Merge branch 'nacabaro:main' into vb_battle_client

app/build.gradle.kts

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

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

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

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

@@ -5,11 +5,14 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -28,6 +31,9 @@ import com.github.nacabaro.vbhelper.utils.getBitmap
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.FontWeight
+import com.github.cfogrady.vbnfc.vb.SpecialMission
+import com.github.nacabaro.vbhelper.R
+import com.github.nacabaro.vbhelper.domain.device_data.SpecialMissions
 import com.github.nacabaro.vbhelper.utils.getObscuredBitmap
 
 @Composable
@@ -115,3 +121,89 @@ fun ItemDisplay(
         }
     }
 }
+
+@Composable
+fun SpecialMissionsEntry(
+    specialMission: SpecialMissions,
+    modifier: Modifier = Modifier,
+    onClickCard: () -> Unit = {  },
+) {
+    val textValue = when (specialMission.missionType) {
+        SpecialMission.Type.NONE -> "No mission selected"
+        SpecialMission.Type.STEPS -> "Walk ${specialMission.goal} steps"
+        SpecialMission.Type.BATTLES -> "Battle ${specialMission.goal} times"
+        SpecialMission.Type.WINS -> "Win ${specialMission.goal} battles"
+        SpecialMission.Type.VITALS -> "Earn ${specialMission.goal} vitals"
+    }
+
+    val progress = if (specialMission.status == SpecialMission.Status.COMPLETED) {
+        specialMission.goal
+    } else {
+        specialMission.progress
+    }
+
+    val completion = when (specialMission.missionType) {
+        SpecialMission.Type.NONE -> ""
+        SpecialMission.Type.STEPS -> "Walked $progress steps"
+        SpecialMission.Type.BATTLES -> "Battled $progress times"
+        SpecialMission.Type.WINS -> "Won $progress battles"
+        SpecialMission.Type.VITALS -> "Earned $progress vitals"
+    }
+
+    val icon = when (specialMission.missionType) {
+        SpecialMission.Type.NONE -> R.drawable.baseline_free_24
+        SpecialMission.Type.STEPS -> R.drawable.baseline_agility_24
+        SpecialMission.Type.BATTLES -> R.drawable.baseline_swords_24
+        SpecialMission.Type.WINS -> R.drawable.baseline_trophy_24
+        SpecialMission.Type.VITALS -> R.drawable.baseline_vitals_24
+    }
+
+    val color = when (specialMission.status)
+    {
+        SpecialMission.Status.IN_PROGRESS -> MaterialTheme.colorScheme.secondary
+        SpecialMission.Status.COMPLETED -> MaterialTheme.colorScheme.primary
+        SpecialMission.Status.FAILED -> MaterialTheme.colorScheme.error
+        else -> MaterialTheme.colorScheme.surfaceContainerHighest
+    }
+
+    Card(
+        modifier = modifier,
+        shape = androidx.compose.material.MaterialTheme.shapes.small,
+        onClick = if (specialMission.status == SpecialMission.Status.COMPLETED) {
+            onClickCard
+        } else {
+            {  }
+        },
+        colors = CardDefaults.cardColors(
+            containerColor = color
+        )
+
+    ) {
+        Row (
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(16.dp)
+        ) {
+            Icon(
+                painter = painterResource(icon),
+                contentDescription = "Vitals",
+                modifier = Modifier
+                    .fillMaxHeight()
+                    .padding(16.dp)
+            )
+            Column {
+                Text(
+                    text = textValue,
+                    fontFamily = MaterialTheme.typography.titleLarge.fontFamily,
+                    fontWeight = FontWeight.Bold,
+                )
+                Text(
+                    text = completion,
+                    fontFamily = MaterialTheme.typography.titleSmall.fontFamily,
+                )
+            }
+        }
+    }
+}

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

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

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

@@ -9,8 +9,26 @@ import com.github.nacabaro.vbhelper.domain.card.Card
 @Dao
 interface CardDao {
     @Insert(onConflict = OnConflictStrategy.IGNORE)
-    suspend fun insertNewDim(card: Card): Long
+    suspend fun insertNewCard(card: Card): Long
 
     @Query("SELECT * FROM Card WHERE cardId = :id")
-    fun getDimById(id: Int): Card?
+    fun getCardByCardId(id: Int): List<Card>
+
+    @Query("SELECT * FROM Card WHERE id = :id")
+    fun getCardById(id: Long): Card?
+
+    @Query("""
+        SELECT ca.* 
+        FROM Card ca
+        JOIN Character ch ON ca.id = ch.dimId
+        JOIN UserCharacter uc ON ch.id = uc.charId
+        WHERE uc.id = :id
+    """)
+    suspend fun getCardByCharacterId(id: Long): Card
+
+    @Query("UPDATE Card SET name = :newName WHERE id = :id")
+    suspend fun renameCard(id: Int, newName: String)
+
+    @Query("DELETE FROM Card WHERE id = :id")
+    suspend fun deleteCard(id: Long)
 }

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

