Skip to content

Commit 6640abd

Browse files
committed
🔧 fixed album art shape picker colors
1 parent 8c62fc3 commit 6640abd

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

app/src/main/java/com/shub39/rush/presentation/share/component/SharePageSheet.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import androidx.compose.foundation.layout.size
3030
import androidx.compose.foundation.lazy.LazyColumn
3131
import androidx.compose.foundation.shape.RoundedCornerShape
3232
import androidx.compose.material3.ExperimentalMaterial3Api
33+
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
3334
import androidx.compose.material3.HorizontalDivider
3435
import androidx.compose.material3.Icon
3536
import androidx.compose.material3.IconButton
@@ -40,6 +41,7 @@ import androidx.compose.material3.ModalBottomSheet
4041
import androidx.compose.material3.SheetState
4142
import androidx.compose.material3.Switch
4243
import androidx.compose.material3.Text
44+
import androidx.compose.material3.ToggleButtonDefaults
4345
import androidx.compose.material3.rememberModalBottomSheetState
4446
import androidx.compose.material3.rememberStandardBottomSheetState
4547
import androidx.compose.runtime.Composable
@@ -76,7 +78,7 @@ import com.shub39.rush.presentation.toFullName
7678
import com.shub39.rush.presentation.toShape
7779
import com.shub39.rush.presentation.toStringRes
7880

79-
@OptIn(ExperimentalMaterial3Api::class)
81+
@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
8082
@Composable
8183
fun SharePageSheet(
8284
state: SharePageState,
@@ -204,7 +206,11 @@ fun SharePageSheet(
204206
modifier =
205207
Modifier.size(20.dp)
206208
.background(
207-
color = MaterialTheme.colorScheme.onSurface,
209+
color = if (state.albumArtShape == it) {
210+
ToggleButtonDefaults.tonalToggleButtonColors().checkedContentColor
211+
} else {
212+
ToggleButtonDefaults.tonalToggleButtonColors().contentColor
213+
},
208214
shape = it.toShape(),
209215
)
210216
)

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ koin = "4.1.1"
1313
koin-annotations = "2.3.1"
1414
ksoup = "0.2.6"
1515
ktor = "3.4.1"
16-
kotlin = "2.3.10"
16+
kotlin = "2.3.20"
1717
ksp = "2.3.5"
1818
landscapist = "2.9.5"
1919
activity-compose = "1.13.0"

0 commit comments

Comments
 (0)