various changes

app/build.gradle.kts

@@ -12,13 +12,14 @@ android {
         minSdk = 24
         targetSdk = 34
         versionCode = 11
-        versionName = "2.0.1"
+        versionName = "2.0.2"
     }
 
     buildTypes {
         release {
             isMinifyEnabled = true
             isShrinkResources = true
+            isCrunchPngs = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
@@ -39,11 +40,6 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion = "1.4.4"
     }
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
 }
 
 dependencies {

app/release/output-metadata.json

@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 11,
-      "versionName": "2.0.1",
+      "versionName": "2.0.2",
       "outputFile": "app-release.apk"
     }
   ],

app/src/main/AndroidManifest.xml

@@ -4,8 +4,6 @@
 
     <application
         android:allowBackup="true"
-        android:dataExtractionRules="@xml/data_extraction_rules"
-        android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="CuteCalc"
         android:roundIcon="@mipmap/ic_launcher_round"

app/src/main/java/com/sosauce/cutecalc/AboutScreen.kt

@@ -24,22 +24,22 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Button
 import androidx.compose.material3.Card
+import androidx.compose.material3.Divider
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
-import androidx.navigation.NavController
 import androidx.compose.ui.unit.sp
+import androidx.navigation.NavController
 import com.sosauce.cutecalc.ui.theme.GlobalFont
-import androidx.compose.material3.Divider
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.runtime.remember
-import androidx.compose.ui.res.painterResource
 
 
 @SuppressLint("UnusedMaterialScaffoldPaddingParameter", "UnusedMaterial3ScaffoldPaddingParameter")
@@ -93,7 +93,7 @@ fun AboutScreen(navController: NavController) {
                         fontSize = 40.sp
                     )
                     Text(
-                        text = "Version 2.0.1",
+                        text = "Version 2.0.2",
                         fontFamily = GlobalFont,
                         fontSize = 20.sp,
                         modifier = Modifier.offset(y = (-8).dp),

app/src/main/java/com/sosauce/cutecalc/AppBar.kt

@@ -9,7 +9,6 @@ package com.sosauce.cutecalc
 
 import android.annotation.SuppressLint
 import androidx.compose.foundation.background
-import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -24,7 +23,6 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.outlined.Info
-import androidx.compose.material.icons.outlined.Settings
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.DropdownMenu
@@ -35,12 +33,8 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.RadioButton
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarColors
 import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.darkColorScheme
-import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf

app/src/main/java/com/sosauce/cutecalc/Calculator.kt

@@ -1,4 +1,5 @@
-@file:OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3Api::class,
+@file:OptIn(
+    ExperimentalMaterial3Api::class, ExperimentalMaterial3Api::class,
     ExperimentalMaterial3Api::class, ExperimentalMaterial3Api::class
 )
 
@@ -41,13 +42,16 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import com.sosauce.cutecalc.ui.theme.GlobalFont
 
-@SuppressLint("UnusedMaterialScaffoldPaddingParameter", "UnusedMaterial3ScaffoldPaddingParameter",
+@SuppressLint(
+    "UnusedMaterialScaffoldPaddingParameter", "UnusedMaterial3ScaffoldPaddingParameter",
     "AutoboxingStateCreation"
 )
 @Composable
-fun CalculatorUI (navController: NavController, state: CalcState, handleAction: (CalcAction) -> Unit) {
+fun CalculatorUI(
+    navController: NavController,
+    state: CalcState
+) {
     val viewModel = viewModel<CalcViewModel>()
-    val appState = viewModel.state
     val config = LocalConfiguration.current
     val portraitMode = remember { mutableStateOf(config.orientation) }
 
@@ -395,6 +399,6 @@ fun CalculatorUI (navController: NavController, state: CalcState, handleAction:
             }
         }
     } else {
-       LandscapeLayout(navController = navController, state = state)
+        LandscapeLayout(navController = navController, state = state)
     }
 }

app/src/main/java/com/sosauce/cutecalc/CalculatorState.kt

@@ -5,13 +5,13 @@ import com.notkamui.keval.keval
 data class CalcState(val field: String)
 sealed interface CalcAction {
     object GetResult : CalcAction
-    object ResetField: CalcAction
-    object RemoveLast: CalcAction
+    object ResetField : CalcAction
+    object RemoveLast : CalcAction
     data class AddToField(val value: String) : CalcAction
 }
 
 class GetFormulaResultUseCase {
-    operator fun invoke(formula: String) : String {
+    operator fun invoke(formula: String): String {
         return formula.keval().toBigDecimal().stripTrailingZeros().toPlainString()
     }
 }

app/src/main/java/com/sosauce/cutecalc/CalculatorViewModel.kt

@@ -5,7 +5,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 
-class CalcViewModel: ViewModel() {
+class CalcViewModel : ViewModel() {
 
     private val getFormulaResult: GetFormulaResultUseCase = GetFormulaResultUseCase()
 
@@ -22,9 +22,11 @@ class CalcViewModel: ViewModel() {
             CalcAction.GetResult -> {
                 setState { copy(field = getFormulaResult(field)) }
             }
+
             CalcAction.ResetField -> {
                 setState { copy(field = "") }
             }
+
             CalcAction.RemoveLast -> {
                 setState { copy(field = field.dropLast(1)) }
             }

app/src/main/java/com/sosauce/cutecalc/LandscapeLayout.kt

@@ -42,7 +42,6 @@ import com.sosauce.cutecalc.ui.theme.GlobalFont
 fun LandscapeLayout(navController: NavController, state: CalcState) {
 
     val viewModel = viewModel<CalcViewModel>()
-    val appState = viewModel.state
 
 
     Scaffold(
@@ -149,7 +148,7 @@ fun LandscapeLayout(navController: NavController, state: CalcState) {
                     }
 
                     Button(
-                        onClick = {viewModel.handleAction(CalcAction.AddToField("*")) },
+                        onClick = { viewModel.handleAction(CalcAction.AddToField("*")) },
                         colors = ButtonDefaults.buttonColors(MaterialTheme.colorScheme.outlineVariant),
                         modifier = Modifier
                             .weight(0.15f)

app/src/main/java/com/sosauce/cutecalc/MainActivity.kt

@@ -28,7 +28,7 @@ class MainActivity : ComponentActivity() {
                         .fillMaxSize()
                         .background(MaterialTheme.colorScheme.background),
                     contentColor = MaterialTheme.colorScheme.background
-                ) { _ -> Nav()}
+                ) { Nav() }
             }
         }
     }

app/src/main/java/com/sosauce/cutecalc/NavigationGraph.kt

@@ -15,11 +15,11 @@ fun Nav() {
         composable(route = "CalculatorScreen") {
             val viewModel = viewModel<CalcViewModel>()
             val state by viewModel.state.collectAsStateWithLifecycle()
-            CalculatorUI(navController, state, viewModel::handleAction)
+            CalculatorUI(navController, state)
         }
         composable(route = "AboutScreen") {
             AboutScreen(navController)
         }
     }
-    
+
 }

app/src/main/res/values/themes.xml

@@ -8,4 +8,5 @@
     </style>
 
     <style name="Theme.CuteCalc" parent="android:Theme.Material.Light.NoActionBar" />
+    <color name="pink_tone">#201A1A</color>
 </resources>