Merge pull request #177

Baseline profiles

app/build.gradle.kts

@@ -25,6 +25,7 @@ plugins {
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.ksp)
+    alias(libs.plugins.baselineprofile)
 }
 
 tasks.withType(Test::class) {
@@ -101,6 +102,14 @@ android {
         includeInApk = false
         includeInBundle = false
     }
+
+    baselineProfile {
+        variants {
+            create("playRelease") {
+                automaticGenerationDuringBuild = true
+            }
+        }
+    }
 }
 
 dependencies {
@@ -124,6 +133,8 @@ dependencies {
 
     implementation(libs.androidx.room.runtime)
     implementation(libs.androidx.room.ktx)
+    implementation(libs.androidx.profileinstaller)
+    "baselineProfile"(project(":baselineprofile"))
     ksp(libs.androidx.room.compiler)
 
     "playImplementation"(libs.revenuecat.purchases)

app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt

@@ -219,9 +219,12 @@ fun AppScreen(
                                         Crossfade(selected) {
                                             if (it) Icon(
                                                 painterResource(item.selectedIcon),
-                                                null
+                                                stringResource(item.label)
+                                            )
+                                            else Icon(
+                                                painterResource(item.unselectedIcon),
+                                                stringResource(item.label)
                                             )
-                                            else Icon(painterResource(item.unselectedIcon), null)
                                         }
                                         AnimatedVisibility(
                                             visible = selected || wide,

app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/SettingsScreen.kt

@@ -173,12 +173,11 @@ private fun SettingsScreen(
             setShowSheet = { showLocaleSheet = it }
         )
 
-    if(settingsState.isShowingEraseDataDialog){
-        ResetDataDialog(resetData = {
-            onAction(SettingsAction.EraseData)
-        }, onDismiss = {
-            onAction(SettingsAction.CancelEraseData)
-        })
+    if (settingsState.isShowingEraseDataDialog) {
+        ResetDataDialog(
+            resetData = { onAction(SettingsAction.EraseData) },
+            onDismiss = { onAction(SettingsAction.CancelEraseData) }
+        )
     }
 
     NavDisplay(
@@ -310,11 +309,11 @@ private fun SettingsScreen(
                             Box(
                                 modifier = Modifier.fillMaxWidth(),
                                 contentAlignment = Alignment.Center
-                            ){
+                            ) {
 
                                 TextButton(
                                     onClick = { onAction(SettingsAction.AskEraseData) },
-                               ) {
+                                ) {
                                     Text(stringResource(R.string.reset_data))
                                 }
                             }

app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AboutScreen.kt

@@ -115,7 +115,7 @@ fun AboutScreen(
                     ) {
                         Icon(
                             painterResource(R.drawable.arrow_back),
-                            null
+                            stringResource(R.string.back)
                         )
                     }
                 },

app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AlarmSettings.kt

@@ -183,7 +183,7 @@ fun AlarmSettings(
                     ) {
                         Icon(
                             painterResource(R.drawable.arrow_back),
-                            null
+                            stringResource(R.string.back)
                         )
                     }
                 },

app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AppearanceSettings.kt

@@ -92,7 +92,7 @@ fun AppearanceSettings(
                     ) {
                         Icon(
                             painterResource(R.drawable.arrow_back),
-                            null
+                            stringResource(R.string.back)
                         )
                     }
                 },

app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/TimerSettings.kt

@@ -206,7 +206,8 @@ fun TimerSettings(
                     ) {
                         Icon(
                             painterResource(R.drawable.arrow_back),
-                            null
+                            stringResource(R.string.back)
+
                         )
                     }
                 },

app/src/main/java/org/nsh07/pomodoro/ui/statsScreen/screens/LastMonthScreen.kt

@@ -146,7 +146,7 @@ fun SharedTransitionScope.LastMonthScreen(
                     ) {
                         Icon(
                             painterResource(R.drawable.arrow_back),
-                            null
+                            stringResource(R.string.back)
                         )
                     }
                 },

app/src/main/java/org/nsh07/pomodoro/ui/statsScreen/screens/LastWeekScreen.kt

@@ -145,7 +145,7 @@ fun SharedTransitionScope.LastWeekScreen(
                     ) {
                         Icon(
                             painterResource(R.drawable.arrow_back),
-                            null
+                            stringResource(R.string.back)
                         )
                     }
                 },

app/src/main/java/org/nsh07/pomodoro/ui/statsScreen/screens/LastYearScreen.kt

@@ -153,7 +153,7 @@ fun SharedTransitionScope.LastYearScreen(
                     ) {
                         Icon(
                             painterResource(R.drawable.arrow_back),
-                            null
+                            stringResource(R.string.back)
                         )
                     }
                 },

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

@@ -122,4 +122,5 @@
     <string name="focus_history_calendar_desc">Focus history of the past month. Days of the previous month are marked with a different color. Tap on a date for more info.</string>
     <string name="reset_data">Reset stats</string>
     <string name="reset_data_dialog_text">Are you sure you want to reset all your stats?</string>
+    <string name="back">Back</string>
 </resources>