v3.2.3

sosauce · Nov 3, 2024 · 2de8bdb · 2de8bdb
1 parent f6b5d80
commit 2de8bdb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/app/src/main/java/com/sosauce/cutecalc/components/CuteButton.kt b/app/src/main/java/com/sosauce/cutecalc/components/CuteButton.kt
@@ -20,11 +20,11 @@ import com.sosauce.cutecalc.logic.rememberVibration
 import com.sosauce.cutecalc.ui.theme.GlobalFont
 
 @Composable
-inline fun CuteButton(
+fun CuteButton(
     modifier: Modifier = Modifier,
     text: String,
     color: ButtonColors = ButtonDefaults.buttonColors(MaterialTheme.colorScheme.secondaryContainer),
-    crossinline onClick: () -> Unit
+    onClick: () -> Unit
 ) {
     val shouldVibrate by rememberVibration()
     val haptic = LocalHapticFeedback.current

diff --git a/app/src/main/java/com/sosauce/cutecalc/logic/CalculatorViewModel.kt b/app/src/main/java/com/sosauce/cutecalc/logic/CalculatorViewModel.kt
@@ -32,7 +32,13 @@ class CalcViewModel : ViewModel() {
 
     fun handleAction(action: CalcAction) {
         displayText = when (action) {
-            is CalcAction.GetResult -> TextFieldValue(Evaluator.eval(displayText.text))
+            is CalcAction.GetResult -> {
+                val result = Evaluator.eval(displayText.text)
+                TextFieldValue(
+                    result,
+                    TextRange(result.length)
+                )
+            }
             is CalcAction.ResetField -> TextFieldValue("")
             is CalcAction.Backspace -> displayText.backSpace()
             is CalcAction.AddToField -> displayText.insertText(action.value)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,11 +1,11 @@
 [versions]
-agp = "8.6.1"
-activityCompose = "1.9.2"
-composeBom = "2024.09.03"
+agp = "8.7.2"
+activityCompose = "1.9.3"
+composeBom = "2024.10.01"
 coreSplashscreen = "1.0.1"
 datastorePreferences = "1.1.1"
 keval = "1.1.1"
-navigationCompose = "2.8.2"
+navigationCompose = "2.8.3"
 kotlin = "2.0.20"
 ksp = "2.0.20-1.0.25"
 roomCompiler = "2.6.1"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Dec 15 16:55:56 CET 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists