README.md

@@ -1,69 +1,38 @@
 # VBHelper
 
-Application to interact with the Vital series, VB, VH, VBC and VBBE.
+## Developer Setup
 
-## Current state of the project
-
-Right now the project is still under development, and until further notice, any database updates will result in having to erase application data.
-
-This document will be updated once the application does not need any more database resets.
-
-## Features
-
-As of now, the project allows you to read characters, view characters stats, and send them back to your watch. 
-
-You can also apply items to the characters read, such as special missions, or change timers, and store characters in the storage section.
-
-You also earn new items every time an item such as a special mission (VB only) or a character completes an in-app adventure mission.
-
-App also comes with a dex that will update every time a new character is added, and allows you to see evolution requirements and current adventure stage in the watch.
-
-## How to set up
-
-1. Download the latest version for VB Arena APK from a trustworthy source. If your download is a standalone APK, continue to step 2. Otherwise, if your download is an XAPK, do the following:
-
-    1. Using your phone file manager, rename the XAPK file to ZIP, and extract its contents. You can also do this with any other device, such as Windows, macOS and Linux. 
-
-    2. Once the files are extracted, look for an APK called `com.bandai.vitalbraceletarena.apk`. Copy it somewhere else, you will need it.
-
-2. Install an APK release for VB Arena. You will find the releases [here](http://github.com/nacabaro/vbhelper/releases). Download the latest release and install its APK.
-
-    Note, in the current stage of the project, you will have to delete the old application from your device. If the app keeps crashing after installing, clear application data and storage.
-
-3. Import secrets in the app. These secrets will allow the app to talk to the watch. On the main screen, click on the gear icon, then `Import secrets`.
-    
-    You will be prompted to choose a file. Choose the APK file that was previously obtained.
-
-4. Import cards. Due to copyright laws, we cannot offer the characters and sprites themselves in the application. In order to import the cards do the following.
-
-    1. Using your own DiM/BEm cards, dump the cards to your device. You can get an in-depth tutorial in [here](http://mrblinky.net/digimon/vb/dimcardtool/dimcardtool.html). You can download the dump tool from [here](http://mrblinky.net/digimon/vb/dimcardtool/)
-
-    2. Once installed the tool and drivers, open the tool, connect your DiM/BEm reader hardware to yout computer and click on Read card.
-
-    3. Transfer the resulting file to your mobile device. You can put them anywhere, as long as they are accessible. My recommendation is to put them under a folder called `Cards` in your `Internal storage` or `SD Card`
-
-    4. In the app, click on import card. Next choose the BIN file corresponding to the card you want to import.
-
-    **Note: if you do not import the card, whenever you attempt to read a character from th watch, the character you read will get deleted.** 
-
-5. App will now be ready to be used.
-
-## Planned features
-
-- Online battles, undegoing development by `lightheel`.
-
-- VitalWear compatibility, undergoing development by `cfogrady`.
-
-- Support for multiple languages, not yet started.
-
-- Database backup/restore.
-
-## Credits
-
-- `cyanic` for helping us understand more about the VB connection protocol.
-
-- `cfogrady` for making both [`VB-DIM-Reader`](https://github.com/cfogrady/VB-DIM-Reader) and [`lib-vb-nfc`](https://github.com/cfogrady/lib-vb-nfc)
-
-- `lightheel` for working on the online component in the application, both server and battle client.
-
-- `shvstrz` for the app icon.
+1. Clone vb-nfc-reader (https://github.com/cfogrady/lib-vb-nfc)
+2. Run vb-nfc-reader/publishToMavenLocal gradle task in the lib-vb-nfc project.
+3. Clone vb-dim-reader (https://github.com/cfogrady/vb-dim-reader)
+4. Run publishToMavenLocal gradle task in the vb-dim-reader project.
+5. Create res/values/keys.xml within the app module.
+6. Populate with:
+```
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="password1">beHmacKey1</string>
+    <string name="password2">beHmacKey2</string>
+    <string name="decryptionKey">aesKey</string>
+    <integer-array name="substitutionArray">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+        <item>14</item>
+        <item>15</item>
+    </integer-array>
+</resources>
+```
+7. Replace the values in the keys.xml file with those extracted from the original app.
+8. Run

app/build.gradle.kts

@@ -15,7 +15,7 @@ android {
         minSdk = 28
         targetSdk = 35
         versionCode = 1
-        versionName = "Alpha 0.6.3"
+        versionName = "Alpha 0.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -91,5 +91,4 @@ dependencies {
     implementation("com.google.android.material:material:1.2.0")
     implementation(libs.protobuf.javalite)
     implementation("androidx.compose.material:material")
-    implementation("androidx.datastore:datastore-preferences:1.1.7")
 }

app/src/main/java/com/github/nacabaro/vbhelper/MainActivity.kt

@@ -14,7 +14,6 @@ import com.github.nacabaro.vbhelper.screens.itemsScreen.ItemsScreenControllerImp
 import com.github.nacabaro.vbhelper.screens.scanScreen.ScanScreenControllerImpl
 import com.github.nacabaro.vbhelper.screens.settingsScreen.SettingsScreenControllerImpl
 import com.github.nacabaro.vbhelper.screens.adventureScreen.AdventureScreenControllerImpl
-import com.github.nacabaro.vbhelper.screens.cardScreen.CardScreenControllerImpl
 import com.github.nacabaro.vbhelper.screens.spriteViewer.SpriteViewerControllerImpl
 import com.github.nacabaro.vbhelper.screens.storageScreen.StorageScreenControllerImpl
 import com.github.nacabaro.vbhelper.ui.theme.VBHelperTheme
@@ -48,7 +47,6 @@ class MainActivity : ComponentActivity() {
         val storageScreenController = StorageScreenControllerImpl(this)
         val homeScreenController = HomeScreenControllerImpl(this)
         val spriteViewerController = SpriteViewerControllerImpl(this)
-        val cardScreenController = CardScreenControllerImpl(this)
 
         super.onCreate(savedInstanceState)
 
@@ -63,8 +61,7 @@ class MainActivity : ComponentActivity() {
                     adventureScreenController = adventureScreenController,
                     homeScreenController = homeScreenController,
                     storageScreenController = storageScreenController,
-                    spriteViewerController = spriteViewerController,
-                    cardScreenController = cardScreenController
+                    spriteViewerController = spriteViewerController
                 )
             }
         }
@@ -96,8 +93,7 @@ class MainActivity : ComponentActivity() {
         adventureScreenController: AdventureScreenControllerImpl,
         storageScreenController: StorageScreenControllerImpl,
         homeScreenController: HomeScreenControllerImpl,
-        spriteViewerController: SpriteViewerControllerImpl,
-        cardScreenController: CardScreenControllerImpl
+        spriteViewerController: SpriteViewerControllerImpl
         ) {
         AppNavigation(
             applicationNavigationHandlers = AppNavigationHandlers(
@@ -107,8 +103,7 @@ class MainActivity : ComponentActivity() {
                 adventureScreenController,
                 storageScreenController,
                 homeScreenController,
-                spriteViewerController,
-                cardScreenController
+                spriteViewerController
             )
         )
     }

app/src/main/java/com/github/nacabaro/vbhelper/components/CharacterEntry.kt

@@ -5,15 +5,11 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.fillMaxHeight
 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
 import androidx.compose.material3.Text
@@ -32,31 +28,21 @@ import com.github.nacabaro.vbhelper.utils.getBitmap
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.FontWeight
-import com.github.cfogrady.vbnfc.vb.SpecialMission
-import com.github.nacabaro.vbhelper.R
-import com.github.nacabaro.vbhelper.domain.device_data.SpecialMissions
 import com.github.nacabaro.vbhelper.utils.getObscuredBitmap
-import androidx.compose.ui.res.stringResource
-
 
 @Composable
 fun CharacterEntry(
     icon: BitmapData,
     modifier: Modifier = Modifier,
-    cardIcon: BitmapData? = null,
     obscure: Boolean = false,
     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) {
         if(obscure) icon.getObscuredBitmap() else icon.getBitmap()
     }
-    val iconSizeMultiplier = 3
     val imageBitmap = remember(bitmap) { bitmap.asImageBitmap() }
     val density: Float = LocalContext.current.resources.displayMetrics.density
     val dpSize = (icon.width * multiplier / density).dp
@@ -69,8 +55,7 @@ fun CharacterEntry(
         },
         modifier = modifier
             .aspectRatio(1f)
-            .padding(8.dp),
-        colors = cardColors
+            .padding(8.dp)
     ) {
         Box(
             contentAlignment = Alignment.BottomCenter,
@@ -88,24 +73,7 @@ fun CharacterEntry(
                 },
                 modifier = Modifier
                     .size(dpSize)
-                    .align(Alignment.BottomCenter)
             )
-
-            if (cardIcon != null) {
-                val bitmap = remember (icon.bitmap) { cardIcon.getBitmap() }
-                val iconBitmap = remember(bitmap) { bitmap.asImageBitmap() }
-                val dpSize = (icon.width * iconSizeMultiplier /density).dp
-
-                Image(
-                    bitmap = iconBitmap,
-                    contentDescription = "Card icon",
-                    filterQuality = FilterQuality.None,
-                    modifier = Modifier
-                        .size(dpSize)
-                        .align(Alignment.BottomEnd)
-                        .padding(8.dp)
-                )
-            }
         }
     }
 }
@@ -147,116 +115,3 @@ fun ItemDisplay(
         }
     }
 }
