More things

- Active characters display different
- Adventure missions award credits (same as special missions)
- Clicking on about will open the github page
- Corrected from arean to arena
- Removed rename from the settings (it was not used)

app/build.gradle.kts

@@ -15,7 +15,7 @@ android {
         minSdk = 28
         targetSdk = 35
         versionCode = 1
-        versionName = "Alpha 0.6.1"
+        versionName = "Alpha 0.6.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

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

@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.Card
+import androidx.compose.material3.CardColors
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -44,6 +45,9 @@ fun CharacterEntry(
     disabled: Boolean = false,
     shape: Shape = MaterialTheme.shapes.medium,
     multiplier: Int = 4,
+    cardColors: CardColors = CardDefaults.cardColors(
+        containerColor = MaterialTheme.colorScheme.surfaceContainerHighest
+    ),
     onClick: () -> Unit = {  }
 ) {
     val bitmap = remember (icon.bitmap) {
@@ -61,7 +65,8 @@ fun CharacterEntry(
         },
         modifier = modifier
             .aspectRatio(1f)
-            .padding(8.dp)
+            .padding(8.dp),
+        colors = cardColors
     ) {
         Box(
             contentAlignment = Alignment.BottomCenter,

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

@@ -3,6 +3,7 @@ package com.github.nacabaro.vbhelper.daos
 import androidx.room.Dao
 import androidx.room.Query
 import com.github.nacabaro.vbhelper.dtos.CharacterDtos
+import kotlinx.coroutines.flow.Flow
 
 
 @Dao
@@ -37,7 +38,7 @@ interface AdventureDao {
         JOIN Adventure a ON uc.id = a.characterId
     """
     )
-    suspend fun getAdventureCharacters(): List<CharacterDtos.AdventureCharacterWithSprites>
+    fun getAdventureCharacters(): Flow<List<CharacterDtos.AdventureCharacterWithSprites>>
 
     @Query("""
         DELETE FROM Adventure

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

@@ -3,6 +3,7 @@ package com.github.nacabaro.vbhelper.daos
 import androidx.room.Dao
 import androidx.room.Query
 import com.github.nacabaro.vbhelper.dtos.CardDtos
+import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface CardAdventureDao {
@@ -52,7 +53,7 @@ interface CardAdventureDao {
         WHERE
             cc.cardId = :cardId
     """)
-    suspend fun getAdventureForCard(
+    fun getAdventureForCard(
         cardId: Long
-    ): List<CardDtos.CardAdventureWithSprites>
+    ): Flow<List<CardDtos.CardAdventureWithSprites>>
 }

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

@@ -5,6 +5,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import com.github.nacabaro.vbhelper.domain.card.Card
+import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface CardDao {
@@ -26,7 +27,7 @@ interface CardDao {
         WHERE uc.id = :id
     """
     )
-    suspend fun getCardByCharacterId(id: Long): Card
+    fun getCardByCharacterId(id: Long): Flow<Card>
 
     @Query("UPDATE Card SET name = :newName WHERE id = :id")
     suspend fun renameCard(id: Int, newName: String)

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

@@ -2,6 +2,9 @@ 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 {
@@ -9,24 +12,37 @@ interface CardFusionsDao {
         INSERT INTO
             CardFusions (
                 fromCharaId,
-                attribute1Fusion,
+                attribute,
-                attribute2Fusion,
+                toCharaId
-                attribute3Fusion,
-                attribute4Fusion
             )
         SELECT
             (SELECT id FROM CardCharacter WHERE cardId = :cardId AND charaIndex = :fromCharaId),
-            (SELECT id FROM CardCharacter WHERE cardId = :cardId AND charaIndex = :toCharaIdAttr1),
+            :attribute,
-            (SELECT id FROM CardCharacter WHERE cardId = :cardId AND charaIndex = :toCharaIdAttr2),
+            (SELECT id FROM CardCharacter WHERE cardId = :cardId AND charaIndex = :toCharaId)
-            (SELECT id FROM CardCharacter WHERE cardId = :cardId AND charaIndex = :toCharaIdAttr3),
-            (SELECT id FROM CardCharacter WHERE cardId = :cardId AND charaIndex = :toCharaIdAttr4)            
     """)
     suspend fun insertNewFusion(
         cardId: Long,
         fromCharaId: Int,
-        toCharaIdAttr1: Int,
+        attribute: NfcCharacter.Attribute,
-        toCharaIdAttr2: Int,
+        toCharaId: Int
-        toCharaIdAttr3: Int,
-        toCharaIdAttr4: 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

@@ -5,6 +5,7 @@ import androidx.room.Insert
 import androidx.room.Query
 import com.github.nacabaro.vbhelper.domain.card.CardProgress
 import com.github.nacabaro.vbhelper.dtos.CharacterDtos
+import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface CardProgressDao {
@@ -21,7 +22,7 @@ interface CardProgressDao {
     @Query(
         "SELECT currentStage FROM CardProgress WHERE cardId = :cardId"
     )
-    fun getCardProgress(cardId: Long): Int
+    fun getCardProgress(cardId: Long): Flow<Int>
 
     @Insert
     fun insertCardProgress(cardProgress: CardProgress)

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

@@ -6,6 +6,7 @@ import androidx.room.Query
 import com.github.nacabaro.vbhelper.domain.card.CardCharacter
 import com.github.nacabaro.vbhelper.domain.characters.Sprite
 import com.github.nacabaro.vbhelper.dtos.CharacterDtos
+import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface CharacterDao {
@@ -82,8 +83,8 @@ interface CharacterDao {
         JOIN Sprite s ON s.id = c.spriteId
         LEFT JOIN Dex d ON d.id = pt.toCharaId
         WHERE
-            c.cardId = :cardId
+            pt.charaId = :characterId
     """
     )
-    suspend fun getEvolutionRequirementsForCard(cardId: Long): List<CharacterDtos.EvolutionRequirementsWithSpritesAndObtained>
+    fun getEvolutionRequirementsForCard(characterId: Long): Flow<List<CharacterDtos.EvolutionRequirementsWithSpritesAndObtained>>
 }

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

@@ -4,6 +4,7 @@ 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 {
@@ -40,7 +41,7 @@ interface DexDao {
         WHERE c.cardId = :cardId
     """
     )
-    suspend fun getSingleCardProgress(cardId: Long): List<CharacterDtos.CardCharaProgress>
+    fun getSingleCardProgress(cardId: Long): Flow<List<CharacterDtos.CardCharaProgress>>
 
     @Query(
         """
@@ -55,5 +56,5 @@ interface DexDao {
         FROM Card c
     """
     )
-    suspend fun getCardsWithProgress(): List<CardDtos.CardProgress>
+    fun getCardsWithProgress(): Flow<List<CardDtos.CardProgress>>
 }

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

@@ -13,6 +13,7 @@ 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 {
@@ -68,7 +69,8 @@ interface UserCharacterDao {
             c.nameWidth as nameSpriteWidth,
             c.nameHeight as nameSpriteHeight,
             d.isBEm as isBemCard,
-            a.characterId = uc.id as isInAdventure
+            a.characterId = uc.id as isInAdventure,
+            uc.isActive as active
         FROM UserCharacter uc
         JOIN CardCharacter c ON uc.charId = c.id
         JOIN Card d ON  d.id = c.cardId
@@ -76,7 +78,7 @@ interface UserCharacterDao {
         LEFT JOIN Adventure a ON a.characterId = uc.id
         """
     )
-    suspend fun getAllCharacters(): List<CharacterDtos.CharacterWithSprites>
+    fun getAllCharacters(): Flow<List<CharacterDtos.CharacterWithSprites>>
 
     @Query(
         """
@@ -92,7 +94,8 @@ interface UserCharacterDao {
             c.nameWidth as nameSpriteWidth,
             c.nameHeight as nameSpriteHeight,
             d.isBEm as isBemCard,
-            a.characterId = uc.id as isInAdventure
+            a.characterId = uc.id as isInAdventure,
+            uc.isActive as active
         FROM UserCharacter uc
         JOIN CardCharacter c ON uc.charId = c.id
         JOIN Card d ON c.cardId = d.id
@@ -129,7 +132,8 @@ interface UserCharacterDao {
             c.nameWidth as nameSpriteWidth,
             c.nameHeight as nameSpriteHeight,
             d.isBEm as isBemCard,
-            a.characterId as isInAdventure            
+            a.characterId as isInAdventure,
+            uc.isActive as active
         FROM UserCharacter uc
         JOIN CardCharacter c ON uc.charId = c.id
         JOIN Card d ON c.cardId = d.id
@@ -193,7 +197,8 @@ interface UserCharacterDao {
             c.nameWidth as nameSpriteWidth,
             c.nameHeight as nameSpriteHeight,
             d.isBEm as isBemCard,
-            a.characterId = uc.id as isInAdventure
+            a.characterId = uc.id as isInAdventure,
+            uc.isActive as active
         FROM UserCharacter uc
         JOIN CardCharacter c ON uc.charId = c.id
         JOIN Card d ON  d.id = c.cardId
@@ -218,7 +223,8 @@ interface UserCharacterDao {
             c.nameWidth as nameSpriteWidth,
             c.nameHeight as nameSpriteHeight,
             d.isBEm as isBemCard,
-            a.characterId = uc.id as isInAdventure
+            a.characterId = uc.id as isInAdventure,
+            uc.isActive as active
         FROM UserCharacter uc
         JOIN CardCharacter c ON uc.charId = c.id
         JOIN Card d ON  d.id = c.cardId

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

@@ -3,6 +3,7 @@ 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 = [
@@ -15,25 +16,7 @@ import androidx.room.PrimaryKey
         ForeignKey(
             entity = CardCharacter::class,
             parentColumns = ["id"],
-            childColumns = ["attribute1Fusion"],
+            childColumns = ["toCharaId"],
-            onDelete = ForeignKey.CASCADE
-        ),
-        ForeignKey(
-            entity = CardCharacter::class,
-            parentColumns = ["id"],
-            childColumns = ["attribute2Fusion"],
-            onDelete = ForeignKey.CASCADE
-        ),
-        ForeignKey(
-            entity = CardCharacter::class,
-            parentColumns = ["id"],
-            childColumns = ["attribute3Fusion"],
-            onDelete = ForeignKey.CASCADE
-        ),
-        ForeignKey(
-            entity = CardCharacter::class,
-            parentColumns = ["id"],
-            childColumns = ["attribute4Fusion"],
             onDelete = ForeignKey.CASCADE
         )
     ]
@@ -41,8 +24,6 @@ import androidx.room.PrimaryKey
 data class CardFusions(
     @PrimaryKey(autoGenerate = true) val id: Long,
     val fromCharaId: Long,
-    val attribute1Fusion: Long?,
+    val attribute: NfcCharacter.Attribute,
-    val attribute2Fusion: Long?,
+    val toCharaId: Long
-    val attribute3Fusion: Long?,
-    val attribute4Fusion: Long?
 )

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

@@ -31,7 +31,8 @@ object CharacterDtos {
         val nameSpriteWidth: Int,
         val nameSpriteHeight: Int,
         val isBemCard: Boolean,
-        val isInAdventure: Boolean
+        val isInAdventure: Boolean,
+        val active: Boolean
     )
 
     data class CardCharacterInfo(
@@ -114,4 +115,14 @@ object CharacterDtos {
         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/screens/adventureScreen/AdventureScreen.kt

@@ -9,12 +9,11 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -29,7 +28,6 @@ import com.github.nacabaro.vbhelper.navigation.NavigationItems
 import com.github.nacabaro.vbhelper.source.StorageRepository
 import com.github.nacabaro.vbhelper.utils.BitmapData
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 import java.time.Instant
 
 @Composable
@@ -37,16 +35,17 @@ fun AdventureScreen(
     navController: NavController,
     storageScreenController: AdventureScreenControllerImpl
 ) {
-    val coroutineScope = rememberCoroutineScope()
     val application = LocalContext.current.applicationContext as VBHelper
     val database = application.container.db
     val storageRepository = StorageRepository(database)
-    val characterList = remember {
+    val characterList by storageRepository.getAdventureCharacters().collectAsState(emptyList())
-        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) {
@@ -59,13 +58,6 @@ fun AdventureScreen(
         mutableStateOf<CharacterDtos.AdventureCharacterWithSprites?>(null)
     }
 
-    LaunchedEffect(storageRepository) {
-        coroutineScope.launch {
-            characterList.value = storageRepository
-                .getAdventureCharacters()
-        }
-    }
-
     Scaffold(
         topBar = {
             TopBanner(
@@ -76,7 +68,7 @@ fun AdventureScreen(
             )
         }
     ) { contentPadding ->
-        if (characterList.value.isEmpty()) {
+        if (characterList.isEmpty()) {
             Column(
                 verticalArrangement = Arrangement.Center,
                 horizontalAlignment = Alignment.CenterHorizontally,
@@ -91,7 +83,7 @@ fun AdventureScreen(
                 modifier = Modifier
                     .padding(top = contentPadding.calculateTopPadding())
             ) {
-                items(characterList.value) {
+                items(characterList) {
                     AdventureEntry(
                         icon = BitmapData(
                             bitmap = it.spriteIdle,
@@ -102,8 +94,9 @@ fun AdventureScreen(
                         onClick = {
                             if (it.finishesAdventure < currentTime) {
                                 storageScreenController
-                                    .getItemFromAdventure(it.id) { adventureResult ->
+                                    .getItemFromAdventure(it.id) { adventureResult, generatedCurrency ->
                                         obtainedItem = adventureResult
+                                        obtainedCurrency = generatedCurrency
                                     }
                             } else {
                                 cancelAdventureDialog = it
@@ -118,6 +111,7 @@ fun AdventureScreen(
     if (obtainedItem != null) {
         ObtainedItemDialog(
             obtainedItem = obtainedItem!!,
+            obtainedCurrency = obtainedCurrency,
             onClickDismiss = {
                 obtainedItem = null
             }

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

@@ -4,6 +4,6 @@ import com.github.nacabaro.vbhelper.dtos.ItemDtos
 
 interface AdventureScreenController {
     fun sendCharacterToAdventure(characterId: Long, timeInMinutes: Long)
-    fun getItemFromAdventure(characterId: Long, onResult: (ItemDtos.PurchasedItem) -> Unit)
+    fun getItemFromAdventure(characterId: Long, onResult: (ItemDtos.PurchasedItem, Int) -> Unit)
     fun cancelAdventure(characterId: Long, onResult: () -> Unit)
 }

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

@@ -38,19 +38,29 @@ class AdventureScreenControllerImpl(
 
     override fun getItemFromAdventure(
         characterId: Long,
-        onResult: (ItemDtos.PurchasedItem) -> Unit
+        onResult: (ItemDtos.PurchasedItem, Int) -> Unit
     ) {
         componentActivity.lifecycleScope.launch(Dispatchers.IO) {
             database
                 .adventureDao()
                 .deleteAdventure(characterId)
 
+            val generatedCurrency = generateRandomCurrency()
+
             val generatedItem = generateItem(characterId)
 
-            onResult(generatedItem)
+            onResult(generatedItem, generatedCurrency)
         }
     }
 
+    private suspend fun generateRandomCurrency(): Int {
+        val currentValue = application.container.currencyRepository.currencyValue.first()
+        val random = (2..6).random() * 1000
+        application.container.currencyRepository.setCurrencyValue(currentValue + random)
+
+        return random
+    }
+
     override fun cancelAdventure(characterId: Long, onResult: () -> Unit) {
         componentActivity.lifecycleScope.launch(Dispatchers.IO) {
             database

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

@@ -6,18 +6,11 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavController
 import com.github.nacabaro.vbhelper.components.TopBanner
-import com.github.nacabaro.vbhelper.dtos.CardDtos
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 
 @Composable
 fun CardAdventureScreen(
@@ -25,20 +18,12 @@ fun CardAdventureScreen(
     cardScreenController: CardScreenControllerImpl,
     cardId: Long
 ) {
-    val cardAdventureMissions = remember { mutableStateOf(emptyList<CardDtos.CardAdventureWithSprites>()) }
+    val cardAdventureMissions by cardScreenController
-    var currentCardAdventure by remember { mutableIntStateOf(0) }
+        .getCardAdventureMissions(cardId)
-
+        .collectAsState(emptyList())
-    LaunchedEffect(cardId) {
+    val currentCardAdventure by cardScreenController
-        withContext(Dispatchers.IO) {
+        .getCardProgress(cardId)
-            cardAdventureMissions.value =
+        .collectAsState(0)
-                cardScreenController
-                    .getCardAdventureMissions(cardId)
-
-            currentCardAdventure =
-                cardScreenController
-                    .getCardProgress(cardId)
-        }
-    }
 
     Scaffold (
         topBar = {
@@ -55,7 +40,7 @@ fun CardAdventureScreen(
                 .padding(top = contentPadding.calculateTopPadding())
                 .verticalScroll(state = rememberScrollState())
         ) {
-            cardAdventureMissions.value.mapIndexed { index, it ->
+            cardAdventureMissions.mapIndexed { index, it ->
                 CardAdventureEntry(
                     cardAdventureEntry = it,
                     obscure = index > currentCardAdventure - 1

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

@@ -1,10 +1,13 @@
 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)
-    suspend fun getCardAdventureMissions(cardId: Long): List<CardDtos.CardAdventureWithSprites>
+    fun getCardAdventureMissions(cardId: Long): Flow<List<CardDtos.CardAdventureWithSprites>>
-    suspend fun getCardProgress(cardId: Long): Int
+    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

@@ -4,6 +4,8 @@ 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(
@@ -32,15 +34,22 @@ class CardScreenControllerImpl(
         }
     }
 
-    override suspend fun getCardAdventureMissions(cardId: Long): List<CardDtos.CardAdventureWithSprites> {
+    override fun getCardAdventureMissions(cardId: Long): Flow<List<CardDtos.CardAdventureWithSprites>> {
         return database
             .cardAdventureDao()
             .getAdventureForCard(cardId)
     }
 
-    override suspend fun getCardProgress(cardId: Long): Int {
+    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/CardViewScreen.kt

@@ -5,10 +5,10 @@ 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.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.rememberCoroutineScope
 import androidx.compose.ui.platform.LocalContext
 import androidx.navigation.NavController
 import com.github.nacabaro.vbhelper.utils.BitmapData
@@ -19,32 +19,19 @@ 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 kotlinx.coroutines.launch
 
 @Composable
 fun CardViewScreen(
     navController: NavController,
     cardId: Long
 ) {
-    val coroutineScope = rememberCoroutineScope()
     val application = LocalContext.current.applicationContext as VBHelper
     val dexRepository = DexRepository(application.container.db)
 
-    val characterList = remember { mutableStateOf<List<CharacterDtos.CardCharaProgress>>(emptyList()) }
+    val characterList by dexRepository.getCharactersByCardId(cardId).collectAsState(emptyList())
-    val cardPossibleTransformations = remember { mutableStateOf<List<CharacterDtos.EvolutionRequirementsWithSpritesAndObtained>>(emptyList()) }
 
     val selectedCharacter = remember { mutableStateOf<CharacterDtos.CardCharaProgress?>(null) }
 
-    LaunchedEffect(dexRepository) {
-        coroutineScope.launch {
-            val newCharacterList = dexRepository.getCharactersByCardId(cardId)
-            characterList.value = newCharacterList
-
-            val newCardPossibleTransformations = dexRepository.getCardPossibleTransformations(cardId)
-            cardPossibleTransformations.value = newCardPossibleTransformations
-        }
-    }
-
     Scaffold (
         topBar = {
             TopBanner(
@@ -70,7 +57,7 @@ fun CardViewScreen(
             columns = GridCells.Fixed(3),
             contentPadding = contentPadding
         ) {
-            items(characterList.value) { character ->
+            items(characterList) { character ->
                 CharacterEntry(
                     onClick = {
                         selectedCharacter.value = character
@@ -88,7 +75,6 @@ fun CardViewScreen(
         if (selectedCharacter.value != null) {
             DexCharaDetailsDialog(
                 currentChara = selectedCharacter.value!!,
-                possibleTransformations = cardPossibleTransformations.value,
                 obscure = selectedCharacter.value!!.discoveredOn == null,
                 onClickClose = {
                     selectedCharacter.value = null

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

@@ -7,11 +7,10 @@ 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.collectAsState
 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.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -25,17 +24,15 @@ 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 kotlinx.coroutines.launch
 
 @Composable
 fun CardsScreen(
     navController: NavController,
     cardScreenController: CardScreenControllerImpl
 ) {
-    val coroutineScope = rememberCoroutineScope()
     val application = LocalContext.current.applicationContext as VBHelper
     val dexRepository = DexRepository(application.container.db)
-    val cardList = remember { mutableStateOf<List<CardDtos.CardProgress>>(emptyList()) }
+    val cardList by dexRepository.getAllDims().collectAsState(emptyList())
 
     val selectedCard = remember { mutableStateOf<CardDtos.CardProgress?>(null) }
     var clickedDelete by remember { mutableStateOf(false) }
@@ -43,13 +40,6 @@ fun CardsScreen(
 
     var modifyCards by remember { mutableStateOf(false) }
 
-    LaunchedEffect(dexRepository) {
-        coroutineScope.launch {
-            val newDimList = dexRepository.getAllDims()
-            cardList.value = newDimList
-        }
-    }
-
     Scaffold (
         topBar = {
             TopBanner(
@@ -64,7 +54,7 @@ fun CardsScreen(
             modifier = Modifier
                 .padding(top = contentPadding.calculateTopPadding())
         ) {
-            items(cardList.value) {
+            items(cardList) {
                 CardEntry(
                     name = it.cardName,
                     logo = BitmapData(

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

@@ -16,6 +16,11 @@ 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
@@ -23,7 +28,9 @@ 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
 
@@ -31,14 +38,25 @@ import com.github.nacabaro.vbhelper.utils.getImageBitmap
 @Composable
 fun DexCharaDetailsDialog(
     currentChara: CharacterDtos.CardCharaProgress,
-    possibleTransformations: List<CharacterDtos.EvolutionRequirementsWithSpritesAndObtained>,
     obscure: Boolean,
     onClickClose: () -> Unit
 ) {
     val nameMultiplier = 3
     val charaMultiplier = 4
 
-    val currentCharaPossibleTransformations = possibleTransformations.filter { it.fromCharaId == currentChara.id }
+    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"
@@ -204,12 +222,40 @@ fun DexCharaDetailsDialog(
                     }
                 }
 
-                Button(
+                Row {
-                    onClick = onClickClose
+                    if (currentCharaPossibleFusions.isNotEmpty()) {
-                ) {
+                        Button(
-                    Text("Close")
+                            onClick = {
+                                showFusions = true
+                            }
+                        ) {
+                            Text("Fusions")
+                        }
+                    }
+
+                    Spacer(
+                        modifier = Modifier
+                            .padding(4.dp)
+                    )
+
+                    Button(
+                        onClick = onClickClose
+                    ) {
+                        Text("Close")
+                    }
                 }
             }
         }
     }
+
+    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

@@ -0,0 +1,191 @@
+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/HomeScreen.kt

@@ -1,6 +1,5 @@
 package com.github.nacabaro.vbhelper.screens.homeScreens
 
-import android.util.Log
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
@@ -56,6 +55,7 @@ fun HomeScreen(
     var adventureMissionsFinished by rememberSaveable { mutableStateOf(false) }
     var betaWarning by rememberSaveable { mutableStateOf(true) }
     var collectedItem by remember { mutableStateOf<ItemDtos.PurchasedItem?>(null) }
+    var collectedCurrency by remember { mutableStateOf<Int?>(null) }
 
     LaunchedEffect(storageRepository, activeMon, collectedItem) {
         withContext(Dispatchers.IO) {
@@ -92,7 +92,6 @@ fun HomeScreen(
         }
     ) { contentPadding ->
         if (activeMon.value == null || (beData.value == null && vbData.value == null) || transformationHistory.value == null) {
-            Log.d("TetTet", "Something is null")
             Column (
                 horizontalAlignment = Alignment.CenterHorizontally,
                 verticalArrangement = Arrangement.Center,
@@ -103,7 +102,6 @@ fun HomeScreen(
                 Text(text = "Nothing to see here")
             }
         } else {
-            Log.d("TetTet", "Something is not null")
             if (activeMon.value!!.isBemCard) {
                 BEBEmHomeScreen(
                     activeMon = activeMon.value!!,
@@ -126,8 +124,9 @@ fun HomeScreen(
                     contentPadding = contentPadding,
                     specialMissions = vbSpecialMissions.value,
                     homeScreenController = homeScreenController,
-                    onClickCollect = { item ->
+                    onClickCollect = { item, currency ->
                         collectedItem = item
+                        collectedCurrency = currency
                     }
                 )
             }
@@ -137,8 +136,10 @@ fun HomeScreen(
     if (collectedItem != null) {
         ObtainedItemDialog(
             obtainedItem = collectedItem!!,
+            obtainedCurrency = collectedCurrency!!,
             onClickDismiss = {
                 collectedItem = null
+                collectedCurrency = null
             }
         )
     }

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

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

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

@@ -23,6 +23,7 @@ class HomeScreenControllerImpl(
             val adventureCharacters = database
                 .adventureDao()
                 .getAdventureCharacters()
+                .first()
 
             val finishedAdventureCharacters = adventureCharacters.filter { character ->
                 character.finishesAdventure <= currentTime
@@ -32,7 +33,7 @@ class HomeScreenControllerImpl(
         }
     }
 
-    override fun clearSpecialMission(missionId: Long, missionCompletion: SpecialMission.Status, onCleared: (ItemDtos.PurchasedItem?) -> Unit) {
+    override fun clearSpecialMission(missionId: Long, missionCompletion: SpecialMission.Status, onCleared: (ItemDtos.PurchasedItem?, Int?) -> Unit) {
         componentActivity.lifecycleScope.launch {
             database
                 .specialMissionDao()
@@ -64,9 +65,13 @@ class HomeScreenControllerImpl(
                     itemType = randomItem.itemType
                 )
 
-                onCleared(purchasedItem)
+                val randomAmount = (2..6).random() * 1000
+                val currentCurrency = application.container.currencyRepository.currencyValue.first()
+                application.container.currencyRepository.setCurrencyValue(currentCurrency + randomAmount)
+
+                onCleared(purchasedItem, randomAmount)
             } else {
-                onCleared(null)
+                onCleared(null, null)
             }
 
         }

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

@@ -34,7 +34,7 @@ fun VBDiMHomeScreen(
     homeScreenController: HomeScreenControllerImpl,
     transformationHistory: List<CharacterDtos.TransformationHistory>,
     contentPadding: PaddingValues,
-    onClickCollect: (ItemDtos.PurchasedItem?) -> Unit
+    onClickCollect: (ItemDtos.PurchasedItem?, Int?) -> Unit
 ) {
     Column(
         modifier = Modifier

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

@@ -24,6 +24,7 @@ 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
 
 
@@ -35,7 +36,7 @@ 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())
     }
@@ -57,7 +58,7 @@ fun ChooseCharacterScreen(
                     characterList.value = storageRepository.getVBCharacters()
                 }
                 else -> {
-                    characterList.value = storageRepository.getAllCharacters()
+                    characterList.value = storageRepository.getAllCharacters().first()
                 }
             }
         }

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

@@ -23,6 +23,7 @@ import com.github.nacabaro.vbhelper.dtos.ItemDtos
 @Composable
 fun ObtainedItemDialog(
     obtainedItem: ItemDtos.PurchasedItem,
+    obtainedCurrency: Int,
     onClickDismiss: () -> Unit
 ) {
     Dialog(
@@ -84,7 +85,16 @@ fun ObtainedItemDialog(
                         text = "You have obtained ${obtainedItem.itemAmount} of this item",
                         modifier = Modifier
                             .fillMaxWidth()
-                            .padding(5.dp)
+                            .padding(top = 4.dp)
+                    )
+                    Text(
+                        textAlign = TextAlign.Center,
+                        fontSize = MaterialTheme.typography.bodySmall.fontSize,
+                        fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
+                        text = "You also got $obtainedCurrency credits",
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(bottom = 4.dp)
                     )
                     Button(
                         onClick = onClickDismiss,

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

@@ -0,0 +1,78 @@
+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.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.navigation.NavController
+import com.github.nacabaro.vbhelper.components.TopBanner
+
+@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)
+        )
+    }
+}

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

@@ -1,38 +1,24 @@
 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.cardScreen.ChooseCard
+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
@@ -55,8 +41,6 @@ fun ScanScreen(
     val storageRepository = StorageRepository(application.container.db)
     var nfcCharacter by remember { mutableStateOf<NfcCharacter?>(null) }
 
-    var cardsRead by remember { mutableStateOf<List<Card>?>(null) }
-
     val context = LocalContext.current
 
     LaunchedEffect(storageRepository) {
@@ -73,143 +57,33 @@ fun ScanScreen(
         }
     }
 
-    var readingScreen by remember { mutableStateOf(false) }
     var writingScreen by remember { mutableStateOf(false) }
-    var cardSelectScreen by remember { mutableStateOf(false) }
+    var readingScreen by remember { mutableStateOf(false) }
-    var isDoneReadingCharacter by remember { mutableStateOf(false) }
-    var isDoneSendingCard by remember { mutableStateOf(false) }
-    var isDoneWritingCharacter by remember { mutableStateOf(false) }
 
-    DisposableEffect(readingScreen) {
+    if (writingScreen && nfcCharacter != null && characterId != null) {
-        if(readingScreen) {
+        WritingScreen(
-            scanScreenController.registerActivityLifecycleListener(
+            scanScreenController = scanScreenController,
-                SCAN_SCREEN_ACTIVITY_LIFECYCLE_LISTENER,
+            nfcCharacter = nfcCharacter!!,
-                object: ActivityLifecycleListener {
+            characterId = characterId,
-                    override fun onPause() {
+            onComplete = {
-                        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()
-            }
-        }
-    }
-
-    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 && !cardSelectScreen) {
-        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()
+                navController.navigate(NavigationItems.Home.route)
-            }
+            },
-        } else if (!isDoneWritingCharacter) {
+            onCancel = {
-            ReadingCharacterScreen("Writing character") {
-                isDoneSendingCard = false
                 writingScreen = false
-                scanScreenController.cancelRead()
+                navController.navigate(NavigationItems.Home.route)
             }
-        }
+        )
-    } else if (cardSelectScreen) {
+    } else if (readingScreen) {
-        ChooseCard(
+        ReadingScreen(
-            cards = cardsRead!!,
+            scanScreenController = scanScreenController,
-            onCardSelected = { card ->
+            onCancel = {
-                cardSelectScreen = false
+                readingScreen = false
-                scanScreenController.flushCharacter(card.id)
+                navController.navigate(NavigationItems.Home.route)
+            },
+            onComplete = {
+                readingScreen = false
+                navController.navigate(NavigationItems.Home.route)
             }
         )
     } else {
@@ -247,66 +121,8 @@ 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() {

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

@@ -1,13 +1,11 @@
 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
@@ -250,10 +248,11 @@ class FromNfcConverter (
     ) {
         val vitalsHistoryWatch = nfcCharacter.vitalHistory
         val vitalsHistory = vitalsHistoryWatch.map { historyElement ->
-            Log.d("VitalsHistory", "${historyElement.year.toInt()} ${historyElement.month.toInt()} ${historyElement.day.toInt()}")
+            val year = if (historyElement.year.toInt() !in 2021 .. 2035) 0 else historyElement.year.toInt()
+
             VitalsHistory(
                 charId = characterId,
-                year = historyElement.year.toInt(),
+                year = year,
                 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

@@ -14,6 +14,7 @@ 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(
@@ -96,6 +97,7 @@ class ToNfcConverter(
         val cardData = database
             .cardDao()
             .getCardByCharacterId(userCharacter.id)
+            .first()
 
         val appReserved = Array<UShort>(3) {
             0u

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

@@ -1,4 +1,4 @@
-package com.github.nacabaro.vbhelper.screens.scanScreen
+package com.github.nacabaro.vbhelper.screens.scanScreen.screens
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -14,13 +14,16 @@ import androidx.compose.ui.unit.dp
 import com.github.nacabaro.vbhelper.components.TopBanner
 
 @Composable
-fun ReadingCharacterScreen(
+fun ActionScreen(
     topBannerText: String,
     onClickCancel: () -> Unit,
 ) {
     Scaffold (
         topBar = {
-            TopBanner(topBannerText)
+            TopBanner(
+                text = topBannerText,
+                onBackClick = onClickCancel
+            )
         }
     ) { innerPadding ->
         Column (

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

@@ -0,0 +1,59 @@
+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.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import com.github.nacabaro.vbhelper.components.TopBanner
+
+@Composable
+fun ReadCharacterScreen(
+    onClickCancel: () -> Unit,
+    onClickConfirm: () -> Unit
+) {
+    Scaffold(
+        topBar = {
+            TopBanner(
+                text = "Read character",
+                onBackClick = onClickCancel
+            )
+        }
+    ) { innerPadding ->
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Center,
+            modifier = Modifier
+                .padding(innerPadding)
+                .fillMaxSize()
+        ) {
+            Text(
+                text = "Prepare your device!",
+                textAlign = TextAlign.Center
+            )
+
+            Text(
+                text = "Go to connect and when ready press confirm!",
+                textAlign = TextAlign.Center
+            )
+
+            Spacer(
+                modifier = Modifier.padding(8.dp)
+            )
+
+            Button(
+                onClick = onClickConfirm,
+            ) {
+                Text("Confirm")
+            }
+        }
+    }
+}

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

@@ -0,0 +1,109 @@
+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 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
+
+@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("Reading character") {
+            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

@@ -0,0 +1,132 @@
+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.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
+
+@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 = "Writing card details",
+                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 = "Icon",
+                                modifier = Modifier
+                                    .size(charaImageBitmapData.dpWidth)
+                                    .padding(8.dp),
+                                filterQuality = FilterQuality.None
+                            )
+                        }
+                    }
+
+                    Spacer(
+                        modifier = Modifier.width(8.dp)
+                    )
+
+                    Column {
+                        Text("Get your device Ready!")
+                        Text("You will need ${cardDetails.name} card!")
+                    }
+                }
+
+            }
+
+            Button(
+                onClick = onClickConfirm,
+            ) {
+                Text("Confirm")
+            }
+        }
+    }
+}

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

@@ -0,0 +1,135 @@
+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.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
+
+@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 = "Writing character",
+                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 = "Icon",
+                                modifier = Modifier
+                                    .size(charaImageBitmapData.dpWidth)
+                                    .padding(8.dp),
+                                filterQuality = FilterQuality.None
+                            )
+                        }
+                    }
+
+                    Spacer(
+                        modifier = Modifier.width(8.dp)
+                    )
+
+                    Column {
+                        Text("Card installed successfully!!")
+                        Text("Wait until your device is ready, then tap 'Confirm'")
+                    }
+                }
+
+            }
+
+            Spacer(modifier = Modifier.height(8.dp))
+
+            Button(
+                onClick = onClickConfirm,
+            ) {
+                Text("Confirm")
+            }
+        }
+    }
+}

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

@@ -0,0 +1,140 @@
+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
+
+@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("Sending card") {
+            scanScreenController.cancelRead()
+            onCancel()
+        }
+    } else if (!writingConfirmScreen) {
+        writing = false
+        WriteCharacterScreen (
+            characterId = characterId,
+            onClickCancel = {
+                scanScreenController.cancelRead()
+                onCancel()
+            },
+            onClickConfirm = {
+                writingConfirmScreen = true
+            }
+        )
+    } else if (!isDoneWritingCharacter) {
+        writing = true
+        ActionScreen("Writing character") {
+            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/SettingsScreen.kt

@@ -1,5 +1,7 @@
 package com.github.nacabaro.vbhelper.screens.settingsScreen
 
+import android.content.Intent
+import android.net.Uri
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -13,6 +15,7 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -25,6 +28,8 @@ fun SettingsScreen(
     navController: NavController,
     settingsScreenController: SettingsScreenControllerImpl,
 ) {
+    val context = LocalContext.current
+
     Scaffold (
         topBar = {
             TopBanner(
@@ -44,19 +49,22 @@ fun SettingsScreen(
                 .verticalScroll(rememberScrollState())
         ) {
             SettingsSection("NFC Communication")
-            SettingsEntry(title = "Import APK", description = "Import Secrets From Vital Arean 2.1.0 APK") {
+            SettingsEntry(title = "Import APK", description = "Import Secrets From Vital Arena 2.1.0 APK") {
                 settingsScreenController.onClickImportApk()
             }
             SettingsSection("DiM/BEm management")
             SettingsEntry(title = "Import card", description = "Import DiM/BEm card file") {
                 settingsScreenController.onClickImportCard()
             }
-            SettingsEntry(title = "Rename DiM/BEm", description = "Set card name") { }
             SettingsSection("About and credits")
             SettingsEntry(title = "Credits", description = "Credits") {
                 navController.navigate(NavigationItems.Credits.route)
             }
-            SettingsEntry(title = "About", description = "About") { }
+            SettingsEntry(title = "About", description = "About") {
+                val browserIntent = Intent(
+                    Intent.ACTION_VIEW, Uri.parse("https://github.com/nacabaro/vbhelper/"))
+                context.startActivity(browserIntent)
+            }
             SettingsSection("Data management")
             SettingsEntry(title = "Export data", description = "Export application database") {
                 settingsScreenController.onClickOpenDirectory()

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

@@ -3,36 +3,24 @@ 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.domain.characters.Sprite
+import com.github.nacabaro.vbhelper.screens.settingsScreen.controllers.CardImportController
-import com.github.nacabaro.vbhelper.domain.card.Card
+import com.github.nacabaro.vbhelper.screens.settingsScreen.controllers.DatabaseManagementController
-import com.github.nacabaro.vbhelper.domain.card.CardProgress
-import com.github.nacabaro.vbhelper.domain.card.CardCharacter
 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>>
@@ -41,13 +29,17 @@ 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) {
-                    exportDatabase(uri)
+                    databaseManagementController.exportDatabase(uri)
                 } else {
                     context.runOnUiThread {
                         Toast.makeText(context, "No destination selected", Toast.LENGTH_SHORT)
@@ -60,7 +52,7 @@ class SettingsScreenControllerImpl(
             ActivityResultContracts.OpenDocument()
         ) { uri ->
             if (uri != null) {
-                importDatabase(uri)
+                databaseManagementController.importDatabase(uri)
             } else {
                 context.runOnUiThread {
                     Toast.makeText(context, "No source selected", Toast.LENGTH_SHORT).show()
@@ -109,276 +101,14 @@ class SettingsScreenControllerImpl(
         filePickerCard.launch(arrayOf("*/*"))
     }
 
-    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
-                )
-        }
-    }
-
-    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 {
-                    database
-                        .cardFusionsDao()
-                        .insertNewFusion(
-                            cardId = cardId,
-                            fromCharaId = it.characterIndex,
-                            toCharaIdAttr1 = it.attribute1Fusion,
-                            toCharaIdAttr2 = it.attribute2Fusion,
-                            toCharaIdAttr3 = it.attribute3Fusion,
-                            toCharaIdAttr4 = it.attribute4Fusion
-                        )
-                }
-        }
-    }
-
-    private fun updateCardProgress(
-        cardId: Long,
-    ) {
-        database
-            .cardProgressDao()
-            .insertCardProgress(
-                CardProgress(
-                    cardId = cardId,
-                    currentStage = 1,
-                    unlocked = false
-                )
-            )
-    }
-
     private fun importCard(uri: Uri) {
         context.lifecycleScope.launch(Dispatchers.IO) {
             val contentResolver = context.contentResolver
             val inputStream = contentResolver.openInputStream(uri)
 
             inputStream.use { fileReader ->
-                val dimReader = DimReader()
+                val cardImportController = CardImportController(database)
-                val card = dimReader.readCard(fileReader, false)
+                cardImportController.importCard(fileReader)
-
-                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)
             }
 
             inputStream?.close()
@@ -388,100 +118,6 @@ 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

@@ -0,0 +1,320 @@
+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

@@ -0,0 +1,115 @@
+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

@@ -38,6 +38,7 @@ import kotlinx.coroutines.launch
 fun StorageDialog(
     characterId: Long,
     onDismissRequest: () -> Unit,
+    onClickDelete: () -> Unit,
     onSendToBracelet: () -> Unit,
     onClickSetActive: () -> Unit,
     onClickSendToAdventure: (time: Long) -> Unit
@@ -141,6 +142,13 @@ fun StorageDialog(
                 ) {
                     Text(text = "Send on adventure")
                 }
+                Button(
+                    modifier = Modifier
+                        .fillMaxWidth(),
+                    onClick = onClickDelete
+                ) {
+                    Text(text = "Delete character")
+                }
                 Button(
                     modifier = Modifier
                         .fillMaxWidth(),

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

@@ -1,5 +1,6 @@
 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
@@ -11,14 +12,15 @@ 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.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.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -28,12 +30,10 @@ 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 kotlinx.coroutines.launch
 
 
 @Composable
@@ -42,18 +42,11 @@ fun StorageScreen(
     storageScreenController: StorageScreenControllerImpl,
     adventureScreenController: AdventureScreenControllerImpl
 ) {
-    val coroutineScope = rememberCoroutineScope()
     val application = LocalContext.current.applicationContext as VBHelper
     val storageRepository = StorageRepository(application.container.db)
-    val monList = remember { mutableStateOf<List<CharacterDtos.CharacterWithSprites>>(emptyList()) }
+    val characterList by storageRepository.getAllCharacters().collectAsState(initial = emptyList())
-    var selectedCharacter by remember { mutableStateOf<Long?>(null) }
 
-    LaunchedEffect(storageRepository, selectedCharacter) {
+    var selectedCharacter by remember { mutableStateOf<Long?>(null) }
-        coroutineScope.launch {
-            val characterList = storageRepository.getAllCharacters()
-            monList.value = characterList
-        }
-    }
 
     Scaffold (
         topBar = {
@@ -65,7 +58,7 @@ fun StorageScreen(
             )
         }
     ) { contentPadding ->
-        if (monList.value.isEmpty()) {
+        if (characterList.isEmpty()) {
             Column (
                 horizontalAlignment = Alignment.CenterHorizontally,
                 verticalArrangement = Arrangement.Center,
@@ -86,7 +79,7 @@ fun StorageScreen(
                     .scrollable(state = rememberScrollState(), orientation = Orientation.Vertical)
                     .padding(top = contentPadding.calculateTopPadding())
             ) {
-                items(monList.value) { index ->
+                items(characterList) { index ->
                     CharacterEntry(
                         icon = BitmapData(
                             bitmap = index.spriteIdle,
@@ -107,6 +100,16 @@ fun StorageScreen(
                                 )
                             }
                         },
+                        cardColors = if (index.active) {
+                            CardDefaults.cardColors(
+                                containerColor = MaterialTheme.colorScheme.primary
+                            )
+                        } else {
+                            CardDefaults.cardColors(
+                                containerColor = MaterialTheme.colorScheme.surfaceContainerHighest
+                            )
+                        }
+
                     )
                 }
             }
@@ -138,6 +141,16 @@ 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,4 +2,5 @@ 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,4 +28,21 @@ 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/DexRepository.kt

@@ -3,19 +3,24 @@ 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
 ) {
-    suspend fun getAllDims(): List<CardDtos.CardProgress> {
+    fun getAllDims(): Flow<List<CardDtos.CardProgress>> {
         return db.dexDao().getCardsWithProgress()
     }
 
-    suspend fun getCharactersByCardId(cardId: Long): List<CharacterDtos.CardCharaProgress> {
+    fun getCharactersByCardId(cardId: Long): Flow<List<CharacterDtos.CardCharaProgress>> {
         return db.dexDao().getSingleCardProgress(cardId)
     }
 
-    suspend fun getCardPossibleTransformations(cardId: Long): List<CharacterDtos.EvolutionRequirementsWithSpritesAndObtained> {
+    fun getCharacterPossibleTransformations(characterId: Long): Flow<List<CharacterDtos.EvolutionRequirementsWithSpritesAndObtained>> {
-        return db.characterDao().getEvolutionRequirementsForCard(cardId)
+        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/ScanRepository.kt

@@ -0,0 +1,13 @@
+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

@@ -6,11 +6,12 @@ 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
 ) {
-    suspend fun getAllCharacters(): List<CharacterDtos.CharacterWithSprites> {
+    fun getAllCharacters(): Flow<List<CharacterDtos.CharacterWithSprites>> {
         return db.userCharacterDao().getAllCharacters()
     }
 
@@ -46,7 +47,7 @@ class StorageRepository (
         return db.userCharacterDao().deleteCharacterById(id)
     }
 
-    suspend fun getAdventureCharacters(): List<CharacterDtos.AdventureCharacterWithSprites> {
+    fun getAdventureCharacters(): Flow<List<CharacterDtos.AdventureCharacterWithSprites>> {
         return db.adventureDao().getAdventureCharacters()
     }