diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt b/app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt
index acee563..89a65ab 100644
--- a/app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt
+++ b/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,
diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/SettingsScreen.kt b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/SettingsScreen.kt
index 9ab8ae8..3cb44d6 100644
--- a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/SettingsScreen.kt
+++ b/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))
}
}
diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AboutScreen.kt b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AboutScreen.kt
index ea9fdc3..611556e 100644
--- a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AboutScreen.kt
+++ b/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)
)
}
},
diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AlarmSettings.kt b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AlarmSettings.kt
index fdd7ea4..62965ad 100644
--- a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AlarmSettings.kt
+++ b/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)
)
}
},
diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AppearanceSettings.kt b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AppearanceSettings.kt
index 32aaa87..2f06a13 100644
--- a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AppearanceSettings.kt
+++ b/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)
)
}
},
diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/TimerSettings.kt b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/TimerSettings.kt
index da79e16..15f8354 100644
--- a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/TimerSettings.kt
+++ b/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)
+
)
}
},
diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/statsScreen/screens/LastMonthScreen.kt b/app/src/main/java/org/nsh07/pomodoro/ui/statsScreen/screens/LastMonthScreen.kt
index 643daa5..fdf657f 100644
--- a/app/src/main/java/org/nsh07/pomodoro/ui/statsScreen/screens/LastMonthScreen.kt
+++ b/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)
)
}
},
diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/statsScreen/screens/LastWeekScreen.kt b/app/src/main/java/org/nsh07/pomodoro/ui/statsScreen/screens/LastWeekScreen.kt
index 56214a4..3a1fc5b 100644
--- a/app/src/main/java/org/nsh07/pomodoro/ui/statsScreen/screens/LastWeekScreen.kt
+++ b/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)
)
}
},
diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/statsScreen/screens/LastYearScreen.kt b/app/src/main/java/org/nsh07/pomodoro/ui/statsScreen/screens/LastYearScreen.kt
index 2d03aad..5b076b4 100644
--- a/app/src/main/java/org/nsh07/pomodoro/ui/statsScreen/screens/LastYearScreen.kt
+++ b/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)
)
}
},
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c76eedb..2b581f5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -122,4 +122,5 @@
Focus history of the past month. Days of the previous month are marked with a different color. Tap on a date for more info.
Reset stats
Are you sure you want to reset all your stats?
+ Back
\ No newline at end of file