Navigation.kt: Fixed crash on release build.

This commit is contained in:
acclorite 2024-06-20 15:36:24 +03:00
parent 99de280c56
commit 5804a69ce2

View file

@ -7,6 +7,7 @@ import android.os.Parcelable
import androidx.activity.ComponentActivity import androidx.activity.ComponentActivity
import androidx.activity.compose.BackHandler import androidx.activity.compose.BackHandler
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.annotation.Keep
import androidx.compose.animation.EnterTransition import androidx.compose.animation.EnterTransition
import androidx.compose.animation.ExitTransition import androidx.compose.animation.ExitTransition
import androidx.compose.foundation.background import androidx.compose.foundation.background
@ -68,57 +69,73 @@ val LocalNavigator = compositionLocalOf<Navigator> {
*/ */
@Immutable @Immutable
@Parcelize @Parcelize
@Keep
sealed class Screen : Parcelable { sealed class Screen : Parcelable {
@Parcelize @Parcelize
@Keep
data object Library : Screen() data object Library : Screen()
@Parcelize @Parcelize
@Keep
data object History : Screen() data object History : Screen()
@Parcelize @Parcelize
@Keep
data object Browse : Screen() data object Browse : Screen()
@Parcelize @Parcelize
@Keep
data class BookInfo( data class BookInfo(
val bookId: Int val bookId: Int
) : Screen() ) : Screen()
@Parcelize @Parcelize
@Keep
data class Reader( data class Reader(
val bookId: Int val bookId: Int
) : Screen() ) : Screen()
@Parcelize @Parcelize
@Keep
data object Settings : Screen() { data object Settings : Screen() {
@Parcelize @Parcelize
@Keep
data object General : Screen() data object General : Screen()
@Parcelize @Parcelize
@Keep
data object Appearance : Screen() data object Appearance : Screen()
@Parcelize @Parcelize
@Keep
data object ReaderSettings : Screen() data object ReaderSettings : Screen()
} }
@Parcelize @Parcelize
@Keep
data object About : Screen() { data object About : Screen() {
@Parcelize @Parcelize
@Keep
data object Licenses : Screen() data object Licenses : Screen()
@Parcelize @Parcelize
@Keep
data class LicenseInfo(val licenseId: String) : Screen() data class LicenseInfo(val licenseId: String) : Screen()
@Parcelize @Parcelize
@Keep
data object Credits : Screen() data object Credits : Screen()
} }
@Parcelize @Parcelize
@Keep
data class Help( data class Help(
val fromStart: Boolean val fromStart: Boolean
) : Screen() ) : Screen()
@Parcelize @Parcelize
@Keep
data object Start : Screen() data object Start : Screen()
} }
@ -167,12 +184,18 @@ class Navigator @AssistedInject constructor(
/** /**
* Retrieves screen that was put via [putScreen]. * Retrieves screen that was put via [putScreen].
* *
* @exception ClassCastException throws an exception if could not cast saved screen as [S].
* @exception Exception if there is no such screen saved that specified in [S], throws an [Exception]. * @exception Exception if there is no such screen saved that specified in [S], throws an [Exception].
*/ */
inline fun <reified S : Screen> retrieveScreen(): S { inline fun <reified S : Screen> retrieveScreen(): S {
for (arg in screens.value) { for (arg in screens.value) {
if (arg.getRoute() == getRoute<S>()) { if (arg.getRoute() == getRoute<S>()) {
return arg as S println("Arg route: ${arg.getRoute()}")
println("Screen route: ${getRoute<S>()}")
val screen = arg as? S
?: throw ClassCastException("Cannot cast ${arg::class} as ${S::class}")
return screen
} }
} }