From a10998d19dab76d6e04d5692eb7aa60203a662fc Mon Sep 17 00:00:00 2001 From: Suhas Dissanayake Date: Thu, 27 Jul 2023 12:05:08 +0530 Subject: [PATCH 1/2] Use seperate app name for debug builds --- app/src/debug/res/values/strings.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 app/src/debug/res/values/strings.xml diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml new file mode 100644 index 000000000..2e5b54b2c --- /dev/null +++ b/app/src/debug/res/values/strings.xml @@ -0,0 +1,20 @@ + + + + Translate You Debug + \ No newline at end of file From 2e92d3726150df7a51aa175027d4232f7840748e Mon Sep 17 00:00:00 2001 From: Suhas Dissanayake Date: Thu, 27 Jul 2023 12:10:45 +0530 Subject: [PATCH 2/2] Create Destination class to store navigation routes --- .../com/bnyro/translate/ui/nav/Destination.kt | 25 +++++++++++++++++++ .../bnyro/translate/ui/nav/NavigationHost.kt | 10 ++++---- .../translate/ui/screens/TranslationPage.kt | 7 +++--- .../bnyro/translate/ui/views/HistoryRow.kt | 3 ++- 4 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 app/src/main/java/com/bnyro/translate/ui/nav/Destination.kt diff --git a/app/src/main/java/com/bnyro/translate/ui/nav/Destination.kt b/app/src/main/java/com/bnyro/translate/ui/nav/Destination.kt new file mode 100644 index 000000000..cfa375883 --- /dev/null +++ b/app/src/main/java/com/bnyro/translate/ui/nav/Destination.kt @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2023 Bnyro + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.bnyro.translate.ui.nav + +sealed class Destination(val route: String) { + object Translate : Destination("translate") + object History : Destination("history") + object Settings : Destination("settings") + object About : Destination("about") +} diff --git a/app/src/main/java/com/bnyro/translate/ui/nav/NavigationHost.kt b/app/src/main/java/com/bnyro/translate/ui/nav/NavigationHost.kt index be189dad2..9ed631c69 100644 --- a/app/src/main/java/com/bnyro/translate/ui/nav/NavigationHost.kt +++ b/app/src/main/java/com/bnyro/translate/ui/nav/NavigationHost.kt @@ -32,17 +32,17 @@ fun NavigationHost( navController: NavHostController, translationModel: TranslationModel ) { - NavHost(navController = navController, "translate") { - composable("translate") { + NavHost(navController = navController, Destination.Translate.route) { + composable(Destination.Translate.route) { TranslationPage(navController, translationModel) } - composable("history") { + composable(Destination.History.route) { HistoryScreen(navController, translationModel) } - composable("settings") { + composable(Destination.Settings.route) { SettingsScreen(navController) } - composable("about") { + composable(Destination.About.route) { AboutPage(navController) } } diff --git a/app/src/main/java/com/bnyro/translate/ui/screens/TranslationPage.kt b/app/src/main/java/com/bnyro/translate/ui/screens/TranslationPage.kt index 6f631a8af..a1cbaf27d 100644 --- a/app/src/main/java/com/bnyro/translate/ui/screens/TranslationPage.kt +++ b/app/src/main/java/com/bnyro/translate/ui/screens/TranslationPage.kt @@ -50,6 +50,7 @@ import com.bnyro.translate.R import com.bnyro.translate.obj.MenuItemData import com.bnyro.translate.ui.components.LanguageSelector import com.bnyro.translate.ui.models.TranslationModel +import com.bnyro.translate.ui.nav.Destination import com.bnyro.translate.ui.views.TopBar import com.bnyro.translate.ui.views.TranslationComponent @@ -77,7 +78,7 @@ fun TranslationPage( ), icon = Icons.Default.Menu ) { - navHostController.navigate("settings") + navHostController.navigate(Destination.Settings.route) }, MenuItemData( text = stringResource( @@ -85,7 +86,7 @@ fun TranslationPage( ), icon = Icons.Default.History ) { - navHostController.navigate("history") + navHostController.navigate(Destination.History.route) }, MenuItemData( text = stringResource( @@ -93,7 +94,7 @@ fun TranslationPage( ), icon = Icons.Default.Info ) { - navHostController.navigate("about") + navHostController.navigate(Destination.About.route) } ) ) diff --git a/app/src/main/java/com/bnyro/translate/ui/views/HistoryRow.kt b/app/src/main/java/com/bnyro/translate/ui/views/HistoryRow.kt index f23e12c31..2257b9cb3 100644 --- a/app/src/main/java/com/bnyro/translate/ui/views/HistoryRow.kt +++ b/app/src/main/java/com/bnyro/translate/ui/views/HistoryRow.kt @@ -45,6 +45,7 @@ import androidx.navigation.NavController import com.bnyro.translate.R import com.bnyro.translate.db.obj.HistoryItem import com.bnyro.translate.ui.models.TranslationModel +import com.bnyro.translate.ui.nav.Destination import com.bnyro.translate.util.Preferences @OptIn(ExperimentalMaterial3Api::class) @@ -63,7 +64,7 @@ fun HistoryRow( showDialog = false translationModel.insertedText = historyItem.insertedText translationModel.translateNow() - navController.navigate("translate") + navController.navigate(Destination.Translate.route) } val compactHistory = Preferences.get(