From d46769b0cb0178bac44f1897925167c03110b67f Mon Sep 17 00:00:00 2001 From: Nacho Date: Sat, 26 Jul 2025 22:26:41 +0200 Subject: [PATCH] Added credits for the app in preparation for version 0.1 --- app/build.gradle.kts | 2 +- .../vbhelper/navigation/AppNavigation.kt | 6 +++ .../navigation/BottomNavigationBar.kt | 1 + .../vbhelper/navigation/NavigationItems.kt | 1 + .../screens/homeScreens/BetaWarning.kt | 46 +++++++++++++++++++ .../screens/homeScreens/HomeScreen.kt | 7 +++ .../screens/settingsScreen/CreditsScreen.kt | 40 ++++++++++++++++ .../screens/settingsScreen/SettingsScreen.kt | 5 +- 8 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/BetaWarning.kt create mode 100644 app/src/main/java/com/github/nacabaro/vbhelper/screens/settingsScreen/CreditsScreen.kt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 784ff18..9e700f0 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -15,7 +15,7 @@ android { minSdk = 28 targetSdk = 35 versionCode = 1 - versionName = "1.0" + versionName = "Alpha 0.1" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/navigation/AppNavigation.kt b/app/src/main/java/com/github/nacabaro/vbhelper/navigation/AppNavigation.kt index 35b13d4..b65d72b 100644 --- a/app/src/main/java/com/github/nacabaro/vbhelper/navigation/AppNavigation.kt +++ b/app/src/main/java/com/github/nacabaro/vbhelper/navigation/AppNavigation.kt @@ -23,6 +23,7 @@ import com.github.nacabaro.vbhelper.screens.itemsScreen.ItemsScreenControllerImp import com.github.nacabaro.vbhelper.screens.settingsScreen.SettingsScreenControllerImpl import com.github.nacabaro.vbhelper.screens.adventureScreen.AdventureScreen import com.github.nacabaro.vbhelper.screens.adventureScreen.AdventureScreenControllerImpl +import com.github.nacabaro.vbhelper.screens.settingsScreen.CreditsScreen import com.github.nacabaro.vbhelper.screens.storageScreen.StorageScreenControllerImpl data class AppNavigationHandlers( @@ -125,6 +126,11 @@ fun AppNavigation( .adventureScreenController ) } + composable(NavigationItems.Credits.route) { + CreditsScreen( + navController = navController + ) + } } } } diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/navigation/BottomNavigationBar.kt b/app/src/main/java/com/github/nacabaro/vbhelper/navigation/BottomNavigationBar.kt index fa905ab..52560c1 100644 --- a/app/src/main/java/com/github/nacabaro/vbhelper/navigation/BottomNavigationBar.kt +++ b/app/src/main/java/com/github/nacabaro/vbhelper/navigation/BottomNavigationBar.kt @@ -19,6 +19,7 @@ fun BottomNavigationBar(navController: NavController) { NavigationItems.Dex, NavigationItems.Storage, ) + NavigationBar { val currentBackStackEntry = navController.currentBackStackEntryAsState() val currentRoute = currentBackStackEntry.value?.destination?.route diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/navigation/NavigationItems.kt b/app/src/main/java/com/github/nacabaro/vbhelper/navigation/NavigationItems.kt index 59140f1..623ae8a 100644 --- a/app/src/main/java/com/github/nacabaro/vbhelper/navigation/NavigationItems.kt +++ b/app/src/main/java/com/github/nacabaro/vbhelper/navigation/NavigationItems.kt @@ -20,4 +20,5 @@ sealed class NavigationItems ( object ItemsStore : NavigationItems("ItemsStore", R.drawable.baseline_data_24, "Items store") object ApplyItem : NavigationItems("ApplyItem/{itemId}", R.drawable.baseline_data_24, "Apply item") object Adventure : NavigationItems("Adventure", R.drawable.baseline_fort_24, "Adventure") + object Credits : NavigationItems("Credits", R.drawable.baseline_data_24, "Credits") } \ No newline at end of file diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/BetaWarning.kt b/app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/BetaWarning.kt new file mode 100644 index 0000000..ff62f8e --- /dev/null +++ b/app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/BetaWarning.kt @@ -0,0 +1,46 @@ +package com.github.nacabaro.vbhelper.screens.homeScreens + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.Dialog + +@Composable +fun BetaWarning( + onDismissRequest: () -> Unit +) { + Dialog( + onDismissRequest = onDismissRequest + ) { + Card { + Column ( + modifier = Modifier + .padding(16.dp) + ) { + Text( + text = "This application is currently in alpha and it is not complete. Do not use to store important characters for you, as any future updates might delete all your characters. Sorry for the inconvenience!" + ) + Spacer(modifier = Modifier.padding(8.dp)) + Text( + text = "Also, this application does not work yet with the original VB." + ) + Spacer(modifier = Modifier.padding(8.dp)) + Text( + text = "Thank you for your understanding and patience. Sincerely, the dev team." + ) + Spacer(modifier = Modifier.padding(8.dp)) + Button( + onClick = onDismissRequest + ) { + Text(text = "Dismiss") + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/HomeScreen.kt b/app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/HomeScreen.kt index e038cbc..26931ad 100644 --- a/app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/HomeScreen.kt +++ b/app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/HomeScreen.kt @@ -46,6 +46,7 @@ fun HomeScreen( val beData = remember { mutableStateOf(null) } val vbData = remember { mutableStateOf(null) } var adventureMissionsFinished by rememberSaveable { mutableStateOf(false) } + var betaWarning by rememberSaveable { mutableStateOf(true) } LaunchedEffect(storageRepository, activeMon) { withContext(Dispatchers.IO) { @@ -140,6 +141,12 @@ fun HomeScreen( } } } + + if (betaWarning) { + BetaWarning { + betaWarning = false + } + } } diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/screens/settingsScreen/CreditsScreen.kt b/app/src/main/java/com/github/nacabaro/vbhelper/screens/settingsScreen/CreditsScreen.kt new file mode 100644 index 0000000..c57a0a1 --- /dev/null +++ b/app/src/main/java/com/github/nacabaro/vbhelper/screens/settingsScreen/CreditsScreen.kt @@ -0,0 +1,40 @@ +package com.github.nacabaro.vbhelper.screens.settingsScreen + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Scaffold +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.navigation.NavController +import com.github.nacabaro.vbhelper.components.TopBanner + +@Composable +fun CreditsScreen( + navController: NavController +) { + Scaffold ( + topBar = { + TopBanner( + text = "Credits", + onBackClick = { + navController.popBackStack() + } + ) + }, + modifier = Modifier + .fillMaxSize() + ) { contentPadding -> + Column ( + modifier = Modifier + .padding(top = contentPadding.calculateTopPadding()) + ) { + SettingsSection("Reverse engineering") + SettingsEntry(title = "cyanic", description = "Reversed the firmware and helped us during development.") { } + SettingsSection("Application development") + SettingsEntry(title = "cfogrady", description = "Developed vb-lib-nfc and part of this application.") { } + SettingsEntry(title = "nacabaro", description = "Developed this application.") { } + SettingsEntry(title = "lightheel", description = "Developing the battling part for this application, including server. Still in the works.") { } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/screens/settingsScreen/SettingsScreen.kt b/app/src/main/java/com/github/nacabaro/vbhelper/screens/settingsScreen/SettingsScreen.kt index 2265a4d..47ad33f 100644 --- a/app/src/main/java/com/github/nacabaro/vbhelper/screens/settingsScreen/SettingsScreen.kt +++ b/app/src/main/java/com/github/nacabaro/vbhelper/screens/settingsScreen/SettingsScreen.kt @@ -18,6 +18,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.navigation.NavController import com.github.nacabaro.vbhelper.components.TopBanner +import com.github.nacabaro.vbhelper.navigation.NavigationItems @Composable fun SettingsScreen( @@ -52,7 +53,9 @@ fun SettingsScreen( } SettingsEntry(title = "Rename DiM/BEm", description = "Set card name") { } SettingsSection("About and credits") - SettingsEntry(title = "Credits", description = "Credits") { } + SettingsEntry(title = "Credits", description = "Credits") { + navController.navigate(NavigationItems.Credits.route) + } SettingsEntry(title = "About", description = "About") { } SettingsSection("Data management") SettingsEntry(title = "Export data", description = "Export application database") {