Skip to content

Commit 67fdf44

Browse files
massivemadnessmassivemadness
committed
Minor changes in sample app
1 parent ccb7a52 commit 67fdf44

File tree

3 files changed

+24
-20
lines changed

3 files changed

+24
-20
lines changed

‎app/src/main/kotlin/com/fragula2/sample/compose/ComposeActivity.kt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import androidx.activity.ComponentActivity
2222
import androidx.activity.compose.setContent
2323
import androidx.appcompat.graphics.drawable.DrawerArrowDrawable
2424
import androidx.compose.foundation.layout.fillMaxSize
25+
import androidx.compose.foundation.layout.padding
2526
import androidx.compose.material.Icon
2627
import androidx.compose.material.IconButton
2728
import androidx.compose.material.MaterialTheme
@@ -33,7 +34,7 @@ import androidx.compose.material.icons.Icons
3334
import androidx.compose.material.icons.filled.Settings
3435
import androidx.compose.runtime.Composable
3536
import androidx.compose.runtime.getValue
36-
import androidx.compose.runtime.mutableStateOf
37+
import androidx.compose.runtime.mutableFloatStateOf
3738
import androidx.compose.runtime.remember
3839
import androidx.compose.runtime.setValue
3940
import androidx.compose.ui.Modifier
@@ -68,7 +69,7 @@ class ComposeActivity : ComponentActivity() {
6869
color = MaterialTheme.colors.background,
6970
) {
7071
val navController = rememberFragulaNavController()
71-
var arrowProgress by remember { mutableStateOf(0f) }
72+
var arrowProgress by remember { mutableFloatStateOf(0f) }
7273
Scaffold(
7374
topBar = {
7475
FragulaAppBar(
@@ -96,10 +97,11 @@ class ComposeActivity : ComponentActivity() {
9697
else -> 0f
9798
}
9899
},
99-
swipeDirection = SwipeDirection.of(settingsViewModel.swipeDirection.value),
100-
scrimColor = settingsViewModel.scrimColor.value.argbToColor(),
101-
scrimAmount = settingsViewModel.scrimAmount.value,
102-
elevationAmount = settingsViewModel.elevationAmount.value.dp,
100+
swipeDirection = SwipeDirection.of(settingsViewModel.swipeDirection.intValue),
101+
scrimColor = settingsViewModel.scrimColor.intValue.argbToColor(),
102+
scrimAmount = settingsViewModel.scrimAmount.floatValue,
103+
elevationAmount = settingsViewModel.elevationAmount.floatValue.dp,
104+
modifier = Modifier.padding(paddingValues),
103105
) {
104106
swipeable("list") {
105107
ListScreen(navController)

‎app/src/main/kotlin/com/fragula2/sample/compose/screen/SettingsScreen.kt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import androidx.compose.material.MaterialTheme
1818
import androidx.compose.material.Text
1919
import androidx.compose.runtime.Composable
2020
import androidx.compose.runtime.getValue
21+
import androidx.compose.runtime.mutableFloatStateOf
2122
import androidx.compose.runtime.mutableStateOf
2223
import androidx.compose.runtime.remember
2324
import androidx.compose.runtime.setValue
@@ -52,9 +53,9 @@ fun SettingsScreen(settingsViewModel: SettingsViewModel) {
5253
FloatButtonsRow(
5354
modifier = Modifier.padding(top = 10.dp),
5455
values = directionsList,
55-
selectedFloat = settingsViewModel.swipeDirection.value.toFloat(),
56+
selectedFloat = settingsViewModel.swipeDirection.intValue.toFloat(),
5657
) { value ->
57-
settingsViewModel.swipeDirection.value = value.toInt()
58+
settingsViewModel.swipeDirection.intValue = value.toInt()
5859
}
5960

6061
Text(
@@ -65,9 +66,9 @@ fun SettingsScreen(settingsViewModel: SettingsViewModel) {
6566
)
6667
ColorButtonsRow(
6768
modifier = Modifier.padding(top = 10.dp),
68-
selectedColor = settingsViewModel.scrimColor.value.argbToColor(),
69+
selectedColor = settingsViewModel.scrimColor.intValue.argbToColor(),
6970
) { color ->
70-
settingsViewModel.scrimColor.value = color.toArgb()
71+
settingsViewModel.scrimColor.intValue = color.toArgb()
7172
}
7273

7374
Text(
@@ -79,9 +80,9 @@ fun SettingsScreen(settingsViewModel: SettingsViewModel) {
7980
FloatButtonsRow(
8081
modifier = Modifier.padding(top = 10.dp),
8182
values = scrimAmountList,
82-
selectedFloat = settingsViewModel.scrimAmount.value,
83+
selectedFloat = settingsViewModel.scrimAmount.floatValue,
8384
) { amount ->
84-
settingsViewModel.scrimAmount.value = amount
85+
settingsViewModel.scrimAmount.floatValue = amount
8586
}
8687

8788
Text(
@@ -93,9 +94,9 @@ fun SettingsScreen(settingsViewModel: SettingsViewModel) {
9394
FloatButtonsRow(
9495
modifier = Modifier.padding(top = 10.dp),
9596
values = elevationAmountList,
96-
selectedFloat = settingsViewModel.elevationAmount.value,
97+
selectedFloat = settingsViewModel.elevationAmount.floatValue,
9798
) { amount ->
98-
settingsViewModel.elevationAmount.value = amount
99+
settingsViewModel.elevationAmount.floatValue = amount
99100
}
100101
}
101102
}
@@ -147,7 +148,7 @@ private fun FloatButtonsRow(
147148
selectedFloat: Float,
148149
onButtonClick: (value: Float) -> Unit = {},
149150
) {
150-
var selectedValue: Float by remember { mutableStateOf(selectedFloat) }
151+
var selectedValue: Float by remember { mutableFloatStateOf(selectedFloat) }
151152
Row(
152153
modifier = modifier
153154
.fillMaxWidth()

‎app/src/main/kotlin/com/fragula2/sample/compose/viewmodel/SettingsViewModel.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package com.fragula2.sample.compose.viewmodel
22

3-
import androidx.compose.runtime.mutableStateOf
3+
import androidx.compose.runtime.mutableFloatStateOf
4+
import androidx.compose.runtime.mutableIntStateOf
45
import androidx.compose.ui.graphics.Color
56
import androidx.compose.ui.graphics.toArgb
67
import androidx.compose.ui.unit.dp
78
import androidx.lifecycle.ViewModel
89
import com.fragula2.common.SwipeDirection
910

1011
class SettingsViewModel : ViewModel() {
11-
val swipeDirection = mutableStateOf(SwipeDirection.LEFT_TO_RIGHT.value)
12-
val elevationAmount = mutableStateOf(3.dp.value)
13-
val scrimColor = mutableStateOf(Color(0xFF000000).toArgb())
14-
val scrimAmount = mutableStateOf(0.15f)
12+
val swipeDirection = mutableIntStateOf(SwipeDirection.LEFT_TO_RIGHT.value)
13+
val elevationAmount = mutableFloatStateOf(3.dp.value)
14+
val scrimColor = mutableIntStateOf(Color(0xFF000000).toArgb())
15+
val scrimAmount = mutableFloatStateOf(0.15f)
1516
}

0 commit comments

Comments
 (0)