Set app name - Activity title

greenart7c3 · Nov 8, 2024 · 6a46977 · 6a46977
1 parent 767ff14
commit 6a46977
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/MainScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/MainScreen.kt
@@ -545,10 +545,21 @@ fun MainScreen(
                 title = {
                     var title by remember { mutableStateOf(routes.find { it.route.startsWith(destinationRoute) }?.title ?: "") }
                     LaunchedEffect(destinationRoute) {
-                        if (destinationRoute.startsWith("Permission/")) {
+                        if (destinationRoute.startsWith("Permission/") || destinationRoute.startsWith("Activity/")) {
                             launch(Dispatchers.IO) {
                                 navBackStackEntry?.arguments?.getString("packageName")?.let { packageName ->
-                                    title = database.applicationDao().getByKey(packageName)?.application?.name ?: packageName
+                                    title = if (destinationRoute.startsWith("Activity/")) {
+                                        "${database.applicationDao().getByKey(packageName)?.application?.name ?: packageName} - ${routes.find { it.route.startsWith(destinationRoute) }?.title}"
+                                    } else {
+                                        database.applicationDao().getByKey(packageName)?.application?.name ?: packageName
+                                    }
+                                }
+                                navBackStackEntry?.arguments?.getString("key")?.let { packageName ->
+                                    title = if (destinationRoute.startsWith("Activity/")) {
+                                        "${database.applicationDao().getByKey(packageName)?.application?.name ?: packageName} - ${routes.find { it.route.startsWith(destinationRoute) }?.title}"
+                                    } else {
+                                        database.applicationDao().getByKey(packageName)?.application?.name ?: packageName
+                                    }
                                 }
                             }
                         } else {
@@ -900,7 +911,8 @@ fun MainScreen(
                             modifier =
                             Modifier
                                 .fillMaxSize()
-                                .padding(padding),
+                                .padding(padding)
+                                .padding(40.dp),
                         )
                     }
                 },