-
-@Composable
-fun SpecialMissionsEntry(
-    specialMission: SpecialMissions,
-    modifier: Modifier = Modifier,
-    onClickMission: (Long) -> Unit = {  },
-    onClickCollect: (Long) -> Unit = {  }
-) {
-    val textValue = when (specialMission.missionType) {
-        SpecialMission.Type.NONE -> stringResource(R.string.special_mission_none)
-        SpecialMission.Type.STEPS -> stringResource(
-            R.string.special_mission_steps,
-            specialMission.goal
-        )
-        SpecialMission.Type.BATTLES -> stringResource(
-            R.string.special_mission_battles,
-            specialMission.goal
-        )
-        SpecialMission.Type.WINS -> stringResource(
-            R.string.special_mission_wins,
-            specialMission.goal
-        )
-        SpecialMission.Type.VITALS -> stringResource(
-            R.string.special_mission_vitals,
-            specialMission.goal
-        )
-    }
-
-    val progress = if (specialMission.status == SpecialMission.Status.COMPLETED) {
-        specialMission.goal
-    } else {
-        specialMission.progress
-    }
-
-    val completion = when (specialMission.missionType) {
-        SpecialMission.Type.NONE -> ""
-        SpecialMission.Type.STEPS -> stringResource(
-            R.string.special_mission_steps_progress,
-            progress
-        )
-        SpecialMission.Type.BATTLES -> stringResource(
-            R.string.special_mission_battles_progress,
-            progress
-        )
-        SpecialMission.Type.WINS -> stringResource(
-            R.string.special_mission_wins_progress,
-            progress
-        )
-        SpecialMission.Type.VITALS -> stringResource(
-            R.string.special_mission_vitals_progress,
-            progress
-        )
-    }
-
-    val icon = when (specialMission.missionType) {
-        SpecialMission.Type.NONE -> R.drawable.baseline_free_24
-        SpecialMission.Type.STEPS -> R.drawable.baseline_agility_24
-        SpecialMission.Type.BATTLES -> R.drawable.baseline_swords_24
-        SpecialMission.Type.WINS -> R.drawable.baseline_trophy_24
-        SpecialMission.Type.VITALS -> R.drawable.baseline_vitals_24
-    }
-
-    val color = when (specialMission.status)
-    {
-        SpecialMission.Status.IN_PROGRESS -> MaterialTheme.colorScheme.secondary
-        SpecialMission.Status.COMPLETED -> MaterialTheme.colorScheme.primary
-        SpecialMission.Status.FAILED -> MaterialTheme.colorScheme.error
-        else -> MaterialTheme.colorScheme.surfaceContainerHighest
-    }
-
-    Card(
-        modifier = modifier,
-        shape = androidx.compose.material.MaterialTheme.shapes.small,
-        onClick = if (specialMission.status == SpecialMission.Status.COMPLETED) {
-            { onClickCollect(specialMission.id) }
-        } else if (specialMission.status == SpecialMission.Status.UNAVAILABLE) {
-            { }
-        } else {
-            { onClickMission(specialMission.id) }
-        },
-        colors = CardDefaults.cardColors(
-            containerColor = color
-        )
-
-    ) {
-        Row (
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.spacedBy(8.dp),
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(16.dp)
-        ) {
-            Icon(
-                painter = painterResource(icon),
-                contentDescription = stringResource(R.string.special_mission_icon_content_description),
-                modifier = Modifier
-                    .fillMaxHeight()
-                    .padding(16.dp)
-            )
-            Column {
-                Text(
-                    text = textValue,
-                    fontFamily = MaterialTheme.typography.titleLarge.fontFamily,
-                    fontWeight = FontWeight.Bold,
-                )
-                Text(
-                    text = completion,
-                    fontFamily = MaterialTheme.typography.titleSmall.fontFamily,
-                )
-            }
-        }
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/components/DexDimEntry.kt

@@ -1,4 +1,4 @@
-package com.github.nacabaro.vbhelper.screens.scanScreen.cardSelect
+package com.github.nacabaro.vbhelper.components
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
@@ -21,9 +21,11 @@ import com.github.nacabaro.vbhelper.utils.BitmapData
 import com.github.nacabaro.vbhelper.utils.getBitmap
 
 @Composable
-fun ScanCardEntry(
+fun DexDiMEntry(
     name: String,
     logo: BitmapData,
+    obtainedCharacters: Int,
+    totalCharacters: Int,
     onClick: () -> Unit,
     modifier: Modifier = Modifier
 ) {
@@ -54,12 +56,17 @@ fun ScanCardEntry(
             Column(
                 modifier = Modifier
                     .padding(8.dp)
-                    .weight(1f)
             ) {
                 Text(
                     text = name,
                     modifier = Modifier
                 )
+                Text(
+                    text = "$obtainedCharacters of $totalCharacters characters obtained",
+                    fontFamily = MaterialTheme.typography.labelSmall.fontFamily,
+                    fontSize = MaterialTheme.typography.labelSmall.fontSize,
+                    modifier = Modifier
+                )
             }
         }
     }

app/src/main/java/com/github/nacabaro/vbhelper/components/TopBanner.kt

@@ -24,8 +24,7 @@ fun TopBanner(
     onGearClick: (() -> Unit)? = null,
     onBackClick: (() -> Unit)? = null,
     onScanClick: (() -> Unit)? = null,
-    onAdventureClick: (() -> Unit)? = null,
-    onModifyClick: (() -> Unit)? = null
+    onAdventureClick: (() -> Unit)? = null
 ) {
     Box( // Use Box to overlay elements
         modifier = modifier
@@ -38,16 +37,16 @@ fun TopBanner(
             textAlign = TextAlign.Center,
             fontSize = 24.sp,
             modifier = Modifier
-                .align(Alignment.Center)
+                .align(Alignment.Center) // Center the text
         )
          if (onGearClick != null) {
             IconButton(
                 onClick = onGearClick,
                 modifier = Modifier
-                    .align(Alignment.CenterEnd)
+                    .align(Alignment.CenterEnd) // Place gear icon at the end
             ) {
                 Icon(
-                    painter = painterResource(R.drawable.baseline_settings_24),
+                    painter = painterResource(R.drawable.baseline_settings_24), // Use a gear icon
                     contentDescription = "Settings"
                 )
             }
@@ -55,21 +54,10 @@ fun TopBanner(
             IconButton(
                 onClick = onAdventureClick,
                 modifier = Modifier
-                    .align(Alignment.CenterEnd)
+                    .align(Alignment.CenterEnd) // Place gear icon at the end
             ) {
                 Icon(
-                    painter = painterResource(R.drawable.baseline_fort_24),
-                    contentDescription = "Adventure"
-                )
-            }
-        } else if (onModifyClick != null) {
-             IconButton(
-                 onClick = onModifyClick,
-                 modifier = Modifier
-                     .align(Alignment.CenterEnd)
-             ) {
-                 Icon(
-                     painter = painterResource(R.drawable.baseline_edit_24),
+                    painter = painterResource(R.drawable.baseline_fort_24), // Use a gear icon
                     contentDescription = "Adventure"
                 )
             }
@@ -79,10 +67,10 @@ fun TopBanner(
             IconButton(
                 onClick = onScanClick,
                 modifier = Modifier
-                    .align(Alignment.CenterStart)
+                    .align(Alignment.CenterStart) // Place gear icon at the end
             ) {
                 Icon(
-                    painter = painterResource(R.drawable.baseline_nfc_24),
+                    painter = painterResource(R.drawable.baseline_nfc_24), // Use a gear icon
                     contentDescription = "Scan"
                 )
             }
@@ -90,10 +78,10 @@ fun TopBanner(
             IconButton(
                 onClick = onBackClick,
                 modifier = Modifier
-                    .align(Alignment.CenterStart)
+                    .align(Alignment.CenterStart) // Place gear icon at the end
             ) {
                 Icon(
-                    painter = painterResource(R.drawable.baseline_arrow_back_24),
+                    painter = painterResource(R.drawable.baseline_arrow_back_24), // Use a gear icon
                     contentDescription = "Settings"
                 )
             }

app/src/main/java/com/github/nacabaro/vbhelper/daos/AdventureDao.kt

@@ -3,7 +3,6 @@ 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
@@ -19,8 +18,7 @@ interface AdventureDao {
     """)
     fun getAdventureCount(): Int
 
-    @Query(
-        """
+    @Query("""
         SELECT
             uc.*,
             c.stage,
@@ -32,13 +30,12 @@ interface AdventureDao {
             a.finishesAdventure AS finishesAdventure,
             a.originalDuration AS originalTimeInMinutes
         FROM UserCharacter uc
-        JOIN CardCharacter c ON uc.charId = c.id
+        JOIN Character c ON uc.charId = c.id
         JOIN Sprite s ON s.id = c.spriteId
-        JOIN Card d ON c.cardId = d.id
+        JOIN Card d ON c.dimId = d.id
         JOIN Adventure a ON uc.id = a.characterId
-    """
-    )
-    fun getAdventureCharacters(): Flow<List<CharacterDtos.AdventureCharacterWithSprites>>
+    """)
+    suspend fun getAdventureCharacters(): List<CharacterDtos.AdventureCharacterWithSprites>
 
     @Query("""
         DELETE FROM Adventure

app/src/main/java/com/github/nacabaro/vbhelper/daos/CardAdventureDao.kt

@@ -1,59 +0,0 @@
-package com.github.nacabaro.vbhelper.daos
-
-import androidx.room.Dao
-import androidx.room.Query
-import com.github.nacabaro.vbhelper.dtos.CardDtos
-import kotlinx.coroutines.flow.Flow
-
-@Dao
-interface CardAdventureDao {
-    @Query("""
-        INSERT INTO 
-            CardAdventure (cardId, characterId, steps, bossAp, bossHp, bossDp, bossBp)
-        SELECT
-            :cardId,
-            cc.id,
-            :steps,
-            :bossAp,
-            :bossHp,
-            :bossDp,
-            :bossBp
-        FROM
-            CardCharacter cc
-        WHERE
-            cc.charaIndex = :characterId AND
-            cc.cardId = :cardId
-    """)
-    suspend fun insertNewAdventure(
-        cardId: Long,
-        characterId: Int,
-        steps: Int,
-        bossAp: Int,
-        bossHp: Int,
-        bossDp: Int,
-        bossBp: Int?
-    )
-
-    @Query("""
-        SELECT
-            cc.nameSprite as characterName,
-            cc.nameWidth as characterNameWidth,
-            cc.nameHeight as characterNameHeight,
-            s.spriteIdle1 as characterIdleSprite,
-            s.width as characterIdleSpriteWidth,
-            s.height as characterIdleSpriteHeight,
-            ca.bossAp as characterAp,
-            ca.bossBp as characterBp,
-            ca.bossDp as characterDp,
-            ca.bossHp as characterHp,
-            ca.steps as steps
-        FROM CardCharacter cc
-        JOIN Sprite s ON cc.spriteId = s.id
-        JOIN CardAdventure ca ON cc.id = ca.characterId
-        WHERE
-            cc.cardId = :cardId
-    """)
-    fun getAdventureForCard(
-        cardId: Long
-    ): Flow<List<CardDtos.CardAdventureWithSprites>>
-}

app/src/main/java/com/github/nacabaro/vbhelper/daos/CardDao.kt

@@ -5,45 +5,12 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import com.github.nacabaro.vbhelper.domain.card.Card
-import com.github.nacabaro.vbhelper.dtos.CardDtos
-import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface CardDao {
     @Insert(onConflict = OnConflictStrategy.IGNORE)
-    suspend fun insertNewCard(card: Card): Long
+    suspend fun insertNewDim(card: Card): Long
 
     @Query("SELECT * FROM Card WHERE cardId = :id")
-    fun getCardByCardId(id: Int): List<Card>
-
-    @Query("SELECT * FROM Card WHERE id = :id")
-    fun getCardById(id: Long): Card?
-
-    @Query(
-        """
-        SELECT ca.* 
-        FROM Card ca
-        JOIN CardCharacter ch ON ca.id = ch.cardId
-        JOIN UserCharacter uc ON ch.id = uc.charId
-        WHERE uc.id = :id
-    """
-    )
-    fun getCardByCharacterId(id: Long): Flow<Card>
-
-    @Query("UPDATE Card SET name = :newName WHERE id = :id")
-    suspend fun renameCard(id: Int, newName: String)
-
-    @Query("DELETE FROM Card WHERE id = :id")
-    suspend fun deleteCard(id: Long)
-
-    @Query("""
-        SELECT 
-            c.logo as cardIcon,
-            c.logoWidth as cardIconWidth,
-            c.logoHeight as cardIconHeight
-        FROM Card c
-        JOIN CardCharacter cc ON cc.cardId = c.id
-        WHERE cc.id = :charaId
-    """)
-    fun getCardIconByCharaId(charaId: Long): Flow<CardDtos.CardIcon>
+    fun getDimById(id: Int): Card?
 }

app/src/main/java/com/github/nacabaro/vbhelper/daos/CardFusionsDao.kt

@@ -1,48 +0,0 @@
-package com.github.nacabaro.vbhelper.daos
-
-import androidx.room.Dao
-import androidx.room.Query
-import com.github.cfogrady.vbnfc.data.NfcCharacter
-import com.github.nacabaro.vbhelper.dtos.CharacterDtos
-import kotlinx.coroutines.flow.Flow
-
-@Dao
-interface CardFusionsDao {
-    @Query("""
-        INSERT INTO
-            CardFusions (
-                fromCharaId,
-                attribute,
-                toCharaId
-            )
-        SELECT
-            (SELECT id FROM CardCharacter WHERE cardId = :cardId AND charaIndex = :fromCharaId),
-            :attribute,
-            (SELECT id FROM CardCharacter WHERE cardId = :cardId AND charaIndex = :toCharaId)
-    """)
-    suspend fun insertNewFusion(
-        cardId: Long,
-        fromCharaId: Int,
-        attribute: NfcCharacter.Attribute,
-        toCharaId: Int
-    )
-
-    @Query("""
-        SELECT 
-            cf.toCharaId as charaId,
-            cf.fromCharaId as fromCharaId,
-            s.spriteIdle1 as spriteIdle,
-            cc.attribute as attribute,
-            s.width as spriteWidth,
-            s.height as spriteHeight,
-            d.discoveredOn as discoveredOn,
-            cf.attribute as fusionAttribute
-        FROM CardFusions cf
-        JOIN CardCharacter cc ON cc.id = cf.toCharaId
-        JOIN Sprite s ON s.id = cc.id
-        LEFT JOIN Dex d ON d.id = cc.id
-        WHERE cf.fromCharaId = :charaId
-        ORDER BY cc.charaIndex
-    """)
-    fun getFusionsForCharacter(charaId: Long): Flow<List<CharacterDtos.FusionsWithSpritesAndObtained>>
-}

app/src/main/java/com/github/nacabaro/vbhelper/daos/CardProgressDao.kt

@@ -1,29 +1,17 @@
 package com.github.nacabaro.vbhelper.daos
 
 import androidx.room.Dao
-import androidx.room.Insert
 import androidx.room.Query
+import androidx.room.Upsert
 import com.github.nacabaro.vbhelper.domain.card.CardProgress
-import com.github.nacabaro.vbhelper.dtos.CharacterDtos
-import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface CardProgressDao {
-    @Query("""
-        UPDATE CardProgress 
-        SET 
-            currentStage = :currentStage, 
-            unlocked = :unlocked
-        WHERE cardId = :cardId AND
-            currentStage < :currentStage
-    """)
-    fun updateCardProgress(currentStage: Int, cardId: Long, unlocked: Boolean)
+    @Upsert
+    fun updateDimProgress(vararg cardProgresses: CardProgress)
 
     @Query(
         "SELECT currentStage FROM CardProgress WHERE cardId = :cardId"
     )
-    fun getCardProgress(cardId: Long): Flow<Int>
-
-    @Insert
-    fun insertCardProgress(cardProgress: CardProgress)
+    fun getCardProgress(cardId: Int): Int
 }

app/src/main/java/com/github/nacabaro/vbhelper/daos/CharacterDao.kt

@@ -3,18 +3,17 @@ package com.github.nacabaro.vbhelper.daos
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.Query
-import com.github.nacabaro.vbhelper.domain.card.CardCharacter
+import com.github.nacabaro.vbhelper.domain.characters.Character
 import com.github.nacabaro.vbhelper.domain.characters.Sprite
 import com.github.nacabaro.vbhelper.dtos.CharacterDtos
-import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface CharacterDao {
     @Insert
-    suspend fun insertCharacter(vararg characterData: CardCharacter)
+    suspend fun insertCharacter(vararg characterData: Character)
 
-    @Query("SELECT * FROM CardCharacter WHERE charaIndex = :monIndex AND cardId = :dimId LIMIT 1")
-    fun getCharacterByMonIndex(monIndex: Int, dimId: Long): CardCharacter
+    @Query("SELECT * FROM Character WHERE monIndex = :monIndex AND dimId = :dimId LIMIT 1")
+    fun getCharacterByMonIndex(monIndex: Int, dimId: Long): Character
 
     @Insert
     suspend fun insertSprite(vararg sprite: Sprite)
@@ -23,68 +22,14 @@ interface CharacterDao {
         """
         SELECT 
             d.cardId as cardId,
-            c.charaIndex as charId,
+            c.monIndex as charId,
             c.stage as stage,
-            c.attribute as attribute,
-            cp.currentStage as currentStage
-        FROM CardCharacter c
+            c.attribute as attribute
+        FROM Character c
         JOIN UserCharacter uc ON c.id = uc.charId
-        JOIN Card d ON c.cardId = d.id
-        JOIN CardProgress cp ON d.id = cp.cardId
+        JOIN Card d ON c.dimId = d.id
         WHERE c.id = :charId
     """
     )
     suspend fun getCharacterInfo(charId: Long): CharacterDtos.CardCharacterInfo
-
-    @Query(
-        """
-        INSERT INTO PossibleTransformations (charaId, requiredVitals, requiredTrophies, requiredBattles, requiredWinRate, changeTimerHours, requiredAdventureLevelCompleted, toCharaId)
-        SELECT
-            (SELECT id FROM CardCharacter WHERE charaIndex = :fromChraraIndex AND cardId = :cardId),
-            :requiredVitals,
-            :requiredTrophies,
-            :requiredBattles,
-            :requiredWinRate,
-            :changeTimerHours,
-            :requiredAdventureLevelCompleted,
-            (SELECT id FROM CardCharacter WHERE charaIndex = :toChraraIndex AND cardId = :cardId)
-    """
-    )
-    suspend fun insertPossibleTransformation(
-        fromChraraIndex: Int,
-        toChraraIndex: Int,
-        cardId: Long,
-        requiredVitals: Int,
-        requiredTrophies: Int,
-        requiredBattles: Int,
-        changeTimerHours: Int,
-        requiredWinRate: Int,
-        requiredAdventureLevelCompleted: Int
-    )
-
-    @Query(
-        """
-        SELECT 
-            pt.charaId as fromCharaId,
-            pt.toCharaId as charaId,
-            s.spriteIdle1 as spriteIdle,
-            s.width as spriteWidth,
-            s.height as spriteHeight,
-            d.discoveredOn as discoveredOn,
-            pt.requiredTrophies as requiredTrophies,
-            pt.requiredVitals as requiredVitals,
-            pt.requiredBattles as requiredBattles,
-            pt.requiredWinRate as requiredWinRate,
-            pt.changeTimerHours as changeTimerHours,
-            pt.requiredAdventureLevelCompleted as requiredAdventureLevelCompleted
-        FROM
-            PossibleTransformations pt
-        JOIN CardCharacter c on pt.toCharaId = c.id
-        JOIN Sprite s ON s.id = c.spriteId
-        LEFT JOIN Dex d ON d.id = pt.toCharaId
-        WHERE
-            pt.charaId = :characterId
-    """
-    )
-    fun getEvolutionRequirementsForCard(characterId: Long): Flow<List<CharacterDtos.EvolutionRequirementsWithSpritesAndObtained>>
 }

app/src/main/java/com/github/nacabaro/vbhelper/daos/DexDao.kt

@@ -4,57 +4,42 @@ import androidx.room.Dao
 import androidx.room.Query
 import com.github.nacabaro.vbhelper.dtos.CardDtos
 import com.github.nacabaro.vbhelper.dtos.CharacterDtos
-import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface DexDao {
-    @Query(
-        """
+    @Query("""
         INSERT OR IGNORE INTO Dex(id, discoveredOn)
         VALUES (
-            (SELECT id FROM CardCharacter WHERE charaIndex = :charIndex AND cardId = :cardId), 
+            (SELECT id FROM Character WHERE monIndex = :charIndex AND dimId = :cardId), 
             :discoveredOn
         )
-    """
-    )
+    """)
     fun insertCharacter(charIndex: Int, cardId: Long, discoveredOn: Long)
 
-    @Query(
-        """
+    @Query("""
         SELECT 
             c.id AS id,
             s.spriteIdle1 AS spriteIdle,
             s.width AS spriteWidth,
             s.height AS spriteHeight,
-            c.nameSprite AS nameSprite,
-            c.nameWidth AS nameSpriteWidth,
-            c.nameHeight AS nameSpriteHeight,
-            d.discoveredOn AS discoveredOn,
-            c.baseHp as baseHp,
-            c.baseBp as baseBp,
-            c.baseAp as baseAp,
-            c.stage as stage,
-            c.attribute as attribute
-        FROM CardCharacter c
+            d.discoveredOn AS discoveredOn
+        FROM Character c
         JOIN Sprite s ON c.spriteId = s.id
         LEFT JOIN dex d ON c.id = d.id
-        WHERE c.cardId = :cardId
-    """
-    )
-    fun getSingleCardProgress(cardId: Long): Flow<List<CharacterDtos.CardCharaProgress>>
+        WHERE c.dimId = :cardId
+    """)
+    suspend fun getSingleCardProgress(cardId: Long): List<CharacterDtos.CardProgress>
 
-    @Query(
-        """
+    @Query("""
         SELECT 
             c.id as cardId,
             c.name as cardName,
             c.logo as cardLogo,
             c.logoWidth as logoWidth,
             c.logoHeight as logoHeight, 
-            (SELECT COUNT(*) FROM CardCharacter cc WHERE cc.cardId = c.id) AS totalCharacters,
-            (SELECT COUNT(*) FROM Dex d JOIN CardCharacter cc ON d.id = cc.id WHERE cc.cardId = c.id AND d.discoveredOn IS NOT NULL) AS obtainedCharacters
+            (SELECT COUNT(*) FROM Character cc WHERE cc.dimId = c.id) AS totalCharacters,
+            (SELECT COUNT(*) FROM Dex d JOIN Character cc ON d.id = cc.id WHERE cc.dimId = c.id AND d.discoveredOn IS NOT NULL) AS obtainedCharacters
         FROM Card c
-    """
-    )
-    fun getCardsWithProgress(): Flow<List<CardDtos.CardProgress>>
+    """)
+    suspend fun getCardsWithProgress(): List<CardDtos.CardProgress>
 }

app/src/main/java/com/github/nacabaro/vbhelper/daos/ItemDao.kt

@@ -3,7 +3,6 @@ package com.github.nacabaro.vbhelper.daos
 import androidx.room.Dao
 import androidx.room.Query
 import com.github.nacabaro.vbhelper.dtos.ItemDtos
-import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface ItemDao {
@@ -14,7 +13,7 @@ interface ItemDao {
         ORDER BY Items.itemIcon ASC
     """
     )
-    fun getAllItems(): Flow<List<ItemDtos.ItemsWithQuantities>>
+    suspend fun getAllItems(): List<ItemDtos.ItemsWithQuantities>
 
     @Query(
         """
@@ -23,7 +22,7 @@ interface ItemDao {
         WHERE quantity > 0
     """
     )
-    fun getAllUserItems(): Flow<List<ItemDtos.ItemsWithQuantities>>
+    suspend fun getAllUserItems(): List<ItemDtos.ItemsWithQuantities>
 
     @Query(
         """
@@ -32,7 +31,7 @@ interface ItemDao {
         WHERE Items.id = :itemId
     """
     )
-    suspend fun getItem(itemId: Long): ItemDtos.ItemsWithQuantities
+    fun getItem(itemId: Long): ItemDtos.ItemsWithQuantities
 
     @Query(
         """
@@ -41,7 +40,7 @@ interface ItemDao {
         WHERE id = :itemId
     """
     )
-    suspend fun useItem(itemId: Long)
+    fun useItem(itemId: Long)
 
     @Query(
         """

app/src/main/java/com/github/nacabaro/vbhelper/daos/SpecialMissionDao.kt

@@ -1,24 +0,0 @@
-package com.github.nacabaro.vbhelper.daos
-
-import androidx.room.Dao
-import androidx.room.Query
-import com.github.nacabaro.vbhelper.domain.device_data.SpecialMissions
-import kotlinx.coroutines.flow.Flow
-
-@Dao
-interface SpecialMissionDao {
-    @Query("""
-        UPDATE SpecialMissions SET 
-            missionType = "NONE",
-            status = "UNAVAILABLE"
-        WHERE id = :id
-    """)
-    suspend fun clearSpecialMission(id: Long)
-
-    @Query("""
-        SELECT *
-        FROM SpecialMissions
-        WHERE id = :id
-    """)
-    fun getSpecialMission(id: Long): Flow<SpecialMissions>
-}

app/src/main/java/com/github/nacabaro/vbhelper/daos/UserCharacterDao.kt

@@ -5,7 +5,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Upsert
-import com.github.nacabaro.vbhelper.domain.card.CardCharacter
+import com.github.nacabaro.vbhelper.domain.characters.Character
 import com.github.nacabaro.vbhelper.domain.device_data.UserCharacter
 import com.github.nacabaro.vbhelper.domain.device_data.BECharacterData
 import com.github.nacabaro.vbhelper.domain.device_data.SpecialMissions
@@ -13,7 +13,6 @@ import com.github.nacabaro.vbhelper.domain.device_data.TransformationHistory
 import com.github.nacabaro.vbhelper.domain.device_data.VBCharacterData
 import com.github.nacabaro.vbhelper.domain.device_data.VitalsHistory
 import com.github.nacabaro.vbhelper.dtos.CharacterDtos
-import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface UserCharacterDao {
@@ -35,25 +34,23 @@ interface UserCharacterDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insertTransformationHistory(vararg transformationHistory: TransformationHistory)
 
-    @Upsert
+    @Insert
     fun insertSpecialMissions(vararg specialMissions: SpecialMissions)
 
-    @Query(
-        """
+    @Query("""
         SELECT 
             c.id AS id,
             s.spriteIdle1 AS spriteIdle,
             s.width AS spriteWidth,
             s.height AS spriteHeight,
-            c.charaIndex AS monIndex, 
+            c.monIndex AS monIndex, 
             t.transformationDate AS transformationDate
         FROM TransformationHistory t 
-        JOIN CardCharacter c ON c.id = t.stageId
+        JOIN Character c ON c.id = t.stageId
         JOIN Sprite s ON s.id = c.spriteId
         WHERE monId = :monId
-    """
-    )
-    fun getTransformationHistory(monId: Long): Flow<List<CharacterDtos.TransformationHistory>>
+    """)
+    suspend fun getTransformationHistory(monId: Long): List<CharacterDtos.TransformationHistory>?
 
     @Query(
         """
@@ -65,20 +62,19 @@ interface UserCharacterDao {
             s.spriteIdle2 AS spriteIdle2,
             s.width AS spriteWidth,
             s.height AS spriteHeight,
-            c.nameSprite as nameSprite,
+            c.name as nameSprite,
             c.nameWidth as nameSpriteWidth,
             c.nameHeight as nameSpriteHeight,
             d.isBEm as isBemCard,
-            a.characterId = uc.id as isInAdventure,
-            uc.isActive as active
+            a.characterId = uc.id as isInAdventure
         FROM UserCharacter uc
-        JOIN CardCharacter c ON uc.charId = c.id
-        JOIN Card d ON  d.id = c.cardId
+        JOIN Character c ON uc.charId = c.id
+        JOIN Card d ON  d.id = c.dimId
         JOIN Sprite s ON s.id = c.spriteId
         LEFT JOIN Adventure a ON a.characterId = uc.id
         """
     )
-    fun getAllCharacters(): Flow<List<CharacterDtos.CharacterWithSprites>>
+    suspend fun getAllCharacters(): List<CharacterDtos.CharacterWithSprites>
 
     @Query(
         """
@@ -90,33 +86,31 @@ interface UserCharacterDao {
             s.spriteIdle2 AS spriteIdle2,
             s.width AS spriteWidth,
             s.height AS spriteHeight,
-            c.nameSprite as nameSprite,
+            c.name as nameSprite,
             c.nameWidth as nameSpriteWidth,
             c.nameHeight as nameSpriteHeight,
             d.isBEm as isBemCard,
-            a.characterId = uc.id as isInAdventure,
-            uc.isActive as active
+            a.characterId = uc.id as isInAdventure
         FROM UserCharacter uc
-        JOIN CardCharacter c ON uc.charId = c.id
-        JOIN Card d ON c.cardId = d.id
+        JOIN Character c ON uc.charId = c.id
+        JOIN Card d ON c.dimId = d.id
         JOIN Sprite s ON s.id = c.spriteId
         LEFT JOIN Adventure a ON a.characterId = uc.id
         WHERE uc.id = :id
-    """
-    )
+    """)
     suspend fun getCharacterWithSprites(id: Long): CharacterDtos.CharacterWithSprites
 
     @Query("SELECT * FROM UserCharacter WHERE id = :id")
     suspend fun getCharacter(id: Long): UserCharacter
 
     @Query("SELECT * FROM BECharacterData WHERE id = :id")
-    fun getBeData(id: Long): Flow<BECharacterData>
+    suspend fun getBeData(id: Long): BECharacterData
 
     @Query("SELECT * FROM VBCharacterData WHERE id = :id")
-    fun getVbData(id: Long): Flow<VBCharacterData>
+    suspend fun getVbData(id: Long): VBCharacterData
 
     @Query("SELECT * FROM SpecialMissions WHERE characterId = :id")
-    fun getSpecialMissions(id: Long): Flow<List<SpecialMissions>>
+    suspend fun getSpecialMissions(id: Long): List<SpecialMissions>
 
     @Query(
         """
@@ -128,22 +122,20 @@ interface UserCharacterDao {
             s.spriteIdle2 AS spriteIdle2,
             s.width AS spriteWidth,
             s.height AS spriteHeight,
-            c.nameSprite as nameSprite,
+            c.name as nameSprite,
             c.nameWidth as nameSpriteWidth,
             c.nameHeight as nameSpriteHeight,
             d.isBEm as isBemCard,
-            a.characterId as isInAdventure,
-            uc.isActive as active
+            a.characterId as isInAdventure            
         FROM UserCharacter uc
-        JOIN CardCharacter c ON uc.charId = c.id
-        JOIN Card d ON c.cardId = d.id
+        JOIN Character c ON uc.charId = c.id
+        JOIN Card d ON c.dimId = d.id
         JOIN Sprite s ON s.id = c.spriteId
         LEFT JOIN Adventure a ON a.characterId = uc.id
         WHERE uc.isActive = 1
         LIMIT 1
-    """
-    )
-    fun getActiveCharacter(): Flow<CharacterDtos.CharacterWithSprites?>
+    """)
+    suspend fun getActiveCharacter(): CharacterDtos.CharacterWithSprites?
 
     @Query("DELETE FROM UserCharacter WHERE id = :id")
     fun deleteCharacterById(id: Long)
@@ -157,24 +149,22 @@ interface UserCharacterDao {
     @Query(
         """
         SELECT c.*
-        FROM CardCharacter c
+        FROM Character c
         join UserCharacter uc on c.id = uc.charId
         where uc.id = :charId
         LIMIT 1
         """
     )
-    suspend fun getCharacterInfo(charId: Long): CardCharacter
+    suspend fun getCharacterInfo(charId: Long): Character
 
 
-    @Query(
-        """
+    @Query("""
         INSERT INTO TransformationHistory(monId, stageId, transformationDate)
         VALUES 
             (:monId, 
-            (SELECT id FROM CardCharacter WHERE charaIndex = :stage AND cardId = :dimId),
+            (SELECT id FROM Character WHERE monIndex = :stage AND dimId = :dimId),
             :transformationDate)
-    """
-    )
+    """)
     fun insertTransformation(monId: Long, stage: Int, dimId: Long, transformationDate: Long)
 
     @Upsert
@@ -182,56 +172,4 @@ interface UserCharacterDao {
 
     @Query("""SELECT * FROM VitalsHistory WHERE charId = :charId ORDER BY id ASC""")
     suspend fun getVitalsHistory(charId: Long): List<VitalsHistory>
-
-    @Query(
-        """
-        SELECT
-            uc.*,
-            c.stage,
-            c.attribute,
-            s.spriteIdle1 AS spriteIdle,
-            s.spriteIdle2 AS spriteIdle2,
-            s.width AS spriteWidth,
-            s.height AS spriteHeight,
-            c.nameSprite as nameSprite,
-            c.nameWidth as nameSpriteWidth,
-            c.nameHeight as nameSpriteHeight,
-            d.isBEm as isBemCard,
-            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
-        JOIN Sprite s ON s.id = c.spriteId
-        LEFT JOIN Adventure a ON a.characterId = uc.id
-        WHERE uc.characterType = "BEDevice"
-        """
-    )
-    suspend fun getBECharacters(): List<CharacterDtos.CharacterWithSprites>
-
-    @Query(
-        """
-        SELECT
-            uc.*,
-            c.stage,
-            c.attribute,
-            s.spriteIdle1 AS spriteIdle,
-            s.spriteIdle2 AS spriteIdle2,
-            s.width AS spriteWidth,
-            s.height AS spriteHeight,
-            c.nameSprite as nameSprite,
-            c.nameWidth as nameSpriteWidth,
-            c.nameHeight as nameSpriteHeight,
-            d.isBEm as isBemCard,
-            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
-        JOIN Sprite s ON s.id = c.spriteId
-        LEFT JOIN Adventure a ON a.characterId = uc.id
-        WHERE uc.characterType = "VBDevice"
-        """
-    )
-    suspend fun getVBDimCharacters(): List<CharacterDtos.CharacterWithSprites>
 }

app/src/main/java/com/github/nacabaro/vbhelper/database/AppDatabase.kt

@@ -3,23 +3,16 @@ package com.github.nacabaro.vbhelper.database
 import androidx.room.Database
 import androidx.room.RoomDatabase
 import com.github.nacabaro.vbhelper.daos.AdventureDao
-import com.github.nacabaro.vbhelper.daos.CardAdventureDao
 import com.github.nacabaro.vbhelper.daos.CharacterDao
 import com.github.nacabaro.vbhelper.daos.DexDao
 import com.github.nacabaro.vbhelper.daos.CardDao
-import com.github.nacabaro.vbhelper.daos.CardFusionsDao
 import com.github.nacabaro.vbhelper.daos.CardProgressDao
 import com.github.nacabaro.vbhelper.daos.ItemDao
-import com.github.nacabaro.vbhelper.daos.SpecialMissionDao
 import com.github.nacabaro.vbhelper.daos.SpriteDao
 import com.github.nacabaro.vbhelper.daos.UserCharacterDao
-import com.github.nacabaro.vbhelper.domain.card.Background
-import com.github.nacabaro.vbhelper.domain.card.CardCharacter
+import com.github.nacabaro.vbhelper.domain.characters.Character
 import com.github.nacabaro.vbhelper.domain.card.Card
-import com.github.nacabaro.vbhelper.domain.card.CardAdventure
-import com.github.nacabaro.vbhelper.domain.card.CardFusions
 import com.github.nacabaro.vbhelper.domain.card.CardProgress
-import com.github.nacabaro.vbhelper.domain.card.PossibleTransformations
 import com.github.nacabaro.vbhelper.domain.characters.Sprite
 import com.github.nacabaro.vbhelper.domain.characters.Adventure
 import com.github.nacabaro.vbhelper.domain.characters.Dex
@@ -36,9 +29,7 @@ import com.github.nacabaro.vbhelper.domain.items.Items
     entities = [
         Card::class,
         CardProgress::class,
-        CardCharacter::class,
-        CardAdventure::class,
-        CardFusions::class,
+        Character::class,
         Sprite::class,
         UserCharacter::class,
         BECharacterData::class,
@@ -48,9 +39,7 @@ import com.github.nacabaro.vbhelper.domain.items.Items
         VitalsHistory::class,
         Dex::class,
         Items::class,
-        Adventure::class,
-        Background::class,
-        PossibleTransformations::class
+        Adventure::class
     ]
 )
 abstract class AppDatabase : RoomDatabase() {
@@ -62,7 +51,4 @@ abstract class AppDatabase : RoomDatabase() {
     abstract fun itemDao(): ItemDao
     abstract fun adventureDao(): AdventureDao
     abstract fun spriteDao(): SpriteDao
-    abstract fun specialMissionDao(): SpecialMissionDao
-    abstract fun cardAdventureDao(): CardAdventureDao
-    abstract fun cardFusionsDao(): CardFusionsDao
 }

app/src/main/java/com/github/nacabaro/vbhelper/di/AppContainer.kt

@@ -1,11 +1,9 @@
 package com.github.nacabaro.vbhelper.di
 
 import com.github.nacabaro.vbhelper.database.AppDatabase
-import com.github.nacabaro.vbhelper.source.CurrencyRepository
 import com.github.nacabaro.vbhelper.source.DataStoreSecretsRepository
 
 interface AppContainer {
     val db: AppDatabase
     val dataStoreSecretsRepository: DataStoreSecretsRepository
-    val currencyRepository: CurrencyRepository
 }

app/src/main/java/com/github/nacabaro/vbhelper/di/DefaultAppContainer.kt

@@ -1,27 +1,20 @@
 import android.content.Context
 import androidx.datastore.core.DataStore
 import androidx.datastore.dataStore
-import androidx.datastore.preferences.core.Preferences
-import androidx.datastore.preferences.preferencesDataStore
 import androidx.room.Room
 import com.github.nacabaro.vbhelper.database.AppDatabase
 import com.github.nacabaro.vbhelper.di.AppContainer
-import com.github.nacabaro.vbhelper.source.CurrencyRepository
 import com.github.nacabaro.vbhelper.source.DataStoreSecretsRepository
 import com.github.nacabaro.vbhelper.source.SecretsSerializer
 import com.github.nacabaro.vbhelper.source.proto.Secrets
 
 private const val SECRETS_DATA_STORE_NAME = "secrets.pb"
-private const val USER_PREFERENCES_NAME = "user_preferences"
+
 val Context.secretsStore: DataStore<Secrets> by dataStore(
     fileName = SECRETS_DATA_STORE_NAME,
     serializer = SecretsSerializer
 )
 
-val Context.currencyStore: DataStore<Preferences> by preferencesDataStore(
-    name = USER_PREFERENCES_NAME
-)
-
 class DefaultAppContainer(private val context: Context) : AppContainer {
 
     override val db: AppDatabase by lazy {
@@ -36,6 +29,5 @@ class DefaultAppContainer(private val context: Context) : AppContainer {
 
     override val dataStoreSecretsRepository = DataStoreSecretsRepository(context.secretsStore)
 
-    override val currencyRepository = CurrencyRepository(context.currencyStore)
 }
 

app/src/main/java/com/github/nacabaro/vbhelper/domain/Evolutions.kt

@@ -3,6 +3,7 @@ package com.github.nacabaro.vbhelper.domain
 import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
+import com.github.nacabaro.vbhelper.domain.characters.Character
 
 @Entity(
     foreignKeys = [

app/src/main/java/com/github/nacabaro/vbhelper/domain/UserMonsters.kt

@@ -3,6 +3,7 @@ package com.github.nacabaro.vbhelper.domain
 import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
+import com.github.nacabaro.vbhelper.domain.characters.Character
 
 @Entity(
     foreignKeys = [

app/src/main/java/com/github/nacabaro/vbhelper/domain/card/Background.kt

@@ -1,23 +0,0 @@
-package com.github.nacabaro.vbhelper.domain.card
-
-import androidx.room.Entity
-import androidx.room.ForeignKey
-import androidx.room.PrimaryKey
-
-@Entity(
-    foreignKeys = [
-        ForeignKey(
-            entity = Card::class,
-            parentColumns = ["id"],
-            childColumns = ["cardId"],
-            onDelete = ForeignKey.CASCADE
-        )
-    ]
-)
-data class Background (
-    @PrimaryKey(autoGenerate = true) val id: Long,
-    val cardId: Long,
-    val background: ByteArray,
-    val backgroundWidth: Int,
-    val backgroundHeight: Int
-)

app/src/main/java/com/github/nacabaro/vbhelper/domain/card/CardAdventure.kt

@@ -1,32 +0,0 @@
-package com.github.nacabaro.vbhelper.domain.card
-
-import androidx.room.Entity
-import androidx.room.ForeignKey
-import androidx.room.PrimaryKey
-
-@Entity(
-    foreignKeys = [
-        ForeignKey(
-            entity = CardCharacter::class,
-            parentColumns = ["id"],
-            childColumns = ["characterId"],
-            onDelete = ForeignKey.CASCADE
-        ),
-        ForeignKey(
-            entity = Card::class,
-            parentColumns = ["id"],
-            childColumns = ["cardId"],
-            onDelete = ForeignKey.CASCADE
-        )
-    ]
-)
-data class CardAdventure(
-    @PrimaryKey(autoGenerate = true) val id: Long = 0,
-    val cardId: Long,
-    val characterId: Long,
-    val steps: Int,
-    val bossHp: Int,
-    val bossAp: Int,
-    val bossDp: Int,
-    val bossBp: Int?
-)

app/src/main/java/com/github/nacabaro/vbhelper/domain/card/CardFusions.kt

@@ -1,29 +0,0 @@
-package com.github.nacabaro.vbhelper.domain.card
-
-import androidx.room.Entity
-import androidx.room.ForeignKey
-import androidx.room.PrimaryKey
-import com.github.cfogrady.vbnfc.data.NfcCharacter
-
-@Entity(
-    foreignKeys = [
-        ForeignKey(
-            entity = CardCharacter::class,
-            parentColumns = ["id"],
-            childColumns = ["fromCharaId"],
-            onDelete = ForeignKey.CASCADE
-        ),
-        ForeignKey(
-            entity = CardCharacter::class,
-            parentColumns = ["id"],
-            childColumns = ["toCharaId"],
-            onDelete = ForeignKey.CASCADE
-        )
-    ]
-)
-data class CardFusions(
-    @PrimaryKey(autoGenerate = true) val id: Long,
-    val fromCharaId: Long,
-    val attribute: NfcCharacter.Attribute,
-    val toCharaId: Long
-)

app/src/main/java/com/github/nacabaro/vbhelper/domain/card/PossibleTransformations.kt

@@ -1,33 +0,0 @@
-package com.github.nacabaro.vbhelper.domain.card
-
-import androidx.room.Entity
-import androidx.room.ForeignKey
-import androidx.room.PrimaryKey
-
-@Entity(
-    foreignKeys = [
-        ForeignKey(
-            entity = CardCharacter::class,
-            parentColumns = ["id"],
-            childColumns = ["charaId"],
-            onDelete = ForeignKey.CASCADE
-        ),
-        ForeignKey(
-            entity = CardCharacter::class,
-            parentColumns = ["id"],
-            childColumns = ["toCharaId"],
-            onDelete = ForeignKey.CASCADE
-        )
-    ]
-)
-data class PossibleTransformations (
-    @PrimaryKey(autoGenerate = true) val id: Long = 0,
-    var charaId: Long,
-    val requiredVitals: Int,
-    val requiredTrophies: Int,
-    val requiredBattles: Int,
-    val requiredWinRate: Int,
-    val changeTimerHours: Int,
-    val requiredAdventureLevelCompleted: Int,
-    val toCharaId: Long?
-)

app/src/main/java/com/github/nacabaro/vbhelper/domain/characters/Character.kt

@@ -1,17 +1,17 @@
-package com.github.nacabaro.vbhelper.domain.card
+package com.github.nacabaro.vbhelper.domain.characters
 
 import androidx.room.Entity
-import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
+import androidx.room.ForeignKey
 import com.github.cfogrady.vbnfc.data.NfcCharacter
-import com.github.nacabaro.vbhelper.domain.characters.Sprite
+import com.github.nacabaro.vbhelper.domain.card.Card
 
 @Entity(
     foreignKeys = [
         ForeignKey(
             entity = Card::class,
             parentColumns = ["id"],
-            childColumns = ["cardId"],
+            childColumns = ["dimId"],
             onDelete = ForeignKey.CASCADE
         ),
         ForeignKey(
@@ -28,17 +28,17 @@ import com.github.nacabaro.vbhelper.domain.characters.Sprite
  * and monIndex.
  * TODO: Customs will mean this should be unique per cardName and monIndex
  */
-data class CardCharacter (
+data class Character (
     @PrimaryKey(autoGenerate = true) val id: Long = 0,
-    val cardId: Long,
+    val dimId: Long,
     val spriteId: Long,
-    val charaIndex: Int,
+    val monIndex: Int,
+    val name: ByteArray,
     val stage: Int, // These should be replaced with enums
     val attribute: NfcCharacter.Attribute, // This one too
     val baseHp: Int,
     val baseBp: Int,
     val baseAp: Int,
-    val nameSprite: ByteArray,
     val nameWidth: Int,
     val nameHeight: Int
 )

app/src/main/java/com/github/nacabaro/vbhelper/domain/characters/Dex.kt

@@ -3,12 +3,11 @@ package com.github.nacabaro.vbhelper.domain.characters
 import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
-import com.github.nacabaro.vbhelper.domain.card.CardCharacter
 
 @Entity(
     foreignKeys = [
         ForeignKey(
-            entity = CardCharacter::class,
+            entity = Character::class,
             parentColumns = ["id"],
             childColumns = ["id"],
             onDelete = ForeignKey.CASCADE

app/src/main/java/com/github/nacabaro/vbhelper/domain/device_data/TransformationHistory.kt

@@ -3,7 +3,7 @@ package com.github.nacabaro.vbhelper.domain.device_data
 import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
-import com.github.nacabaro.vbhelper.domain.card.CardCharacter
+import com.github.nacabaro.vbhelper.domain.characters.Character
 
 @Entity(
     foreignKeys = [
@@ -14,7 +14,7 @@ import com.github.nacabaro.vbhelper.domain.card.CardCharacter
             onDelete = ForeignKey.CASCADE
         ),
         ForeignKey(
-            entity = CardCharacter::class,
+            entity = Character::class,
             parentColumns = ["id"],
             childColumns = ["stageId"],
             onDelete = ForeignKey.CASCADE

app/src/main/java/com/github/nacabaro/vbhelper/domain/device_data/UserCharacter.kt

@@ -5,12 +5,12 @@ import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
 import com.github.cfogrady.vbnfc.data.NfcCharacter
 import com.github.nacabaro.vbhelper.utils.DeviceType
-import com.github.nacabaro.vbhelper.domain.card.CardCharacter
+import com.github.nacabaro.vbhelper.domain.characters.Character
 
 @Entity(
     foreignKeys = [
         ForeignKey(
-            entity = CardCharacter::class,
+            entity = Character::class,
             parentColumns = ["id"],
             childColumns = ["charId"],
             onDelete = ForeignKey.CASCADE

app/src/main/java/com/github/nacabaro/vbhelper/domain/items/Items.kt

@@ -3,13 +3,6 @@ package com.github.nacabaro.vbhelper.domain.items
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 
-enum class ItemType {
-    VBITEM,
-    BEITEM,
-    UNIVERSAL,
-    SPECIALMISSION
-}
-
 @Entity
 data class Items(
     @PrimaryKey val id: Long,
@@ -18,6 +11,5 @@ data class Items(
     val itemIcon: Int,
     val itemLength: Int,
     val price: Int,
-    val quantity: Int,
-    val itemType: ItemType
+    val quantity: Int
 )

app/src/main/java/com/github/nacabaro/vbhelper/dtos/CardDtos.kt

@@ -10,24 +10,4 @@ object CardDtos {
         val totalCharacters: Int,
         val obtainedCharacters: Int,
     )
-
-    data class CardAdventureWithSprites (
-        val characterName: ByteArray,
-        val characterNameWidth: Int,
-        val characterNameHeight: Int,
-        val characterIdleSprite: ByteArray,
-        val characterIdleSpriteWidth: Int,
-        val characterIdleSpriteHeight: Int,
-        val characterAp: Int,
-        val characterBp: Int?,
-        val characterDp: Int,
-        val characterHp: Int,
-        val steps: Int,
-    )
-
-    data class CardIcon (
-        val cardIcon: ByteArray,
-        val cardIconWidth: Int,
-        val cardIconHeight: Int
-    )
 }

app/src/main/java/com/github/nacabaro/vbhelper/dtos/CharacterDtos.kt

@@ -31,16 +31,14 @@ object CharacterDtos {
         val nameSpriteWidth: Int,
         val nameSpriteHeight: Int,
         val isBemCard: Boolean,
-        val isInAdventure: Boolean,
-        val active: Boolean
+        val isInAdventure: Boolean
     )
 
     data class CardCharacterInfo(
-        val cardId: Long,
+        val cardId: Int,
         val charId: Int,
         val stage: Int,
-        val attribute: NfcCharacter.Attribute,
-        val currentStage: Int
+        val attribute: NfcCharacter.Attribute
     )
 
     data class TransformationHistory(
@@ -52,27 +50,12 @@ object CharacterDtos {
         val transformationDate: Long
     )
 
-    data class CardCharaProgress(
-        val id: Long,
-        val spriteIdle: ByteArray,
-        val spriteWidth: Int,
-        val spriteHeight: Int,
-        val nameSprite: ByteArray,
-        val nameSpriteWidth: Int,
-        val nameSpriteHeight: Int,
-        val discoveredOn: Long?,
-        val baseHp: Int,
-        val baseBp: Int,
-        val baseAp: Int,
-        val stage: Int,
-        val attribute: NfcCharacter.Attribute,
-    )
-
     data class CardProgress(
         val id: Long,
         val spriteIdle: ByteArray,
         val spriteWidth: Int,
         val spriteHeight: Int,
+        val discoveredOn: Long?
     )
 
     data class AdventureCharacterWithSprites(
@@ -100,29 +83,4 @@ object CharacterDtos {
         val finishesAdventure: Long,
         val originalTimeInMinutes: Long
     )
-
-    data class EvolutionRequirementsWithSpritesAndObtained(
-        val charaId: Long,
-        val fromCharaId: Long,
-        val spriteIdle: ByteArray,
-        val spriteWidth: Int,
-        val spriteHeight: Int,
-        val discoveredOn: Long?,
-        val requiredTrophies: Int,
-        val requiredVitals: Int,
-        val requiredBattles: Int,
-        val requiredWinRate: Int,
-        val changeTimerHours: Int,
-        val requiredAdventureLevelCompleted: Int
-    )
-
-    data class FusionsWithSpritesAndObtained(
-        val charaId: Long,
-        val fromCharaId: Long,
-        val spriteIdle: ByteArray,
-        val spriteWidth: Int,
-        val spriteHeight: Int,
-        val discoveredOn: Long?,
-        val fusionAttribute: NfcCharacter.Attribute
-    )
 }

app/src/main/java/com/github/nacabaro/vbhelper/dtos/ItemDtos.kt

@@ -1,7 +1,5 @@
 package com.github.nacabaro.vbhelper.dtos
 
-import com.github.nacabaro.vbhelper.domain.items.ItemType
-
 
 object ItemDtos {
     data class ItemsWithQuantities(
@@ -12,7 +10,6 @@ object ItemDtos {
         val itemLength: Int,
         val price: Int,
         val quantity: Int,
-        val itemType: ItemType
     )
 
     data class PurchasedItem(
@@ -21,7 +18,6 @@ object ItemDtos {
         val itemDescription: String,
         val itemIcon: Int,
         val itemLength: Int,
-        val itemAmount: Int,
-        val itemType: ItemType
+        val itemAmount: Int
     )
 }

app/src/main/java/com/github/nacabaro/vbhelper/navigation/AppNavigation.kt

@@ -1,12 +1,13 @@
 package com.github.nacabaro.vbhelper.navigation
 
+import android.util.Log
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -18,8 +19,8 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import com.github.nacabaro.vbhelper.di.VBHelper
 import com.github.nacabaro.vbhelper.screens.BattlesScreen
-import com.github.nacabaro.vbhelper.screens.cardScreen.CardsScreen
-import com.github.nacabaro.vbhelper.screens.cardScreen.CardViewScreen
+import com.github.nacabaro.vbhelper.screens.DexScreen
+import com.github.nacabaro.vbhelper.screens.DiMScreen
 import com.github.nacabaro.vbhelper.screens.homeScreens.HomeScreen
 import com.github.nacabaro.vbhelper.screens.itemsScreen.ItemsScreen
 import com.github.nacabaro.vbhelper.screens.scanScreen.ScanScreen
@@ -33,8 +34,6 @@ 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.cardScreen.CardAdventureScreen
-import com.github.nacabaro.vbhelper.screens.cardScreen.CardScreenControllerImpl
 import com.github.nacabaro.vbhelper.screens.settingsScreen.CreditsScreen
 import com.github.nacabaro.vbhelper.screens.spriteViewer.SpriteViewerControllerImpl
 import com.github.nacabaro.vbhelper.screens.storageScreen.StorageScreenControllerImpl
@@ -47,8 +46,7 @@ data class AppNavigationHandlers(
     val adventureScreenController: AdventureScreenControllerImpl,
     val storageScreenController: StorageScreenControllerImpl,
     val homeScreenController: HomeScreenControllerImpl,
-    val spriteViewerController: SpriteViewerControllerImpl,
-    val cardScreenController: CardScreenControllerImpl
+    val spriteViewerController: SpriteViewerControllerImpl
 )
 
 @Composable
@@ -98,14 +96,20 @@ fun AppNavigation(
             composable(NavigationItems.Scan.route) {
                 val characterIdString = it.arguments?.getString("characterId")
                 var characterId by remember { mutableStateOf(characterIdString?.toLongOrNull()) }
+                Log.d("ScanScreen", "characterId: $characterId")
                 val launchedFromHomeScreen = (characterIdString?.toLongOrNull() == null)
 
                 if (characterId == null) {
                     val context = LocalContext.current.applicationContext as VBHelper
                     val storageRepository = StorageRepository(context.container.db)
-                    val characterData by storageRepository.getActiveCharacter().collectAsState(null)
+
+                    LaunchedEffect(characterId) {
+                        if (characterId == null) {
+                            val characterData = storageRepository.getActiveCharacter()
                             if (characterData != null) {
-                        characterId = characterData!!.id
+                                characterId = characterData.id
+                            }
+                        }
                     }
                 }
 
@@ -117,9 +121,8 @@ fun AppNavigation(
                 )
             }
             composable(NavigationItems.Dex.route) {
-                CardsScreen(
-                    navController = navController,
-                    cardScreenController = applicationNavigationHandlers.cardScreenController
+                DexScreen(
+                    navController = navController
                 )
             }
             composable(NavigationItems.Settings.route) {
@@ -137,9 +140,9 @@ fun AppNavigation(
             composable(NavigationItems.CardView.route) {
                 val cardId = it.arguments?.getString("cardId")
                 if (cardId != null) {
-                    CardViewScreen(
+                    DiMScreen(
                         navController = navController,
-                        cardId = cardId.toLong()
+                        dimId = cardId.toLong()
                     )
                 }
             }
@@ -171,17 +174,6 @@ fun AppNavigation(
                     navController = navController
                 )
             }
-            composable(NavigationItems.CardAdventure.route) {
-                val cardId = it.arguments?.getString("cardId")
-                if (cardId != null) {
-                    CardAdventureScreen(
-                        navController = navController,
-                        cardId = cardId.toLong(),
-                        cardScreenController = applicationNavigationHandlers
-                            .cardScreenController
-                    )
-                }
-            }
         }
     }
 }

app/src/main/java/com/github/nacabaro/vbhelper/navigation/BottomNavigationBar.kt

@@ -8,7 +8,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.painterResource
 import androidx.navigation.NavController
 import androidx.navigation.compose.currentBackStackEntryAsState
-import androidx.compose.ui.res.stringResource
+
 
 @Composable
 fun BottomNavigationBar(navController: NavController) {
@@ -26,8 +26,8 @@ fun BottomNavigationBar(navController: NavController) {
 
         items.forEach { item ->
             NavigationBarItem (
-                icon = { Icon(painter = painterResource(item.icon), contentDescription = stringResource(item.label)) },
-                label = { Text(text = stringResource(item.label)) },
+                icon = { Icon(painter = painterResource(item.icon), contentDescription = item.label) },
+                label = { Text(item.label) },
                 selected = currentRoute == item.route,
                 onClick = {
                     navController.navigate(item.route) {

app/src/main/java/com/github/nacabaro/vbhelper/navigation/NavigationItems.kt

@@ -1,101 +1,24 @@
 package com.github.nacabaro.vbhelper.navigation
 
 import com.github.nacabaro.vbhelper.R
-import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
 
-sealed class NavigationItems(
-    val route: String,
-    @DrawableRes val icon: Int,
-    @StringRes val label: Int
+sealed class NavigationItems (
+    var route: String,
+    var icon: Int,
+    var label: String
 ) {
-    object Scan : NavigationItems(
-        "Scan/{characterId}",
-        R.drawable.baseline_nfc_24,
-        R.string.nav_scan
-    )
-
-    object Battles : NavigationItems(
-        "Battle",
-        R.drawable.baseline_swords_24,
-        R.string.nav_battle
-    )
-
-    object Home : NavigationItems(
-        "Home",
-        R.drawable.baseline_cottage_24,
-        R.string.nav_home
-    )
-
-    object Dex : NavigationItems(
-        "Dex",
-        R.drawable.baseline_menu_book_24,
-        R.string.nav_dex
-    )
-
-    object CardAdventure : NavigationItems(
-        "CardAdventure/{cardId}",
-        R.drawable.baseline_fort_24,
-        R.string.nav_card_adventure
-    )
-
-    object Storage : NavigationItems(
-        "Storage",
-        R.drawable.baseline_catching_pokemon_24,
-        R.string.nav_storage
-    )
-
-    object Settings : NavigationItems(
-        "Settings",
-        R.drawable.baseline_settings_24,
-        R.string.nav_settings
-    )
-
-    object Viewer : NavigationItems(
-        "Viewer",
-        R.drawable.baseline_image_24,
-        R.string.nav_viewer
-    )
-
-    object CardView : NavigationItems(
-        "Card/{cardId}",
-        R.drawable.baseline_image_24,
-        R.string.nav_card
-    )
-
-    object Items : NavigationItems(
-        "Items",
-        R.drawable.baseline_data_24,
-        R.string.nav_items
-    )
-
-    object MyItems : NavigationItems(
-        "MyItems",
-        R.drawable.baseline_data_24,
-        R.string.nav_my_items
-    )
-
-    object ItemsStore : NavigationItems(
-        "ItemsStore",
-        R.drawable.baseline_data_24,
-        R.string.nav_items_store
-    )
-
-    object ApplyItem : NavigationItems(
-        "ApplyItem/{itemId}",
-        R.drawable.baseline_data_24,
-        R.string.nav_apply_item
-    )
-
-    object Adventure : NavigationItems(
-        "Adventure",
-        R.drawable.baseline_fort_24,
-        R.string.nav_adventure
-    )
-
-    object Credits : NavigationItems(
-        "Credits",
-        R.drawable.baseline_data_24,
-        R.string.nav_credits
-    )
+    object Scan : NavigationItems("Scan/{characterId}", R.drawable.baseline_nfc_24, "Scan")
+    object Battles : NavigationItems("Battle", R.drawable.baseline_swords_24, "Battle")
+    object Home : NavigationItems("Home", R.drawable.baseline_cottage_24, "Home")
+    object Dex : NavigationItems("Dex", R.drawable.baseline_menu_book_24, "Dex")
+    object Storage : NavigationItems("Storage", R.drawable.baseline_catching_pokemon_24, "Storage")
+    object Settings : NavigationItems("Settings", R.drawable.baseline_settings_24, "Settings")
+    object Viewer : NavigationItems("Viewer", R.drawable.baseline_image_24, "Viewer")
+    object CardView : NavigationItems("Card/{cardId}", R.drawable.baseline_image_24, "Card")
+    object Items : NavigationItems("Items", R.drawable.baseline_data_24, "Items")
+    object MyItems : NavigationItems("MyItems", R.drawable.baseline_data_24, "My items")
+    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")
 }

app/src/main/java/com/github/nacabaro/vbhelper/screens/BattlesScreen.kt

@@ -10,16 +10,13 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import com.github.nacabaro.vbhelper.components.TopBanner
-import androidx.compose.ui.res.stringResource
-import com.github.nacabaro.vbhelper.R
-
 
 @Composable
 fun BattlesScreen() {
     Scaffold (
         topBar = {
             TopBanner(
-                text = stringResource(R.string.battles_online_title)
+                text = "Online battles"
             )
         }
     ) { contentPadding ->
@@ -30,7 +27,7 @@ fun BattlesScreen() {
                 .padding(top = contentPadding.calculateTopPadding())
                 .fillMaxSize()
         ) {
-            Text(stringResource(R.string.battles_coming_soon))
+            Text("Coming soon")
         }
     }
 }

app/src/main/java/com/github/nacabaro/vbhelper/screens/DexScreen.kt

@@ -0,0 +1,83 @@
+package com.github.nacabaro.vbhelper.screens
+
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.Scaffold
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
+import com.github.nacabaro.vbhelper.utils.BitmapData
+import com.github.nacabaro.vbhelper.components.DexDiMEntry
+import com.github.nacabaro.vbhelper.components.TopBanner
+import com.github.nacabaro.vbhelper.di.VBHelper
+import com.github.nacabaro.vbhelper.dtos.CardDtos
+import com.github.nacabaro.vbhelper.navigation.NavigationItems
+import com.github.nacabaro.vbhelper.source.DexRepository
+import kotlinx.coroutines.launch
+
+@Composable
+fun DexScreen(
+    navController: NavController
+) {
+    val coroutineScope = rememberCoroutineScope()
+    val application = LocalContext.current.applicationContext as VBHelper
+    val dexRepository = DexRepository(application.container.db)
+
+    val cardList = remember { mutableStateOf<List<CardDtos.CardProgress>>(emptyList()) }
+
+    LaunchedEffect(dexRepository) {
+        coroutineScope.launch {
+            val newDimList = dexRepository.getAllDims()
+            cardList.value = newDimList // Replace the entire list atomically
+        }
+    }
+
+    Scaffold (
+        topBar = {
+            TopBanner(
+                text = "Discovered characters",
+                onGearClick = {
+                    navController.navigate(NavigationItems.Viewer.route)
+                }
+            )
+        }
+    ) { contentPadding ->
+        LazyColumn (
+            modifier = Modifier
+                .padding(top = contentPadding.calculateTopPadding())
+        ) {
+            items(cardList.value) {
+                DexDiMEntry(
+                    name = it.cardName,
+                    logo = BitmapData(
+                        bitmap = it.cardLogo,
+                        width = it.logoWidth,
+                        height = it.logoHeight
+                    ),
+                    onClick = {
+                        navController
+                            .navigate(
+                                NavigationItems
+                                    .CardView.route
+                                    .replace("{cardId}", "${it.cardId}")
+                            )
+                    },
+                    obtainedCharacters = it.obtainedCharacters,
+                    totalCharacters = it.totalCharacters,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(8.dp)
+                )
+            }
+        }
+    }
+}
+

app/src/main/java/com/github/nacabaro/vbhelper/screens/DimScreen.kt

@@ -1,57 +1,49 @@
-package com.github.nacabaro.vbhelper.screens.cardScreen
+package com.github.nacabaro.vbhelper.screens
 
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
 import androidx.navigation.NavController
 import com.github.nacabaro.vbhelper.utils.BitmapData
 import com.github.nacabaro.vbhelper.components.CharacterEntry
 import com.github.nacabaro.vbhelper.components.TopBanner
+import com.github.nacabaro.vbhelper.domain.characters.Character
 import com.github.nacabaro.vbhelper.di.VBHelper
 import com.github.nacabaro.vbhelper.dtos.CharacterDtos
-import com.github.nacabaro.vbhelper.navigation.NavigationItems
-import com.github.nacabaro.vbhelper.screens.cardScreen.dialogs.DexCharaDetailsDialog
 import com.github.nacabaro.vbhelper.source.DexRepository
-import com.github.nacabaro.vbhelper.R
-
+import kotlinx.coroutines.launch
 
 @Composable
-fun CardViewScreen(
+fun DiMScreen(
     navController: NavController,
-    cardId: Long
+    dimId: Long
 ) {
+    val coroutineScope = rememberCoroutineScope()
     val application = LocalContext.current.applicationContext as VBHelper
     val dexRepository = DexRepository(application.container.db)
 
-    val characterList by dexRepository.getCharactersByCardId(cardId).collectAsState(emptyList())
+    val characterList = remember { mutableStateOf<List<CharacterDtos.CardProgress>>(emptyList()) }
 
-    val selectedCharacter = remember { mutableStateOf<CharacterDtos.CardCharaProgress?>(null) }
+    LaunchedEffect(dexRepository) {
+        coroutineScope.launch {
+            val newCharacterList = dexRepository.getCharactersByDimId(dimId)
+            characterList.value = newCharacterList
+        }
+    }
 
     Scaffold (
         topBar = {
             TopBanner(
-                text = stringResource(R.string.card_view_discovered_characters),
+                text = "Discovered characters",
                 onBackClick = {
                     navController.popBackStack()
-                },
-                onAdventureClick = {
-                    navController
-                        .navigate(route = NavigationItems
-                            .CardAdventure
-                            .route
-                            .replace(
-                                "{cardId}",
-                                cardId.toString()
-                            )
-                        )
                 }
             )
         }
@@ -60,11 +52,9 @@ fun CardViewScreen(
             columns = GridCells.Fixed(3),
             contentPadding = contentPadding
         ) {
-            items(characterList) { character ->
+            items(characterList.value) { character ->
                 CharacterEntry(
-                    onClick = {
-                        selectedCharacter.value = character
-                    },
+                    onClick = {  },
                     obscure = character.discoveredOn == null,
                     icon = BitmapData(
                         bitmap = character.spriteIdle,
@@ -74,15 +64,5 @@ fun CardViewScreen(
                 )
             }
         }
-
-        if (selectedCharacter.value != null) {
-            DexCharaDetailsDialog(
-                currentChara = selectedCharacter.value!!,
-                obscure = selectedCharacter.value!!.discoveredOn == null,
-                onClickClose = {
-                    selectedCharacter.value = null
-                }
-            )
-        }
     }
 }

app/src/main/java/com/github/nacabaro/vbhelper/screens/adventureScreen/AdventureScreen.kt

@@ -9,16 +9,16 @@ 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.collectAsState
+import androidx.compose.runtime.LaunchedEffect
 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
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
 import androidx.navigation.NavController
 import com.github.nacabaro.vbhelper.screens.itemsScreen.ObtainedItemDialog
 import com.github.nacabaro.vbhelper.components.TopBanner
@@ -29,25 +29,24 @@ 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
-import com.github.nacabaro.vbhelper.R
 
 @Composable
 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 by storageRepository.getAdventureCharacters().collectAsState(emptyList())
-
+    val characterList = remember {
+        mutableStateOf<List<CharacterDtos.AdventureCharacterWithSprites>>(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) {
@@ -60,17 +59,24 @@ fun AdventureScreen(
         mutableStateOf<CharacterDtos.AdventureCharacterWithSprites?>(null)
     }
 
+    LaunchedEffect(storageRepository) {
+        coroutineScope.launch {
+            characterList.value = storageRepository
+                .getAdventureCharacters()
+        }
+    }
+
     Scaffold(
         topBar = {
             TopBanner(
-                text = stringResource(R.string.adventure_title),
+                text = "Adventure",
                 onBackClick = {
                     navController.popBackStack()
                 }
             )
         }
     ) { contentPadding ->
-        if (characterList.isEmpty()) {
+        if (characterList.value.isEmpty()) {
             Column(
                 verticalArrangement = Arrangement.Center,
                 horizontalAlignment = Alignment.CenterHorizontally,
@@ -78,14 +84,14 @@ fun AdventureScreen(
                     .padding(top = contentPadding.calculateTopPadding())
                     .fillMaxSize()
             ) {
-                Text(text = stringResource(R.string.adventure_empty_state))
+                Text(text = "Nothing to see here")
             }
         } else {
             LazyColumn(
                 modifier = Modifier
                     .padding(top = contentPadding.calculateTopPadding())
             ) {
-                items(characterList) {
+                items(characterList.value) {
                     AdventureEntry(
                         icon = BitmapData(
                             bitmap = it.spriteIdle,
@@ -96,9 +102,8 @@ fun AdventureScreen(
                         onClick = {
                             if (it.finishesAdventure < currentTime) {
                                 storageScreenController
-                                    .getItemFromAdventure(it.id) { adventureResult, generatedCurrency ->
+                                    .getItemFromAdventure(it.id) { adventureResult ->
                                         obtainedItem = adventureResult
-                                        obtainedCurrency = generatedCurrency
                                     }
                             } else {
                                 cancelAdventureDialog = it
@@ -113,7 +118,6 @@ fun AdventureScreen(
     if (obtainedItem != null) {
         ObtainedItemDialog(
             obtainedItem = obtainedItem!!,
-            obtainedCurrency = obtainedCurrency,
             onClickDismiss = {
                 obtainedItem = null
             }

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, Int) -> Unit)
+    fun getItemFromAdventure(characterId: Long, onResult: (ItemDtos.PurchasedItem) -> Unit)
     fun cancelAdventure(characterId: Long, onResult: () -> Unit)
 }

app/src/main/java/com/github/nacabaro/vbhelper/screens/adventureScreen/AdventureScreenControllerImpl.kt

@@ -6,7 +6,6 @@ import androidx.lifecycle.lifecycleScope
 import com.github.nacabaro.vbhelper.di.VBHelper
 import com.github.nacabaro.vbhelper.dtos.ItemDtos
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import kotlin.math.roundToInt
 import kotlin.random.Random
@@ -38,29 +37,19 @@ class AdventureScreenControllerImpl(
 
     override fun getItemFromAdventure(
         characterId: Long,
-        onResult: (ItemDtos.PurchasedItem, Int) -> Unit
+        onResult: (ItemDtos.PurchasedItem) -> Unit
     ) {
         componentActivity.lifecycleScope.launch(Dispatchers.IO) {
             database
                 .adventureDao()
                 .deleteAdventure(characterId)
 
-            val generatedCurrency = generateRandomCurrency()
-
             val generatedItem = generateItem(characterId)
 
-            onResult(generatedItem, generatedCurrency)
+            onResult(generatedItem)
         }
     }
 
-    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
@@ -88,7 +77,6 @@ class AdventureScreenControllerImpl(
         val randomItem = database
             .itemDao()
             .getAllItems()
-            .first()
             .random()
 
         val random = ((Random.nextFloat() * character.stage) + 3).roundToInt()
@@ -106,8 +94,7 @@ class AdventureScreenControllerImpl(
             itemName = randomItem.name,
             itemIcon = randomItem.itemIcon,
             itemLength = randomItem.itemLength,
-            itemDescription = randomItem.description,
-            itemType = randomItem.itemType
+            itemDescription = randomItem.description
         )
     }
 }

app/src/main/java/com/github/nacabaro/vbhelper/screens/cardScreen/CardAdventureEntry.kt

@@ -1,122 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.cardScreen
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardColors
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.contentColorFor
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.graphics.FilterQuality
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.dp
-import com.github.nacabaro.vbhelper.dtos.CardDtos
-import com.github.nacabaro.vbhelper.utils.BitmapData
-import com.github.nacabaro.vbhelper.utils.getImageBitmap
-
-@Composable
-fun CardAdventureEntry(
-    cardAdventureEntry: CardDtos.CardAdventureWithSprites,
-    obscure: Boolean
-) {
-    val charaImageBitmapData = BitmapData(
-        bitmap = cardAdventureEntry.characterIdleSprite,
-        width = cardAdventureEntry.characterIdleSpriteWidth,
-        height = cardAdventureEntry.characterIdleSpriteHeight
-    ).getImageBitmap(
-        context = LocalContext.current,
-        multiplier = 4,
-        obscure = obscure
-    )
-
-    val nameImageBitmapData = BitmapData(
-        bitmap = cardAdventureEntry.characterName,
-        width = cardAdventureEntry.characterNameWidth,
-        height = cardAdventureEntry.characterNameHeight
-    ).getImageBitmap(
-        context = LocalContext.current,
-        multiplier = 3,
-        obscure = obscure
-    )
-
-    Card (
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(8.dp)
-    ) {
-        Row (
-            modifier = Modifier
-                .padding(8.dp)
-        ){
-            Card (
-                colors = CardColors(
-                    containerColor = MaterialTheme.colorScheme.surfaceVariant,
-                    contentColor = MaterialTheme.colorScheme.contentColorFor(
-                        backgroundColor = MaterialTheme.colorScheme.surfaceVariant,
-                    ),
-                    disabledContainerColor = MaterialTheme.colorScheme.surfaceVariant,
-                    disabledContentColor = MaterialTheme.colorScheme.contentColorFor(
-                        backgroundColor = MaterialTheme.colorScheme.surfaceVariant,
-                    )
-                )
-            ) {
-                Image(
-                    bitmap = charaImageBitmapData.imageBitmap,
-                    contentDescription = "Icon",
-                    modifier = Modifier
-                        .size(charaImageBitmapData.dpWidth)
-                        .padding(8.dp),
-                    colorFilter = when (obscure) {
-                        true -> ColorFilter.tint(color = MaterialTheme.colorScheme.secondary)
-                        false -> null
-                    },
-                    filterQuality = FilterQuality.None
-                )
-            }
-
-            Spacer(modifier = Modifier.padding(8.dp))
-
-            Column {
-                if (!obscure) {
-                    Image(
-                        bitmap = nameImageBitmapData.imageBitmap,
-                        contentDescription = "Icon",
-                        modifier = Modifier
-                            .width(nameImageBitmapData.dpWidth)
-                            .height(nameImageBitmapData.dpHeight),
-                        filterQuality = FilterQuality.None
-                    )
-
-                    Spacer(modifier = Modifier.padding(4.dp))
-
-                    Text(
-                        text = "HP: ${cardAdventureEntry.characterHp}, DP: ${cardAdventureEntry.characterDp}, AP: ${cardAdventureEntry.characterAp}"
-                    )
-                    if (cardAdventureEntry.characterBp != null) {
-                        Text(text = "BP: ${cardAdventureEntry.characterBp}")
-                    }
-                    Text(text = "Steps: ${cardAdventureEntry.steps}")
-                } else {
-                    Text(text = "????????????????")
-                    Text(
-                        text = "HP: -, BP: -, AP: -"
-                    )
-                    if (cardAdventureEntry.characterBp != null) {
-                        Text(text = "DP: -")
-                    }
-                    Text(text = "Steps: -")
-                }
-            }
-        }
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/screens/cardScreen/CardAdventureScreen.kt

@@ -1,54 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.cardScreen
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.Scaffold
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import androidx.navigation.NavController
-import com.github.nacabaro.vbhelper.components.TopBanner
-import androidx.compose.ui.res.stringResource
-import com.github.nacabaro.vbhelper.R
-
-
-@Composable
-fun CardAdventureScreen(
-    navController: NavController,
-    cardScreenController: CardScreenControllerImpl,
-    cardId: Long
-) {
-    val cardAdventureMissions by cardScreenController
-        .getCardAdventureMissions(cardId)
-        .collectAsState(emptyList())
-    val currentCardAdventure by cardScreenController
-        .getCardProgress(cardId)
-        .collectAsState(0)
-
-    Scaffold (
-        topBar = {
-            TopBanner(
-                text = stringResource(R.string.card_adventure_missions_title),
-                onBackClick = {
-                    navController.popBackStack()
-                }
-            )
-        }
-    ) { contentPadding ->
-        Column (
-            modifier = Modifier
-                .padding(top = contentPadding.calculateTopPadding())
-                .verticalScroll(state = rememberScrollState())
-        ) {
-            cardAdventureMissions.mapIndexed { index, it ->
-                CardAdventureEntry(
-                    cardAdventureEntry = it,
-                    obscure = index > currentCardAdventure - 1
-                )
-            }
-        }
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/screens/cardScreen/CardEntry.kt

@@ -1,116 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.cardScreen
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material.icons.filled.Edit
-import androidx.compose.material3.Card
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.FilterQuality
-import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.dp
-import com.github.nacabaro.vbhelper.utils.BitmapData
-import com.github.nacabaro.vbhelper.utils.getBitmap
-import androidx.compose.ui.res.stringResource
-import com.github.nacabaro.vbhelper.R
-
-
-@Composable
-fun CardEntry(
-    name: String,
-    logo: BitmapData,
-    obtainedCharacters: Int,
-    totalCharacters: Int,
-    onClick: () -> Unit,
-    displayModify: Boolean,
-    onClickModify: () -> Unit,
-    onClickDelete: () -> Unit,
-    modifier: Modifier = Modifier
-) {
-    val bitmap = remember (logo.bitmap) { logo.getBitmap() }
-    val imageBitmap = remember(bitmap) { bitmap.asImageBitmap() }
-    val density: Float = LocalContext.current.resources.displayMetrics.density
-    val dpSize = (logo.width * 4 / density).dp
-
-    Card (
-        shape = MaterialTheme.shapes.medium,
-        modifier = modifier,
-        onClick = if (!displayModify) {
-            onClick
-        } else {
-            {  }
-        }
-    ) {
-        Row (
-            horizontalArrangement = Arrangement.Start,
-            verticalAlignment = Alignment.CenterVertically,
-            modifier = Modifier
-                .padding(8.dp)
-        ) {
-            Image (
-                bitmap = imageBitmap,
-                contentDescription = name,
-                filterQuality = FilterQuality.None,
-                modifier = Modifier
-                    .padding(8.dp)
-                    .size(dpSize)
-            )
-            Column(
-                modifier = Modifier
-                    .padding(8.dp)
-                    .weight(1f)
-            ) {
-                Text(
-                    text = name,
-                    modifier = Modifier
-                )
-                Text(
-                    text = stringResource(
-                        R.string.card_entry_characters_obtained,
-                        obtainedCharacters,
-                        totalCharacters
-                    ),
-                    fontFamily = MaterialTheme.typography.labelSmall.fontFamily,
-                    fontSize = MaterialTheme.typography.labelSmall.fontSize,
-                    modifier = Modifier
-                )
-            }
-            if (displayModify) {
-                Row (
-                    modifier = Modifier,
-                    horizontalArrangement = Arrangement.End,
-                ) {
-                    IconButton(
-                        onClick = onClickModify
-                    ) {
-                        Icon(
-                            imageVector = Icons.Default.Edit,
-                            contentDescription = stringResource(R.string.card_entry_edit)
-                        )
-                    }
-                    IconButton(
-                        onClick = onClickDelete
-                    ) {
-                        Icon(
-                            imageVector = Icons.Default.Delete,
-                            contentDescription = stringResource(R.string.card_entry_delete)
-                        )
-                    }
-                }
-            }
-        }
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/screens/cardScreen/CardScreenController.kt

@@ -1,13 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.cardScreen
-
-import com.github.nacabaro.vbhelper.dtos.CardDtos
-import com.github.nacabaro.vbhelper.dtos.CharacterDtos
-import kotlinx.coroutines.flow.Flow
-
-interface CardScreenController {
-    fun renameCard(cardId: Long, newName: String, onRenamed: (String) -> Unit)
-    fun deleteCard(cardId: Long, onDeleted: () -> Unit)
-    fun getCardAdventureMissions(cardId: Long): Flow<List<CardDtos.CardAdventureWithSprites>>
-    fun getCardProgress(cardId: Long): Flow<Int>
-    fun getFusionsForCharacters(characterId: Long): Flow<List<CharacterDtos.FusionsWithSpritesAndObtained>>
-}

app/src/main/java/com/github/nacabaro/vbhelper/screens/cardScreen/CardScreenControllerImpl.kt

@@ -1,55 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.cardScreen
-
-import androidx.activity.ComponentActivity
-import androidx.lifecycle.lifecycleScope
-import com.github.nacabaro.vbhelper.di.VBHelper
-import com.github.nacabaro.vbhelper.dtos.CardDtos
-import com.github.nacabaro.vbhelper.dtos.CharacterDtos
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.launch
-
-class CardScreenControllerImpl(
-    private val componentActivity: ComponentActivity,
-) : CardScreenController {
-    private val application = componentActivity.applicationContext as VBHelper
-    private val database = application.container.db
-
-    override fun renameCard(cardId: Long, newName: String, onRenamed: (String) -> Unit) {
-        componentActivity.lifecycleScope.launch {
-            database
-                .cardDao()
-                .renameCard(cardId.toInt(), newName)
-
-            onRenamed(newName)
-        }
-    }
-
-    override fun deleteCard(cardId: Long, onDeleted: () -> Unit) {
-        componentActivity.lifecycleScope.launch {
-            database
-                .cardDao()
-                .deleteCard(cardId)
-
-            onDeleted()
-        }
-    }
-
-    override fun getCardAdventureMissions(cardId: Long): Flow<List<CardDtos.CardAdventureWithSprites>> {
-        return database
-            .cardAdventureDao()
-            .getAdventureForCard(cardId)
-    }
-
-    override fun getCardProgress(cardId: Long): Flow<Int> {
-        return database
-            .cardProgressDao()
-            .getCardProgress(cardId)
-    }
-
-    override fun getFusionsForCharacters(characterId: Long): Flow<List<CharacterDtos.FusionsWithSpritesAndObtained>> {
-        return database
-            .cardFusionsDao()
-            .getFusionsForCharacter(characterId)
-    }
-
-}

app/src/main/java/com/github/nacabaro/vbhelper/screens/cardScreen/CardsScreen.kt

@@ -1,137 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.cardScreen
-
-import android.util.Log
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.Scaffold
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.dp
-import androidx.navigation.NavController
-import com.github.nacabaro.vbhelper.utils.BitmapData
-import com.github.nacabaro.vbhelper.components.TopBanner
-import com.github.nacabaro.vbhelper.di.VBHelper
-import com.github.nacabaro.vbhelper.dtos.CardDtos
-import com.github.nacabaro.vbhelper.navigation.NavigationItems
-import com.github.nacabaro.vbhelper.screens.cardScreen.dialogs.CardDeleteDialog
-import com.github.nacabaro.vbhelper.screens.cardScreen.dialogs.CardRenameDialog
-import com.github.nacabaro.vbhelper.source.DexRepository
-import androidx.compose.ui.res.stringResource
-import com.github.nacabaro.vbhelper.R
-
-@Composable
-fun CardsScreen(
-    navController: NavController,
-    cardScreenController: CardScreenControllerImpl
-) {
-    val application = LocalContext.current.applicationContext as VBHelper
-    val dexRepository = DexRepository(application.container.db)
-    val cardList by dexRepository.getAllDims().collectAsState(emptyList())
-
-    val selectedCard = remember { mutableStateOf<CardDtos.CardProgress?>(null) }
-    var clickedDelete by remember { mutableStateOf(false) }
-    var clickedRename by remember { mutableStateOf(false) }
-
-    var modifyCards by remember { mutableStateOf(false) }
-
-    Scaffold (
-        topBar = {
-            TopBanner(
-                text = stringResource(R.string.cards_my_cards_title),
-                onModifyClick = {
-                    modifyCards = !modifyCards
-                }
-            )
-        }
-    ) { contentPadding ->
-        LazyColumn (
-            modifier = Modifier
-                .padding(top = contentPadding.calculateTopPadding())
-        ) {
-            items(cardList) {
-                CardEntry(
-                    name = it.cardName,
-                    logo = BitmapData(
-                        bitmap = it.cardLogo,
-                        width = it.logoWidth,
-                        height = it.logoHeight
-                    ),
-                    onClick = {
-                        navController
-                            .navigate(
-                                NavigationItems
-                                    .CardView.route
-                                    .replace("{cardId}", "${it.cardId}")
-                            )
-                    },
-                    obtainedCharacters = it.obtainedCharacters,
-                    totalCharacters = it.totalCharacters,
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(8.dp),
-                    displayModify = modifyCards,
-                    onClickModify = {
-                        selectedCard.value = it
-                        clickedRename = true
-                    },
-                    onClickDelete = {
-                        selectedCard.value = it
-                        clickedDelete = true
-                    }
-                )
-            }
-        }
-    }
-
-    if (clickedRename) {
-        CardRenameDialog(
-            onDismiss = {
-                clickedRename = false
-                selectedCard.value = null
-            },
-            onRename = { newName ->
-                Log.d("CardsScreen", "New name: $newName")
-                Log.d("CardsScreen", "Card: ${selectedCard.value.toString()}")
-                cardScreenController
-                    .renameCard(
-                        cardId = selectedCard.value!!.cardId,
-                        newName = newName,
-                        onRenamed = {
-                            clickedRename = false
-                            selectedCard.value = null
-                        }
-                    )
-            },
-            currentName = selectedCard.value!!.cardName
-        )
-    }
-
-    if (clickedDelete) {
-        CardDeleteDialog(
-            cardName = selectedCard.value!!.cardName,
-            onDismiss = {
-                clickedDelete = false
-                selectedCard.value = null
-            },
-            onConfirm = {
-                cardScreenController
-                    .deleteCard(
-                        cardId = selectedCard.value!!.cardId,
-                        onDeleted = {
-                            clickedDelete = false
-                            selectedCard.value = null
-                        }
-                    )
-            }
-        )
-    }
-}
-

app/src/main/java/com/github/nacabaro/vbhelper/screens/cardScreen/dialogs/CardDeleteDialog.kt

@@ -1,51 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.cardScreen.dialogs
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-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 CardDeleteDialog(
-    cardName: String,
-    onDismiss: () -> Unit,
-    onConfirm: () -> Unit
-) {
-    Dialog(
-        onDismissRequest = onDismiss
-
-    ) {
-        Card ( ) {
-            Column (
-                modifier = Modifier
-                    .padding(16.dp)
-            ) {
-                Text(text = "Are you sure you want to delete $cardName. This action will also delete all the characters raised from this card.")
-                Spacer(modifier = Modifier.padding(8.dp))
-                Row {
-                    Button(
-                        onClick = {
-                            onDismiss()
-                        }
-                    ) {
-                        Text(text = "Confirm")
-                    }
-                    Button(
-                        onClick = {
-                            onConfirm()
-                        }
-                    ) {
-                        Text(text = "Delete")
-                    }
-                }
-            }
-        }
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/screens/cardScreen/dialogs/CardRenameDialog.kt

@@ -1,52 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.cardScreen.dialogs
-
-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.material3.TextField
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Dialog
-
-@Composable
-fun CardRenameDialog(
-    onDismiss: () -> Unit,
-    onRename: (String) -> Unit,
-    currentName: String
-) {
-    var cardName by remember { mutableStateOf(currentName) }
-
-    Dialog(
-        onDismissRequest = onDismiss
-
-    ) {
-        Card ( ) {
-            Column (
-                modifier = Modifier
-                    .padding(16.dp)
-            ) {
-                TextField(
-                    value = cardName,
-                    onValueChange = { cardName = it }
-                )
-                Spacer(modifier = Modifier.padding(8.dp))
-                Button(
-                    onClick = {
-                        onRename(cardName)
-                        onDismiss()
-                    }
-                ) {
-                    Text(text = "Rename")
-                }
-            }
-        }
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/screens/cardScreen/dialogs/DexCharaDetailsDialog.kt

@@ -1,287 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.cardScreen.dialogs
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.material3.Button
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardColors
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.contentColorFor
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.graphics.FilterQuality
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Dialog
-import com.github.nacabaro.vbhelper.di.VBHelper
-import com.github.nacabaro.vbhelper.dtos.CharacterDtos
-import com.github.nacabaro.vbhelper.source.DexRepository
-import com.github.nacabaro.vbhelper.utils.BitmapData
-import com.github.nacabaro.vbhelper.utils.getImageBitmap
-import androidx.compose.ui.res.stringResource
-import com.github.nacabaro.vbhelper.R
-
-@Composable
-fun DexCharaDetailsDialog(
-    currentChara: CharacterDtos.CardCharaProgress,
-    obscure: Boolean,
-    onClickClose: () -> Unit
-) {
-    val nameMultiplier = 3
-    val charaMultiplier = 4
-
-    val application = LocalContext.current.applicationContext as VBHelper
-    val database = application.container.db
-    val dexRepository = DexRepository(database)
-
-    var showFusions by remember { mutableStateOf(false) }
-
-    val currentCharaPossibleTransformations by dexRepository
-        .getCharacterPossibleTransformations(currentChara.id)
-        .collectAsState(emptyList())
-
-    val currentCharaPossibleFusions by dexRepository
-        .getCharacterPossibleFusions(currentChara.id)
-        .collectAsState(emptyList())
-
-    val romanNumeralsStage = when (currentChara.stage) {
-        1 -> "II"
-        2 -> "III"
-        3 -> "IV"
-        4 -> "V"
-        5 -> "VI"
-        6 -> "VII"
-        else -> "I"
-    }
-
-    val charaBitmapData = BitmapData(
-        bitmap = currentChara.spriteIdle,
-        width = currentChara.spriteWidth,
-        height = currentChara.spriteHeight
-    )
-    val charaImageBitmapData = charaBitmapData.getImageBitmap(
-        context = LocalContext.current,
-        multiplier = charaMultiplier,
-        obscure = obscure
-    )
-
-    val nameBitmapData = BitmapData(
-        bitmap = currentChara.nameSprite,
-        width = currentChara.nameSpriteWidth,
-        height = currentChara.nameSpriteHeight
-    )
-    val nameImageBitmapData = nameBitmapData.getImageBitmap(
-        context = LocalContext.current,
-        multiplier = nameMultiplier,
-        obscure = obscure
-    )
-
-    Dialog(
-        onDismissRequest = onClickClose
-    ) {
-        Card (
-            modifier = Modifier
-                .fillMaxWidth()
-        ) {
-            Column (
-                modifier = Modifier
-                    .padding(16.dp)
-            ) {
-                Row (
-                    verticalAlignment = Alignment.CenterVertically,
-                    modifier = Modifier
-                ) {
-                    Card (
-                        colors = CardColors(
-                            containerColor = MaterialTheme.colorScheme.surfaceVariant,
-                            contentColor = MaterialTheme.colorScheme.contentColorFor(
-                                backgroundColor = MaterialTheme.colorScheme.surfaceVariant,
-                            ),
-                            disabledContainerColor = MaterialTheme.colorScheme.surfaceVariant,
-                            disabledContentColor = MaterialTheme.colorScheme.contentColorFor(
-                                backgroundColor = MaterialTheme.colorScheme.surfaceVariant,
-                            )
-                        )
-                    ) {
-                        Image(
-                            bitmap = charaImageBitmapData.imageBitmap,
-                            contentDescription = stringResource(R.string.dex_chara_icon_description),
-                            modifier = Modifier
-                                .size(charaImageBitmapData.dpWidth)
-                                .padding(8.dp),
-                            colorFilter = when (obscure) {
-                                true -> ColorFilter.tint(color = MaterialTheme.colorScheme.secondary)
-                                false -> null
-                            },
-                            filterQuality = FilterQuality.None
-                        )
-                    }
-                    Spacer(
-                        modifier = Modifier
-                            .padding(16.dp)
-                    )
-                    if (!obscure) {
-                        Column {
-                            Image(
-                                bitmap = nameImageBitmapData.imageBitmap,
-                                contentDescription = stringResource(R.string.dex_chara_name_icon_description),
-                                modifier = Modifier
-                                    .width(nameImageBitmapData.dpWidth)
-                                    .height(nameImageBitmapData.dpHeight),
-                                filterQuality = FilterQuality.None
-                            )
-                            Spacer(modifier = Modifier.padding(4.dp))
-                            if (currentChara.baseHp != 65535) {
-                                Text(
-                                    text = stringResource(
-                                        R.string.dex_chara_stats,
-                                        currentChara.baseHp,
-                                        currentChara.baseBp,
-                                        currentChara.baseAp
-                                    )
-                                )
-                                Text(
-                                    text = stringResource(
-                                        R.string.dex_chara_stage_attribute,
-                                        romanNumeralsStage,
-                                        currentChara.attribute.toString().substring(0, 2)
-                                    )
-                                )
-                            }
-                        }
-                    } else {
-                        Column {
-                            Text(stringResource(R.string.dex_chara_unknown_name))
-                            Spacer(modifier = Modifier.padding(4.dp))
-                            Text(stringResource(R.string.dex_chara_stage_attribute_unknown))
-                            Text(stringResource(R.string.dex_chara_stats_unknown))
-                        }
-                    }
-                }
-                Spacer(modifier = Modifier.padding(16.dp))
-                Column {
-                    currentCharaPossibleTransformations.map {
-                        val selectedCharaBitmap = BitmapData(
-                            bitmap = it.spriteIdle,
-                            width = it.spriteWidth,
-                            height = it.spriteHeight
-                        )
-                        val selectedCharaImageBitmap = selectedCharaBitmap.getImageBitmap(
-                            context = LocalContext.current,
-                            multiplier = 4,
-                            obscure = it.discoveredOn == null
-                        )
-
-                        Card (
-                            modifier = Modifier
-                                .padding(vertical = 8.dp)
-                        ) {
-                            Row (
-                                verticalAlignment = Alignment.CenterVertically,
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                            ) {
-                                Card (
-                                    colors = CardColors(
-                                        containerColor = MaterialTheme.colorScheme.surfaceVariant,
-                                        contentColor = MaterialTheme.colorScheme.contentColorFor(
-                                            backgroundColor = MaterialTheme.colorScheme.surfaceVariant,
-                                        ),
-                                        disabledContainerColor = MaterialTheme.colorScheme.surfaceVariant,
-                                        disabledContentColor = MaterialTheme.colorScheme.contentColorFor(
-                                            backgroundColor = MaterialTheme.colorScheme.surfaceVariant,
-                                        )
-                                    )
-                                ) {
-                                    Image(
-                                        bitmap = selectedCharaImageBitmap.imageBitmap,
-                                        contentDescription = stringResource(R.string.dex_chara_icon_description),
-                                        modifier = Modifier
-                                            .size(selectedCharaImageBitmap.dpWidth)
-                                            .padding(8.dp),
-                                        colorFilter = when (it.discoveredOn == null) {
-                                            true -> ColorFilter.tint(color = MaterialTheme.colorScheme.secondary)
-                                            false -> null
-                                        },
-                                        filterQuality = FilterQuality.None
-                                    )
-                                }
-                                Spacer(
-                                    modifier = Modifier
-                                        .padding(16.dp)
-                                )
-                                Column {
-                                    Text(
-                                        text = stringResource(
-                                            R.string.dex_chara_requirements,
-                                            it.requiredTrophies,
-                                            it.requiredBattles,
-                                            it.requiredVitals,
-                                            it.requiredWinRate,
-                                            it.changeTimerHours
-                                        )
-                                    )
-                                    Text(
-                                        text = stringResource(
-                                            R.string.dex_chara_adventure_level,
-                                            it.requiredAdventureLevelCompleted + 1
-                                        )
-                                    )
-                                }
-                            }
-                        }
-                    }
-                }
-
-                Row {
-                    if (currentCharaPossibleFusions.isNotEmpty()) {
-                        Button(
-                            onClick = {
-                                showFusions = true
-                            }
-                        ) {
-                            Text(stringResource(R.string.dex_chara_fusions_button))
-                        }
-                    }
-
-                    Spacer(
-                        modifier = Modifier
-                            .padding(4.dp)
-                    )
-
-                    Button(
-                        onClick = onClickClose
-                    ) {
-                        Text(stringResource(R.string.dex_chara_close_button))
-                    }
-                }
-            }
-        }
-    }
-
-    if (showFusions) {
-        DexCharaFusionsDialog(
-            currentChara = currentChara,
-            currentCharaPossibleFusions = currentCharaPossibleFusions,
-            onClickDismiss = {
-                showFusions = false
-            },
-            obscure = obscure
-        )
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/screens/cardScreen/dialogs/DexCharaFusionsDialog.kt

@@ -1,191 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.cardScreen.dialogs
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.material3.Button
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardColors
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.contentColorFor
-import androidx.compose.runtime.Composable
-import com.github.nacabaro.vbhelper.dtos.CharacterDtos
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.graphics.FilterQuality
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Dialog
-import com.github.nacabaro.vbhelper.utils.BitmapData
-import com.github.nacabaro.vbhelper.utils.getImageBitmap
-
-@Composable
-fun DexCharaFusionsDialog(
-    currentChara: CharacterDtos.CardCharaProgress,
-    currentCharaPossibleFusions: List<CharacterDtos.FusionsWithSpritesAndObtained>,
-    obscure: Boolean,
-    onClickDismiss: () -> Unit,
-) {
-    val nameMultiplier = 3
-    val charaMultiplier = 4
-
-    val charaBitmapData = BitmapData(
-        bitmap = currentChara.spriteIdle,
-        width = currentChara.spriteWidth,
-        height = currentChara.spriteHeight
-    )
-    val charaImageBitmapData = charaBitmapData.getImageBitmap(
-        context = LocalContext.current,
-        multiplier = charaMultiplier,
-        obscure = obscure
-    )
-
-    val nameBitmapData = BitmapData(
-        bitmap = currentChara.nameSprite,
-        width = currentChara.nameSpriteWidth,
-        height = currentChara.nameSpriteHeight
-    )
-    val nameImageBitmapData = nameBitmapData.getImageBitmap(
-        context = LocalContext.current,
-        multiplier = nameMultiplier,
-        obscure = obscure
-    )
-
-    Dialog(
-        onDismissRequest = onClickDismiss,
-    ) {
-        Card(
-            modifier = Modifier
-                .fillMaxWidth()
-        ) {
-            Column(
-                modifier = Modifier
-                    .padding(16.dp)
-            ) {
-                Row {
-                    Card (
-                        colors = CardColors(
-                            containerColor = MaterialTheme.colorScheme.surfaceVariant,
-                            contentColor = MaterialTheme.colorScheme.contentColorFor(
-                                backgroundColor = MaterialTheme.colorScheme.surfaceVariant,
-                            ),
-                            disabledContainerColor = MaterialTheme.colorScheme.surfaceVariant,
-                            disabledContentColor = MaterialTheme.colorScheme.contentColorFor(
-                                backgroundColor = MaterialTheme.colorScheme.surfaceVariant,
-                            )
-                        )
-                    ) {
-                        Image(
-                            bitmap = charaImageBitmapData.imageBitmap,
-                            contentDescription = "Icon",
-                            modifier = Modifier
-                                .size(charaImageBitmapData.dpWidth)
-                                .padding(8.dp),
-                            colorFilter = when (obscure) {
-                                true -> ColorFilter.tint(color = MaterialTheme.colorScheme.secondary)
-                                false -> null
-                            },
-                            filterQuality = FilterQuality.None
-                        )
-                    }
-
-                    Spacer(
-                        modifier = Modifier
-                            .padding(16.dp)
-                    )
-
-                    if (!obscure) {
-                        Column {
-                            Image(
-                                bitmap = nameImageBitmapData.imageBitmap,
-                                contentDescription = "Icon",
-                                modifier = Modifier
-                                    .width(nameImageBitmapData.dpWidth)
-                                    .height(nameImageBitmapData.dpHeight),
-                                filterQuality = FilterQuality.None
-                            )
-                        }
-                    } else {
-                        Column {
-                            Text(text = "????????????????")
-                        }
-                    }
-                }
-
-                Spacer(modifier = Modifier.padding(16.dp))
-                Column {
-                    currentCharaPossibleFusions.map {
-                        val selectedCharaBitmap = BitmapData(
-                            bitmap = it.spriteIdle,
-                            width = it.spriteWidth,
-                            height = it.spriteHeight
-                        )
-                        val selectedCharaImageBitmap = selectedCharaBitmap.getImageBitmap(
-                            context = LocalContext.current,
-                            multiplier = 4,
-                            obscure = it.discoveredOn == null
-                        )
-
-                        Card (
-                            modifier = Modifier
-                                .padding(vertical = 8.dp)
-                        ) {
-                            Row (
-                                verticalAlignment = Alignment.CenterVertically,
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                            ) {
-                                Card (
-                                    colors = CardColors(
-                                        containerColor = MaterialTheme.colorScheme.surfaceVariant,
-                                        contentColor = MaterialTheme.colorScheme.contentColorFor(
-                                            backgroundColor = MaterialTheme.colorScheme.surfaceVariant,
-                                        ),
-                                        disabledContainerColor = MaterialTheme.colorScheme.surfaceVariant,
-                                        disabledContentColor = MaterialTheme.colorScheme.contentColorFor(
-                                            backgroundColor = MaterialTheme.colorScheme.surfaceVariant,
-                                        )
-                                    )
-                                ) {
-                                    Image(
-                                        bitmap = selectedCharaImageBitmap.imageBitmap,
-                                        contentDescription = "Icon",
-                                        modifier = Modifier
-                                            .size(selectedCharaImageBitmap.dpWidth)
-                                            .padding(8.dp),
-                                        colorFilter = when (it.discoveredOn == null) {
-                                            true -> ColorFilter.tint(color = MaterialTheme.colorScheme.secondary)
-                                            false -> null
-                                        },
-                                        filterQuality = FilterQuality.None
-                                    )
-                                }
-                                Spacer(
-                                    modifier = Modifier
-                                        .padding(16.dp)
-                                )
-                                Column {
-                                    Text("Combine with ${it.fusionAttribute}")
-                                }
-                            }
-                        }
-                    }
-                }
-
-                Button(
-                    onClick = onClickDismiss
-                ) {
-                    Text("Close")
-                }
-            }
-        }
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/BEBEmHomeScreen.kt

@@ -1,4 +1,4 @@
-package com.github.nacabaro.vbhelper.screens.homeScreens.screens
+package com.github.nacabaro.vbhelper.screens.homeScreens
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -26,7 +26,6 @@ import java.util.Locale
 fun BEBEmHomeScreen(
     activeMon: CharacterDtos.CharacterWithSprites,
     beData: BECharacterData,
-    cardIcon: BitmapData,
     transformationHistory: List<CharacterDtos.TransformationHistory>,
     contentPadding: PaddingValues
 ) {
@@ -47,7 +46,6 @@ fun BEBEmHomeScreen(
                 ),
                 multiplier = 8,
                 shape = androidx.compose.material.MaterialTheme.shapes.small,
-                cardIcon = cardIcon,
                 modifier = Modifier
                     .weight(1f)
                     .aspectRatio(1f)

app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/BEDiMHomeScreen.kt

@@ -1,4 +1,4 @@
-package com.github.nacabaro.vbhelper.screens.homeScreens.screens
+package com.github.nacabaro.vbhelper.screens.homeScreens
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -26,7 +26,6 @@ import kotlin.text.format
 @Composable
 fun BEDiMHomeScreen(
     activeMon: CharacterDtos.CharacterWithSprites,
-    cardIcon: BitmapData,
     beData: BECharacterData,
     transformationHistory: List<CharacterDtos.TransformationHistory>,
     contentPadding: PaddingValues
@@ -46,7 +45,6 @@ fun BEDiMHomeScreen(
                     width = activeMon.spriteWidth,
                     height = activeMon.spriteHeight
                 ),
-                cardIcon = cardIcon,
                 multiplier = 8,
                 shape = androidx.compose.material.MaterialTheme.shapes.small,
                 modifier = Modifier

app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/BetaWarning.kt

@@ -8,10 +8,8 @@ import androidx.compose.material3.Card
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
-import com.github.nacabaro.vbhelper.R
 
 @Composable
 fun BetaWarning(
@@ -21,26 +19,26 @@ fun BetaWarning(
         onDismissRequest = onDismissRequest
     ) {
         Card {
-            Column(
+            Column (
                 modifier = Modifier
                     .padding(16.dp)
             ) {
                 Text(
-                    text = stringResource(R.string.beta_warning_message_main)
+                    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 = stringResource(R.string.beta_warning_message_compatibility)
+                    text = "Also, this application does not work yet with the original VB."
                 )
                 Spacer(modifier = Modifier.padding(8.dp))
                 Text(
-                    text = stringResource(R.string.beta_warning_message_thanks)
+                    text = "Thank you for your understanding and patience. Sincerely, the dev team."
                 )
                 Spacer(modifier = Modifier.padding(8.dp))
                 Button(
                     onClick = onDismissRequest
                 ) {
-                    Text(text = stringResource(R.string.beta_warning_button_dismiss))
+                    Text(text = "Dismiss")
                 }
             }
         }

app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/HomeScreen.kt

@@ -11,7 +11,6 @@ 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.remember
@@ -20,7 +19,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
@@ -30,19 +28,11 @@ import com.github.nacabaro.vbhelper.di.VBHelper
 import com.github.nacabaro.vbhelper.utils.DeviceType
 import com.github.nacabaro.vbhelper.domain.device_data.BECharacterData
 import com.github.nacabaro.vbhelper.domain.device_data.VBCharacterData
-import com.github.nacabaro.vbhelper.dtos.ItemDtos
+import com.github.nacabaro.vbhelper.dtos.CharacterDtos
 import com.github.nacabaro.vbhelper.navigation.NavigationItems
-import com.github.nacabaro.vbhelper.screens.homeScreens.screens.BEBEmHomeScreen
-import com.github.nacabaro.vbhelper.screens.homeScreens.screens.BEDiMHomeScreen
-import com.github.nacabaro.vbhelper.screens.homeScreens.screens.VBDiMHomeScreen
-import com.github.nacabaro.vbhelper.screens.itemsScreen.ObtainedItemDialog
 import com.github.nacabaro.vbhelper.source.StorageRepository
-import com.github.nacabaro.vbhelper.R
-import com.github.nacabaro.vbhelper.dtos.CardDtos
-import com.github.nacabaro.vbhelper.source.CardRepository
-import com.github.nacabaro.vbhelper.utils.BitmapData
-import kotlinx.coroutines.flow.flowOf
-import kotlin.collections.emptyList
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
 @Composable
 fun HomeScreen(
@@ -51,59 +41,22 @@ fun HomeScreen(
 ) {
     val application = LocalContext.current.applicationContext as VBHelper
     val storageRepository = StorageRepository(application.container.db)
-    val cardRepository = CardRepository(application.container.db)
-
-    val activeMon by storageRepository
-        .getActiveCharacter()
-        .collectAsState(initial = null)
-
-    val cardIconData by (
-        activeMon
-            ?.let { chara ->
-                cardRepository.getCardIconByCharaId(chara.charId)
-            }
-            ?: flowOf<CardDtos.CardIcon?>(null)
-    ).collectAsState(initial = null)
-
-    val transformationHistory by (
-        activeMon
-            ?.let { chara ->
-                storageRepository.getTransformationHistory(chara.id)
-            }
-            ?: flowOf(emptyList())
-    ).collectAsState(initial = emptyList())
-
-    val vbSpecialMissions by (
-        activeMon
-            ?.takeIf { it.characterType == DeviceType.VBDevice }
-            ?.let { chara ->
-                storageRepository.getSpecialMissions(chara.id)
-            }
-            ?: flowOf(emptyList())
-    ).collectAsState(initial = emptyList())
-
-    val vbData by (
-        activeMon
-            ?.takeIf { it.characterType == DeviceType.VBDevice }
-            ?.let { chara ->
-                storageRepository.getCharacterVbData(chara.id)
-            }
-            ?: flowOf<VBCharacterData?>(null)
-    ).collectAsState(initial = null)
-
-    val beData by (
-        activeMon
-            ?.takeIf { it.characterType == DeviceType.BEDevice }
-            ?.let { chara ->
-                storageRepository.getCharacterBeData(chara.id)
-            }
-            ?: flowOf<BECharacterData?>(null)
-    ).collectAsState(initial = null)
-
+    val activeMon = remember { mutableStateOf<CharacterDtos.CharacterWithSprites?>(null) }
+    val transformationHistory = remember { mutableStateOf<List<CharacterDtos.TransformationHistory>?>(null) }
+    val beData = remember { mutableStateOf<BECharacterData?>(null) }
+    val vbData = remember { mutableStateOf<VBCharacterData?>(null) }
     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) {
+        withContext(Dispatchers.IO) {
+            activeMon.value = storageRepository.getActiveCharacter()
+            if (activeMon.value != null) {
+                beData.value = storageRepository.getCharacterBeData(activeMon.value!!.id)
+                transformationHistory.value = storageRepository.getTransformationHistory(activeMon.value!!.id)
+            }
+        }
+    }
 
     LaunchedEffect(true) {
         homeScreenController
@@ -115,7 +68,7 @@ fun HomeScreen(
     Scaffold (
         topBar = {
             TopBanner(
-                text = stringResource(R.string.home_title),
+                text = "VB Helper",
                 onScanClick = {
                     navController.navigate(NavigationItems.Scan.route)
                 },
@@ -125,7 +78,7 @@ fun HomeScreen(
             )
         }
     ) { contentPadding ->
-        if (activeMon == null || (beData == null && vbData == null) || cardIconData == null || transformationHistory.isEmpty()) {
+        if (activeMon.value == null || (beData.value == null && vbData.value == null) || transformationHistory.value == null) {
             Column (
                 horizontalAlignment = Alignment.CenterHorizontally,
                 verticalArrangement = Arrangement.Center,
@@ -133,60 +86,34 @@ fun HomeScreen(
                     .fillMaxSize()
                     .padding(top = contentPadding.calculateTopPadding())
             ) {
-                Text(text = stringResource(R.string.adventure_empty_state))
+                Text(text = "Nothing to see here")
             }
         } else {
-            val cardIcon = BitmapData(
-                bitmap = cardIconData!!.cardIcon,
-                width = cardIconData!!.cardIconWidth,
-                height = cardIconData!!.cardIconHeight
-            )
-
-            if (activeMon!!.isBemCard && beData != null) {
+            if (activeMon.value!!.isBemCard) {
                 BEBEmHomeScreen(
-                    activeMon = activeMon!!,
-                    beData = beData!!,
-                    transformationHistory = transformationHistory,
-                    contentPadding = contentPadding,
-                    cardIcon = cardIcon
+                    activeMon = activeMon.value!!,
+                    beData = beData.value!!,
+                    transformationHistory = transformationHistory.value!!,
+                    contentPadding = contentPadding
                 )
-            } else if (!activeMon!!.isBemCard && activeMon!!.characterType == DeviceType.BEDevice && beData != null) {
+            } else if (!activeMon.value!!.isBemCard && activeMon.value!!.characterType == DeviceType.BEDevice) {
                 BEDiMHomeScreen(
-                    activeMon = activeMon!!,
-                    beData = beData!!,
-                    transformationHistory = transformationHistory,
-                    contentPadding = contentPadding,
-                    cardIcon = cardIcon
+                    activeMon = activeMon.value!!,
+                    beData = beData.value!!,
+                    transformationHistory = transformationHistory.value!!,
+                    contentPadding = contentPadding
                 )
-            } else if (vbData != null) {
+            } else {
                 VBDiMHomeScreen(
-                    activeMon = activeMon!!,
-                    vbData = vbData!!,
-                    transformationHistory = transformationHistory,
-                    contentPadding = contentPadding,
-                    specialMissions = vbSpecialMissions,
-                    homeScreenController = homeScreenController,
-                    onClickCollect = { item, currency ->
-                        collectedItem = item
-                        collectedCurrency = currency
-                    },
-                    cardIcon = cardIcon
+                    activeMon = activeMon.value!!,
+                    vbData = vbData.value!!,
+                    transformationHistory = transformationHistory.value!!,
+                    contentPadding = contentPadding
                 )
             }
         }
     }
 
-    if (collectedItem != null) {
-        ObtainedItemDialog(
-            obtainedItem = collectedItem!!,
-            obtainedCurrency = collectedCurrency!!,
-            onClickDismiss = {
-                collectedItem = null
-                collectedCurrency = null
-            }
-        )
-    }
-
     if (adventureMissionsFinished) {
         Dialog(
             onDismissRequest = { adventureMissionsFinished = false },
@@ -197,7 +124,7 @@ fun HomeScreen(
                         .padding(16.dp)
                 ) {
                     Text(
-                        text = stringResource(R.string.home_adventure_mission_finished),
+                        text = "One of your characters has finished their adventure mission!",
                         textAlign = TextAlign.Center
                     )
                     Button(
@@ -208,7 +135,7 @@ fun HomeScreen(
                             .padding(8.dp)
                             .fillMaxWidth()
                     ) {
-                        Text(text = stringResource(R.string.beta_warning_button_dismiss))
+                        Text(text = "Dismiss")
                     }
                 }
             }

app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/HomeScreenController.kt

@@ -1,8 +1,5 @@
 package com.github.nacabaro.vbhelper.screens.homeScreens
 
-import com.github.nacabaro.vbhelper.dtos.ItemDtos
-
 interface HomeScreenController {
     fun didAdventureMissionsFinish(onCompletion: (Boolean) -> Unit)
-    fun clearSpecialMission(missionId: Long, onCleared: (ItemDtos.PurchasedItem?, Int?) -> Unit)
 }

app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/HomeScreenControllerImpl.kt

@@ -2,14 +2,9 @@ package com.github.nacabaro.vbhelper.screens.homeScreens
 
 import androidx.activity.ComponentActivity
 import androidx.lifecycle.lifecycleScope
-import com.github.cfogrady.vbnfc.vb.SpecialMission
 import com.github.nacabaro.vbhelper.di.VBHelper
-import com.github.nacabaro.vbhelper.dtos.ItemDtos
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import java.time.Instant
-import kotlin.math.roundToInt
-import kotlin.random.Random
 
 class HomeScreenControllerImpl(
     private val componentActivity: ComponentActivity,
@@ -23,7 +18,6 @@ class HomeScreenControllerImpl(
             val adventureCharacters = database
                 .adventureDao()
                 .getAdventureCharacters()
-                .first()
 
             val finishedAdventureCharacters = adventureCharacters.filter { character ->
                 character.finishesAdventure <= currentTime
@@ -32,52 +26,4 @@ class HomeScreenControllerImpl(
             onCompletion(finishedAdventureCharacters.isNotEmpty())
         }
     }
-
-    override fun clearSpecialMission(missionId: Long, onCleared: (ItemDtos.PurchasedItem?, Int?) -> Unit) {
-        componentActivity.lifecycleScope.launch {
-            val missionStatus = database
-                .specialMissionDao()
-                .getSpecialMission(missionId)
-                .first()
-
-            database
-                .specialMissionDao()
-                .clearSpecialMission(missionId)
-
-            if (missionStatus.status == SpecialMission.Status.COMPLETED) {
-                val randomItem = database
-                    .itemDao()
-                    .getAllItems()
-                    .first()
-                    .random()
-
-                val randomItemAmount = (Random.nextFloat() * 5).roundToInt()
-
-                database
-                    .itemDao()
-                    .purchaseItem(
-                        itemId = randomItem.id,
-                        itemAmount = randomItemAmount
-                    )
-
-                val purchasedItem = ItemDtos.PurchasedItem(
-                    itemId = randomItem.id,
-                    itemName = randomItem.name,
-                    itemDescription = randomItem.description,
-                    itemIcon = randomItem.itemIcon,
-                    itemLength = randomItem.itemLength,
-                    itemAmount = randomItemAmount,
-                    itemType = randomItem.itemType
-                )
-
-                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, null)
-            }
-        }
-    }
 }

app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/VBDiMHomeScreen.kt

@@ -0,0 +1,16 @@
+package com.github.nacabaro.vbhelper.screens.homeScreens
+
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.runtime.Composable
+import com.github.nacabaro.vbhelper.domain.device_data.VBCharacterData
+import com.github.nacabaro.vbhelper.dtos.CharacterDtos
+
+@Composable
+fun VBDiMHomeScreen(
+    activeMon: CharacterDtos.CharacterWithSprites,
+    vbData: VBCharacterData,
+    transformationHistory: List<CharacterDtos.TransformationHistory>,
+    contentPadding: PaddingValues
+) {
+    TODO("Not implemented yet")
+}

app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/dialogs/DeleteSpecialMissionDialog.kt

@@ -1,56 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.homeScreens.dialogs
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-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.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Dialog
-import com.github.nacabaro.vbhelper.R
-
-@Composable
-fun DeleteSpecialMissionDialog(
-    onClickDismiss: () -> Unit,
-    onClickDelete: () -> Unit
-) {
-    Dialog(
-        onDismissRequest = onClickDismiss
-    ) {
-        Card {
-            Column(
-                modifier = Modifier
-                    .padding(16.dp)
-            ) {
-                Text(
-                    text = stringResource(R.string.home_special_mission_delete_main),
-                    textAlign = TextAlign.Center
-                )
-                Spacer(modifier = Modifier.padding(8.dp))
-                Row {
-                    Button(
-                        onClick = onClickDismiss,
-                        modifier = Modifier
-                            .padding(8.dp)
-                    ) {
-                        Text(text = stringResource(R.string.home_special_mission_delete_dismiss))
-                    }
-
-                    Button(
-                        onClick = onClickDelete,
-                        modifier = Modifier
-                            .padding(8.dp)
-                    ) {
-                        Text(text = stringResource(R.string.home_special_mission_delete_remove))
-                    }
-                }
-            }
-        }
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/screens/VBDiMHomeScreen.kt

@@ -1,217 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.homeScreens.screens
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.github.nacabaro.vbhelper.R
-import com.github.nacabaro.vbhelper.components.CharacterEntry
-import com.github.nacabaro.vbhelper.components.ItemDisplay
-import com.github.nacabaro.vbhelper.components.SpecialMissionsEntry
-import com.github.nacabaro.vbhelper.components.TransformationHistoryCard
-import com.github.nacabaro.vbhelper.domain.device_data.SpecialMissions
-import com.github.nacabaro.vbhelper.domain.device_data.VBCharacterData
-import com.github.nacabaro.vbhelper.dtos.CharacterDtos
-import com.github.nacabaro.vbhelper.dtos.ItemDtos
-import com.github.nacabaro.vbhelper.screens.homeScreens.HomeScreenControllerImpl
-import com.github.nacabaro.vbhelper.utils.BitmapData
-import java.util.Locale
-import androidx.compose.ui.res.stringResource
-import com.github.nacabaro.vbhelper.screens.homeScreens.dialogs.DeleteSpecialMissionDialog
-
-
-@Composable
-fun VBDiMHomeScreen(
-    activeMon: CharacterDtos.CharacterWithSprites,
-    cardIcon: BitmapData,
-    vbData: VBCharacterData,
-    specialMissions: List<SpecialMissions>,
-    homeScreenController: HomeScreenControllerImpl,
-    transformationHistory: List<CharacterDtos.TransformationHistory>,
-    contentPadding: PaddingValues,
-    onClickCollect: (ItemDtos.PurchasedItem?, Int?) -> Unit
-) {
-    var selectedSpecialMissionId by remember { mutableStateOf<Long>(-1) }
-
-    Column(
-        modifier = Modifier
-            .padding(top = contentPadding.calculateTopPadding())
-            .verticalScroll(state = rememberScrollState())
-    ) {
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-        ) {
-            CharacterEntry(
-                icon = BitmapData(
-                    bitmap = activeMon.spriteIdle,
-                    width = activeMon.spriteWidth,
-                    height = activeMon.spriteHeight
-                ),
-                cardIcon = cardIcon,
-                multiplier = 8,
-                shape = androidx.compose.material.MaterialTheme.shapes.small,
-                modifier = Modifier
-                    .weight(1f)
-                    .aspectRatio(1f)
-            )
-            Column(
-                modifier = Modifier
-                    .weight(0.5f)
-                    .aspectRatio(0.5f)
-            ) {
-                ItemDisplay(
-                    icon = R.drawable.baseline_vitals_24,
-                    textValue = activeMon.vitalPoints.toString(),
-                    definition = stringResource(R.string.home_vbdim_vitals),
-                    modifier = Modifier
-                        .weight(0.5f)
-                        .aspectRatio(1f)
-                        .padding(8.dp)
-                )
-                ItemDisplay(
-                    icon = R.drawable.baseline_trophy_24,
-                    textValue = activeMon.trophies.toString(),
-                    definition = stringResource(R.string.home_vbdim_trophies),
-                    modifier = Modifier
-                        .weight(0.5f)
-                        .aspectRatio(1f)
-                        .padding(8.dp)
-                )
-            }
-        }
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-        ) {
-            ItemDisplay(
-                icon = R.drawable.baseline_mood_24,
-                textValue = activeMon.mood.toString(),
-                definition = stringResource(R.string.home_vbdim_mood),
-                modifier = Modifier
-                    .weight(1f)
-                    .aspectRatio(1f)
-                    .padding(8.dp)
-            )
-            val transformationCountdownInHours = activeMon.transformationCountdown / 60
-            ItemDisplay(
-                icon = R.drawable.baseline_next_24,
-                textValue = when (transformationCountdownInHours) {
-                    0 -> "${activeMon.transformationCountdown} m"
-                    else -> "$transformationCountdownInHours h"
-                },
-                definition = stringResource(R.string.home_vbdim_next_timer),
-                modifier = Modifier
-                    .weight(1f)
-                    .aspectRatio(1f)
-                    .padding(8.dp)
-            )
-            ItemDisplay(
-                icon = R.drawable.baseline_swords_24,
-                textValue = when {
-                    activeMon.totalBattlesLost == 0 -> "0.00 %"
-                    else -> {
-                        val battleWinPercentage =
-                            activeMon.totalBattlesWon.toFloat() / (activeMon.totalBattlesWon + activeMon.totalBattlesLost).toFloat()
-                        String.format(
-                            Locale.getDefault(),
-                            "%.2f",
-                            battleWinPercentage * 100
-                        ) + " %" // Specify locale
-                    }
-                },
-                definition = stringResource(R.string.home_vbdim_total_battle_win),
-                modifier = Modifier
-                    .weight(1f)
-                    .aspectRatio(1f)
-                    .padding(8.dp)
-            )
-            ItemDisplay(
-                icon = R.drawable.baseline_swords_24,
-                textValue = when {
-                    activeMon.totalBattlesLost == 0 -> "0.00 %"
-                    else -> {
-                        val battleWinPercentage =
-                            activeMon.currentPhaseBattlesWon.toFloat() / (activeMon.currentPhaseBattlesWon + activeMon.currentPhaseBattlesLost).toFloat()
-                        String.format(
-                            Locale.getDefault(),
-                            "%.2f",
-                            battleWinPercentage * 100
-                        ) + " %" // Specify locale
-                    }
-                },
-                definition = stringResource(R.string.home_vbdim_current_phase_win),
-                modifier = Modifier
-                    .weight(1f)
-                    .aspectRatio(1f)
-                    .padding(8.dp)
-            )
-        }
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-        ) {
-            TransformationHistoryCard(
-                transformationHistory = transformationHistory,
-                modifier = Modifier
-                    .weight(1f)
-                    .padding(8.dp)
-            )
-        }
-        Row (
-            modifier = Modifier
-                .padding(16.dp)
-        ) {
-            Text(
-                text = stringResource(R.string.home_vbdim_special_missions),
-                fontSize = 24.sp
-                )
-        }
-        for (mission in specialMissions) {
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-            ) {
-                SpecialMissionsEntry(
-                    specialMission = mission,
-                    modifier = Modifier
-                        .weight(1f)
-                        .padding(8.dp),
-                    onClickMission = { missionId ->
-                        selectedSpecialMissionId = missionId
-                    },
-                    onClickCollect = {
-                        homeScreenController
-                            .clearSpecialMission(selectedSpecialMissionId, onClickCollect)
-                    }
-                )
-            }
-        }
-    }
-
-    if (selectedSpecialMissionId.toInt() != -1) {
-        DeleteSpecialMissionDialog(
-            onClickDismiss = {
-                selectedSpecialMissionId = -1
-            },
-            onClickDelete = {
-                homeScreenController
-                    .clearSpecialMission(selectedSpecialMissionId, onClickCollect)
-                selectedSpecialMissionId = -1
-            }
-        )
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/screens/itemsScreen/ChooseCharacterScreen.kt

@@ -15,19 +15,15 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
 import androidx.navigation.NavController
 import com.github.nacabaro.vbhelper.components.CharacterEntry
 import com.github.nacabaro.vbhelper.components.TopBanner
 import com.github.nacabaro.vbhelper.di.VBHelper
-import com.github.nacabaro.vbhelper.domain.items.ItemType
 import com.github.nacabaro.vbhelper.dtos.CharacterDtos
-import com.github.nacabaro.vbhelper.dtos.ItemDtos
 import com.github.nacabaro.vbhelper.source.StorageRepository
 import com.github.nacabaro.vbhelper.utils.BitmapData
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
-import com.github.nacabaro.vbhelper.R
+
 
 @Composable
 fun ChooseCharacterScreen(
@@ -37,31 +33,16 @@ fun ChooseCharacterScreen(
 ) {
     val coroutineScope = rememberCoroutineScope()
     val application = LocalContext.current.applicationContext as VBHelper
-    val storageRepository = StorageRepository(application.container.db, )
+    val storageRepository = StorageRepository(application.container.db)
     val characterList = remember {
         mutableStateOf<List<CharacterDtos.CharacterWithSprites>>(emptyList())
     }
 
     var selectedCharacter by remember { mutableStateOf<Long?>(null) }
-    var selectedItem by remember { mutableStateOf<ItemDtos.ItemsWithQuantities?>(null) }
 
     LaunchedEffect(storageRepository) {
         coroutineScope.launch {
-            selectedItem = storageRepository.getItem(itemId)
-            when (selectedItem?.itemType) {
-                ItemType.BEITEM -> {
-                    characterList.value = storageRepository.getBECharacters()
-                }
-                ItemType.VBITEM -> {
-                    characterList.value = storageRepository.getVBCharacters()
-                }
-                ItemType.SPECIALMISSION-> {
-                    characterList.value = storageRepository.getVBCharacters()
-                }
-                else -> {
-                    characterList.value = storageRepository.getAllCharacters().first()
-                }
-            }
+            characterList.value = storageRepository.getAllCharacters()
         }
     }
 
@@ -70,7 +51,7 @@ fun ChooseCharacterScreen(
             itemsScreenController.applyItem(itemId, selectedCharacter!!) {
                 Toast.makeText(
                     application.applicationContext,
-                    application.getString(R.string.choose_character_item_applied),
+                    "Item applied!",
                     Toast.LENGTH_SHORT
                 ).show()
                 navController.popBackStack()
@@ -81,7 +62,7 @@ fun ChooseCharacterScreen(
     Scaffold(
         topBar = {
             TopBanner(
-                text = stringResource(R.string.choose_character_title),
+                text = "Choose character",
                 onBackClick = {
                     navController.popBackStack()
                 }

app/src/main/java/com/github/nacabaro/vbhelper/screens/itemsScreen/ItemDialog.kt

@@ -1,173 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.itemsScreen
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.material3.Button
-import androidx.compose.material3.Card
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import com.github.nacabaro.vbhelper.R
-import com.github.nacabaro.vbhelper.domain.items.ItemType
-import com.github.nacabaro.vbhelper.dtos.ItemDtos
-import com.github.nacabaro.vbhelper.ui.theme.VBHelperTheme
-
-
-
-@Composable
-fun ItemDialog(
-    item: ItemDtos.ItemsWithQuantities,
-    onClickCancel: () -> Unit,
-    onClickUse: (() -> Unit)? = null,
-    onClickPurchase: (() -> Unit)? = null,
-) {
-    Dialog(
-        onDismissRequest = onClickCancel,
-        properties = DialogProperties(
-            dismissOnBackPress = true,
-            dismissOnClickOutside = true
-        )
-    ) {
-        Card (
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(16.dp)
-        ) {
-            Column (
-                modifier = Modifier
-                    .padding(16.dp)
-            ) {
-                Row {
-                    Box(modifier = Modifier) {
-                        // Background image (full size)
-                        Icon(
-                            painter = painterResource(id = getIconResource(item.itemIcon)),
-                            contentDescription = null,
-                            modifier = Modifier
-                                .size(96.dp)
-                                .align(Alignment.Center)
-                        )
-                        Icon(
-                            painter = painterResource(id = getLengthResource(item.itemLength)),
-                            contentDescription = null,
-                            tint = MaterialTheme.colorScheme.outline,
-                            modifier = Modifier
-                                .size(64.dp) // Set the size of the overlay image
-                                .align(Alignment.BottomEnd) // Align to the top end (top-right corner)
-                        )
-                    }
-                    Column (
-                        modifier = Modifier
-                            .padding(16.dp)
-                    ) {
-                        Text(
-                            fontSize = MaterialTheme.typography.titleLarge.fontSize,
-                            text = item.name,
-                            modifier = Modifier
-                                .fillMaxWidth()
-                        )
-                    }
-                }
-                Text(
-                    textAlign = TextAlign.Center,
-                    fontSize = MaterialTheme.typography.bodyMedium.fontSize,
-                    fontFamily = MaterialTheme.typography.bodyMedium.fontFamily,
-                    text = item.description,
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(4.dp)
-                )
-                if (onClickPurchase != null) {
-                    Text(
-                        textAlign = TextAlign.Center,
-                        fontSize = MaterialTheme.typography.bodySmall.fontSize,
-                        fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
-                        text = stringResource(
-                            R.string.item_dialog_costs_credits,
-                            item.price
-                        ),
-                        modifier = Modifier
-                            .fillMaxWidth()
-                    )
-                }
-                Text(
-                    textAlign = TextAlign.Center,
-                    fontSize = MaterialTheme.typography.bodySmall.fontSize,
-                    fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
-                    text = stringResource(
-                        R.string.item_dialog_you_have_quantity,
-                        item.quantity
-                    ),
-                    modifier = Modifier
-                        .fillMaxWidth()
-                )
-
-                Row (
-                    horizontalArrangement = Arrangement.Center,
-                    modifier = Modifier
-                        .fillMaxWidth()
-                ) {
-                    if (onClickUse != null) {
-                        Button(
-                            onClick = onClickUse
-                        ) {
-                            Text(stringResource(R.string.item_dialog_use))
-                        }
-                    }
-
-                    if (onClickPurchase != null) {
-                        Button(
-                            onClick = onClickPurchase
-                        ) {
-                            Text(stringResource(R.string.item_dialog_purchase))
-                        }
-                    }
-
-                    Spacer(modifier = Modifier.size(8.dp))
-                    Button(
-                        onClick = onClickCancel
-                    ) {
-                        Text(stringResource(R.string.item_dialog_cancel))
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Composable
-@Preview(showBackground = true)
-fun PreviewItemDialog() {
-    VBHelperTheme {
-        ItemDialog(
-            item = ItemDtos.ItemsWithQuantities(
-                name = "AP Training x3 (60 min)",
-                description = "Boosts AP during training (for 60 minutes)",
-                itemIcon = R.drawable.baseline_attack_24,
-                itemLength = R.drawable.baseline_60_min_timer,
-                quantity = 19,
-                id = 1,
-                price = 500,
-                itemType = ItemType.BEITEM
-            ),
-            onClickUse = {  },
-            onClickCancel = {  }
-        )
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/screens/itemsScreen/ItemElement.kt

@@ -1,24 +1,36 @@
 package com.github.nacabaro.vbhelper.screens.itemsScreen
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Button
 import androidx.compose.material3.Card
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.github.nacabaro.vbhelper.dtos.ItemDtos
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
 import com.github.nacabaro.vbhelper.R
+import com.github.nacabaro.vbhelper.ui.theme.VBHelperTheme
 
 @Composable
 fun ItemElement(
-    item: ItemDtos.ItemsWithQuantities,
+    itemIcon: Int,
+    lengthIcon: Int,
     modifier: Modifier = Modifier,
     onClick: (() -> Unit) = {  }
 ) {
@@ -29,7 +41,7 @@ fun ItemElement(
     ) {
         Box(modifier = Modifier.fillMaxSize()) {
             Icon(
-                painter = painterResource(id = getIconResource(item.itemIcon)),
+                painter = painterResource(id = itemIcon),
                 contentDescription = null,
                 modifier = Modifier
                     .size(96.dp)
@@ -37,14 +49,164 @@ fun ItemElement(
                     .padding(16.dp)
             )
             Icon(
-                painter = painterResource(id = getLengthResource(item.itemLength)),
+                painter = painterResource(id = lengthIcon),
                 contentDescription = null,
                 tint = MaterialTheme.colorScheme.surfaceTint,
                 modifier = Modifier
-                    .size(48.dp)
-                    .align(Alignment.TopStart)
+                    .size(48.dp) // Set the size of the overlay image
+                    .align(Alignment.TopStart) // Align to the top end (top-right corner)
                     .padding(8.dp)
             )
         }
     }
 }
+
+@Composable
+fun ItemDialog(
+    name: String,
+    description: String,
+    itemIcon: Int,
+    lengthIcon: Int,
+    amount: Int,
+    onClickUse: () -> Unit,
+    onClickCancel: () -> Unit
+) {
+    Dialog(
+        onDismissRequest = onClickCancel,
+        properties = DialogProperties(
+            dismissOnBackPress = true,
+            dismissOnClickOutside = true
+        )
+    ) {
+        Card (
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(16.dp)
+        ) {
+            Column (
+                modifier = Modifier
+                    .padding(16.dp)
+            ) {
+                Row {
+                    Box(modifier = Modifier) {
+                        // Background image (full size)
+                        Icon(
+                            painter = painterResource(id = itemIcon),
+                            contentDescription = null,
+                            modifier = Modifier
+                                .size(96.dp)
+                                .align(Alignment.Center)
+                        )
+                        Icon(
+                            painter = painterResource(id = lengthIcon),
+                            contentDescription = null,
+                            tint = MaterialTheme.colorScheme.outline,
+                            modifier = Modifier
+                                .size(64.dp) // Set the size of the overlay image
+                                .align(Alignment.BottomEnd) // Align to the top end (top-right corner)
+                        )
+                    }
+                    Column (
+                        modifier = Modifier
+                            .padding(16.dp)
+                    ) {
+                        Text(
+                            fontSize = MaterialTheme.typography.titleLarge.fontSize,
+                            text = name,
+                            modifier = Modifier
+                                .fillMaxWidth()
+                        )
+                    }
+                }
+                Text(
+                    textAlign = TextAlign.Center,
+                    fontSize = MaterialTheme.typography.bodyMedium.fontSize,
+                    fontFamily = MaterialTheme.typography.bodyMedium.fontFamily,
+                    text = description,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(4.dp)
+                )
+                Text(
+                    textAlign = TextAlign.Center,
+                    fontSize = MaterialTheme.typography.bodySmall.fontSize,
+                    fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
+                    text = "You have $amount of this item",
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(8.dp)
+                )
+                Row (
+                    horizontalArrangement = Arrangement.Center,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                ) {
+                    Button(
+                        onClick = onClickUse
+                    ) {
+                        Text("Use item")
+                    }
+                    Spacer(modifier = Modifier.size(8.dp))
+                    Button(
+                        onClick = onClickCancel
+                    ) {
+                        Text("Cancel")
+                    }
+                }
+            }
+        }
+    }
+}
+
+fun getIconResource(index: Int): Int {
+    return when (index) {
+        ItemsScreenControllerImpl.ItemTypes.PPTraining.id -> R.drawable.baseline_agility_24
+        ItemsScreenControllerImpl.ItemTypes.APTraining.id -> R.drawable.baseline_attack_24
+        ItemsScreenControllerImpl.ItemTypes.HPTraining.id -> R.drawable.baseline_shield_24
+        ItemsScreenControllerImpl.ItemTypes.BPTraining.id -> R.drawable.baseline_trophy_24
+        ItemsScreenControllerImpl.ItemTypes.AllTraining.id -> R.drawable.baseline_arrow_up_24
+        6 -> R.drawable.baseline_timer_24
+        7 -> R.drawable.baseline_rank_24
+        8 -> R.drawable.baseline_vitals_24
+        else -> R.drawable.baseline_question_mark_24
+    }
+}
+
+fun getLengthResource(index: Int): Int {
+    return when (index) {
+        15 -> R.drawable.baseline_15_min_timer
+        30 -> R.drawable.baseline_30_min_timer
+        60 -> R.drawable.baseline_60_min_timer
+        -60 -> R.drawable.baseline_60_min_timer
+        300 -> R.drawable.baseline_5_hour_timer
+        600 -> R.drawable.baseline_10_hour_timer
+        -720 -> R.drawable.baseline_12_hour_timer
+        -1440 -> R.drawable.baseline_24_hour_timer
+        6000 -> R.drawable.baseline_reset_24
+        1000 -> R.drawable.baseline_single_arrow_up
+        2500 -> R.drawable.baseline_double_arrow_up
+        5000 -> R.drawable.baseline_triple_arrow_up
+        9999 -> R.drawable.baseline_health_24
+        -500 -> R.drawable.baseline_single_arrow_down
+        -1000 -> R.drawable.baseline_double_arrow_down
+        -2500 -> R.drawable.baseline_triple_arrow_down
+        -9999 -> R.drawable.baseline_reset_24
+        else -> R.drawable.baseline_question_mark_24
+    }
+}
+
+@Composable
+@Preview(showBackground = true)
+fun PreviewItemDialog() {
+    VBHelperTheme {
+        ItemDialog(
+            name = "AP Training x3 (60 min)",
+            description = "Boosts AP during training (for 60 minutes)",
+            itemIcon = R.drawable.baseline_attack_24,
+            lengthIcon = R.drawable.baseline_60_min_timer,
+            onClickUse = {  },
+            onClickCancel = {  },
+            amount = 19
+        )
+    }
+}

app/src/main/java/com/github/nacabaro/vbhelper/screens/itemsScreen/ItemIcons.kt

@@ -1,40 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.itemsScreen
-
-import com.github.nacabaro.vbhelper.R
-
-fun getIconResource(index: Int): Int {
-    return when (index) {
-        ItemsScreenControllerImpl.ItemTypes.PPTraining.id -> R.drawable.baseline_agility_24
-        ItemsScreenControllerImpl.ItemTypes.APTraining.id -> R.drawable.baseline_attack_24
-        ItemsScreenControllerImpl.ItemTypes.HPTraining.id -> R.drawable.baseline_shield_24
-        ItemsScreenControllerImpl.ItemTypes.BPTraining.id -> R.drawable.baseline_trophy_24
-        ItemsScreenControllerImpl.ItemTypes.AllTraining.id -> R.drawable.baseline_arrow_up_24
-        6 -> R.drawable.baseline_timer_24
-        7 -> R.drawable.baseline_rank_24
-        8 -> R.drawable.baseline_vitals_24
-        else -> R.drawable.baseline_question_mark_24
-    }
-}
-
-fun getLengthResource(index: Int): Int {
-    return when (index) {
-        15 -> R.drawable.baseline_15_min_timer
-        30 -> R.drawable.baseline_30_min_timer
-        60 -> R.drawable.baseline_60_min_timer
-        -60 -> R.drawable.baseline_60_min_timer
-        300 -> R.drawable.baseline_5_hour_timer
-        600 -> R.drawable.baseline_10_hour_timer
-        -720 -> R.drawable.baseline_12_hour_timer
-        -1440 -> R.drawable.baseline_24_hour_timer
-        6000 -> R.drawable.baseline_reset_24
-        1000 -> R.drawable.baseline_single_arrow_up
-        2500 -> R.drawable.baseline_double_arrow_up
-        5000 -> R.drawable.baseline_triple_arrow_up
-        9999 -> R.drawable.baseline_health_24
-        -500 -> R.drawable.baseline_single_arrow_down
-        -1000 -> R.drawable.baseline_double_arrow_down
-        -2500 -> R.drawable.baseline_triple_arrow_down
-        -9999 -> R.drawable.baseline_reset_24
-        else -> R.drawable.baseline_question_mark_24
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/screens/itemsScreen/ItemsScreen.kt

@@ -17,9 +17,6 @@ import androidx.compose.ui.Modifier
 import androidx.navigation.NavController
 import com.github.nacabaro.vbhelper.components.TopBanner
 import com.github.nacabaro.vbhelper.navigation.NavigationItems
-import androidx.compose.ui.res.stringResource
-import com.github.nacabaro.vbhelper.R
-
 
 @Composable
 fun ItemsScreen(
@@ -33,14 +30,14 @@ fun ItemsScreen(
     Scaffold(
         topBar = {
             Column {
-                TopBanner(text = stringResource(R.string.items_title))
+                TopBanner("Items")
                 TabRow(
                     selectedTabIndex = selectedTabItem,
                     modifier = Modifier
                 ) {
                     items.forEachIndexed { index, item ->
                         Tab(
-                            text = { Text(text = stringResource(item.label)) },
+                            text = { Text(item.label) },
                             selected = selectedTabItem == index,
                             onClick = { selectedTabItem = index }
                         )

app/src/main/java/com/github/nacabaro/vbhelper/screens/itemsScreen/ItemsScreenControllerImpl.kt

@@ -2,17 +2,12 @@ package com.github.nacabaro.vbhelper.screens.itemsScreen
 
 import androidx.activity.ComponentActivity
 import androidx.lifecycle.lifecycleScope
-import com.github.cfogrady.vbnfc.vb.SpecialMission
-import com.github.nacabaro.vbhelper.domain.device_data.SpecialMissions
 import com.github.nacabaro.vbhelper.database.AppDatabase
 import com.github.nacabaro.vbhelper.di.VBHelper
 import com.github.nacabaro.vbhelper.domain.device_data.BECharacterData
-import com.github.nacabaro.vbhelper.domain.device_data.VBCharacterData
 import com.github.nacabaro.vbhelper.dtos.ItemDtos
 import com.github.nacabaro.vbhelper.utils.DeviceType
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
@@ -29,15 +24,7 @@ class ItemsScreenControllerImpl (
         AllTraining(5),
         EvoTimer(6),
         LimitTimer(7),
-        Vitals(8),
-        Step8k(9),
-        Step4k(10),
-        Vitals1000(11),
-        Vitals250(12),
-        Battle20(13),
-        Battle5(14),
-        Win10(15),
-        Win4(16)
+        Vitals(8)
     }
 
     init {
@@ -50,27 +37,17 @@ class ItemsScreenControllerImpl (
             withContext(Dispatchers.IO) {
                 val item = getItem(itemId)
                 val characterData = database.userCharacterDao().getCharacter(characterId)
-                var beCharacterData: BECharacterData? = null
-                var vbCharacterData: VBCharacterData? = null
+                val beCharacterData: BECharacterData
+                //var vbCharacterData: VBCharacterData
 
                 if (characterData.characterType == DeviceType.BEDevice) {
-                    beCharacterData = database
-                        .userCharacterDao()
-                        .getBeData(characterId)
-                        .firstOrNull()
-
-                } else if (characterData.characterType == DeviceType.VBDevice) {
-                    vbCharacterData = database
-                        .userCharacterDao()
-                        .getVbData(characterId)
-                        .firstOrNull()
+                    beCharacterData = database.userCharacterDao().getBeData(characterId)
+                } else {
+                    TODO("Not implemented")
+                    //vbCharacterData = database.userCharacterDao().getVbData(characterId)
                 }
 
-                if (
-                    item.itemIcon in 1 .. 5 &&
-                    characterData.characterType == DeviceType.BEDevice &&
-                    beCharacterData != null
-                ) {
+                if (item.itemIcon in 1 .. 5 && characterData.characterType == DeviceType.BEDevice) {
                     beCharacterData.itemType = item.itemIcon
                     beCharacterData.itemMultiplier = 3
                     beCharacterData.itemRemainingTime = item.itemLength
@@ -95,11 +72,7 @@ class ItemsScreenControllerImpl (
                         .userCharacterDao()
                         .updateCharacter(characterData)
 
-                } else if (
-                    item.itemIcon == ItemTypes.LimitTimer.id &&
-                    characterData.characterType == DeviceType.BEDevice &&
-                    beCharacterData != null
-                ) {
+                } else if (item.itemIcon == ItemTypes.LimitTimer.id) {
                     beCharacterData.remainingTrainingTimeInMinutes += item.itemLength
                     if (beCharacterData.remainingTrainingTimeInMinutes > 6000) {
                         beCharacterData.remainingTrainingTimeInMinutes = 6000
@@ -120,12 +93,6 @@ class ItemsScreenControllerImpl (
                     database
                         .userCharacterDao()
                         .updateCharacter(characterData)
-
-                } else if (item.itemIcon in ItemTypes.Step8k.id  .. ItemTypes.Win4.id &&
-                    characterData.characterType == DeviceType.VBDevice &&
-                    vbCharacterData != null
-                ) {
-                    applySpecialMission(item.itemIcon, item.itemLength, characterId)
                 }
 
                 consumeItem(item.id)
@@ -137,74 +104,13 @@ class ItemsScreenControllerImpl (
         }
     }
 
-    private suspend fun applySpecialMission(itemIcon: Int, itemLength: Int, characterId: Long) {
-        // Hello, it's me, naca! No! I don't like this, I'll see how I can improve it later on...
-        val specialMissionType = when (itemIcon) {
-            ItemTypes.Step8k.id -> SpecialMission.Type.STEPS
-            ItemTypes.Step4k.id -> SpecialMission.Type.STEPS
-            ItemTypes.Vitals1000.id -> SpecialMission.Type.VITALS
-            ItemTypes.Vitals250.id -> SpecialMission.Type.VITALS
-            ItemTypes.Battle20.id -> SpecialMission.Type.BATTLES
-            ItemTypes.Battle5.id -> SpecialMission.Type.BATTLES
-            ItemTypes.Win10.id -> SpecialMission.Type.WINS
-            ItemTypes.Win4.id -> SpecialMission.Type.WINS
-            else -> SpecialMission.Type.NONE
-        }
-
-        val specialMissionGoal = when (itemIcon) {
-            ItemTypes.Step8k.id -> 8000
-            ItemTypes.Step4k.id -> 4000
-            ItemTypes.Vitals1000.id -> 1000
-            ItemTypes.Vitals250.id -> 250
-            ItemTypes.Battle20.id -> 20
-            ItemTypes.Battle5.id -> 5
-            ItemTypes.Win10.id -> 10
-            ItemTypes.Win4.id -> 4
-            else -> 0
-        }
-        
-        val specialMissionSlot = when (itemIcon) {
-            ItemTypes.Step8k.id -> 0
-            ItemTypes.Step4k.id -> 0
-            ItemTypes.Vitals1000.id -> 1
-            ItemTypes.Vitals250.id -> 1
-            ItemTypes.Battle20.id -> 2
-            ItemTypes.Battle5.id -> 2
-            ItemTypes.Win10.id -> 3
-            ItemTypes.Win4.id -> 3
-            else -> 0
-        }
-
-        val availableSpecialMissions = database
-            .userCharacterDao()
-            .getSpecialMissions(characterId)
-            .first()
-
-        var newSpecialMission = availableSpecialMissions[specialMissionSlot]
-        newSpecialMission = SpecialMissions(
-            id = newSpecialMission.id,
-            characterId = newSpecialMission.characterId,
-            goal = specialMissionGoal,
-            watchId = newSpecialMission.watchId,
-            progress = 0,
-            status = SpecialMission.Status.AVAILABLE,
-            timeElapsedInMinutes = 0,
-            timeLimitInMinutes = itemLength,
-            missionType = specialMissionType
-        )
-
-        database
-            .userCharacterDao()
-            .insertSpecialMissions(newSpecialMission)
-    }
-
-    private suspend fun getItem(itemId: Long): ItemDtos.ItemsWithQuantities {
+    private fun getItem(itemId: Long): ItemDtos.ItemsWithQuantities {
         return database
             .itemDao()
             .getItem(itemId)
     }
 
-    private suspend fun consumeItem(itemId: Long) {
+    private fun consumeItem(itemId: Long) {
         database
             .itemDao()
             .useItem(itemId)

app/src/main/java/com/github/nacabaro/vbhelper/screens/itemsScreen/ItemsStore.kt

@@ -1,37 +1,25 @@
 package com.github.nacabaro.vbhelper.screens.itemsScreen
 
-import android.widget.Toast
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
-import androidx.compose.material3.Card
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 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
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
-import com.github.nacabaro.vbhelper.database.AppDatabase
 import com.github.nacabaro.vbhelper.di.VBHelper
 import com.github.nacabaro.vbhelper.dtos.ItemDtos
-import com.github.nacabaro.vbhelper.source.CurrencyRepository
 import com.github.nacabaro.vbhelper.source.ItemsRepository
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.launch
-import com.github.nacabaro.vbhelper.R
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
 @Composable
 fun ItemsStore(
@@ -39,102 +27,45 @@ fun ItemsStore(
 ) {
     val application = LocalContext.current.applicationContext as VBHelper
     val itemsRepository = ItemsRepository(application.container.db)
-    val myItems by itemsRepository.getAllItems().collectAsState(emptyList())
-
+    val myItems = remember { mutableStateOf(emptyList<ItemDtos.ItemsWithQuantities>()) }
     var selectedElementIndex by remember { mutableStateOf<Int?>(null) }
 
-    val currencyRepository = application.container.currencyRepository
-    val currentCurrency = currencyRepository.currencyValue.collectAsState(0)
-
-    val scope = rememberCoroutineScope()
-
-    if (myItems.isEmpty()) {
-        Column(
-            verticalArrangement = Arrangement.Center,
-            horizontalAlignment = Alignment.CenterHorizontally,
-            modifier = Modifier.fillMaxSize()
-        ) {
-            Text(stringResource(R.string.items_no_items))
+    LaunchedEffect(itemsRepository) {
+        withContext(Dispatchers.IO) {
+            myItems.value = itemsRepository.getAllItems()
         }
+    }
+
+    if (myItems.value.isEmpty()) {
+        Text("No items")
     } else {
-        Column() {
-            Card(
-                modifier = Modifier
-                    .padding(8.dp)
-                    .fillMaxWidth()
-            ) {
-                Text(
-                    text = stringResource(
-                        R.string.items_store_credits,
-                        currentCurrency.value
-                    ),
-                    modifier = Modifier
-                        .padding(8.dp)
-                )
-            }
-
         LazyVerticalGrid(
             columns = GridCells.Fixed(3),
             modifier = Modifier
         ) {
-                items(myItems) { index ->
+            items(myItems.value) { index ->
                 ItemElement(
-                        item = index,
+                    itemIcon = getIconResource(index.itemIcon),
+                    lengthIcon = getLengthResource(index.itemLength),
                     modifier = Modifier
                         .padding(8.dp),
                     onClick = {
-                            selectedElementIndex = myItems.indexOf(index)
+                        selectedElementIndex = myItems.value.indexOf(index)
                     }
                 )
             }
         }
-        }
-    }
-
 
         if (selectedElementIndex != null) {
             ItemDialog(
-            item = myItems[selectedElementIndex!!],
-            onClickPurchase = {
-                scope.launch {
-                    Toast.makeText(
-                        application.applicationContext,
-                        application.getString(
-                            purchaseItem(
-                                application.container.db,
-                                myItems[selectedElementIndex!!],
-                                currencyRepository
-                            )
-                        ),
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
-            },
+                name = myItems.value[selectedElementIndex!!].name,
+                description = myItems.value[selectedElementIndex!!].description,
+                itemIcon = getIconResource(myItems.value[selectedElementIndex!!].itemIcon),
+                lengthIcon = getLengthResource(myItems.value[selectedElementIndex!!].itemLength),
+                amount = myItems.value[selectedElementIndex!!].quantity,
+                onClickUse = { },
                 onClickCancel = { selectedElementIndex = null }
             )
         }
-}
-
-suspend fun purchaseItem(
-    db: AppDatabase,
-    item: ItemDtos.ItemsWithQuantities,
-    currencyRepository: CurrencyRepository
-): Int {
-    return if (currencyRepository.currencyValue.first() < item.price) {
-        R.string.items_not_enough_credits
-    } else {
-        db
-            .itemDao()
-            .purchaseItem(
-                item.id,
-                1
-            )
-
-        currencyRepository
-            .setCurrencyValue(
-                currencyRepository.currencyValue.first() - item.price
-            )
-
-        R.string.items_purchase_success
     }
 }

app/src/main/java/com/github/nacabaro/vbhelper/screens/itemsScreen/MyItems.kt

@@ -9,7 +9,7 @@ import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -17,14 +17,14 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import com.github.nacabaro.vbhelper.di.VBHelper
+import com.github.nacabaro.vbhelper.dtos.ItemDtos
 import com.github.nacabaro.vbhelper.navigation.NavigationItems
 import com.github.nacabaro.vbhelper.source.ItemsRepository
-import com.github.nacabaro.vbhelper.R
-
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
 @Composable
 fun MyItems(
@@ -32,30 +32,36 @@ fun MyItems(
 ) {
     val application = LocalContext.current.applicationContext as VBHelper
     val itemsRepository = ItemsRepository(application.container.db)
-    val myItems by itemsRepository.getUserItems().collectAsState(emptyList())
-
+    val myItems = remember { mutableStateOf(emptyList<ItemDtos.ItemsWithQuantities>()) }
     var selectedElementIndex by remember { mutableStateOf<Int?>(null) }
 
-    if (myItems.isEmpty()) {
+    LaunchedEffect(itemsRepository) {
+        withContext(Dispatchers.IO) {
+            myItems.value = itemsRepository.getUserItems()
+        }
+    }
+
+    if (myItems.value.isEmpty()) {
         Column(
             verticalArrangement = Arrangement.Center,
             horizontalAlignment = Alignment.CenterHorizontally,
             modifier = Modifier.fillMaxSize()
         ) {
-            Text(stringResource(R.string.items_no_items))
+            Text("No items")
         }
     } else {
         LazyVerticalGrid(
             columns = GridCells.Fixed(3),
             modifier = Modifier
         ) {
-            items(myItems) { index ->
+            items(myItems.value) { index ->
                 ItemElement(
-                    item = index,
+                    itemIcon = getIconResource(index.itemIcon),
+                    lengthIcon = getLengthResource(index.itemLength),
                     modifier = Modifier
                         .padding(8.dp),
                     onClick = {
-                        selectedElementIndex = myItems.indexOf(index)
+                        selectedElementIndex = myItems.value.indexOf(index)
                     }
                 )
             }
@@ -63,7 +69,11 @@ fun MyItems(
 
         if (selectedElementIndex != null) {
             ItemDialog(
-                item = myItems[selectedElementIndex!!],
+                name = myItems.value[selectedElementIndex!!].name,
+                description = myItems.value[selectedElementIndex!!].description,
+                itemIcon = getIconResource(myItems.value[selectedElementIndex!!].itemIcon),
+                lengthIcon = getLengthResource(myItems.value[selectedElementIndex!!].itemLength),
+                amount = myItems.value[selectedElementIndex!!].quantity,
                 onClickUse = {
                     navController
                         .navigate(
@@ -71,7 +81,7 @@ fun MyItems(
                                 .ApplyItem.route
                                 .replace(
                                     "{itemId}",
-                                    myItems[selectedElementIndex!!].id.toString()
+                                    myItems.value[selectedElementIndex!!].id.toString()
                                 )
                         )
                     selectedElementIndex = null

app/src/main/java/com/github/nacabaro/vbhelper/screens/itemsScreen/ObtainedItemDialog.kt

@@ -19,13 +19,10 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import com.github.nacabaro.vbhelper.dtos.ItemDtos
-import androidx.compose.ui.res.stringResource
-import com.github.nacabaro.vbhelper.R
 
 @Composable
 fun ObtainedItemDialog(
     obtainedItem: ItemDtos.PurchasedItem,
-    obtainedCurrency: Int,
     onClickDismiss: () -> Unit
 ) {
     Dialog(
@@ -84,32 +81,17 @@ fun ObtainedItemDialog(
                         textAlign = TextAlign.Center,
                         fontSize = MaterialTheme.typography.bodySmall.fontSize,
                         fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
-                        text = stringResource(
-                            R.string.obtained_item_you_have,
-                            obtainedItem.itemAmount
-                        ),
+                        text = "You have obtained ${obtainedItem.itemAmount} of this item",
                         modifier = Modifier
                             .fillMaxWidth()
-                            .padding(top = 4.dp)
-                    )
-                    Text(
-                        textAlign = TextAlign.Center,
-                        fontSize = MaterialTheme.typography.bodySmall.fontSize,
-                        fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
-                        text = stringResource(
-                            R.string.obtained_item_you_also_got_credits,
-                            obtainedCurrency
-                        ),
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(bottom = 4.dp)
+                            .padding(5.dp)
                     )
                     Button(
                         onClick = onClickDismiss,
                         modifier = Modifier
                             .fillMaxWidth()
                     ) {
-                        Text(text = stringResource(R.string.obtained_item_dismiss))
+                        Text(text = "Dismiss")
                     }
                 }
             }

app/src/main/java/com/github/nacabaro/vbhelper/screens/scanScreen/ChooseConnectionScreen.kt

@@ -1,80 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.scanScreen
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Button
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-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.R
-
-@Composable
-fun ChooseConnectOption(
-    onClickRead: (() -> Unit)? = null,
-    onClickWrite: (() -> Unit)? = null,
-    navController: NavController
-) {
-    Scaffold(
-        topBar = {
-            TopBanner(
-                text = stringResource(R.string.scan_title),
-                onBackClick = {
-                    navController.popBackStack()
-                }
-            )
-        }
-    ) { contentPadding ->
-        Column(
-            verticalArrangement = Arrangement.Center,
-            horizontalAlignment = Alignment.CenterHorizontally,
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(contentPadding)
-        ) {
-            ScanButton(
-                text = stringResource(R.string.scan_vb_to_app),
-                disabled = onClickRead == null,
-                onClick = onClickRead?: {  },
-            )
-            Spacer(modifier = Modifier.height(16.dp))
-            ScanButton(
-                text = stringResource(R.string.scan_app_to_vb),
-                disabled = onClickWrite == null,
-                onClick = onClickWrite?: {  },
-            )
-        }
-    }
-}
-
-
-@Composable
-fun ScanButton(
-    text: String,
-    onClick: () -> Unit,
-    modifier: Modifier = Modifier,
-    disabled: Boolean = false,
-) {
-    Button(
-        onClick = onClick,
-        modifier = modifier,
-        enabled = !disabled,
-    ) {
-        Text(
-            text = text,
-            fontSize = 16.sp,
-            modifier = Modifier
-                .padding(4.dp)
-        )
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/screens/scanScreen/ReadingCharacter.kt

@@ -1,4 +1,4 @@
-package com.github.nacabaro.vbhelper.screens.scanScreen.screens
+package com.github.nacabaro.vbhelper.screens.scanScreen
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -10,22 +10,17 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.github.nacabaro.vbhelper.components.TopBanner
-import com.github.nacabaro.vbhelper.R
 
 @Composable
-fun ActionScreen(
+fun ReadingCharacterScreen(
     topBannerText: String,
     onClickCancel: () -> Unit,
 ) {
     Scaffold (
         topBar = {
-            TopBanner(
-                text = topBannerText,
-                onBackClick = onClickCancel
-            )
+            TopBanner(topBannerText)
         }
     ) { innerPadding ->
         Column (
@@ -35,12 +30,12 @@ fun ActionScreen(
                 .padding(innerPadding)
                 .fillMaxSize()
         ) {
-            Text(stringResource(R.string.action_place_near_reader))
+            Text("Place your Vital Bracelet near the reader...")
             Button(
                 onClick = onClickCancel,
                 modifier = Modifier.padding(16.dp)
             ) {
-                Text(stringResource(R.string.action_cancel))
+                Text("Cancel")
             }
         }
     }

app/src/main/java/com/github/nacabaro/vbhelper/screens/scanScreen/ScanScreen.kt

@@ -1,31 +1,42 @@
 package com.github.nacabaro.vbhelper.screens.scanScreen
 
 import android.widget.Toast
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Button
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
 import androidx.navigation.compose.rememberNavController
 import com.github.cfogrady.vbnfc.data.NfcCharacter
 import com.github.nacabaro.vbhelper.ActivityLifecycleListener
+import com.github.nacabaro.vbhelper.components.TopBanner
 import com.github.nacabaro.vbhelper.di.VBHelper
-import com.github.nacabaro.vbhelper.domain.card.Card
 import com.github.nacabaro.vbhelper.navigation.NavigationItems
-import com.github.nacabaro.vbhelper.screens.scanScreen.screens.ReadingScreen
-import com.github.nacabaro.vbhelper.screens.scanScreen.screens.WritingScreen
 import com.github.nacabaro.vbhelper.source.StorageRepository
 import com.github.nacabaro.vbhelper.source.isMissingSecrets
 import com.github.nacabaro.vbhelper.source.proto.Secrets
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.withContext
-import com.github.nacabaro.vbhelper.R
 
 const val SCAN_SCREEN_ACTIVITY_LIFECYCLE_LISTENER = "SCAN_SCREEN_ACTIVITY_LIFECYCLE_LISTENER"
 
@@ -58,35 +69,118 @@ fun ScanScreen(
         }
     }
 
-    var writingScreen by remember { mutableStateOf(false) }
     var readingScreen by remember { mutableStateOf(false) }
+    var writingScreen by remember { mutableStateOf(false) }
+    var isDoneReadingCharacter by remember { mutableStateOf(false) }
+    var isDoneSendingCard by remember { mutableStateOf(false) }
+    var isDoneWritingCharacter by remember { mutableStateOf(false) }
 
-    if (writingScreen && nfcCharacter != null && characterId != null) {
-        WritingScreen(
-            scanScreenController = scanScreenController,
-            nfcCharacter = nfcCharacter!!,
-            characterId = characterId,
-            onComplete = {
-                writingScreen = false
-                navController.navigate(NavigationItems.Home.route)
-            },
-            onCancel = {
-                writingScreen = false
-                navController.navigate(NavigationItems.Home.route)
+    DisposableEffect(readingScreen) {
+        if(readingScreen) {
+            scanScreenController.registerActivityLifecycleListener(
+                SCAN_SCREEN_ACTIVITY_LIFECYCLE_LISTENER,
+                object: ActivityLifecycleListener {
+                    override fun onPause() {
+                        scanScreenController.cancelRead()
+                    }
+
+                    override fun onResume() {
+                        scanScreenController.onClickRead(secrets!!) {
+                            isDoneReadingCharacter = true
+                        }
+                    }
                 }
             )
-    } else if (readingScreen) {
-        ReadingScreen(
-            scanScreenController = scanScreenController,
-            onCancel = {
-                readingScreen = false
-                navController.navigate(NavigationItems.Home.route)
-            },
-            onComplete = {
-                readingScreen = false
-                navController.navigate(NavigationItems.Home.route)
+            scanScreenController.onClickRead(secrets!!) {
+                isDoneReadingCharacter = true
+            }
+        }
+        onDispose {
+            if(readingScreen) {
+                scanScreenController.unregisterActivityLifecycleListener(
+                    SCAN_SCREEN_ACTIVITY_LIFECYCLE_LISTENER
+                )
+                scanScreenController.cancelRead()
+            }
+        }
+    }
+
+    DisposableEffect(writingScreen, isDoneSendingCard) {
+        if (writingScreen) {
+            scanScreenController.registerActivityLifecycleListener(
+                SCAN_SCREEN_ACTIVITY_LIFECYCLE_LISTENER,
+                object : ActivityLifecycleListener {
+                    override fun onPause() {
+                        scanScreenController.cancelRead()
+                    }
+
+                    override fun onResume() {
+                        if (!isDoneSendingCard) {
+                            scanScreenController.onClickCheckCard(secrets!!, nfcCharacter!!) {
+                                isDoneSendingCard = true
+                            }
+                        } else if (!isDoneWritingCharacter) {
+                            scanScreenController.onClickWrite(secrets!!, nfcCharacter!!) {
+                                isDoneWritingCharacter = true
+                            }
+                        }
+                    }
                 }
             )
+        }
+
+        if (secrets != null && nfcCharacter != null) {
+            if (!isDoneSendingCard) {
+                scanScreenController.onClickCheckCard(secrets!!, nfcCharacter!!) {
+                    isDoneSendingCard = true
+                }
+            } else if (!isDoneWritingCharacter) {
+                scanScreenController.onClickWrite(secrets!!, nfcCharacter!!) {
+                    isDoneWritingCharacter = true
+                }
+            }
+        }
+
+        onDispose {
+            if(writingScreen) {
+                scanScreenController.unregisterActivityLifecycleListener(SCAN_SCREEN_ACTIVITY_LIFECYCLE_LISTENER)
+                scanScreenController.cancelRead()
+            }
+        }
+    }
+
+    if (isDoneReadingCharacter) {
+        readingScreen = false
+        navController.navigate(NavigationItems.Home.route)
+    } else if (isDoneSendingCard && isDoneWritingCharacter) {
+        writingScreen = false
+        navController.navigate(NavigationItems.Home.route)
+        LaunchedEffect(storageRepository) {
+            withContext(Dispatchers.IO) {
+                storageRepository
+                    .deleteCharacter(characterId!!)
+            }
+        }
+    }
+
+    if (readingScreen) {
+        ReadingCharacterScreen("Reading character") {
+            readingScreen = false
+            scanScreenController.cancelRead()
+        }
+    } else if (writingScreen) {
+        if (!isDoneSendingCard) {
+            ReadingCharacterScreen("Sending card") {
+                writingScreen = false
+                scanScreenController.cancelRead()
+            }
+        } else if (!isDoneWritingCharacter) {
+            ReadingCharacterScreen("Writing character") {
+                isDoneSendingCard = false
+                writingScreen = false
+                scanScreenController.cancelRead()
+            }
+        }
     } else {
         ChooseConnectOption(
             onClickRead = when {
@@ -94,9 +188,9 @@ fun ScanScreen(
                 else -> {
                     {
                         if(secrets == null) {
-                            Toast.makeText(context, context.getString(R.string.scan_secrets_not_initialized), Toast.LENGTH_SHORT).show()
+                            Toast.makeText(context, "Secrets is not yet initialized. Try again.", Toast.LENGTH_SHORT).show()
                         } else if(secrets?.isMissingSecrets() == true) {
-                            Toast.makeText(context, context.getString(R.string.scan_secrets_not_imported), Toast.LENGTH_SHORT).show()
+                            Toast.makeText(context, "Secrets not yet imported. Go to Settings and Import APK", Toast.LENGTH_SHORT).show()
                         } else {
                             readingScreen = true // kicks off nfc adapter in DisposableEffect
                         }
@@ -108,9 +202,9 @@ fun ScanScreen(
                 else -> {
                     {
                         if(secrets == null) {
-                            Toast.makeText(context,   context.getString(R.string.scan_secrets_not_initialized), Toast.LENGTH_SHORT).show()
+                            Toast.makeText(context, "Secrets is not yet initialized. Try again.", Toast.LENGTH_SHORT).show()
                         } else if(secrets?.isMissingSecrets() == true) {
-                            Toast.makeText(context, context.getString(R.string.scan_secrets_not_imported), Toast.LENGTH_SHORT).show()
+                            Toast.makeText(context, "Secrets not yet imported. Go to Settings and Import APK", Toast.LENGTH_SHORT).show()
                         } else {
                             writingScreen = true // kicks off nfc adapter in DisposableEffect
                         }
@@ -122,8 +216,66 @@ fun ScanScreen(
     }
 }
 
+@Composable
+fun ChooseConnectOption(
+    onClickRead: (() -> Unit)? = null,
+    onClickWrite: (() -> Unit)? = null,
+    navController: NavController
+) {
+    Scaffold(
+        topBar = {
+            TopBanner(
+                text = "Scan a Vital Bracelet",
+                onBackClick = {
+                    navController.popBackStack()
+                }
+            )
+        }
+    ) { contentPadding ->
+        Column(
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.CenterHorizontally,
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(contentPadding)
+        ) {
+            ScanButton(
+                text = "Vital Bracelet to App",
+                disabled = onClickRead == null,
+                onClick = onClickRead?: {  },
+            )
+            Spacer(modifier = Modifier.height(16.dp))
+            ScanButton(
+                text = "App to Vital Bracelet",
+                disabled = onClickWrite == null,
+                onClick = onClickWrite?: {  },
+            )
+        }
+    }
+}
 
 
+@Composable
+fun ScanButton(
+    text: String,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    disabled: Boolean = false,
+) {
+    Button(
+        onClick = onClick,
+        modifier = modifier,
+        enabled = !disabled,
+    ) {
+        Text(
+            text = text,
+            fontSize = 16.sp,
+            modifier = Modifier
+                .padding(4.dp)
+        )
+    }
+}
+
 @Preview(showBackground = true)
 @Composable
 fun ScanScreenPreview() {
@@ -138,12 +290,11 @@ fun ScanScreenPreview() {
             ) {
 
             }
-            override fun flushCharacter(cardId: Long) {}
-            override fun onClickRead(secrets: Secrets, onComplete: ()->Unit, onMultipleCards: (List<Card>) -> Unit) {}
+            override fun onClickRead(secrets: Secrets, onComplete: ()->Unit) {}
             override fun onClickCheckCard(secrets: Secrets, nfcCharacter: NfcCharacter, onComplete: () -> Unit) {}
             override fun onClickWrite(secrets: Secrets, nfcCharacter: NfcCharacter, onComplete: () -> Unit) {}
             override fun cancelRead() {}
-            override fun characterFromNfc(nfcCharacter: NfcCharacter, onMultipleCards: (List<Card>, NfcCharacter) -> Unit): String { return "" }
+            override fun characterFromNfc(nfcCharacter: NfcCharacter): String { return "" }
             override suspend fun characterToNfc(characterId: Long): NfcCharacter? { return null }
         },
         characterId = null,

app/src/main/java/com/github/nacabaro/vbhelper/screens/scanScreen/ScanScreenController.kt

@@ -2,13 +2,12 @@ package com.github.nacabaro.vbhelper.screens.scanScreen
 
 import com.github.cfogrady.vbnfc.data.NfcCharacter
 import com.github.nacabaro.vbhelper.ActivityLifecycleListener
-import com.github.nacabaro.vbhelper.domain.card.Card
 import com.github.nacabaro.vbhelper.source.proto.Secrets
 import kotlinx.coroutines.flow.Flow
 
 interface ScanScreenController {
     val secretsFlow: Flow<Secrets>
-    fun onClickRead(secrets: Secrets, onComplete: ()->Unit, onMultipleCards: (List<Card>) -> Unit)
+    fun onClickRead(secrets: Secrets, onComplete: ()->Unit)
     fun onClickCheckCard(secrets: Secrets, nfcCharacter: NfcCharacter, onComplete: () -> Unit)
     fun onClickWrite(secrets: Secrets, nfcCharacter: NfcCharacter, onComplete: () -> Unit)
 
@@ -17,11 +16,6 @@ interface ScanScreenController {
     fun registerActivityLifecycleListener(key: String, activityLifecycleListener: ActivityLifecycleListener)
     fun unregisterActivityLifecycleListener(key: String)
 
-    fun flushCharacter(cardId: Long)
-
-    fun characterFromNfc(
-        nfcCharacter: NfcCharacter,
-        onMultipleCards: (List<Card>, NfcCharacter) -> Unit
-    ): String
+    fun characterFromNfc(nfcCharacter: NfcCharacter): String
     suspend fun characterToNfc(characterId: Long): NfcCharacter?
 }

app/src/main/java/com/github/nacabaro/vbhelper/screens/scanScreen/ScanScreenControllerImpl.kt

@@ -11,11 +11,8 @@ import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.lifecycle.lifecycleScope
 import com.github.cfogrady.vbnfc.TagCommunicator
-import com.github.cfogrady.vbnfc.be.BENfcCharacter
 import com.github.cfogrady.vbnfc.data.NfcCharacter
-import com.github.cfogrady.vbnfc.vb.VBNfcCharacter
 import com.github.nacabaro.vbhelper.ActivityLifecycleListener
-import com.github.nacabaro.vbhelper.domain.card.Card
 import com.github.nacabaro.vbhelper.screens.scanScreen.converters.FromNfcConverter
 import com.github.nacabaro.vbhelper.screens.scanScreen.converters.ToNfcConverter
 import com.github.nacabaro.vbhelper.source.getCryptographicTransformerMap
@@ -25,7 +22,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
-import com.github.nacabaro.vbhelper.R
 
 class ScanScreenControllerImpl(
     override val secretsFlow: Flow<Secrets>,
@@ -33,26 +29,22 @@ class ScanScreenControllerImpl(
     private val registerActivityLifecycleListener: (String, ActivityLifecycleListener)->Unit,
     private val unregisterActivityLifecycleListener: (String)->Unit,
 ): ScanScreenController {
-    private var lastScannedCharacter: NfcCharacter? = null
+
     private val nfcAdapter: NfcAdapter
 
     init {
         val maybeNfcAdapter = NfcAdapter.getDefaultAdapter(componentActivity)
         if (maybeNfcAdapter == null) {
-            Toast.makeText(componentActivity,  componentActivity.getString(R.string.scan_no_nfc_on_device), Toast.LENGTH_SHORT).show()
+            Toast.makeText(componentActivity, "No NFC on device!", Toast.LENGTH_SHORT).show()
         }
         nfcAdapter = maybeNfcAdapter
         checkSecrets()
     }
 
-    override fun onClickRead(secrets: Secrets, onComplete: ()->Unit, onMultipleCards: (List<Card>) -> Unit) {
+    override fun onClickRead(secrets: Secrets, onComplete: ()->Unit) {
         handleTag(secrets) { tagCommunicator ->
             val character = tagCommunicator.receiveCharacter()
-            val resultMessage = characterFromNfc(character) { cards, nfcCharacter ->
-                lastScannedCharacter = nfcCharacter
-                onMultipleCards(cards)
-
-            }
+            val resultMessage = characterFromNfc(character)
             onComplete.invoke()
             resultMessage
         }
@@ -95,7 +87,7 @@ class ScanScreenControllerImpl(
             val nfcData = NfcA.get(tag)
             if (nfcData == null) {
                 componentActivity.runOnUiThread {
-                    Toast.makeText(componentActivity, componentActivity.getString(R.string.scan_tag_not_vb), Toast.LENGTH_SHORT).show()
+                    Toast.makeText(componentActivity, "Tag detected is not VB", Toast.LENGTH_SHORT).show()
                 }
             }
             nfcData.connect()
@@ -113,7 +105,7 @@ class ScanScreenControllerImpl(
         componentActivity.lifecycleScope.launch(Dispatchers.IO) {
             if(secretsFlow.stateIn(componentActivity.lifecycleScope).value.isMissingSecrets()) {
                 componentActivity.runOnUiThread {
-                    Toast.makeText(componentActivity, componentActivity.getString(R.string.scan_missing_secrets), Toast.LENGTH_SHORT).show()
+                    Toast.makeText(componentActivity, "Missing Secrets. Go to settings and import Vital Arena APK", Toast.LENGTH_SHORT).show()
                 }
             }
         }
@@ -126,20 +118,12 @@ class ScanScreenControllerImpl(
     ) {
         handleTag(secrets) { tagCommunicator ->
             try {
-                if (nfcCharacter is VBNfcCharacter) {
-                    Log.d("SendCharacter", "VBNfcCharacter")
-                    val castNfcCharacter: VBNfcCharacter = nfcCharacter
-                    tagCommunicator.sendCharacter(castNfcCharacter)
-                } else if (nfcCharacter is BENfcCharacter) {
-                    Log.d("SendCharacter", "BENfcCharacter")
-                    val castNfcCharacter: BENfcCharacter = nfcCharacter
-                    tagCommunicator.sendCharacter(castNfcCharacter)
-                }
+                tagCommunicator.sendCharacter(nfcCharacter)
                 onComplete.invoke()
-                componentActivity.getString(R.string.scan_sent_character_success)
+                "Sent character successfully!"
             } catch (e: Throwable) {
                 Log.e("TAG", e.stackTraceToString())
-                componentActivity.getString(R.string.scan_error_generic)
+                "Whoops"
             }
         }
     }
@@ -152,46 +136,27 @@ class ScanScreenControllerImpl(
         handleTag(secrets) { tagCommunicator ->
             tagCommunicator.prepareDIMForCharacter(nfcCharacter.dimId)
             onComplete.invoke()
-            componentActivity.getString(R.string.scan_sent_dim_success)
+            "Sent DIM successfully!"
         }
     }
 
     // EXTRACTED DIRECTLY FROM EXAMPLE APP
     private fun showWirelessSettings() {
-        Toast.makeText(componentActivity,  componentActivity.getString(R.string.scan_nfc_must_be_enabled), Toast.LENGTH_SHORT).show()
+        Toast.makeText(componentActivity, "NFC must be enabled", Toast.LENGTH_SHORT).show()
         componentActivity.startActivity(Intent(Settings.ACTION_WIRELESS_SETTINGS))
     }
 
-    override fun characterFromNfc(
-        nfcCharacter: NfcCharacter,
-        onMultipleCards: (List<Card>, NfcCharacter) -> Unit
-    ): String {
+    override fun characterFromNfc(nfcCharacter: NfcCharacter): String {
         val nfcConverter = FromNfcConverter(
             componentActivity = componentActivity
         )
-        return nfcConverter.addCharacter(nfcCharacter, onMultipleCards)
+        return nfcConverter.addCharacter(nfcCharacter)
     }
 
     override suspend fun characterToNfc(characterId: Long): NfcCharacter {
         val nfcGenerator = ToNfcConverter(
             componentActivity = componentActivity
         )
-
-        val character = nfcGenerator.characterToNfc(characterId)
-        Log.d("CharacterType", character.toString())
-        return character
-    }
-
-    override fun flushCharacter(cardId: Long) {
-        val nfcConverter = FromNfcConverter(
-            componentActivity = componentActivity
-        )
-
-        componentActivity.lifecycleScope.launch(Dispatchers.IO) {
-            if (lastScannedCharacter != null) {
-                nfcConverter.addCharacterUsingCard(lastScannedCharacter!!, cardId)
-                lastScannedCharacter = null
-            }
-        }
+        return nfcGenerator.characterToNfc(characterId)
     }
 }

app/src/main/java/com/github/nacabaro/vbhelper/screens/scanScreen/cardSelect/ChooseCard.kt

@@ -1,48 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.cardScreen
-
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.Scaffold
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import com.github.nacabaro.vbhelper.components.TopBanner
-import com.github.nacabaro.vbhelper.domain.card.Card
-import com.github.nacabaro.vbhelper.screens.scanScreen.cardSelect.ScanCardEntry
-import com.github.nacabaro.vbhelper.utils.BitmapData
-
-@Composable
-fun ChooseCard(
-    cards: List<Card>,
-    onCardSelected: (Card) -> Unit
-) {
-    Scaffold (
-        topBar = {
-            TopBanner(
-                text = "Choose card",
-            )
-        }
-    ) { contentPadding ->
-        LazyColumn (
-            modifier = Modifier
-                .padding(top = contentPadding.calculateTopPadding())
-        ) {
-            items(cards) {
-                ScanCardEntry(
-                    name = it.name,
-                    logo = BitmapData(
-                        it.logo,
-                        it.logoWidth,
-                        it.logoHeight
-                    ),
-                    onClick = {
-                        onCardSelected(it)
-                    },
-                    modifier = Modifier
-                        .padding(8.dp)
-                )
-            }
-        }
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/screens/scanScreen/converters/FromNfcConverter.kt

@@ -1,11 +1,13 @@
 package com.github.nacabaro.vbhelper.screens.scanScreen.converters
 
+import android.util.Log
 import androidx.activity.ComponentActivity
 import com.github.cfogrady.vbnfc.be.BENfcCharacter
 import com.github.cfogrady.vbnfc.data.NfcCharacter
 import com.github.cfogrady.vbnfc.vb.VBNfcCharacter
 import com.github.nacabaro.vbhelper.di.VBHelper
 import com.github.nacabaro.vbhelper.domain.card.Card
+import com.github.nacabaro.vbhelper.domain.card.CardProgress
 import com.github.nacabaro.vbhelper.domain.device_data.BECharacterData
 import com.github.nacabaro.vbhelper.domain.device_data.SpecialMissions
 import com.github.nacabaro.vbhelper.domain.device_data.UserCharacter
@@ -21,68 +23,15 @@ class FromNfcConverter (
     private val database = application.container.db
 
 
-    fun addCharacterUsingCard(
-        nfcCharacter: NfcCharacter,
-        cardId: Long
-    ): String {
+
+    fun addCharacter(nfcCharacter: NfcCharacter): String {
         val cardData = database
             .cardDao()
-            .getCardById(cardId)
+            .getDimById(nfcCharacter.dimId.toInt())
 
-        if (cardData == null) {
-            return "Card not found"
-        }
-
-        return insertCharacter(nfcCharacter, cardData)
-    }
-    
-
-    fun addCharacter(
-        nfcCharacter: NfcCharacter,
-        onMultipleCards: (List<Card>, NfcCharacter) -> Unit
-    ): String {
-        val appReservedCardId = nfcCharacter
-            .appReserved2[0].toLong()
-
-        var cardData: Card? =  null
-
-        if (appReservedCardId != 0L) {
-            val fetchedCard = database
-                .cardDao()
-                .getCardById(appReservedCardId)
-
-            if (fetchedCard == null) {
-                return "Card not found"
-            } else if (fetchedCard.cardId == nfcCharacter.dimId.toInt()) {
-                cardData = fetchedCard
-            }
-        }
-
-        if (cardData == null) {
-            val allCards = database
-                .cardDao()
-                .getCardByCardId(nfcCharacter.dimId.toInt())
-
-            if (allCards.isEmpty())
+        if (cardData == null)
             return "Card not found"
 
-            if (allCards.size > 1) {
-                onMultipleCards(allCards, nfcCharacter)
-                return "Multiple cards found"
-            }
-
-            cardData = allCards[0]
-        }
-
-        return insertCharacter(nfcCharacter, cardData)
-    }
-
-
-
-    private fun insertCharacter(
-        nfcCharacter: NfcCharacter,
-        cardData: Card
-    ): String {
         val cardCharData = database
             .characterDao()
             .getCharacterByMonIndex(nfcCharacter.charIndex.toInt(), cardData.id)
@@ -150,13 +99,15 @@ class FromNfcConverter (
         nfcCharacter: NfcCharacter,
         cardData: Card
     ) {
+        val currentCardProgress = CardProgress(
+            cardId = cardData.id,
+            currentStage = nfcCharacter.nextAdventureMissionStage.toInt(),
+            unlocked = nfcCharacter.nextAdventureMissionStage.toInt() > cardData.stageCount
+        )
+
         database
             .cardProgressDao()
-            .updateCardProgress(
-                currentStage = nfcCharacter.nextAdventureMissionStage.toInt(),
-                cardId = cardData.id,
-                unlocked = nfcCharacter.nextAdventureMissionStage.toInt() > cardData.stageCount,
-            )
+            .updateDimProgress(currentCardProgress)
     }
 
 
@@ -248,11 +199,10 @@ class FromNfcConverter (
     ) {
         val vitalsHistoryWatch = nfcCharacter.vitalHistory
         val vitalsHistory = vitalsHistoryWatch.map { historyElement ->
-            val year = if (historyElement.year.toInt() !in 2021 .. 2035) 0 else historyElement.year.toInt()
-
+            Log.d("VitalsHistory", "${historyElement.year.toInt()} ${historyElement.month.toInt()} ${historyElement.day.toInt()}")
             VitalsHistory(
                 charId = characterId,
-                year = year,
+                year = historyElement.year.toInt(),
                 month = historyElement.month.toInt(),
                 day = historyElement.day.toInt(),
                 vitalPoints = historyElement.vitalsGained.toInt()

app/src/main/java/com/github/nacabaro/vbhelper/screens/scanScreen/converters/ToNfcConverter.kt

@@ -1,7 +1,6 @@
 package com.github.nacabaro.vbhelper.screens.scanScreen.converters
 
 import android.icu.util.Calendar
-import android.icu.util.TimeZone
 import android.util.Log
 import androidx.activity.ComponentActivity
 import com.github.cfogrady.vbnfc.be.BENfcCharacter
@@ -14,7 +13,6 @@ import com.github.nacabaro.vbhelper.di.VBHelper
 import com.github.nacabaro.vbhelper.domain.device_data.UserCharacter
 import com.github.nacabaro.vbhelper.dtos.CharacterDtos
 import com.github.nacabaro.vbhelper.utils.DeviceType
-import kotlinx.coroutines.flow.first
 import java.util.Date
 
 class ToNfcConverter(
@@ -39,10 +37,14 @@ class ToNfcConverter(
             .characterDao()
             .getCharacterInfo(userCharacter.charId)
 
+        val currentCardStage = database
+            .cardProgressDao()
+            .getCardProgress(characterInfo.cardId)
+
         return if (userCharacter.characterType == DeviceType.BEDevice)
-            nfcToBENfc(characterId, characterInfo, userCharacter)
+            nfcToBENfc(characterId, characterInfo, currentCardStage, userCharacter)
         else
-            nfcToVBNfc(characterId, characterInfo, userCharacter)
+            nfcToVBNfc(characterId, characterInfo, currentCardStage, userCharacter)
     }
 
 
@@ -50,14 +52,14 @@ class ToNfcConverter(
     private suspend fun nfcToVBNfc(
         characterId: Long,
         characterInfo: CharacterDtos.CardCharacterInfo,
+        currentCardStage: Int,
         userCharacter: UserCharacter
     ): VBNfcCharacter {
         val vbData = database
             .userCharacterDao()
             .getVbData(characterId)
-            .first()
 
-        val paddedTransformationArray = generateTransformationHistory(characterId, 9)
+        val paddedTransformationArray = generateTransformationHistory(characterId)
 
         val watchSpecialMissions = generateSpecialMissionsArray(characterId)
 
@@ -67,7 +69,7 @@ class ToNfcConverter(
             stage = characterInfo.stage.toByte(),
             attribute = characterInfo.attribute,
             ageInDays = userCharacter.ageInDays.toByte(),
-            nextAdventureMissionStage = characterInfo.currentStage.toByte(),
+            nextAdventureMissionStage = currentCardStage.toByte(),
             mood = userCharacter.mood.toByte(),
             vitalPoints = userCharacter.vitalPoints.toUShort(),
             transformationCountdownInMinutes = userCharacter.transformationCountdown.toUShort(),
@@ -82,7 +84,7 @@ class ToNfcConverter(
             transformationHistory = paddedTransformationArray,
             vitalHistory = generateVitalsHistoryArray(characterId),
             appReserved1 = ByteArray(12) {0},
-            appReserved2 = generateUShortAppReserved(userCharacter),
+            appReserved2 = Array(3) {0u},
             generation = vbData.generation.toUShort(),
             totalTrophies = vbData.totalTrophies.toUShort(),
             specialMissions = watchSpecialMissions.toTypedArray()
@@ -92,24 +94,6 @@ class ToNfcConverter(
     }
 
 
-    private suspend fun generateUShortAppReserved(
-        userCharacter: UserCharacter
-    ): Array<UShort> {
-        val cardData = database
-            .cardDao()
-            .getCardByCharacterId(userCharacter.id)
-            .first()
-
-        val appReserved = Array<UShort>(3) {
-            0u
-        }
-
-        appReserved[0] = cardData.id.toUShort()
-
-        return appReserved
-    }
-
-
 
     private suspend fun generateSpecialMissionsArray(
         characterId: Long
@@ -117,7 +101,6 @@ class ToNfcConverter(
         val specialMissions = database
             .userCharacterDao()
             .getSpecialMissions(characterId)
-            .first()
 
         val watchSpecialMissions = specialMissions.map {
             SpecialMission(
@@ -172,12 +155,12 @@ class ToNfcConverter(
     private suspend fun nfcToBENfc(
         characterId: Long,
         characterInfo: CharacterDtos.CardCharacterInfo,
+        currentCardStage: Int,
         userCharacter: UserCharacter
     ): BENfcCharacter {
         val beData = database
             .userCharacterDao()
             .getBeData(characterId)
-            .first()
 
         val paddedTransformationArray = generateTransformationHistory(characterId)
 
@@ -187,7 +170,7 @@ class ToNfcConverter(
             stage = characterInfo.stage.toByte(),
             attribute = characterInfo.attribute,
             ageInDays = userCharacter.ageInDays.toByte(),
-            nextAdventureMissionStage = characterInfo.currentStage.toByte(),
+            nextAdventureMissionStage = currentCardStage.toByte(),
             mood = userCharacter.mood.toByte(),
             vitalPoints = userCharacter.vitalPoints.toUShort(),
             itemEffectMentalStateValue = beData.itemEffectMentalStateValue.toByte(),
@@ -235,32 +218,23 @@ class ToNfcConverter(
 
 
     private suspend fun generateTransformationHistory(
-        characterId: Long,
-        length: Int = 8
+        characterId: Long
     ): Array<NfcCharacter.Transformation> {
         val transformationHistory = database
             .userCharacterDao()
-            .getTransformationHistory(characterId)
-            .first()
+            .getTransformationHistory(characterId)!!
             .map {
                 val date = Date(it.transformationDate)
-                val calendar = android.icu.util.GregorianCalendar(TimeZone.getTimeZone("UTC"))
+                val calendar = android.icu.util.GregorianCalendar()
                 calendar.time = date
 
-                Log.d(
-                    "TransformationHistory",
-                    "Year: ${calendar.get(Calendar.YEAR)}, " +
-                            "Month: ${calendar.get(Calendar.MONTH) + 1}, " +
-                            "Day: ${calendar.get(Calendar.DAY_OF_MONTH)}"
-                )
-
                 NfcCharacter.Transformation(
                     toCharIndex = it.monIndex.toUByte(),
                     year = calendar
                         .get(Calendar.YEAR)
                         .toUShort(),
-                    month = (calendar
-                        .get(Calendar.MONTH) + 1)
+                    month = calendar
+                        .get(Calendar.MONTH)
                         .toUByte(),
                     day = calendar
                         .get(Calendar.DAY_OF_MONTH)
@@ -268,7 +242,7 @@ class ToNfcConverter(
                 )
             }.toTypedArray()
 
-        val paddedTransformationArray = padTransformationArray(transformationHistory, length)
+        val paddedTransformationArray = padTransformationArray(transformationHistory)
 
         return paddedTransformationArray
     }
@@ -276,14 +250,13 @@ class ToNfcConverter(
 
 
     private fun padTransformationArray(
-        transformationArray: Array<NfcCharacter.Transformation>,
-        length: Int
+        transformationArray: Array<NfcCharacter.Transformation>
     ): Array<NfcCharacter.Transformation> {
         if (transformationArray.size >= 8) {
             return transformationArray
         }
 
-        val paddedArray = Array(length) {
+        val paddedArray = Array(8) {
             NfcCharacter.Transformation(
                 toCharIndex = 255u,
                 year = 65535u,

app/src/main/java/com/github/nacabaro/vbhelper/screens/scanScreen/screens/ReadCharacterScreen.kt

@@ -1,61 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.scanScreen.screens
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Button
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import com.github.nacabaro.vbhelper.components.TopBanner
-import com.github.nacabaro.vbhelper.R
-
-@Composable
-fun ReadCharacterScreen(
-    onClickCancel: () -> Unit,
-    onClickConfirm: () -> Unit
-) {
-    Scaffold(
-        topBar = {
-            TopBanner(
-                text = stringResource(R.string.read_character_title),
-                onBackClick = onClickCancel
-            )
-        }
-    ) { innerPadding ->
-        Column(
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.Center,
-            modifier = Modifier
-                .padding(innerPadding)
-                .fillMaxSize()
-        ) {
-            Text(
-                text = stringResource(R.string.read_character_prepare_device),
-                textAlign = TextAlign.Center
-            )
-
-            Text(
-                text = stringResource(R.string.read_character_go_to_connect),
-                textAlign = TextAlign.Center
-            )
-
-            Spacer(
-                modifier = Modifier.padding(8.dp)
-            )
-
-            Button(
-                onClick = onClickConfirm,
-            ) {
-                Text(stringResource(R.string.read_character_confirm))
-            }
-        }
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/screens/scanScreen/screens/ReadingScreen.kt

@@ -1,112 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.scanScreen.screens
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.res.stringResource
-import com.github.nacabaro.vbhelper.ActivityLifecycleListener
-import com.github.nacabaro.vbhelper.domain.card.Card
-import com.github.nacabaro.vbhelper.screens.cardScreen.ChooseCard
-import com.github.nacabaro.vbhelper.screens.scanScreen.SCAN_SCREEN_ACTIVITY_LIFECYCLE_LISTENER
-import com.github.nacabaro.vbhelper.screens.scanScreen.ScanScreenController
-import com.github.nacabaro.vbhelper.R
-
-
-@Composable
-fun ReadingScreen(
-    scanScreenController: ScanScreenController,
-    onCancel: () -> Unit,
-    onComplete: () -> Unit
-) {
-    val secrets by scanScreenController.secretsFlow.collectAsState(null)
-
-    var cardsRead by remember { mutableStateOf<List<Card>?>(null) }
-
-    var readingScreen by remember { mutableStateOf(false) }
-    var isDoneReadingCharacter by remember { mutableStateOf(false) }
-    var cardSelectScreen by remember { mutableStateOf(false) }
-
-    DisposableEffect(readingScreen) {
-        if(readingScreen) {
-            scanScreenController.registerActivityLifecycleListener(
-                SCAN_SCREEN_ACTIVITY_LIFECYCLE_LISTENER,
-                object: ActivityLifecycleListener {
-                    override fun onPause() {
-                        scanScreenController.cancelRead()
-                    }
-
-                    override fun onResume() {
-                        scanScreenController.onClickRead(
-                            secrets = secrets!!,
-                            onComplete = {
-                                isDoneReadingCharacter = true
-                            },
-                            onMultipleCards = { cards ->
-                                cardsRead = cards
-                                readingScreen = false
-                                cardSelectScreen = true
-                                isDoneReadingCharacter = true
-                            }
-                        )
-                    }
-                }
-            )
-            scanScreenController.onClickRead(
-                secrets = secrets!!,
-                onComplete = {
-                    isDoneReadingCharacter = true
-                },
-                onMultipleCards = { cards ->
-                    cardsRead = cards
-                    readingScreen = false
-                    cardSelectScreen = true
-                    isDoneReadingCharacter = true
-                }
-            )
-        }
-        onDispose {
-            if(readingScreen) {
-                scanScreenController.unregisterActivityLifecycleListener(
-                    SCAN_SCREEN_ACTIVITY_LIFECYCLE_LISTENER
-                )
-                scanScreenController.cancelRead()
-            }
-        }
-    }
-
-    if (isDoneReadingCharacter && !cardSelectScreen) {
-        readingScreen = false
-        onComplete()
-    }
-
-    if (!readingScreen) {
-        ReadCharacterScreen(
-            onClickConfirm = {
-                readingScreen = true
-            },
-            onClickCancel = {
-                onCancel()
-            }
-        )
-    }
-
-    if (readingScreen) {
-        ActionScreen(topBannerText = stringResource(R.string.reading_character_title),) {
-            readingScreen = false
-            scanScreenController.cancelRead()
-            onCancel()
-        }
-    } else if (cardSelectScreen) {
-        ChooseCard(
-            cards = cardsRead!!,
-            onCardSelected = { card ->
-                cardSelectScreen = false
-                scanScreenController.flushCharacter(card.id)
-            }
-        )
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/screens/scanScreen/screens/WriteCardScreen.kt

@@ -1,142 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.scanScreen.screens
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.material3.Button
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardColors
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.contentColorFor
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.FilterQuality
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.github.nacabaro.vbhelper.components.TopBanner
-import com.github.nacabaro.vbhelper.di.VBHelper
-import com.github.nacabaro.vbhelper.domain.card.Card
-import com.github.nacabaro.vbhelper.source.ScanRepository
-import com.github.nacabaro.vbhelper.utils.BitmapData
-import com.github.nacabaro.vbhelper.utils.getImageBitmap
-import com.github.nacabaro.vbhelper.R
-
-@Composable
-fun WriteCardScreen(
-    characterId: Long,
-    onClickCancel: () -> Unit,
-    onClickConfirm: () -> Unit
-) {
-    val application = LocalContext.current.applicationContext as VBHelper
-    val database = application.container.db
-    val scanRepository = ScanRepository(database)
-    val cardDetails by scanRepository.getCardDetails(characterId).collectAsState(Card(
-        id = 0,
-        cardId = 0,
-        name = "",
-        logo = byteArrayOf(),
-        logoHeight = 0,
-        logoWidth = 0,
-        stageCount = 0,
-        isBEm = false
-    ))
-
-    Scaffold(
-        topBar = {
-            TopBanner(
-                text = stringResource(R.string.write_card_title),
-                onBackClick = onClickCancel
-            )
-        }
-    ) { innerPadding ->
-        Column(
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.Center,
-            modifier = Modifier
-                .padding(innerPadding)
-                .fillMaxSize()
-        ) {
-            Card (
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(8.dp)
-            ) {
-                Row (
-                    modifier = Modifier.padding(16.dp),
-                ){
-                    if (cardDetails.logoHeight > 0 && cardDetails.logoWidth > 0) {
-                        val charaBitmapData = BitmapData(
-                            bitmap = cardDetails.logo,
-                            width = cardDetails.logoWidth,
-                            height = cardDetails.logoHeight
-                        )
-                        val charaImageBitmapData = charaBitmapData.getImageBitmap(
-                            context = LocalContext.current,
-                            multiplier = 4,
-                            obscure = false
-                        )
-
-                        Card (
-                            colors = CardColors(
-                                containerColor = MaterialTheme.colorScheme.surfaceVariant,
-                                contentColor = MaterialTheme.colorScheme.contentColorFor(
-                                    backgroundColor = MaterialTheme.colorScheme.surfaceVariant,
-                                ),
-                                disabledContainerColor = MaterialTheme.colorScheme.surfaceVariant,
-                                disabledContentColor = MaterialTheme.colorScheme.contentColorFor(
-                                    backgroundColor = MaterialTheme.colorScheme.surfaceVariant,
-                                )
-                            )
-                        ) {
-                            Image(
-                                bitmap = charaImageBitmapData.imageBitmap,
-                                contentDescription =  stringResource(
-                                    R.string.write_card_icon_description
-                                ),
-                                modifier = Modifier
-                                    .size(charaImageBitmapData.dpWidth)
-                                    .padding(8.dp),
-                                filterQuality = FilterQuality.None
-                            )
-                        }
-                    }
-
-                    Spacer(
-                        modifier = Modifier.width(8.dp)
-                    )
-
-                    Column {
-                        Text(stringResource(R.string.write_card_device_ready))
-                        Text(
-                            stringResource(
-                                R.string.write_card_required_card,
-                                cardDetails.name
-                            )
-                        )
-
-                    }
-                }
-
-            }
-
-            Button(
-                onClick = onClickConfirm,
-            ) {
-                Text(stringResource(R.string.write_card_confirm))
-            }
-        }
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/screens/scanScreen/screens/WriteCharacterScreen.kt

@@ -1,138 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.scanScreen.screens
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.material3.Button
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardColors
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.contentColorFor
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.FilterQuality
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.github.nacabaro.vbhelper.components.TopBanner
-import com.github.nacabaro.vbhelper.di.VBHelper
-import com.github.nacabaro.vbhelper.domain.card.Card
-import com.github.nacabaro.vbhelper.source.ScanRepository
-import com.github.nacabaro.vbhelper.utils.BitmapData
-import com.github.nacabaro.vbhelper.utils.getImageBitmap
-import com.github.nacabaro.vbhelper.R
-
-
-@Composable
-fun WriteCharacterScreen(
-    characterId: Long,
-    onClickCancel: () -> Unit,
-    onClickConfirm: () -> Unit
-) {
-    val application = LocalContext.current.applicationContext as VBHelper
-    val database = application.container.db
-    val scanRepository = ScanRepository(database)
-    val cardDetails by scanRepository.getCardDetails(characterId).collectAsState(Card(
-        id = 0,
-        cardId = 0,
-        name = "",
-        logo = byteArrayOf(),
-        logoHeight = 0,
-        logoWidth = 0,
-        stageCount = 0,
-        isBEm = false
-    ))
-
-    Scaffold(
-        topBar = {
-            TopBanner(
-                text = stringResource(R.string.write_character_title),
-                onBackClick = onClickCancel
-            )
-        }
-    ) { innerPadding ->
-        Column(
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.Center,
-            modifier = Modifier
-                .padding(innerPadding)
-                .fillMaxSize()
-        ) {
-            Card (
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(8.dp)
-            ) {
-                Row (
-                    modifier = Modifier.padding(16.dp),
-                ){
-                    if (cardDetails.logoHeight > 0 && cardDetails.logoWidth > 0) {
-                        val charaBitmapData = BitmapData(
-                            bitmap = cardDetails.logo,
-                            width = cardDetails.logoWidth,
-                            height = cardDetails.logoHeight
-                        )
-                        val charaImageBitmapData = charaBitmapData.getImageBitmap(
-                            context = LocalContext.current,
-                            multiplier = 4,
-                            obscure = false
-                        )
-
-                        Card (
-                            colors = CardColors(
-                                containerColor = MaterialTheme.colorScheme.surfaceVariant,
-                                contentColor = MaterialTheme.colorScheme.contentColorFor(
-                                    backgroundColor = MaterialTheme.colorScheme.surfaceVariant,
-                                ),
-                                disabledContainerColor = MaterialTheme.colorScheme.surfaceVariant,
-                                disabledContentColor = MaterialTheme.colorScheme.contentColorFor(
-                                    backgroundColor = MaterialTheme.colorScheme.surfaceVariant,
-                                )
-                            )
-                        ) {
-                            Image(
-                                bitmap = charaImageBitmapData.imageBitmap,
-                                contentDescription = stringResource(R.string.write_character_icon_description),
-                                modifier = Modifier
-                                    .size(charaImageBitmapData.dpWidth)
-                                    .padding(8.dp),
-                                filterQuality = FilterQuality.None
-                            )
-                        }
-                    }
-
-                    Spacer(
-                        modifier = Modifier.width(8.dp)
-                    )
-
-                    Column {
-                        Text(stringResource(R.string.write_character_success))
-                        Text(stringResource(R.string.write_character_wait_ready))
-                    }
-                }
-
-            }
-
-            Spacer(modifier = Modifier.height(8.dp))
-
-            Button(
-                onClick = onClickConfirm,
-            ) {
-                Text(stringResource(R.string.write_character_confirm))
-            }
-        }
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/screens/scanScreen/screens/WritingScreen.kt

@@ -1,142 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.scanScreen.screens
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.platform.LocalContext
-import com.github.cfogrady.vbnfc.data.NfcCharacter
-import com.github.nacabaro.vbhelper.ActivityLifecycleListener
-import com.github.nacabaro.vbhelper.di.VBHelper
-import com.github.nacabaro.vbhelper.screens.scanScreen.SCAN_SCREEN_ACTIVITY_LIFECYCLE_LISTENER
-import com.github.nacabaro.vbhelper.screens.scanScreen.ScanScreenController
-import com.github.nacabaro.vbhelper.source.StorageRepository
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import androidx.compose.ui.res.stringResource
-import com.github.nacabaro.vbhelper.R
-
-@Composable
-fun WritingScreen(
-    scanScreenController: ScanScreenController,
-    characterId: Long,
-    nfcCharacter: NfcCharacter,
-    onComplete: () -> Unit,
-    onCancel: () -> Unit,
-) {
-    val secrets by scanScreenController.secretsFlow.collectAsState(null)
-
-    val application = LocalContext.current.applicationContext as VBHelper
-    val storageRepository = StorageRepository(application.container.db)
-
-    var writing by remember { mutableStateOf(false) }
-    var writingScreen by remember { mutableStateOf(false) }
-    var writingConfirmScreen by remember { mutableStateOf(false) }
-    var isDoneSendingCard by remember { mutableStateOf(false) }
-    var isDoneWritingCharacter by remember { mutableStateOf(false) }
-
-    DisposableEffect(writing) {
-        if (writing) {
-            scanScreenController.registerActivityLifecycleListener(
-                SCAN_SCREEN_ACTIVITY_LIFECYCLE_LISTENER,
-                object : ActivityLifecycleListener {
-                    override fun onPause() {
-                        scanScreenController.cancelRead()
-                    }
-
-                    override fun onResume() {
-                        if (!isDoneSendingCard) {
-                            scanScreenController.onClickCheckCard(secrets!!, nfcCharacter) {
-                                isDoneSendingCard = true
-                            }
-                        } else if (!isDoneWritingCharacter) {
-                            scanScreenController.onClickWrite(secrets!!, nfcCharacter) {
-                                isDoneWritingCharacter = true
-                            }
-                        }
-                    }
-                }
-            )
-
-            if (secrets != null) {
-                if (!isDoneSendingCard) {
-                    scanScreenController.onClickCheckCard(secrets!!, nfcCharacter) {
-                        isDoneSendingCard = true
-                    }
-                } else if (!isDoneWritingCharacter) {
-                    scanScreenController.onClickWrite(secrets!!, nfcCharacter) {
-                        isDoneWritingCharacter = true
-                    }
-                }
-            }
-        }
-
-        onDispose {
-            if (writing) {
-                scanScreenController.unregisterActivityLifecycleListener(
-                    SCAN_SCREEN_ACTIVITY_LIFECYCLE_LISTENER
-                )
-                scanScreenController.cancelRead()
-            }
-        }
-    }
-
-    if (!writingScreen) {
-        writing = false
-        WriteCardScreen (
-            characterId = characterId,
-            onClickCancel = {
-                scanScreenController.cancelRead()
-                onCancel()
-            },
-            onClickConfirm = {
-                writingScreen = true
-            }
-        )
-    } else if (!isDoneSendingCard) {
-        writing = true
-        ActionScreen( topBannerText = stringResource(R.string.sending_card_title)) {
-            scanScreenController.cancelRead()
-            onCancel()
-        }
-    } else if (!writingConfirmScreen) {
-        writing = false
-        WriteCharacterScreen (
-            characterId = characterId,
-            onClickCancel = {
-                scanScreenController.cancelRead()
-                onCancel()
-            },
-            onClickConfirm = {
-                writingConfirmScreen = true
-            }
-        )
-    } else if (!isDoneWritingCharacter) {
-        writing = true
-        ActionScreen(topBannerText = stringResource(R.string.writing_character_action_title)) {
-            isDoneSendingCard = false
-            scanScreenController.cancelRead()
-            onCancel()
-        }
-    }
-
-    var completedWriting by remember { mutableStateOf(false) }
-
-    LaunchedEffect(isDoneSendingCard, isDoneWritingCharacter) {
-        withContext(Dispatchers.IO) {
-            if (isDoneSendingCard && isDoneWritingCharacter) {
-                storageRepository
-                    .deleteCharacter(characterId)
-                completedWriting = true
-            }
-        }
-    }
-
-    if (completedWriting) {
-        onComplete()
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/screens/settingsScreen/CreditsScreen.kt

@@ -6,10 +6,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
 import androidx.navigation.NavController
 import com.github.nacabaro.vbhelper.components.TopBanner
-import com.github.nacabaro.vbhelper.R
 
 @Composable
 fun CreditsScreen(
@@ -18,7 +16,7 @@ fun CreditsScreen(
     Scaffold (
         topBar = {
             TopBanner(
-                text = stringResource(R.string.credits_title),
+                text = "Credits",
                 onBackClick = {
                     navController.popBackStack()
                 }
@@ -31,13 +29,12 @@ fun CreditsScreen(
             modifier = Modifier
                 .padding(top = contentPadding.calculateTopPadding())
         ) {
-            SettingsSection(stringResource(R.string.credits_section_reverse_engineering))
-            SettingsEntry(title = "cyanic", description = stringResource(R.string.credits_cyanic_description)) { }
-            SettingsSection(stringResource(R.string.credits_section_app_development))
-            SettingsEntry(title = "cfogrady", description = stringResource(R.string.credits_cfogrady_description)) { }
-            SettingsEntry(title = "nacabaro", description = stringResource(R.string.credits_nacabaro_description)) { }
-            SettingsEntry(title = "lightheel", description = stringResource(R.string.credits_lightheel_description)) { }
-            SettingsEntry(title = "shvstrz", description = stringResource(R.string.credits_shvstrz_description)) { }
+            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.") { }
         }
     }
 }

app/src/main/java/com/github/nacabaro/vbhelper/screens/settingsScreen/SettingsScreen.kt

@@ -1,7 +1,5 @@
 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
@@ -15,28 +13,22 @@ 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.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 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
-import com.github.nacabaro.vbhelper.R
-
 
 @Composable
 fun SettingsScreen(
     navController: NavController,
     settingsScreenController: SettingsScreenControllerImpl,
 ) {
-    val context = LocalContext.current
-
-    Scaffold(
+    Scaffold (
         topBar = {
             TopBanner(
-                text = stringResource(R.string.settings_title),
+                text = "Settings",
                 onBackClick = {
                     navController.popBackStack()
                 }
@@ -45,57 +37,31 @@ fun SettingsScreen(
         modifier = Modifier
             .fillMaxSize()
     ) { contentPadding ->
-        Column(
+        Column (
             modifier = Modifier
                 .padding(top = contentPadding.calculateTopPadding())
                 .fillMaxSize()
                 .verticalScroll(rememberScrollState())
         ) {
-            SettingsSection(title = stringResource(R.string.settings_section_nfc))
-            SettingsEntry(
-                title = stringResource(R.string.settings_import_apk_title),
-                description = stringResource(R.string.settings_import_apk_desc)
-            ) {
+            SettingsSection("NFC Communication")
+            SettingsEntry(title = "Import APK", description = "Import Secrets From Vital Arean 2.1.0 APK") {
                 settingsScreenController.onClickImportApk()
             }
-
-            SettingsSection(title = stringResource(R.string.settings_section_dim_bem))
-            SettingsEntry(
-                title = stringResource(R.string.settings_import_card_title),
-                description = stringResource(R.string.settings_import_card_desc)
-            ) {
+            SettingsSection("DiM/BEm management")
+            SettingsEntry(title = "Import card", description = "Import DiM/BEm card file") {
                 settingsScreenController.onClickImportCard()
             }
-
-            SettingsSection(title = stringResource(R.string.settings_section_about))
-            SettingsEntry(
-                title = stringResource(R.string.settings_credits_title),
-                description = stringResource(R.string.settings_credits_desc)
-            ) {
+            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 = stringResource(R.string.settings_about_title),
-                description = stringResource(R.string.settings_about_desc)
-            ) {
-                val browserIntent = Intent(
-                    Intent.ACTION_VIEW,
-                    Uri.parse("https://github.com/nacabaro/vbhelper/")
-                )
-                context.startActivity(browserIntent)
-            }
-
-            SettingsSection(title = stringResource(R.string.settings_section_data))
-            SettingsEntry(
-                title = stringResource(R.string.settings_export_data_title),
-                description = stringResource(R.string.settings_export_data_desc)
-            ) {
+            SettingsEntry(title = "About", description = "About") { }
+            SettingsSection("Data management")
+            SettingsEntry(title = "Export data", description = "Export application database") {
                 settingsScreenController.onClickOpenDirectory()
             }
-            SettingsEntry(
-                title = stringResource(R.string.settings_import_data_title),
-                description = stringResource(R.string.settings_import_data_desc)
-            ) {
+            SettingsEntry(title = "Import data", description = "Import application database") {
                 settingsScreenController.onClickImportDatabase()
             }
         }
@@ -127,9 +93,9 @@ fun SettingsEntry(
 fun SettingsSection(
     title: String
 ) {
-    Box(
+    Box (
         modifier = Modifier
-            .padding(start = 16.dp, top = 16.dp, bottom = 4.dp)
+            .padding(start = 16.dp)
     ) {
         Text(
             text = title,

app/src/main/java/com/github/nacabaro/vbhelper/screens/settingsScreen/SettingsScreenControllerImpl.kt

@@ -3,24 +3,36 @@ package com.github.nacabaro.vbhelper.screens.settingsScreen
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.launch
 import android.net.Uri
+import android.provider.OpenableColumns
+import android.util.Log
 import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
+import com.github.cfogrady.vb.dim.card.BemCard
+import com.github.cfogrady.vb.dim.card.DimCard
+import com.github.cfogrady.vb.dim.card.DimReader
+import com.github.cfogrady.vbnfc.data.NfcCharacter
 import com.github.nacabaro.vbhelper.database.AppDatabase
 import com.github.nacabaro.vbhelper.di.VBHelper
-import com.github.nacabaro.vbhelper.screens.settingsScreen.controllers.CardImportController
-import com.github.nacabaro.vbhelper.screens.settingsScreen.controllers.DatabaseManagementController
+import com.github.nacabaro.vbhelper.domain.characters.Sprite
+import com.github.nacabaro.vbhelper.domain.card.Card
+import com.github.nacabaro.vbhelper.domain.card.CardProgress
+import com.github.nacabaro.vbhelper.domain.characters.Character
 import com.github.nacabaro.vbhelper.source.ApkSecretsImporter
 import com.github.nacabaro.vbhelper.source.SecretsImporter
 import com.github.nacabaro.vbhelper.source.SecretsRepository
 import com.github.nacabaro.vbhelper.source.proto.Secrets
 import kotlinx.coroutines.Dispatchers
+import java.io.File
+import java.io.InputStream
+import java.io.OutputStream
 
 
 class SettingsScreenControllerImpl(
     private val context: ComponentActivity,
 ): SettingsScreenController {
+    private val roomDbName = "internalDb"
     private val filePickerLauncher: ActivityResultLauncher<String>
     private val filePickerOpenerLauncher: ActivityResultLauncher<Array<String>>
     private val filePickerApk: ActivityResultLauncher<Array<String>>
@@ -29,17 +41,13 @@ class SettingsScreenControllerImpl(
     private val application = context.applicationContext as VBHelper
     private val secretsRepository: SecretsRepository = application.container.dataStoreSecretsRepository
     private val database: AppDatabase = application.container.db
-    private val databaseManagementController = DatabaseManagementController(
-        componentActivity = context,
-        application = application
-    )
 
     init {
         filePickerLauncher = context.registerForActivityResult(
             ActivityResultContracts.CreateDocument("application/octet-stream")
         ) { uri ->
                 if (uri != null) {
-                    databaseManagementController.exportDatabase(uri)
+                    exportDatabase(uri)
                 } else {
                     context.runOnUiThread {
                         Toast.makeText(context, "No destination selected", Toast.LENGTH_SHORT)
@@ -52,7 +60,7 @@ class SettingsScreenControllerImpl(
             ActivityResultContracts.OpenDocument()
         ) { uri ->
             if (uri != null) {
-                databaseManagementController.importDatabase(uri)
+                importDatabase(uri)
             } else {
                 context.runOnUiThread {
                     Toast.makeText(context, "No source selected", Toast.LENGTH_SHORT).show()
@@ -105,10 +113,119 @@ class SettingsScreenControllerImpl(
         context.lifecycleScope.launch(Dispatchers.IO) {
             val contentResolver = context.contentResolver
             val inputStream = contentResolver.openInputStream(uri)
-
             inputStream.use { fileReader ->
-                val cardImportController = CardImportController(database)
-                cardImportController.importCard(fileReader)
+                val dimReader = DimReader()
+                val card = dimReader.readCard(fileReader, false)
+
+                val cardModel = Card(
+                    cardId = card.header.dimId,
+                    logo = card.spriteData.sprites[0].pixelData,
+                    name = card.spriteData.text, // TODO Make user write card name
+                    stageCount = card.adventureLevels.levels.size,
+                    logoHeight = card.spriteData.sprites[0].height,
+                    logoWidth = card.spriteData.sprites[0].width,
+                    isBEm = card is BemCard
+                )
+
+                val dimId = database
+                    .cardDao()
+                    .insertNewDim(cardModel)
+
+                val cardProgress = CardProgress(
+                    cardId = dimId,
+                    currentStage = 0,
+                    unlocked = false
+                )
+
+                database
+                    .cardProgressDao()
+                    .updateDimProgress(cardProgress)
+
+                val characters = card
+                    .characterStats
+                    .characterEntries
+
+                var spriteCounter = when (card is BemCard) {
+                    true -> 54
+                    false -> 10
+                }
+
+                val domainCharacters = mutableListOf<Character>()
+
+                for (index in 0 until characters.size) {
+                    var domainSprite: Sprite?
+
+                    if (index < 2 && card is DimCard) {
+                        domainSprite = Sprite(
+                            width = card.spriteData.sprites[spriteCounter + 1].spriteDimensions.width,
+                            height = card.spriteData.sprites[spriteCounter + 1].spriteDimensions.height,
+                            spriteIdle1 = card.spriteData.sprites[spriteCounter + 1].pixelData,
+                            spriteIdle2 = card.spriteData.sprites[spriteCounter + 2].pixelData,
+                            spriteWalk1 = card.spriteData.sprites[spriteCounter + 1].pixelData,
+                            spriteWalk2 = card.spriteData.sprites[spriteCounter + 3].pixelData,
+                            spriteRun1 = card.spriteData.sprites[spriteCounter + 1].pixelData,
+                            spriteRun2 = card.spriteData.sprites[spriteCounter + 3].pixelData,
+                            spriteTrain1 = card.spriteData.sprites[spriteCounter + 1].pixelData,
+                            spriteTrain2 = card.spriteData.sprites[spriteCounter + 3].pixelData,
+                            spriteHappy = card.spriteData.sprites[spriteCounter + 4].pixelData,
+                            spriteSleep = card.spriteData.sprites[spriteCounter + 5].pixelData,
+                            spriteAttack = card.spriteData.sprites[spriteCounter + 2].pixelData,
+                            spriteDodge = card.spriteData.sprites[spriteCounter + 3].pixelData
+                        )
+                    } else {
+                        domainSprite = Sprite(
+                            width = card.spriteData.sprites[spriteCounter + 1].spriteDimensions.width,
+                            height = card.spriteData.sprites[spriteCounter + 1].spriteDimensions.height,
+                            spriteIdle1 = card.spriteData.sprites[spriteCounter + 1].pixelData,
+                            spriteIdle2 = card.spriteData.sprites[spriteCounter + 2].pixelData,
+                            spriteWalk1 = card.spriteData.sprites[spriteCounter + 3].pixelData,
+                            spriteWalk2 = card.spriteData.sprites[spriteCounter + 4].pixelData,
+                            spriteRun1 = card.spriteData.sprites[spriteCounter + 5].pixelData,
+                            spriteRun2 = card.spriteData.sprites[spriteCounter + 6].pixelData,
+                            spriteTrain1 = card.spriteData.sprites[spriteCounter + 7].pixelData,
+                            spriteTrain2 = card.spriteData.sprites[spriteCounter + 8].pixelData,
+                            spriteHappy = card.spriteData.sprites[spriteCounter + 9].pixelData,
+                            spriteSleep = card.spriteData.sprites[spriteCounter + 10].pixelData,
+                            spriteAttack = card.spriteData.sprites[spriteCounter + 11].pixelData,
+                            spriteDodge = card.spriteData.sprites[spriteCounter + 12].pixelData
+                        )
+                    }
+
+
+                    val spriteId = database
+                        .spriteDao()
+                        .insertSprite(domainSprite)
+
+                    domainCharacters.add(
+                        Character(
+                            dimId = dimId,
+                            spriteId = spriteId,
+                            monIndex = index,
+                            name = card.spriteData.sprites[spriteCounter].pixelData,
+                            stage = characters[index].stage,
+                            attribute = NfcCharacter.Attribute.entries[characters[index].attribute],
+                            baseHp = characters[index].hp,
+                            baseBp = characters[index].dp,
+                            baseAp = characters[index].ap,
+                            nameWidth = card.spriteData.sprites[spriteCounter].spriteDimensions.width,
+                            nameHeight = card.spriteData.sprites[spriteCounter].spriteDimensions.height,
+                        )
+                    )
+
+                    spriteCounter += if (card is BemCard) {
+                        14
+                    } else {
+                        when (index) {
+                            0 -> 6
+                            1 -> 7
+                            else -> 14
+                        }
+                    }
+                }
+
+                database
+                    .characterDao()
+                    .insertCharacter(*domainCharacters.toTypedArray())
             }
 
             inputStream?.close()
@@ -118,6 +235,100 @@ class SettingsScreenControllerImpl(
         }
     }
 
+    private fun exportDatabase(destinationUri: Uri) {
+        context.lifecycleScope.launch(Dispatchers.IO) {
+            try {
+                val dbFile = File(context.getDatabasePath(roomDbName).absolutePath)
+                if (!dbFile.exists()) {
+                    throw IllegalStateException("Database file does not exist!")
+                }
+
+                application.container.db.close()
+
+                context.contentResolver.openOutputStream(destinationUri)?.use { outputStream ->
+                    dbFile.inputStream().use { inputStream ->
+                        copyFile(inputStream, outputStream)
+                    }
+                } ?: throw IllegalArgumentException("Unable to open destination Uri for writing")
+
+                context.runOnUiThread {
+                    Toast.makeText(context, "Database exported successfully!", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(context, "Closing application to avoid changes.", Toast.LENGTH_LONG).show()
+                    context.finishAffinity()
+                }
+            } catch (e: Exception) {
+                Log.e("ScanScreenController", "Error exporting database $e")
+                context.runOnUiThread {
+                    Toast.makeText(context, "Error exporting database: ${e.message}", Toast.LENGTH_LONG).show()
+                }
+            }
+        }
+    }
+
+    private fun importDatabase(sourceUri: Uri) {
+        context.lifecycleScope.launch(Dispatchers.IO) {
+            try {
+                if (!getFileNameFromUri(sourceUri)!!.endsWith(".vbhelper")) {
+                    context.runOnUiThread {
+                        Toast.makeText(context, "Invalid file format", Toast.LENGTH_SHORT).show()
+                    }
+                    return@launch
+                }
+
+                application.container.db.close()
+
+                val dbPath = context.getDatabasePath(roomDbName)
+                val shmFile = File(dbPath.parent, "$roomDbName-shm")
+                val walFile = File(dbPath.parent, "$roomDbName-wal")
+
+                // Delete existing database files
+                if (dbPath.exists()) dbPath.delete()
+                if (shmFile.exists()) shmFile.delete()
+                if (walFile.exists()) walFile.delete()
+
+                val dbFile = File(dbPath.absolutePath)
+
+                context.contentResolver.openInputStream(sourceUri)?.use { inputStream ->
+                    dbFile.outputStream().use { outputStream ->
+                        copyFile(inputStream, outputStream)
+                    }
+                } ?: throw IllegalArgumentException("Unable to open source Uri for reading")
+
+                context.runOnUiThread {
+                    Toast.makeText(context, "Database imported successfully!", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(context, "Reopen the app to finish import process!", Toast.LENGTH_LONG).show()
+                    context.finishAffinity()
+                }
+            } catch (e: Exception) {
+                Log.e("ScanScreenController", "Error importing database $e")
+                context.runOnUiThread {
+                    Toast.makeText(context, "Error importing database: ${e.message}", Toast.LENGTH_LONG).show()
+                }
+            }
+        }
+    }
+
+    private fun getFileNameFromUri(uri: Uri): String? {
+        var fileName: String? = null
+        val cursor = context.contentResolver.query(uri, null, null, null, null)
+        cursor?.use {
+            if (it.moveToFirst()) {
+                val nameIndex = it.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)
+                fileName = it.getString(nameIndex)
+            }
+        }
+        return fileName
+    }
+
+    private fun copyFile(inputStream: InputStream, outputStream: OutputStream) {
+        val buffer = ByteArray(1024)
+        var bytesRead: Int
+        while (inputStream.read(buffer).also { bytesRead = it } != -1) {
+            outputStream.write(buffer, 0, bytesRead)
+        }
+        outputStream.flush()
+    }
+
     private fun importApk(uri: Uri) {
         context.lifecycleScope.launch(Dispatchers.IO) {
             context.contentResolver.openInputStream(uri).use {

app/src/main/java/com/github/nacabaro/vbhelper/screens/settingsScreen/controllers/CardImportController.kt

@@ -1,320 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.settingsScreen.controllers
-
-import android.util.Log
-import com.github.cfogrady.vb.dim.card.BemCard
-import com.github.cfogrady.vb.dim.card.DimCard
-import com.github.cfogrady.vb.dim.card.DimReader
-import com.github.cfogrady.vbnfc.data.NfcCharacter
-import com.github.nacabaro.vbhelper.database.AppDatabase
-import com.github.nacabaro.vbhelper.domain.card.Card
-import com.github.nacabaro.vbhelper.domain.card.CardCharacter
-import com.github.nacabaro.vbhelper.domain.card.CardProgress
-import com.github.nacabaro.vbhelper.domain.characters.Sprite
-import java.io.InputStream
-
-class CardImportController(
-    private val database: AppDatabase
-) {
-    suspend fun importCard(
-        fileReader: InputStream?
-    ) {
-        val dimReader = DimReader()
-        val card = dimReader.readCard(fileReader, false)
-
-        val cardModel = Card(
-            cardId = card.header.dimId,
-            logo = card.spriteData.sprites[0].pixelData,
-            name = card.spriteData.text,
-            stageCount = card.adventureLevels.levels.size,
-            logoHeight = card.spriteData.sprites[0].height,
-            logoWidth = card.spriteData.sprites[0].width,
-            isBEm = card is BemCard
-        )
-
-        val cardId = database
-            .cardDao()
-            .insertNewCard(cardModel)
-
-        updateCardProgress(cardId = cardId)
-
-        importCharacterData(cardId, card)
-
-        importEvoData(cardId, card)
-
-        importAdventureMissions(cardId, card)
-
-        importCardFusions(cardId, card)
-    }
-
-    private fun updateCardProgress(
-        cardId: Long,
-    ) {
-        database
-            .cardProgressDao()
-            .insertCardProgress(
-                CardProgress(
-                    cardId = cardId,
-                    currentStage = 1,
-                    unlocked = false
-                )
-            )
-    }
-
-    private suspend fun importCharacterData(
-        cardId: Long,
-        card: com.github.cfogrady.vb.dim.card.Card<*, *, *, *, *, *>
-    ) {
-        var spriteCounter = when (card is BemCard) {
-            true -> 54
-            false -> 10
-        }
-
-        val domainCharacters = mutableListOf<CardCharacter>()
-
-        val characters = card
-            .characterStats
-            .characterEntries
-
-        for (index in 0 until characters.size) {
-            var domainSprite: Sprite?
-            if (index < 2 && card is DimCard) {
-                domainSprite = Sprite(
-                    width = card.spriteData.sprites[spriteCounter + 1].spriteDimensions.width,
-                    height = card.spriteData.sprites[spriteCounter + 1].spriteDimensions.height,
-                    spriteIdle1 = card.spriteData.sprites[spriteCounter + 1].pixelData,
-                    spriteIdle2 = card.spriteData.sprites[spriteCounter + 2].pixelData,
-                    spriteWalk1 = card.spriteData.sprites[spriteCounter + 1].pixelData,
-                    spriteWalk2 = card.spriteData.sprites[spriteCounter + 3].pixelData,
-                    spriteRun1 = card.spriteData.sprites[spriteCounter + 1].pixelData,
-                    spriteRun2 = card.spriteData.sprites[spriteCounter + 3].pixelData,
-                    spriteTrain1 = card.spriteData.sprites[spriteCounter + 1].pixelData,
-                    spriteTrain2 = card.spriteData.sprites[spriteCounter + 3].pixelData,
-                    spriteHappy = card.spriteData.sprites[spriteCounter + 4].pixelData,
-                    spriteSleep = card.spriteData.sprites[spriteCounter + 5].pixelData,
-                    spriteAttack = card.spriteData.sprites[spriteCounter + 2].pixelData,
-                    spriteDodge = card.spriteData.sprites[spriteCounter + 3].pixelData
-                )
-            } else {
-                domainSprite = Sprite(
-                    width = card.spriteData.sprites[spriteCounter + 1].spriteDimensions.width,
-                    height = card.spriteData.sprites[spriteCounter + 1].spriteDimensions.height,
-                    spriteIdle1 = card.spriteData.sprites[spriteCounter + 1].pixelData,
-                    spriteIdle2 = card.spriteData.sprites[spriteCounter + 2].pixelData,
-                    spriteWalk1 = card.spriteData.sprites[spriteCounter + 3].pixelData,
-                    spriteWalk2 = card.spriteData.sprites[spriteCounter + 4].pixelData,
-                    spriteRun1 = card.spriteData.sprites[spriteCounter + 5].pixelData,
-                    spriteRun2 = card.spriteData.sprites[spriteCounter + 6].pixelData,
-                    spriteTrain1 = card.spriteData.sprites[spriteCounter + 7].pixelData,
-                    spriteTrain2 = card.spriteData.sprites[spriteCounter + 8].pixelData,
-                    spriteHappy = card.spriteData.sprites[spriteCounter + 9].pixelData,
-                    spriteSleep = card.spriteData.sprites[spriteCounter + 10].pixelData,
-                    spriteAttack = card.spriteData.sprites[spriteCounter + 11].pixelData,
-                    spriteDodge = card.spriteData.sprites[spriteCounter + 12].pixelData
-                )
-            }
-
-            val spriteId = database
-                .spriteDao()
-                .insertSprite(domainSprite)
-
-
-            domainCharacters.add(
-                CardCharacter(
-                    cardId = cardId,
-                    spriteId = spriteId,
-                    charaIndex = index,
-                    nameSprite = card.spriteData.sprites[spriteCounter].pixelData,
-                    stage = characters[index].stage,
-                    attribute = NfcCharacter.Attribute.entries[characters[index].attribute],
-                    baseHp = characters[index].hp,
-                    baseBp = characters[index].dp,
-                    baseAp = characters[index].ap,
-                    nameWidth = card.spriteData.sprites[spriteCounter].spriteDimensions.width,
-                    nameHeight = card.spriteData.sprites[spriteCounter].spriteDimensions.height
-                )
-            )
-
-            spriteCounter += if (card is BemCard) {
-                14
-            } else {
-                when (index) {
-                    0 -> 6
-                    1 -> 7
-                    else -> 14
-                }
-            }
-        }
-
-        database
-            .characterDao()
-            .insertCharacter(*domainCharacters.toTypedArray())
-    }
-
-    private suspend fun importAdventureMissions(
-        cardId: Long,
-        card: com.github.cfogrady.vb.dim.card.Card<*, *, *, *, *, *>
-    ) {
-        Log.d("importAdventureMissions", "Importing adventure missions")
-        if (card is BemCard) {
-            card.adventureLevels.levels.forEach {
-                database
-                    .cardAdventureDao()
-                    .insertNewAdventure(
-                        cardId = cardId,
-                        characterId = it.bossCharacterIndex,
-                        steps = it.steps,
-                        bossAp = it.bossAp,
-                        bossHp = it.bossHp,
-                        bossDp = it.bossDp,
-                        bossBp = it.bossBp
-                    )
-            }
-        } else if (card is DimCard) {
-            card.adventureLevels.levels.map {
-                database
-                    .cardAdventureDao()
-                    .insertNewAdventure(
-                        cardId = cardId,
-                        characterId = it.bossCharacterIndex,
-                        steps = it.steps,
-                        bossAp = it.bossAp,
-                        bossHp = it.bossHp,
-                        bossDp = it.bossDp,
-                        bossBp = null
-                    )
-            }
-        }
-    }
-
-    private suspend fun importCardFusions(
-        cardId: Long,
-        card: com.github.cfogrady.vb.dim.card.Card<*, *, *, *, *, *>
-    ) {
-        Log.d("importCardFusions", "Importing card fusions")
-        if (card is DimCard) {
-            card
-                .attributeFusions
-                .entries
-                .forEach {
-                    Log.d("importCardFusions", "Importing fusion: ${it.attribute1Fusion}")
-                    if (it.attribute1Fusion != 65535 && it.characterIndex != 65535) {
-                        database
-                            .cardFusionsDao()
-                            .insertNewFusion(
-                                cardId = cardId,
-                                fromCharaId = it.characterIndex,
-                                attribute = NfcCharacter.Attribute.Virus,
-                                toCharaId = it.attribute1Fusion,
-                            )
-                    }
-
-                    if (it.attribute2Fusion != 65535 && it.characterIndex != 65535) {
-                        database
-                            .cardFusionsDao()
-                            .insertNewFusion(
-                                cardId = cardId,
-                                fromCharaId = it.characterIndex,
-                                attribute = NfcCharacter.Attribute.Data,
-                                toCharaId = it.attribute2Fusion,
-                            )
-                    }
-
-                    if (it.attribute3Fusion != 65535 && it.characterIndex != 65535) {
-                        database
-                            .cardFusionsDao()
-                            .insertNewFusion(
-                                cardId = cardId,
-                                fromCharaId = it.characterIndex,
-                                attribute = NfcCharacter.Attribute.Vaccine,
-                                toCharaId = it.attribute3Fusion,
-                            )
-                    }
-
-                    if (it.attribute4Fusion != 65535 && it.characterIndex != 65535) {
-                        database
-                            .cardFusionsDao()
-                            .insertNewFusion(
-                                cardId = cardId,
-                                fromCharaId = it.characterIndex,
-                                attribute = NfcCharacter.Attribute.Free,
-                                toCharaId = it.attribute4Fusion,
-                            )
-                    }
-                }
-        }
-    }
-
-    private suspend fun importEvoData(
-        cardId: Long,
-        card: com.github.cfogrady.vb.dim.card.Card<*, *, *, *, *, *>
-    ) {
-        for (index in 0 until card.transformationRequirements.transformationEntries.size) {
-            val evo = card.transformationRequirements.transformationEntries[index]
-
-            var transformationTimerHours: Int
-            var unlockAdventureLevel: Int
-
-            if (card is BemCard) {
-                transformationTimerHours = card
-                    .transformationRequirements
-                    .transformationEntries[index]
-                    .minutesUntilTransformation / 60
-                unlockAdventureLevel = if (
-                    card
-                        .transformationRequirements
-                        .transformationEntries[index]
-                        .requiredCompletedAdventureLevel == 65535
-                ) {
-                    0
-                } else {
-                    card
-                        .transformationRequirements
-                        .transformationEntries[index]
-                        .requiredCompletedAdventureLevel
-                }
-            } else {
-                transformationTimerHours = (card as DimCard)
-                    .transformationRequirements
-                    .transformationEntries[index]
-                    .hoursUntilEvolution
-                unlockAdventureLevel = if (
-                    card
-                        .adventureLevels
-                        .levels
-                        .last()
-                        .bossCharacterIndex == card.transformationRequirements.transformationEntries[index].toCharacterIndex
-                ) {
-                    14
-                    /*
-                    Magic number incoming!!
-
-                    In the case of DiMCards, stage 15 is the one that unlocks the locked character.
-                    We know it is a locked character if the last adventure level's boss character index
-                    is the current index. If it is, we add stage 15 complete as a requirement for transformation.
-                     */
-                } else {
-                    0
-                    /*
-                    Another magic number...
-
-                    The rest of the characters are not locked.
-                     */
-                }
-            }
-
-            database
-                .characterDao()
-                .insertPossibleTransformation(
-                    cardId = cardId,
-                    fromChraraIndex = evo.fromCharacterIndex,
-                    toChraraIndex = evo.toCharacterIndex,
-                    requiredVitals = evo.requiredVitalValues,
-                    requiredTrophies = evo.requiredTrophies,
-                    requiredBattles = evo.requiredBattles,
-                    requiredWinRate = evo.requiredWinRatio,
-                    requiredAdventureLevelCompleted = unlockAdventureLevel,
-                    changeTimerHours = transformationTimerHours
-                )
-        }
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/screens/settingsScreen/controllers/DatabaseManagementController.kt

@@ -1,115 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.settingsScreen.controllers
-
-import android.net.Uri
-import android.provider.OpenableColumns
-import android.util.Log
-import android.widget.Toast
-import androidx.activity.ComponentActivity
-import androidx.lifecycle.lifecycleScope
-import com.github.nacabaro.vbhelper.di.VBHelper
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import java.io.File
-import java.io.InputStream
-import java.io.OutputStream
-
-class DatabaseManagementController(
-    val componentActivity: ComponentActivity,
-    val application: VBHelper
-) {
-    private val roomDbName = "internalDb"
-
-    fun exportDatabase( destinationUri: Uri) {
-        componentActivity.lifecycleScope.launch(Dispatchers.IO) {
-            try {
-                val dbFile = File(componentActivity.getDatabasePath(roomDbName).absolutePath)
-                if (!dbFile.exists()) {
-                    throw IllegalStateException("Database file does not exist!")
-                }
-
-                application.container.db.close()
-
-                componentActivity.contentResolver.openOutputStream(destinationUri)?.use { outputStream ->
-                    dbFile.inputStream().use { inputStream ->
-                        copyFile(inputStream, outputStream)
-                    }
-                } ?: throw IllegalArgumentException("Unable to open destination Uri for writing")
-
-                componentActivity.runOnUiThread {
-                    Toast.makeText(componentActivity, "Database exported successfully!", Toast.LENGTH_SHORT).show()
-                    Toast.makeText(componentActivity, "Closing application to avoid changes.", Toast.LENGTH_LONG).show()
-                    componentActivity.finishAffinity()
-                }
-            } catch (e: Exception) {
-                Log.e("ScanScreenController", "Error exporting database $e")
-                componentActivity.runOnUiThread {
-                    Toast.makeText(componentActivity, "Error exporting database: ${e.message}", Toast.LENGTH_LONG).show()
-                }
-            }
-        }
-    }
-
-    fun importDatabase(sourceUri: Uri) {
-        componentActivity.lifecycleScope.launch(Dispatchers.IO) {
-            try {
-                if (!getFileNameFromUri(sourceUri)!!.endsWith(".vbhelper")) {
-                    componentActivity.runOnUiThread {
-                        Toast.makeText(componentActivity, "Invalid file format", Toast.LENGTH_SHORT).show()
-                    }
-                    return@launch
-                }
-
-                application.container.db.close()
-
-                val dbPath = componentActivity.getDatabasePath(roomDbName)
-                val shmFile = File(dbPath.parent, "$roomDbName-shm")
-                val walFile = File(dbPath.parent, "$roomDbName-wal")
-
-                // Delete existing database files
-                if (dbPath.exists()) dbPath.delete()
-                if (shmFile.exists()) shmFile.delete()
-                if (walFile.exists()) walFile.delete()
-
-                val dbFile = File(dbPath.absolutePath)
-
-                componentActivity.contentResolver.openInputStream(sourceUri)?.use { inputStream ->
-                    dbFile.outputStream().use { outputStream ->
-                        copyFile(inputStream, outputStream)
-                    }
-                } ?: throw IllegalArgumentException("Unable to open source Uri for reading")
-
-                componentActivity.runOnUiThread {
-                    Toast.makeText(componentActivity, "Database imported successfully!", Toast.LENGTH_SHORT).show()
-                    Toast.makeText(componentActivity, "Reopen the app to finish import process!", Toast.LENGTH_LONG).show()
-                    componentActivity.finishAffinity()
-                }
-            } catch (e: Exception) {
-                Log.e("ScanScreenController", "Error importing database $e")
-                componentActivity.runOnUiThread {
-                    Toast.makeText(componentActivity, "Error importing database: ${e.message}", Toast.LENGTH_LONG).show()
-                }
-            }
-        }
-    }
-
-    private fun copyFile(inputStream: InputStream, outputStream: OutputStream) {
-        val buffer = ByteArray(1024)
-        var bytesRead: Int
-        while (inputStream.read(buffer).also { bytesRead = it } != -1) {
-            outputStream.write(buffer, 0, bytesRead)
-        }
-        outputStream.flush()
-    }
-
-    private fun getFileNameFromUri(uri: Uri): String? {
-        var fileName: String? = null
-        val cursor = componentActivity.contentResolver.query(uri, null, null, null, null)
-        cursor?.use {
-            if (it.moveToFirst()) {
-                val nameIndex = it.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)
-                fileName = it.getString(nameIndex)
-            }
-        }
-        return fileName
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/screens/storageScreen/StorageDialog.kt

@@ -33,15 +33,11 @@ import com.github.nacabaro.vbhelper.source.StorageRepository
 import com.github.nacabaro.vbhelper.utils.BitmapData
 import com.github.nacabaro.vbhelper.utils.getBitmap
 import kotlinx.coroutines.launch
-import androidx.compose.ui.res.stringResource
-import com.github.nacabaro.vbhelper.R
-
 
 @Composable
 fun StorageDialog(
     characterId: Long,
     onDismissRequest: () -> Unit,
-    onClickDelete: () -> Unit,
     onSendToBracelet: () -> Unit,
     onClickSetActive: () -> Unit,
     onClickSendToAdventure: (time: Long) -> Unit
@@ -97,7 +93,7 @@ fun StorageDialog(
                         val dpSize = (characterSprite.value!!.width * 4 / density).dp
                         Image(
                             bitmap = imageBitmap,
-                            contentDescription = stringResource(R.string.storage_character_image_description),
+                            contentDescription = "Character image",
                             filterQuality = FilterQuality.None,
                             modifier = Modifier
                                 .size(dpSize)
@@ -107,7 +103,7 @@ fun StorageDialog(
                         val nameDpSize = (characterName.value!!.width * 4 / density).dp
                         Image(
                             bitmap = nameImageBitmap,
-                            contentDescription = stringResource(R.string.storage_character_image_description),
+                            contentDescription = "Character image",
                             filterQuality = FilterQuality.None,
                             modifier = Modifier
                                 .size(nameDpSize)
@@ -124,7 +120,7 @@ fun StorageDialog(
                         modifier = Modifier
                             .weight(1f)
                     ) {
-                        Text(text = stringResource(R.string.storage_send_to_watch))
+                        Text(text = "Send to watch")
                     }
                     Spacer(
                         modifier = Modifier
@@ -133,7 +129,7 @@ fun StorageDialog(
                     Button(
                         onClick = onClickSetActive,
                     ) {
-                        Text(text = stringResource(R.string.storage_set_active))
+                        Text(text = "Set active")
                     }
                 }
                 Button(
@@ -143,21 +139,14 @@ fun StorageDialog(
                     modifier = Modifier
                         .fillMaxWidth()
                 ) {
-                    Text(text = stringResource(R.string.storage_send_on_adventure))
-                }
-                Button(
-                    modifier = Modifier
-                        .fillMaxWidth(),
-                    onClick = onClickDelete
-                ) {
-                    Text(text = stringResource(R.string.storage_delete_character))
+                    Text(text = "Send on adventure")
                 }
                 Button(
                     modifier = Modifier
                         .fillMaxWidth(),
                     onClick = onDismissRequest
                 ) {
-                    Text(text = stringResource(R.string.storage_close))
+                    Text(text = "Close")
                 }
             }
         }

app/src/main/java/com/github/nacabaro/vbhelper/screens/storageScreen/StorageScreen.kt

@@ -1,6 +1,5 @@
 package com.github.nacabaro.vbhelper.screens.storageScreen
 
-import android.util.Log
 import android.widget.Toast
 import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.gestures.scrollable
@@ -12,15 +11,14 @@ 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
-import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 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
@@ -30,12 +28,12 @@ import androidx.navigation.NavController
 import com.github.nacabaro.vbhelper.components.CharacterEntry
 import com.github.nacabaro.vbhelper.components.TopBanner
 import com.github.nacabaro.vbhelper.di.VBHelper
+import com.github.nacabaro.vbhelper.dtos.CharacterDtos
 import com.github.nacabaro.vbhelper.navigation.NavigationItems
 import com.github.nacabaro.vbhelper.screens.adventureScreen.AdventureScreenControllerImpl
 import com.github.nacabaro.vbhelper.source.StorageRepository
 import com.github.nacabaro.vbhelper.utils.BitmapData
-import androidx.compose.ui.res.stringResource
-import com.github.nacabaro.vbhelper.R
+import kotlinx.coroutines.launch
 
 
 @Composable
@@ -44,23 +42,30 @@ fun StorageScreen(
     storageScreenController: StorageScreenControllerImpl,
     adventureScreenController: AdventureScreenControllerImpl
 ) {
+    val coroutineScope = rememberCoroutineScope()
     val application = LocalContext.current.applicationContext as VBHelper
     val storageRepository = StorageRepository(application.container.db)
-    val characterList by storageRepository.getAllCharacters().collectAsState(initial = emptyList())
-
+    val monList = remember { mutableStateOf<List<CharacterDtos.CharacterWithSprites>>(emptyList()) }
     var selectedCharacter by remember { mutableStateOf<Long?>(null) }
 
+    LaunchedEffect(storageRepository, selectedCharacter) {
+        coroutineScope.launch {
+            val characterList = storageRepository.getAllCharacters()
+            monList.value = characterList
+        }
+    }
+
     Scaffold (
         topBar = {
             TopBanner(
-                text = stringResource(R.string.storage_my_characters_title),
+                text = "My characters",
                 onAdventureClick = {
                     navController.navigate(NavigationItems.Adventure.route)
                 }
             )
         }
     ) { contentPadding ->
-        if (characterList.isEmpty()) {
+        if (monList.value.isEmpty()) {
             Column (
                 horizontalAlignment = Alignment.CenterHorizontally,
                 verticalArrangement = Arrangement.Center,
@@ -69,7 +74,7 @@ fun StorageScreen(
                     .fillMaxSize()
             ) {
                 Text(
-                    text = stringResource(R.string.storage_nothing_to_see_here),
+                    text = "Nothing to see here",
                     textAlign = TextAlign.Center,
                     modifier = Modifier
                 )
@@ -81,7 +86,7 @@ fun StorageScreen(
                     .scrollable(state = rememberScrollState(), orientation = Orientation.Vertical)
                     .padding(top = contentPadding.calculateTopPadding())
             ) {
-                items(characterList) { index ->
+                items(monList.value) { index ->
                     CharacterEntry(
                         icon = BitmapData(
                             bitmap = index.spriteIdle,
@@ -94,7 +99,7 @@ fun StorageScreen(
                             } else {
                                 Toast.makeText(
                                     application,
-                                    application.getString(R.string.storage_in_adventure_toast),
+                                    "This character is in an adventure",
                                     Toast.LENGTH_SHORT
                                 ).show()
                                 navController.navigate(
@@ -102,16 +107,6 @@ fun StorageScreen(
                                 )
                             }
                         },
-                        cardColors = if (index.active) {
-                            CardDefaults.cardColors(
-                                containerColor = MaterialTheme.colorScheme.primary
-                            )
-                        } else {
-                            CardDefaults.cardColors(
-                                containerColor = MaterialTheme.colorScheme.surfaceContainerHighest
-                            )
-                        }
-
                     )
                 }
             }
@@ -143,16 +138,6 @@ fun StorageScreen(
                             timeInMinutes = time
                         )
                     selectedCharacter = null
-                },
-                onClickDelete = {
-                    storageScreenController
-                        .deleteCharacter(
-                            characterId = selectedCharacter!!,
-                            onCompletion = {
-                                Log.d("StorageScreen", "Character deleted")
-                            }
-                        )
-                    selectedCharacter = null
                 }
             )
         }

app/src/main/java/com/github/nacabaro/vbhelper/screens/storageScreen/StorageScreenController.kt

@@ -2,5 +2,4 @@ package com.github.nacabaro.vbhelper.screens.storageScreen
 
 interface StorageScreenController {
     fun setActive(characterId: Long, onCompletion: () -> Unit)
-    fun deleteCharacter(characterId: Long, onCompletion: () -> Unit)
 }

app/src/main/java/com/github/nacabaro/vbhelper/screens/storageScreen/StorageScreenControllerImpl.kt

@@ -28,21 +28,4 @@ class StorageScreenControllerImpl(
             }
         }
     }
-
-    override fun deleteCharacter(characterId: Long, onCompletion: () -> Unit) {
-        componentActivity.lifecycleScope.launch(Dispatchers.IO) {
-            database
-                .userCharacterDao()
-                .deleteCharacterById(characterId)
-
-            componentActivity.runOnUiThread {
-                Toast.makeText(
-                    componentActivity,
-                    "Character deleted!",
-                    Toast.LENGTH_SHORT
-                ).show()
-                onCompletion()
-            }
-        }
-    }
 }

app/src/main/java/com/github/nacabaro/vbhelper/source/CardRepository.kt

@@ -1,15 +0,0 @@
-package com.github.nacabaro.vbhelper.source
-
-import com.github.nacabaro.vbhelper.database.AppDatabase
-import com.github.nacabaro.vbhelper.dtos.CardDtos
-import kotlinx.coroutines.flow.Flow
-
-class CardRepository (
-    private val db: AppDatabase
-) {
-    fun getCardIconByCharaId(charaId: Long): Flow<CardDtos.CardIcon> {
-        return db
-            .cardDao()
-            .getCardIconByCharaId(charaId = charaId)
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/source/CurrencyRepository.kt

@@ -1,28 +0,0 @@
-package com.github.nacabaro.vbhelper.source
-
-import androidx.datastore.core.DataStore
-import androidx.datastore.preferences.core.Preferences
-import androidx.datastore.preferences.core.edit
-import androidx.datastore.preferences.core.intPreferencesKey
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
-
-class CurrencyRepository (
-    private val dataStore: DataStore<Preferences>
-) {
-
-    private companion object {
-        val CURRENCY_VALUE = intPreferencesKey("currency_value")
-    }
-
-    val currencyValue: Flow<Int> = dataStore.data
-        .map { preferences ->
-            preferences[CURRENCY_VALUE] ?: 10000
-        }
-
-    suspend fun setCurrencyValue(newValue: Int) {
-        dataStore.edit { preferences ->
-            preferences[CURRENCY_VALUE] = newValue
-        }
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/source/DexRepository.kt

@@ -3,24 +3,15 @@ package com.github.nacabaro.vbhelper.source
 import com.github.nacabaro.vbhelper.database.AppDatabase
 import com.github.nacabaro.vbhelper.dtos.CardDtos
 import com.github.nacabaro.vbhelper.dtos.CharacterDtos
-import kotlinx.coroutines.flow.Flow
 
 class DexRepository (
     private val db: AppDatabase
 ) {
-    fun getAllDims(): Flow<List<CardDtos.CardProgress>> {
+    suspend fun getAllDims(): List<CardDtos.CardProgress> {
         return db.dexDao().getCardsWithProgress()
     }
 
-    fun getCharactersByCardId(cardId: Long): Flow<List<CharacterDtos.CardCharaProgress>> {
+    suspend fun getCharactersByDimId(cardId: Long): List<CharacterDtos.CardProgress> {
         return db.dexDao().getSingleCardProgress(cardId)
     }
-
-    fun getCharacterPossibleTransformations(characterId: Long): Flow<List<CharacterDtos.EvolutionRequirementsWithSpritesAndObtained>> {
-        return db.characterDao().getEvolutionRequirementsForCard(characterId)
-    }
-
-    fun getCharacterPossibleFusions(characterId: Long): Flow<List<CharacterDtos.FusionsWithSpritesAndObtained>> {
-        return db.cardFusionsDao().getFusionsForCharacter(characterId)
-    }
 }

app/src/main/java/com/github/nacabaro/vbhelper/source/ItemsRepository.kt

@@ -1,17 +1,17 @@
 package com.github.nacabaro.vbhelper.source
 
 import com.github.nacabaro.vbhelper.database.AppDatabase
+import com.github.nacabaro.vbhelper.domain.items.Items
 import com.github.nacabaro.vbhelper.dtos.ItemDtos
-import kotlinx.coroutines.flow.Flow
 
 class ItemsRepository(
     private val db: AppDatabase
 ) {
-    fun getAllItems(): Flow<List<ItemDtos.ItemsWithQuantities>> {
+    suspend fun getAllItems(): List<ItemDtos.ItemsWithQuantities> {
         return db.itemDao().getAllItems()
     }
 
-    fun getUserItems(): Flow<List<ItemDtos.ItemsWithQuantities>> {
+    suspend fun getUserItems(): List<ItemDtos.ItemsWithQuantities> {
         return db.itemDao().getAllUserItems()
     }
 }

app/src/main/java/com/github/nacabaro/vbhelper/source/ScanRepository.kt

@@ -1,13 +0,0 @@
-package com.github.nacabaro.vbhelper.source
-
-import com.github.nacabaro.vbhelper.database.AppDatabase
-import com.github.nacabaro.vbhelper.domain.card.Card
-import kotlinx.coroutines.flow.Flow
-
-class ScanRepository(
-    val database: AppDatabase
-) {
-    fun getCardDetails(characterId: Long): Flow<Card> {
-        return database.cardDao().getCardByCharacterId(characterId)
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/source/StorageRepository.kt

@@ -2,16 +2,12 @@ package com.github.nacabaro.vbhelper.source
 
 import com.github.nacabaro.vbhelper.database.AppDatabase
 import com.github.nacabaro.vbhelper.domain.device_data.BECharacterData
-import com.github.nacabaro.vbhelper.domain.device_data.SpecialMissions
-import com.github.nacabaro.vbhelper.domain.device_data.VBCharacterData
 import com.github.nacabaro.vbhelper.dtos.CharacterDtos
-import com.github.nacabaro.vbhelper.dtos.ItemDtos
-import kotlinx.coroutines.flow.Flow
 
 class StorageRepository (
     private val db: AppDatabase
 ) {
-    fun getAllCharacters(): Flow<List<CharacterDtos.CharacterWithSprites>> {
+    suspend fun getAllCharacters(): List<CharacterDtos.CharacterWithSprites> {
         return db.userCharacterDao().getAllCharacters()
     }
 
@@ -19,27 +15,15 @@ class StorageRepository (
         return db.userCharacterDao().getCharacterWithSprites(id)
     }
 
-    fun getCharacterBeData(id: Long): Flow<BECharacterData> {
+    suspend fun getCharacterBeData(id: Long): BECharacterData {
         return db.userCharacterDao().getBeData(id)
     }
 
-    fun getTransformationHistory(characterId: Long): Flow<List<CharacterDtos.TransformationHistory>> {
+    suspend fun getTransformationHistory(characterId: Long): List<CharacterDtos.TransformationHistory>? {
         return db.userCharacterDao().getTransformationHistory(characterId)
     }
 
-    fun getCharacterVbData(id: Long): Flow<VBCharacterData> {
-        return db.userCharacterDao().getVbData(id)
-    }
-
-    fun getSpecialMissions(id: Long): Flow<List<SpecialMissions>> {
-        return db.userCharacterDao().getSpecialMissions(id)
-    }
-
-    suspend fun getItem(id: Long): ItemDtos.ItemsWithQuantities {
-        return db.itemDao().getItem(id)
-    }
-
-    fun getActiveCharacter(): Flow<CharacterDtos.CharacterWithSprites?> {
+    suspend fun getActiveCharacter(): CharacterDtos.CharacterWithSprites? {
         return db.userCharacterDao().getActiveCharacter()
     }
 
@@ -47,15 +31,7 @@ class StorageRepository (
         return db.userCharacterDao().deleteCharacterById(id)
     }
 
-    fun getAdventureCharacters(): Flow<List<CharacterDtos.AdventureCharacterWithSprites>> {
+    suspend fun getAdventureCharacters(): List<CharacterDtos.AdventureCharacterWithSprites> {
         return db.adventureDao().getAdventureCharacters()
     }
-
-    suspend fun getBECharacters(): List<CharacterDtos.CharacterWithSprites> {
-        return db.userCharacterDao().getBECharacters()
-    }
-
-    suspend fun getVBCharacters(): List<CharacterDtos.CharacterWithSprites> {
-        return db.userCharacterDao().getVBDimCharacters()
-    }
 }