Fix rpe

AnkitSuda · Nov 18, 2022 · 5e393b2 · 5e393b2
1 parent 497da60
commit 5e393b2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/...or/src/main/java/com/ankitsuda/rebound/ui/components/workouteditor/WorkoutExerciseItem.kt b/...or/src/main/java/com/ankitsuda/rebound/ui/components/workouteditor/WorkoutExerciseItem.kt
@@ -644,6 +644,7 @@ private fun SetItemLayout(
             || exercise.category == ExerciseCategory.REPS
         ) {
             ReboundSetTextField(
+                layoutWeight = 0.75f,
                 value = exerciseLogEntry.rpe?.toReadableString() ?: "",
                 onValueChange = {
                     onRpeChange(exerciseLogEntry, it.toFloatOrNull())

diff --git a/...i-keyboard/src/main/java/com/ankitsuda/rebound/ui/keyboard/ReboundSetKeyboardComponent.kt b/...i-keyboard/src/main/java/com/ankitsuda/rebound/ui/keyboard/ReboundSetKeyboardComponent.kt
@@ -139,16 +139,17 @@ fun ReboundSetKeyboardComponent(
                     )
                 }
                 KeyboardModeType.RPE_PICKER -> {
-                    RpePickerComponent(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .height(
-                                height = 250.dp,
-                            ),
-                        onSetText = ::setText,
-                        text = inputConnection?.getText(),
-                        refreshKey = inputConnection
-                    )
+                    key(inputConnection) {
+                        RpePickerComponent(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .height(
+                                    height = 250.dp,
+                                ),
+                            onSetText = ::setText,
+                            text = inputConnection?.getText(),
+                        )
+                    }
                 }
             }
         }

diff --git a/.../ui-keyboard/src/main/java/com/ankitsuda/rebound/ui/keyboard/field/ReboundSetTextField.kt b/.../ui-keyboard/src/main/java/com/ankitsuda/rebound/ui/keyboard/field/ReboundSetTextField.kt
@@ -38,6 +38,7 @@ import com.ankitsuda.rebound.ui.keyboard.enums.ReboundKeyboardType
 
 @Composable
 fun RowScope.ReboundSetTextField(
+    layoutWeight: Float = 1.25f,
     value: String,
     contentColor: Color,
     bgColor: Color,
@@ -51,7 +52,7 @@ fun RowScope.ReboundSetTextField(
         modifier = Modifier
             .height(32.dp)
             .padding(start = 8.dp, end = 8.dp)
-            .weight(1.25f)
+            .weight(layoutWeight)
             .clip(RoundedCornerShape(12.dp))
             .background(bgColor.lighterOrDarkerColor(0.10f)),
     ) {

diff --git a/...les/ui-keyboard/src/main/java/com/ankitsuda/rebound/ui/keyboard/rpe/RpePickerComponent.kt b/...les/ui-keyboard/src/main/java/com/ankitsuda/rebound/ui/keyboard/rpe/RpePickerComponent.kt
@@ -26,7 +26,7 @@ internal fun RpePickerComponent(
     modifier: Modifier,
     onSetText: (String) -> Unit,
     text: String?,
-    refreshKey: Any?,
+    refreshKey: Any? = null,
 ) {
     var rpe: Float? by remember(text) {
         mutableStateOf(text?.toFloatOrNull().takeIf { allRPEs.any { r -> r == it } })