Create a small test widget, I just wanted to learn hoe Jetpack Compose Glance works?

app/build.gradle.kts

@@ -15,7 +15,7 @@ android {
         minSdk = 28
         targetSdk = 35
         versionCode = 1
-        versionName = "Alpha 0.5.2"
+        versionName = "Alpha 0.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -91,4 +91,7 @@ dependencies {
     implementation("com.google.android.material:material:1.2.0")
     implementation(libs.protobuf.javalite)
     implementation("androidx.compose.material:material")
+    implementation("androidx.glance:glance:1.1.1")
+    implementation("androidx.glance:glance-appwidget:1.1.1")
+    implementation("androidx.work:work-runtime-ktx:2.9.0")
 }

app/src/main/AndroidManifest.xml

@@ -27,6 +27,15 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <receiver android:name=".widget.CharacterDisplayWidgetReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_info" />
+        </receiver>
     </application>
 
 </manifest>

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

@@ -14,8 +14,6 @@ import com.github.nacabaro.vbhelper.screens.itemsScreen.ItemsScreenControllerImp
 import com.github.nacabaro.vbhelper.screens.scanScreen.ScanScreenControllerImpl
 import com.github.nacabaro.vbhelper.screens.settingsScreen.SettingsScreenControllerImpl
 import com.github.nacabaro.vbhelper.screens.adventureScreen.AdventureScreenControllerImpl
-import com.github.nacabaro.vbhelper.screens.cardScreen.CardScreenControllerImpl
-import com.github.nacabaro.vbhelper.screens.spriteViewer.SpriteViewerControllerImpl
 import com.github.nacabaro.vbhelper.screens.storageScreen.StorageScreenControllerImpl
 import com.github.nacabaro.vbhelper.ui.theme.VBHelperTheme
 
@@ -47,8 +45,6 @@ class MainActivity : ComponentActivity() {
         val adventureScreenController = AdventureScreenControllerImpl(this)
         val storageScreenController = StorageScreenControllerImpl(this)
         val homeScreenController = HomeScreenControllerImpl(this)
-        val spriteViewerController = SpriteViewerControllerImpl(this)
-        val cardScreenController = CardScreenControllerImpl(this)
 
         super.onCreate(savedInstanceState)
 
@@ -62,9 +58,7 @@ class MainActivity : ComponentActivity() {
                     itemsScreenController = itemsScreenController,
                     adventureScreenController = adventureScreenController,
                     homeScreenController = homeScreenController,
-                    storageScreenController = storageScreenController,
+                    storageScreenController = storageScreenController
-                    spriteViewerController = spriteViewerController,
-                    cardScreenController = cardScreenController
                 )
             }
         }
