WTA #40: Extracted streak stats to separate function and fixed build …

…issues.
Jacob3075 · Nov 7, 2022 · 1f7fe8d · 1f7fe8d
1 parent 3aeccdf
commit 1f7fe8d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 14 deletions.
diff --git a/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/OtherDailyStatsSection.kt b/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/OtherDailyStatsSection.kt
@@ -2,7 +2,7 @@ package com.jacob.wakatimeapp.home.ui.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.IntrinsicSize.Min
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
@@ -46,8 +46,29 @@ fun OtherDailyStatsSection(
     SectionHeader()
     Spacer(modifier = Modifier.height(spacing.extraSmall))
 
+    StreakStats(currentStreak, longestStreak)
+
+    Spacer(modifier = Modifier.height(spacing.sMedium))
+
+    SecondaryStats(
+        mostUsedLanguage = mostUsedLanguage,
+        onClick = onClick,
+        spacing = spacing,
+        mostUsedOs = mostUsedOs,
+        mostUsedEditor = mostUsedEditor
+    )
+}
+
+@Composable
+private fun StreakStats(
+    currentStreak: StreakRange,
+    longestStreak: StreakRange,
+) {
+    val spacing = MaterialTheme.spacing
+    val gradients = MaterialTheme.gradients
+
     Row(
-        modifier = Modifier.height(IntrinsicSize.Min),
+        modifier = Modifier.height(Min),
         horizontalArrangement = Arrangement.spacedBy(spacing.small)
     ) {
         CurrentStreakCard(
@@ -74,16 +95,6 @@ fun OtherDailyStatsSection(
             )
         }
     }
-
-    Spacer(modifier = Modifier.height(spacing.sMedium))
-
-    SecondaryStats(
-        mostUsedLanguage = mostUsedLanguage,
-        onClick = onClick,
-        spacing = spacing,
-        mostUsedOs = mostUsedOs,
-        mostUsedEditor = mostUsedEditor
-    )
 }
 
 @Composable

diff --git a/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/StreaksCards.kt b/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/StreaksCards.kt
@@ -107,7 +107,7 @@ private fun CurrentStreakCardPreview() = WakaTimeAppTheme {
                     start = LocalDate(2022, 1, 1),
                     end = LocalDate(2022, 1, 11)
                 ),
-                gradient = MaterialTheme.gradients.greenCyan,
+                gradient = MaterialTheme.gradients.purpink,
                 cornerPercentage = 20,
                 modifier = Modifier.weight(0.5F)
             )
@@ -116,7 +116,7 @@ private fun CurrentStreakCardPreview() = WakaTimeAppTheme {
                     start = LocalDate(2022, 1, 1),
                     end = LocalDate(2022, 1, 5)
                 ),
-                gradient = MaterialTheme.gradients.greenCyan,
+                gradient = MaterialTheme.gradients.tealLove,
                 cornerPercentage = 20,
                 modifier = Modifier.weight(0.5F)
             )