commit 9024b22b99f94719c8c1c890d9fb4a38624712e1
parent 1f035924996434588ca60327cb148f9f876e3e7c
Author: rhunk <101876869+rhunk@users.noreply.github.com>
Date:   Tue,  9 Apr 2024 23:36:39 +0200

fix(ui): top bar title translation

Diffstat:

Mapp/src/main/kotlin/me/rhunk/snapenhance/ui/manager/Navigation.kt | 3++-


Mapp/src/main/kotlin/me/rhunk/snapenhance/ui/manager/Routes.kt | 4++--


2 files changed, 4 insertions(+), 3 deletions(-)

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
@@ -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
@@ -35,7 +35,7 @@ data class RouteInfo(
     val icon: ImageVector = Icons.Default.Home,
     val primary: Boolean = false,
 ) {
-    var translatedKey: String? = null
+    var translatedKey: Lazy<String?>? = null
     val childIds = mutableListOf<String>()
 }
 
@@ -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