diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/Navigation.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/Navigation.kt index 2ab90ae4..850f6645 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/Navigation.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/Navigation.kt @@ -41,7 +41,8 @@ class Navigation( } == true } TopAppBar(title = { - routes.getCurrentRoute(navBackStackEntry)?.title?.invoke() ?: Text(text = routes.getCurrentRoute(navBackStackEntry)?.routeInfo?.translatedKey ?: "Unknown Page") + val currentRoute = routes.getCurrentRoute(navBackStackEntry) + currentRoute?.title?.invoke() ?: Text(text = currentRoute?.routeInfo?.translatedKey?.value ?: "Unknown Page") }, navigationIcon = { val backButtonAnimation by animateFloatAsState(if (canGoBack) 1f else 0f, label = "backButtonAnimation" diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/Routes.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/Routes.kt index c4012dab..2fe375b2 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/Routes.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/Routes.kt @@ -35,7 +35,7 @@ data class RouteInfo( val icon: ImageVector = Icons.Default.Home, val primary: Boolean = false, ) { - var translatedKey: String? = null + var translatedKey: Lazy? = null val childIds = mutableListOf() } @@ -132,7 +132,7 @@ class Routes( this.routeInfo = routeInfo routes = this@Routes context = this@Routes.context - this.routeInfo.translatedKey = context.translation.getOrNull("manager.routes.${route.routeInfo.key.substringBefore("/")}") + this.routeInfo.translatedKey = lazy { context.translation.getOrNull("manager.routes.${route.routeInfo.key.substringBefore("/")}") } } routes.add(route) return route