@@ -31,7 +31,7 @@ interface ItemDao {
         WHERE Items.id = :itemId
     """
     )
-    fun getItem(itemId: Long): ItemDtos.ItemsWithQuantities
+    suspend fun getItem(itemId: Long): ItemDtos.ItemsWithQuantities
 
     @Query(
         """
@@ -40,7 +40,7 @@ interface ItemDao {
         WHERE id = :itemId
     """
     )
-    fun useItem(itemId: Long)
+    suspend fun useItem(itemId: Long)
 
     @Query(
         """

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

@@ -0,0 +1,15 @@
+package com.github.nacabaro.vbhelper.daos
+
+import androidx.room.Dao
+import androidx.room.Query
+
+@Dao
+interface SpecialMissionDao {
+    @Query("""
+        UPDATE SpecialMissions SET 
+            missionType = "NONE",
+            status = "UNAVAILABLE"
+        WHERE id = :id
+    """)
+    suspend fun clearSpecialMission(id: Long)
+}

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

@@ -34,7 +34,7 @@ interface UserCharacterDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insertTransformationHistory(vararg transformationHistory: TransformationHistory)
 
-    @Insert
+    @Upsert
     fun insertSpecialMissions(vararg specialMissions: SpecialMissions)
 
     @Query("""
@@ -172,4 +172,54 @@ interface UserCharacterDao {
 
     @Query("""SELECT * FROM VitalsHistory WHERE charId = :charId ORDER BY id ASC""")
     suspend fun getVitalsHistory(charId: Long): List<VitalsHistory>
+
+    @Query(
+        """
+        SELECT
+            uc.*,
+            c.stage,
+            c.attribute,
+            s.spriteIdle1 AS spriteIdle,
+            s.spriteIdle2 AS spriteIdle2,
+            s.width AS spriteWidth,
+            s.height AS spriteHeight,
+            c.name as nameSprite,
+            c.nameWidth as nameSpriteWidth,
+            c.nameHeight as nameSpriteHeight,
+            d.isBEm as isBemCard,
+            a.characterId = uc.id as isInAdventure
+        FROM UserCharacter uc
+        JOIN Character c ON uc.charId = c.id
+        JOIN Card d ON  d.id = c.dimId
+        JOIN Sprite s ON s.id = c.spriteId
+        LEFT JOIN Adventure a ON a.characterId = uc.id
+        WHERE uc.characterType = "BEDevice"
+        """
+    )
+    suspend fun getBECharacters(): List<CharacterDtos.CharacterWithSprites>
+
+    @Query(
+        """
+        SELECT
+            uc.*,
+            c.stage,
+            c.attribute,
+            s.spriteIdle1 AS spriteIdle,
+            s.spriteIdle2 AS spriteIdle2,
+            s.width AS spriteWidth,
+            s.height AS spriteHeight,
+            c.name as nameSprite,
+            c.nameWidth as nameSpriteWidth,
+            c.nameHeight as nameSpriteHeight,
+            d.isBEm as isBemCard,
+            a.characterId = uc.id as isInAdventure
+        FROM UserCharacter uc
+        JOIN Character c ON uc.charId = c.id
+        JOIN Card d ON  d.id = c.dimId
+        JOIN Sprite s ON s.id = c.spriteId
+        LEFT JOIN Adventure a ON a.characterId = uc.id
+        WHERE uc.characterType = "VBDevice"
+        """
+    )
+    suspend fun getVBDimCharacters(): List<CharacterDtos.CharacterWithSprites>
 }

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

@@ -8,6 +8,7 @@ import com.github.nacabaro.vbhelper.daos.DexDao
 import com.github.nacabaro.vbhelper.daos.CardDao
 import com.github.nacabaro.vbhelper.daos.CardProgressDao
 import com.github.nacabaro.vbhelper.daos.ItemDao
+import com.github.nacabaro.vbhelper.daos.SpecialMissionDao
 import com.github.nacabaro.vbhelper.daos.SpriteDao
 import com.github.nacabaro.vbhelper.daos.UserCharacterDao
 import com.github.nacabaro.vbhelper.domain.characters.Character
@@ -51,4 +52,5 @@ abstract class AppDatabase : RoomDatabase() {
     abstract fun itemDao(): ItemDao
     abstract fun adventureDao(): AdventureDao
     abstract fun spriteDao(): SpriteDao
+    abstract fun specialMissionDao(): SpecialMissionDao
 }

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

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

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

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

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

@@ -19,8 +19,8 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import com.github.nacabaro.vbhelper.di.VBHelper
 import com.github.nacabaro.vbhelper.screens.BattlesScreen
-import com.github.nacabaro.vbhelper.screens.DexScreen
-import com.github.nacabaro.vbhelper.screens.DiMScreen
+import com.github.nacabaro.vbhelper.screens.cardScreen.CardsScreen
+import com.github.nacabaro.vbhelper.screens.cardScreen.CardViewScreen
 import com.github.nacabaro.vbhelper.screens.homeScreens.HomeScreen
 import com.github.nacabaro.vbhelper.screens.itemsScreen.ItemsScreen
 import com.github.nacabaro.vbhelper.screens.scanScreen.ScanScreen
@@ -34,6 +34,7 @@ import com.github.nacabaro.vbhelper.screens.itemsScreen.ItemsScreenControllerImp
 import com.github.nacabaro.vbhelper.screens.settingsScreen.SettingsScreenControllerImpl
 import com.github.nacabaro.vbhelper.screens.adventureScreen.AdventureScreen
 import com.github.nacabaro.vbhelper.screens.adventureScreen.AdventureScreenControllerImpl
+import com.github.nacabaro.vbhelper.screens.cardScreen.CardScreenControllerImpl
 import com.github.nacabaro.vbhelper.screens.settingsScreen.CreditsScreen
 import com.github.nacabaro.vbhelper.screens.spriteViewer.SpriteViewerControllerImpl
 import com.github.nacabaro.vbhelper.screens.storageScreen.StorageScreenControllerImpl
@@ -46,7 +47,8 @@ data class AppNavigationHandlers(
     val adventureScreenController: AdventureScreenControllerImpl,
     val storageScreenController: StorageScreenControllerImpl,
     val homeScreenController: HomeScreenControllerImpl,
-    val spriteViewerController: SpriteViewerControllerImpl
+    val spriteViewerController: SpriteViewerControllerImpl,
+    val cardScreenController: CardScreenControllerImpl
 )
 
 @Composable
@@ -121,8 +123,9 @@ fun AppNavigation(
                 )
             }
             composable(NavigationItems.Dex.route) {
-                DexScreen(
-                    navController = navController
+                CardsScreen(
+                    navController = navController,
+                    cardScreenController = applicationNavigationHandlers.cardScreenController
                 )
             }
             composable(NavigationItems.Settings.route) {
@@ -140,7 +143,7 @@ fun AppNavigation(
             composable(NavigationItems.CardView.route) {
                 val cardId = it.arguments?.getString("cardId")
                 if (cardId != null) {
-                    DiMScreen(
+                    CardViewScreen(
                         navController = navController,
                         dimId = cardId.toLong()
                     )

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

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

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

@@ -94,7 +94,8 @@ class AdventureScreenControllerImpl(
             itemName = randomItem.name,
             itemIcon = randomItem.itemIcon,
             itemLength = randomItem.itemLength,
-            itemDescription = randomItem.description
+            itemDescription = randomItem.description,
+            itemType = randomItem.itemType
         )
     }
 }

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

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

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

@@ -0,0 +1,6 @@
+package com.github.nacabaro.vbhelper.screens.cardScreen
+
+interface CardScreenController {
+    fun renameCard(cardId: Long, newName: String, onRenamed: (String) -> Unit)
+    fun deleteCard(cardId: Long, onDeleted: () -> Unit)
+}

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

@@ -0,0 +1,34 @@
+package com.github.nacabaro.vbhelper.screens.cardScreen
+
+import androidx.activity.ComponentActivity
+import androidx.lifecycle.lifecycleScope
+import com.github.nacabaro.vbhelper.di.VBHelper
+import kotlinx.coroutines.launch
+
+class CardScreenControllerImpl(
+    private val componentActivity: ComponentActivity,
+) : CardScreenController {
+    private val application = componentActivity.applicationContext as VBHelper
+    private val database = application.container.db
+
+
+    override fun renameCard(cardId: Long, newName: String, onRenamed: (String) -> Unit) {
+        componentActivity.lifecycleScope.launch {
+            database
+                .cardDao()
+                .renameCard(cardId.toInt(), newName)
+
+            onRenamed(newName)
+        }
+    }
+
+    override fun deleteCard(cardId: Long, onDeleted: () -> Unit) {
+        componentActivity.lifecycleScope.launch {
+            database
+                .cardDao()
+                .deleteCard(cardId)
+
+            onDeleted()
+        }
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.github.nacabaro.vbhelper.screens
+package com.github.nacabaro.vbhelper.screens.cardScreen
 
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
@@ -14,14 +14,13 @@ import androidx.navigation.NavController
 import com.github.nacabaro.vbhelper.utils.BitmapData
 import com.github.nacabaro.vbhelper.components.CharacterEntry
 import com.github.nacabaro.vbhelper.components.TopBanner
-import com.github.nacabaro.vbhelper.domain.characters.Character
 import com.github.nacabaro.vbhelper.di.VBHelper
 import com.github.nacabaro.vbhelper.dtos.CharacterDtos
 import com.github.nacabaro.vbhelper.source.DexRepository
 import kotlinx.coroutines.launch
 
 @Composable
-fun DiMScreen(
+fun CardViewScreen(
     navController: NavController,
     dimId: Long
 ) {

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

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

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

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

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

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

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

@@ -28,7 +28,7 @@ fun BetaWarning(
                 )
                 Spacer(modifier = Modifier.padding(8.dp))
                 Text(
-                    text = "Also, this application does not work yet with the original VB."
+                    text = "Application should work now with the original VB and the VH."
                 )
                 Spacer(modifier = Modifier.padding(8.dp))
                 Text(

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

@@ -1,5 +1,6 @@
 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
@@ -27,9 +28,15 @@ import com.github.nacabaro.vbhelper.components.TopBanner
 import com.github.nacabaro.vbhelper.di.VBHelper
 import com.github.nacabaro.vbhelper.utils.DeviceType
 import com.github.nacabaro.vbhelper.domain.device_data.BECharacterData
+import com.github.nacabaro.vbhelper.domain.device_data.SpecialMissions
 import com.github.nacabaro.vbhelper.domain.device_data.VBCharacterData
 import com.github.nacabaro.vbhelper.dtos.CharacterDtos
+import com.github.nacabaro.vbhelper.dtos.ItemDtos
 import com.github.nacabaro.vbhelper.navigation.NavigationItems
+import com.github.nacabaro.vbhelper.screens.homeScreens.screens.BEBEmHomeScreen
+import com.github.nacabaro.vbhelper.screens.homeScreens.screens.BEDiMHomeScreen
+import com.github.nacabaro.vbhelper.screens.homeScreens.screens.VBDiMHomeScreen
+import com.github.nacabaro.vbhelper.screens.itemsScreen.ObtainedItemDialog
 import com.github.nacabaro.vbhelper.source.StorageRepository
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -45,15 +52,21 @@ fun HomeScreen(
     val transformationHistory = remember { mutableStateOf<List<CharacterDtos.TransformationHistory>?>(null) }
     val beData = remember { mutableStateOf<BECharacterData?>(null) }
     val vbData = remember { mutableStateOf<VBCharacterData?>(null) }
+    val vbSpecialMissions = remember { mutableStateOf<List<SpecialMissions>>(emptyList()) }
     var adventureMissionsFinished by rememberSaveable { mutableStateOf(false) }
     var betaWarning by rememberSaveable { mutableStateOf(true) }
+    var collectedItem by remember { mutableStateOf<ItemDtos.PurchasedItem?>(null) }
 
-    LaunchedEffect(storageRepository, activeMon) {
+    LaunchedEffect(storageRepository, activeMon, collectedItem) {
         withContext(Dispatchers.IO) {
             activeMon.value = storageRepository.getActiveCharacter()
-            if (activeMon.value != null) {
+            if (activeMon.value != null && activeMon.value!!.characterType == DeviceType.BEDevice) {
                 beData.value = storageRepository.getCharacterBeData(activeMon.value!!.id)
                 transformationHistory.value = storageRepository.getTransformationHistory(activeMon.value!!.id)
+            } else if (activeMon.value != null && activeMon.value!!.characterType == DeviceType.VBDevice) {
+                vbData.value = storageRepository.getCharacterVbData(activeMon.value!!.id)
+                vbSpecialMissions.value = storageRepository.getSpecialMissions(activeMon.value!!.id)
+                transformationHistory.value = storageRepository.getTransformationHistory(activeMon.value!!.id)
             }
         }
     }
@@ -79,6 +92,7 @@ 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,
@@ -89,6 +103,7 @@ fun HomeScreen(
                 Text(text = "Nothing to see here")
             }
         } else {
+            Log.d("TetTet", "Something is not null")
             if (activeMon.value!!.isBemCard) {
                 BEBEmHomeScreen(
                     activeMon = activeMon.value!!,
@@ -108,12 +123,26 @@ fun HomeScreen(
                     activeMon = activeMon.value!!,
                     vbData = vbData.value!!,
                     transformationHistory = transformationHistory.value!!,
-                    contentPadding = contentPadding
+                    contentPadding = contentPadding,
+                    specialMissions = vbSpecialMissions.value,
+                    homeScreenController = homeScreenController,
+                    onClickCollect = { item ->
+                        collectedItem = item
+                    }
                 )
             }
         }
     }
 
+    if (collectedItem != null) {
+        ObtainedItemDialog(
+            obtainedItem = collectedItem!!,
+            onClickDismiss = {
+                collectedItem = null
+            }
+        )
+    }
+
     if (adventureMissionsFinished) {
         Dialog(
             onDismissRequest = { adventureMissionsFinished = false },

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

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

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

@@ -3,8 +3,11 @@ package com.github.nacabaro.vbhelper.screens.homeScreens
 import androidx.activity.ComponentActivity
 import androidx.lifecycle.lifecycleScope
 import com.github.nacabaro.vbhelper.di.VBHelper
+import com.github.nacabaro.vbhelper.dtos.ItemDtos
 import kotlinx.coroutines.launch
 import java.time.Instant
+import kotlin.math.roundToInt
+import kotlin.random.Random
 
 class HomeScreenControllerImpl(
     private val componentActivity: ComponentActivity,
@@ -26,4 +29,38 @@ class HomeScreenControllerImpl(
             onCompletion(finishedAdventureCharacters.isNotEmpty())
         }
     }
+
+    override fun clearSpecialMission(missionId: Long, onCleared: (ItemDtos.PurchasedItem) -> Unit) {
+        componentActivity.lifecycleScope.launch {
+            database
+                .specialMissionDao()
+                .clearSpecialMission(missionId)
+
+            val randomItem = database
+                .itemDao()
+                .getAllItems()
+                .random()
+
+            val randomItemAmount = (Random.nextFloat() * 5).roundToInt()
+
+            database
+                .itemDao()
+                .purchaseItem(
+                    itemId = randomItem.id,
+                    itemAmount = randomItemAmount
+                )
+
+            val purchasedItem = ItemDtos.PurchasedItem(
+                itemId = randomItem.id,
+                itemName = randomItem.name,
+                itemDescription = randomItem.description,
+                itemIcon = randomItem.itemIcon,
+                itemLength = randomItem.itemLength,
+                itemAmount = randomItemAmount,
+                itemType = randomItem.itemType
+            )
+
+            onCleared(purchasedItem)
+        }
+    }
 }

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

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

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

@@ -1,4 +1,4 @@
-package com.github.nacabaro.vbhelper.screens.homeScreens
+package com.github.nacabaro.vbhelper.screens.homeScreens.screens
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues

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

@@ -1,4 +1,4 @@
-package com.github.nacabaro.vbhelper.screens.homeScreens
+package com.github.nacabaro.vbhelper.screens.homeScreens.screens
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues

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

@@ -0,0 +1,189 @@
+package com.github.nacabaro.vbhelper.screens.homeScreens.screens
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.github.nacabaro.vbhelper.R
+import com.github.nacabaro.vbhelper.components.CharacterEntry
+import com.github.nacabaro.vbhelper.components.ItemDisplay
+import com.github.nacabaro.vbhelper.components.SpecialMissionsEntry
+import com.github.nacabaro.vbhelper.components.TransformationHistoryCard
+import com.github.nacabaro.vbhelper.domain.device_data.SpecialMissions
+import com.github.nacabaro.vbhelper.domain.device_data.VBCharacterData
+import com.github.nacabaro.vbhelper.dtos.CharacterDtos
+import com.github.nacabaro.vbhelper.dtos.ItemDtos
+import com.github.nacabaro.vbhelper.screens.homeScreens.HomeScreenControllerImpl
+import com.github.nacabaro.vbhelper.utils.BitmapData
+import java.util.Locale
+
+@Composable
+fun VBDiMHomeScreen(
+    activeMon: CharacterDtos.CharacterWithSprites,
+    vbData: VBCharacterData,
+    specialMissions: List<SpecialMissions>,
+    homeScreenController: HomeScreenControllerImpl,
+    transformationHistory: List<CharacterDtos.TransformationHistory>,
+    contentPadding: PaddingValues,
+    onClickCollect: (ItemDtos.PurchasedItem) -> Unit
+) {
+    Column(
+        modifier = Modifier
+            .padding(top = contentPadding.calculateTopPadding())
+            .verticalScroll(state = rememberScrollState())
+    ) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+        ) {
+            CharacterEntry(
+                icon = BitmapData(
+                    bitmap = activeMon.spriteIdle,
+                    width = activeMon.spriteWidth,
+                    height = activeMon.spriteHeight
+                ),
+                multiplier = 8,
+                shape = androidx.compose.material.MaterialTheme.shapes.small,
+                modifier = Modifier
+                    .weight(1f)
+                    .aspectRatio(1f)
+            )
+            Column(
+                modifier = Modifier
+                    .weight(0.5f)
+                    .aspectRatio(0.5f)
+            ) {
+                ItemDisplay(
+                    icon = R.drawable.baseline_vitals_24,
+                    textValue = activeMon.vitalPoints.toString(),
+                    definition = "Vitals",
+                    modifier = Modifier
+                        .weight(0.5f)
+                        .aspectRatio(1f)
+                        .padding(8.dp)
+                )
+                ItemDisplay(
+                    icon = R.drawable.baseline_trophy_24,
+                    textValue = activeMon.trophies.toString(),
+                    definition = "Trophies",
+                    modifier = Modifier
+                        .weight(0.5f)
+                        .aspectRatio(1f)
+                        .padding(8.dp)
+                )
+            }
+        }
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+        ) {
+            ItemDisplay(
+                icon = R.drawable.baseline_mood_24,
+                textValue = activeMon.mood.toString(),
+                definition = "Mood",
+                modifier = Modifier
+                    .weight(1f)
+                    .aspectRatio(1f)
+                    .padding(8.dp)
+            )
+            val transformationCountdownInHours = activeMon.transformationCountdown / 60
+            ItemDisplay(
+                icon = R.drawable.baseline_next_24,
+                textValue = when (transformationCountdownInHours) {
+                    0 -> "${activeMon.transformationCountdown} m"
+                    else -> "$transformationCountdownInHours h"
+                },
+                definition = "Next timer",
+                modifier = Modifier
+                    .weight(1f)
+                    .aspectRatio(1f)
+                    .padding(8.dp)
+            )
+            ItemDisplay(
+                icon = R.drawable.baseline_swords_24,
+                textValue = when {
+                    activeMon.totalBattlesLost == 0 -> "0.00 %"
+                    else -> {
+                        val battleWinPercentage =
+                            activeMon.totalBattlesWon.toFloat() / (activeMon.totalBattlesWon + activeMon.totalBattlesLost).toFloat()
+                        String.format(
+                            Locale.getDefault(),
+                            "%.2f",
+                            battleWinPercentage * 100
+                        ) + " %" // Specify locale
+                    }
+                },
+                definition = "Total battle win %",
+                modifier = Modifier
+                    .weight(1f)
+                    .aspectRatio(1f)
+                    .padding(8.dp)
+            )
+            ItemDisplay(
+                icon = R.drawable.baseline_swords_24,
+                textValue = when {
+                    activeMon.totalBattlesLost == 0 -> "0.00 %"
+                    else -> {
+                        val battleWinPercentage =
+                            activeMon.currentPhaseBattlesWon.toFloat() / (activeMon.currentPhaseBattlesWon + activeMon.currentPhaseBattlesLost).toFloat()
+                        String.format(
+                            Locale.getDefault(),
+                            "%.2f",
+                            battleWinPercentage * 100
+                        ) + " %" // Specify locale
+                    }
+                },
+                definition = "Current phase win %",
+                modifier = Modifier
+                    .weight(1f)
+                    .aspectRatio(1f)
+                    .padding(8.dp)
+            )
+        }
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+        ) {
+            TransformationHistoryCard(
+                transformationHistory = transformationHistory,
+                modifier = Modifier
+                    .weight(1f)
+                    .padding(8.dp)
+            )
+        }
+        Row (
+            modifier = Modifier
+                .padding(16.dp)
+        ) {
+            Text(
+                text = "Special missions",
+                fontSize = 24.sp
+                )
+        }
+        for (mission in specialMissions) {
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+            ) {
+                SpecialMissionsEntry(
+                    specialMission = mission,
+                    modifier = Modifier
+                        .weight(1f)
+                        .padding(8.dp),
+                ) {
+                    homeScreenController
+                        .clearSpecialMission(mission.id, onClickCollect)
+                }
+            }
+        }
+    }
+}

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

@@ -19,7 +19,9 @@ import androidx.navigation.NavController
 import com.github.nacabaro.vbhelper.components.CharacterEntry
 import com.github.nacabaro.vbhelper.components.TopBanner
 import com.github.nacabaro.vbhelper.di.VBHelper
+import com.github.nacabaro.vbhelper.domain.items.ItemType
 import com.github.nacabaro.vbhelper.dtos.CharacterDtos
+import com.github.nacabaro.vbhelper.dtos.ItemDtos
 import com.github.nacabaro.vbhelper.source.StorageRepository
 import com.github.nacabaro.vbhelper.utils.BitmapData
 import kotlinx.coroutines.launch
@@ -39,12 +41,27 @@ fun ChooseCharacterScreen(
     }
 
     var selectedCharacter by remember { mutableStateOf<Long?>(null) }
+    var selectedItem by remember { mutableStateOf<ItemDtos.ItemsWithQuantities?>(null) }
 
     LaunchedEffect(storageRepository) {
         coroutineScope.launch {
+            selectedItem = storageRepository.getItem(itemId)
+            when (selectedItem?.itemType) {
+                ItemType.BEITEM -> {
+                    characterList.value = storageRepository.getBECharacters()
+                }
+                ItemType.VBITEM -> {
+                    characterList.value = storageRepository.getVBCharacters()
+                }
+                ItemType.SPECIALMISSION-> {
+                    characterList.value = storageRepository.getVBCharacters()
+                }
+                else -> {
                     characterList.value = storageRepository.getAllCharacters()
                 }
             }
+        }
+    }
 
     LaunchedEffect (selectedCharacter) {
         if (selectedCharacter != null) {

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

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

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

@@ -30,7 +30,9 @@ 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.source.StorageRepository
 import com.github.nacabaro.vbhelper.source.isMissingSecrets
 import com.github.nacabaro.vbhelper.source.proto.Secrets
@@ -53,6 +55,8 @@ 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) {
@@ -71,6 +75,7 @@ fun ScanScreen(
 
     var readingScreen by remember { mutableStateOf(false) }
     var writingScreen by remember { mutableStateOf(false) }
+    var cardSelectScreen by remember { mutableStateOf(false) }
     var isDoneReadingCharacter by remember { mutableStateOf(false) }
     var isDoneSendingCard by remember { mutableStateOf(false) }
     var isDoneWritingCharacter by remember { mutableStateOf(false) }
@@ -85,15 +90,33 @@ fun ScanScreen(
                     }
 
                     override fun onResume() {
-                        scanScreenController.onClickRead(secrets!!) {
+                        scanScreenController.onClickRead(
+                            secrets = secrets!!,
+                            onComplete = {
+                                isDoneReadingCharacter = true
+                            },
+                            onMultipleCards = { cards ->
+                                cardsRead = cards
+                                readingScreen = false
+                                cardSelectScreen = true
                                 isDoneReadingCharacter = true
                             }
+                        )
                     }
                 }
             )
-            scanScreenController.onClickRead(secrets!!) {
+            scanScreenController.onClickRead(
+                secrets = secrets!!,
+                onComplete = {
+                    isDoneReadingCharacter = true
+                },
+                onMultipleCards = { cards ->
+                    cardsRead = cards
+                    readingScreen = false
+                    cardSelectScreen = true
                     isDoneReadingCharacter = true
                 }
+            )
         }
         onDispose {
             if(readingScreen) {
@@ -149,7 +172,7 @@ fun ScanScreen(
         }
     }
 
-    if (isDoneReadingCharacter) {
+    if (isDoneReadingCharacter && !cardSelectScreen) {
         readingScreen = false
         navController.navigate(NavigationItems.Home.route)
     } else if (isDoneSendingCard && isDoneWritingCharacter) {
@@ -181,6 +204,14 @@ fun ScanScreen(
                 scanScreenController.cancelRead()
             }
         }
+    } else if (cardSelectScreen) {
+        ChooseCard(
+            cards = cardsRead!!,
+            onCardSelected = { card ->
+                cardSelectScreen = false
+                scanScreenController.flushCharacter(card.id)
+            }
+        )
     } else {
         ChooseConnectOption(
             onClickRead = when {
@@ -290,11 +321,12 @@ fun ScanScreenPreview() {
             ) {
 
             }
-            override fun onClickRead(secrets: Secrets, onComplete: ()->Unit) {}
+            override fun flushCharacter(cardId: Long) {}
+            override fun onClickRead(secrets: Secrets, onComplete: ()->Unit, onMultipleCards: (List<Card>) -> Unit) {}
             override fun onClickCheckCard(secrets: Secrets, nfcCharacter: NfcCharacter, onComplete: () -> Unit) {}
             override fun onClickWrite(secrets: Secrets, nfcCharacter: NfcCharacter, onComplete: () -> Unit) {}
             override fun cancelRead() {}
-            override fun characterFromNfc(nfcCharacter: NfcCharacter): String { return "" }
+            override fun characterFromNfc(nfcCharacter: NfcCharacter, onMultipleCards: (List<Card>, NfcCharacter) -> Unit): String { return "" }
             override suspend fun characterToNfc(characterId: Long): NfcCharacter? { return null }
         },
         characterId = null,

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

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

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

@@ -11,8 +11,11 @@ import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.lifecycle.lifecycleScope
 import com.github.cfogrady.vbnfc.TagCommunicator
+import com.github.cfogrady.vbnfc.be.BENfcCharacter
 import com.github.cfogrady.vbnfc.data.NfcCharacter
+import com.github.cfogrady.vbnfc.vb.VBNfcCharacter
 import com.github.nacabaro.vbhelper.ActivityLifecycleListener
+import com.github.nacabaro.vbhelper.domain.card.Card
 import com.github.nacabaro.vbhelper.screens.scanScreen.converters.FromNfcConverter
 import com.github.nacabaro.vbhelper.screens.scanScreen.converters.ToNfcConverter
 import com.github.nacabaro.vbhelper.source.getCryptographicTransformerMap
@@ -29,7 +32,7 @@ class ScanScreenControllerImpl(
     private val registerActivityLifecycleListener: (String, ActivityLifecycleListener)->Unit,
     private val unregisterActivityLifecycleListener: (String)->Unit,
 ): ScanScreenController {
-
+    private var lastScannedCharacter: NfcCharacter? = null
     private val nfcAdapter: NfcAdapter
 
     init {
@@ -41,10 +44,14 @@ class ScanScreenControllerImpl(
         checkSecrets()
     }
 
-    override fun onClickRead(secrets: Secrets, onComplete: ()->Unit) {
+    override fun onClickRead(secrets: Secrets, onComplete: ()->Unit, onMultipleCards: (List<Card>) -> Unit) {
         handleTag(secrets) { tagCommunicator ->
             val character = tagCommunicator.receiveCharacter()
-            val resultMessage = characterFromNfc(character)
+            val resultMessage = characterFromNfc(character) { cards, nfcCharacter ->
+                lastScannedCharacter = nfcCharacter
+                onMultipleCards(cards)
+
+            }
             onComplete.invoke()
             resultMessage
         }
@@ -118,7 +125,15 @@ class ScanScreenControllerImpl(
     ) {
         handleTag(secrets) { tagCommunicator ->
             try {
-                tagCommunicator.sendCharacter(nfcCharacter)
+                if (nfcCharacter is VBNfcCharacter) {
+                    Log.d("SendCharacter", "VBNfcCharacter")
+                    val castNfcCharacter: VBNfcCharacter = nfcCharacter
+                    tagCommunicator.sendCharacter(castNfcCharacter)
+                } else if (nfcCharacter is BENfcCharacter) {
+                    Log.d("SendCharacter", "BENfcCharacter")
+                    val castNfcCharacter: BENfcCharacter = nfcCharacter
+                    tagCommunicator.sendCharacter(castNfcCharacter)
+                }
                 onComplete.invoke()
                 "Sent character successfully!"
             } catch (e: Throwable) {
@@ -146,17 +161,36 @@ class ScanScreenControllerImpl(
         componentActivity.startActivity(Intent(Settings.ACTION_WIRELESS_SETTINGS))
     }
 
-    override fun characterFromNfc(nfcCharacter: NfcCharacter): String {
+    override fun characterFromNfc(
+        nfcCharacter: NfcCharacter,
+        onMultipleCards: (List<Card>, NfcCharacter) -> Unit
+    ): String {
         val nfcConverter = FromNfcConverter(
             componentActivity = componentActivity
         )
-        return nfcConverter.addCharacter(nfcCharacter)
+        return nfcConverter.addCharacter(nfcCharacter, onMultipleCards)
     }
 
     override suspend fun characterToNfc(characterId: Long): NfcCharacter {
         val nfcGenerator = ToNfcConverter(
             componentActivity = componentActivity
         )
-        return nfcGenerator.characterToNfc(characterId)
+
+        val character = nfcGenerator.characterToNfc(characterId)
+        Log.d("CharacterType", character.toString())
+        return character
+    }
+
+    override fun flushCharacter(cardId: Long) {
+        val nfcConverter = FromNfcConverter(
+            componentActivity = componentActivity
+        )
+
+        componentActivity.lifecycleScope.launch(Dispatchers.IO) {
+            if (lastScannedCharacter != null) {
+                nfcConverter.addCharacterUsingCard(lastScannedCharacter!!, cardId)
+                lastScannedCharacter = null
+            }
+        }
     }
 }

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

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

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

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

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

@@ -23,15 +23,68 @@ class FromNfcConverter (
     private val database = application.container.db
     
     
-
-    fun addCharacter(nfcCharacter: NfcCharacter): String {
+    fun addCharacterUsingCard(
+        nfcCharacter: NfcCharacter,
+        cardId: Long
+    ): String {
         val cardData = database
             .cardDao()
-            .getDimById(nfcCharacter.dimId.toInt())
+            .getCardById(cardId)
 
-        if (cardData == null)
+        if (cardData == null) {
+            return "Card not found"
+        }
+
+        return insertCharacter(nfcCharacter, cardData)
+    }
+    
+
+    fun addCharacter(
+        nfcCharacter: NfcCharacter,
+        onMultipleCards: (List<Card>, NfcCharacter) -> Unit
+    ): String {
+        val appReservedCardId = nfcCharacter
+            .appReserved2[0].toLong()
+
+        var cardData: Card? =  null
+
+        if (appReservedCardId != 0L) {
+            val fetchedCard = database
+                .cardDao()
+                .getCardById(appReservedCardId)
+
+            if (fetchedCard == null) {
+                return "Card not found"
+            } else if (fetchedCard.cardId == nfcCharacter.dimId.toInt()) {
+                cardData = fetchedCard
+            }
+        }
+
+        if (cardData == null) {
+            val allCards = database
+                .cardDao()
+                .getCardByCardId(nfcCharacter.dimId.toInt())
+
+            if (allCards.isEmpty())
                 return "Card not found"
 
+            if (allCards.size > 1) {
+                onMultipleCards(allCards, nfcCharacter)
+                return "Multiple cards found"
+            }
+
+            cardData = allCards[0]
+        }
+
+        return insertCharacter(nfcCharacter, cardData)
+    }
+
+
+
+    private fun insertCharacter(
+        nfcCharacter: NfcCharacter,
+        cardData: Card
+    ): String {
         val cardCharData = database
             .characterDao()
             .getCharacterByMonIndex(nfcCharacter.charIndex.toInt(), cardData.id)

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

@@ -59,7 +59,7 @@ class ToNfcConverter(
             .userCharacterDao()
             .getVbData(characterId)
 
-        val paddedTransformationArray = generateTransformationHistory(characterId)
+        val paddedTransformationArray = generateTransformationHistory(characterId, 9)
 
         val watchSpecialMissions = generateSpecialMissionsArray(characterId)
 
@@ -84,7 +84,7 @@ class ToNfcConverter(
             transformationHistory = paddedTransformationArray,
             vitalHistory = generateVitalsHistoryArray(characterId),
             appReserved1 = ByteArray(12) {0},
-            appReserved2 = Array(3) {0u},
+            appReserved2 = generateUShortAppReserved(userCharacter),
             generation = vbData.generation.toUShort(),
             totalTrophies = vbData.totalTrophies.toUShort(),
             specialMissions = watchSpecialMissions.toTypedArray()
@@ -94,6 +94,23 @@ class ToNfcConverter(
     }
 
 
+    private suspend fun generateUShortAppReserved(
+        userCharacter: UserCharacter
+    ): Array<UShort> {
+        val cardData = database
+            .cardDao()
+            .getCardByCharacterId(userCharacter.id)
+
+        val appReserved = Array<UShort>(3) {
+            0u
+        }
+
+        appReserved[0] = cardData.id.toUShort()
+
+        return appReserved
+    }
+
+
 
     private suspend fun generateSpecialMissionsArray(
         characterId: Long
@@ -218,7 +235,8 @@ class ToNfcConverter(
 
 
     private suspend fun generateTransformationHistory(
-        characterId: Long
+        characterId: Long,
+        length: Int = 8
     ): Array<NfcCharacter.Transformation> {
         val transformationHistory = database
             .userCharacterDao()
@@ -242,7 +260,7 @@ class ToNfcConverter(
                 )
             }.toTypedArray()
 
-        val paddedTransformationArray = padTransformationArray(transformationHistory)
+        val paddedTransformationArray = padTransformationArray(transformationHistory, length)
 
         return paddedTransformationArray
     }
@@ -250,13 +268,14 @@ class ToNfcConverter(
 
 
     private fun padTransformationArray(
-        transformationArray: Array<NfcCharacter.Transformation>
+        transformationArray: Array<NfcCharacter.Transformation>,
+        length: Int
     ): Array<NfcCharacter.Transformation> {
         if (transformationArray.size >= 8) {
             return transformationArray
         }
 
-        val paddedArray = Array(8) {
+        val paddedArray = Array(length) {
             NfcCharacter.Transformation(
                 toCharIndex = 255u,
                 year = 65535u,

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

@@ -35,6 +35,7 @@ fun CreditsScreen(
             SettingsEntry(title = "cfogrady", description = "Developed vb-lib-nfc and part of this application.") { }
             SettingsEntry(title = "nacabaro", description = "Developed this application.") { }
             SettingsEntry(title = "lightheel", description = "Developing the battling part for this application, including server. Still in the works.") { }
+            SettingsEntry(title = "shvstrz", description = "Designing the app icon in SVG.") { }
         }
     }
 }

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

@@ -129,7 +129,7 @@ class SettingsScreenControllerImpl(
 
                 val dimId = database
                     .cardDao()
-                    .insertNewDim(cardModel)
+                    .insertNewCard(cardModel)
 
                 val cardProgress = CardProgress(
                     cardId = dimId,

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

@@ -2,7 +2,10 @@ package com.github.nacabaro.vbhelper.source
 
 import com.github.nacabaro.vbhelper.database.AppDatabase
 import com.github.nacabaro.vbhelper.domain.device_data.BECharacterData
+import com.github.nacabaro.vbhelper.domain.device_data.SpecialMissions
+import com.github.nacabaro.vbhelper.domain.device_data.VBCharacterData
 import com.github.nacabaro.vbhelper.dtos.CharacterDtos
+import com.github.nacabaro.vbhelper.dtos.ItemDtos
 
 class StorageRepository (
     private val db: AppDatabase
@@ -23,6 +26,18 @@ class StorageRepository (
         return db.userCharacterDao().getTransformationHistory(characterId)
     }
 
+    suspend fun getCharacterVbData(id: Long): VBCharacterData {
+        return db.userCharacterDao().getVbData(id)
+    }
+
+    suspend fun getSpecialMissions(id: Long): List<SpecialMissions> {
+        return db.userCharacterDao().getSpecialMissions(id)
+    }
+
+    suspend fun getItem(id: Long): ItemDtos.ItemsWithQuantities {
+        return db.itemDao().getItem(id)
+    }
+
     suspend fun getActiveCharacter(): CharacterDtos.CharacterWithSprites? {
         return db.userCharacterDao().getActiveCharacter()
     }
@@ -34,4 +49,12 @@ class StorageRepository (
     suspend fun getAdventureCharacters(): List<CharacterDtos.AdventureCharacterWithSprites> {
         return db.adventureDao().getAdventureCharacters()
     }
+
+    suspend fun getBECharacters(): List<CharacterDtos.CharacterWithSprites> {
+        return db.userCharacterDao().getBECharacters()
+    }
+
+    suspend fun getVBCharacters(): List<CharacterDtos.CharacterWithSprites> {
+        return db.userCharacterDao().getVBDimCharacters()
+    }
 }

app/src/main/res/drawable/baseline_edit_24.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M200,760h57l391,-391 -57,-57 -391,391v57ZM120,840v-170l528,-527q12,-11 26.5,-17t30.5,-6q16,0 31,6t26,18l55,56q12,11 17.5,26t5.5,30q0,16 -5.5,30.5T817,313L290,840L120,840ZM760,256 L704,200 760,256ZM619,341 L591,312 648,369 619,341Z"
+      android:fillColor="#000000"/>
+</vector>

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -1,30 +1,39 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <group android:scaleX="0.79"
+      android:scaleY="0.79"
+      android:translateX="53.76"
+      android:translateY="53.76">
+    <group>
+      <clip-path
+          android:pathData="M0,0h512v512h-512z"/>
       <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
+          android:pathData="M0,0h512v512h-512z"
+          android:fillColor="#000000"/>
+      <path
+          android:pathData="M164,107L186.19,107L186.19,129C186.19,132.86 189.32,136 193.19,136L219,136L235.95,163.3C236.53,164.24 237.9,165 239,165L267,165C268.1,165 269.47,164.24 270.05,163.3L287,136L312.8,136C316.66,136 319.8,132.86 319.8,129L319.8,107L313.1,107L313.1,128C313.1,129.1 312.2,130 311.1,130L283,130L267.04,156.29C266.46,157.23 265.1,158 264,158L242,158C240.9,158 239.54,157.23 238.96,156.29L223,130L194.94,130C193.83,130 192.94,129.1 192.94,128L192.94,107L217.75,107L229,92L277,92L288,107L342,107L342,405L319.81,405L319.81,383C319.81,379.14 316.68,376 312.81,376L287,376L270.05,348.7C269.47,347.76 268.1,347 267,347L239,347C237.9,347 236.53,347.76 235.95,348.7L219,376L193.2,376C189.34,376 186.2,379.14 186.2,383L186.2,405L192.94,405L192.94,384C192.94,382.9 193.83,382 194.94,382L223,382L238.96,355.71C239.54,354.77 240.9,354 242,354L264,354C265.1,354 266.46,354.77 267.04,355.71L283,382L311.06,382C312.17,382 313.06,382.9 313.06,384L313.06,405L288.25,405L277,420L229,420L218,405L164,405L164,107Z"
+          android:fillColor="#EBEBEB"/>
+      <path
+          android:pathData="M212.61,181.5L299.39,181.5C306.15,181.5 311.63,186.98 311.63,193.74L311.63,318.26C311.63,325.02 306.15,330.5 299.39,330.5L212.61,330.5C205.85,330.5 200.37,325.02 200.37,318.26L200.37,193.74C200.37,186.98 205.85,181.5 212.61,181.5Z"
+          android:fillColor="#000000"
+          android:strokeColor="#00000000"/>
+      <path
+          android:pathData="M0,249L192.88,249L214,208L232.38,249L253.69,171L274.85,255L296,194L310.27,249L512,249L512,269L296,269L294,261L274.85,331L262.59,283.5L253.69,249L232.38,316L213.38,255L205.75,269L0,269L0,249Z"
+          android:fillColor="#EBEBEB"/>
+      <group>
+        <clip-path
+            android:pathData="M-1024,-1024h2048v2048h-2048zM0,249L192.88,249L214,208L232.38,249L253.69,171L274.85,255L296,194L310.27,249L512,249L512,269L296,269L294,261L274.85,331L262.59,283.5L253.69,249L232.38,316L213.38,255L205.75,269L0,269L0,249Z"/>
+        <path
+            android:pathData="M0,249L192.88,249L214,208L232.38,249L253.69,171L274.85,255L296,194L310.27,249L512,249L512,269L296,269L294,261L274.85,331L262.59,283.5L253.69,249L232.38,316L213.38,255L205.75,269L0,269L0,249Z"
+            android:strokeLineJoin="round"
+            android:strokeWidth="10"
+            android:fillColor="#EBEBEB"
+            android:strokeColor="#000000"
+            android:strokeLineCap="square"/>
+      </group>
+    </group>
+  </group>
 </vector>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#000000</color>
+</resources>