yetangitu/timelimit-android
1
0
Fork 0
mirror of https://codeberg.org/timelimit/timelimit-android.git synced 2025-10-03 01:39:22 +02:00
Code Issues Projects Releases Wiki Activity

Remove ScreenWithTitleResource

Browse source
This commit is contained in:
Jonas Lochmann 2023-02-27 01:00:00 +01:00
parent 7c578a68d2
commit 0be972c05f
No known key found for this signature in database
GPG key ID: 8B8C9AEE10FA5B36
2 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/io/timelimit/android/ui/MainActivity.kt
View file

@ -262,7 +262,6 @@ class MainActivity : AppCompatActivity(), ActivityViewModelHolder, U2fManager.De
}.asFlow().collectAsState(initial = null) }.asFlow().collectAsState(initial = null)
val screenTitle = when (screen) { val screenTitle = when (screen) {
is ScreenWithTitleResource -> stringResource(screen.titleResource)
is ScreenWithTitle -> when (val title = screen.title) { is ScreenWithTitle -> when (val title = screen.title) {
is Title.Plain -> title.text is Title.Plain -> title.text
is Title.StringResource -> stringResource(title.id) is Title.StringResource -> stringResource(title.id)

9
app/src/main/java/io/timelimit/android/ui/model/Screen.kt
View file

@ -68,8 +68,8 @@ sealed class Screen(
state: State, state: State,
val content: DeviceOwnerHandling.OwnerScreen, val content: DeviceOwnerHandling.OwnerScreen,
override val snackbarHostState: SnackbarHostState override val snackbarHostState: SnackbarHostState
): Screen(state), ScreenWithAuthenticationFab, ScreenWithSnackbar, ScreenWithTitleResource { ): Screen(state), ScreenWithAuthenticationFab, ScreenWithSnackbar, ScreenWithTitle {
override val titleResource = R.string.diagnose_dom_title override val title = Title.StringResource(R.string.diagnose_dom_title)
} }
} }
@ -78,11 +78,6 @@ interface ScreenWithSnackbar {
val snackbarHostState: SnackbarHostState val snackbarHostState: SnackbarHostState
} }
@Deprecated(message = "Use ScreenWithTitle instead")
interface ScreenWithTitleResource {
val titleResource: Int
}
interface ScreenWithTitle { interface ScreenWithTitle {
val title: Title val title: Title
} }