@@ -96,9 +90,8 @@ class MainActivity : ComponentActivity() {
         adventureScreenController: AdventureScreenControllerImpl,
         storageScreenController: StorageScreenControllerImpl,
         homeScreenController: HomeScreenControllerImpl,
-        spriteViewerController: SpriteViewerControllerImpl,
+
-        cardScreenController: CardScreenControllerImpl
+        ) {
-    ) {
         AppNavigation(
             applicationNavigationHandlers = AppNavigationHandlers(
                 settingsScreenController,
@@ -106,9 +99,7 @@ class MainActivity : ComponentActivity() {
                 itemsScreenController,
                 adventureScreenController,
                 storageScreenController,
-                homeScreenController,
+                homeScreenController
-                spriteViewerController,
-                cardScreenController
             )
         )
     }

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

@@ -5,14 +5,11 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -31,9 +28,6 @@ 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
@@ -121,89 +115,3 @@ 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/DexDimEntry.kt

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

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

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

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

@@ -23,15 +23,14 @@ interface AdventureDao {
             uc.*,
             c.stage,
             c.attribute,
-            s.spriteIdle1 AS spriteIdle,
+            c.sprite1 AS spriteIdle,
-            s.width AS spriteWidth,
+            c.spritesWidth AS spriteWidth,
-            s.height AS spriteHeight,
+            c.spritesHeight AS spriteHeight,
             d.isBEm as isBemCard,
             a.finishesAdventure AS finishesAdventure,
             a.originalDuration AS originalTimeInMinutes
         FROM UserCharacter uc
         JOIN Character c ON uc.charId = c.id
-        JOIN Sprite s ON s.id = c.spriteId
         JOIN Card d ON c.dimId = d.id
         JOIN Adventure a ON uc.id = a.characterId
     """)

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

@@ -1,34 +0,0 @@
-package com.github.nacabaro.vbhelper.daos
-
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import com.github.nacabaro.vbhelper.domain.card.Card
-
-@Dao
-interface CardDao {
-    @Insert(onConflict = OnConflictStrategy.IGNORE)
-    suspend fun insertNewCard(card: Card): Long
-
-    @Query("SELECT * FROM Card WHERE cardId = :id")
-    fun getCardByCardId(id: Int): List<Card>
-
-    @Query("SELECT * FROM Card WHERE id = :id")
-    fun getCardById(id: Long): Card?
-
-    @Query("""
-        SELECT ca.* 
-        FROM Card ca
-        JOIN 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/CardProgressDao.kt

@@ -1,17 +0,0 @@
-package com.github.nacabaro.vbhelper.daos
-
-import androidx.room.Dao
-import androidx.room.Query
-import androidx.room.Upsert
-import com.github.nacabaro.vbhelper.domain.card.CardProgress
-
-@Dao
-interface CardProgressDao {
-    @Upsert
-    fun updateDimProgress(vararg cardProgresses: CardProgress)
-
-    @Query(
-        "SELECT currentStage FROM CardProgress WHERE cardId = :cardId"
-    )
-    fun getCardProgress(cardId: Int): Int
-}

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

@@ -4,7 +4,7 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.Query
 import com.github.nacabaro.vbhelper.domain.characters.Character
-import com.github.nacabaro.vbhelper.domain.characters.Sprite
+import com.github.nacabaro.vbhelper.domain.Sprites
 import com.github.nacabaro.vbhelper.dtos.CharacterDtos
 
 @Dao
@@ -12,24 +12,40 @@ interface CharacterDao {
     @Insert
     suspend fun insertCharacter(vararg characterData: Character)
 
+    @Query("SELECT * FROM Character")
+    suspend fun getAllCharacters(): List<Character>
+
+    @Query("SELECT * FROM Character WHERE dimId = :dimId")
+    suspend fun getCharacterByDimId(dimId: Int): List<Character>
+
     @Query("SELECT * FROM Character WHERE monIndex = :monIndex AND dimId = :dimId LIMIT 1")
     fun getCharacterByMonIndex(monIndex: Int, dimId: Long): Character
 
     @Insert
-    suspend fun insertSprite(vararg sprite: Sprite)
+    suspend fun insertSprite(vararg sprite: Sprites)
+
+    @Query("SELECT * FROM Sprites")
+    suspend fun getAllSprites(): List<Sprites>
 
     @Query(
         """
         SELECT 
-            d.cardId as cardId,
+            d.dimId as cardId,
-            c.monIndex as charId,
+            c.monIndex as charId
-            c.stage as stage,
-            c.attribute as attribute
         FROM Character c
         JOIN UserCharacter uc ON c.id = uc.charId
         JOIN Card d ON c.dimId = d.id
-        WHERE c.id = :charId
+        WHERE uc.id = :charId
     """
     )
-    suspend fun getCharacterInfo(charId: Long): CharacterDtos.CardCharacterInfo
+    suspend fun getCharacterInfo(charId: Long): CharacterDtos.DiMInfo
+
+    @Query("""
+        INSERT INTO TransformationHistory(monId, stageId, transformationDate)
+        VALUES 
+            (:monId, 
+            (SELECT id FROM Character WHERE monIndex = :stage AND dimId = :dimId),
+            :transformationDate)
+    """)
+    fun insertTransformation(monId: Long, stage: Int, dimId: Long, transformationDate: Long)
 }

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

@@ -19,12 +19,11 @@ interface DexDao {
     @Query("""
         SELECT 
             c.id AS id,
-            s.spriteIdle1 AS spriteIdle,
+            c.sprite1 AS spriteIdle,
-            s.width AS spriteWidth,
+            c.spritesWidth AS spriteWidth,
-            s.height AS spriteHeight,
+            c.spritesHeight AS spriteHeight,
             d.discoveredOn AS discoveredOn
-        FROM Character c
+        FROM character c
-        JOIN Sprite s ON c.spriteId = s.id
         LEFT JOIN dex d ON c.id = d.id
         WHERE c.dimId = :cardId
     """)

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

@@ -0,0 +1,19 @@
+package com.github.nacabaro.vbhelper.daos
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import com.github.nacabaro.vbhelper.domain.characters.Card
+
+@Dao
+interface DiMDao {
+    @Insert(onConflict = OnConflictStrategy.IGNORE)
+    suspend fun insertNewDim(card: Card): Long
+
+    @Query("SELECT * FROM Card")
+    suspend fun getAllDims(): List<Card>
+
+    @Query("SELECT * FROM Card WHERE dimId = :id")
+    fun getDimById(id: Int): Card?
+}

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

@@ -0,0 +1,11 @@
+package com.github.nacabaro.vbhelper.daos
+
+import androidx.room.Dao
+import androidx.room.Upsert
+import com.github.nacabaro.vbhelper.domain.DimProgress
+
+@Dao
+interface DiMProgressDao {
+    @Upsert
+    suspend fun updateDimProgress(vararg dimProgress: DimProgress)
+}

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

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

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

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

@@ -1,16 +0,0 @@
-package com.github.nacabaro.vbhelper.daos
-
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import com.github.nacabaro.vbhelper.domain.characters.Sprite
-
-@Dao
-interface SpriteDao {
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertSprite(sprite: Sprite): Long
-
-    @Query("SELECT * FROM Sprite")
-    suspend fun getAllSprites(): List<Sprite>
-}

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

@@ -8,10 +8,7 @@ import androidx.room.Upsert
 import com.github.nacabaro.vbhelper.domain.characters.Character
 import com.github.nacabaro.vbhelper.domain.device_data.UserCharacter
 import com.github.nacabaro.vbhelper.domain.device_data.BECharacterData
-import com.github.nacabaro.vbhelper.domain.device_data.SpecialMissions
 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
 
 @Dao
@@ -22,9 +19,6 @@ interface UserCharacterDao {
     @Insert
     fun insertBECharacterData(characterData: BECharacterData)
 
-    @Insert
-    fun insertVBCharacterData(characterData: VBCharacterData)
-
     @Upsert
     fun updateCharacter(character: UserCharacter)
 
@@ -34,23 +28,19 @@ interface UserCharacterDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insertTransformationHistory(vararg transformationHistory: TransformationHistory)
 
-    @Upsert
-    fun insertSpecialMissions(vararg specialMissions: SpecialMissions)
-
     @Query("""
         SELECT 
             c.id AS id,
-            s.spriteIdle1 AS spriteIdle,
+            c.sprite1 AS spriteIdle,
-            s.width AS spriteWidth,
+            c.spritesWidth AS spriteWidth,
-            s.height AS spriteHeight,
+            c.spritesHeight AS spriteHeight,
             c.monIndex AS monIndex, 
             t.transformationDate AS transformationDate
         FROM TransformationHistory t 
         JOIN Character c ON c.id = t.stageId
-        JOIN Sprite s ON s.id = c.spriteId
         WHERE monId = :monId
     """)
-    suspend fun getTransformationHistory(monId: Long): List<CharacterDtos.TransformationHistory>?
+    fun getTransformationHistory(monId: Long): List<CharacterDtos.TransformationHistory>?
 
     @Query(
         """
@@ -58,10 +48,9 @@ interface UserCharacterDao {
             uc.*,
             c.stage,
             c.attribute,
-            s.spriteIdle1 AS spriteIdle,
+            c.sprite1 AS spriteIdle,
-            s.spriteIdle2 AS spriteIdle2,
+            c.spritesWidth AS spriteWidth,
-            s.width AS spriteWidth,
+            c.spritesHeight AS spriteHeight,
-            s.height AS spriteHeight,
             c.name as nameSprite,
             c.nameWidth as nameSpriteWidth,
             c.nameHeight as nameSpriteHeight,
@@ -69,8 +58,7 @@ interface UserCharacterDao {
             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 Card d ON c.dimId = d.id
-        JOIN Sprite s ON s.id = c.spriteId
         LEFT JOIN Adventure a ON a.characterId = uc.id
         """
     )
@@ -82,10 +70,9 @@ interface UserCharacterDao {
             uc.*,
             c.stage,
             c.attribute,
-            s.spriteIdle1 AS spriteIdle,
+            c.sprite1 AS spriteIdle,
-            s.spriteIdle2 AS spriteIdle2,
+            c.spritesWidth AS spriteWidth,
-            s.width AS spriteWidth,
+            c.spritesHeight AS spriteHeight,
-            s.height AS spriteHeight,
             c.name as nameSprite,
             c.nameWidth as nameSpriteWidth,
             c.nameHeight as nameSpriteHeight,
@@ -94,7 +81,6 @@ interface UserCharacterDao {
         FROM UserCharacter uc
         JOIN Character c ON uc.charId = c.id
         JOIN Card d ON c.dimId = d.id
-        JOIN Sprite s ON s.id = c.spriteId
         LEFT JOIN Adventure a ON a.characterId = uc.id
         WHERE uc.id = :id
     """)
@@ -106,22 +92,15 @@ interface UserCharacterDao {
     @Query("SELECT * FROM BECharacterData WHERE id = :id")
     suspend fun getBeData(id: Long): BECharacterData
 
-    @Query("SELECT * FROM VBCharacterData WHERE id = :id")
-    suspend fun getVbData(id: Long): VBCharacterData
-
-    @Query("SELECT * FROM SpecialMissions WHERE characterId = :id")
-    suspend fun getSpecialMissions(id: Long): List<SpecialMissions>
-
     @Query(
         """
         SELECT
             uc.*,
             c.stage,
             c.attribute,
-            s.spriteIdle1 AS spriteIdle,
+            c.sprite1 AS spriteIdle,
-            s.spriteIdle2 AS spriteIdle2,
+            c.spritesWidth AS spriteWidth,
-            s.width AS spriteWidth,
+            c.spritesHeight AS spriteHeight,
-            s.height AS spriteHeight,
             c.name as nameSprite,
             c.nameWidth as nameSpriteWidth,
             c.nameHeight as nameSpriteHeight,
@@ -130,7 +109,6 @@ interface UserCharacterDao {
         FROM UserCharacter uc
         JOIN Character c ON uc.charId = c.id
         JOIN Card d ON c.dimId = d.id
-        JOIN Sprite s ON s.id = c.spriteId
         LEFT JOIN Adventure a ON a.characterId = uc.id
         WHERE uc.isActive = 1
         LIMIT 1
@@ -156,70 +134,4 @@ interface UserCharacterDao {
         """
     )
     suspend fun getCharacterInfo(charId: Long): Character
-
-
-    @Query("""
-        INSERT INTO TransformationHistory(monId, stageId, transformationDate)
-        VALUES 
-            (:monId, 
-            (SELECT id FROM Character WHERE monIndex = :stage AND dimId = :dimId),
-            :transformationDate)
-    """)
-    fun insertTransformation(monId: Long, stage: Int, dimId: Long, transformationDate: Long)
-
-    @Upsert
-    fun insertVitals(vararg vitalsHistory: VitalsHistory)
-
-    @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

@@ -5,52 +5,38 @@ import androidx.room.RoomDatabase
 import com.github.nacabaro.vbhelper.daos.AdventureDao
 import com.github.nacabaro.vbhelper.daos.CharacterDao
 import com.github.nacabaro.vbhelper.daos.DexDao
-import com.github.nacabaro.vbhelper.daos.CardDao
+import com.github.nacabaro.vbhelper.daos.DiMDao
-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
-import com.github.nacabaro.vbhelper.domain.card.Card
+import com.github.nacabaro.vbhelper.domain.characters.Card
-import com.github.nacabaro.vbhelper.domain.card.CardProgress
+import com.github.nacabaro.vbhelper.domain.Sprites
-import com.github.nacabaro.vbhelper.domain.characters.Sprite
 import com.github.nacabaro.vbhelper.domain.characters.Adventure
 import com.github.nacabaro.vbhelper.domain.characters.Dex
 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.TransformationHistory
 import com.github.nacabaro.vbhelper.domain.device_data.UserCharacter
-import com.github.nacabaro.vbhelper.domain.device_data.VBCharacterData
-import com.github.nacabaro.vbhelper.domain.device_data.VitalsHistory
 import com.github.nacabaro.vbhelper.domain.items.Items
 
 @Database(
     version = 1,
     entities = [
         Card::class,
-        CardProgress::class,
         Character::class,
-        Sprite::class,
+        Sprites::class,
         UserCharacter::class,
         BECharacterData::class,
-        VBCharacterData::class,
-        SpecialMissions::class,
         TransformationHistory::class,
-        VitalsHistory::class,
         Dex::class,
         Items::class,
         Adventure::class
     ]
 )
 abstract class AppDatabase : RoomDatabase() {
-    abstract fun cardDao(): CardDao
+    abstract fun dimDao(): DiMDao
-    abstract fun cardProgressDao(): CardProgressDao
     abstract fun characterDao(): CharacterDao
     abstract fun userCharacterDao(): UserCharacterDao
     abstract fun dexDao(): DexDao
     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/DimProgress.kt

@@ -0,0 +1,29 @@
+package com.github.nacabaro.vbhelper.domain
+
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.PrimaryKey
+import com.github.nacabaro.vbhelper.domain.characters.Card
+
+@Entity(
+    foreignKeys = [
+        ForeignKey(
+            entity = User::class,
+            parentColumns = ["id"],
+            childColumns = ["userId"],
+            onDelete = ForeignKey.CASCADE
+        ),
+        ForeignKey(
+            entity = Card::class,
+            parentColumns = ["id"],
+            childColumns = ["dimId"],
+            onDelete = ForeignKey.CASCADE
+        )
+    ]
+)
+data class DimProgress(
+    @PrimaryKey val dimId: Int,
+    @PrimaryKey val userId: Int,
+    val currentStage: Int,
+    val unlocked: Boolean
+)

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

@@ -0,0 +1,12 @@
+package com.github.nacabaro.vbhelper.domain
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity
+data class Sprites(
+    @PrimaryKey(autoGenerate = true) val id : Int,
+    val sprite: ByteArray,
+    val width: Int,
+    val height: Int
+)

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

@@ -1,21 +0,0 @@
-package com.github.nacabaro.vbhelper.domain.card
-
-import androidx.room.Entity
-import androidx.room.ForeignKey
-import androidx.room.PrimaryKey
-
-@Entity(
-    foreignKeys = [
-        ForeignKey(
-            entity = Card::class,
-            parentColumns = ["id"],
-            childColumns = ["cardId"],
-            onDelete = ForeignKey.CASCADE
-        )
-    ]
-)
-data class CardProgress(
-    @PrimaryKey val cardId: Long,
-    val currentStage: Int,
-    val unlocked: Boolean
-)

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

@@ -1,4 +1,4 @@
-package com.github.nacabaro.vbhelper.domain.card
+package com.github.nacabaro.vbhelper.domain.characters
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
@@ -7,7 +7,7 @@ import androidx.room.PrimaryKey
 data class Card(
     @PrimaryKey(autoGenerate = true)
     val id: Long = 0,
-    val cardId: Int,
+    val dimId: Int,
     val logo: ByteArray,
     val logoWidth: Int,
     val logoHeight: Int,

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

@@ -4,7 +4,6 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 import androidx.room.ForeignKey
 import com.github.cfogrady.vbnfc.data.NfcCharacter
-import com.github.nacabaro.vbhelper.domain.card.Card
 
 @Entity(
     foreignKeys = [
@@ -13,25 +12,17 @@ import com.github.nacabaro.vbhelper.domain.card.Card
             parentColumns = ["id"],
             childColumns = ["dimId"],
             onDelete = ForeignKey.CASCADE
-        ),
-        ForeignKey(
-            entity = Sprite::class,
-            parentColumns = ["id"],
-            childColumns = ["spriteId"],
-            onDelete = ForeignKey.CASCADE
         )
     ]
 )
-
 /*
- * Character represents a character on a card. There should only be one of these per dimId
+ * Character represents a character on a DIM card. There should only be one of these per dimId
  * and monIndex.
  * TODO: Customs will mean this should be unique per cardName and monIndex
  */
 data class Character (
     @PrimaryKey(autoGenerate = true) val id: Long = 0,
     val dimId: Long,
-    val spriteId: Long,
     val monIndex: Int,
     val name: ByteArray,
     val stage: Int, // These should be replaced with enums
@@ -39,6 +30,10 @@ data class Character (
     val baseHp: Int,
     val baseBp: Int,
     val baseAp: Int,
+    val sprite1: ByteArray,
+    val sprite2: ByteArray,
     val nameWidth: Int,
-    val nameHeight: Int
+    val nameHeight: Int,
+    val spritesWidth: Int,
+    val spritesHeight: Int
 )

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

@@ -1,23 +0,0 @@
-package com.github.nacabaro.vbhelper.domain.characters
-
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity
-data class Sprite(
-    @PrimaryKey(autoGenerate = true) val id : Int = 0,
-    val spriteIdle1: ByteArray,
-    val spriteIdle2: ByteArray,
-    val spriteWalk1: ByteArray,
-    val spriteWalk2: ByteArray,
-    val spriteRun1: ByteArray,
-    val spriteRun2: ByteArray,
-    val spriteTrain1: ByteArray,
-    val spriteTrain2: ByteArray,
-    val spriteHappy: ByteArray,
-    val spriteSleep: ByteArray,
-    val spriteAttack: ByteArray,
-    val spriteDodge: ByteArray,
-    val width: Int,
-    val height: Int
-)

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

@@ -1,28 +0,0 @@
-package com.github.nacabaro.vbhelper.domain.device_data
-
-import androidx.room.Entity
-import androidx.room.ForeignKey
-import androidx.room.PrimaryKey
-import com.github.cfogrady.vbnfc.vb.SpecialMission
-
-@Entity(
-    foreignKeys = [
-        ForeignKey(
-            entity = UserCharacter::class,
-            parentColumns = ["id"],
-            childColumns = ["characterId"],
-            onDelete = ForeignKey.CASCADE
-        )
-    ]
-)
-data class SpecialMissions (
-    @PrimaryKey(autoGenerate = true) var id: Long = 0,
-    var characterId: Long,
-    var goal: Int,
-    val watchId: Int,
-    val progress: Int,
-    val status: SpecialMission.Status,
-    val timeElapsedInMinutes: Int,
-    val timeLimitInMinutes: Int,
-    val missionType: SpecialMission.Type
-)

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

@@ -24,6 +24,7 @@ data class UserCharacter (
     @PrimaryKey(autoGenerate = true) val id: Long = 0,
     var charId: Long,
     var ageInDays: Int,
+    var nextAdventureMissionStage: Int, // next adventure mission stage on the character's dim
     var mood: Int,
     var vitalPoints: Int,
     var transformationCountdown: Int,

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

@@ -1,21 +1,4 @@
 package com.github.nacabaro.vbhelper.domain.device_data
 
-import androidx.room.Entity
+class VBCharacterData {
-import androidx.room.ForeignKey
+}
-import androidx.room.PrimaryKey
-
-@Entity(
-    foreignKeys = [
-        ForeignKey(
-            entity = UserCharacter::class,
-            parentColumns = ["id"],
-            childColumns = ["id"],
-            onDelete = ForeignKey.CASCADE
-        )
-    ]
-)
-data class VBCharacterData (
-    @PrimaryKey val id: Long,
-    val generation: Int,
-    val totalTrophies: Int
-)

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

@@ -1,24 +0,0 @@
-package com.github.nacabaro.vbhelper.domain.device_data
-
-import androidx.room.Entity
-import androidx.room.ForeignKey
-import androidx.room.PrimaryKey
-
-@Entity(
-    foreignKeys = [
-        ForeignKey(
-            entity = UserCharacter::class,
-            parentColumns = ["id"],
-            childColumns = ["charId"],
-            onDelete = ForeignKey.CASCADE
-        )
-    ]
-)
-data class VitalsHistory (
-    @PrimaryKey(autoGenerate = true) val id: Long = 0,
-    val charId: Long,
-    val year: Int,
-    val month: Int,
-    val day: Int,
-    val vitalPoints: Int
-)

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

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

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

@@ -11,6 +11,7 @@ object CharacterDtos {
         var stage: Int,
         var attribute: NfcCharacter.Attribute,
         var ageInDays: Int,
+        var nextAdventureMissionStage: Int, // next adventure mission stage on the character's dim
         var mood: Int,
         var vitalPoints: Int,
         var transformationCountdown: Int,
@@ -24,7 +25,6 @@ object CharacterDtos {
         var heartRateCurrent: Int,
         var characterType: DeviceType,
         val spriteIdle: ByteArray,
-        val spriteIdle2: ByteArray,
         val spriteWidth: Int,
         val spriteHeight: Int,
         val nameSprite: ByteArray,
@@ -34,11 +34,9 @@ object CharacterDtos {
         val isInAdventure: Boolean
     )
 
-    data class CardCharacterInfo(
+    data class DiMInfo(
         val cardId: Int,
-        val charId: Int,
+        val charId: Int
-        val stage: Int,
-        val attribute: NfcCharacter.Attribute
     )
 
     data class TransformationHistory(
@@ -64,6 +62,7 @@ object CharacterDtos {
         var stage: Int,
         var attribute: NfcCharacter.Attribute,
         var ageInDays: Int,
+        var nextAdventureMissionStage: Int, // next adventure mission stage on the character's dim
         var mood: Int,
         var vitalPoints: Int,
         var transformationCountdown: Int,

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

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

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

@@ -1,32 +1,21 @@
 package com.github.nacabaro.vbhelper.navigation
 
-import android.util.Log
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import com.github.nacabaro.vbhelper.di.VBHelper
 import com.github.nacabaro.vbhelper.screens.BattlesScreen
-import com.github.nacabaro.vbhelper.screens.cardScreen.CardsScreen
+import com.github.nacabaro.vbhelper.screens.DexScreen
-import com.github.nacabaro.vbhelper.screens.cardScreen.CardViewScreen
+import com.github.nacabaro.vbhelper.screens.DiMScreen
 import com.github.nacabaro.vbhelper.screens.homeScreens.HomeScreen
 import com.github.nacabaro.vbhelper.screens.itemsScreen.ItemsScreen
 import com.github.nacabaro.vbhelper.screens.scanScreen.ScanScreen
 import com.github.nacabaro.vbhelper.screens.scanScreen.ScanScreenControllerImpl
 import com.github.nacabaro.vbhelper.screens.settingsScreen.SettingsScreen
-import com.github.nacabaro.vbhelper.screens.spriteViewer.SpriteViewer
+import com.github.nacabaro.vbhelper.screens.SpriteViewer
 import com.github.nacabaro.vbhelper.screens.homeScreens.HomeScreenControllerImpl
 import com.github.nacabaro.vbhelper.screens.storageScreen.StorageScreen
 import com.github.nacabaro.vbhelper.screens.itemsScreen.ChooseCharacterScreen
@@ -34,11 +23,8 @@ 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
-import com.github.nacabaro.vbhelper.source.StorageRepository
 
 data class AppNavigationHandlers(
     val settingsScreenController: SettingsScreenControllerImpl,
@@ -46,9 +32,7 @@ data class AppNavigationHandlers(
     val itemsScreenController: ItemsScreenControllerImpl,
     val adventureScreenController: AdventureScreenControllerImpl,
     val storageScreenController: StorageScreenControllerImpl,
-    val homeScreenController: HomeScreenControllerImpl,
+    val homeScreenController: HomeScreenControllerImpl
-    val spriteViewerController: SpriteViewerControllerImpl,
-    val cardScreenController: CardScreenControllerImpl
 )
 
 @Composable
@@ -65,19 +49,8 @@ fun AppNavigation(
         NavHost(
             navController = navController,
             startDestination = NavigationItems.Home.route,
-            enterTransition = {
-                fadeIn(
-                    animationSpec = tween(200)
-                )
-            },
-            exitTransition = {
-                fadeOut(
-                    animationSpec = tween(200)
-                )
-            },
             modifier = Modifier
                 .padding(contentPadding)
-
         ) {
             composable(NavigationItems.Battles.route) {
                 BattlesScreen()
@@ -97,35 +70,17 @@ fun AppNavigation(
             }
             composable(NavigationItems.Scan.route) {
                 val characterIdString = it.arguments?.getString("characterId")
-                var characterId by remember { mutableStateOf(characterIdString?.toLongOrNull()) }
+                val characterId = characterIdString?.toLongOrNull()
-                Log.d("ScanScreen", "characterId: $characterId")
-                val launchedFromHomeScreen = (characterIdString?.toLongOrNull() == null)
-
-                if (characterId == null) {
-                    val context = LocalContext.current.applicationContext as VBHelper
-                    val storageRepository = StorageRepository(context.container.db)
-
-                    LaunchedEffect(characterId) {
-                        if (characterId == null) {
-                            val characterData = storageRepository.getActiveCharacter()
-                            if (characterData != null) {
-                                characterId = characterData.id
-                            }
-                        }
-                    }
-                }
 
                 ScanScreen(
                     navController = navController,
                     scanScreenController = applicationNavigationHandlers.scanScreenController,
-                    characterId = characterId,
+                    characterId = characterId
-                    launchedFromHomeScreen = launchedFromHomeScreen
                 )
             }
             composable(NavigationItems.Dex.route) {
-                CardsScreen(
+                DexScreen(
-                    navController = navController,
+                    navController = navController
-                    cardScreenController = applicationNavigationHandlers.cardScreenController
                 )
             }
             composable(NavigationItems.Settings.route) {
@@ -136,14 +91,13 @@ fun AppNavigation(
             }
             composable(NavigationItems.Viewer.route) {
                 SpriteViewer(
-                    navController = navController,
+                    navController = navController
-                    spriteViewerController = applicationNavigationHandlers.spriteViewerController
                 )
             }
             composable(NavigationItems.CardView.route) {
                 val cardId = it.arguments?.getString("cardId")
                 if (cardId != null) {
-                    CardViewScreen(
+                    DiMScreen(
                         navController = navController,
                         dimId = cardId.toLong()
                     )

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

@@ -1,33 +1,9 @@
 package com.github.nacabaro.vbhelper.screens
 
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import com.github.nacabaro.vbhelper.components.TopBanner
 
 @Composable
 fun BattlesScreen() {
-    Scaffold (
+    Text("Battles Screen")
-        topBar = {
-            TopBanner(
-                text = "Online battles"
-            )
-        }
-    ) { contentPadding ->
-        Column(
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.Center,
-            modifier = Modifier
-                .padding(top = contentPadding.calculateTopPadding())
-                .fillMaxSize()
-        ) {
-            Text("Coming soon")
-        }
-    }
 }

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

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

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

@@ -1,4 +1,4 @@
-package com.github.nacabaro.vbhelper.screens.cardScreen
+package com.github.nacabaro.vbhelper.screens
 
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
@@ -14,13 +14,14 @@ 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 CardViewScreen(
+fun DiMScreen(
     navController: NavController,
     dimId: Long
 ) {

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

@@ -1,38 +1,55 @@
-package com.github.nacabaro.vbhelper.screens.spriteViewer
+package com.github.nacabaro.vbhelper.screens
 
 import android.graphics.Bitmap
 import android.util.Log
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Column
 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.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+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.mutableStateListOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import com.github.nacabaro.vbhelper.components.TopBanner
+import com.github.nacabaro.vbhelper.di.VBHelper
+import com.github.nacabaro.vbhelper.domain.Sprites
+import com.github.nacabaro.vbhelper.source.SpriteRepo
+import kotlinx.coroutines.launch
+import java.nio.ByteBuffer
 
 @Composable
 fun SpriteViewer(
-    navController: NavController,
+    navController: NavController
-    spriteViewerController: SpriteViewerController
 ) {
-    val spriteList = remember { mutableStateListOf<Bitmap>() }
+    val coroutineScope = rememberCoroutineScope()
+    val application = LocalContext.current.applicationContext as VBHelper
+    val db = application.container.db
+    val spriteRepo = SpriteRepo(db)
+
+    val spriteList = remember { mutableStateListOf<Sprites>() }
 
     Log.d("SpriteViewer", "spriteList: $spriteList")
 
-    LaunchedEffect(spriteViewerController) {
+    LaunchedEffect(spriteRepo) {
-        val sprites = spriteViewerController.getAllSprites()
+        coroutineScope.launch {
-        val bitmapData = spriteViewerController.convertToBitmap(sprites)
+            spriteList.clear()
-        spriteList.addAll(bitmapData)
+            spriteList.addAll(spriteRepo.getAllSprites())
+        }
     }
 
     Scaffold (
@@ -52,7 +69,13 @@ fun SpriteViewer(
                 .padding(top = contentPadding.calculateTopPadding())
         ) {
             items(spriteList) { sprite ->
-                val imageBitmap = remember(sprite) { sprite.asImageBitmap() }
+                val bitmap = remember (sprite.sprite) {
+                    Log.d("SpriteViewer", "sprite: $sprite")
+                    Bitmap.createBitmap(sprite.width, sprite.height, Bitmap.Config.RGB_565).apply {
+                        copyPixelsFromBuffer(ByteBuffer.wrap(sprite.sprite))
+                    }
+                }
+                val imageBitmap = remember(bitmap) { bitmap.asImageBitmap() }
                 Image(
                     bitmap = imageBitmap,
                     contentDescription = "Sprite",

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

@@ -94,8 +94,7 @@ 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

@@ -1,109 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.cardScreen
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material.icons.filled.Edit
-import androidx.compose.material3.Card
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.FilterQuality
-import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.dp
-import com.github.nacabaro.vbhelper.utils.BitmapData
-import com.github.nacabaro.vbhelper.utils.getBitmap
-
-@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

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

@@ -1,34 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.cardScreen
-
-import androidx.activity.ComponentActivity
-import androidx.lifecycle.lifecycleScope
-import com.github.nacabaro.vbhelper.di.VBHelper
-import 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/CardsScreen.kt

@@ -1,145 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.cardScreen
-
-import android.util.Log
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.Scaffold
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.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

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

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

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

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

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

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

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

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 = "Application should work now with the original VB and the VH."
+                    text = "Also, this application does not work yet with the original VB."
                 )
                 Spacer(modifier = Modifier.padding(8.dp))
                 Text(

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
@@ -28,15 +27,9 @@ 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
@@ -52,21 +45,15 @@ 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, collectedItem) {
+    LaunchedEffect(storageRepository, activeMon) {
         withContext(Dispatchers.IO) {
             activeMon.value = storageRepository.getActiveCharacter()
-            if (activeMon.value != null && activeMon.value!!.characterType == DeviceType.BEDevice) {
+            if (activeMon.value != null) {
                 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)
             }
         }
     }
@@ -92,7 +79,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 +89,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!!,
@@ -123,26 +108,12 @@ 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,8 +1,5 @@
 package com.github.nacabaro.vbhelper.screens.homeScreens
 
-import com.github.nacabaro.vbhelper.dtos.ItemDtos
-
 interface HomeScreenController {
     fun didAdventureMissionsFinish(onCompletion: (Boolean) -> Unit)
-    fun clearSpecialMission(missionId: Long, onCleared: (ItemDtos.PurchasedItem) -> Unit)
 }

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

@@ -3,11 +3,8 @@ 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,
@@ -29,38 +26,4 @@ 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

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

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

@@ -1,189 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.homeScreens.screens
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.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,9 +19,7 @@ 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
@@ -41,25 +39,10 @@ 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)
+            characterList.value = storageRepository.getAllCharacters()
-            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()
-                }
-            }
         }
     }
 

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

@@ -2,12 +2,9 @@ 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
@@ -27,15 +24,7 @@ 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 {
@@ -48,20 +37,17 @@ class ItemsScreenControllerImpl (
             withContext(Dispatchers.IO) {
                 val item = getItem(itemId)
                 val characterData = database.userCharacterDao().getCharacter(characterId)
-                var beCharacterData: BECharacterData? = null
+                val beCharacterData: BECharacterData
-                var vbCharacterData: VBCharacterData? = null
+                //var vbCharacterData: VBCharacterData
 
                 if (characterData.characterType == DeviceType.BEDevice) {
                     beCharacterData = database.userCharacterDao().getBeData(characterId)
-                } else if (characterData.characterType == DeviceType.VBDevice) {
+                } else {
-                    vbCharacterData = database.userCharacterDao().getVbData(characterId)
+                    TODO("Not implemented")
+                    //vbCharacterData = database.userCharacterDao().getVbData(characterId)
                 }
 
-                if (
+                if (item.itemIcon in 1 .. 5 && characterData.characterType == DeviceType.BEDevice) {
-                    item.itemIcon in 1 .. 5 &&
-                    characterData.characterType == DeviceType.BEDevice &&
-                    beCharacterData != null
-                ) {
                     beCharacterData.itemType = item.itemIcon
                     beCharacterData.itemMultiplier = 3
                     beCharacterData.itemRemainingTime = item.itemLength
@@ -86,11 +72,7 @@ class ItemsScreenControllerImpl (
                         .userCharacterDao()
                         .updateCharacter(characterData)
 
-                } else if (
+                } else if (item.itemIcon == ItemTypes.LimitTimer.id) {
-                    item.itemIcon == ItemTypes.LimitTimer.id &&
-                    characterData.characterType == DeviceType.BEDevice &&
-                    beCharacterData != null
-                ) {
                     beCharacterData.remainingTrainingTimeInMinutes += item.itemLength
                     if (beCharacterData.remainingTrainingTimeInMinutes > 6000) {
                         beCharacterData.remainingTrainingTimeInMinutes = 6000
@@ -111,12 +93,6 @@ class ItemsScreenControllerImpl (
                     database
                         .userCharacterDao()
                         .updateCharacter(characterData)
-
-                } else if (item.itemIcon in ItemTypes.Step8k.id  .. ItemTypes.Win4.id &&
-                    characterData.characterType == DeviceType.VBDevice &&
-                    vbCharacterData != null
-                ) {
-                    applySpecialMission(item.itemIcon, item.itemLength, characterId)
                 }
 
                 consumeItem(item.id)
@@ -128,72 +104,13 @@ class ItemsScreenControllerImpl (
         }
     }
 
-    private suspend fun applySpecialMission(itemIcon: Int, itemLength: Int, characterId: Long) {
+    private fun getItem(itemId: Long): ItemDtos.ItemsWithQuantities {
-        // 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 suspend fun consumeItem(itemId: Long) {
+    private fun consumeItem(itemId: Long) {
         database
             .itemDao()
             .useItem(itemId)

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

@@ -30,12 +30,11 @@ 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
+import com.github.nacabaro.vbhelper.utils.characterToNfc
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.withContext
@@ -47,89 +46,45 @@ fun ScanScreen(
     navController: NavController,
     characterId: Long?,
     scanScreenController: ScanScreenController,
-    launchedFromHomeScreen: Boolean
 ) {
     val secrets by scanScreenController.secretsFlow.collectAsState(null)
+    var readingScreen by remember { mutableStateOf(false) }
+    var writingScreen by remember { mutableStateOf(false) }
+    var isDoneReadingCharacter by remember { mutableStateOf(false) }
+    var isDoneSendingCard by remember { mutableStateOf(false) }
+    var isDoneWritingCharacter by remember { mutableStateOf(false) }
 
     val application = LocalContext.current.applicationContext as VBHelper
     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) {
         withContext(Dispatchers.IO) {
-            /*
+            if(characterId != null && nfcCharacter == null) {
-            First check if there is a character sent through the navigation system
+                nfcCharacter = characterToNfc(context, characterId)
-            If there is not, that means we got here through the home screen nfc button
-            If we got here through the home screen, it does not hurt to check if there is
-            an active character.
-             */
-            if (characterId != null && nfcCharacter == null) {
-                nfcCharacter = scanScreenController.characterToNfc(characterId)
             }
         }
     }
 
-    var readingScreen by remember { mutableStateOf(false) }
+    DisposableEffect(readingScreen || writingScreen, isDoneSendingCard) {
-    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) }
-
-    DisposableEffect(readingScreen) {
         if(readingScreen) {
-            scanScreenController.registerActivityLifecycleListener(
+            scanScreenController.registerActivityLifecycleListener(SCAN_SCREEN_ACTIVITY_LIFECYCLE_LISTENER, object: ActivityLifecycleListener {
-                SCAN_SCREEN_ACTIVITY_LIFECYCLE_LISTENER,
+                override fun onPause() {
-                object: ActivityLifecycleListener {
+                    scanScreenController.cancelRead()
-                    override fun onPause() {
+                }
-                        scanScreenController.cancelRead()
-                    }
 
-                    override fun onResume() {
+                override fun onResume() {
-                        scanScreenController.onClickRead(
+                    scanScreenController.onClickRead(secrets!!) {
-                            secrets = secrets!!,
+                        isDoneReadingCharacter = true
-                            onComplete = {
-                                isDoneReadingCharacter = true
-                            },
-                            onMultipleCards = { cards ->
-                                cardsRead = cards
-                                readingScreen = false
-                                cardSelectScreen = true
-                                isDoneReadingCharacter = true
-                            }
-                        )
                     }
                 }
-            )
+
-            scanScreenController.onClickRead(
+            })
-                secrets = secrets!!,
+            scanScreenController.onClickRead(secrets!!) {
-                onComplete = {
+                isDoneReadingCharacter = true
-                    isDoneReadingCharacter = true
-                },
-                onMultipleCards = { cards ->
-                    cardsRead = cards
-                    readingScreen = false
-                    cardSelectScreen = true
-                    isDoneReadingCharacter = true
-                }
-            )
-        }
-        onDispose {
-            if(readingScreen) {
-                scanScreenController.unregisterActivityLifecycleListener(
-                    SCAN_SCREEN_ACTIVITY_LIFECYCLE_LISTENER
-                )
-                scanScreenController.cancelRead()
             }
-        }
+        } else if (writingScreen) {
-    }
-
-    DisposableEffect(writingScreen, isDoneSendingCard) {
-        if (writingScreen) {
             scanScreenController.registerActivityLifecycleListener(
                 SCAN_SCREEN_ACTIVITY_LIFECYCLE_LISTENER,
                 object : ActivityLifecycleListener {
@@ -150,9 +105,6 @@ fun ScanScreen(
                     }
                 }
             )
-        }
-
-        if (secrets != null && nfcCharacter != null) {
             if (!isDoneSendingCard) {
                 scanScreenController.onClickCheckCard(secrets!!, nfcCharacter!!) {
                     isDoneSendingCard = true
@@ -163,16 +115,15 @@ fun ScanScreen(
                 }
             }
         }
-
         onDispose {
-            if(writingScreen) {
+            if(readingScreen || writingScreen) {
                 scanScreenController.unregisterActivityLifecycleListener(SCAN_SCREEN_ACTIVITY_LIFECYCLE_LISTENER)
                 scanScreenController.cancelRead()
             }
         }
     }
 
-    if (isDoneReadingCharacter && !cardSelectScreen) {
+    if (isDoneReadingCharacter) {
         readingScreen = false
         navController.navigate(NavigationItems.Home.route)
     } else if (isDoneSendingCard && isDoneWritingCharacter) {
@@ -204,18 +155,10 @@ fun ScanScreen(
                 scanScreenController.cancelRead()
             }
         }
-    } else if (cardSelectScreen) {
-        ChooseCard(
-            cards = cardsRead!!,
-            onCardSelected = { card ->
-                cardSelectScreen = false
-                scanScreenController.flushCharacter(card.id)
-            }
-        )
     } else {
         ChooseConnectOption(
             onClickRead = when {
-                !launchedFromHomeScreen -> null
+                characterId != null -> null
                 else -> {
                     {
                         if(secrets == null) {
@@ -241,8 +184,7 @@ fun ScanScreen(
                         }
                     }
                 }
-            },
+            }
-            navController = navController
         )
     }
 }
@@ -251,17 +193,9 @@ fun ScanScreen(
 fun ChooseConnectOption(
     onClickRead: (() -> Unit)? = null,
     onClickWrite: (() -> Unit)? = null,
-    navController: NavController
 ) {
     Scaffold(
-        topBar = {
+        topBar = { TopBanner(text = "Scan a Vital Bracelet") }
-            TopBanner(
-                text = "Scan a Vital Bracelet",
-                onBackClick = {
-                    navController.popBackStack()
-                }
-            )
-        }
     ) { contentPadding ->
         Column(
             verticalArrangement = Arrangement.Center,
@@ -321,15 +255,11 @@ fun ScanScreenPreview() {
             ) {
 
             }
-            override fun flushCharacter(cardId: Long) {}
+            override fun onClickRead(secrets: Secrets, onComplete: ()->Unit) {}
-            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, onMultipleCards: (List<Card>, NfcCharacter) -> Unit): String { return "" }
-            override suspend fun characterToNfc(characterId: Long): NfcCharacter? { return null }
         },
-        characterId = null,
+        characterId = null
-        launchedFromHomeScreen = false
     )
 }

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

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

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

@@ -15,16 +15,18 @@ 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.di.VBHelper
-import com.github.nacabaro.vbhelper.screens.scanScreen.converters.FromNfcConverter
+import com.github.nacabaro.vbhelper.domain.device_data.BECharacterData
-import com.github.nacabaro.vbhelper.screens.scanScreen.converters.ToNfcConverter
+import com.github.nacabaro.vbhelper.domain.device_data.UserCharacter
 import com.github.nacabaro.vbhelper.source.getCryptographicTransformerMap
 import com.github.nacabaro.vbhelper.source.isMissingSecrets
 import com.github.nacabaro.vbhelper.source.proto.Secrets
+import com.github.nacabaro.vbhelper.utils.DeviceType
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
+import java.util.GregorianCalendar
 
 class ScanScreenControllerImpl(
     override val secretsFlow: Flow<Secrets>,
@@ -32,7 +34,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 {
@@ -44,14 +46,10 @@ class ScanScreenControllerImpl(
         checkSecrets()
     }
 
-    override fun onClickRead(secrets: Secrets, onComplete: ()->Unit, onMultipleCards: (List<Card>) -> Unit) {
+    override fun onClickRead(secrets: Secrets, onComplete: ()->Unit) {
         handleTag(secrets) { tagCommunicator ->
             val character = tagCommunicator.receiveCharacter()
-            val resultMessage = characterFromNfc(character) { cards, nfcCharacter ->
+            val resultMessage = addCharacterScannedIntoDatabase(character)
-                lastScannedCharacter = nfcCharacter
-                onMultipleCards(cards)
-
-            }
             onComplete.invoke()
             resultMessage
         }
@@ -125,15 +123,7 @@ class ScanScreenControllerImpl(
     ) {
         handleTag(secrets) { tagCommunicator ->
             try {
-                if (nfcCharacter is VBNfcCharacter) {
+                tagCommunicator.sendCharacter(nfcCharacter)
-                    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) {
@@ -161,36 +151,101 @@ class ScanScreenControllerImpl(
         componentActivity.startActivity(Intent(Settings.ACTION_WIRELESS_SETTINGS))
     }
 
-    override fun characterFromNfc(
+    private fun addCharacterScannedIntoDatabase(nfcCharacter: NfcCharacter): String {
-        nfcCharacter: NfcCharacter,
+        val application = componentActivity.applicationContext as VBHelper
-        onMultipleCards: (List<Card>, NfcCharacter) -> Unit
+        val storageRepository = application.container.db
-    ): String {
-        val nfcConverter = FromNfcConverter(
-            componentActivity = componentActivity
-        )
-        return nfcConverter.addCharacter(nfcCharacter, onMultipleCards)
-    }
 
-    override suspend fun characterToNfc(characterId: Long): NfcCharacter {
+        val dimData = storageRepository
-        val nfcGenerator = ToNfcConverter(
+            .dimDao()
-            componentActivity = componentActivity
+            .getDimById(nfcCharacter.dimId.toInt())
+
+        if (dimData == null) return "Card not found"
+
+        val cardCharData = storageRepository
+            .characterDao()
+            .getCharacterByMonIndex(nfcCharacter.charIndex.toInt(), dimData.id)
+
+        val characterData = UserCharacter(
+            charId = cardCharData.id,
+            ageInDays = nfcCharacter.ageInDays.toInt(),
+            nextAdventureMissionStage = nfcCharacter.nextAdventureMissionStage.toInt(),
+            mood = nfcCharacter.mood.toInt(),
+            vitalPoints = nfcCharacter.vitalPoints.toInt(),
+            transformationCountdown = nfcCharacter.transformationCountdownInMinutes.toInt(),
+            injuryStatus = nfcCharacter.injuryStatus,
+            trophies = nfcCharacter.trophies.toInt(),
+            currentPhaseBattlesWon = nfcCharacter.currentPhaseBattlesWon.toInt(),
+            currentPhaseBattlesLost = nfcCharacter.currentPhaseBattlesLost.toInt(),
+            totalBattlesWon = nfcCharacter.totalBattlesWon.toInt(),
+            totalBattlesLost = nfcCharacter.totalBattlesLost.toInt(),
+            activityLevel = nfcCharacter.activityLevel.toInt(),
+            heartRateCurrent = nfcCharacter.heartRateCurrent.toInt(),
+            characterType = when (nfcCharacter) {
+                is BENfcCharacter -> DeviceType.BEDevice
+                else -> DeviceType.VBDevice
+            },
+            isActive = true
         )
 
-        val character = nfcGenerator.characterToNfc(characterId)
+        storageRepository
-        Log.d("CharacterType", character.toString())
+            .userCharacterDao()
-        return character
+            .clearActiveCharacter()
-    }
 
-    override fun flushCharacter(cardId: Long) {
+        val characterId: Long = storageRepository
-        val nfcConverter = FromNfcConverter(
+            .userCharacterDao()
-            componentActivity = componentActivity
+            .insertCharacterData(characterData)
-        )
 
-        componentActivity.lifecycleScope.launch(Dispatchers.IO) {
+        if (nfcCharacter is BENfcCharacter) {
-            if (lastScannedCharacter != null) {
+            val extraCharacterData = BECharacterData(
-                nfcConverter.addCharacterUsingCard(lastScannedCharacter!!, cardId)
+                id = characterId,
-                lastScannedCharacter = null
+                trainingHp = nfcCharacter.trainingHp.toInt(),
+                trainingAp = nfcCharacter.trainingAp.toInt(),
+                trainingBp = nfcCharacter.trainingBp.toInt(),
+                remainingTrainingTimeInMinutes = nfcCharacter.remainingTrainingTimeInMinutes.toInt(),
+                itemEffectActivityLevelValue = nfcCharacter.itemEffectActivityLevelValue.toInt(),
+                itemEffectMentalStateValue = nfcCharacter.itemEffectMentalStateValue.toInt(),
+                itemEffectMentalStateMinutesRemaining = nfcCharacter.itemEffectMentalStateMinutesRemaining.toInt(),
+                itemEffectActivityLevelMinutesRemaining = nfcCharacter.itemEffectActivityLevelMinutesRemaining.toInt(),
+                itemEffectVitalPointsChangeValue = nfcCharacter.itemEffectVitalPointsChangeValue.toInt(),
+                itemEffectVitalPointsChangeMinutesRemaining = nfcCharacter.itemEffectVitalPointsChangeMinutesRemaining.toInt(),
+                abilityRarity = nfcCharacter.abilityRarity,
+                abilityType = nfcCharacter.abilityType.toInt(),
+                abilityBranch = nfcCharacter.abilityBranch.toInt(),
+                abilityReset = nfcCharacter.abilityReset.toInt(),
+                rank = nfcCharacter.abilityReset.toInt(),
+                itemType = nfcCharacter.itemType.toInt(),
+                itemMultiplier = nfcCharacter.itemMultiplier.toInt(),
+                itemRemainingTime = nfcCharacter.itemRemainingTime.toInt(),
+                otp0 = "", //nfcCharacter.value!!.otp0.toString(),
+                otp1 = "", //nfcCharacter.value!!.otp1.toString(),
+                minorVersion = nfcCharacter.characterCreationFirmwareVersion.minorVersion.toInt(),
+                majorVersion = nfcCharacter.characterCreationFirmwareVersion.majorVersion.toInt(),
+            )
+
+            storageRepository
+                .userCharacterDao()
+                .insertBECharacterData(extraCharacterData)
+
+            val transformationHistoryWatch = nfcCharacter.transformationHistory
+            transformationHistoryWatch.map { item ->
+                if (item.toCharIndex.toInt() != 255) {
+                    val date = GregorianCalendar(item.year.toInt(), item.month.toInt(), item.day.toInt())
+                        .time
+                        .time
+
+                    storageRepository
+                        .characterDao()
+                        .insertTransformation(characterId, item.toCharIndex.toInt(), dimData.id, date)
+
+                    storageRepository
+                        .dexDao()
+                        .insertCharacter(item.toCharIndex.toInt(), dimData.id, date)
+                }
             }
+        } else if (nfcCharacter is VBNfcCharacter) {
+            return "Not implemented yet"
         }
+
+        return "Done reading character!"
     }
 }

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

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

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

@@ -1,306 +0,0 @@
-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
-import com.github.nacabaro.vbhelper.domain.device_data.VBCharacterData
-import com.github.nacabaro.vbhelper.domain.device_data.VitalsHistory
-import com.github.nacabaro.vbhelper.utils.DeviceType
-import java.util.GregorianCalendar
-
-class FromNfcConverter (
-    componentActivity: ComponentActivity
-) {
-    private val application = componentActivity.applicationContext as VBHelper
-    private val database = application.container.db
-    
-    
-    fun addCharacterUsingCard(
-        nfcCharacter: NfcCharacter,
-        cardId: Long
-    ): String {
-        val cardData = database
-            .cardDao()
-            .getCardById(cardId)
-
-        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)
-
-        updateCardProgress(nfcCharacter, cardData)
-
-        val characterData = UserCharacter(
-            charId = cardCharData.id,
-            ageInDays = nfcCharacter.ageInDays.toInt(),
-            mood = nfcCharacter.mood.toInt(),
-            vitalPoints = nfcCharacter.vitalPoints.toInt(),
-            transformationCountdown = nfcCharacter.transformationCountdownInMinutes.toInt(),
-            injuryStatus = nfcCharacter.injuryStatus,
-            trophies = nfcCharacter.trophies.toInt(),
-            currentPhaseBattlesWon = nfcCharacter.currentPhaseBattlesWon.toInt(),
-            currentPhaseBattlesLost = nfcCharacter.currentPhaseBattlesLost.toInt(),
-            totalBattlesWon = nfcCharacter.totalBattlesWon.toInt(),
-            totalBattlesLost = nfcCharacter.totalBattlesLost.toInt(),
-            activityLevel = nfcCharacter.activityLevel.toInt(),
-            heartRateCurrent = nfcCharacter.heartRateCurrent.toInt(),
-            characterType = when (nfcCharacter) {
-                is BENfcCharacter -> DeviceType.BEDevice
-                else -> DeviceType.VBDevice
-            },
-            isActive = true
-        )
-
-        database
-            .userCharacterDao()
-            .clearActiveCharacter()
-
-        val characterId: Long = database
-            .userCharacterDao()
-            .insertCharacterData(characterData)
-
-        if (nfcCharacter is BENfcCharacter) {
-            addBeCharacterToDatabase(
-                characterId = characterId,
-                nfcCharacter = nfcCharacter
-            )
-        } else if (nfcCharacter is VBNfcCharacter) {
-            addVbCharacterToDatabase(
-                characterId = characterId,
-                nfcCharacter = nfcCharacter
-            )
-        }
-
-        addTransformationHistoryToDatabase(
-            characterId = characterId,
-            nfcCharacter = nfcCharacter,
-            dimData = cardData
-        )
-
-        addVitalsHistoryToDatabase(
-            characterId = characterId,
-            nfcCharacter = nfcCharacter
-        )
-
-        return "Done reading character!"
-    }
-    
-
-
-    private fun updateCardProgress(
-        nfcCharacter: NfcCharacter,
-        cardData: Card
-    ) {
-        val currentCardProgress = CardProgress(
-            cardId = cardData.id,
-            currentStage = nfcCharacter.nextAdventureMissionStage.toInt(),
-            unlocked = nfcCharacter.nextAdventureMissionStage.toInt() > cardData.stageCount
-        )
-
-        database
-            .cardProgressDao()
-            .updateDimProgress(currentCardProgress)
-    }
-
-
-
-    private fun addVbCharacterToDatabase(
-        characterId: Long,
-        nfcCharacter: VBNfcCharacter
-    ) {
-        val extraCharacterData = VBCharacterData(
-            id = characterId,
-            generation = nfcCharacter.generation.toInt(),
-            totalTrophies = nfcCharacter.totalTrophies.toInt()
-        )
-
-        database
-            .userCharacterDao()
-            .insertVBCharacterData(extraCharacterData)
-
-        addSpecialMissionsToDatabase(nfcCharacter, characterId)
-    }
-
-
-
-    private fun addSpecialMissionsToDatabase(
-        nfcCharacter: VBNfcCharacter,
-        characterId: Long
-    ) {
-        val specialMissionsWatch = nfcCharacter.specialMissions
-        val specialMissionsDb = specialMissionsWatch.map { item ->
-            SpecialMissions(
-                characterId = characterId,
-                goal = item.goal.toInt(),
-                watchId = item.id.toInt(),
-                progress = item.progress.toInt(),
-                status = item.status,
-                timeElapsedInMinutes = item.timeElapsedInMinutes.toInt(),
-                timeLimitInMinutes = item.timeLimitInMinutes.toInt(),
-                missionType = item.type,
-            )
-        }
-
-        database
-            .userCharacterDao()
-            .insertSpecialMissions(*specialMissionsDb.toTypedArray())
-    }
-
-
-
-    private fun addBeCharacterToDatabase(
-        characterId: Long,
-        nfcCharacter: BENfcCharacter
-    ) {
-        val extraCharacterData = BECharacterData(
-            id = characterId,
-            trainingHp = nfcCharacter.trainingHp.toInt(),
-            trainingAp = nfcCharacter.trainingAp.toInt(),
-            trainingBp = nfcCharacter.trainingBp.toInt(),
-            remainingTrainingTimeInMinutes = nfcCharacter.remainingTrainingTimeInMinutes.toInt(),
-            itemEffectActivityLevelValue = nfcCharacter.itemEffectActivityLevelValue.toInt(),
-            itemEffectMentalStateValue = nfcCharacter.itemEffectMentalStateValue.toInt(),
-            itemEffectMentalStateMinutesRemaining = nfcCharacter.itemEffectMentalStateMinutesRemaining.toInt(),
-            itemEffectActivityLevelMinutesRemaining = nfcCharacter.itemEffectActivityLevelMinutesRemaining.toInt(),
-            itemEffectVitalPointsChangeValue = nfcCharacter.itemEffectVitalPointsChangeValue.toInt(),
-            itemEffectVitalPointsChangeMinutesRemaining = nfcCharacter.itemEffectVitalPointsChangeMinutesRemaining.toInt(),
-            abilityRarity = nfcCharacter.abilityRarity,
-            abilityType = nfcCharacter.abilityType.toInt(),
-            abilityBranch = nfcCharacter.abilityBranch.toInt(),
-            abilityReset = nfcCharacter.abilityReset.toInt(),
-            rank = nfcCharacter.abilityReset.toInt(),
-            itemType = nfcCharacter.itemType.toInt(),
-            itemMultiplier = nfcCharacter.itemMultiplier.toInt(),
-            itemRemainingTime = nfcCharacter.itemRemainingTime.toInt(),
-            otp0 = "", //nfcCharacter.value!!.otp0.toString(),
-            otp1 = "", //nfcCharacter.value!!.otp1.toString(),
-            minorVersion = nfcCharacter.characterCreationFirmwareVersion.minorVersion.toInt(),
-            majorVersion = nfcCharacter.characterCreationFirmwareVersion.majorVersion.toInt(),
-        )
-
-        database
-            .userCharacterDao()
-            .insertBECharacterData(extraCharacterData)
-    }
-
-
-
-    private fun addVitalsHistoryToDatabase(
-        characterId: Long,
-        nfcCharacter: NfcCharacter
-    ) {
-        val vitalsHistoryWatch = nfcCharacter.vitalHistory
-        val vitalsHistory = vitalsHistoryWatch.map { historyElement ->
-            Log.d("VitalsHistory", "${historyElement.year.toInt()} ${historyElement.month.toInt()} ${historyElement.day.toInt()}")
-            VitalsHistory(
-                charId = characterId,
-                year = historyElement.year.toInt(),
-                month = historyElement.month.toInt(),
-                day = historyElement.day.toInt(),
-                vitalPoints = historyElement.vitalsGained.toInt()
-            )
-        }
-
-        database
-            .userCharacterDao()
-            .insertVitals(*vitalsHistory.toTypedArray())
-    }
-
-
-    private fun addTransformationHistoryToDatabase(
-        characterId: Long,
-        nfcCharacter: NfcCharacter,
-        dimData: Card
-    ) {
-        val transformationHistoryWatch = nfcCharacter.transformationHistory
-        transformationHistoryWatch.map { item ->
-            if (item.toCharIndex.toInt() != 255) {
-                val date = GregorianCalendar(
-                    item.year.toInt(),
-                    item.month.toInt(),
-                    item.day.toInt()
-                )
-                    .time
-                    .time
-
-                database
-                    .userCharacterDao()
-                    .insertTransformation(
-                        characterId,
-                        item.toCharIndex.toInt(),
-                        dimData.id,
-                        date
-                    )
-
-                database
-                    .dexDao()
-                    .insertCharacter(
-                        item.toCharIndex.toInt(),
-                        dimData.id,
-                        date
-                    )
-            }
-        }
-    }
-}

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

@@ -1,298 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.scanScreen.converters
-
-import android.icu.util.Calendar
-import android.icu.util.TimeZone
-import android.util.Log
-import androidx.activity.ComponentActivity
-import com.github.cfogrady.vbnfc.be.BENfcCharacter
-import com.github.cfogrady.vbnfc.be.FirmwareVersion
-import com.github.cfogrady.vbnfc.data.NfcCharacter
-import com.github.cfogrady.vbnfc.vb.SpecialMission
-import com.github.cfogrady.vbnfc.vb.VBNfcCharacter
-import com.github.nacabaro.vbhelper.database.AppDatabase
-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 java.util.Date
-
-class ToNfcConverter(
-    private val componentActivity: ComponentActivity
-) {
-    private val application: VBHelper = componentActivity.applicationContext as VBHelper
-    private val database: AppDatabase = application.container.db
-
-
-
-    suspend fun characterToNfc(
-        characterId: Long
-    ): NfcCharacter {
-        val app = componentActivity.applicationContext as VBHelper
-        val database = app.container.db
-
-        val userCharacter = database
-            .userCharacterDao()
-            .getCharacter(characterId)
-
-        val characterInfo = database
-            .characterDao()
-            .getCharacterInfo(userCharacter.charId)
-
-        val currentCardStage = database
-            .cardProgressDao()
-            .getCardProgress(characterInfo.cardId)
-
-        return if (userCharacter.characterType == DeviceType.BEDevice)
-            nfcToBENfc(characterId, characterInfo, currentCardStage, userCharacter)
-        else
-            nfcToVBNfc(characterId, characterInfo, currentCardStage, userCharacter)
-    }
-
-
-
-    private suspend fun nfcToVBNfc(
-        characterId: Long,
-        characterInfo: CharacterDtos.CardCharacterInfo,
-        currentCardStage: Int,
-        userCharacter: UserCharacter
-    ): VBNfcCharacter {
-        val vbData = database
-            .userCharacterDao()
-            .getVbData(characterId)
-
-        val paddedTransformationArray = generateTransformationHistory(characterId, 9)
-
-        val watchSpecialMissions = generateSpecialMissionsArray(characterId)
-
-        val nfcData = VBNfcCharacter(
-            dimId = characterInfo.cardId.toUShort(),
-            charIndex = characterInfo.charId.toUShort(),
-            stage = characterInfo.stage.toByte(),
-            attribute = characterInfo.attribute,
-            ageInDays = userCharacter.ageInDays.toByte(),
-            nextAdventureMissionStage = currentCardStage.toByte(),
-            mood = userCharacter.mood.toByte(),
-            vitalPoints = userCharacter.vitalPoints.toUShort(),
-            transformationCountdownInMinutes = userCharacter.transformationCountdown.toUShort(),
-            injuryStatus = userCharacter.injuryStatus,
-            trophies = userCharacter.trophies.toUShort(),
-            currentPhaseBattlesWon = userCharacter.currentPhaseBattlesWon.toUShort(),
-            currentPhaseBattlesLost = userCharacter.currentPhaseBattlesLost.toUShort(),
-            totalBattlesWon = userCharacter.totalBattlesWon.toUShort(),
-            totalBattlesLost = userCharacter.totalBattlesLost.toUShort(),
-            activityLevel = userCharacter.activityLevel.toByte(),
-            heartRateCurrent = userCharacter.heartRateCurrent.toUByte(),
-            transformationHistory = paddedTransformationArray,
-            vitalHistory = generateVitalsHistoryArray(characterId),
-            appReserved1 = ByteArray(12) {0},
-            appReserved2 = generateUShortAppReserved(userCharacter),
-            generation = vbData.generation.toUShort(),
-            totalTrophies = vbData.totalTrophies.toUShort(),
-            specialMissions = watchSpecialMissions.toTypedArray()
-        )
-
-        return nfcData
-    }
-
-
-    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
-    ): List<SpecialMission> {
-        val specialMissions = database
-            .userCharacterDao()
-            .getSpecialMissions(characterId)
-
-        val watchSpecialMissions = specialMissions.map {
-            SpecialMission(
-                goal = it.goal.toUShort(),
-                id = it.watchId.toUShort(),
-                progress = it.progress.toUShort(),
-                status = it.status,
-                timeElapsedInMinutes = it.timeElapsedInMinutes.toUShort(),
-                timeLimitInMinutes = it.timeLimitInMinutes.toUShort(),
-                type = it.missionType
-            )
-        }
-
-        return watchSpecialMissions
-    }
-
-
-
-    private suspend fun generateVitalsHistoryArray(
-        characterId: Long
-    ): Array<NfcCharacter.DailyVitals> {
-        val vitalsHistory = database
-            .userCharacterDao()
-            .getVitalsHistory(characterId)
-
-        val nfcVitalsHistory = Array(7) {
-            NfcCharacter.DailyVitals(0u, 0u, 0u, 0u)
-        }
-
-        vitalsHistory.mapIndexed { index, historyElement ->
-            var actualYear = 0
-            if (historyElement.year != 2000) {
-                actualYear = historyElement.year
-            }
-             nfcVitalsHistory[index] = NfcCharacter.DailyVitals(
-                day = historyElement.day.toUByte(),
-                month = historyElement.month.toUByte(),
-                year = actualYear.toUShort(),
-                vitalsGained = vitalsHistory[index].vitalPoints.toUShort()
-            )
-        }
-
-        nfcVitalsHistory.map {
-            Log.d("NFC", it.toString())
-        }
-
-        return nfcVitalsHistory
-    }
-
-
-
-    private suspend fun nfcToBENfc(
-        characterId: Long,
-        characterInfo: CharacterDtos.CardCharacterInfo,
-        currentCardStage: Int,
-        userCharacter: UserCharacter
-    ): BENfcCharacter {
-        val beData = database
-            .userCharacterDao()
-            .getBeData(characterId)
-
-        val paddedTransformationArray = generateTransformationHistory(characterId)
-
-        val nfcData = BENfcCharacter(
-            dimId = characterInfo.cardId.toUShort(),
-            charIndex = characterInfo.charId.toUShort(),
-            stage = characterInfo.stage.toByte(),
-            attribute = characterInfo.attribute,
-            ageInDays = userCharacter.ageInDays.toByte(),
-            nextAdventureMissionStage = currentCardStage.toByte(),
-            mood = userCharacter.mood.toByte(),
-            vitalPoints = userCharacter.vitalPoints.toUShort(),
-            itemEffectMentalStateValue = beData.itemEffectMentalStateValue.toByte(),
-            itemEffectMentalStateMinutesRemaining = beData.itemEffectMentalStateMinutesRemaining.toByte(),
-            itemEffectActivityLevelValue = beData.itemEffectActivityLevelValue.toByte(),
-            itemEffectActivityLevelMinutesRemaining = beData.itemEffectActivityLevelMinutesRemaining.toByte(),
-            itemEffectVitalPointsChangeValue = beData.itemEffectVitalPointsChangeValue.toByte(),
-            itemEffectVitalPointsChangeMinutesRemaining = beData.itemEffectVitalPointsChangeMinutesRemaining.toByte(),
-            transformationCountdownInMinutes = userCharacter.transformationCountdown.toUShort(),
-            injuryStatus = userCharacter.injuryStatus,
-            trainingPp = userCharacter.trophies.toUShort(),
-            currentPhaseBattlesWon = userCharacter.currentPhaseBattlesWon.toUShort(),
-            currentPhaseBattlesLost = userCharacter.currentPhaseBattlesLost.toUShort(),
-            totalBattlesWon = userCharacter.totalBattlesWon.toUShort(),
-            totalBattlesLost = userCharacter.totalBattlesLost.toUShort(),
-            activityLevel = userCharacter.activityLevel.toByte(),
-            heartRateCurrent = userCharacter.heartRateCurrent.toUByte(),
-            transformationHistory = paddedTransformationArray,
-            vitalHistory = generateVitalsHistoryArray(characterId),
-            appReserved1 = ByteArray(12) {0},
-            appReserved2 = Array(3) {0u},
-            trainingHp = beData.trainingHp.toUShort(),
-            trainingAp = beData.trainingAp.toUShort(),
-            trainingBp = beData.trainingBp.toUShort(),
-            remainingTrainingTimeInMinutes = beData.remainingTrainingTimeInMinutes.toUShort(),
-            abilityRarity = beData.abilityRarity,
-            abilityType = beData.abilityType.toUShort(),
-            abilityBranch = beData.abilityBranch.toUShort(),
-            abilityReset = beData.abilityReset.toByte(),
-            rank = beData.rank.toByte(),
-            itemType = beData.itemType.toByte(),
-            itemMultiplier = beData.itemMultiplier.toByte(),
-            itemRemainingTime = beData.itemRemainingTime.toByte(),
-            otp0 = byteArrayOf(8),
-            otp1 = byteArrayOf(8),
-            characterCreationFirmwareVersion = FirmwareVersion(
-                minorVersion = beData.minorVersion.toByte(),
-                majorVersion = beData.majorVersion.toByte()
-            )
-        )
-
-        return nfcData
-    }
-
-
-
-    private suspend fun generateTransformationHistory(
-        characterId: Long,
-        length: Int = 8
-    ): Array<NfcCharacter.Transformation> {
-        val transformationHistory = database
-            .userCharacterDao()
-            .getTransformationHistory(characterId)!!
-            .map {
-                val date = Date(it.transformationDate)
-                val calendar = android.icu.util.GregorianCalendar(TimeZone.getTimeZone("UTC"))
-                calendar.time = date
-
-                Log.d(
-                    "TransformationHistory",
-                    "Year: ${calendar.get(Calendar.YEAR)}, " +
-                            "Month: ${calendar.get(Calendar.MONTH) + 1}, " +
-                            "Day: ${calendar.get(Calendar.DAY_OF_MONTH)}"
-                )
-
-                NfcCharacter.Transformation(
-                    toCharIndex = it.monIndex.toUByte(),
-                    year = calendar
-                        .get(Calendar.YEAR)
-                        .toUShort(),
-                    month = (calendar
-                        .get(Calendar.MONTH) + 1)
-                        .toUByte(),
-                    day = calendar
-                        .get(Calendar.DAY_OF_MONTH)
-                        .toUByte()
-                )
-            }.toTypedArray()
-
-        val paddedTransformationArray = padTransformationArray(transformationHistory, length)
-
-        return paddedTransformationArray
-    }
-
-
-
-    private fun padTransformationArray(
-        transformationArray: Array<NfcCharacter.Transformation>,
-        length: Int
-    ): Array<NfcCharacter.Transformation> {
-        if (transformationArray.size >= 8) {
-            return transformationArray
-        }
-
-        val paddedArray = Array(length) {
-            NfcCharacter.Transformation(
-                toCharIndex = 255u,
-                year = 65535u,
-                month = 255u,
-                day = 255u
-            )
-        }
-
-        System.arraycopy(transformationArray, 0, paddedArray, 0, transformationArray.size)
-        return paddedArray
-    }
-}

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

@@ -35,7 +35,6 @@ 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

@@ -10,14 +10,12 @@ 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.domain.Sprites
-import com.github.nacabaro.vbhelper.domain.card.Card
+import com.github.nacabaro.vbhelper.domain.characters.Card
-import com.github.nacabaro.vbhelper.domain.card.CardProgress
 import com.github.nacabaro.vbhelper.domain.characters.Character
 import com.github.nacabaro.vbhelper.source.ApkSecretsImporter
 import com.github.nacabaro.vbhelper.source.SecretsImporter
@@ -118,9 +116,9 @@ class SettingsScreenControllerImpl(
                 val card = dimReader.readCard(fileReader, false)
 
                 val cardModel = Card(
-                    cardId = card.header.dimId,
+                    dimId = card.header.dimId,
                     logo = card.spriteData.sprites[0].pixelData,
-                    name = card.spriteData.text, // TODO Make user write card name
+                    name = card.spriteData.text, // TODO Make user write card name// TODO Make user write card name
                     stageCount = card.adventureLevels.levels.size,
                     logoHeight = card.spriteData.sprites[0].height,
                     logoWidth = card.spriteData.sprites[0].width,
@@ -128,22 +126,10 @@ class SettingsScreenControllerImpl(
                 )
 
                 val dimId = database
-                    .cardDao()
+                    .dimDao()
-                    .insertNewCard(cardModel)
+                    .insertNewDim(cardModel)
 
-                val cardProgress = CardProgress(
+                val characters = card.characterStats.characterEntries
-                    cardId = dimId,
-                    currentStage = 0,
-                    unlocked = false
-                )
-
-                database
-                    .cardProgressDao()
-                    .updateDimProgress(cardProgress)
-
-                val characters = card
-                    .characterStats
-                    .characterEntries
 
                 var spriteCounter = when (card is BemCard) {
                     true -> 54
@@ -153,53 +139,9 @@ class SettingsScreenControllerImpl(
                 val domainCharacters = mutableListOf<Character>()
 
                 for (index in 0 until characters.size) {
-                    var domainSprite: Sprite?
-
-                    if (index < 2 && card is DimCard) {
-                        domainSprite = Sprite(
-                            width = card.spriteData.sprites[spriteCounter + 1].spriteDimensions.width,
-                            height = card.spriteData.sprites[spriteCounter + 1].spriteDimensions.height,
-                            spriteIdle1 = card.spriteData.sprites[spriteCounter + 1].pixelData,
-                            spriteIdle2 = card.spriteData.sprites[spriteCounter + 2].pixelData,
-                            spriteWalk1 = card.spriteData.sprites[spriteCounter + 1].pixelData,
-                            spriteWalk2 = card.spriteData.sprites[spriteCounter + 3].pixelData,
-                            spriteRun1 = card.spriteData.sprites[spriteCounter + 1].pixelData,
-                            spriteRun2 = card.spriteData.sprites[spriteCounter + 3].pixelData,
-                            spriteTrain1 = card.spriteData.sprites[spriteCounter + 1].pixelData,
-                            spriteTrain2 = card.spriteData.sprites[spriteCounter + 3].pixelData,
-                            spriteHappy = card.spriteData.sprites[spriteCounter + 4].pixelData,
-                            spriteSleep = card.spriteData.sprites[spriteCounter + 5].pixelData,
-                            spriteAttack = card.spriteData.sprites[spriteCounter + 2].pixelData,
-                            spriteDodge = card.spriteData.sprites[spriteCounter + 3].pixelData
-                        )
-                    } else {
-                        domainSprite = Sprite(
-                            width = card.spriteData.sprites[spriteCounter + 1].spriteDimensions.width,
-                            height = card.spriteData.sprites[spriteCounter + 1].spriteDimensions.height,
-                            spriteIdle1 = card.spriteData.sprites[spriteCounter + 1].pixelData,
-                            spriteIdle2 = card.spriteData.sprites[spriteCounter + 2].pixelData,
-                            spriteWalk1 = card.spriteData.sprites[spriteCounter + 3].pixelData,
-                            spriteWalk2 = card.spriteData.sprites[spriteCounter + 4].pixelData,
-                            spriteRun1 = card.spriteData.sprites[spriteCounter + 5].pixelData,
-                            spriteRun2 = card.spriteData.sprites[spriteCounter + 6].pixelData,
-                            spriteTrain1 = card.spriteData.sprites[spriteCounter + 7].pixelData,
-                            spriteTrain2 = card.spriteData.sprites[spriteCounter + 8].pixelData,
-                            spriteHappy = card.spriteData.sprites[spriteCounter + 9].pixelData,
-                            spriteSleep = card.spriteData.sprites[spriteCounter + 10].pixelData,
-                            spriteAttack = card.spriteData.sprites[spriteCounter + 11].pixelData,
-                            spriteDodge = card.spriteData.sprites[spriteCounter + 12].pixelData
-                        )
-                    }
-
-
-                    val spriteId = database
-                        .spriteDao()
-                        .insertSprite(domainSprite)
-
                     domainCharacters.add(
                         Character(
                             dimId = dimId,
-                            spriteId = spriteId,
                             monIndex = index,
                             name = card.spriteData.sprites[spriteCounter].pixelData,
                             stage = characters[index].stage,
@@ -207,8 +149,12 @@ class SettingsScreenControllerImpl(
                             baseHp = characters[index].hp,
                             baseBp = characters[index].dp,
                             baseAp = characters[index].ap,
-                            nameWidth = card.spriteData.sprites[spriteCounter].spriteDimensions.width,
+                            sprite1 = card.spriteData.sprites[spriteCounter + 1].pixelData,
-                            nameHeight = card.spriteData.sprites[spriteCounter].spriteDimensions.height,
+                            sprite2 = card.spriteData.sprites[spriteCounter + 2].pixelData,
+                            nameWidth = card.spriteData.sprites[spriteCounter].width,
+                            nameHeight = card.spriteData.sprites[spriteCounter].height,
+                            spritesWidth = card.spriteData.sprites[spriteCounter + 1].width,
+                            spritesHeight = card.spriteData.sprites[spriteCounter + 1].height
                         )
                     )
 
@@ -226,6 +172,18 @@ class SettingsScreenControllerImpl(
                 database
                     .characterDao()
                     .insertCharacter(*domainCharacters.toTypedArray())
+
+                val sprites = card.spriteData.sprites.map { sprite ->
+                    Sprites(
+                        id = 0,
+                        sprite = sprite.pixelData,
+                        width = sprite.width,
+                        height = sprite.height
+                    )
+                }
+                database
+                    .characterDao()
+                    .insertSprite(*sprites.toTypedArray())
             }
 
             inputStream?.close()

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

@@ -1,9 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.spriteViewer
-
-import android.graphics.Bitmap
-import com.github.nacabaro.vbhelper.domain.characters.Sprite
-
-interface SpriteViewerController {
-    suspend fun getAllSprites(): List<Sprite>
-    fun convertToBitmap(sprites: List<Sprite>): List<Bitmap>
-}

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

@@ -1,68 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.spriteViewer
-
-import android.graphics.Bitmap
-import android.util.Log
-import androidx.activity.ComponentActivity
-import androidx.compose.runtime.remember
-import androidx.compose.ui.graphics.asImageBitmap
-import com.github.nacabaro.vbhelper.di.VBHelper
-import com.github.nacabaro.vbhelper.domain.characters.Sprite
-import java.nio.ByteBuffer
-
-class SpriteViewerControllerImpl(
-    private val context: ComponentActivity
-) : SpriteViewerController {
-    override suspend fun getAllSprites(): List<Sprite> {
-        val applicationContext = context.applicationContext as VBHelper
-        val db = applicationContext.container.db
-        val sprites = db.spriteDao().getAllSprites()
-        return sprites
-    }
-
-    // I don't like this, chief
-    override fun convertToBitmap(sprites: List<Sprite>): List<Bitmap> {
-        val bitmapList = mutableListOf<Bitmap>()
-
-        for (sprite in sprites) {
-            Log.d("SpriteViewer", "sprite: $sprite")
-            bitmapList.add(Bitmap.createBitmap(sprite.width, sprite.height, Bitmap.Config.RGB_565).apply {
-                copyPixelsFromBuffer(ByteBuffer.wrap(sprite.spriteIdle1))
-            })
-            bitmapList.add(Bitmap.createBitmap(sprite.width, sprite.height, Bitmap.Config.RGB_565).apply {
-                copyPixelsFromBuffer(ByteBuffer.wrap(sprite.spriteIdle2))
-            })
-            bitmapList.add(Bitmap.createBitmap(sprite.width, sprite.height, Bitmap.Config.RGB_565).apply {
-                copyPixelsFromBuffer(ByteBuffer.wrap(sprite.spriteWalk1))
-            })
-            bitmapList.add(Bitmap.createBitmap(sprite.width, sprite.height, Bitmap.Config.RGB_565).apply {
-                copyPixelsFromBuffer(ByteBuffer.wrap(sprite.spriteWalk2))
-            })
-            bitmapList.add(Bitmap.createBitmap(sprite.width, sprite.height, Bitmap.Config.RGB_565).apply {
-                copyPixelsFromBuffer(ByteBuffer.wrap(sprite.spriteRun1))
-            })
-            bitmapList.add(Bitmap.createBitmap(sprite.width, sprite.height, Bitmap.Config.RGB_565).apply {
-                copyPixelsFromBuffer(ByteBuffer.wrap(sprite.spriteRun2))
-            })
-            bitmapList.add(Bitmap.createBitmap(sprite.width, sprite.height, Bitmap.Config.RGB_565).apply {
-                copyPixelsFromBuffer(ByteBuffer.wrap(sprite.spriteTrain1))
-            })
-            bitmapList.add(Bitmap.createBitmap(sprite.width, sprite.height, Bitmap.Config.RGB_565).apply {
-                copyPixelsFromBuffer(ByteBuffer.wrap(sprite.spriteTrain2))
-            })
-            bitmapList.add(Bitmap.createBitmap(sprite.width, sprite.height, Bitmap.Config.RGB_565).apply {
-                copyPixelsFromBuffer(ByteBuffer.wrap(sprite.spriteHappy))
-            })
-            bitmapList.add(Bitmap.createBitmap(sprite.width, sprite.height, Bitmap.Config.RGB_565).apply {
-                copyPixelsFromBuffer(ByteBuffer.wrap(sprite.spriteSleep))
-            })
-            bitmapList.add(Bitmap.createBitmap(sprite.width, sprite.height, Bitmap.Config.RGB_565).apply {
-                copyPixelsFromBuffer(ByteBuffer.wrap(sprite.spriteAttack))
-            })
-            bitmapList.add(Bitmap.createBitmap(sprite.width, sprite.height, Bitmap.Config.RGB_565).apply {
-                copyPixelsFromBuffer(ByteBuffer.wrap(sprite.spriteDodge))
-            })
-        }
-
-        return bitmapList
-    }
-}

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

@@ -1,6 +1,7 @@
 package com.github.nacabaro.vbhelper.source
 
 import com.github.nacabaro.vbhelper.database.AppDatabase
+import com.github.nacabaro.vbhelper.domain.characters.Card
 import com.github.nacabaro.vbhelper.dtos.CardDtos
 import com.github.nacabaro.vbhelper.dtos.CharacterDtos
 

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

@@ -0,0 +1,12 @@
+package com.github.nacabaro.vbhelper.source
+
+import com.github.nacabaro.vbhelper.database.AppDatabase
+import com.github.nacabaro.vbhelper.domain.Sprites
+
+class SpriteRepo (
+    private val db: AppDatabase
+) {
+    suspend fun getAllSprites(): List<Sprites> {
+        return db.characterDao().getAllSprites()
+    }
+}

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

@@ -2,10 +2,7 @@ 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
@@ -22,20 +19,12 @@ class StorageRepository (
         return db.userCharacterDao().getBeData(id)
     }
 
-    suspend fun getTransformationHistory(characterId: Long): List<CharacterDtos.TransformationHistory>? {
+    fun getTransformationHistory(characterId: Long): List<CharacterDtos.TransformationHistory>? {
         return db.userCharacterDao().getTransformationHistory(characterId)
     }
 
-    suspend fun getCharacterVbData(id: Long): VBCharacterData {
+    suspend fun getCharacterData(id: Long): CharacterDtos.DiMInfo {
-        return db.userCharacterDao().getVbData(id)
+        return db.characterDao().getCharacterInfo(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? {
@@ -49,12 +38,4 @@ 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/java/com/github/nacabaro/vbhelper/utils/CharacterToNFCCharacter.kt

@@ -0,0 +1,99 @@
+package com.github.nacabaro.vbhelper.utils
+
+import android.content.Context
+import android.icu.util.Calendar
+import android.icu.util.GregorianCalendar
+import com.github.cfogrady.vbnfc.be.BENfcCharacter
+import com.github.cfogrady.vbnfc.be.FirmwareVersion
+import com.github.cfogrady.vbnfc.data.NfcCharacter
+import com.github.nacabaro.vbhelper.di.VBHelper
+import com.github.nacabaro.vbhelper.source.StorageRepository
+import java.util.Date
+
+suspend fun characterToNfc(context: Context, characterId: Long): NfcCharacter? {
+    val app = context.applicationContext as VBHelper
+    val database = app.container.db
+    val storageRepository = StorageRepository(database)
+    val userCharacter = storageRepository.getSingleCharacter(characterId)
+    val characterInfo = storageRepository.getCharacterData(characterId)
+
+    if (userCharacter.characterType == DeviceType.BEDevice) {
+        val beData = storageRepository.getCharacterBeData(characterId)
+        val transformationHistory = storageRepository
+            .getTransformationHistory(characterId)!!
+            .map {
+                val date = Date(it.transformationDate)
+                val calendar = GregorianCalendar()
+                calendar.time = date
+
+                NfcCharacter.Transformation(
+                    toCharIndex = it.monIndex.toUByte(),
+                    year = calendar
+                        .get(Calendar.YEAR)
+                        .toUShort(),
+                    month = calendar
+                        .get(Calendar.MONTH)
+                        .toUByte(),
+                    day = calendar
+                        .get(Calendar.DAY_OF_MONTH)
+                        .toUByte()
+                )
+            }.toTypedArray()
+
+        val paddedTransformationArray = padTransformationArray(transformationHistory)
+
+        val nfcData = BENfcCharacter(
+            dimId = characterInfo.cardId.toUShort(),
+            charIndex = characterInfo.charId.toUShort(),
+            stage = userCharacter.stage.toByte(),
+            attribute = userCharacter.attribute,
+            ageInDays = userCharacter.ageInDays.toByte(),
+            nextAdventureMissionStage = userCharacter.nextAdventureMissionStage.toByte(),
+            mood = userCharacter.mood.toByte(),
+            vitalPoints = userCharacter.vitalPoints.toUShort(),
+            itemEffectMentalStateValue = beData.itemEffectMentalStateValue.toByte(),
+            itemEffectMentalStateMinutesRemaining = beData.itemEffectMentalStateMinutesRemaining.toByte(),
+            itemEffectActivityLevelValue = beData.itemEffectActivityLevelValue.toByte(),
+            itemEffectActivityLevelMinutesRemaining = beData.itemEffectActivityLevelMinutesRemaining.toByte(),
+            itemEffectVitalPointsChangeValue = beData.itemEffectVitalPointsChangeValue.toByte(),
+            itemEffectVitalPointsChangeMinutesRemaining = beData.itemEffectVitalPointsChangeMinutesRemaining.toByte(),
+            transformationCountdownInMinutes = userCharacter.transformationCountdown.toUShort(),
+            injuryStatus = userCharacter.injuryStatus,
+            trainingPp = userCharacter.trophies.toUShort(),
+            currentPhaseBattlesWon = userCharacter.currentPhaseBattlesWon.toUShort(),
+            currentPhaseBattlesLost = userCharacter.currentPhaseBattlesLost.toUShort(),
+            totalBattlesWon = userCharacter.totalBattlesWon.toUShort(),
+            totalBattlesLost = userCharacter.totalBattlesLost.toUShort(),
+            activityLevel = userCharacter.activityLevel.toByte(),
+            heartRateCurrent = userCharacter.heartRateCurrent.toUByte(),
+            transformationHistory = paddedTransformationArray,
+            vitalHistory = Array(7) {
+                NfcCharacter.DailyVitals(0u, 0u, 0u, 0u)
+            },
+            appReserved1 = ByteArray(12) {0},
+            appReserved2 = Array(3) {0u},
+            trainingHp = beData.trainingHp.toUShort(),
+            trainingAp = beData.trainingAp.toUShort(),
+            trainingBp = beData.trainingBp.toUShort(),
+            remainingTrainingTimeInMinutes = beData.remainingTrainingTimeInMinutes.toUShort(),
+            abilityRarity = beData.abilityRarity,
+            abilityType = beData.abilityType.toUShort(),
+            abilityBranch = beData.abilityBranch.toUShort(),
+            abilityReset = beData.abilityReset.toByte(),
+            rank = beData.rank.toByte(),
+            itemType = beData.itemType.toByte(),
+            itemMultiplier = beData.itemMultiplier.toByte(),
+            itemRemainingTime = beData.itemRemainingTime.toByte(),
+            otp0 = byteArrayOf(8),
+            otp1 = byteArrayOf(8),
+            characterCreationFirmwareVersion = FirmwareVersion(
+                minorVersion = beData.minorVersion.toByte(),
+                majorVersion = beData.majorVersion.toByte()
+            )
+        )
+
+        return nfcData
+    }
+
+    return null
+}

app/src/main/java/com/github/nacabaro/vbhelper/utils/padTransformationArray.kt

@@ -0,0 +1,23 @@
+package com.github.nacabaro.vbhelper.utils
+
+import com.github.cfogrady.vbnfc.data.NfcCharacter
+
+fun padTransformationArray(
+    transformationArray: Array<NfcCharacter.Transformation>
+): Array<NfcCharacter.Transformation> {
+    if (transformationArray.size >= 8) {
+        return transformationArray
+    }
+
+    val paddedArray = Array(8) {
+        NfcCharacter.Transformation(
+            toCharIndex = 255u,
+            year = 65535u,
+            month = 255u,
+            day = 255u
+        )
+    }
+
+    System.arraycopy(transformationArray, 0, paddedArray, 0, transformationArray.size)
+    return paddedArray
+}

app/src/main/java/com/github/nacabaro/vbhelper/widget/CharacterDisplayWidget.kt

@@ -0,0 +1,117 @@
+package com.github.nacabaro.vbhelper.widget
+
+import android.content.Context
+import android.graphics.Bitmap
+import androidx.compose.material3.MaterialTheme
+import androidx.glance.GlanceTheme
+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.glance.background
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.preferencesDataStore
+import androidx.glance.GlanceId
+import androidx.glance.GlanceModifier
+import androidx.glance.Image
+import androidx.glance.ImageProvider
+import androidx.glance.appwidget.GlanceAppWidget
+import androidx.glance.appwidget.provideContent
+import androidx.glance.layout.Alignment
+import androidx.glance.layout.Column
+import androidx.glance.layout.fillMaxSize
+import androidx.glance.layout.size
+import androidx.glance.state.PreferencesGlanceStateDefinition
+import androidx.glance.text.Text
+import androidx.glance.unit.ColorProvider
+import com.github.nacabaro.vbhelper.di.VBHelper
+import com.github.nacabaro.vbhelper.utils.BitmapData
+import com.github.nacabaro.vbhelper.utils.getBitmap
+
+/*
+    RANT: Why did they have to create the components from Jetpack Compose
+    with a different API for Glance? Now there are things I use in Jetpack Compose
+    like the filterQuality, which isn't here.
+ */
+
+val CURRENT_IMAGE_KEY = booleanPreferencesKey("current_image")
+
+class CharacterDisplayWidget : GlanceAppWidget() {
+    override suspend fun provideGlance(context: Context, id: GlanceId) {
+        val application = context.applicationContext as VBHelper
+        val storageRepository = application.container.db
+
+        val currentCharacter = storageRepository
+            .userCharacterDao()
+            .getActiveCharacter()
+
+        val multiplier = 4
+
+        provideContent {
+            var bitmapIdle1 by remember { mutableStateOf<Bitmap?>(null) }
+            var bitmapIdle2 by remember { mutableStateOf<Bitmap?>(null) }
+            var dpSize by remember { mutableStateOf(0.dp) }
+
+            if (currentCharacter != null) {
+                val currentCharacterBitmapIdle1 = BitmapData(
+                    currentCharacter.spriteIdle,
+                    currentCharacter.spriteWidth,
+                    currentCharacter.spriteHeight
+                )
+
+                val currentCharacterBitmapIdle2 = BitmapData(
+                    currentCharacter.spriteIdle2,
+                    currentCharacter.spriteWidth,
+                    currentCharacter.spriteHeight
+                )
+
+                bitmapIdle1 = currentCharacterBitmapIdle1.getBitmap()
+                bitmapIdle2 = currentCharacterBitmapIdle2.getBitmap()
+
+                val density: Float = application.resources.displayMetrics.density
+                dpSize = (currentCharacterBitmapIdle1.width * multiplier / density).dp
+            }
+
+            WidgetContent(
+                imageBitmapFrame1 = bitmapIdle1,
+                imageBitmapFrame2 = bitmapIdle2,
+                dpSize = dpSize
+            )
+        }
+    }
+
+    @Composable
+    private fun WidgetContent(
+        imageBitmapFrame1: Bitmap?,
+        imageBitmapFrame2: Bitmap?,
+        dpSize: Dp
+    ) {
+        GlanceTheme {
+            Column (
+                horizontalAlignment = Alignment.Horizontal.CenterHorizontally,
+                verticalAlignment = Alignment.Vertical.CenterVertically,
+                modifier = GlanceModifier
+                    .fillMaxSize()
+                    .background(ColorProvider(MaterialTheme.colorScheme.background))
+            ) {
+                if (imageBitmapFrame1 != null) {
+                    Image(
+                        provider = ImageProvider(
+                            bitmap = imageBitmapFrame1
+                        ),
+                        contentDescription = "Character",
+                        modifier = GlanceModifier
+                            .size(dpSize)
+                    )
+                } else {
+                    Text(
+                        text = "No character selected"
+                    )
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/github/nacabaro/vbhelper/widget/CharacterDisplayWidgetPreferences.kt

@@ -0,0 +1,3 @@
+package com.github.nacabaro.vbhelper.widget
+
+import androidx.glance.state.PreferencesGlanceStateDefinition

app/src/main/java/com/github/nacabaro/vbhelper/widget/CharacterDisplayWidgetReceiver.kt

@@ -0,0 +1,8 @@
+package com.github.nacabaro.vbhelper.widget
+
+import androidx.glance.appwidget.GlanceAppWidget
+import androidx.glance.appwidget.GlanceAppWidgetReceiver
+
+class CharacterDisplayWidgetReceiver : GlanceAppWidgetReceiver() {
+    override val glanceAppWidget: GlanceAppWidget = CharacterDisplayWidget()
+}

app/src/main/java/com/github/nacabaro/vbhelper/widget/CharacterDisplayWidgetWorker.kt

@@ -0,0 +1,35 @@
+package com.github.nacabaro.vbhelper.widget
+
+import android.content.Context
+import androidx.glance.appwidget.GlanceAppWidgetManager
+import androidx.glance.appwidget.state.updateAppWidgetState
+import androidx.work.CoroutineWorker
+import androidx.work.WorkerParameters
+
+class CharacterDisplayWidgetWorker(
+    appContext: Context,
+    workerParams: WorkerParameters
+) : CoroutineWorker(appContext, workerParams) {
+
+    override suspend fun doWork(): Result {
+        // Get all widget IDs for your ImageSwapWidget
+        val glanceIds = GlanceAppWidgetManager(applicationContext)
+            .getGlanceIds(CharacterDisplayWidget::class.java)
+
+        glanceIds.forEach { glanceId ->
+            // Update the widget's state (toggle the boolean)
+            updateAppWidgetState(
+                context = applicationContext,
+                glanceId = glanceId
+            ) { prefs ->
+                val currentImageIsImage1 = prefs[CURRENT_IMAGE_KEY] ?: true
+                prefs[CURRENT_IMAGE_KEY] = !currentImageIsImage1 // Toggle the boolean
+            }
+            // Trigger the widget to redraw itself with the new state
+            CharacterDisplayWidget().update(applicationContext, glanceId)
+        }
+
+        // Indicate that the work was successful
+        return Result.success()
+    }
+}

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

@@ -1,9 +0,0 @@
-<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,39 +1,30 @@
 <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="512"
+    android:viewportWidth="108"
-    android:viewportHeight="512">
+    android:viewportHeight="108">
-  <group android:scaleX="0.79"
+    <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">
-      android:scaleY="0.79"
+        <aapt:attr name="android:fillColor">
-      android:translateX="53.76"
+            <gradient
-      android:translateY="53.76">
+                android:endX="85.84757"
-    <group>
+                android:endY="92.4963"
-      <clip-path
+                android:startX="42.9492"
-          android:pathData="M0,0h512v512h-512z"/>
+                android:startY="49.59793"
-      <path
+                android:type="linear">
-          android:pathData="M0,0h512v512h-512z"
+                <item
-          android:fillColor="#000000"/>
+                    android:color="#44000000"
-      <path
+                    android:offset="0.0" />
-          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"
+                <item
-          android:fillColor="#EBEBEB"/>
+                    android:color="#00000000"
-      <path
+                    android:offset="1.0" />
-          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"
+            </gradient>
-          android:fillColor="#000000"
+        </aapt:attr>
-          android:strokeColor="#00000000"/>
+    </path>
-      <path
+    <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="#FFFFFF"
-          android:fillColor="#EBEBEB"/>
+        android:fillType="nonZero"
-      <group>
+        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"
-        <clip-path
+        android:strokeWidth="1"
-            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"/>
+        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: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,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
+    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

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

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

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

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

app/src/main/res/xml/widget_info.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:initialLayout="@layout/glance_default_loading_layout"
+    android:minWidth="40dp"
+    android:minHeight="20dp"
+    android:minResizeWidth="20dp"
+    android:previewImage="@drawable/baseline_image_24"
+    android:resizeMode="horizontal|vertical"
+    android:updatePeriodMillis="300000"
+    android:widgetCategory="home_screen" />