More things

- Active characters display different - Adventure missions award credits (same as special missions) - Clicking on about will open the github page - Corrected from arean to arena - Removed rename from the settings (it was not used)
Might be incomplete uhhh
2026-01-27 16:05:32 +00:00 · 2025-11-16 21:59:08 +00:00 · 2025-11-16 21:13:28 +01:00
16 changed files with 95 additions and 40 deletions
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@ -15,7 +15,7 @@ android {
        minSdk = 28
        targetSdk = 35
        versionCode = 1
-        versionName = "Alpha 0.6.1"
+        versionName = "Alpha 0.6.2"

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
    }
--- a/app/src/main/java/com/github/nacabaro/vbhelper/components/CharacterEntry.kt
+++ b/app/src/main/java/com/github/nacabaro/vbhelper/components/CharacterEntry.kt
@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.Card
+import androidx.compose.material3.CardColors
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@ -44,6 +45,9 @@ fun CharacterEntry(
    disabled: Boolean = false,
    shape: Shape = MaterialTheme.shapes.medium,
    multiplier: Int = 4,
+    cardColors: CardColors = CardDefaults.cardColors(
+        containerColor = MaterialTheme.colorScheme.surfaceContainerHighest
+    ),
    onClick: () -> Unit = {  }
 ) {
    val bitmap = remember (icon.bitmap) {
@ -61,7 +65,8 @@ fun CharacterEntry(
        },
        modifier = modifier
            .aspectRatio(1f)
-            .padding(8.dp)
+            .padding(8.dp),
+        colors = cardColors
    ) {
        Box(
            contentAlignment = Alignment.BottomCenter,
--- a/app/src/main/java/com/github/nacabaro/vbhelper/daos/AdventureDao.kt
+++ b/app/src/main/java/com/github/nacabaro/vbhelper/daos/AdventureDao.kt
@ -3,6 +3,7 @@ package com.github.nacabaro.vbhelper.daos
 import androidx.room.Dao
 import androidx.room.Query
 import com.github.nacabaro.vbhelper.dtos.CharacterDtos
+import kotlinx.coroutines.flow.Flow


@Dao
@ -37,7 +38,7 @@ interface AdventureDao {
        JOIN Adventure a ON uc.id = a.characterId
    """
    )
-    suspend fun getAdventureCharacters(): List<CharacterDtos.AdventureCharacterWithSprites>
+    fun getAdventureCharacters(): Flow<List<CharacterDtos.AdventureCharacterWithSprites>>

    @Query("""
        DELETE FROM Adventure
--- a/app/src/main/java/com/github/nacabaro/vbhelper/daos/UserCharacterDao.kt
+++ b/app/src/main/java/com/github/nacabaro/vbhelper/daos/UserCharacterDao.kt
@ -69,7 +69,8 @@ interface UserCharacterDao {
            c.nameWidth as nameSpriteWidth,
            c.nameHeight as nameSpriteHeight,
            d.isBEm as isBemCard,
-            a.characterId = uc.id as isInAdventure
+            a.characterId = uc.id as isInAdventure,
+            uc.isActive as active
        FROM UserCharacter uc
        JOIN CardCharacter c ON uc.charId = c.id
        JOIN Card d ON  d.id = c.cardId
@ -93,7 +94,8 @@ interface UserCharacterDao {
            c.nameWidth as nameSpriteWidth,
            c.nameHeight as nameSpriteHeight,
            d.isBEm as isBemCard,
-            a.characterId = uc.id as isInAdventure
+            a.characterId = uc.id as isInAdventure,
+            uc.isActive as active
        FROM UserCharacter uc
        JOIN CardCharacter c ON uc.charId = c.id
        JOIN Card d ON c.cardId = d.id
@ -130,7 +132,8 @@ interface UserCharacterDao {
            c.nameWidth as nameSpriteWidth,
            c.nameHeight as nameSpriteHeight,
            d.isBEm as isBemCard,
-            a.characterId as isInAdventure            
+            a.characterId as isInAdventure,
+            uc.isActive as active
        FROM UserCharacter uc
        JOIN CardCharacter c ON uc.charId = c.id
        JOIN Card d ON c.cardId = d.id
@ -194,7 +197,8 @@ interface UserCharacterDao {
            c.nameWidth as nameSpriteWidth,
            c.nameHeight as nameSpriteHeight,
            d.isBEm as isBemCard,
-            a.characterId = uc.id as isInAdventure
+            a.characterId = uc.id as isInAdventure,
+            uc.isActive as active
        FROM UserCharacter uc
        JOIN CardCharacter c ON uc.charId = c.id
        JOIN Card d ON  d.id = c.cardId
@ -219,7 +223,8 @@ interface UserCharacterDao {
            c.nameWidth as nameSpriteWidth,
            c.nameHeight as nameSpriteHeight,
            d.isBEm as isBemCard,
-            a.characterId = uc.id as isInAdventure
+            a.characterId = uc.id as isInAdventure,
+            uc.isActive as active
        FROM UserCharacter uc
        JOIN CardCharacter c ON uc.charId = c.id
        JOIN Card d ON  d.id = c.cardId
--- a/app/src/main/java/com/github/nacabaro/vbhelper/dtos/CharacterDtos.kt
+++ b/app/src/main/java/com/github/nacabaro/vbhelper/dtos/CharacterDtos.kt
@ -31,7 +31,8 @@ object CharacterDtos {
        val nameSpriteWidth: Int,
        val nameSpriteHeight: Int,
        val isBemCard: Boolean,
-        val isInAdventure: Boolean
+        val isInAdventure: Boolean,
+        val active: Boolean
    )

    data class CardCharacterInfo(
--- a/app/src/main/java/com/github/nacabaro/vbhelper/screens/adventureScreen/AdventureScreen.kt
+++ b/app/src/main/java/com/github/nacabaro/vbhelper/screens/adventureScreen/AdventureScreen.kt
@ -9,12 +9,11 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@ -29,7 +28,6 @@ import com.github.nacabaro.vbhelper.navigation.NavigationItems
 import com.github.nacabaro.vbhelper.source.StorageRepository
 import com.github.nacabaro.vbhelper.utils.BitmapData
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 import java.time.Instant

@Composable
@ -37,16 +35,17 @@ fun AdventureScreen(
    navController: NavController,
    storageScreenController: AdventureScreenControllerImpl
 ) {
-    val coroutineScope = rememberCoroutineScope()
    val application = LocalContext.current.applicationContext as VBHelper
    val database = application.container.db
    val storageRepository = StorageRepository(database)
-    val characterList = remember {
-        mutableStateOf<List<CharacterDtos.AdventureCharacterWithSprites>>(emptyList())
-    }
+    val characterList by storageRepository.getAdventureCharacters().collectAsState(emptyList())
+
    var obtainedItem by remember {
        mutableStateOf<ItemDtos.PurchasedItem?>(null)
    }
+    var obtainedCurrency by remember {
+        mutableStateOf(0)
+    }

    val currentTime by produceState(initialValue = Instant.now().epochSecond) {
        while (true) {
@ -59,13 +58,6 @@ fun AdventureScreen(
        mutableStateOf<CharacterDtos.AdventureCharacterWithSprites?>(null)
    }

-    LaunchedEffect(storageRepository) {
-        coroutineScope.launch {
-            characterList.value = storageRepository
-                .getAdventureCharacters()
-        }
-    }
-
    Scaffold(
        topBar = {
            TopBanner(
@ -76,7 +68,7 @@ fun AdventureScreen(
            )
        }
    ) { contentPadding ->
-        if (characterList.value.isEmpty()) {
+        if (characterList.isEmpty()) {
            Column(
                verticalArrangement = Arrangement.Center,
                horizontalAlignment = Alignment.CenterHorizontally,
@ -91,7 +83,7 @@ fun AdventureScreen(
                modifier = Modifier
                    .padding(top = contentPadding.calculateTopPadding())
            ) {
-                items(characterList.value) {
+                items(characterList) {
                    AdventureEntry(
                        icon = BitmapData(
                            bitmap = it.spriteIdle,
@ -102,8 +94,9 @@ fun AdventureScreen(
                        onClick = {
                            if (it.finishesAdventure < currentTime) {
                                storageScreenController
-                                    .getItemFromAdventure(it.id) { adventureResult ->
+                                    .getItemFromAdventure(it.id) { adventureResult, generatedCurrency ->
                                        obtainedItem = adventureResult
+                                        obtainedCurrency = generatedCurrency
                                    }
                            } else {
                                cancelAdventureDialog = it
@ -118,6 +111,7 @@ fun AdventureScreen(
    if (obtainedItem != null) {
        ObtainedItemDialog(
            obtainedItem = obtainedItem!!,
+            obtainedCurrency = obtainedCurrency,
            onClickDismiss = {
                obtainedItem = null
            }
--- a/app/src/main/java/com/github/nacabaro/vbhelper/screens/adventureScreen/AdventureScreenController.kt
+++ b/app/src/main/java/com/github/nacabaro/vbhelper/screens/adventureScreen/AdventureScreenController.kt
@ -4,6 +4,6 @@ import com.github.nacabaro.vbhelper.dtos.ItemDtos

 interface AdventureScreenController {
    fun sendCharacterToAdventure(characterId: Long, timeInMinutes: Long)
-    fun getItemFromAdventure(characterId: Long, onResult: (ItemDtos.PurchasedItem) -> Unit)
+    fun getItemFromAdventure(characterId: Long, onResult: (ItemDtos.PurchasedItem, Int) -> Unit)
    fun cancelAdventure(characterId: Long, onResult: () -> Unit)
 }
--- a/app/src/main/java/com/github/nacabaro/vbhelper/screens/adventureScreen/AdventureScreenControllerImpl.kt
+++ b/app/src/main/java/com/github/nacabaro/vbhelper/screens/adventureScreen/AdventureScreenControllerImpl.kt
@ -38,19 +38,29 @@ class AdventureScreenControllerImpl(

    override fun getItemFromAdventure(
        characterId: Long,
-        onResult: (ItemDtos.PurchasedItem) -> Unit
+        onResult: (ItemDtos.PurchasedItem, Int) -> Unit
    ) {
        componentActivity.lifecycleScope.launch(Dispatchers.IO) {
            database
                .adventureDao()
                .deleteAdventure(characterId)

+            val generatedCurrency = generateRandomCurrency()
+
            val generatedItem = generateItem(characterId)

-            onResult(generatedItem)
+            onResult(generatedItem, generatedCurrency)
        }
    }

+    private suspend fun generateRandomCurrency(): Int {
+        val currentValue = application.container.currencyRepository.currencyValue.first()
+        val random = (2..6).random() * 1000
+        application.container.currencyRepository.setCurrencyValue(currentValue + random)
+
+        return random
+    }
+
    override fun cancelAdventure(characterId: Long, onResult: () -> Unit) {
        componentActivity.lifecycleScope.launch(Dispatchers.IO) {
            database
--- 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
@ -55,6 +55,7 @@ fun HomeScreen(
    var adventureMissionsFinished by rememberSaveable { mutableStateOf(false) }
    var betaWarning by rememberSaveable { mutableStateOf(true) }
    var collectedItem by remember { mutableStateOf<ItemDtos.PurchasedItem?>(null) }
+    var collectedCurrency by remember { mutableStateOf<Int?>(null) }

    LaunchedEffect(storageRepository, activeMon, collectedItem) {
        withContext(Dispatchers.IO) {
@ -123,8 +124,9 @@ fun HomeScreen(
                    contentPadding = contentPadding,
                    specialMissions = vbSpecialMissions.value,
                    homeScreenController = homeScreenController,
-                    onClickCollect = { item ->
+                    onClickCollect = { item, currency ->
                        collectedItem = item
+                        collectedCurrency = currency
                    }
                )
            }
@ -134,8 +136,10 @@ fun HomeScreen(
    if (collectedItem != null) {
        ObtainedItemDialog(
            obtainedItem = collectedItem!!,
+            obtainedCurrency = collectedCurrency!!,
            onClickDismiss = {
                collectedItem = null
+                collectedCurrency = null
            }
        )
    }
--- a/app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/HomeScreenController.kt
+++ b/app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/HomeScreenController.kt
@ -5,5 +5,5 @@ import com.github.nacabaro.vbhelper.dtos.ItemDtos

 interface HomeScreenController {
    fun didAdventureMissionsFinish(onCompletion: (Boolean) -> Unit)
-    fun clearSpecialMission(missionId: Long, missionCompletion: SpecialMission.Status, onCleared: (ItemDtos.PurchasedItem?) -> Unit)
+    fun clearSpecialMission(missionId: Long, missionCompletion: SpecialMission.Status, onCleared: (ItemDtos.PurchasedItem?, Int?) -> Unit)
 }
--- a/app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/HomeScreenControllerImpl.kt
+++ b/app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/HomeScreenControllerImpl.kt
@ -23,6 +23,7 @@ class HomeScreenControllerImpl(
            val adventureCharacters = database
                .adventureDao()
                .getAdventureCharacters()
+                .first()

            val finishedAdventureCharacters = adventureCharacters.filter { character ->
                character.finishesAdventure <= currentTime
@ -32,7 +33,7 @@ class HomeScreenControllerImpl(
        }
    }

-    override fun clearSpecialMission(missionId: Long, missionCompletion: SpecialMission.Status, onCleared: (ItemDtos.PurchasedItem?) -> Unit) {
+    override fun clearSpecialMission(missionId: Long, missionCompletion: SpecialMission.Status, onCleared: (ItemDtos.PurchasedItem?, Int?) -> Unit) {
        componentActivity.lifecycleScope.launch {
            database
                .specialMissionDao()
@ -64,9 +65,13 @@ class HomeScreenControllerImpl(
                    itemType = randomItem.itemType
                )

-                onCleared(purchasedItem)
+                val randomAmount = (2..6).random() * 1000
+                val currentCurrency = application.container.currencyRepository.currencyValue.first()
+                application.container.currencyRepository.setCurrencyValue(currentCurrency + randomAmount)
+
+                onCleared(purchasedItem, randomAmount)
            } else {
-                onCleared(null)
+                onCleared(null, null)
            }

        }
--- a/app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/screens/VBDiMHomeScreen.kt
+++ b/app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/screens/VBDiMHomeScreen.kt
@ -34,7 +34,7 @@ fun VBDiMHomeScreen(
    homeScreenController: HomeScreenControllerImpl,
    transformationHistory: List<CharacterDtos.TransformationHistory>,
    contentPadding: PaddingValues,
-    onClickCollect: (ItemDtos.PurchasedItem?) -> Unit
+    onClickCollect: (ItemDtos.PurchasedItem?, Int?) -> Unit
 ) {
    Column(
        modifier = Modifier
--- a/app/src/main/java/com/github/nacabaro/vbhelper/screens/itemsScreen/ObtainedItemDialog.kt
+++ b/app/src/main/java/com/github/nacabaro/vbhelper/screens/itemsScreen/ObtainedItemDialog.kt
@ -23,6 +23,7 @@ import com.github.nacabaro.vbhelper.dtos.ItemDtos
@Composable
 fun ObtainedItemDialog(
    obtainedItem: ItemDtos.PurchasedItem,
+    obtainedCurrency: Int,
    onClickDismiss: () -> Unit
 ) {
    Dialog(
@ -84,7 +85,16 @@ fun ObtainedItemDialog(
                        text = "You have obtained ${obtainedItem.itemAmount} of this item",
                        modifier = Modifier
                            .fillMaxWidth()
-                            .padding(5.dp)
+                            .padding(top = 4.dp)
+                    )
+                    Text(
+                        textAlign = TextAlign.Center,
+                        fontSize = MaterialTheme.typography.bodySmall.fontSize,
+                        fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
+                        text = "You also got $obtainedCurrency credits",
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(bottom = 4.dp)
                    )
                    Button(
                        onClick = onClickDismiss,
--- 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
@ -1,5 +1,7 @@
 package com.github.nacabaro.vbhelper.screens.settingsScreen

+import android.content.Intent
+import android.net.Uri
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@ -13,6 +15,7 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@ -25,6 +28,8 @@ fun SettingsScreen(
    navController: NavController,
    settingsScreenController: SettingsScreenControllerImpl,
 ) {
+    val context = LocalContext.current
+
    Scaffold (
        topBar = {
            TopBanner(
@ -44,19 +49,22 @@ fun SettingsScreen(
                .verticalScroll(rememberScrollState())
        ) {
            SettingsSection("NFC Communication")
-            SettingsEntry(title = "Import APK", description = "Import Secrets From Vital Arean 2.1.0 APK") {
+            SettingsEntry(title = "Import APK", description = "Import Secrets From Vital Arena 2.1.0 APK") {
                settingsScreenController.onClickImportApk()
            }
            SettingsSection("DiM/BEm management")
            SettingsEntry(title = "Import card", description = "Import DiM/BEm card file") {
                settingsScreenController.onClickImportCard()
            }
-            SettingsEntry(title = "Rename DiM/BEm", description = "Set card name") { }
            SettingsSection("About and credits")
            SettingsEntry(title = "Credits", description = "Credits") {
                navController.navigate(NavigationItems.Credits.route)
            }
-            SettingsEntry(title = "About", description = "About") { }
+            SettingsEntry(title = "About", description = "About") {
+                val browserIntent = Intent(
+                    Intent.ACTION_VIEW, Uri.parse("https://github.com/nacabaro/vbhelper/"))
+                context.startActivity(browserIntent)
+            }
            SettingsSection("Data management")
            SettingsEntry(title = "Export data", description = "Export application database") {
                settingsScreenController.onClickOpenDirectory()
--- a/app/src/main/java/com/github/nacabaro/vbhelper/screens/storageScreen/StorageScreen.kt
+++ b/app/src/main/java/com/github/nacabaro/vbhelper/screens/storageScreen/StorageScreen.kt
@ -12,6 +12,8 @@ import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@ -98,6 +100,16 @@ fun StorageScreen(
                                )
                            }
                        },
+                        cardColors = if (index.active) {
+                            CardDefaults.cardColors(
+                                containerColor = MaterialTheme.colorScheme.primary
+                            )
+                        } else {
+                            CardDefaults.cardColors(
+                                containerColor = MaterialTheme.colorScheme.surfaceContainerHighest
+                            )
+                        }
+
                    )
                }
            }
--- a/app/src/main/java/com/github/nacabaro/vbhelper/source/StorageRepository.kt
+++ b/app/src/main/java/com/github/nacabaro/vbhelper/source/StorageRepository.kt
@ -47,7 +47,7 @@ class StorageRepository (
        return db.userCharacterDao().deleteCharacterById(id)
    }

-    suspend fun getAdventureCharacters(): List<CharacterDtos.AdventureCharacterWithSprites> {
+    fun getAdventureCharacters(): Flow<List<CharacterDtos.AdventureCharacterWithSprites>> {
        return db.adventureDao().getAdventureCharacters()
    }