fixed #204

rozPierog · Jul 31, 2023 · 689ad53 · 689ad53
1 parent c0c0ea8
commit 689ad53
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/app/src/main/java/com/omelan/cofi/pages/details/RecipeDetails.kt b/app/src/main/java/com/omelan/cofi/pages/details/RecipeDetails.kt
@@ -60,7 +60,7 @@ import com.omelan.cofi.appDeepLinkUrl
 import com.omelan.cofi.components.*
 import com.omelan.cofi.model.DataStore
 import com.omelan.cofi.model.NEXT_STEP_ENABLED_DEFAULT_VALUE
-import com.omelan.cofi.share.*
+import com.omelan.cofi.share.COMBINE_WEIGHT_DEFAULT_VALUE
 import com.omelan.cofi.share.model.*
 import com.omelan.cofi.share.pages.Destinations
 import com.omelan.cofi.share.timer.Timer
@@ -344,6 +344,7 @@ fun RecipeDetails(
                         .animateItemPlacement()
                         .padding(bottom = Spacing.normal),
                     step = nextStep ?: Step(name = "", type = StepType.WAIT),
+                    weightMultiplier, timeMultiplier,
                 )
             }
         }

diff --git a/app/src/main/java/com/omelan/cofi/pages/details/UpNext.kt b/app/src/main/java/com/omelan/cofi/pages/details/UpNext.kt
@@ -27,7 +27,11 @@ import com.omelan.cofi.ui.card
 import com.omelan.cofi.ui.shapes
 
 @Composable
-fun UpNext(modifier: Modifier = Modifier, step: Step) {
+fun UpNext(
+    modifier: Modifier = Modifier, step: Step,
+    weightMultiplier: Float = 1f,
+    timeMultiplier: Float = 1f,
+) {
     Surface(modifier = modifier.animateContentSize(), shape = shapes.card, tonalElevation = 2.dp) {
         Column(
             Modifier
@@ -47,7 +51,12 @@ fun UpNext(modifier: Modifier = Modifier, step: Step) {
                 },
                 label = "Next step",
             ) {
-                StepListItem(step = it, stepProgress = StepProgress.Upcoming)
+                StepListItem(
+                    step = it,
+                    stepProgress = StepProgress.Upcoming,
+                    weightMultiplier = weightMultiplier,
+                    timeMultiplier = timeMultiplier,
+                )
             }
         }
     }

diff --git a/docs/Changelog.md b/docs/Changelog.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - WearOS will now show recipes in the same order as Android
 - Improved rotary input on WearOS
+- Fixed Up Next not scaling with the recipe multipliers
 
 ### Removed