Skip to content

Commit e35d150

Browse files
rename and move util functions
1 parent 64b3a4b commit e35d150

File tree

16 files changed

+1627
-1203
lines changed

16 files changed

+1627
-1203
lines changed

app/src/main/java/com/smarttoolfactory/composecolorsextended/MaterialColorPicker.kt renamed to app/src/main/java/com/smarttoolfactory/composecolorsextended/M2ListColorPicker.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import com.smarttoolfactory.extendedcolors.ColorSwatch
2626
import com.smarttoolfactory.extendedcolors.util.colorToHex
2727

2828
@Composable
29-
fun MaterialColorPicker(onColorChange: (Color) -> Unit) {
29+
fun M2ListColorPicker(onColorChange: (Color) -> Unit) {
3030

3131
var headerIndex by remember { mutableStateOf(0) }
3232
var selectedColorIndex by remember { mutableStateOf(-1) }

app/src/main/java/com/smarttoolfactory/composecolorsextended/MainActivity.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,16 @@ import androidx.compose.material.*
1111
import androidx.compose.runtime.*
1212
import androidx.compose.ui.Modifier
1313
import androidx.compose.ui.graphics.Color
14-
import androidx.compose.ui.platform.ClipboardManager
15-
import androidx.compose.ui.platform.LocalClipboardManager
16-
import androidx.compose.ui.text.AnnotatedString
1714
import androidx.compose.ui.unit.dp
1815
import com.google.accompanist.pager.ExperimentalPagerApi
1916
import com.google.accompanist.pager.HorizontalPager
2017
import com.google.accompanist.pager.PagerState
2118
import com.google.accompanist.pager.rememberPagerState
2219
import com.google.accompanist.systemuicontroller.rememberSystemUiController
20+
import com.smarttoolfactory.composecolorsextended.demo.ColorModelConversionDemo
2321
import com.smarttoolfactory.composecolorsextended.demo.GradientAngleDemo
24-
import com.smarttoolfactory.composecolorsextended.demo.MD2ColorSelectionDemo
25-
import com.smarttoolfactory.composecolorsextended.demo.MD3ColorShadeSelectionDemo
22+
import com.smarttoolfactory.composecolorsextended.demo.M2ColorSelectionDemo
23+
import com.smarttoolfactory.composecolorsextended.demo.M3ColorShadeSelectionDemo
2624
import com.smarttoolfactory.composecolorsextended.ui.theme.ComposeColorsExtendedTheme
2725
import com.smarttoolfactory.extendedcolors.util.colorToHSL
2826
import kotlinx.coroutines.launch
@@ -96,13 +94,14 @@ private fun HomeContent() {
9694
) { page: Int ->
9795

9896
when (page) {
99-
0 -> MD2ColorSelectionDemo {
97+
0 -> M2ColorSelectionDemo {
10098
backgroundColor = it
10199
}
102-
1 -> MD3ColorShadeSelectionDemo {
100+
1 -> M3ColorShadeSelectionDemo {
103101
backgroundColor = it
104102
}
105-
else -> GradientAngleDemo()
103+
2 -> GradientAngleDemo()
104+
else -> ColorModelConversionDemo()
106105
}
107106
}
108107
}
@@ -111,5 +110,6 @@ internal val tabList =
111110
listOf(
112111
"Material Design2",
113112
"Material You/3",
114-
"Gradient Angles"
113+
"Gradient Angles",
114+
"Model Conversion",
115115
)

0 commit comments

Comments
 (0)