lostecho/Tomato
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: prepare for baseline profile generation test

Browse Source
This commit is contained in:
Nishant Mishra
2025-12-20 11:53:16 +05:30
parent ed72ec288b
commit 09639fd5e0
10 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,

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

@@ -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))
}
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

1
app/src/main/res/values/strings.xml
View File

@@ -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>