code improvement.

bytebeats · bytebeats · commit ce93ec3081ea · 2024-05-29T16:32:00.000+08:00
diff --git a/app/src/main/java/me/bytebeats/views/charts/app/ui/screen/HomeScreen.kt b/app/src/main/java/me/bytebeats/views/charts/app/ui/screen/HomeScreen.kt
@@ -47,9 +47,18 @@ private fun HomeScreenContent(modifier: Modifier) {
         verticalArrangement = Arrangement.Center,
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
-        ChartScreenSelector(text = "Pie Chart", nextScreen = Screen.Pie)
-        ChartScreenSelector(text = "Line Chart", nextScreen = Screen.Line)
-        ChartScreenSelector(text = "Bar Chart", nextScreen = Screen.Bar)
+        ChartScreenSelector(
+            text = "Pie Chart",
+            nextScreen = Screen.Pie
+        )
+        ChartScreenSelector(
+            text = "Line Chart",
+            nextScreen = Screen.Line
+        )
+        ChartScreenSelector(
+            text = "Bar Chart",
+            nextScreen = Screen.Bar
+        )
     }
 }
 
@@ -59,7 +68,10 @@ private fun ChartScreenSelector(
     nextScreen: Screen
 ) {
     Row(
-        modifier = Modifier.padding(horizontal = Margins.horizontal, vertical = Margins.vertical)
+        modifier = Modifier.padding(
+            horizontal = Margins.horizontal,
+            vertical = Margins.vertical
+        )
     ) {
         TextButton(
             onClick = { ScreenRouter.navigate(nextScreen) }
diff --git a/app/src/main/java/me/bytebeats/views/charts/app/ui/screen/bar/BarChartScreen.kt b/app/src/main/java/me/bytebeats/views/charts/app/ui/screen/bar/BarChartScreen.kt
@@ -47,7 +47,9 @@ fun BarChartScreen() {
         topBar = {
             TopAppBar(
                 navigationIcon = {
-                    IconButton(onClick = { ScreenRouter.navigateHome() }) {
+                    IconButton(
+                        onClick = { ScreenRouter.navigateHome() }
+                    ) {
                         Icon(
                             imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                             contentDescription = "Go back home"
@@ -72,7 +74,8 @@ private fun BarChartContent(modifier: Modifier = Modifier) {
         BarChartRow(barChartDataModel = barChartDataModel)
         DrawLabelLocation(
             barChartDataModel = barChartDataModel,
-            newLocation = { barChartDataModel.labelLocation = it })
+            newLocation = { barChartDataModel.labelLocation = it }
+        )
         AddOrRemoveBar(barChartDataModel = barChartDataModel)
     }
 }
diff --git a/app/src/main/java/me/bytebeats/views/charts/app/ui/screen/line/LineChartDataModel.kt b/app/src/main/java/me/bytebeats/views/charts/app/ui/screen/line/LineChartDataModel.kt
@@ -1,6 +1,7 @@
 package me.bytebeats.views.charts.app.ui.screen.line
 
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import me.bytebeats.views.charts.line.LineChartData
@@ -31,7 +32,7 @@ class LineChartDataModel {
         )
     )
 
-    var horizontalOffset by mutableStateOf(5F)
+    var horizontalOffset by mutableFloatStateOf(5F)
 
     var pointDrawerType by mutableStateOf(PointDrawerType.Hollow)
     val pointDrawer: IPointDrawer
diff --git a/app/src/main/java/me/bytebeats/views/charts/app/ui/screen/line/LineChartScreen.kt b/app/src/main/java/me/bytebeats/views/charts/app/ui/screen/line/LineChartScreen.kt
@@ -41,7 +41,8 @@ fun LineChartScreen() {
             TopAppBar(
                 navigationIcon = {
                     IconButton(
-                        onClick = { ScreenRouter.navigateHome() }) {
+                        onClick = { ScreenRouter.navigateHome() }
+                    ) {
                         Icon(
                             imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                             contentDescription = "Go back home"
diff --git a/app/src/main/java/me/bytebeats/views/charts/app/ui/screen/line/PointDrawerType.kt b/app/src/main/java/me/bytebeats/views/charts/app/ui/screen/line/PointDrawerType.kt
@@ -8,5 +8,5 @@ package me.bytebeats.views.charts.app.ui.screen.line
 enum class PointDrawerType {
     None,
     Filled,
-    Hollow
-}
+    Hollow;
+}
diff --git a/app/src/main/java/me/bytebeats/views/charts/app/ui/screen/pie/PieChartDataModel.kt b/app/src/main/java/me/bytebeats/views/charts/app/ui/screen/pie/PieChartDataModel.kt
@@ -1,6 +1,7 @@
 package me.bytebeats.views.charts.app.ui.screen.pie
 
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.graphics.Color
@@ -13,7 +14,7 @@ import kotlin.random.Random
  * Quote: Peasant. Educated. Worker
  */
 class PieChartDataModel {
-    private val colors = mutableListOf<Color>(
+    private val colors = mutableListOf(
         Color(0XFFF44336),
         Color(0XFFE91E63),
         Color(0XFF9C27B0),
@@ -29,17 +30,23 @@ class PieChartDataModel {
         Color(0XFF607D8B)
     )
 
-    var sliceThickness by mutableStateOf(25F)
+    var sliceThickness by mutableFloatStateOf(25F)
 
     var pieChartData by mutableStateOf(
         PieChartData(
             slices = listOf(
                 PieChartData.Slice(
-                    randomLength(),
-                    randomColor()
+                    value = randomLength(),
+                    color = randomColor()
                 ),
-                PieChartData.Slice(randomLength(), randomColor()),
-                PieChartData.Slice(randomLength(), randomColor())
+                PieChartData.Slice(
+                    value = randomLength(),
+                    color = randomColor()
+                ),
+                PieChartData.Slice(
+                    value = randomLength(),
+                    color = randomColor()
+                )
             )
         )
     )
@@ -50,7 +57,12 @@ class PieChartDataModel {
     fun addSlice() {
         pieChartData = pieChartData.copy(
             slices = slices.toMutableList().apply {
-                add(PieChartData.Slice(randomLength(), randomColor()))
+                add(
+                    PieChartData.Slice(
+                        value = randomLength(),
+                        color = randomColor()
+                    )
+                )
             }.toList()
         )
     }
@@ -70,4 +82,4 @@ class PieChartDataModel {
         val randomIndex = Random.Default.nextInt(colors.size)
         return colors.removeAt(randomIndex)
     }
-}
+}
diff --git a/app/src/main/java/me/bytebeats/views/charts/app/ui/screen/pie/PieChartScreen.kt b/app/src/main/java/me/bytebeats/views/charts/app/ui/screen/pie/PieChartScreen.kt
@@ -47,7 +47,8 @@ fun PieChartScreen() {
             TopAppBar(
                 navigationIcon = {
                     IconButton(
-                        onClick = { ScreenRouter.navigateHome() }) {
+                        onClick = { ScreenRouter.navigateHome() }
+                    ) {
                         Icon(
                             imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                             contentDescription = "Go back Home"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package me.bytebeats.views.charts.app.ui.screen.line`
`2`	`2`
`3`	`3`	`import androidx.compose.runtime.getValue`
	`4`	`+import androidx.compose.runtime.mutableFloatStateOf`
`4`	`5`	`import androidx.compose.runtime.mutableStateOf`
`5`	`6`	`import androidx.compose.runtime.setValue`
`6`	`7`	`import me.bytebeats.views.charts.line.LineChartData`
`@@ -31,7 +32,7 @@ class LineChartDataModel {`
`31`	`32`	`)`
`32`	`33`	`)`
`33`	`34`
`34`		`- var horizontalOffset by mutableStateOf(5F)`
	`35`	`+ var horizontalOffset by mutableFloatStateOf(5F)`
`35`	`36`
`36`	`37`	`var pointDrawerType by mutableStateOf(PointDrawerType.Hollow)`
`37`	`38`	`val pointDrawer: IPointDrawer`
-Original file line number
+Diff line change
 enum class PointDrawerType {
     None,
     Filled,
 -    Hollow
 -}
 +    Hollow;
 +}