From 0be972c05f57de6c616809733226adf498e0e714 Mon Sep 17 00:00:00 2001 From: Jonas Lochmann Date: Mon, 27 Feb 2023 01:00:00 +0100 Subject: [PATCH] Remove ScreenWithTitleResource --- .../main/java/io/timelimit/android/ui/MainActivity.kt | 1 - .../main/java/io/timelimit/android/ui/model/Screen.kt | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/io/timelimit/android/ui/MainActivity.kt b/app/src/main/java/io/timelimit/android/ui/MainActivity.kt index 33d70a4..9cedf9f 100644 --- a/app/src/main/java/io/timelimit/android/ui/MainActivity.kt +++ b/app/src/main/java/io/timelimit/android/ui/MainActivity.kt @@ -262,7 +262,6 @@ class MainActivity : AppCompatActivity(), ActivityViewModelHolder, U2fManager.De }.asFlow().collectAsState(initial = null) val screenTitle = when (screen) { - is ScreenWithTitleResource -> stringResource(screen.titleResource) is ScreenWithTitle -> when (val title = screen.title) { is Title.Plain -> title.text is Title.StringResource -> stringResource(title.id) diff --git a/app/src/main/java/io/timelimit/android/ui/model/Screen.kt b/app/src/main/java/io/timelimit/android/ui/model/Screen.kt index 6d8a80c..397302e 100644 --- a/app/src/main/java/io/timelimit/android/ui/model/Screen.kt +++ b/app/src/main/java/io/timelimit/android/ui/model/Screen.kt @@ -68,8 +68,8 @@ sealed class Screen( state: State, val content: DeviceOwnerHandling.OwnerScreen, override val snackbarHostState: SnackbarHostState - ): Screen(state), ScreenWithAuthenticationFab, ScreenWithSnackbar, ScreenWithTitleResource { - override val titleResource = R.string.diagnose_dom_title + ): Screen(state), ScreenWithAuthenticationFab, ScreenWithSnackbar, ScreenWithTitle { + override val title = Title.StringResource(R.string.diagnose_dom_title) } } @@ -78,11 +78,6 @@ interface ScreenWithSnackbar { val snackbarHostState: SnackbarHostState } -@Deprecated(message = "Use ScreenWithTitle instead") -interface ScreenWithTitleResource { - val titleResource: Int -} - interface ScreenWithTitle { val title: Title }