Added logger

Logger is a class (AppLogger) that sits between Log class and allows me to store debug information inside the app.

This debug information can be seen at anytime from within the application settings, and it's not sent out to any server.

.gitignore

@@ -10,10 +10,3 @@ app/src/main/res/values/keys.xml
 app/src/test/resources/com/github/nacabaro/vbhelper/source/com.bandai.vitalbraceletarena.apk
 
 app/src/test/resources/com/github/nacabaro/vbhelper/source/classes.dex
-
-app/src/main/java/com/github/nacabaro/vbhelper/battle/Battle_Sprites_Reference/
-
-app/src/main/assets/battle_sprites
-app/src/main/assets/extracted_audio
-
-API-ACR122USAM-2.01.pdf

README.md

@@ -26,7 +26,7 @@ App also comes with a dex that will update every time a new character is added,
 
     2. Once the files are extracted, look for an APK called `com.bandai.vitalbraceletarena.apk`. Copy it somewhere else, you will need it.
 
-2. Install an APK release for VB Helper. You will find the releases [here](http://github.com/nacabaro/vbhelper/releases). Download the latest release and install its APK.
+2. Install an APK release for VB Arena. You will find the releases [here](http://github.com/nacabaro/vbhelper/releases). Download the latest release and install its APK.
 
     Note, in the current stage of the project, you will have to delete the old application from your device. If the app keeps crashing after installing, clear application data and storage.
 
@@ -66,4 +66,4 @@ App also comes with a dex that will update every time a new character is added,
 
 - `lightheel` for working on the online component in the application, both server and battle client.
 
-- `shvstrz` for the app icon.
+- `shvstrz` for the app icon.

app/build.gradle.kts

@@ -2,21 +2,22 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
-    alias(libs.plugins.vksp)
-    alias(libs.plugins.vprotobuf)
+    id("com.google.devtools.ksp") version "2.3.0"
+    id("com.google.protobuf")
 }
 
 android {
     namespace = "com.github.nacabaro.vbhelper"
-    compileSdk = 37
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.github.nacabaro.vbhelper"
         minSdk = 28
-        targetSdk = 37
+        targetSdk = 36
         versionCode = 1
-        versionName = "Alpha 0.6.5"
+        versionName = "Alpha 0.6.3.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -86,11 +87,6 @@ dependencies {
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
     implementation(libs.androidx.compose.material.icons.extended)
-    implementation(libs.play.services.wearable)
-    implementation(libs.kotlinx.coroutines.play.services)
-    implementation(libs.timber)
-    implementation(libs.tinylog.api)
-    implementation(libs.tinylog.impl)
 
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
@@ -104,11 +100,4 @@ dependencies {
     androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(platform(libs.androidx.compose.bom))
     androidTestImplementation(libs.androidx.ui.test.junit4)
-
-    implementation(libs.retrofit)
-    implementation(libs.retrofit.converter.gson)
-    implementation(libs.gson)
-
-    // HTTP request logging
-    implementation(libs.okhttp.logging.interceptor)
-}
+}

app/src/main/AndroidManifest.xml

@@ -4,12 +4,6 @@
 
     <uses-permission android:name="android.permission.NFC" />
     <uses-feature android:name="android.hardware.nfc" android:required="true" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
-        tools:ignore="ScopedStorage" />
 
     <application
         android:name=".di.VBHelper"
@@ -21,47 +15,18 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.VBHelper"
-        android:usesCleartextTraffic="true"
         tools:targetApi="31">
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths" />
-        </provider>
         <activity
             android:name=".MainActivity"
             android:exported="true"
+            android:label="@string/app_name"
             android:theme="@style/Theme.VBHelper">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="vbhelper" android:host="auth" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="http" />
-                <data android:host="localhost" android:port="8080" />
-                <data android:host="127.0.0.1" android:port="8080" />
-                <data android:pathPrefix="/authenticate" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="application/x-vitalwear-character" />
-            </intent-filter>
         </activity>
     </application>
 
-</manifest>
+</manifest>

app/src/main/java/com/github/cfogrady/vitalwear/common/data/SharedDatabaseFactory.kt

@@ -1,22 +0,0 @@
-package com.github.cfogrady.vitalwear.common.data
-
-import android.content.Context
-import androidx.room.Room
-
-object SharedDatabaseFactory {
-    private const val DATABASE_NAME = "shared_transfer.db"
-
-    @Volatile
-    private var instance: SharedTransferDatabase? = null
-
-    fun getDatabase(context: Context): SharedTransferDatabase {
-        return instance ?: synchronized(this) {
-            instance ?: Room.databaseBuilder(
-                context.applicationContext,
-                SharedTransferDatabase::class.java,
-                DATABASE_NAME
-            ).build().also { instance = it }
-        }
-    }
-}
-

app/src/main/java/com/github/cfogrady/vitalwear/common/data/SharedTransferDatabase.kt

@@ -1,16 +0,0 @@
-package com.github.cfogrady.vitalwear.common.data
-
-import androidx.room.Database
-import androidx.room.RoomDatabase
-
-@Database(
-    entities = [
-        SharedTransferSeenEntity::class,
-    ],
-    version = 1,
-    exportSchema = false,
-)
-abstract class SharedTransferDatabase : RoomDatabase() {
-    abstract fun transferSeenDao(): SharedTransferSeenDao
-}
-

app/src/main/java/com/github/cfogrady/vitalwear/common/data/SharedTransferSeenDao.kt

@@ -1,47 +0,0 @@
-package com.github.cfogrady.vitalwear.common.data
-
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import androidx.room.Transaction
-
-@Dao
-interface SharedTransferSeenDao {
-	@Insert(onConflict = OnConflictStrategy.IGNORE)
-	fun insert(entry: SharedTransferSeenEntity): Long
-
-	@Query(
-		"""
-		UPDATE ${SharedTransferSeenEntity.TABLE}
-		SET cardName = :cardName,
-			seenAtEpochMillis = :seenAtEpochMillis
-		WHERE cardLookupKey = :cardLookupKey
-		  AND slotId = :slotId
-		"""
-	)
-	fun update(cardName: String, cardLookupKey: String, slotId: Int, seenAtEpochMillis: Long)
-
-	@Transaction
-	fun markSeen(cardName: String, slotId: Int, seenAtEpochMillis: Long) {
-		if (slotId < 0) {
-			return
-		}
-		val cardLookupKey = cardName.lowercase().filter { it.isLetterOrDigit() }
-		if (cardLookupKey.isBlank()) {
-			return
-		}
-		val inserted = insert(
-			SharedTransferSeenEntity(
-				cardName = cardName,
-				cardLookupKey = cardLookupKey,
-				slotId = slotId,
-				seenAtEpochMillis = seenAtEpochMillis,
-			)
-		)
-		if (inserted == -1L) {
-			update(cardName, cardLookupKey, slotId, seenAtEpochMillis)
-		}
-	}
-}
-

app/src/main/java/com/github/cfogrady/vitalwear/common/data/SharedTransferSeenEntity.kt

@@ -1,24 +0,0 @@
-package com.github.cfogrady.vitalwear.common.data
-
-import androidx.room.Entity
-import androidx.room.Index
-import androidx.room.PrimaryKey
-
-@Entity(
-    tableName = SharedTransferSeenEntity.TABLE,
-    indices = [
-        Index(value = ["cardLookupKey", "slotId"], unique = true)
-    ]
-)
-data class SharedTransferSeenEntity(
-    @PrimaryKey(autoGenerate = true) val id: Long = 0,
-    val cardName: String,
-    val cardLookupKey: String,
-    val slotId: Int,
-    val seenAtEpochMillis: Long,
-) {
-    companion object {
-        const val TABLE = "TransferSeen"
-    }
-}
-

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

@@ -1,16 +1,10 @@
 package com.github.nacabaro.vbhelper
 
-import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
-import android.util.Log
-import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.runtime.Composable
-import androidx.lifecycle.lifecycleScope
-import com.github.cfogrady.vitalwear.protos.Character
 import com.github.nacabaro.vbhelper.navigation.AppNavigation
 import com.github.nacabaro.vbhelper.di.VBHelper
 import com.github.nacabaro.vbhelper.navigation.AppNavigationHandlers
@@ -22,15 +16,11 @@ import com.github.nacabaro.vbhelper.screens.adventureScreen.AdventureScreenContr
 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.source.VitalWearCharacterImporter
 import com.github.nacabaro.vbhelper.ui.theme.VBHelperTheme
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 
 
 class MainActivity : ComponentActivity() {
     private val onActivityLifecycleListeners = HashMap<String, ActivityLifecycleListener>()
-    private var initialRoute: String? = null
 
     private fun registerActivityLifecycleListener(key: String, activityLifecycleListener: ActivityLifecycleListener) {
         if( onActivityLifecycleListeners[key] != null) {
@@ -49,8 +39,7 @@ class MainActivity : ComponentActivity() {
             application.container.dataStoreSecretsRepository.secretsFlow,
             this,
             this::registerActivityLifecycleListener,
-            this::unregisterActivityLifecycleListener,
-            application.container.db,
+            this::unregisterActivityLifecycleListener
         )
         val settingsScreenController = SettingsScreenControllerImpl(this)
         val itemsScreenController = ItemsScreenControllerImpl(this)
@@ -64,8 +53,6 @@ class MainActivity : ComponentActivity() {
 
         enableEdgeToEdge()
 
-        initialRoute = getInitialRouteFromIntent(intent)
-
         setContent {
             VBHelperTheme {
                 MainApplication(
@@ -76,19 +63,14 @@ class MainActivity : ComponentActivity() {
                     homeScreenController = homeScreenController,
                     storageScreenController = storageScreenController,
                     spriteViewerController = spriteViewerController,
-                    cardScreenController = cardScreenController,
-                    initialRoute = initialRoute
+                    cardScreenController = cardScreenController
                 )
             }
         }
-
-        Log.i("MainActivity", "Activity onCreated")
-        handleImportIntent(intent)
     }
 
     override fun onPause() {
         super.onPause()
-        Log.i("MainActivity", "onPause")
         for(activityListener in onActivityLifecycleListeners) {
             activityListener.value.onPause()
         }
@@ -96,77 +78,11 @@ class MainActivity : ComponentActivity() {
 
     override fun onResume() {
         super.onResume()
-        Log.i("MainActivity", "Resume")
         for(activityListener in onActivityLifecycleListeners) {
             activityListener.value.onResume()
         }
     }
 
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        setIntent(intent)
-        initialRoute = getInitialRouteFromIntent(intent)
-        // Optionally, you may want to trigger navigation here if needed
-        handleImportIntent(intent)
-    }
-
-    private fun handleImportIntent(intent: Intent?) {
-        val importUri = extractVitalWearImportUri(intent) ?: return
-        val application = applicationContext as VBHelper
-
-        lifecycleScope.launch(Dispatchers.IO) {
-            val result = runCatching {
-                contentResolver.openInputStream(importUri)?.use { inputStream ->
-                    val character = Character.parseFrom(inputStream)
-                    VitalWearCharacterImporter(application.container.db).importCharacter(character)
-                } ?: VitalWearCharacterImporter.ImportResult(
-                    success = false,
-                    message = "VitalWear import file could not be opened."
-                )
-            }.getOrElse {
-                VitalWearCharacterImporter.ImportResult(
-                    success = false,
-                    message = "VitalWear import failed: ${it.message ?: "Unknown error"}"
-                )
-            }
-
-            runOnUiThread {
-                Toast.makeText(this@MainActivity, result.message, Toast.LENGTH_LONG).show()
-            }
-        }
-    }
-
-    private fun extractVitalWearImportUri(intent: Intent?): Uri? {
-        if (intent == null) {
-            return null
-        }
-
-        val isVitalWearImport = intent.type == VITALWEAR_CHARACTER_MIME
-        if (!isVitalWearImport) {
-            return null
-        }
-
-        return when (intent.action) {
-            Intent.ACTION_SEND -> {
-                @Suppress("DEPRECATION")
-                intent.getParcelableExtra(Intent.EXTRA_STREAM)
-            }
-            Intent.ACTION_VIEW -> intent.data
-            else -> null
-        }
-    }
-
-    private fun getInitialRouteFromIntent(intent: Intent?): String? {
-        if (intent == null) return null
-        val data = intent.data
-        if (intent.action == Intent.ACTION_VIEW && data != null) {
-            if (data.scheme == "vbhelper" && data.host == "auth") {
-                return "Battle"
-            }
-        }
-        return null
-    }
-
     @Composable
     private fun MainApplication(
         scanScreenController: ScanScreenControllerImpl,
@@ -176,8 +92,7 @@ class MainActivity : ComponentActivity() {
         storageScreenController: StorageScreenControllerImpl,
         homeScreenController: HomeScreenControllerImpl,
         spriteViewerController: SpriteViewerControllerImpl,
-        cardScreenController: CardScreenControllerImpl,
-        initialRoute: String? = null
+        cardScreenController: CardScreenControllerImpl
     ) {
         AppNavigation(
             applicationNavigationHandlers = AppNavigationHandlers(
@@ -189,12 +104,7 @@ class MainActivity : ComponentActivity() {
                 homeScreenController,
                 spriteViewerController,
                 cardScreenController
-            ),
-            initialRoute = initialRoute
+            )
         )
     }
-
-    companion object {
-        private const val VITALWEAR_CHARACTER_MIME = "application/x-vitalwear-character"
-    }
 }

app/src/main/java/com/github/nacabaro/vbhelper/battle/APIBattleCharacter.kt

@@ -1,14 +0,0 @@
-package com.github.nacabaro.vbhelper.battle
-
-data class APIBattleCharacter(
-    val name: String,
-    val namekey: String,
-    val charaId: String,
-    val stage: Int,
-    val attribute: Int,
-    val baseHp: Int,
-    val currentHp: Int,
-    val baseBp: Float,
-    val baseAp: Float,
-    val displayName: String? = null
-)

app/src/main/java/com/github/nacabaro/vbhelper/battle/AnimatedSpriteImage.kt

@@ -1,82 +0,0 @@
-package com.github.nacabaro.vbhelper.battle
-
-import androidx.compose.foundation.Image
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.delay
-
-@Composable
-fun AnimatedSpriteImage(
-    characterId: String,
-    animationType: DigimonAnimationType = DigimonAnimationType.IDLE,
-    modifier: Modifier = Modifier,
-    contentScale: ContentScale = ContentScale.Fit,
-    reloadMappings: Boolean = false,
-    animationOffset: Long = 0L // New parameter for offsetting animation timing
-) {
-    val context = LocalContext.current
-    val spriteManager = remember { IndividualSpriteManager(context) }
-    
-    // Calculate frame offset based on animation offset
-    // 750ms is the idle animation duration, so we calculate how many frames to offset
-    val frameOffset = if (animationOffset > 0L) {
-        // Convert time offset to frame offset (2 frames per cycle, 750ms per frame)
-        ((animationOffset / 750L) * 2).toInt()
-    } else {
-        0
-    }
-    
-    val animationStateMachine = remember { DigimonAnimationStateMachine(characterId, context, frameOffset, animationOffset) }
-    val coroutineScope = rememberCoroutineScope()
-    
-    var bitmap by remember { mutableStateOf<android.graphics.Bitmap?>(null) }
-    
-    // Reload mappings when reloadMappings parameter changes
-    LaunchedEffect(reloadMappings) {
-        if (reloadMappings) {
-            animationStateMachine.reloadMappings()
-        }
-    }
-    
-    // Start the animation when the component is first created
-    LaunchedEffect(characterId) {
-        coroutineScope.launch {
-            animationStateMachine.playIdleAnimation()
-        }
-    }
-    
-    // Change animation when animationType changes
-    LaunchedEffect(animationType) {
-        coroutineScope.launch {
-            if (animationType == DigimonAnimationType.IDLE) {
-                animationStateMachine.playIdleAnimation()
-            } else {
-                animationStateMachine.playAnimation(animationType)
-            }
-        }
-    }
-    
-    // Update sprite when animation state changes
-    LaunchedEffect(animationStateMachine.currentFrameNumber) {
-        val frameNumber = animationStateMachine.getCurrentFrame()
-
-        bitmap = spriteManager.loadSpriteFrame(characterId, frameNumber)
-        
-        if (bitmap == null) {
-            println("Failed to load animated sprite frame: $frameNumber for character: $characterId")
-        }
-    }
-    
-    bitmap?.let { bmp ->
-        Image(
-            bitmap = bmp.asImageBitmap(),
-            contentDescription = "Animated Sprite: $characterId - ${animationStateMachine.currentAnimation}",
-            modifier = modifier,
-            contentScale = contentScale
-        )
-    }
-} 

app/src/main/java/com/github/nacabaro/vbhelper/battle/ArenaBattleSystem.kt

@@ -1,385 +0,0 @@
-package com.github.nacabaro.vbhelper.battle
-
-import android.util.Log
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.setValue
-import androidx.compose.runtime.State
-
-class ArenaBattleSystem {
-    companion object {
-        private const val TAG = "ArenaBattleSystem"
-    }
-
-    // Attack phases: 0=Idle, 1=Player attack on player screen, 2=Player attack on opponent screen, 
-    // 3=Opponent attack on opponent screen, 4=Opponent attack on player screen
-    private var _attackPhase by mutableStateOf(0)
-    val attackPhase: Int get() = _attackPhase
-
-    private var _attackProgress by mutableStateOf(0f)
-    val attackProgress: Float get() = _attackProgress
-
-    private var _isPlayerAttacking by mutableStateOf(false)
-    val isPlayerAttacking: Boolean get() = _isPlayerAttacking
-
-    private var _attackIsHit by mutableStateOf(false)
-    val attackIsHit: Boolean get() = _attackIsHit
-
-    private var _isAttackButtonEnabled by mutableStateOf(true)
-    val isAttackButtonEnabled: Boolean get() = _isAttackButtonEnabled
-
-    private var _currentView by mutableStateOf(0)
-    val currentView: Int get() = _currentView
-
-    private var _playerHP by mutableStateOf(100f)
-    val playerHP: Float get() = _playerHP
-
-    private var _opponentHP by mutableStateOf(100f)
-    val opponentHP: Float get() = _opponentHP
-
-    private var _isBattleOver by mutableStateOf(false)
-    val isBattleOver: Boolean get() = _isBattleOver
-
-    private var _critBarProgress by mutableStateOf(0)
-    val critBarProgress: Int get() = _critBarProgress
-
-    // Dodge animation states
-    private var _isDodging by mutableStateOf(false)
-    val isDodging: Boolean get() = _isDodging
-
-    private var _dodgeProgress by mutableStateOf(0f)
-    val dodgeProgress: Float get() = _dodgeProgress
-
-    private var _dodgeDirection by mutableStateOf(1f) // 1f = up, -1f = down
-    val dodgeDirection: Float get() = _dodgeDirection
-
-    private var _isHit by mutableStateOf(false)
-    val isHit: Boolean get() = _isHit
-
-    private var _hitProgress by mutableStateOf(0f)
-    val hitProgress: Float get() = _hitProgress
-
-    // Separate states for player and opponent
-    private var _isPlayerDodging by mutableStateOf(false)
-    val isPlayerDodging: Boolean get() = _isPlayerDodging
-
-    private var _isOpponentDodging by mutableStateOf(false)
-    val isOpponentDodging: Boolean get() = _isOpponentDodging
-
-    // Separate dodge progress and direction for player and opponent
-    private var _playerDodgeProgress by mutableStateOf(0f)
-    val playerDodgeProgress: Float get() = _playerDodgeProgress
-
-    private var _playerDodgeDirection by mutableStateOf(1f)
-    val playerDodgeDirection: Float get() = _playerDodgeDirection
-
-    private var _opponentDodgeProgress by mutableStateOf(0f)
-    val opponentDodgeProgress: Float get() = _opponentDodgeProgress
-
-    private var _opponentDodgeDirection by mutableStateOf(1f)
-    val opponentDodgeDirection: Float get() = _opponentDodgeDirection
-
-    private var _isPlayerHit by mutableStateOf(false)
-    val isPlayerHit: Boolean get() = _isPlayerHit
-
-    private var _isOpponentHit by mutableStateOf(false)
-    val isOpponentHit: Boolean get() = _isOpponentHit
-
-    // Delayed hit states for SLEEP animation timing
-    private var _isPlayerHitDelayed by mutableStateOf(false)
-    val isPlayerHitDelayed: Boolean get() = _isPlayerHitDelayed
-
-    private var _isOpponentHitDelayed by mutableStateOf(false)
-    val isOpponentHitDelayed: Boolean get() = _isOpponentHitDelayed
-
-    // Delayed shake states for shake animation timing
-    private var _isPlayerShakeDelayed by mutableStateOf(false)
-    val isPlayerShakeDelayed: Boolean get() = _isPlayerShakeDelayed
-
-    private var _isOpponentShakeDelayed by mutableStateOf(false)
-    val isOpponentShakeDelayed: Boolean get() = _isOpponentShakeDelayed
-
-    // Counter-attack tracking
-    private var _shouldCounterAttack by mutableStateOf(false)
-    val shouldCounterAttack: Boolean get() = _shouldCounterAttack
-
-    private var _counterAttackIsHit by mutableStateOf(false)
-    val counterAttackIsHit: Boolean get() = _counterAttackIsHit
-
-    // Separate tracking for opponent attack result
-    private var _opponentAttackIsHit by mutableStateOf(false)
-    val opponentAttackIsHit: Boolean get() = _opponentAttackIsHit
-
-    fun startPlayerAttack() {
-        _attackPhase = 1
-        _attackProgress = 0f
-        _isPlayerAttacking = true
-        _isAttackButtonEnabled = false
-        _currentView = 0
-    }
-
-    fun startOpponentAttack() {
-        _attackPhase = 3
-        _attackProgress = 0f
-        _isPlayerAttacking = false
-        _currentView = 1
-    }
-
-    fun advanceAttackPhase() {
-        _attackPhase++
-        _attackProgress = 0f
-    }
-
-    fun setAttackProgress(progress: Float) {
-        _attackProgress = progress
-    }
-
-    fun setAttackHitState(isHit: Boolean) {
-        _attackIsHit = isHit
-    }
-
-    fun switchToView(view: Int) {
-        _currentView = view
-    }
-
-    fun enableAttackButton() {
-        _isAttackButtonEnabled = true
-    }
-
-    fun applyDamage(isPlayer: Boolean, damage: Float) {
-        if (isPlayer) {
-            _playerHP = (_playerHP - damage).coerceAtLeast(0f)
-        } else {
-            _opponentHP = (_opponentHP - damage).coerceAtLeast(0f)
-        }
-    }
-
-    fun updateHPFromAPI(playerHP: Float, opponentHP: Float) {
-        _playerHP = playerHP
-        _opponentHP = opponentHP
-    }
-
-    fun initializeHP(playerHP: Float, opponentHP: Float) {
-        _playerHP = playerHP
-        _opponentHP = opponentHP
-    }
-
-    fun completeAttackAnimation(playerDamage: Float = 0f, opponentDamage: Float = 0f) {
-        if (playerDamage > 0f) {
-            applyDamage(true, playerDamage)
-        }
-        if (opponentDamage > 0f) {
-            applyDamage(false, opponentDamage)
-        }
-    }
-
-    fun resetAttackState() {
-        _attackPhase = 0
-        _attackProgress = 0f
-        _isPlayerAttacking = false
-        _attackIsHit = false
-        _currentView = 0
-        _isDodging = false
-        _dodgeProgress = 0f
-        _dodgeDirection = 1f
-        _isHit = false
-        _hitProgress = 0f
-        _isPlayerDodging = false
-        _isOpponentDodging = false
-        _playerDodgeProgress = 0f
-        _playerDodgeDirection = 1f
-        _opponentDodgeProgress = 0f
-        _opponentDodgeDirection = 1f
-        _isPlayerHit = false
-        _isOpponentHit = false
-        _isPlayerHitDelayed = false
-        _isOpponentHitDelayed = false
-        _isPlayerShakeDelayed = false
-        _isOpponentShakeDelayed = false
-        _shouldCounterAttack = false
-        _counterAttackIsHit = false
-        _opponentAttackIsHit = false
-    }
-
-    fun checkBattleOver(): Boolean {
-        return _playerHP <= 0f || _opponentHP <= 0f
-    }
-
-    fun endBattle() {
-        _isBattleOver = true
-    }
-
-    fun updateCritBarProgress(progress: Int) {
-        _critBarProgress = progress
-        //Log.d(TAG, "Updated crit bar progress: $progress")
-    }
-
-    // Dodge animation methods
-    fun startDodge() {
-        _isDodging = true
-        _dodgeProgress = 0f
-        _dodgeDirection = 1f // Start moving up
-    }
-
-    fun setDodgeProgress(progress: Float) {
-        _dodgeProgress = progress
-    }
-
-    fun setDodgeDirection(direction: Float) {
-        _dodgeDirection = direction
-    }
-
-    fun endDodge() {
-        _isDodging = false
-        _dodgeProgress = 0f
-    }
-
-    // Hit animation methods
-    fun startHit() {
-        _isHit = true
-        _hitProgress = 0f
-    }
-
-    fun setHitProgress(progress: Float) {
-        _hitProgress = progress
-    }
-
-    fun endHit() {
-        _isHit = false
-        _hitProgress = 0f
-    }
-
-    // Player-specific dodge methods
-    fun startPlayerDodge() {
-        _isPlayerDodging = true
-        _playerDodgeProgress = 0f
-        _playerDodgeDirection = 1f
-    }
-
-    fun endPlayerDodge() {
-        _isPlayerDodging = false
-        _playerDodgeProgress = 0f
-    }
-
-    fun setPlayerDodgeProgress(progress: Float) {
-        _playerDodgeProgress = progress
-    }
-
-    fun setPlayerDodgeDirection(direction: Float) {
-        _playerDodgeDirection = direction
-    }
-
-    // Opponent-specific dodge methods
-    fun startOpponentDodge() {
-        _isOpponentDodging = true
-        _opponentDodgeProgress = 0f
-        _opponentDodgeDirection = 1f
-    }
-
-    fun endOpponentDodge() {
-        _isOpponentDodging = false
-        _opponentDodgeProgress = 0f
-    }
-
-    fun setOpponentDodgeProgress(progress: Float) {
-        _opponentDodgeProgress = progress
-    }
-
-    fun setOpponentDodgeDirection(direction: Float) {
-        _opponentDodgeDirection = direction
-    }
-
-    // Player-specific hit methods
-    fun startPlayerHit() {
-        _isPlayerHit = true
-        _hitProgress = 0f
-    }
-
-    fun startPlayerHitDelayed() {
-        _isPlayerHitDelayed = true
-    }
-
-    fun endPlayerHit() {
-        _isPlayerHit = false
-        _hitProgress = 0f
-    }
-
-    fun endPlayerHitDelayed() {
-        _isPlayerHitDelayed = false
-    }
-
-    // Opponent-specific hit methods
-    fun startOpponentHit() {
-        _isOpponentHit = true
-        _hitProgress = 0f
-    }
-
-    fun startOpponentHitDelayed() {
-        _isOpponentHitDelayed = true
-    }
-
-    fun endOpponentHit() {
-        _isOpponentHit = false
-        _hitProgress = 0f
-    }
-
-    fun endOpponentHitDelayed() {
-        _isOpponentHitDelayed = false
-    }
-
-    // Delayed shake methods
-    fun startPlayerShakeDelayed() {
-        _isPlayerShakeDelayed = true
-    }
-
-    fun endPlayerShakeDelayed() {
-        _isPlayerShakeDelayed = false
-    }
-
-    fun startOpponentShakeDelayed() {
-        _isOpponentShakeDelayed = true
-    }
-
-    fun endOpponentShakeDelayed() {
-        _isOpponentShakeDelayed = false
-    }
-
-    // Combined method to handle attack result
-    fun handleAttackResult(isHit: Boolean) {
-        _attackIsHit = isHit
-        if (isHit) {
-            // Player attack hit - opponent gets hit
-            startOpponentHit()
-        } else {
-            // Player attack missed - opponent dodges
-            startOpponentDodge()
-        }
-    }
-
-    // Method to handle opponent attack result
-    fun handleOpponentAttackResult(isHit: Boolean) {
-        _opponentAttackIsHit = isHit
-        if (isHit) {
-            // Opponent attack hit - player gets hit
-            startPlayerHit()
-        } else {
-            // Opponent attack missed - player dodges
-            startPlayerDodge()
-        }
-    }
-
-    // Counter-attack methods
-    fun setupCounterAttack(isHit: Boolean) {
-        _shouldCounterAttack = true
-        _counterAttackIsHit = isHit
-    }
-
-    fun startCounterAttack() {
-        _attackPhase = 3
-        _attackProgress = 0f
-        _isPlayerAttacking = false
-        _currentView = 1
-        _opponentAttackIsHit = _counterAttackIsHit
-    }
-} 

app/src/main/java/com/github/nacabaro/vbhelper/battle/AttackSpriteManager.kt

@@ -1,151 +0,0 @@
-package com.github.nacabaro.vbhelper.battle
-
-import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.os.Environment
-import com.google.gson.Gson
-import java.io.File
-
-data class CharacterData(
-    val name: String,
-    val charaId: String,
-    val smalefilename: String,
-    val laugeFileName: String
-)
-
-data class CharacterDataResponse(
-    val name: String,
-    val type: String,
-    val source_file: String,
-    val collection: String,
-    val unity_collection_id: String,
-    val relative_path: String,
-    val all_attributes: CharacterDataAttributes
-)
-
-data class CharacterDataAttributes(
-    val DataList: List<String>
-)
-
-class AttackSpriteManager(private val context: Context) {
-    private val gson = Gson()
-    private val characterDataCache = mutableMapOf<String, CharacterData>()
-    
-    // Get the external storage directory for attack sprites
-    private fun getAttackTexturesBaseDir(): File {
-        val externalDir = android.os.Environment.getExternalStorageDirectory()
-        return File(externalDir, "VBHelper/battle_sprites/extracted_atksprites")
-    }
-    
-    fun getAttackSprite(characterId: String, isLarge: Boolean = false): Bitmap? {
-        println("AttackSpriteManager: Getting attack sprite for characterId=$characterId, isLarge=$isLarge")
-        try {
-            // Get character data
-            val characterData = getCharacterData(characterId) ?: return null
-            // Determine which attack file to use
-            val attackFileName = if (isLarge) {
-                characterData.laugeFileName
-            } else {
-                characterData.smalefilename
-            }
-            
-            // Skip if no attack file
-            if (attackFileName == "0") {
-                println("AttackSpriteManager: Skipping attack file (filename is '0')")
-                return null
-            }
-            
-            // Load the attack sprite from external storage
-            val attackFile = File(getAttackTexturesBaseDir(), "$attackFileName.png")
-            
-            return if (attackFile.exists()) {
-                val bitmap = BitmapFactory.decodeFile(attackFile.absolutePath)
-                bitmap
-            } else {
-                println("AttackSpriteManager: Attack file does not exist")
-                null
-            }
-        } catch (e: Exception) {
-            println("AttackSpriteManager: Exception occurred: ${e.message}")
-            e.printStackTrace()
-            return null
-        }
-    }
-    
-    private fun getCharacterData(characterId: String): CharacterData? {
-        // Check cache first
-        if (characterDataCache.containsKey(characterId)) {
-            return characterDataCache[characterId]
-        }
-        
-        try {
-            // Load character data from JSON file in external storage
-            val externalDir = android.os.Environment.getExternalStorageDirectory()
-            val characterDataFile = File(externalDir, "VBHelper/battle_sprites/extracted_digimon_stats/character_data/CharacterData.json")
-            
-            if (!characterDataFile.exists()) {
-                println("AttackSpriteManager: Character data file does not exist, using default data")
-                // For now, return a default character data
-                val characterData = CharacterData(
-                    name = characterId,
-                    charaId = characterId,
-                    smalefilename = "atk_s_02", // Default small attack
-                    laugeFileName = "atk_l_04"   // Default large attack
-                )
-                
-                characterDataCache[characterId] = characterData
-                return characterData
-            }
-            
-            val jsonContent = characterDataFile.readText()
-            
-            // Parse the JSON response
-            val response = gson.fromJson(jsonContent, CharacterDataResponse::class.java)
-            
-            // Search through the DataList for the matching characterId
-            for (characterString in response.all_attributes.DataList) {
-                // Extract charaId from the string format: "<UnknownObject<Character> id=0, charaId='dim000_mon03', ...>"
-                val charaIdMatch = Regex("charaId='([^']+)'").find(characterString)
-                if (charaIdMatch != null) {
-                    val foundCharaId = charaIdMatch.groupValues[1]
-                    if (foundCharaId == characterId) {
-                        // Extract smalefilename and laugeFileName
-                        val smallFileMatch = Regex("smalefilename='([^']+)'").find(characterString)
-                        val largeFileMatch = Regex("laugeFileName='([^']+)'").find(characterString)
-                        
-                        val smallFileName = smallFileMatch?.groupValues?.get(1) ?: "0"
-                        val largeFileName = largeFileMatch?.groupValues?.get(1) ?: "0"
-                        
-                        val characterData = CharacterData(
-                            name = characterId,
-                            charaId = characterId,
-                            smalefilename = smallFileName,
-                            laugeFileName = largeFileName
-                        )
-                        
-                        characterDataCache[characterId] = characterData
-                        return characterData
-                    }
-                }
-            }
-            
-            // If character not found, return default data
-            println("AttackSpriteManager: Character not found in JSON, using default data")
-            val characterData = CharacterData(
-                name = characterId,
-                charaId = characterId,
-                smalefilename = "atk_s_02", // Default small attack
-                laugeFileName = "atk_l_04"   // Default large attack
-            )
-            
-            characterDataCache[characterId] = characterData
-            return characterData
-            
-        } catch (e: Exception) {
-            println("AttackSpriteManager: Exception in getCharacterData: ${e.message}")
-            e.printStackTrace()
-            return null
-        }
-    }
-} 

app/src/main/java/com/github/nacabaro/vbhelper/battle/AuthInterceptor.kt

@@ -1,31 +0,0 @@
-package com.github.nacabaro.vbhelper.battle
-
-import okhttp3.Interceptor
-import okhttp3.Response
-
-/**
- * OkHttp interceptor that adds Authorization header to API requests.
- * Skips adding header for auth endpoints.
- */
-class AuthInterceptor(private val token: String) : Interceptor {
-    override fun intercept(chain: Interceptor.Chain): Response {
-        val originalRequest = chain.request()
-        
-        // Skip adding auth header for auth endpoints
-        if (originalRequest.url.encodedPath.startsWith("/api/auth")) {
-            return chain.proceed(originalRequest)
-        }
-        
-        // Add authentication header for game endpoints
-        // Use X-Session-Token header (preferred) or Authorization: Bearer
-        val authenticatedRequest = originalRequest.newBuilder()
-            .header("X-Session-Token", token)
-            .build()
-        
-        // Debug: Log which header is being used (first few chars of token for security)
-        val tokenPreview = if (token.length > 8) "${token.take(4)}...${token.takeLast(4)}" else "***"
-        println("AuthInterceptor: Adding X-Session-Token header (token: $tokenPreview)")
-        
-        return chain.proceed(authenticatedRequest)
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/battle/AuthService.kt

@@ -1,14 +0,0 @@
-package com.github.nacabaro.vbhelper.battle
-
-import retrofit2.Call
-import retrofit2.http.Body
-import retrofit2.http.POST
-
-interface AuthService {
-    @POST("api/auth/validate")
-    fun validate(@Body request: AuthenticateRequest): Call<AuthenticateResponse>
-    
-    @POST("api/auth/login")
-    fun login(@Body request: AuthenticateRequest): Call<AuthenticateResponse>
-}
-

app/src/main/java/com/github/nacabaro/vbhelper/battle/AuthenticateRequest.kt

@@ -1,6 +0,0 @@
-package com.github.nacabaro.vbhelper.battle
-
-data class AuthenticateRequest(
-    val userToken: String
-)
-

app/src/main/java/com/github/nacabaro/vbhelper/battle/AuthenticateResponse.kt

@@ -1,21 +0,0 @@
-package com.github.nacabaro.vbhelper.battle
-
-data class AdditionalInfo(
-    val avatar: String? = null,
-    val id: Long? = null,
-    val name: String? = null,
-    val status: String? = null
-)
-
-data class UserInfo(
-    val userId: String? = null,
-    val additionalInfo: AdditionalInfo? = null
-)
-
-data class AuthenticateResponse(
-    val success: Boolean,
-    val message: String? = null,
-    val userInfo: UserInfo? = null,
-    val sessionToken: String? = null
-)
-

app/src/main/java/com/github/nacabaro/vbhelper/battle/BattleAuthContainer.kt

@@ -1,16 +0,0 @@
-package com.github.nacabaro.vbhelper.battle
-
-import android.content.Context
-import androidx.datastore.preferences.core.Preferences
-import androidx.datastore.preferences.preferencesDataStore
-import com.github.nacabaro.vbhelper.source.AuthRepository
-
-private const val BATTLE_AUTH_PREFERENCES_NAME = "battle_auth_preferences"
-val Context.battleAuthStore: androidx.datastore.core.DataStore<Preferences> by preferencesDataStore(
-    name = BATTLE_AUTH_PREFERENCES_NAME
-)
-
-class BattleAuthContainer(private val context: Context) {
-    val authRepository: AuthRepository = AuthRepository(context.battleAuthStore)
-}
-

app/src/main/java/com/github/nacabaro/vbhelper/battle/BattleSpriteManager.kt

@@ -1,181 +0,0 @@
-package com.github.nacabaro.vbhelper.battle
-
-import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.os.Environment
-import com.google.gson.Gson
-import java.io.File
-
-data class SpriteMapping(
-    val atlas_name: String,
-    val atlas_file: String,
-    val texture: TextureInfo,
-    val sprites: List<String>
-)
-
-data class TextureInfo(
-    val name: String,
-    val file: String,
-    val path_id: Long
-)
-
-data class SpriteData(
-    val name: String,
-    val atlas_name: String,
-    val m_Name: String,
-    val texture_rect: TextureRect
-)
-
-data class TextureRect(
-    val height: Float,
-    val width: Float,
-    val x: Float,
-    val y: Float
-)
-
-class BattleSpriteManager(private val context: Context) {
-    private val gson = Gson()
-    private val spriteCache = mutableMapOf<String, Bitmap>()
-    
-    // Get the external storage directory for sprite files
-    private fun getSpriteBaseDir(): File {
-        val externalDir = android.os.Environment.getExternalStorageDirectory()
-        return File(externalDir, "VBHelper/battle_sprites/extracted_assets")
-    }
-    
-    fun loadSprite(spriteName: String, atlasName: String): Bitmap? {
-        val cacheKey = "${spriteName}_${atlasName}"
-        
-        // Check cache first
-        if (spriteCache.containsKey(cacheKey)) {
-            return spriteCache[cacheKey]
-        }
-        
-        // Debug: Check if base directory exists
-        val spriteBaseDir = getSpriteBaseDir()
-        if (!spriteBaseDir.exists()) {
-            println("Sprite base directory does not exist: ${spriteBaseDir.absolutePath}")
-            return null
-        }
-        
-        println("Sprite base directory exists: ${spriteBaseDir.absolutePath}")
-        println("Available directories: ${spriteBaseDir.listFiles()?.map { it.name }}")
-        
-        try {
-            // Load the PNG texture file directly using the atlas name
-            val textureFile = File(spriteBaseDir, "extracted_textures/${atlasName}.png")
-            
-            if (!textureFile.exists()) {
-                println("Texture file not found: ${textureFile.absolutePath}")
-                return null
-            }
-            
-            val fullBitmap = BitmapFactory.decodeFile(textureFile.absolutePath)
-            if (fullBitmap == null) {
-                println("Failed to decode texture file: ${textureFile.absolutePath}")
-                return null
-            }
-            
-            // Load the specific sprite data file
-            val spriteDataFile = File(spriteBaseDir, "sprites/${spriteName}.json")
-            if (!spriteDataFile.exists()) {
-                println("Sprite data file not found: ${spriteDataFile.absolutePath}")
-                return null
-            }
-            
-            val spriteDataJson = spriteDataFile.readText()
-            val spriteData = gson.fromJson(spriteDataJson, SpriteData::class.java)
-            
-            // Debug: Print sprite coordinates
-            println("Sprite coordinates: x=${spriteData.texture_rect.x}, y=${spriteData.texture_rect.y}, width=${spriteData.texture_rect.width}, height=${spriteData.texture_rect.height}")
-            println("Texture dimensions: width=${fullBitmap.width}, height=${fullBitmap.height}")
-            
-            // Calculate the correct Y coordinate (inverted coordinate system)
-            val correctedY = fullBitmap.height - spriteData.texture_rect.y.toInt() - spriteData.texture_rect.height.toInt()
-            
-            // Extract the sprite from the atlas using texture_rect coordinates
-            val spriteBitmap = Bitmap.createBitmap(
-                fullBitmap,
-                spriteData.texture_rect.x.toInt(),
-                correctedY,
-                spriteData.texture_rect.width.toInt(),
-                spriteData.texture_rect.height.toInt()
-            )
-            
-            // Ensure the bitmap is not scaled and has proper quality
-            val finalBitmap = if (spriteBitmap.width != spriteData.texture_rect.width.toInt() || 
-                                  spriteBitmap.height != spriteData.texture_rect.height.toInt()) {
-                // If the bitmap was scaled during creation, create a new one with exact dimensions
-                Bitmap.createScaledBitmap(spriteBitmap, 
-                    spriteData.texture_rect.width.toInt(), 
-                    spriteData.texture_rect.height.toInt(), 
-                    false) // false = no filtering/interpolation
-            } else {
-                spriteBitmap
-            }
-            
-            println("Extracted sprite dimensions: ${finalBitmap.width}x${finalBitmap.height}")
-            
-            // Cache the result
-            spriteCache[cacheKey] = finalBitmap
-            
-            return finalBitmap
-            
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return null
-        }
-    }
-    
-    fun clearCache() {
-        spriteCache.clear()
-    }
-    
-    // Helper method to get available sprites for an atlas
-    fun getAvailableSprites(atlasName: String): List<String> {
-        try {
-            val spritesDir = File(getSpriteBaseDir(), "sprites")
-            if (!spritesDir.exists()) {
-                return emptyList()
-            }
-            
-            val spriteFiles = spritesDir.listFiles { file ->
-                file.name.startsWith("${atlasName}_sprite_") && file.name.endsWith(".json")
-            } ?: emptyArray()
-            
-            return spriteFiles.map { file ->
-                // Extract sprite number from filename (e.g., "dim000_mon01_sprite_00.json" -> "00")
-                val spriteNumber = file.name.substringAfter("_sprite_").substringBefore(".json")
-                spriteNumber
-            }.sorted()
-            
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return emptyList()
-        }
-    }
-    
-    // Helper method to get available atlases
-    fun getAvailableAtlases(): List<String> {
-        try {
-            val texturesDir = File(getSpriteBaseDir(), "extracted_textures")
-            if (!texturesDir.exists()) {
-                return emptyList()
-            }
-            
-            val textureFiles = texturesDir.listFiles { file ->
-                file.name.endsWith(".png")
-            } ?: emptyArray()
-            
-            return textureFiles.map { file ->
-                // Extract atlas name from filename (e.g., "dim000_mon01.png" -> "dim000_mon01")
-                file.name.substringBefore(".png")
-            }.sorted()
-            
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return emptyList()
-        }
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/battle/DigimonAnimationState.kt

@@ -1,167 +0,0 @@
-package com.github.nacabaro.vbhelper.battle
-
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
-import kotlinx.coroutines.delay
-import android.content.Context
-import java.io.File
-
-enum class DigimonAnimationType {
-    IDLE,
-    IDLE2,
-    WALK,
-    WALK2,
-    RUN,
-    RUN2,
-    WORKOUT,
-    WORKOUT2,
-    HAPPY,
-    SLEEP,
-    ATTACK,
-    FLEE
-}
-
-data class AnimationState(
-    val type: DigimonAnimationType,
-    val frameNumber: Int, // 1-12 for individual PNG files
-    val duration: Long = 100L, // Duration in milliseconds
-    val loop: Boolean = true
-)
-
-class DigimonAnimationStateMachine(
-    private val characterId: String,
-    private val context: Context,
-    private val initialFrameOffset: Int = 0, // New parameter for offsetting the starting frame
-    private val timingOffset: Long = 0L // New parameter for offsetting the timing
-) {
-    var currentAnimation by mutableStateOf<DigimonAnimationType>(DigimonAnimationType.IDLE)
-        private set
-    
-    var currentFrameNumber by mutableStateOf(1)
-        private set
-    
-    var isPlaying by mutableStateOf(false)
-        private set
-    
-    // Direct mapping of frame numbers (1-12) to animation types
-    // This is based on the standard Digimon sprite frame order
-    private val frameToAnimationType = mapOf(
-        1 to DigimonAnimationType.IDLE,
-        2 to DigimonAnimationType.IDLE2,
-        3 to DigimonAnimationType.WALK,
-        4 to DigimonAnimationType.WALK2,
-        5 to DigimonAnimationType.RUN,
-        6 to DigimonAnimationType.RUN2,
-        7 to DigimonAnimationType.WORKOUT,
-        8 to DigimonAnimationType.WORKOUT2,
-        9 to DigimonAnimationType.HAPPY,
-        10 to DigimonAnimationType.SLEEP,
-        11 to DigimonAnimationType.ATTACK,
-        12 to DigimonAnimationType.FLEE
-    )
-    
-    // Reverse mapping for getting frame numbers for each animation type
-    private val animationTypeToFrames = frameToAnimationType.entries.groupBy({ it.value }, { it.key })
-    
-    // Animation durations for each type
-    private val animationDurations = mapOf(
-        DigimonAnimationType.IDLE to 750L,
-        DigimonAnimationType.IDLE2 to 750L,
-        DigimonAnimationType.WALK to 200L,
-        DigimonAnimationType.WALK2 to 200L,
-        DigimonAnimationType.RUN to 150L,
-        DigimonAnimationType.RUN2 to 150L,
-        DigimonAnimationType.WORKOUT to 300L,
-        DigimonAnimationType.WORKOUT2 to 300L,
-        DigimonAnimationType.HAPPY to 400L,
-        DigimonAnimationType.SLEEP to 1500L,
-        DigimonAnimationType.ATTACK to 650L,
-        DigimonAnimationType.FLEE to 150L
-    )
-
-    /*
-    init {
-        println("Initialized DigimonAnimationStateMachine for character: $characterId with frame offset: $initialFrameOffset, timing offset: $timingOffset")
-        println("Available animation types: ${animationTypeToFrames.keys}")
-    }
-    */
-    
-    suspend fun playAnimation(animationType: DigimonAnimationType) {
-        if (currentAnimation == animationType && isPlaying) {
-            return // Already playing this animation
-        }
-        
-        currentAnimation = animationType
-        isPlaying = true
-        
-        val frameNumbers = animationTypeToFrames[animationType] ?: listOf(1)
-        val duration = animationDurations[animationType] ?: 100L
-        
-        // For non-looping animations like ATTACK, play once and return to IDLE
-        if (animationType == DigimonAnimationType.ATTACK) {
-            currentFrameNumber = frameNumbers.firstOrNull() ?: 1
-            delay(duration)
-            playAnimation(DigimonAnimationType.IDLE)
-        } else {
-            // For looping animations, cycle through frames
-            var frameIndex = 0
-            while (isPlaying && currentAnimation == animationType) {
-                val frameNumber = frameNumbers[frameIndex % frameNumbers.size]
-                currentFrameNumber = frameNumber
-                delay(duration)
-                frameIndex++
-            }
-        }
-    }
-    
-    // Special method for idle animation that cycles between IDLE and IDLE2
-    suspend fun playIdleAnimation() {
-        if (currentAnimation == DigimonAnimationType.IDLE && isPlaying) {
-            return // Already playing idle animation
-        }
-        
-        currentAnimation = DigimonAnimationType.IDLE
-        isPlaying = true
-
-        val idleFrames = animationTypeToFrames[DigimonAnimationType.IDLE] ?: listOf(1)
-        val idle2Frames = animationTypeToFrames[DigimonAnimationType.IDLE2] ?: listOf(2)
-        
-        // Combine frames for cycling idle animation
-        val combinedFrames = (idleFrames + idle2Frames).distinct()
-        
-        val duration = animationDurations[DigimonAnimationType.IDLE] ?: 500L
-        
-        // Apply initial timing offset
-        if (timingOffset > 0L) {
-            delay(timingOffset)
-        }
-        
-        // Cycle through idle frames, starting from the offset
-        var frameIndex = initialFrameOffset
-        while (isPlaying && currentAnimation == DigimonAnimationType.IDLE) {
-            val frameNumber = combinedFrames[frameIndex % combinedFrames.size]
-            currentFrameNumber = frameNumber
-            delay(duration)
-            frameIndex++
-        }
-    }
-    
-    fun stopAnimation() {
-        isPlaying = false
-    }
-    
-    fun getCurrentFrame(): Int {
-        return currentFrameNumber
-    }
-    
-    fun getCurrentCharacterId(): String {
-        return characterId
-    }
-    
-    // Method to reload mappings (useful for testing)
-    fun reloadMappings() {
-        println("Reloading mappings for character: $characterId")
-        // No need to reload since we use direct frame mapping
-    }
-} 

app/src/main/java/com/github/nacabaro/vbhelper/battle/HitEffectComposables.kt

@@ -1,120 +0,0 @@
-package com.github.nacabaro.vbhelper.battle
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.size
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.unit.dp
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-
-@Composable
-fun HitEffectOverlay(
-    isVisible: Boolean,
-    modifier: Modifier = Modifier,
-    isPlayerScreen: Boolean = false,
-    onAnimationComplete: () -> Unit = {}
-) {
-    if (!isVisible) return
-    
-    val context = LocalContext.current
-    val configuration = LocalConfiguration.current
-    val isLandscapeMode = configuration.orientation == android.content.res.Configuration.ORIENTATION_LANDSCAPE
-    val hitEffectManager = remember { HitEffectSpriteManager(context) }
-    val coroutineScope = rememberCoroutineScope()
-    
-    var currentFrame by remember { mutableStateOf(0) }
-    var currentSprite by remember { mutableStateOf<android.graphics.Bitmap?>(null) }
-    var animationProgress by remember { mutableStateOf(0f) }
-    var scale by remember { mutableStateOf(0.5f) }
-    var alpha by remember { mutableStateOf(1f) }
-    
-    LaunchedEffect(isVisible) {
-        if (isVisible) {
-            
-            // Add delay before starting hit effect animation
-            delay(400) // Increased from 200ms to 400ms delay before hit effect appears
-            
-            // Randomly choose between hit_01, hit_02, and hit_02_white
-            val hitSpriteName = when (kotlin.random.Random.nextInt(3)) {
-                0 -> "hit_01"
-                1 -> "hit_02"
-                else -> "hit_02_white"
-            }
-            currentSprite = hitEffectManager.loadHitSprite(hitSpriteName)
-            
-            if (currentSprite != null) {
-                // Animate the hit effect
-                animationProgress = 0f
-                scale = 0.5f
-                alpha = 1f
-                
-                // Scale up animation - slowed down
-                while (scale < 1.2f) {
-                    scale += 0.05f  // Reduced from 0.1f to 0.05f
-                    delay(32)       // Increased from 16ms to 32ms
-                }
-                
-                // Hold for a moment - increased duration
-                delay(300)  // Increased from 100ms to 300ms
-                
-                // Fade out - slowed down
-                while (alpha > 0f) {
-                    alpha -= 0.03f  // Reduced from 0.05f to 0.03f
-                    delay(32)       // Increased from 16ms to 32ms
-                }
-                
-                println("DEBUG: Hit effect animation completed")
-                onAnimationComplete()
-            } else {
-                println("DEBUG: Failed to load hit sprite")
-                onAnimationComplete()
-            }
-        }
-    }
-    
-    currentSprite?.let { sprite ->
-        Box(
-            modifier = modifier.fillMaxSize(),
-            contentAlignment = Alignment.Center
-        ) {
-            Image(
-                bitmap = sprite.asImageBitmap(),
-                contentDescription = "Hit Effect",
-                modifier = Modifier
-                    .size((sprite.width * scale).dp, (sprite.height * scale).dp)
-                    .offset(
-                        x = if (isPlayerScreen) {
-                            // On player screen, position further to the left
-                            if (isLandscapeMode) {
-                                // In landscape mode, move even further left for player screen
-                                (-sprite.width * scale / 2 - 300).dp
-                            } else {
-                                // In portrait mode, use original positioning
-                                (-sprite.width * scale / 2 - 100).dp
-                            }
-                        } else {
-                            // On enemy screen, position further to the right
-                            if (isLandscapeMode) {
-                                // In landscape mode, move even further right for enemy screen
-                                (-sprite.width * scale / 2 + 350).dp
-                            } else {
-                                // In portrait mode, use original positioning
-                                (-sprite.width * scale / 2 + 150).dp
-                            }
-                        },
-                        y = (-sprite.height * scale / 2 + 40).dp  // Position lower on screen (was -60, now +40)
-                    ),
-                contentScale = ContentScale.Fit
-            )
-        }
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/battle/HitEffectSpriteManager.kt

@@ -1,172 +0,0 @@
-package com.github.nacabaro.vbhelper.battle
-
-import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.graphics.Rect
-import android.os.Environment
-import java.io.File
-
-class HitEffectSpriteManager(private val context: Context) {
-    private val spriteCache = mutableMapOf<String, Bitmap>()
-    
-    // Get the external storage directory for hit effect sprites
-    private fun getHitSpritesDir(): File {
-        val externalDir = android.os.Environment.getExternalStorageDirectory()
-        return File(externalDir, "VBHelper/battle_sprites/extracted_hit_sprites")
-    }
-    
-    /**
-     * Load a hit sprite (hit_01.png, hit_02.png, hit_02_white.png)
-     * @param spriteName The sprite name (e.g., "hit_01", "hit_02", "hit_02_white")
-     * @return Bitmap of the hit sprite, or null if not found
-     */
-    fun loadHitSprite(spriteName: String): Bitmap? {
-        val cacheKey = "hit_$spriteName"
-        
-        // Check cache first
-        if (spriteCache.containsKey(cacheKey)) {
-            return spriteCache[cacheKey]
-        }
-        
-        try {
-            val hitSpritesDir = getHitSpritesDir()
-            val spriteFile = File(hitSpritesDir, "$spriteName.png")
-            
-            if (!spriteFile.exists()) {
-                println("Hit sprite file not found: ${spriteFile.absolutePath}")
-                return null
-            }
-            
-            val bitmap = BitmapFactory.decodeFile(spriteFile.absolutePath)
-            if (bitmap == null) {
-                println("Failed to decode hit sprite file: ${spriteFile.absolutePath}")
-                return null
-            }
-            
-            // Cache the result
-            spriteCache[cacheKey] = bitmap
-            
-            return bitmap
-            
-        } catch (e: Exception) {
-            println("Error loading hit sprite: ${e.message}")
-            e.printStackTrace()
-            return null
-        }
-    }
-    
-    /**
-     * Load a damage effect sprite from spritesheet
-     * @param spritesheetName The spritesheet name (e.g., "dmg_ef1", "dmg_ef2")
-     * @param frameIndex The frame index (0-3 for dmg_ef1 and dmg_ef2, 0 for dmg_ef3)
-     * @return Bitmap of the damage effect frame, or null if not found
-     */
-    fun loadDamageEffectSprite(spritesheetName: String, frameIndex: Int = 0): Bitmap? {
-        val cacheKey = "dmg_${spritesheetName}_frame_${frameIndex}"
-        
-        // Check cache first
-        if (spriteCache.containsKey(cacheKey)) {
-            return spriteCache[cacheKey]
-        }
-        
-        try {
-            val spritesheetFile = File(getHitSpritesDir(), "$spritesheetName.png")
-            
-            if (!spritesheetFile.exists()) {
-                println("Damage effect spritesheet not found: ${spritesheetFile.absolutePath}")
-                return null
-            }
-            
-            val spritesheet = BitmapFactory.decodeFile(spritesheetFile.absolutePath)
-            if (spritesheet == null) {
-                println("Failed to decode damage effect spritesheet: ${spritesheetFile.absolutePath}")
-                return null
-            }
-            
-            // Extract frame from spritesheet
-            val frameBitmap = when (spritesheetName) {
-                "dmg_ef1", "dmg_ef2" -> {
-                    // These are 2x2 spritesheets (4 frames)
-                    val frameWidth = spritesheet.width / 2
-                    val frameHeight = spritesheet.height / 2
-                    val row = frameIndex / 2
-                    val col = frameIndex % 2
-                    val x = col * frameWidth
-                    val y = row * frameHeight
-                    Bitmap.createBitmap(spritesheet, x, y, frameWidth, frameHeight)
-                }
-                "dmg_ef3" -> {
-                    // This is a single sprite
-                    spritesheet
-                }
-                else -> {
-                    println("Unknown spritesheet name: $spritesheetName")
-                    return null
-                }
-            }
-            
-            println("Successfully loaded damage effect frame: $spritesheetName frame $frameIndex (${frameBitmap.width}x${frameBitmap.height})")
-            
-            // Cache the result
-            spriteCache[cacheKey] = frameBitmap
-            
-            return frameBitmap
-            
-        } catch (e: Exception) {
-            println("Error loading damage effect sprite: ${e.message}")
-            e.printStackTrace()
-            return null
-        }
-    }
-    
-    /**
-     * Get all available hit sprites
-     * @return List of hit sprite names (without .png extension)
-     */
-    fun getAvailableHitSprites(): List<String> {
-        val hitSpritesDir = getHitSpritesDir()
-        
-        if (!hitSpritesDir.exists()) {
-            return emptyList()
-        }
-        
-        return hitSpritesDir.listFiles { file ->
-            file.name.startsWith("hit_") && file.name.endsWith(".png")
-        }?.map { file ->
-            file.name.substringBefore(".png")
-        }?.sorted() ?: emptyList()
-    }
-    
-    /**
-     * Get available damage effect spritesheet names
-     * @return List of available damage effect spritesheet names
-     */
-    fun getAvailableDamageEffectSpritesheets(): List<String> {
-        try {
-            if (!getHitSpritesDir().exists()) {
-                return emptyList()
-            }
-            
-            val dmgFiles = getHitSpritesDir().listFiles { file ->
-                file.name.startsWith("dmg_ef") && file.name.endsWith(".png")
-            } ?: emptyArray()
-            
-            return dmgFiles.map { file ->
-                file.name.substringBefore(".png")
-            }.sorted()
-            
-        } catch (e: Exception) {
-            println("Error getting available damage effect spritesheets: ${e.message}")
-            e.printStackTrace()
-            return emptyList()
-        }
-    }
-    
-    /**
-     * Clear the sprite cache
-     */
-    fun clearCache() {
-        spriteCache.clear()
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/battle/IndividualSpriteManager.kt

@@ -1,132 +0,0 @@
-package com.github.nacabaro.vbhelper.battle
-
-import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.os.Environment
-import java.io.File
-
-class IndividualSpriteManager(private val context: Context) {
-    private val spriteCache = mutableMapOf<String, Bitmap>()
-    
-    // Get the external storage directory for sprite files
-    private fun getSpriteBaseDir(): File {
-        val externalDir = android.os.Environment.getExternalStorageDirectory()
-        return File(externalDir, "VBHelper/battle_sprites/extracted_assets/sprites")
-    }
-    
-    /**
-     * Load a specific sprite frame for a character
-     * @param characterId The character ID (e.g., "dim012_mon03")
-     * @param frameNumber The frame number (1-12)
-     * @return Bitmap of the sprite frame, or null if not found
-     */
-    fun loadSpriteFrame(characterId: String, frameNumber: Int): Bitmap? {
-        val cacheKey = "${characterId}_frame_${frameNumber}"
-        
-        // Check cache first
-        if (spriteCache.containsKey(cacheKey)) {
-            return spriteCache[cacheKey]
-        }
-        
-        // Debug: Check if base directory exists
-        val spriteBaseDir = getSpriteBaseDir()
-        if (!spriteBaseDir.exists()) {
-            println("Sprite base directory does not exist: ${spriteBaseDir.absolutePath}")
-            return null
-        }
-        
-        try {
-            // Construct the sprite file path
-            val spriteFileName = "${characterId}_${String.format("%02d", frameNumber)}.png"
-            val spriteFile = File(spriteBaseDir, "$characterId/$spriteFileName")
-            
-            if (!spriteFile.exists()) {
-                println("Sprite file not found: ${spriteFile.absolutePath}")
-                return null
-            }
-            
-            // Load the PNG file directly
-            val bitmap = BitmapFactory.decodeFile(spriteFile.absolutePath)
-            if (bitmap == null) {
-                println("Failed to decode sprite file: ${spriteFile.absolutePath}")
-                return null
-            }
-            
-            // Cache the result
-            spriteCache[cacheKey] = bitmap
-            
-            return bitmap
-            
-        } catch (e: Exception) {
-            println("Error loading sprite frame: ${e.message}")
-            e.printStackTrace()
-            return null
-        }
-    }
-    
-    /**
-     * Get all available sprite frames for a character
-     * @param characterId The character ID
-     * @return List of frame numbers (1-12) that exist for this character
-     */
-    fun getAvailableFrames(characterId: String): List<Int> {
-        val spriteBaseDir = getSpriteBaseDir()
-        val characterDir = File(spriteBaseDir, characterId)
-        
-        if (!characterDir.exists()) {
-            return emptyList()
-        }
-        
-        val spriteFiles = characterDir.listFiles { file ->
-            file.name.startsWith("${characterId}_") && file.name.endsWith(".png")
-        } ?: emptyArray()
-        
-        return spriteFiles.mapNotNull { file ->
-            val fileName = file.name
-            val frameMatch = Regex("${characterId}_(\\d{2})\\.png").find(fileName)
-            frameMatch?.groupValues?.get(1)?.toIntOrNull()
-        }.sorted()
-    }
-    
-    /**
-     * Get all available character IDs
-     * @return List of character IDs that have sprite directories
-     */
-    fun getAvailableCharacters(): List<String> {
-        val spriteBaseDir = getSpriteBaseDir()
-        
-        if (!spriteBaseDir.exists()) {
-            return emptyList()
-        }
-        
-        return spriteBaseDir.listFiles { file ->
-            file.isDirectory && file.listFiles()?.any { it.name.endsWith(".png") } == true
-        }?.map { it.name }?.sorted() ?: emptyList()
-    }
-    
-    /**
-     * Clear the sprite cache
-     */
-    fun clearCache() {
-        spriteCache.clear()
-    }
-    
-    /**
-     * Check if a character has sprite files
-     * @param characterId The character ID to check
-     * @return true if the character has sprite files, false otherwise
-     */
-    fun hasCharacterSprites(characterId: String): Boolean {
-        val characterDir = File(getSpriteBaseDir(), characterId)
-        if (!characterDir.exists()) {
-            return false
-        }
-        
-        val spriteFiles = characterDir.listFiles { file ->
-            file.name.startsWith("${characterId}_") && file.name.endsWith(".png")
-        } ?: emptyArray()
-        
-        return spriteFiles.isNotEmpty()
-    }
-} 

app/src/main/java/com/github/nacabaro/vbhelper/battle/OpponentService.kt

@@ -1,13 +0,0 @@
-package com.github.nacabaro.vbhelper.battle
-
-import retrofit2.Call
-import retrofit2.http.GET
-import retrofit2.http.Query
-
-interface OpponentService {
-    @GET("api/opponents")
-    // This method returns a Call object with a generic
-    // type of DataModel, which represents
-    // the data model for the response.
-    fun getopponents(@Query("stage") stage: String): Call<OpponentsDataModel>
-}

app/src/main/java/com/github/nacabaro/vbhelper/battle/OpponentsDataModel.kt

@@ -1,5 +0,0 @@
-package com.github.nacabaro.vbhelper.battle
-
-data class OpponentsDataModel (
-    val opponentsList: ArrayList<APIBattleCharacter>
-):java.io.Serializable

app/src/main/java/com/github/nacabaro/vbhelper/battle/PVPDataModel.kt

@@ -1,16 +0,0 @@
-package com.github.nacabaro.vbhelper.battle
-
-data class PVPDataModel (
-    val status: String,
-    val state: Int,
-    val currentRound: Int,
-    val playerHP: Int,
-    val opponentHP: Int,
-    val playerAttackHit: Boolean,
-    val playerAttackDamage: Int,
-    val opponentAttackDamage: Int,
-    val winner: String,
-    val opponentCharaId: String? = null,  // Server provides opponent's charaId from the match
-    val playerMaxHP: Int? = null,  // Server should provide max HP for resumed matches
-    val opponentMaxHP: Int? = null  // Server should provide max HP for resumed matches
-):java.io.Serializable

app/src/main/java/com/github/nacabaro/vbhelper/battle/PVPService.kt

@@ -1,22 +0,0 @@
-package com.github.nacabaro.vbhelper.battle
-
-import retrofit2.Call
-import retrofit2.http.GET
-import retrofit2.http.Query
-
-interface PVPService {
-    @GET("api/pvp")
-    // This method returns a Call object with a generic
-    // type of DataModel, which represents
-    // the data model for the response.
-    fun getwinner(
-        @Query("apiStage") apiStage: Int, 
-        @Query("playerID") playerID: Long, 
-        @Query("playerDigi") playerDigi: String, 
-        @Query("playerStage") playerStage: Int, 
-        @Query("critBar") critBar: Int, 
-        @Query("opponentDigi") opponentDigi: String, 
-        @Query("opponentStage") opponentStage: Int,
-        @Query("action") action: String? = null  // Optional: "quit" or "rejoin"
-    ): Call<PVPDataModel>
-}

app/src/main/java/com/github/nacabaro/vbhelper/battle/RetrofitHelper.kt

@@ -1,377 +0,0 @@
-package com.github.nacabaro.vbhelper.battle
-
-import android.content.Context
-import retrofit2.Retrofit
-import android.widget.Toast
-import retrofit2.*
-import retrofit2.converter.gson.GsonConverterFactory
-import okhttp3.OkHttpClient
-import okhttp3.logging.HttpLoggingInterceptor
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import com.github.nacabaro.vbhelper.battle.BattleAuthContainer
-
-class RetrofitHelper {
-    
-    /**
-     * Creates an OkHttpClient with authentication interceptor for game endpoints.
-     * Requires a non-null, non-empty token.
-     */
-    private fun createAuthenticatedClient(token: String): OkHttpClient {
-        val loggingInterceptor = HttpLoggingInterceptor().apply {
-            level = HttpLoggingInterceptor.Level.BODY
-        }
-        
-        return OkHttpClient.Builder()
-            .addInterceptor(AuthInterceptor(token))
-            .addInterceptor(loggingInterceptor)
-            .build()
-    }
-    
-    /**
-     * Gets the session token from AuthRepository for API calls.
-     * Falls back to nacatech token if session token is not available (backward compatibility).
-     */
-    private fun getAuthToken(context: Context): String? {
-        return try {
-            val authContainer = BattleAuthContainer(context)
-            runBlocking {
-                // Prefer session token, fall back to nacatech token for backward compatibility
-                val sessionToken = authContainer.authRepository.sessionToken.first()
-                if (!sessionToken.isNullOrEmpty()) {
-                    println("RetrofitHelper: Using sessionToken for API call")
-                    sessionToken
-                } else {
-                    // Fallback to nacatech token (slower, but works)
-                    val nacatechToken = authContainer.authRepository.authToken.first()
-                    if (!nacatechToken.isNullOrEmpty()) {
-                        println("RetrofitHelper: No sessionToken found, falling back to nacatechToken")
-                    }
-                    nacatechToken
-                }
-            }
-        } catch (e: Exception) {
-            println("RetrofitHelper: Error getting auth token: ${e.message}")
-            null
-        }
-    }
-    
-    /**
-     * Creates a Retrofit instance with authentication for game endpoints.
-     */
-    private fun createAuthenticatedRetrofit(context: Context): Retrofit? {
-        val token = getAuthToken(context)
-        if (token.isNullOrEmpty()) {
-            println("RetrofitHelper: No auth token available")
-            return null
-        }
-        
-        val client = createAuthenticatedClient(token)
-        return Retrofit.Builder()
-            .baseUrl("http://battle.io-void.com:8080/")
-            .client(client)
-            .addConverterFactory(GsonConverterFactory.create())
-            .build()
-    }
-    
-    /**
-     * Handles HTTP error responses (401, 403, 429).
-     * For 401/403, clears authentication state to trigger re-authentication.
-     */
-    private fun handleErrorResponse(context: Context, response: Response<*>, errorMessage: String) {
-        when (response.code()) {
-            401 -> {
-                println("RetrofitHelper: Authentication failed (401) - token may be expired")
-                clearAuthAndNotify(context, "Authentication failed. Please log in again.")
-            }
-            403 -> {
-                println("RetrofitHelper: Access forbidden (403) - token may be expired or invalid")
-                // 403 could mean expired token, so clear auth state to trigger re-authentication
-                clearAuthAndNotify(context, "Session expired. Please log in again.")
-            }
-            429 -> {
-                println("RetrofitHelper: Rate limit exceeded (429)")
-                Toast.makeText(context, "Too many requests. Please wait a moment.", Toast.LENGTH_SHORT).show()
-            }
-            else -> {
-                println("RetrofitHelper: API error (${response.code()}): $errorMessage")
-                Toast.makeText(context, "Request failed: ${response.code()}", Toast.LENGTH_SHORT).show()
-            }
-        }
-    }
-    
-    /**
-     * Clears authentication state and shows a message.
-     * This will trigger BattlesScreen to detect the auth state change and open the login page.
-     */
-    private fun clearAuthAndNotify(context: Context, message: String) {
-        try {
-            val authContainer = BattleAuthContainer(context)
-            CoroutineScope(Dispatchers.IO).launch {
-                authContainer.authRepository.logout()
-                println("RetrofitHelper: Cleared authentication state due to expired/invalid token")
-            }
-            Toast.makeText(context, message, Toast.LENGTH_LONG).show()
-        } catch (e: Exception) {
-            println("RetrofitHelper: Error clearing auth state: ${e.message}")
-            Toast.makeText(context, message, Toast.LENGTH_LONG).show()
-        }
-    }
-
-    fun getOpponents(context: Context, stage: String, callback: (OpponentsDataModel) -> Unit) {
-        //println("RetrofitHelper: Starting API call for stage: $stage")
-
-        try {
-            // Create an authenticated Retrofit instance
-            val retrofit = createAuthenticatedRetrofit(context)
-            if (retrofit == null) {
-                println("RetrofitHelper: Cannot create authenticated Retrofit - no token available")
-                Toast.makeText(context, "Authentication required. Please log in.", Toast.LENGTH_SHORT).show()
-                return
-            }
-
-            // Create an ApiService instance from the Retrofit instance.
-            val service: OpponentService = retrofit.create<OpponentService>(OpponentService::class.java)
-            //println("RetrofitHelper: Service created")
-
-            // Call the getopponents() method of the ApiService
-            // to make an API request.
-            val call: Call<OpponentsDataModel> = service.getopponents(stage)
-            //println("RetrofitHelper: API call created, enqueueing...")
-
-            // Use the enqueue() method of the Call object to
-            // make an asynchronous API request.
-            call.enqueue(object : Callback<OpponentsDataModel> {
-                override fun onFailure(call: Call<OpponentsDataModel>, t: Throwable) {
-                    println("RetrofitHelper: API call failed: ${t.message}")
-                    t.printStackTrace()
-                    Toast.makeText(context, "Request Fail", Toast.LENGTH_SHORT).show()
-                }
-
-                override fun onResponse(call: Call<OpponentsDataModel>, response: Response<OpponentsDataModel>) {
-                    println("RetrofitHelper: API response received - Code: ${response.code()}")
-                    println("RetrofitHelper: Response body: ${response.body()}")
-
-                    if(response.isSuccessful){
-                        //println("RetrofitHelper: Response successful, calling callback")
-                        val opponentsList: OpponentsDataModel = response.body() as OpponentsDataModel
-                        callback(opponentsList)
-                    } else {
-                        val errorBody = response.errorBody()?.string()
-                        println("RetrofitHelper: Response not successful - Error: $errorBody")
-                        handleErrorResponse(context, response, errorBody ?: "Unknown error")
-                    }
-                }
-            })
-        } catch (e: Exception) {
-            println("RetrofitHelper: Exception in getOpponents: ${e.message}")
-            e.printStackTrace()
-            Toast.makeText(context, "Request failed: ${e.message}", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-    /*
-    fun getCombatWinner(context: Context, stage: String, callback: (CombatDataModel) -> Unit) {
-
-        // Create a Retrofit instance with the base URL and
-        // a GsonConverterFactory for parsing the response.
-        val retrofit: Retrofit = Retrofit.Builder().baseUrl("http://battle.io-void.com:8080/").addConverterFactory(
-            GsonConverterFactory.create()).build()
-
-        // Create an ApiService instance from the Retrofit instance.
-        val service: CombatService = retrofit.create<CombatService>(CombatService::class.java)
-
-        // Call the getwinner() method of the ApiService
-        // to make an API request.
-        val call: Call<CombatDataModel> = service.getwinner(stage)
-
-        // Use the enqueue() method of the Call object to
-        // make an asynchronous API request.
-        call.enqueue(object : Callback<CombatDataModel> {
-            // This is an anonymous inner class that implements the Callback interface.
-
-            override fun onFailure(call: Call<CombatDataModel>, t: Throwable) {
-                // This method is called when the API request fails.
-                Toast.makeText(context, "Request Fail", Toast.LENGTH_SHORT).show()
-            }
-
-            override fun onResponse(call: Call<CombatDataModel>, response: Response<CombatDataModel>) {
-                // This method is called when the API response is received successfully.
-
-                if(response.isSuccessful){
-                    // If the response is successful, parse the
-                    // response body to a DataModel object.
-                    val winner: CombatDataModel = response.body() as CombatDataModel
-
-                    // Call the callback function with the DataModel
-                    // object as a parameter.
-                    callback(winner)
-                }
-            }
-        })
-    }
-
-    fun getBattleWinner(context: Context, playerDigi: String, playerStage: Int, opponentDigi: String, opponentStage: Int, callback: (BattleDataModel) -> Unit) {
-
-        // Create a Retrofit instance with the base URL and
-        // a GsonConverterFactory for parsing the response.
-        val retrofit: Retrofit = Retrofit.Builder().baseUrl("http://battle.io-void.com:8080/").addConverterFactory(
-            GsonConverterFactory.create()).build()
-
-        // Create an ApiService instance from the Retrofit instance.
-        val service: BattleService = retrofit.create<BattleService>(BattleService::class.java)
-
-        // Call the getwinner() method of the ApiService
-        // to make an API request.
-        val call: Call<BattleDataModel> = service.getwinner(playerDigi, playerStage, opponentDigi, opponentStage)
-
-        // Use the enqueue() method of the Call object to
-        // make an asynchronous API request.
-        call.enqueue(object : Callback<BattleDataModel> {
-            // This is an anonymous inner class that implements the Callback interface.
-
-            override fun onFailure(call: Call<BattleDataModel>, t: Throwable) {
-                // This method is called when the API request fails.
-                Toast.makeText(context, "Request Fail", Toast.LENGTH_SHORT).show()
-            }
-
-            override fun onResponse(call: Call<BattleDataModel>, response: Response<BattleDataModel>) {
-                // This method is called when the API response is received successfully.
-
-                if(response.isSuccessful){
-                    // If the response is successful, parse the
-                    // response body to a DataModel object.
-                    val winner: BattleDataModel = response.body() as BattleDataModel
-
-                    // Call the callback function with the DataModel
-                    // object as a parameter.
-                    callback(winner)
-                }
-            }
-        })
-    }
-     */
-
-    fun getPVPWinner(context: Context, apiStage: Int, playerID: Long, playerDigi: String, playerStage: Int, critBar: Int, opponentDigi: String, opponentStage: Int, callback: (PVPDataModel) -> Unit) {
-        getPVPWinner(context, apiStage, playerID, playerDigi, playerStage, critBar, opponentDigi, opponentStage, null, callback)
-    }
-
-    fun getPVPWinner(context: Context, apiStage: Int, playerID: Long, playerDigi: String, playerStage: Int, critBar: Int, opponentDigi: String, opponentStage: Int, action: String?, callback: (PVPDataModel) -> Unit) {
-
-        try {
-            // Create an authenticated Retrofit instance
-            val retrofit = createAuthenticatedRetrofit(context)
-            if (retrofit == null) {
-                println("RetrofitHelper: Cannot create authenticated Retrofit - no token available")
-                Toast.makeText(context, "Authentication required. Please log in.", Toast.LENGTH_SHORT).show()
-                return
-            }
-
-            // Create an ApiService instance from the Retrofit instance.
-            val service: PVPService = retrofit.create<PVPService>(PVPService::class.java)
-
-            // Call the getwinner() method of the ApiService
-            // to make an API request.
-            val call: Call<PVPDataModel> = service.getwinner(apiStage, playerID, playerDigi, playerStage, critBar, opponentDigi, opponentStage, action)
-
-            // Use the enqueue() method of the Call object to
-            // make an asynchronous API request.
-            call.enqueue(object : Callback<PVPDataModel> {
-                // This is an anonymous inner class that implements the Callback interface.
-
-                override fun onFailure(call: Call<PVPDataModel>, t: Throwable) {
-                    // This method is called when the API request fails.
-                    println("RetrofitHelper: PVP API call failed: ${t.message}")
-                    t.printStackTrace()
-                    Toast.makeText(context, "Request Fail", Toast.LENGTH_SHORT).show()
-                }
-
-                override fun onResponse(call: Call<PVPDataModel>, response: Response<PVPDataModel>) {
-                    // This method is called when the API response is received successfully.
-                    println("RetrofitHelper: PVP API response received - Code: ${response.code()}")
-
-                    if(response.isSuccessful){
-                        // If the response is successful, parse the
-                        // response body to a DataModel object.
-                        val apiResults: PVPDataModel = response.body() as PVPDataModel
-
-                        // Call the callback function with the DataModel
-                        // object as a parameter.
-                        callback(apiResults)
-                    } else {
-                        val errorBody = response.errorBody()?.string()
-                        println("RetrofitHelper: PVP API response not successful - Code: ${response.code()}, Error: $errorBody")
-                        handleErrorResponse(context, response, errorBody ?: "Unknown error")
-                    }
-                }
-            })
-        } catch (e: Exception) {
-            println("RetrofitHelper: Exception in getPVPWinner: ${e.message}")
-            e.printStackTrace()
-            Toast.makeText(context, "Request failed: ${e.message}", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-    fun authenticate(context: Context, token: String, callback: (AuthenticateResponse) -> Unit) {
-        //println("RetrofitHelper: Starting validate API call with token: $token")
-        
-        if (token.isEmpty()) {
-            println("RetrofitHelper: ERROR - Token is empty!")
-            Toast.makeText(context, "Authentication failed: Token is empty", Toast.LENGTH_SHORT).show()
-            return
-        }
-
-        try {
-            // Add logging interceptor to see the actual HTTP request
-            val loggingInterceptor = HttpLoggingInterceptor().apply {
-                level = HttpLoggingInterceptor.Level.BODY
-            }
-            val okHttpClient = OkHttpClient.Builder()
-                .addInterceptor(loggingInterceptor)
-                .build()
-            
-            val retrofit: Retrofit = Retrofit.Builder()
-                .baseUrl("http://battle.io-void.com:8080/")
-                .client(okHttpClient)
-                .addConverterFactory(GsonConverterFactory.create())
-                .build()
-
-            val service: AuthService = retrofit.create<AuthService>(AuthService::class.java)
-            val request = AuthenticateRequest(userToken = token)
-            // Use login endpoint instead of validate to get sessionToken
-            val call: Call<AuthenticateResponse> = service.login(request)
-
-            call.enqueue(object : Callback<AuthenticateResponse> {
-                override fun onFailure(call: Call<AuthenticateResponse>, t: Throwable) {
-                    println("RetrofitHelper: Validate API call failed: ${t.message}")
-                    t.printStackTrace()
-                    Toast.makeText(context, "Authentication failed: ${t.message}", Toast.LENGTH_SHORT).show()
-                }
-
-                override fun onResponse(call: Call<AuthenticateResponse>, response: Response<AuthenticateResponse>) {
-
-                    if (response.isSuccessful) {
-                        val authResponse: AuthenticateResponse? = response.body()
-                        if (authResponse != null) {
-                            callback(authResponse)
-                        } else {
-                            println("RetrofitHelper: Validation failed: Invalid response body")
-                            Toast.makeText(context, "Authentication failed: Invalid response", Toast.LENGTH_SHORT).show()
-                        }
-                    } else {
-                        val errorBody = response.errorBody()?.string()
-                        println("RetrofitHelper: Validate response not successful - Code: ${response.code()}, Error: $errorBody")
-                        Toast.makeText(context, "Authentication failed: ${response.code()}", Toast.LENGTH_SHORT).show()
-                    }
-                }
-            })
-        } catch (e: Exception) {
-            println("RetrofitHelper: Exception in validate: ${e.message}")
-            e.printStackTrace()
-            Toast.makeText(context, "Authentication failed: ${e.message}", Toast.LENGTH_SHORT).show()
-        }
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/battle/SpriteFileManager.kt

@@ -1,328 +0,0 @@
-package com.github.nacabaro.vbhelper.battle
-
-import android.content.Context
-import java.io.File
-import java.io.FileOutputStream
-import java.io.IOException
-import java.io.FileInputStream
-
-class SpriteFileManager(private val context: Context) {
-    
-    // Get the external storage directory where files are already located
-    fun getExternalSpriteBaseDir(): File {
-        val externalDir = android.os.Environment.getExternalStorageDirectory()
-        return File(externalDir, "VBHelper/battle_sprites")
-    }
-    
-    // Get the internal storage directory for sprite files
-    private fun getInternalSpriteBaseDir(): File {
-        return File(context.filesDir, "battle_sprites")
-    }
-    
-    fun copySpriteFilesToInternalStorage() {
-        try {
-            println("Starting sprite file copy process from external storage to internal storage...")
-            
-            val externalDir = getExternalSpriteBaseDir()
-            val internalDir = getInternalSpriteBaseDir()
-            
-            // Check if external directory exists
-            if (!externalDir.exists()) {
-                println("External sprite directory does not exist: ${externalDir.absolutePath}")
-                return
-            }
-            
-            println("External sprite directory exists: ${externalDir.absolutePath}")
-            println("Copying to internal storage: ${internalDir.absolutePath}")
-            
-            // Create internal directory if it doesn't exist
-            if (!internalDir.exists()) {
-                val created = internalDir.mkdirs()
-                println("Created internal sprite directory: $created")
-            }
-            
-            // Copy all subdirectories from external to internal storage
-            val externalFiles = externalDir.listFiles()
-            if (externalFiles != null) {
-                println("Found ${externalFiles.size} items in external directory")
-                externalFiles.forEach { item ->
-                    val targetItem = File(internalDir, item.name)
-                    if (item.isDirectory) {
-                        println("Copying directory: ${item.name}")
-                        copyDirectory(item, targetItem)
-                    } else {
-                        println("Copying file: ${item.name}")
-                        copyFile(item, targetItem)
-                    }
-                }
-            }
-            
-            println("Sprite files copied successfully to internal storage: ${internalDir.absolutePath}")
-            
-        } catch (e: Exception) {
-            println("Error copying sprite files to internal storage: ${e.message}")
-            e.printStackTrace()
-        }
-    }
-    
-    fun copySpriteFilesToExternalStorage() {
-        try {
-            println("Starting sprite file copy process to external storage...")
-            
-            // Debug: List what's in the assets directory
-            val assetManager = context.assets
-            val battleSpritesFiles = assetManager.list("battle_sprites")
-            println("battle_sprites directory in assets contains: ${battleSpritesFiles?.joinToString(", ")}")
-            
-            val extractedAssetsFiles = assetManager.list("battle_sprites/extracted_assets")
-            println("battle_sprites/extracted_assets directory in assets contains: ${extractedAssetsFiles?.joinToString(", ")}")
-            
-            // Check specifically for extracted_atksprites in assets (now directly under battle_sprites)
-            val atkspritesInAssets = assetManager.list("battle_sprites/extracted_atksprites")
-            println("extracted_atksprites in assets contains: ${atkspritesInAssets?.size ?: 0} files")
-            if (atkspritesInAssets != null && atkspritesInAssets.isNotEmpty()) {
-                println("First few attack files in assets: ${atkspritesInAssets.take(5).joinToString(", ")}")
-            }
-            
-            // Check for extracted_battlebgs in assets (now directly under battle_sprites)
-            val battlebgsInAssets = assetManager.list("battle_sprites/extracted_battlebgs")
-            println("extracted_battlebgs in assets contains: ${battlebgsInAssets?.size ?: 0} files")
-            if (battlebgsInAssets != null && battlebgsInAssets.isNotEmpty()) {
-                println("First few battle background files in assets: ${battlebgsInAssets.take(5).joinToString(", ")}")
-            }
-            
-            // Try to list all possible subdirectories in battle_sprites
-            println("Checking all possible subdirectories in battle_sprites...")
-            battleSpritesFiles?.forEach { subdir ->
-                try {
-                    val subdirFiles = assetManager.list("battle_sprites/$subdir")
-                    println("  $subdir contains: ${subdirFiles?.size ?: 0} files")
-                    if (subdirFiles != null && subdirFiles.isNotEmpty()) {
-                        println("    First few files: ${subdirFiles.take(3).joinToString(", ")}")
-                    }
-                } catch (e: Exception) {
-                    println("  Error listing $subdir: ${e.message}")
-                }
-            }
-            
-            // Create the base directory for battle_sprites in external storage
-            val battleSpritesDir = getExternalSpriteBaseDir()
-            if (!battleSpritesDir.exists()) {
-                battleSpritesDir.mkdirs()
-                println("Created battle_sprites directory in external storage: ${battleSpritesDir.absolutePath}")
-            } else {
-                println("battle_sprites directory already exists in external storage: ${battleSpritesDir.absolutePath}")
-            }
-            
-            // Copy all subdirectories from battle_sprites assets to external storage
-            println("Copying all battle_sprites subdirectories to external storage...")
-            battleSpritesFiles?.forEach { subdir ->
-                val sourcePath = "battle_sprites/$subdir"
-                val targetDir = File(battleSpritesDir, subdir)
-                println("Copying $sourcePath to ${targetDir.absolutePath}")
-                copyAssetDirectory(sourcePath, targetDir)
-            }
-            
-            println("Sprite files copied successfully to external storage: ${battleSpritesDir.absolutePath}")
-            
-            // Verify that attack sprites were copied
-            val atkspritesDir = File(battleSpritesDir, "extracted_atksprites")
-            if (atkspritesDir.exists()) {
-                val attackFiles = atkspritesDir.listFiles()
-                println("Attack sprites directory exists with ${attackFiles?.size ?: 0} files")
-                if (attackFiles != null && attackFiles.isNotEmpty()) {
-                    println("First few attack files: ${attackFiles.take(5).map { it.name }}")
-                }
-            } else {
-                println("WARNING: extracted_atksprites directory does not exist!")
-                // List what's actually in the battle_sprites directory
-                val battleSpritesContents = battleSpritesDir.listFiles()
-                println("battle_sprites directory contains: ${battleSpritesContents?.map { it.name }?.joinToString(", ")}")
-            }
-            
-            // Verify that battle backgrounds were copied
-            val battlebgsDir = File(battleSpritesDir, "extracted_battlebgs")
-            if (battlebgsDir.exists()) {
-                val bgFiles = battlebgsDir.listFiles()
-                println("Battle backgrounds directory exists with ${bgFiles?.size ?: 0} files")
-                if (bgFiles != null && bgFiles.isNotEmpty()) {
-                    println("First few battle background files: ${bgFiles.take(5).map { it.name }}")
-                }
-            } else {
-                println("WARNING: extracted_battlebgs directory does not exist!")
-            }
-            
-        } catch (e: Exception) {
-            println("Error copying sprite files to external storage: ${e.message}")
-            e.printStackTrace()
-        }
-    }
-    
-    private fun copyAssetDirectory(assetPath: String, targetDir: File) {
-        try {
-            val assetManager = context.assets
-            val files = assetManager.list(assetPath) ?: return
-            
-            println("Copying asset directory: $assetPath (${files.size} items)")
-            println("Files found: ${files.joinToString(", ")}")
-            
-            for (file in files) {
-                val assetFilePath = if (assetPath.isEmpty()) file else "$assetPath/$file"
-                val targetFile = File(targetDir, file)
-                
-                // Create subdirectories if needed
-                if (targetFile.parentFile != null && !targetFile.parentFile!!.exists()) {
-                    targetFile.parentFile!!.mkdirs()
-                }
-                
-                // Check if it's a directory by trying to list its contents
-                try {
-                    val subFiles = assetManager.list(assetFilePath)
-                    if (subFiles != null && subFiles.isNotEmpty()) {
-                        // It's a directory, create it and copy contents
-                        println("Copying subdirectory: $assetFilePath (${subFiles.size} files)")
-                        if (!targetFile.exists()) {
-                            targetFile.mkdirs()
-                        }
-                        copyAssetDirectory(assetFilePath, targetFile)
-                    } else {
-                        // It's a file, copy it
-                        copyAssetFile(assetFilePath, targetFile)
-                    }
-                } catch (e: Exception) {
-                    // If we can't list contents, it's probably a file
-                    println("Treating $assetFilePath as file (could not list contents)")
-                    copyAssetFile(assetFilePath, targetFile)
-                }
-            }
-            
-            // Special handling for extracted_atksprites - try to copy it directly if it wasn't found
-            if (assetPath == "battle_sprites/extracted_assets") {
-                println("Special handling: Checking for extracted_atksprites directory...")
-                try {
-                    val atkspritesFiles = assetManager.list("battle_sprites/extracted_assets/extracted_atksprites")
-                    if (atkspritesFiles != null && atkspritesFiles.isNotEmpty()) {
-                        println("Found extracted_atksprites with ${atkspritesFiles.size} files")
-                        val atkspritesDir = File(targetDir, "extracted_atksprites")
-                        if (!atkspritesDir.exists()) {
-                            atkspritesDir.mkdirs()
-                        }
-                        copyAssetDirectory("battle_sprites/extracted_assets/extracted_atksprites", atkspritesDir)
-                    } else {
-                        println("extracted_atksprites directory not found in assets")
-                    }
-                } catch (e: Exception) {
-                    println("Error checking extracted_atksprites: ${e.message}")
-                }
-            }
-            
-        } catch (e: Exception) {
-            println("Error copying asset directory $assetPath: ${e.message}")
-            e.printStackTrace()
-        }
-    }
-    
-    private fun copyDirectory(sourceDir: File, targetDir: File) {
-        if (!targetDir.exists()) {
-            targetDir.mkdirs()
-        }
-        
-        val files = sourceDir.listFiles()
-        if (files != null) {
-            files.forEach { file ->
-                val targetFile = File(targetDir, file.name)
-                if (file.isDirectory) {
-                    copyDirectory(file, targetFile)
-                } else {
-                    copyFile(file, targetFile)
-                }
-            }
-        }
-    }
-    
-    private fun copyFile(sourceFile: File, targetFile: File) {
-        try {
-            val inputStream = FileInputStream(sourceFile)
-            val outputStream = FileOutputStream(targetFile)
-            
-            inputStream.copyTo(outputStream)
-            inputStream.close()
-            outputStream.close()
-            
-            println("Copied: ${sourceFile.name} -> ${targetFile.absolutePath}")
-        } catch (e: IOException) {
-            println("Error copying file ${sourceFile.name}: ${e.message}")
-        }
-    }
-    
-    private fun copyAssetFile(assetPath: String, targetFile: File) {
-        try {
-            val inputStream = context.assets.open(assetPath)
-            val outputStream = FileOutputStream(targetFile)
-            
-            inputStream.copyTo(outputStream)
-            inputStream.close()
-            outputStream.close()
-            
-            println("Copied: $assetPath -> ${targetFile.absolutePath}")
-        } catch (e: IOException) {
-            println("Error copying asset file $assetPath: ${e.message}")
-        }
-    }
-    
-    fun checkSpriteFilesExist(): Boolean {
-        val battleSpritesDir = getExternalSpriteBaseDir()
-        val extractedAssetsDir = File(battleSpritesDir, "extracted_assets")
-        val extractedStatsDir = File(battleSpritesDir, "extracted_digimon_stats")
-        val atkspritesDir = File(battleSpritesDir, "extracted_atksprites")
-        val battlebgsDir = File(battleSpritesDir, "extracted_battlebgs")
-        
-        val battleSpritesExist = battleSpritesDir.exists() && battleSpritesDir.listFiles()?.isNotEmpty() == true
-        val assetsExist = extractedAssetsDir.exists() && extractedAssetsDir.listFiles()?.isNotEmpty() == true
-        val statsExist = extractedStatsDir.exists() && extractedStatsDir.listFiles()?.isNotEmpty() == true
-        val atkspritesExist = atkspritesDir.exists() && atkspritesDir.listFiles()?.isNotEmpty() == true
-        val battlebgsExist = battlebgsDir.exists() && battlebgsDir.listFiles()?.isNotEmpty() == true
-
-        /*
-        println("Checking sprite files exist in external storage:")
-        println("  battle_sprites exists: $battleSpritesExist")
-        println("  extracted_assets exists: $assetsExist")
-        println("  extracted_digimon_stats exists: $statsExist")
-        println("  extracted_atksprites exists: $atkspritesExist")
-        println("  extracted_battlebgs exists: $battlebgsExist")
-        */
-        
-        return battleSpritesExist && assetsExist && statsExist && atkspritesExist && battlebgsExist
-    }
-    
-    fun clearSpriteFiles() {
-        try {
-            val battleSpritesDir = getInternalSpriteBaseDir()
-            
-            if (battleSpritesDir.exists()) {
-                deleteDirectory(battleSpritesDir)
-                println("Cleared battle_sprites directory from internal storage")
-            }
-            
-        } catch (e: Exception) {
-            println("Error clearing sprite files: ${e.message}")
-            e.printStackTrace()
-        }
-    }
-    
-    private fun deleteDirectory(directory: File) {
-        if (directory.exists()) {
-            val files = directory.listFiles()
-            if (files != null) {
-                for (file in files) {
-                    if (file.isDirectory) {
-                        deleteDirectory(file)
-                    } else {
-                        file.delete()
-                    }
-                }
-            }
-            directory.delete()
-        }
-    }
-} 

app/src/main/java/com/github/nacabaro/vbhelper/battle/SpriteImage.kt

@@ -1,38 +0,0 @@
-package com.github.nacabaro.vbhelper.battle
-
-import androidx.compose.foundation.Image
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
-
-@Composable
-fun SpriteImage(
-    characterId: String,
-    frameNumber: Int,
-    modifier: Modifier = Modifier,
-    contentScale: ContentScale = ContentScale.Fit
-) {
-    val context = LocalContext.current
-    val spriteManager = remember { IndividualSpriteManager(context) }
-    
-    var bitmap by remember { mutableStateOf<android.graphics.Bitmap?>(null) }
-    
-    LaunchedEffect(characterId, frameNumber) {
-        println("Loading sprite frame: $frameNumber for character: $characterId")
-        bitmap = spriteManager.loadSpriteFrame(characterId, frameNumber)
-        if (bitmap == null) {
-            println("Failed to load sprite frame: $frameNumber for character: $characterId")
-        }
-    }
-    
-    bitmap?.let { bmp ->
-        Image(
-            bitmap = bmp.asImageBitmap(),
-            contentDescription = "Sprite: $characterId frame $frameNumber",
-            modifier = modifier,
-            contentScale = contentScale
-        )
-    }
-}

app/src/main/java/com/github/nacabaro/vbhelper/companion/card/ByteManipulation.kt

@@ -1,46 +0,0 @@
-package com.github.nacabaro.vbhelper.companion.card
-
-enum class Endian {
-    Big,
-    Little,
-}
-
-fun ByteArray.getUInt32(index: Int = 0, endian: Endian = Endian.Little): UInt {
-    require(this.size >= index + 4) { "Must be 4 bytes from index to get a UInt" }
-    var result: UInt = 0u
-    for (i in 0 until 4) {
-        result = if (endian == Endian.Big) {
-            result or ((this[index + i].toUInt() and 0xFFu) shl (8 * (3 - i)))
-        } else {
-            result or ((this[index + i].toUInt() and 0xFFu) shl (8 * i))
-        }
-    }
-    return result
-}
-
-fun ByteArray.getUInt16(index: Int = 0, endian: Endian = Endian.Little): UShort {
-    require(this.size >= index + 2) { "Must be 2 bytes from index to get a UInt" }
-    var result: UInt = 0u
-    for (i in 0 until 2) {
-        result = if (endian == Endian.Big) {
-            result or ((this[index + i].toUInt() and 0xFFu) shl (8 * (1 - i)))
-        } else {
-            result or ((this[index + i].toUInt() and 0xFFu) shl (8 * i))
-        }
-    }
-    return result.toUShort()
-}
-
-fun UShort.toByteArray(endian: Endian = Endian.Little): ByteArray {
-    val byteArray = byteArrayOf(0, 0)
-    val asUInt = this.toUInt()
-    for (i in 0 until 2) {
-        if (endian == Endian.Little) {
-            byteArray[i] = ((asUInt shr (8 * i)) and 255u).toByte()
-        } else {
-            byteArray[1 - i] = ((asUInt shr (8 * i)) and 255u).toByte()
-        }
-    }
-    return byteArray
-}
-

app/src/main/java/com/github/nacabaro/vbhelper/companion/card/CompanionImportCardActivity.kt

@@ -1,400 +0,0 @@
-package com.github.nacabaro.vbhelper.companion.card
-
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import android.widget.Toast
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.lifecycle.lifecycleScope
-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.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Button
-import androidx.compose.material3.Checkbox
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextField
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.github.cfogrady.vb.dim.adventure.AdventureLevels
-import com.github.cfogrady.vb.dim.adventure.AdventureLevels.AdventureLevel
-import com.github.cfogrady.vb.dim.card.Card
-import com.github.cfogrady.vb.dim.card.DimReader
-import com.github.cfogrady.vb.dim.card.DimWriter
-import com.github.cfogrady.vb.dim.character.CharacterStats
-import com.github.cfogrady.vb.dim.character.CharacterStats.CharacterStatsEntry
-import com.github.cfogrady.vb.dim.fusion.AttributeFusions
-import com.github.cfogrady.vb.dim.fusion.SpecificFusions
-import com.github.cfogrady.vb.dim.fusion.SpecificFusions.SpecificFusionEntry
-import com.github.cfogrady.vb.dim.header.DimHeader
-import com.github.cfogrady.vb.dim.transformation.TransformationRequirements
-import com.github.cfogrady.vb.dim.transformation.TransformationRequirements.TransformationRequirementsEntry
-import com.github.nacabaro.vbhelper.R
-import com.github.nacabaro.vbhelper.companion.card.CompanionValidateCardActivity
-import com.github.nacabaro.vbhelper.companion.common.ChannelTypes
-import com.github.nacabaro.vbhelper.companion.ui.CompanionLoading
-import com.github.nacabaro.vbhelper.companion.validation.ValidatedCardManager
-import com.github.nacabaro.vbhelper.di.VBHelper
-import com.google.android.gms.wearable.Wearable
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.tasks.await
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-import java.io.ByteArrayOutputStream
-import java.io.DataOutputStream
-import java.nio.charset.Charset
-
-class CompanionImportCardActivity : ComponentActivity() {
-    enum class ImportState {
-        PickFile,
-        NameOrUnique,
-        LoadFile,
-        UnlockCard,
-        ImportCard,
-        Success,
-    }
-
-    private lateinit var filePickLauncher: ActivityResultLauncher<Array<String>>
-    private lateinit var validationLauncher: ActivityResultLauncher<Intent>
-    private var uri: Uri? = null
-    private val importState = MutableStateFlow(ImportState.PickFile)
-    private val cardName = MutableStateFlow("")
-    private val uniqueSprites = MutableStateFlow(false)
-    private val convertToBem = MutableStateFlow(false)
-    private val importPercent = MutableStateFlow(0)
-    private val importStatus = MutableStateFlow("Preparing transfer")
-    private lateinit var card: Card<out DimHeader, out CharacterStats<out CharacterStatsEntry>, out TransformationRequirements<out TransformationRequirementsEntry>, out AdventureLevels<out AdventureLevel>, out AttributeFusions, out SpecificFusions<out SpecificFusionEntry>>
-
-    private val validatedCardManager by lazy {
-        (application as VBHelper).validatedCardManager
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        filePickLauncher = buildFilePickLauncher()
-        validationLauncher = buildValidationLauncher()
-        setContent {
-            val state by importState.collectAsState()
-            when (state) {
-                ImportState.PickFile -> {
-                    LaunchedEffect(true) {
-                        filePickLauncher.launch(arrayOf("*/*"))
-                    }
-                    CompanionLoading(loadingText = stringResource(R.string.settings_companion_import_card_image_title))
-                }
-                ImportState.NameOrUnique -> NameOrUnique()
-                ImportState.LoadFile -> {
-                    CompanionLoading(loadingText = "Loading Card Image")
-                    LaunchedEffect(true) {
-                        runCatching {
-                            loadCard()
-                        }.onFailure { error ->
-                            Timber.e(error, "Failed to load card image")
-                            Toast.makeText(
-                                this@CompanionImportCardActivity,
-                                "Card load failed: ${error.message ?: "unknown error"}",
-                                Toast.LENGTH_LONG,
-                            ).show()
-                            importState.value = ImportState.NameOrUnique
-                        }
-                    }
-                }
-                ImportState.UnlockCard -> {
-                    CompanionLoading(loadingText = stringResource(R.string.companion_validation_connect_vb))
-                    LaunchedEffect(true) {
-                        validationLauncher.launch(
-                            Intent(applicationContext, CompanionValidateCardActivity::class.java).apply {
-                                putExtra(CompanionValidateCardActivity.CARD_VALIDATED_KEY, card.header.dimId)
-                            }
-                        )
-                    }
-                }
-                ImportState.ImportCard -> {
-                    val percent by importPercent.collectAsState()
-                    val status by importStatus.collectAsState()
-                    CompanionLoading(loadingText = "$status ($percent%)")
-                    LaunchedEffect(true) {
-                        withContext(Dispatchers.IO) {
-                            try {
-                                val transferred = importCard()
-                                importState.value = if (transferred) ImportState.Success else ImportState.NameOrUnique
-                            } catch (error: Exception) {
-                                Timber.e(error, "Card transfer failed")
-                                withContext(Dispatchers.Main) {
-                                    Toast.makeText(
-                                        this@CompanionImportCardActivity,
-                                        "Card transfer failed: ${error.message ?: "unknown error"}",
-                                        Toast.LENGTH_LONG,
-                                    ).show()
-                                }
-                                importState.value = ImportState.NameOrUnique
-                            }
-                        }
-                    }
-                }
-                ImportState.Success -> {
-                    LaunchedEffect(true) {
-                        Handler(Looper.getMainLooper()).postDelayed({
-                            finish()
-                        }, 1000)
-                    }
-                    Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-                        Text(text = stringResource(R.string.companion_card_import_success))
-                    }
-                }
-            }
-        }
-    }
-
-    @Composable
-    private fun NameOrUnique() {
-        val selectedUri = uri
-        val filePath = selectedUri?.path ?: "No file selected"
-        val name by cardName.collectAsState()
-        val unique by uniqueSprites.collectAsState()
-        val convert by convertToBem.collectAsState()
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(16.dp),
-            verticalArrangement = Arrangement.Center,
-            horizontalAlignment = Alignment.CenterHorizontally,
-        ) {
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.Center,
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Button(modifier = Modifier.padding(end = 10.dp), onClick = { importState.value = ImportState.PickFile }) {
-                    Text(text = "File")
-                }
-                Text(text = filePath)
-            }
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(top = 16.dp),
-                horizontalArrangement = Arrangement.Center,
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Text(text = "Name:", modifier = Modifier.padding(end = 10.dp))
-                TextField(value = name, onValueChange = { cardName.value = it })
-            }
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(top = 16.dp),
-                horizontalArrangement = Arrangement.Center,
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Text(text = "Unique Sprites:")
-                Checkbox(checked = unique, onCheckedChange = { uniqueSprites.value = it })
-            }
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(top = 16.dp),
-                horizontalArrangement = Arrangement.Center,
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Text(text = "Convert to BeM:")
-                Checkbox(checked = convert, onCheckedChange = { convertToBem.value = it })
-            }
-            Button(
-                modifier = Modifier.padding(top = 16.dp),
-                enabled = selectedUri != null,
-                onClick = { importState.value = ImportState.LoadFile },
-            ) {
-                Text(text = "Import")
-            }
-        }
-    }
-
-    private fun buildFilePickLauncher(): ActivityResultLauncher<Array<String>> {
-        return registerForActivityResult(ActivityResultContracts.OpenDocument()) {
-            if (it == null) {
-                Toast.makeText(
-                    this,
-                    "Card file selection cancelled.",
-                    Toast.LENGTH_SHORT,
-                ).show()
-                importState.value = ImportState.NameOrUnique
-            } else {
-                uri = it
-                val path = it.path ?: ""
-                var name = path.substringAfterLast("/")
-                if (name.contains('.')) {
-                    name = name.substringBeforeLast('.')
-                }
-                cardName.value = name
-                importState.value = ImportState.NameOrUnique
-            }
-        }
-    }
-
-    private fun buildValidationLauncher(): ActivityResultLauncher<Intent> {
-        return registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-            val validatedCardId = result.data?.extras?.getInt(CompanionValidateCardActivity.CARD_VALIDATED_KEY, -1)
-            if (result.resultCode != RESULT_OK || validatedCardId == null || validatedCardId == -1) {
-                Toast.makeText(
-                    this,
-                    "Card validation was cancelled.",
-                    Toast.LENGTH_SHORT,
-                ).show()
-                importState.value = ImportState.NameOrUnique
-            } else {
-                lifecycleScope.launch(Dispatchers.IO) {
-                    validatedCardManager.addValidatedCard(validatedCardId)
-                    importState.value = ImportState.ImportCard
-                }
-            }
-        }
-    }
-
-    private suspend fun loadCard() {
-        val selectedUri = uri
-        if (selectedUri == null) {
-            withContext(Dispatchers.Main) {
-                Toast.makeText(
-                    this@CompanionImportCardActivity,
-                    "No card file selected.",
-                    Toast.LENGTH_SHORT,
-                ).show()
-            }
-            importState.value = ImportState.NameOrUnique
-            return
-        }
-        val dimReader = DimReader()
-        val inputStream = contentResolver.openInputStream(selectedUri)
-        if (inputStream == null) {
-            withContext(Dispatchers.Main) {
-                Toast.makeText(
-                    this@CompanionImportCardActivity,
-                    "Unable to open selected card file.",
-                    Toast.LENGTH_LONG,
-                ).show()
-            }
-            importState.value = ImportState.NameOrUnique
-            return
-        }
-        inputStream.use {
-            card = dimReader.readCard(it, false)
-            if (validatedCardManager.isValidatedCard(card.header.dimId)) {
-                importState.value = ImportState.ImportCard
-            } else {
-                importState.value = ImportState.UnlockCard
-            }
-        }
-    }
-
-    private suspend fun importCard(): Boolean {
-        importPercent.value = 0
-        importStatus.value = "Preparing card"
-        val channelClient = Wearable.getChannelClient(this)
-        val nodes = Wearable.getNodeClient(this).connectedNodes.await()
-        Timber.i("Card transfer start: connectedNodes=${nodes.size}, ids=${nodes.joinToString { it.id }}")
-        if (nodes.isEmpty()) {
-            importStatus.value = getString(R.string.companion_firmware_no_watch)
-            withContext(Dispatchers.Main) {
-                Toast.makeText(
-                    this@CompanionImportCardActivity,
-                    getString(R.string.companion_firmware_no_watch),
-                    Toast.LENGTH_LONG,
-                ).show()
-            }
-            return false
-        }
-
-        val cardWriter = DimWriter()
-        val cardPayload = ByteArrayOutputStream().use { outputStream ->
-            cardWriter.writeCard(card, outputStream)
-            outputStream.toByteArray()
-        }
-        val cardNameBytes = cardName.value.toByteArray(Charset.defaultCharset())
-        val metadataLength = cardNameBytes.size + 1 + 1 + 1 + 4
-        val totalBytes = (metadataLength + cardPayload.size).toLong() * nodes.size
-        var transferredBytes = 0L
-        var successfulTransfers = 0
-        val failedNodes = mutableListOf<String>()
-        for (node in nodes) {
-            val nodeName = node.displayName.takeIf { it.isNotBlank() } ?: node.id
-            importStatus.value = "Connecting to $nodeName"
-            try {
-                Timber.i("Opening card channel for nodeId=${node.id}, displayName=${node.displayName}")
-                val channel = channelClient.openChannel(node.id, ChannelTypes.CARD_DATA).await()
-                channelClient.getOutputStream(channel).await().use { os ->
-                    val output = DataOutputStream(os)
-                    output.write(cardNameBytes)
-                    output.writeByte(0)
-                    output.writeByte(if (uniqueSprites.value) 1 else 0)
-                    output.writeByte(if (convertToBem.value) 1 else 0)
-                    output.writeInt(cardPayload.size)
-                    transferredBytes += metadataLength
-                    val metadataPercent = if (totalBytes == 0L) 0 else ((transferredBytes * 100) / totalBytes).toInt().coerceIn(0, 100)
-                    importStatus.value = "Sending card to $nodeName"
-                    importPercent.value = metadataPercent
-
-                    val buffer = ByteArray(4096)
-                    var bytesRead: Int
-                    cardPayload.inputStream().use { payloadInput ->
-                        while (payloadInput.read(buffer).also { bytesRead = it } >= 0) {
-                            output.write(buffer, 0, bytesRead)
-                            transferredBytes += bytesRead
-                            val transferPercent = if (totalBytes == 0L) 0 else ((transferredBytes * 100) / totalBytes).toInt().coerceIn(0, 100)
-                            importPercent.value = transferPercent
-                        }
-                    }
-                    output.flush()
-                }
-                channelClient.close(channel).await()
-                successfulTransfers++
-                Timber.i("Card transfer complete for nodeId=${node.id}, card=${cardName.value}, payloadBytes=${cardPayload.size}")
-            } catch (error: Exception) {
-                failedNodes.add("$nodeName: ${error.message ?: "unknown error"}")
-                Timber.e(error, "Card transfer failed for nodeId=${node.id}, displayName=${node.displayName}")
-            }
-        }
-
-        if (successfulTransfers == 0) {
-            importStatus.value = "Transfer failed"
-            importPercent.value = 0
-            withContext(Dispatchers.Main) {
-                val reason = failedNodes.firstOrNull() ?: "No watch accepted the transfer"
-                Toast.makeText(this@CompanionImportCardActivity, "Card transfer failed: $reason", Toast.LENGTH_LONG).show()
-            }
-            return false
-        }
-
-        importStatus.value = "Transfer complete"
-        importPercent.value = 100
-        if (failedNodes.isNotEmpty()) {
-            withContext(Dispatchers.Main) {
-                Toast.makeText(
-                    this@CompanionImportCardActivity,
-                    "Sent to $successfulTransfers watch(es); ${failedNodes.size} failed.",
-                    Toast.LENGTH_LONG,
-                ).show()
-            }
-        }
-
-        Timber.i("Companion-style card import sent to watch for ${cardName.value}; success=$successfulTransfers failures=${failedNodes.size}")
-        return true
-    }
-}
-

app/src/main/java/com/github/nacabaro/vbhelper/companion/card/CompanionValidateCardActivity.kt

@@ -1,162 +0,0 @@
-package com.github.nacabaro.vbhelper.companion.card
-
-import android.content.Intent
-import android.nfc.NfcAdapter
-import android.nfc.Tag
-import android.nfc.tech.MifareUltralight
-import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import android.provider.Settings
-import android.widget.Toast
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.res.stringResource
-import com.github.nacabaro.vbhelper.R
-import com.github.nacabaro.vbhelper.companion.ui.CompanionLoading
-import kotlinx.coroutines.flow.MutableStateFlow
-import timber.log.Timber
-
-class CompanionValidateCardActivity : ComponentActivity(), NfcAdapter.ReaderCallback {
-    companion object {
-        const val CARD_VALIDATED_KEY = "CARD_VALIDATED"
-    }
-
-    enum class CardValidationState {
-        WaitingForVBConnect,
-        ValidateCardOnVB,
-        Success,
-    }
-
-    private lateinit var nfcAdapter: NfcAdapter
-    private val validationStateFlow = MutableStateFlow(CardValidationState.WaitingForVBConnect)
-    private var cardIdToValidate: UShort = 0u
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        val maybeNfcAdapter = NfcAdapter.getDefaultAdapter(this)
-        val inputCardId = intent.getIntExtra(CARD_VALIDATED_KEY, -1)
-        if (inputCardId == -1) {
-            Timber.e("CompanionValidateCardActivity called without card number!")
-            finish()
-            return
-        }
-        cardIdToValidate = inputCardId.toUShort()
-        if (maybeNfcAdapter == null) {
-            Toast.makeText(this, getString(R.string.scan_no_nfc_on_device), Toast.LENGTH_SHORT).show()
-            finish()
-            return
-        }
-        nfcAdapter = maybeNfcAdapter
-        setContent {
-            DisplayContent()
-        }
-    }
-
-    @Composable
-    fun DisplayContent() {
-        val validationState by validationStateFlow.collectAsState()
-        when (validationState) {
-            CardValidationState.WaitingForVBConnect -> {
-                CompanionLoading(loadingText = stringResource(R.string.companion_validation_connect_vb))
-            }
-            CardValidationState.ValidateCardOnVB -> {
-                CompanionLoading(loadingText = stringResource(R.string.companion_validation_insert_card))
-            }
-            CardValidationState.Success -> {
-                LaunchedEffect(true) {
-                    Handler(Looper.getMainLooper()).postDelayed({
-                        val intent = Intent().apply {
-                            putExtra(CARD_VALIDATED_KEY, cardIdToValidate.toInt())
-                        }
-                        setResult(RESULT_OK, intent)
-                        finish()
-                    }, 1000)
-                }
-                Text(text = stringResource(R.string.companion_validation_success))
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        if (!nfcAdapter.isEnabled) {
-            showWirelessSettings()
-        } else {
-            nfcAdapter.enableReaderMode(this, this, NfcAdapter.FLAG_READER_NFC_A, Bundle())
-        }
-    }
-
-    override fun onPause() {
-        super.onPause()
-        if (this::nfcAdapter.isInitialized) {
-            nfcAdapter.disableReaderMode(this)
-        }
-    }
-
-    private fun showWirelessSettings() {
-        Toast.makeText(this, getString(R.string.scan_nfc_must_be_enabled), Toast.LENGTH_SHORT).show()
-        startActivity(Intent(Settings.ACTION_WIRELESS_SETTINGS))
-    }
-
-    override fun onTagDiscovered(tag: Tag?) {
-        if (tag == null) {
-            Timber.w("Tag discovery returned null tag")
-            return
-        }
-        when (validationStateFlow.value) {
-            CardValidationState.WaitingForVBConnect -> {
-                val nfcData = MifareUltralight.get(tag)
-                if (nfcData == null) {
-                    Timber.w("Unsupported NFC tech for validation")
-                    return
-                }
-                val writeSuccessful = runCatching {
-                    nfcData.connect()
-                    nfcData.use {
-                        val vbData = VBNfcData(nfcData)
-                        vbData.writeCardCheck(nfcData, cardIdToValidate)
-                    }
-                    true
-                }.onFailure {
-                    Timber.e(it, "Failed during first validation NFC step")
-                    runOnUiThread {
-                        Toast.makeText(
-                            this,
-                            "Failed to validate card on bracelet. Please retry.",
-                            Toast.LENGTH_SHORT,
-                        ).show()
-                    }
-                }.getOrDefault(false)
-                if (writeSuccessful) {
-                    validationStateFlow.value = CardValidationState.ValidateCardOnVB
-                }
-            }
-            CardValidationState.ValidateCardOnVB -> {
-                val nfcData = MifareUltralight.get(tag)
-                if (nfcData == null) {
-                    Timber.w("Unsupported NFC tech for validation")
-                    return
-                }
-                runCatching {
-                    nfcData.connect()
-                    nfcData.use {
-                        val vbData = VBNfcData(nfcData)
-                        if (vbData.wasCardIdValidated(cardIdToValidate)) {
-                            validationStateFlow.value = CardValidationState.Success
-                        }
-                    }
-                }.onFailure {
-                    Timber.e(it, "Failed during second validation NFC step")
-                }
-            }
-            else -> Timber.w("Incorrect state")
-        }
-    }
-}
-

app/src/main/java/com/github/nacabaro/vbhelper/companion/card/VBNfcData.kt

@@ -1,48 +0,0 @@
-package com.github.nacabaro.vbhelper.companion.card
-
-import android.nfc.tech.MifareUltralight
-import kotlin.experimental.and
-import kotlin.experimental.or
-
-class VBNfcData(nfcData: MifareUltralight) {
-    companion object {
-        private const val ITEM_ID_BE: UShort = 4u
-        private const val STATUS_READY_FLAG: Byte = 0b00000001
-        private const val STATUS_DIM_READY_FLAG: Byte = 0b00000010
-        private val STATUS_DIM_IS_READY = STATUS_READY_FLAG or STATUS_DIM_READY_FLAG
-        private const val OPERATION_READY: Byte = 1
-        private const val OPERATION_CHECK_DIM: Byte = 3
-    }
-
-    val itemId: UShort
-    val status: Byte
-    val operation: Byte
-    val dimId: UShort
-
-    init {
-        val readData = nfcData.transceive(byteArrayOf(0x30, 0x04))
-        itemId = readData.getUInt16(4, Endian.Big)
-        status = readData[8]
-        if (itemId == ITEM_ID_BE) {
-            operation = readData[9]
-            dimId = readData.getUInt16(10, Endian.Big)
-        } else {
-            dimId = readData[9].toUShort()
-            operation = readData[10]
-        }
-    }
-
-    fun writeCardCheck(nfcData: MifareUltralight, dimId: UShort) {
-        if (itemId == ITEM_ID_BE) {
-            val dimData = dimId.toByteArray(endian = Endian.Big)
-            nfcData.writePage(6, byteArrayOf(STATUS_READY_FLAG, OPERATION_CHECK_DIM, dimData[0], dimData[1]))
-        } else {
-            nfcData.writePage(6, byteArrayOf(STATUS_READY_FLAG, dimId.toByte(), OPERATION_CHECK_DIM, 0))
-        }
-    }
-
-    fun wasCardIdValidated(dimId: UShort): Boolean {
-        return dimId == this.dimId && operation == OPERATION_READY && (status and STATUS_DIM_IS_READY == STATUS_DIM_IS_READY)
-    }
-}
-

app/src/main/java/com/github/nacabaro/vbhelper/companion/common/ChannelTypes.kt

@@ -1,10 +0,0 @@
-package com.github.nacabaro.vbhelper.companion.common
-
-object ChannelTypes {
-    const val CARD_DATA = "com.github.cfogrady.vitalwear/CARD_DATA"
-    const val FIRMWARE_DATA = "com.github.cfogrady.vitalwear/FIRMWARE_DATA"
-    const val CHARACTER_DATA = "com.github.cfogrady.vitalwear/CHARACTER_DATA"
-    const val SEND_LOGS_REQUEST = "SEND_LOGS_REQUEST"
-    const val LOGS_DATA = "LOG_DATA"
-}
-

app/src/main/java/com/github/nacabaro/vbhelper/companion/firmware/CompanionFirmwareImportActivity.kt

@@ -1,140 +0,0 @@
-package com.github.nacabaro.vbhelper.companion.firmware
-
-import android.net.Uri
-import android.os.Bundle
-import android.widget.Toast
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.lifecycle.lifecycleScope
-import com.github.nacabaro.vbhelper.R
-import com.github.nacabaro.vbhelper.companion.common.ChannelTypes
-import com.github.nacabaro.vbhelper.companion.ui.CompanionLoading
-import com.google.android.gms.wearable.Wearable
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.tasks.await
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-import java.io.DataOutputStream
-
-class CompanionFirmwareImportActivity : ComponentActivity() {
-    enum class FirmwareImportState {
-        PickFirmware,
-        LoadFirmware,
-    }
-
-    private val importState = MutableStateFlow(FirmwareImportState.PickFirmware)
-    private val transferPercent = MutableStateFlow(0)
-    private val transferStatus = MutableStateFlow("Preparing transfer")
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        val firmwareImportActivity = buildFirmwareFilePickLauncher()
-        setContent {
-            BuildScreen(firmwareImportActivity)
-        }
-    }
-
-    @Composable
-    fun BuildScreen(firmwareImportActivity: ActivityResultLauncher<Array<String>>) {
-        val state by importState.collectAsState()
-        val percent by transferPercent.collectAsState()
-        val status by transferStatus.collectAsState()
-        if (state == FirmwareImportState.PickFirmware) {
-            LaunchedEffect(true) {
-                firmwareImportActivity.launch(arrayOf("*/*"))
-            }
-        }
-        val loadingText = if (state == FirmwareImportState.PickFirmware) {
-            getString(R.string.companion_loading_select_firmware)
-        } else {
-            "$status ($percent%)"
-        }
-        CompanionLoading(loadingText = loadingText)
-    }
-
-    private fun buildFirmwareFilePickLauncher(): ActivityResultLauncher<Array<String>> {
-        return registerForActivityResult(ActivityResultContracts.OpenDocument()) {
-            importState.value = FirmwareImportState.LoadFirmware
-            if (it == null) {
-                finish()
-            } else {
-                Timber.i("Path: ${it.path}")
-                importFirmware(it)
-            }
-        }
-    }
-
-    private fun importFirmware(uri: Uri) {
-        transferPercent.value = 0
-        transferStatus.value = "Reading firmware file"
-        val channelClient = Wearable.getChannelClient(this)
-        val nodeListTask = Wearable.getNodeClient(this).connectedNodes
-        lifecycleScope.launch(Dispatchers.IO) {
-            try {
-                val nodes = nodeListTask.await()
-                if (nodes.isEmpty()) {
-                    transferStatus.value = getString(R.string.companion_firmware_no_watch)
-                    withContext(Dispatchers.Main) {
-                        Toast.makeText(this@CompanionFirmwareImportActivity, getString(R.string.companion_firmware_no_watch), Toast.LENGTH_LONG).show()
-                    }
-                    importState.value = FirmwareImportState.PickFirmware
-                    return@launch
-                }
-
-                val firmware = contentResolver.openInputStream(uri)?.use { input ->
-                    input.readBytes()
-                } ?: throw IllegalStateException("Unable to read selected firmware file")
-
-                transferPercent.value = 5
-                transferStatus.value = "Sending firmware"
-                val totalBytes = (firmware.size + 4).toLong() * nodes.size
-                var transferredBytes = 0L
-                for (node in nodes) {
-                    val channel = channelClient.openChannel(node.id, ChannelTypes.FIRMWARE_DATA).await()
-                    try {
-                        channelClient.getOutputStream(channel).await().use {
-                            val output = DataOutputStream(it)
-                            output.writeInt(firmware.size)
-                            transferredBytes += 4
-                            transferPercent.value = if (totalBytes == 0L) 0 else ((transferredBytes * 100) / totalBytes).toInt().coerceIn(0, 100)
-                            val buffer = ByteArray(4096)
-                            var bytesRead: Int
-                            firmware.inputStream().use { firmwareInput ->
-                                while (firmwareInput.read(buffer).also { bytesRead = it } >= 0) {
-                                    output.write(buffer, 0, bytesRead)
-                                    transferredBytes += bytesRead
-                                    transferPercent.value = if (totalBytes == 0L) 0 else ((transferredBytes * 100) / totalBytes).toInt().coerceIn(0, 100)
-                                }
-                            }
-                            output.flush()
-                        }
-                    } finally {
-                        runCatching { channelClient.close(channel).await() }
-                    }
-                }
-                transferStatus.value = "Transfer complete"
-                transferPercent.value = 100
-                withContext(Dispatchers.Main) {
-                    Toast.makeText(this@CompanionFirmwareImportActivity, getString(R.string.companion_firmware_sent_success), Toast.LENGTH_SHORT).show()
-                    finish()
-                }
-            } catch (e: Exception) {
-                Timber.e(e, "Failed to send firmware to watch")
-                transferStatus.value = "Transfer failed: ${e.message ?: "unknown"}"
-                withContext(Dispatchers.Main) {
-                    Toast.makeText(this@CompanionFirmwareImportActivity, "Firmware transfer failed: ${e.message ?: "unknown error"}", Toast.LENGTH_LONG).show()
-                }
-                importState.value = FirmwareImportState.PickFirmware
-            }
-        }
-    }
-}
-

app/src/main/java/com/github/nacabaro/vbhelper/companion/logging/TinyLogTree.kt

@@ -1,77 +0,0 @@
-package com.github.nacabaro.vbhelper.companion.logging
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.util.Log
-import org.tinylog.Logger
-import org.tinylog.configuration.Configuration
-import org.tinylog.provider.ProviderRegistry
-import timber.log.Timber
-import java.io.File
-
-@SuppressLint("LogNotTimber")
-class TinyLogTree(context: Context) : Timber.DebugTree() {
-    companion object {
-        private val logFileRegexp = Regex("""log_(\d{4}-\d{2}-\d{2})_(\d+)\.txt""")
-        private const val START_DATE = "0000-00-00"
-
-        fun shutdown() {
-            ProviderRegistry.getLoggingProvider().shutdown()
-        }
-
-        private fun setupRollingLogs(logsDir: String) {
-            Configuration.set("writer", "rolling file")
-            Configuration.set("writer.level", "info")
-            Configuration.set("writer.backups", "3")
-            Configuration.set("writer.format", "{date: yyyy-MM-dd HH:mm:ss.SSS}{pipe}{tag}{pipe}{level}{pipe}{message}")
-            Configuration.set("writer.file", "$logsDir/log_{date:yyyy-MM-dd}_{count}.txt")
-            Configuration.set("writer.policies", "daily, size: 10mb")
-            Configuration.set("writer.buffered", "true")
-        }
-
-        private fun getLogsDir(context: Context): File = File(context.filesDir, "logs")
-
-        fun getMostRecentLogFile(context: Context): File? {
-            val logsDir = getLogsDir(context)
-            val files = logsDir.listFiles() ?: return null
-            return getMostRecentLogFileFromFiles(files)
-        }
-
-        internal fun getMostRecentLogFileFromFiles(files: Array<out File>): File? {
-            var date = START_DATE
-            var count = 0
-            var mostRecentFile: File? = null
-            for (child in files) {
-                val matchResult = logFileRegexp.find(child.name) ?: continue
-                val childDate = matchResult.groups[1]?.value ?: START_DATE
-                val childCount = matchResult.groups[2]?.value?.toInt() ?: 0
-                if (childDate > date || (childDate == date && childCount > count)) {
-                    mostRecentFile = child
-                    date = childDate
-                    count = childCount
-                }
-            }
-            Log.i("TinyLogTree", "Most Recent Log: $mostRecentFile")
-            return mostRecentFile
-        }
-    }
-
-    init {
-        val logsDir = getLogsDir(context).absolutePath
-        setupRollingLogs(logsDir)
-        Configuration.set("writingthread", "true")
-        Log.i("TinyLogTree", "Log Dir: $logsDir")
-    }
-
-    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
-        val taggedLogger = Logger.tag(tag)
-        when (priority) {
-            Log.VERBOSE, Log.DEBUG -> taggedLogger.debug { message }
-            Log.INFO -> taggedLogger.info { message }
-            Log.WARN -> taggedLogger.warn { message }
-            Log.ERROR, Log.ASSERT -> taggedLogger.error { message }
-            else -> taggedLogger.error { "Invalid priority $priority For Message! $message" }
-        }
-    }
-}
-

app/src/main/java/com/github/nacabaro/vbhelper/companion/logs/CompanionLogService.kt

@@ -1,122 +0,0 @@
-package com.github.nacabaro.vbhelper.companion.logs
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.content.ClipData
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.util.Log
-import android.widget.Toast
-import androidx.core.content.FileProvider
-import com.github.nacabaro.vbhelper.R
-import com.github.nacabaro.vbhelper.companion.common.ChannelTypes
-import com.google.android.gms.wearable.CapabilityClient
-import com.google.android.gms.wearable.ChannelClient
-import com.google.android.gms.wearable.ChannelClient.ChannelCallback
-import com.google.android.gms.wearable.Wearable
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.tasks.await
-import timber.log.Timber
-import java.io.File
-
-class CompanionLogService {
-    companion object {
-        private const val TAG = "CompanionLogService"
-    }
-
-    var initializedActivity: Activity? = null
-
-    fun sendLogFile(context: Context, file: File) {
-        initializedActivity?.let {
-            sendLogFile(context, file, it)
-            initializedActivity?.finish()
-        }
-        initializedActivity = null
-    }
-
-    @SuppressLint("LogNotTimber")
-    fun sendLogFile(context: Context, file: File, activity: Activity) {
-        val emailIntent = Intent(Intent.ACTION_SENDTO).apply {
-            data = Uri.parse("mailto:")
-            putExtra(Intent.EXTRA_EMAIL, arrayOf("vitalwear-developers@googlegroups.com", "taveonnelsonn@gmail.com"))
-            putExtra(Intent.EXTRA_SUBJECT, "VBHelper Log")
-            putExtra(Intent.EXTRA_TEXT, "Please take a look at these logs to help diagnose the below issue:\n")
-        }
-        val fileUri = FileProvider.getUriForFile(context, "${context.packageName}.provider", file)
-        emailIntent.putExtra(Intent.EXTRA_STREAM, fileUri)
-        emailIntent.clipData = ClipData.newRawUri("", fileUri)
-        emailIntent.flags = Intent.FLAG_GRANT_READ_URI_PERMISSION
-        Log.i(TAG, "Starting activity to send email")
-        activity.startActivity(Intent.createChooser(emailIntent, "Select Email Client"))
-    }
-
-    fun receiveFile(context: Context, channel: ChannelClient.Channel) {
-        val channelClient = Wearable.getChannelClient(context)
-        val logs = File(context.filesDir, "logs")
-        if (!logs.exists()) {
-            logs.mkdirs()
-        }
-        val file = File(logs, "watch_log.txt")
-        channelClient.registerChannelCallback(channel, object : ChannelCallback() {
-            override fun onInputClosed(channel: ChannelClient.Channel, closeReason: Int, appErrorCode: Int) {
-                super.onInputClosed(channel, closeReason, appErrorCode)
-                if (closeReason != ChannelCallback.CLOSE_REASON_NORMAL) {
-                    Timber.w("Failed to receive file. Close Reason: ${closeReasonString(closeReason)}")
-                } else {
-                    Timber.i("Successfully downloaded log file. Input closed.")
-                    sendLogFile(context, file)
-                }
-                channelClient.close(channel)
-            }
-        })
-        channelClient.receiveFile(channel, Uri.fromFile(file), false).apply {
-            addOnFailureListener {
-                Toast.makeText(context, context.getString(R.string.companion_logs_receive_failed), Toast.LENGTH_SHORT).show()
-                initializedActivity?.finish()
-                initializedActivity = null
-            }
-        }
-    }
-
-    fun fetchWatchLogs(callingActivity: Activity) {
-        val messageClient = Wearable.getMessageClient(callingActivity)
-        val capabilityInfoTask = Wearable.getCapabilityClient(callingActivity)
-            .getCapability(ChannelTypes.SEND_LOGS_REQUEST, CapabilityClient.FILTER_REACHABLE)
-        CoroutineScope(Dispatchers.IO).launch {
-            val capabilityInfo = capabilityInfoTask.await()
-            if (capabilityInfo.nodes.isEmpty()) {
-                CoroutineScope(Dispatchers.Main).launch {
-                    Toast.makeText(callingActivity, callingActivity.getString(R.string.companion_firmware_no_watch), Toast.LENGTH_SHORT).show()
-                    callingActivity.finish()
-                }
-                return@launch
-            }
-            for (node in capabilityInfo.nodes) {
-                messageClient.sendMessage(node.id, ChannelTypes.SEND_LOGS_REQUEST, null).apply {
-                    addOnFailureListener {
-                        Toast.makeText(callingActivity, callingActivity.getString(R.string.companion_logs_failed_request), Toast.LENGTH_SHORT).show()
-                        callingActivity.finish()
-                    }
-                    addOnSuccessListener {
-                        initializedActivity = callingActivity
-                    }
-                }
-            }
-        }
-    }
-
-    private fun closeReasonString(closeReason: Int): String {
-        return when (closeReason) {
-            ChannelCallback.CLOSE_REASON_NORMAL -> "Normal"
-            ChannelCallback.CLOSE_REASON_LOCAL_CLOSE -> "Closed Locally"
-            ChannelCallback.CLOSE_REASON_REMOTE_CLOSE -> "Closed Remotely"
-            ChannelCallback.CLOSE_REASON_DISCONNECTED -> "Disconnected"
-            ChannelCallback.CLOSE_REASON_CONNECTION_TIMEOUT -> "Timeout"
-            else -> "Unknown"
-        }
-    }
-}
-

app/src/main/java/com/github/nacabaro/vbhelper/companion/logs/CompanionWatchLogsActivity.kt

@@ -1,41 +0,0 @@
-package com.github.nacabaro.vbhelper.companion.logs
-
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-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.res.stringResource
-import com.github.nacabaro.vbhelper.R
-import com.github.nacabaro.vbhelper.companion.ui.CompanionConfirmation
-import com.github.nacabaro.vbhelper.companion.ui.CompanionLoading
-import com.github.nacabaro.vbhelper.di.VBHelper
-
-class CompanionWatchLogsActivity : ComponentActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        val activity = this
-        setContent {
-            var accepted by remember { mutableStateOf(false) }
-            if (!accepted) {
-                CompanionConfirmation(prompt = stringResource(R.string.companion_logs_warning)) {
-                    if (it) {
-                        accepted = true
-                    } else {
-                        finish()
-                    }
-                }
-            } else {
-                CompanionLoading(loadingText = stringResource(R.string.settings_companion_send_watch_logs_title))
-                LaunchedEffect(true) {
-                    (application as VBHelper).companionLogService.fetchWatchLogs(activity)
-                }
-            }
-        }
-    }
-}
-
-

app/src/main/java/com/github/nacabaro/vbhelper/companion/logs/WatchCommunicationService.kt

@@ -1,21 +0,0 @@
-package com.github.nacabaro.vbhelper.companion.logs
-
-import com.github.nacabaro.vbhelper.companion.common.ChannelTypes
-import com.github.nacabaro.vbhelper.di.VBHelper
-import com.google.android.gms.wearable.ChannelClient
-import com.google.android.gms.wearable.WearableListenerService
-import timber.log.Timber
-
-class WatchCommunicationService : WearableListenerService() {
-    override fun onChannelOpened(channel: ChannelClient.Channel) {
-        super.onChannelOpened(channel)
-        when (channel.path) {
-            ChannelTypes.LOGS_DATA -> {
-                val logService = (application as VBHelper).companionLogService
-                logService.receiveFile(this, channel)
-            }
-            else -> Timber.i("Unknown channel: ${channel.path}")
-        }
-    }
-}
-

app/src/main/java/com/github/nacabaro/vbhelper/companion/transfer/CompanionCharacterImportActivity.kt

@@ -1,23 +0,0 @@
-package com.github.nacabaro.vbhelper.companion.transfer
-
-import android.os.Bundle
-import android.widget.Toast
-import androidx.activity.ComponentActivity
-import com.github.nacabaro.vbhelper.R
-
-/**
- * Compatibility endpoint kept for legacy links/intents from older companion flows.
- * Character transfer remains watch-driven and is not supported from phone companion UI.
- */
-class CompanionCharacterImportActivity : ComponentActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        Toast.makeText(
-            this,
-            getString(R.string.companion_transfer_disabled_message),
-            Toast.LENGTH_LONG,
-        ).show()
-        finish()
-    }
-}
-

app/src/main/java/com/github/nacabaro/vbhelper/companion/ui/CompanionConfirmation.kt

@@ -1,42 +0,0 @@
-package com.github.nacabaro.vbhelper.companion.ui
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Button
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun CompanionConfirmation(
-    prompt: String,
-    onResult: (Boolean) -> Unit,
-) {
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .padding(24.dp),
-        verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.CenterHorizontally,
-    ) {
-        Text(text = prompt, modifier = Modifier.padding(bottom = 24.dp))
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceEvenly,
-        ) {
-            Button(onClick = { onResult(true) }) {
-                Text(text = "Ok")
-            }
-            Button(onClick = { onResult(false) }) {
-                Text(text = "Cancel")
-            }
-        }
-    }
-}
-

app/src/main/java/com/github/nacabaro/vbhelper/companion/ui/CompanionLoading.kt

@@ -1,32 +0,0 @@
-package com.github.nacabaro.vbhelper.companion.ui
-
-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.CircularProgressIndicator
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun CompanionLoading(
-    loadingText: String,
-) {
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .padding(24.dp),
-        verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.CenterHorizontally,
-    ) {
-        CircularProgressIndicator()
-        Text(
-            text = loadingText,
-            modifier = Modifier.padding(top = 16.dp),
-        )
-    }
-}
-

app/src/main/java/com/github/nacabaro/vbhelper/companion/validation/CompanionValidatedDatabase.kt

@@ -1,14 +0,0 @@
-package com.github.nacabaro.vbhelper.companion.validation
-
-import androidx.room.Database
-import androidx.room.RoomDatabase
-
-@Database(
-    entities = [ValidatedCardEntity::class],
-    version = 1,
-    exportSchema = false,
-)
-abstract class CompanionValidatedDatabase : RoomDatabase() {
-    abstract fun validatedCardDao(): ValidatedCardDao
-}
-

app/src/main/java/com/github/nacabaro/vbhelper/companion/validation/ValidatedCardDao.kt

@@ -1,16 +0,0 @@
-package com.github.nacabaro.vbhelper.companion.validation
-
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-
-@Dao
-interface ValidatedCardDao {
-    @Query("select cardId from ${ValidatedCardEntity.TABLE}")
-    suspend fun getIds(): List<Int>
-
-    @Insert(onConflict = OnConflictStrategy.IGNORE)
-    suspend fun insert(validatedCardEntity: ValidatedCardEntity)
-}
-

app/src/main/java/com/github/nacabaro/vbhelper/companion/validation/ValidatedCardEntity.kt

@@ -1,13 +0,0 @@
-package com.github.nacabaro.vbhelper.companion.validation
-
-import androidx.room.Entity
-
-@Entity(tableName = ValidatedCardEntity.TABLE, primaryKeys = ["cardId"])
-data class ValidatedCardEntity(
-    val cardId: Int,
-) {
-    companion object {
-        const val TABLE = "validated"
-    }
-}
-

app/src/main/java/com/github/nacabaro/vbhelper/companion/validation/ValidatedCardManager.kt

@@ -1,35 +0,0 @@
-package com.github.nacabaro.vbhelper.companion.validation
-
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-
-class ValidatedCardManager(
-    private val validatedCardDao: ValidatedCardDao,
-) {
-    private val mutex = Mutex()
-    private var validatedIds: Set<Int>? = null
-
-    private suspend fun ensureLoaded(): Set<Int> {
-        validatedIds?.let { return it }
-        return mutex.withLock {
-            validatedIds ?: validatedCardDao.getIds().toSet().also { validatedIds = it }
-        }
-    }
-
-    suspend fun addValidatedCard(cardId: Int) {
-        mutex.withLock {
-            val current = validatedIds ?: validatedCardDao.getIds().toSet()
-            if (!current.contains(cardId)) {
-                validatedCardDao.insert(ValidatedCardEntity(cardId))
-                validatedIds = current + cardId
-            } else {
-                validatedIds = current
-            }
-        }
-    }
-
-    suspend fun isValidatedCard(cardId: Int): Boolean {
-        return ensureLoaded().contains(cardId)
-    }
-}
-

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

@@ -1,45 +0,0 @@
-package com.github.nacabaro.vbhelper.battle
-
-import android.graphics.Bitmap
-import androidx.compose.foundation.Image
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
-import com.github.nacabaro.vbhelper.battle.AttackSpriteManager
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-
-@Composable
-fun AttackSpriteImage(
-    characterId: String,
-    isLarge: Boolean = false,
-    modifier: Modifier = Modifier,
-    contentScale: ContentScale = ContentScale.Fit
-) {
-    var bitmap by remember { mutableStateOf<Bitmap?>(null) }
-    val coroutineScope = rememberCoroutineScope()
-    val context = LocalContext.current
-    
-    LaunchedEffect(characterId, isLarge) {
-        //println("AttackSpriteImage: Loading attack sprite for characterId=$characterId, isLarge=$isLarge")
-        coroutineScope.launch {
-            val attackSpriteManager = AttackSpriteManager(context)
-            val loadedBitmap = withContext(Dispatchers.IO) {
-                attackSpriteManager.getAttackSprite(characterId, isLarge)
-            }
-            bitmap = loadedBitmap
-        }
-    }
-    
-    bitmap?.let { bmp ->
-        Image(
-            bitmap = bmp.asImageBitmap(),
-            contentDescription = "Attack Sprite",
-            modifier = modifier,
-            contentScale = contentScale
-        )
-    }
-} 

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

@@ -2,13 +2,11 @@ package com.github.nacabaro.vbhelper.daos
 
 import androidx.room.Dao
 import androidx.room.Query
-import androidx.room.RewriteQueriesToDropUnusedColumns
 import com.github.nacabaro.vbhelper.dtos.CharacterDtos
 import kotlinx.coroutines.flow.Flow
 
 
 @Dao
-@RewriteQueriesToDropUnusedColumns
 interface AdventureDao {
     @Query("""
         INSERT INTO Adventure (characterId, originalDuration, finishesAdventure)

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

@@ -13,18 +13,12 @@ interface CardDao {
     @Insert(onConflict = OnConflictStrategy.IGNORE)
     suspend fun insertNewCard(card: Card): Long
 
-    @Query("SELECT * FROM Card")
-    fun getAllCards(): List<Card>
-
     @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 * FROM Card WHERE LOWER(name) = LOWER(:name) LIMIT 1")
-    fun getCardByName(name: String): Card?
-
     @Query(
         """
         SELECT ca.* 
@@ -36,18 +30,6 @@ interface CardDao {
     )
     fun getCardByCharacterId(id: Long): Flow<Card>
 
-    @Query(
-        """
-        SELECT ca.*
-        FROM Card ca
-        JOIN CardCharacter ch ON ca.id = ch.cardId
-        JOIN UserCharacter uc ON ch.id = uc.charId
-        WHERE uc.id = :id
-        LIMIT 1
-    """
-    )
-    fun getCardByCharacterIdSync(id: Long): Card?
-
     @Query("UPDATE Card SET name = :newName WHERE id = :id")
     suspend fun renameCard(id: Int, newName: String)
 
@@ -64,4 +46,4 @@ interface CardDao {
         WHERE cc.id = :charaId
     """)
     fun getCardIconByCharaId(charaId: Long): Flow<CardDtos.CardIcon>
-}
+}

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

@@ -2,13 +2,11 @@ package com.github.nacabaro.vbhelper.daos
 
 import androidx.room.Dao
 import androidx.room.Query
-import androidx.room.RewriteQueriesToDropUnusedColumns
 import com.github.cfogrady.vbnfc.data.NfcCharacter
 import com.github.nacabaro.vbhelper.dtos.CharacterDtos
 import kotlinx.coroutines.flow.Flow
 
 @Dao
-@RewriteQueriesToDropUnusedColumns
 interface CardFusionsDao {
     @Query("""
         INSERT INTO

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

@@ -24,9 +24,6 @@ interface CardProgressDao {
     )
     fun getCardProgress(cardId: Long): Flow<Int>
 
-    @Query("SELECT currentStage FROM CardProgress WHERE cardId = :cardId LIMIT 1")
-    fun getCardProgressSync(cardId: Long): Int?
-
     @Insert
     fun insertCardProgress(cardProgress: CardProgress)
-}
+}

app/src/main/java/com/github/nacabaro/vbhelper/daos/CharacterTransferPolicyDao.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.device_data.CharacterTransferPolicy
-
-@Dao
-interface CharacterTransferPolicyDao {
-    @Query("SELECT * FROM CharacterTransferPolicy WHERE characterId = :characterId")
-    fun getByCharacterId(characterId: Long): CharacterTransferPolicy?
-
-    @Upsert
-    fun upsert(policy: CharacterTransferPolicy)
-}
-
-

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

@@ -1,7 +0,0 @@
-package com.github.nacabaro.vbhelper.daos
-
-import com.github.cfogrady.vitalwear.common.data.SharedTransferSeenDao
-
-@Deprecated("Use SharedTransferSeenDao from the shared transfer database.")
-typealias TransferSeenDao = SharedTransferSeenDao
-

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

@@ -5,7 +5,6 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Upsert
-import androidx.room.RewriteQueriesToDropUnusedColumns
 import com.github.nacabaro.vbhelper.domain.card.CardCharacter
 import com.github.nacabaro.vbhelper.domain.device_data.UserCharacter
 import com.github.nacabaro.vbhelper.domain.device_data.BECharacterData
@@ -17,7 +16,6 @@ import com.github.nacabaro.vbhelper.dtos.CharacterDtos
 import kotlinx.coroutines.flow.Flow
 
 @Dao
-@RewriteQueriesToDropUnusedColumns
 interface UserCharacterDao {
     @Insert
     fun insertCharacterData(characterData: UserCharacter): Long
@@ -57,22 +55,6 @@ interface UserCharacterDao {
     )
     fun getTransformationHistory(monId: Long): Flow<List<CharacterDtos.TransformationHistory>>
 
-    @Query(
-        """
-        SELECT
-            t.stageId as stageId,
-            c.charaIndex AS monIndex,
-            ca.name as cardName,
-            t.transformationDate AS transformationDate
-        FROM TransformationHistory t
-        JOIN CardCharacter c ON c.id = t.stageId
-        JOIN Card ca ON ca.id = c.cardId
-        WHERE t.monId = :monId
-        ORDER BY t.transformationDate ASC, t.id ASC
-    """
-    )
-    suspend fun getTransformationHistoryForExport(monId: Long): List<CharacterDtos.TransformationHistoryExport>
-
     @Query(
         """
         SELECT
@@ -133,9 +115,6 @@ interface UserCharacterDao {
     @Query("SELECT * FROM VBCharacterData WHERE id = :id")
     fun getVbData(id: Long): Flow<VBCharacterData>
 
-    @Query("SELECT * FROM VBCharacterData WHERE id = :id")
-    suspend fun getVbDataOrNull(id: Long): VBCharacterData?
-
     @Query("SELECT * FROM SpecialMissions WHERE characterId = :id")
     fun getSpecialMissions(id: Long): Flow<List<SpecialMissions>>
 
@@ -255,4 +234,4 @@ interface UserCharacterDao {
         """
     )
     suspend fun getVBDimCharacters(): List<CharacterDtos.CharacterWithSprites>
-}
+}

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

@@ -1,17 +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.device_data.VitalWearCharacterSettings
-
-@Dao
-interface VitalWearSettingsDao {
-    @Query("SELECT * FROM VitalWearCharacterSettings WHERE characterId = :characterId LIMIT 1")
-    suspend fun getByCharacterId(characterId: Long): VitalWearCharacterSettings?
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun upsert(settings: VitalWearCharacterSettings)
-}
-

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

@@ -2,8 +2,6 @@ package com.github.nacabaro.vbhelper.database
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
 import com.github.nacabaro.vbhelper.daos.AdventureDao
 import com.github.nacabaro.vbhelper.daos.CardAdventureDao
 import com.github.nacabaro.vbhelper.daos.CharacterDao
@@ -15,10 +13,6 @@ 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.daos.VitalWearSettingsDao
-import com.github.nacabaro.vbhelper.daos.CharacterTransferPolicyDao
-import com.github.nacabaro.vbhelper.companion.validation.ValidatedCardDao
-import com.github.nacabaro.vbhelper.companion.validation.ValidatedCardEntity
 import com.github.nacabaro.vbhelper.domain.card.Background
 import com.github.nacabaro.vbhelper.domain.card.CardCharacter
 import com.github.nacabaro.vbhelper.domain.card.Card
@@ -35,13 +29,10 @@ 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.device_data.VitalWearCharacterSettings
-import com.github.nacabaro.vbhelper.domain.device_data.CharacterTransferPolicy
 import com.github.nacabaro.vbhelper.domain.items.Items
 
 @Database(
-    version = 3,
-    exportSchema = false,
+    version = 1,
     entities = [
         Card::class,
         CardProgress::class,
@@ -59,10 +50,7 @@ import com.github.nacabaro.vbhelper.domain.items.Items
         Items::class,
         Adventure::class,
         Background::class,
-        PossibleTransformations::class,
-        ValidatedCardEntity::class,
-        VitalWearCharacterSettings::class,
-        CharacterTransferPolicy::class
+        PossibleTransformations::class
     ]
 )
 abstract class AppDatabase : RoomDatabase() {
@@ -77,35 +65,4 @@ abstract class AppDatabase : RoomDatabase() {
     abstract fun specialMissionDao(): SpecialMissionDao
     abstract fun cardAdventureDao(): CardAdventureDao
     abstract fun cardFusionsDao(): CardFusionsDao
-    abstract fun validatedCardDao(): ValidatedCardDao
-    abstract fun vitalWearSettingsDao(): VitalWearSettingsDao
-    abstract fun characterTransferPolicyDao(): CharacterTransferPolicyDao
-
-    companion object {
-        val MIGRATION_1_2 = object : Migration(1, 2) {
-            override fun migrate(db: SupportSQLiteDatabase) {
-                // Create new tables
-                db.execSQL("CREATE TABLE IF NOT EXISTS `Items` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, `itemIcon` INTEGER NOT NULL, `itemLength` INTEGER NOT NULL, `price` INTEGER NOT NULL, `quantity` INTEGER NOT NULL, `itemType` TEXT NOT NULL, PRIMARY KEY(`id`))")
-                db.execSQL("CREATE TABLE IF NOT EXISTS `SpecialMissions` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `characterId` INTEGER NOT NULL, `goal` INTEGER NOT NULL, `watchId` INTEGER NOT NULL, `progress` INTEGER NOT NULL, `status` TEXT NOT NULL, `timeElapsedInMinutes` INTEGER NOT NULL, `timeLimitInMinutes` INTEGER NOT NULL, `missionType` TEXT NOT NULL, FOREIGN KEY(`characterId`) REFERENCES `UserCharacter`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )")
-                db.execSQL("CREATE TABLE IF NOT EXISTS `VBCharacterData` (`id` INTEGER NOT NULL, `generation` INTEGER NOT NULL, `totalTrophies` INTEGER NOT NULL, PRIMARY KEY(`id`), FOREIGN KEY(`id`) REFERENCES `UserCharacter`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )")
-                db.execSQL("CREATE TABLE IF NOT EXISTS `TransformationHistory` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `monId` INTEGER NOT NULL, `stageId` INTEGER NOT NULL, `transformationDate` INTEGER NOT NULL, FOREIGN KEY(`monId`) REFERENCES `UserCharacter`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`stageId`) REFERENCES `CardCharacter`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )")
-                db.execSQL("CREATE TABLE IF NOT EXISTS `VitalsHistory` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `charId` INTEGER NOT NULL, `year` INTEGER NOT NULL, `month` INTEGER NOT NULL, `day` INTEGER NOT NULL, `vitalPoints` INTEGER NOT NULL, FOREIGN KEY(`charId`) REFERENCES `UserCharacter`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )")
-                db.execSQL("CREATE TABLE IF NOT EXISTS `Dex` (`id` INTEGER NOT NULL, `discoveredOn` INTEGER NOT NULL, PRIMARY KEY(`id`), FOREIGN KEY(`id`) REFERENCES `CardCharacter`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )")
-                db.execSQL("CREATE TABLE IF NOT EXISTS `Adventure` (`characterId` INTEGER NOT NULL, `originalDuration` INTEGER NOT NULL, `finishesAdventure` INTEGER NOT NULL, PRIMARY KEY(`characterId`), FOREIGN KEY(`characterId`) REFERENCES `UserCharacter`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )")
-                db.execSQL("CREATE TABLE IF NOT EXISTS `Background` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `cardId` INTEGER NOT NULL, `background` BLOB NOT NULL, `backgroundWidth` INTEGER NOT NULL, `backgroundHeight` INTEGER NOT NULL, FOREIGN KEY(`cardId`) REFERENCES `Card`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )")
-                db.execSQL("CREATE TABLE IF NOT EXISTS `PossibleTransformations` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `charaId` INTEGER NOT NULL, `requiredVitals` INTEGER NOT NULL, `requiredTrophies` INTEGER NOT NULL, `requiredBattles` INTEGER NOT NULL, `requiredWinRate` INTEGER NOT NULL, `changeTimerHours` INTEGER NOT NULL, `requiredAdventureLevelCompleted` INTEGER NOT NULL, `toCharaId` INTEGER, FOREIGN KEY(`charaId`) REFERENCES `CardCharacter`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`toCharaId`) REFERENCES `CardCharacter`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )")
-                db.execSQL("CREATE TABLE IF NOT EXISTS `validated` (`cardId` INTEGER NOT NULL, PRIMARY KEY(`cardId`))")
-                db.execSQL("CREATE TABLE IF NOT EXISTS `VitalWearCharacterSettings` (`characterId` INTEGER NOT NULL, `trainingInBackground` INTEGER NOT NULL, `allowedBattles` INTEGER NOT NULL, `accumulatedDailyInjuries` INTEGER NOT NULL, PRIMARY KEY(`characterId`))")
-                db.execSQL("CREATE TABLE IF NOT EXISTS `CharacterTransferPolicy` (`characterId` INTEGER NOT NULL, `nativeDeviceType` TEXT NOT NULL, `preferredHceExportFormat` TEXT NOT NULL, `preferredNfcaExportFormat` TEXT NOT NULL, `lastObservedImportFormat` TEXT, `lastTransferTransport` TEXT, `lastTransferTarget` TEXT, `preserveVbRoundTrip` INTEGER NOT NULL, `preserveBeRoundTrip` INTEGER NOT NULL, PRIMARY KEY(`characterId`), FOREIGN KEY(`characterId`) REFERENCES `UserCharacter`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )")
-
-                // Add columns to existing tables
-                try {
-                    db.execSQL("ALTER TABLE `UserCharacter` ADD COLUMN `characterType` TEXT NOT NULL DEFAULT 'BEDevice'")
-                } catch (e: Exception) {}
-                try {
-                    db.execSQL("ALTER TABLE `Card` ADD COLUMN `isBEm` INTEGER NOT NULL DEFAULT 0")
-                } catch (e: Exception) {}
-            }
-        }
-    }
-}
+}

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

@@ -3,13 +3,9 @@ package com.github.nacabaro.vbhelper.di
 import com.github.nacabaro.vbhelper.database.AppDatabase
 import com.github.nacabaro.vbhelper.source.CurrencyRepository
 import com.github.nacabaro.vbhelper.source.DataStoreSecretsRepository
-import com.github.nacabaro.vbhelper.companion.validation.ValidatedCardManager
-import com.github.nacabaro.vbhelper.companion.logs.CompanionLogService
 
 interface AppContainer {
     val db: AppDatabase
     val dataStoreSecretsRepository: DataStoreSecretsRepository
     val currencyRepository: CurrencyRepository
-    val validatedCardManager: ValidatedCardManager
-    val companionLogService: CompanionLogService
 }

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

@@ -8,8 +8,6 @@ import com.github.nacabaro.vbhelper.database.AppDatabase
 import com.github.nacabaro.vbhelper.di.AppContainer
 import com.github.nacabaro.vbhelper.source.CurrencyRepository
 import com.github.nacabaro.vbhelper.source.DataStoreSecretsRepository
-import com.github.nacabaro.vbhelper.companion.validation.ValidatedCardManager
-import com.github.nacabaro.vbhelper.companion.logs.CompanionLogService
 import com.github.nacabaro.vbhelper.source.SecretsSerializer
 import com.github.nacabaro.vbhelper.source.proto.Secrets
 
@@ -32,7 +30,6 @@ class DefaultAppContainer(private val context: Context) : AppContainer {
             klass = AppDatabase::class.java,
             "internalDb"
         )
-            .addMigrations(AppDatabase.MIGRATION_1_2)
             .createFromAsset("items.db")
             .build()
     }
@@ -40,11 +37,5 @@ class DefaultAppContainer(private val context: Context) : AppContainer {
     override val dataStoreSecretsRepository = DataStoreSecretsRepository(context.secretsStore)
 
     override val currencyRepository = CurrencyRepository(context.currencyStore)
-
-    override val validatedCardManager by lazy {
-        ValidatedCardManager(db.validatedCardDao())
-    }
-
-    override val companionLogService = CompanionLogService()
 }
 

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

@@ -2,18 +2,10 @@ package com.github.nacabaro.vbhelper.di
 
 import DefaultAppContainer
 import android.app.Application
-import com.github.nacabaro.vbhelper.companion.validation.ValidatedCardManager
-import com.github.nacabaro.vbhelper.companion.logs.CompanionLogService
 
 class VBHelper : Application() {
     lateinit var container: DefaultAppContainer
 
-    val validatedCardManager: ValidatedCardManager
-        get() = container.validatedCardManager
-
-    val companionLogService: CompanionLogService
-        get() = container.companionLogService
-
     override fun onCreate() {
         super.onCreate()
         container = DefaultAppContainer(applicationContext)

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

@@ -1,7 +1,6 @@
 package com.github.nacabaro.vbhelper.domain.card
 
 import androidx.room.Entity
-import androidx.room.Index
 import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
 
@@ -13,8 +12,7 @@ import androidx.room.PrimaryKey
             childColumns = ["cardId"],
             onDelete = ForeignKey.CASCADE
         )
-    ],
-    indices = [Index(value = ["cardId"])]
+    ]
 )
 data class Background (
     @PrimaryKey(autoGenerate = true) val id: Long,
@@ -22,28 +20,4 @@ data class Background (
     val background: ByteArray,
     val backgroundWidth: Int,
     val backgroundHeight: Int
-) {
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as Background
-
-        if (id != other.id) return false
-        if (cardId != other.cardId) return false
-        if (!background.contentEquals(other.background)) return false
-        if (backgroundWidth != other.backgroundWidth) return false
-        if (backgroundHeight != other.backgroundHeight) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = id.hashCode()
-        result = 31 * result + cardId.hashCode()
-        result = 31 * result + background.contentHashCode()
-        result = 31 * result + backgroundWidth
-        result = 31 * result + backgroundHeight
-        return result
-    }
-}
+)

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

@@ -14,34 +14,4 @@ data class Card(
     val name: String,
     val stageCount: Int,
     val isBEm: Boolean
-) {
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as Card
-
-        if (id != other.id) return false
-        if (cardId != other.cardId) return false
-        if (!logo.contentEquals(other.logo)) return false
-        if (logoWidth != other.logoWidth) return false
-        if (logoHeight != other.logoHeight) return false
-        if (name != other.name) return false
-        if (stageCount != other.stageCount) return false
-        if (isBEm != other.isBEm) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = id.hashCode()
-        result = 31 * result + cardId
-        result = 31 * result + logo.contentHashCode()
-        result = 31 * result + logoWidth
-        result = 31 * result + logoHeight
-        result = 31 * result + name.hashCode()
-        result = 31 * result + stageCount
-        result = 31 * result + isBEm.hashCode()
-        return result
-    }
-}
+)

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

@@ -1,7 +1,6 @@
 package com.github.nacabaro.vbhelper.domain.card
 
 import androidx.room.Entity
-import androidx.room.Index
 import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
 
@@ -19,10 +18,6 @@ import androidx.room.PrimaryKey
             childColumns = ["cardId"],
             onDelete = ForeignKey.CASCADE
         )
-    ],
-    indices = [
-        Index(value = ["characterId"]),
-        Index(value = ["cardId"])
     ]
 )
 data class CardAdventure(
@@ -34,4 +29,4 @@ data class CardAdventure(
     val bossAp: Int,
     val bossDp: Int,
     val bossBp: Int?
-)
+)

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

@@ -1,7 +1,6 @@
 package com.github.nacabaro.vbhelper.domain.card
 
 import androidx.room.Entity
-import androidx.room.Index
 import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
 import com.github.cfogrady.vbnfc.data.NfcCharacter
@@ -21,10 +20,6 @@ import com.github.nacabaro.vbhelper.domain.characters.Sprite
             childColumns = ["spriteId"],
             onDelete = ForeignKey.CASCADE
         )
-    ],
-    indices = [
-        Index(value = ["cardId"]),
-        Index(value = ["spriteId"])
     ]
 )
 
@@ -46,42 +41,4 @@ data class CardCharacter (
     val nameSprite: ByteArray,
     val nameWidth: Int,
     val nameHeight: Int
-) {
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as CardCharacter
-
-        if (id != other.id) return false
-        if (cardId != other.cardId) return false
-        if (spriteId != other.spriteId) return false
-        if (charaIndex != other.charaIndex) return false
-        if (stage != other.stage) return false
-        if (attribute != other.attribute) return false
-        if (baseHp != other.baseHp) return false
-        if (baseBp != other.baseBp) return false
-        if (baseAp != other.baseAp) return false
-        if (!nameSprite.contentEquals(other.nameSprite)) return false
-        if (nameWidth != other.nameWidth) return false
-        if (nameHeight != other.nameHeight) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = id.hashCode()
-        result = 31 * result + cardId.hashCode()
-        result = 31 * result + spriteId.hashCode()
-        result = 31 * result + charaIndex
-        result = 31 * result + stage
-        result = 31 * result + attribute.hashCode()
-        result = 31 * result + baseHp
-        result = 31 * result + baseBp
-        result = 31 * result + baseAp
-        result = 31 * result + nameSprite.contentHashCode()
-        result = 31 * result + nameWidth
-        result = 31 * result + nameHeight
-        return result
-    }
-}
+)

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

@@ -1,7 +1,6 @@
 package com.github.nacabaro.vbhelper.domain.card
 
 import androidx.room.Entity
-import androidx.room.Index
 import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
 import com.github.cfogrady.vbnfc.data.NfcCharacter
@@ -20,10 +19,6 @@ import com.github.cfogrady.vbnfc.data.NfcCharacter
             childColumns = ["toCharaId"],
             onDelete = ForeignKey.CASCADE
         )
-    ],
-    indices = [
-        Index(value = ["fromCharaId"]),
-        Index(value = ["toCharaId"])
     ]
 )
 data class CardFusions(
@@ -31,4 +26,4 @@ data class CardFusions(
     val fromCharaId: Long,
     val attribute: NfcCharacter.Attribute,
     val toCharaId: Long
-)
+)

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

@@ -1,7 +1,6 @@
 package com.github.nacabaro.vbhelper.domain.card
 
 import androidx.room.Entity
-import androidx.room.Index
 import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
 
@@ -19,10 +18,6 @@ import androidx.room.PrimaryKey
             childColumns = ["toCharaId"],
             onDelete = ForeignKey.CASCADE
         )
-    ],
-    indices = [
-        Index(value = ["charaId"]),
-        Index(value = ["toCharaId"])
     ]
 )
 data class PossibleTransformations (
@@ -35,4 +30,4 @@ data class PossibleTransformations (
     val changeTimerHours: Int,
     val requiredAdventureLevelCompleted: Int,
     val toCharaId: Long?
-)
+)

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

@@ -20,48 +20,4 @@ data class Sprite(
     val spriteDodge: ByteArray,
     val width: Int,
     val height: Int
-) {
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as Sprite
-
-        if (id != other.id) return false
-        if (!spriteIdle1.contentEquals(other.spriteIdle1)) return false
-        if (!spriteIdle2.contentEquals(other.spriteIdle2)) return false
-        if (!spriteWalk1.contentEquals(other.spriteWalk1)) return false
-        if (!spriteWalk2.contentEquals(other.spriteWalk2)) return false
-        if (!spriteRun1.contentEquals(other.spriteRun1)) return false
-        if (!spriteRun2.contentEquals(other.spriteRun2)) return false
-        if (!spriteTrain1.contentEquals(other.spriteTrain1)) return false
-        if (!spriteTrain2.contentEquals(other.spriteTrain2)) return false
-        if (!spriteHappy.contentEquals(other.spriteHappy)) return false
-        if (!spriteSleep.contentEquals(other.spriteSleep)) return false
-        if (!spriteAttack.contentEquals(other.spriteAttack)) return false
-        if (!spriteDodge.contentEquals(other.spriteDodge)) return false
-        if (width != other.width) return false
-        if (height != other.height) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = id
-        result = 31 * result + spriteIdle1.contentHashCode()
-        result = 31 * result + spriteIdle2.contentHashCode()
-        result = 31 * result + spriteWalk1.contentHashCode()
-        result = 31 * result + spriteWalk2.contentHashCode()
-        result = 31 * result + spriteRun1.contentHashCode()
-        result = 31 * result + spriteRun2.contentHashCode()
-        result = 31 * result + spriteTrain1.contentHashCode()
-        result = 31 * result + spriteTrain2.contentHashCode()
-        result = 31 * result + spriteHappy.contentHashCode()
-        result = 31 * result + spriteSleep.contentHashCode()
-        result = 31 * result + spriteAttack.contentHashCode()
-        result = 31 * result + spriteDodge.contentHashCode()
-        result = 31 * result + width
-        result = 31 * result + height
-        return result
-    }
-}
+)

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

@@ -1,32 +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.nacabaro.vbhelper.transfer.ExportFormat
-import com.github.nacabaro.vbhelper.transfer.TransferTarget
-import com.github.nacabaro.vbhelper.transfer.TransferTransport
-import com.github.nacabaro.vbhelper.utils.DeviceType
-
-@Entity(
-    foreignKeys = [
-        ForeignKey(
-            entity = UserCharacter::class,
-            parentColumns = ["id"],
-            childColumns = ["characterId"],
-            onDelete = ForeignKey.CASCADE,
-        )
-    ]
-)
-data class CharacterTransferPolicy(
-    @PrimaryKey val characterId: Long,
-    val nativeDeviceType: DeviceType,
-    val preferredHceExportFormat: ExportFormat,
-    val preferredNfcaExportFormat: ExportFormat,
-    val lastObservedImportFormat: ExportFormat?,
-    val lastTransferTransport: TransferTransport?,
-    val lastTransferTarget: TransferTarget?,
-    val preserveVbRoundTrip: Boolean,
-    val preserveBeRoundTrip: Boolean,
-)
-

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

@@ -1,7 +1,6 @@
 package com.github.nacabaro.vbhelper.domain.device_data
 
 import androidx.room.Entity
-import androidx.room.Index
 import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
 import com.github.cfogrady.vbnfc.vb.SpecialMission
@@ -14,8 +13,7 @@ import com.github.cfogrady.vbnfc.vb.SpecialMission
             childColumns = ["characterId"],
             onDelete = ForeignKey.CASCADE
         )
-    ],
-    indices = [Index(value = ["characterId"])]
+    ]
 )
 data class SpecialMissions (
     @PrimaryKey(autoGenerate = true) var id: Long = 0,
@@ -27,4 +25,4 @@ data class SpecialMissions (
     val timeElapsedInMinutes: Int,
     val timeLimitInMinutes: Int,
     val missionType: SpecialMission.Type
-)
+)

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

@@ -1,7 +1,6 @@
 package com.github.nacabaro.vbhelper.domain.device_data
 
 import androidx.room.Entity
-import androidx.room.Index
 import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
 import com.github.nacabaro.vbhelper.domain.card.CardCharacter
@@ -20,10 +19,6 @@ import com.github.nacabaro.vbhelper.domain.card.CardCharacter
             childColumns = ["stageId"],
             onDelete = ForeignKey.CASCADE
         )
-    ],
-    indices = [
-        Index(value = ["monId"]),
-        Index(value = ["stageId"])
     ]
 )
 data class TransformationHistory (

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

@@ -1,31 +0,0 @@
-package com.github.nacabaro.vbhelper.domain.device_data
-
-import com.github.nacabaro.vbhelper.utils.DeviceType
-
-/**
- * UnifiedCharacter provides a single access point for common character data
- * and bridges the specific data for VB and BE characters.
- */
-data class UnifiedCharacter(
-    val userCharacter: UserCharacter,
-    val vbData: VBCharacterData? = null,
-    val beData: BECharacterData? = null
-) {
-    val characterType: DeviceType get() = userCharacter.characterType
-
-    fun isVB() = characterType == DeviceType.VBDevice
-    fun isBE() = characterType == DeviceType.BEDevice
-
-    // Unified accessors for core stats
-    val trophies: Int get() = userCharacter.trophies
-    val ageInDays: Int get() = userCharacter.ageInDays
-    val mood: Int get() = userCharacter.mood
-    val vitalPoints: Int get() = userCharacter.vitalPoints
-    val injuryStatus = userCharacter.injuryStatus
-    
-    // BE specific accessors with defaults
-    val trainingHp: Int get() = beData?.trainingHp ?: 0
-    val trainingAp: Int get() = beData?.trainingAp ?: 0
-    val trainingBp: Int get() = beData?.trainingBp ?: 0
-    val abilityRarity = beData?.abilityRarity
-}

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

@@ -1,7 +1,6 @@
 package com.github.nacabaro.vbhelper.domain.device_data
 
 import androidx.room.Entity
-import androidx.room.Index
 import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
 import com.github.cfogrady.vbnfc.data.NfcCharacter
@@ -16,8 +15,7 @@ import com.github.nacabaro.vbhelper.domain.card.CardCharacter
             childColumns = ["charId"],
             onDelete = ForeignKey.CASCADE
         )
-    ],
-    indices = [Index(value = ["charId"])]
+    ]
 )
 /**
  * UserCharacter represents and instance of a character. The charId should map to a Character
@@ -39,4 +37,4 @@ data class UserCharacter (
     var heartRateCurrent: Int,
     var characterType: DeviceType,
     var isActive: Boolean
-)
+)

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

@@ -1,13 +0,0 @@
-package com.github.nacabaro.vbhelper.domain.device_data
-
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity
-data class VitalWearCharacterSettings(
-    @PrimaryKey val characterId: Long,
-    val trainingInBackground: Boolean = false,
-    val allowedBattles: Int = 1,
-    val accumulatedDailyInjuries: Int = 0,
-)
-

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

@@ -1,7 +1,6 @@
 package com.github.nacabaro.vbhelper.domain.device_data
 
 import androidx.room.Entity
-import androidx.room.Index
 import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
 
@@ -13,8 +12,7 @@ import androidx.room.PrimaryKey
             childColumns = ["charId"],
             onDelete = ForeignKey.CASCADE
         )
-    ],
-    indices = [Index(value = ["charId"])]
+    ]
 )
 data class VitalsHistory (
     @PrimaryKey(autoGenerate = true) val id: Long = 0,
@@ -23,4 +21,4 @@ data class VitalsHistory (
     val month: Int,
     val day: Int,
     val vitalPoints: Int
-)
+)

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

@@ -1,7 +0,0 @@
-package com.github.nacabaro.vbhelper.domain.transfer
-
-import com.github.cfogrady.vitalwear.common.data.SharedTransferSeenEntity
-
-@Deprecated("Use SharedTransferSeenEntity from the shared transfer database.")
-typealias TransferSeenEntity = SharedTransferSeenEntity
-

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

@@ -9,35 +9,7 @@ object CardDtos {
         val logoHeight: Int,
         val totalCharacters: Int,
         val obtainedCharacters: Int,
-    ) {
-        override fun equals(other: Any?): Boolean {
-            if (this === other) return true
-            if (javaClass != other?.javaClass) return false
-
-            other as CardProgress
-
-            if (cardId != other.cardId) return false
-            if (cardName != other.cardName) return false
-            if (!cardLogo.contentEquals(other.cardLogo)) return false
-            if (logoWidth != other.logoWidth) return false
-            if (logoHeight != other.logoHeight) return false
-            if (totalCharacters != other.totalCharacters) return false
-            if (obtainedCharacters != other.obtainedCharacters) return false
-
-            return true
-        }
-
-        override fun hashCode(): Int {
-            var result = cardId.hashCode()
-            result = 31 * result + cardName.hashCode()
-            result = 31 * result + cardLogo.contentHashCode()
-            result = 31 * result + logoWidth
-            result = 31 * result + logoHeight
-            result = 31 * result + totalCharacters
-            result = 31 * result + obtainedCharacters
-            return result
-        }
-    }
+    )
 
     data class CardAdventureWithSprites (
         val characterName: ByteArray,
@@ -51,67 +23,11 @@ object CardDtos {
         val characterDp: Int,
         val characterHp: Int,
         val steps: Int,
-    ) {
-        override fun equals(other: Any?): Boolean {
-            if (this === other) return true
-            if (javaClass != other?.javaClass) return false
-
-            other as CardAdventureWithSprites
-
-            if (!characterName.contentEquals(other.characterName)) return false
-            if (characterNameWidth != other.characterNameWidth) return false
-            if (characterNameHeight != other.characterNameHeight) return false
-            if (!characterIdleSprite.contentEquals(other.characterIdleSprite)) return false
-            if (characterIdleSpriteWidth != other.characterIdleSpriteWidth) return false
-            if (characterIdleSpriteHeight != other.characterIdleSpriteHeight) return false
-            if (characterAp != other.characterAp) return false
-            if (characterBp != other.characterBp) return false
-            if (characterDp != other.characterDp) return false
-            if (characterHp != other.characterHp) return false
-            if (steps != other.steps) return false
-
-            return true
-        }
-
-        override fun hashCode(): Int {
-            var result = characterName.contentHashCode()
-            result = 31 * result + characterNameWidth
-            result = 31 * result + characterNameHeight
-            result = 31 * result + characterIdleSprite.contentHashCode()
-            result = 31 * result + characterIdleSpriteWidth
-            result = 31 * result + characterIdleSpriteHeight
-            result = 31 * result + characterAp
-            result = 31 * result + (characterBp ?: 0)
-            result = 31 * result + characterDp
-            result = 31 * result + characterHp
-            result = 31 * result + steps
-            return result
-        }
-    }
+    )
 
     data class CardIcon (
         val cardIcon: ByteArray,
         val cardIconWidth: Int,
         val cardIconHeight: Int
-    ) {
-        override fun equals(other: Any?): Boolean {
-            if (this === other) return true
-            if (javaClass != other?.javaClass) return false
-
-            other as CardIcon
-
-            if (!cardIcon.contentEquals(other.cardIcon)) return false
-            if (cardIconWidth != other.cardIconWidth) return false
-            if (cardIconHeight != other.cardIconHeight) return false
-
-            return true
-        }
-
-        override fun hashCode(): Int {
-            var result = cardIcon.contentHashCode()
-            result = 31 * result + cardIconWidth
-            result = 31 * result + cardIconHeight
-            return result
-        }
-    }
+    )
 }

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

@@ -33,75 +33,7 @@ object CharacterDtos {
         val isBemCard: Boolean,
         val isInAdventure: Boolean,
         val active: Boolean
-    ) {
-        override fun equals(other: Any?): Boolean {
-            if (this === other) return true
-            if (javaClass != other?.javaClass) return false
-
-            other as CharacterWithSprites
-
-            if (id != other.id) return false
-            if (charId != other.charId) return false
-            if (stage != other.stage) return false
-            if (attribute != other.attribute) return false
-            if (ageInDays != other.ageInDays) return false
-            if (mood != other.mood) return false
-            if (vitalPoints != other.vitalPoints) return false
-            if (transformationCountdown != other.transformationCountdown) return false
-            if (injuryStatus != other.injuryStatus) return false
-            if (trophies != other.trophies) return false
-            if (currentPhaseBattlesWon != other.currentPhaseBattlesWon) return false
-            if (currentPhaseBattlesLost != other.currentPhaseBattlesLost) return false
-            if (totalBattlesWon != other.totalBattlesWon) return false
-            if (totalBattlesLost != other.totalBattlesLost) return false
-            if (activityLevel != other.activityLevel) return false
-            if (heartRateCurrent != other.heartRateCurrent) return false
-            if (characterType != other.characterType) return false
-            if (!spriteIdle.contentEquals(other.spriteIdle)) return false
-            if (!spriteIdle2.contentEquals(other.spriteIdle2)) return false
-            if (spriteWidth != other.spriteWidth) return false
-            if (spriteHeight != other.spriteHeight) return false
-            if (!nameSprite.contentEquals(other.nameSprite)) return false
-            if (nameSpriteWidth != other.nameSpriteWidth) return false
-            if (nameSpriteHeight != other.nameSpriteHeight) return false
-            if (isBemCard != other.isBemCard) return false
-            if (isInAdventure != other.isInAdventure) return false
-            if (active != other.active) return false
-
-            return true
-        }
-
-        override fun hashCode(): Int {
-            var result = id.hashCode()
-            result = 31 * result + charId.hashCode()
-            result = 31 * result + stage
-            result = 31 * result + attribute.hashCode()
-            result = 31 * result + ageInDays
-            result = 31 * result + mood
-            result = 31 * result + vitalPoints
-            result = 31 * result + transformationCountdown
-            result = 31 * result + injuryStatus.hashCode()
-            result = 31 * result + trophies
-            result = 31 * result + currentPhaseBattlesWon
-            result = 31 * result + currentPhaseBattlesLost
-            result = 31 * result + totalBattlesWon
-            result = 31 * result + totalBattlesLost
-            result = 31 * result + activityLevel
-            result = 31 * result + heartRateCurrent
-            result = 31 * result + characterType.hashCode()
-            result = 31 * result + spriteIdle.contentHashCode()
-            result = 31 * result + spriteIdle2.contentHashCode()
-            result = 31 * result + spriteWidth
-            result = 31 * result + spriteHeight
-            result = 31 * result + nameSprite.contentHashCode()
-            result = 31 * result + nameSpriteWidth
-            result = 31 * result + nameSpriteHeight
-            result = 31 * result + isBemCard.hashCode()
-            result = 31 * result + isInAdventure.hashCode()
-            result = 31 * result + active.hashCode()
-            return result
-        }
-    }
+    )
 
     data class CardCharacterInfo(
         val cardId: Long,
@@ -118,39 +50,6 @@ object CharacterDtos {
         val spriteHeight: Int,
         val monIndex: Int,
         val transformationDate: Long
-    ) {
-        override fun equals(other: Any?): Boolean {
-            if (this === other) return true
-            if (javaClass != other?.javaClass) return false
-
-            other as TransformationHistory
-
-            if (id != other.id) return false
-            if (!spriteIdle.contentEquals(other.spriteIdle)) return false
-            if (spriteWidth != other.spriteWidth) return false
-            if (spriteHeight != other.spriteHeight) return false
-            if (monIndex != other.monIndex) return false
-            if (transformationDate != other.transformationDate) return false
-
-            return true
-        }
-
-        override fun hashCode(): Int {
-            var result = id.hashCode()
-            result = 31 * result + spriteIdle.contentHashCode()
-            result = 31 * result + spriteWidth
-            result = 31 * result + spriteHeight
-            result = 31 * result + monIndex
-            result = 31 * result + transformationDate.hashCode()
-            return result
-        }
-    }
-
-    data class TransformationHistoryExport(
-        val stageId: Long,
-        val monIndex: Int,
-        val cardName: String,
-        val transformationDate: Long
     )
 
     data class CardCharaProgress(
@@ -167,76 +66,14 @@ object CharacterDtos {
         val baseAp: Int,
         val stage: Int,
         val attribute: NfcCharacter.Attribute,
-    ) {
-        override fun equals(other: Any?): Boolean {
-            if (this === other) return true
-            if (javaClass != other?.javaClass) return false
-
-            other as CardCharaProgress
-
-            if (id != other.id) return false
-            if (!spriteIdle.contentEquals(other.spriteIdle)) return false
-            if (spriteWidth != other.spriteWidth) return false
-            if (spriteHeight != other.spriteHeight) return false
-            if (!nameSprite.contentEquals(other.nameSprite)) return false
-            if (nameSpriteWidth != other.nameSpriteWidth) return false
-            if (nameSpriteHeight != other.nameSpriteHeight) return false
-            if (discoveredOn != other.discoveredOn) return false
-            if (baseHp != other.baseHp) return false
-            if (baseBp != other.baseBp) return false
-            if (baseAp != other.baseAp) return false
-            if (stage != other.stage) return false
-            if (attribute != other.attribute) return false
-
-            return true
-        }
-
-        override fun hashCode(): Int {
-            var result = id.hashCode()
-            result = 31 * result + spriteIdle.contentHashCode()
-            result = 31 * result + spriteWidth
-            result = 31 * result + spriteHeight
-            result = 31 * result + nameSprite.contentHashCode()
-            result = 31 * result + nameSpriteWidth
-            result = 31 * result + nameSpriteHeight
-            result = 31 * result + (discoveredOn?.hashCode() ?: 0)
-            result = 31 * result + baseHp
-            result = 31 * result + baseBp
-            result = 31 * result + baseAp
-            result = 31 * result + stage
-            result = 31 * result + attribute.hashCode()
-            return result
-        }
-    }
+    )
 
     data class CardProgress(
         val id: Long,
         val spriteIdle: ByteArray,
         val spriteWidth: Int,
         val spriteHeight: Int,
-    ) {
-        override fun equals(other: Any?): Boolean {
-            if (this === other) return true
-            if (javaClass != other?.javaClass) return false
-
-            other as CardProgress
-
-            if (id != other.id) return false
-            if (!spriteIdle.contentEquals(other.spriteIdle)) return false
-            if (spriteWidth != other.spriteWidth) return false
-            if (spriteHeight != other.spriteHeight) return false
-
-            return true
-        }
-
-        override fun hashCode(): Int {
-            var result = id.hashCode()
-            result = 31 * result + spriteIdle.contentHashCode()
-            result = 31 * result + spriteWidth
-            result = 31 * result + spriteHeight
-            return result
-        }
-    }
+    )
 
     data class AdventureCharacterWithSprites(
         var id: Long = 0,
@@ -262,67 +99,7 @@ object CharacterDtos {
         val isBemCard: Boolean,
         val finishesAdventure: Long,
         val originalTimeInMinutes: Long
-    ) {
-        override fun equals(other: Any?): Boolean {
-            if (this === other) return true
-            if (javaClass != other?.javaClass) return false
-
-            other as AdventureCharacterWithSprites
-
-            if (id != other.id) return false
-            if (charId != other.charId) return false
-            if (stage != other.stage) return false
-            if (attribute != other.attribute) return false
-            if (ageInDays != other.ageInDays) return false
-            if (mood != other.mood) return false
-            if (vitalPoints != other.vitalPoints) return false
-            if (transformationCountdown != other.transformationCountdown) return false
-            if (injuryStatus != other.injuryStatus) return false
-            if (trophies != other.trophies) return false
-            if (currentPhaseBattlesWon != other.currentPhaseBattlesWon) return false
-            if (currentPhaseBattlesLost != other.currentPhaseBattlesLost) return false
-            if (totalBattlesWon != other.totalBattlesWon) return false
-            if (totalBattlesLost != other.totalBattlesLost) return false
-            if (activityLevel != other.activityLevel) return false
-            if (heartRateCurrent != other.heartRateCurrent) return false
-            if (characterType != other.characterType) return false
-            if (!spriteIdle.contentEquals(other.spriteIdle)) return false
-            if (spriteWidth != other.spriteWidth) return false
-            if (spriteHeight != other.spriteHeight) return false
-            if (isBemCard != other.isBemCard) return false
-            if (finishesAdventure != other.finishesAdventure) return false
-            if (originalTimeInMinutes != other.originalTimeInMinutes) return false
-
-            return true
-        }
-
-        override fun hashCode(): Int {
-            var result = id.hashCode()
-            result = 31 * result + charId.hashCode()
-            result = 31 * result + stage
-            result = 31 * result + attribute.hashCode()
-            result = 31 * result + ageInDays
-            result = 31 * result + mood
-            result = 31 * result + vitalPoints
-            result = 31 * result + transformationCountdown
-            result = 31 * result + injuryStatus.hashCode()
-            result = 31 * result + trophies
-            result = 31 * result + currentPhaseBattlesWon
-            result = 31 * result + currentPhaseBattlesLost
-            result = 31 * result + totalBattlesWon
-            result = 31 * result + totalBattlesLost
-            result = 31 * result + activityLevel
-            result = 31 * result + heartRateCurrent
-            result = 31 * result + characterType.hashCode()
-            result = 31 * result + spriteIdle.contentHashCode()
-            result = 31 * result + spriteWidth
-            result = 31 * result + spriteHeight
-            result = 31 * result + isBemCard.hashCode()
-            result = 31 * result + finishesAdventure.hashCode()
-            result = 31 * result + originalTimeInMinutes.hashCode()
-            return result
-        }
-    }
+    )
 
     data class EvolutionRequirementsWithSpritesAndObtained(
         val charaId: Long,
@@ -337,45 +114,7 @@ object CharacterDtos {
         val requiredWinRate: Int,
         val changeTimerHours: Int,
         val requiredAdventureLevelCompleted: Int
-    ) {
-        override fun equals(other: Any?): Boolean {
-            if (this === other) return true
-            if (javaClass != other?.javaClass) return false
-
-            other as EvolutionRequirementsWithSpritesAndObtained
-
-            if (charaId != other.charaId) return false
-            if (fromCharaId != other.fromCharaId) return false
-            if (!spriteIdle.contentEquals(other.spriteIdle)) return false
-            if (spriteWidth != other.spriteWidth) return false
-            if (spriteHeight != other.spriteHeight) return false
-            if (discoveredOn != other.discoveredOn) return false
-            if (requiredTrophies != other.requiredTrophies) return false
-            if (requiredVitals != other.requiredVitals) return false
-            if (requiredBattles != other.requiredBattles) return false
-            if (requiredWinRate != other.requiredWinRate) return false
-            if (changeTimerHours != other.changeTimerHours) return false
-            if (requiredAdventureLevelCompleted != other.requiredAdventureLevelCompleted) return false
-
-            return true
-        }
-
-        override fun hashCode(): Int {
-            var result = charaId.hashCode()
-            result = 31 * result + fromCharaId.hashCode()
-            result = 31 * result + spriteIdle.contentHashCode()
-            result = 31 * result + spriteWidth
-            result = 31 * result + spriteHeight
-            result = 31 * result + (discoveredOn?.hashCode() ?: 0)
-            result = 31 * result + requiredTrophies
-            result = 31 * result + requiredVitals
-            result = 31 * result + requiredBattles
-            result = 31 * result + requiredWinRate
-            result = 31 * result + changeTimerHours
-            result = 31 * result + requiredAdventureLevelCompleted
-            return result
-        }
-    }
+    )
 
     data class FusionsWithSpritesAndObtained(
         val charaId: Long,
@@ -385,33 +124,5 @@ object CharacterDtos {
         val spriteHeight: Int,
         val discoveredOn: Long?,
         val fusionAttribute: NfcCharacter.Attribute
-    ) {
-        override fun equals(other: Any?): Boolean {
-            if (this === other) return true
-            if (javaClass != other?.javaClass) return false
-
-            other as FusionsWithSpritesAndObtained
-
-            if (charaId != other.charaId) return false
-            if (fromCharaId != other.fromCharaId) return false
-            if (!spriteIdle.contentEquals(other.spriteIdle)) return false
-            if (spriteWidth != other.spriteWidth) return false
-            if (spriteHeight != other.spriteHeight) return false
-            if (discoveredOn != other.discoveredOn) return false
-            if (fusionAttribute != other.fusionAttribute) return false
-
-            return true
-        }
-
-        override fun hashCode(): Int {
-            var result = charaId.hashCode()
-            result = 31 * result + fromCharaId.hashCode()
-            result = 31 * result + spriteIdle.contentHashCode()
-            result = 31 * result + spriteWidth
-            result = 31 * result + spriteHeight
-            result = 31 * result + (discoveredOn?.hashCode() ?: 0)
-            result = 31 * result + fusionAttribute.hashCode()
-            return result
-        }
-    }
-}
+    )
+}

app/src/main/java/com/github/nacabaro/vbhelper/logger/AppLogger.kt

@@ -0,0 +1,25 @@
+import android.util.Log
+
+object AppLogger {
+    private val logs = StringBuilder()
+
+    fun d(tag: String, message: String) {
+        Log.d(tag, message)
+        append("DEBUG", tag, message)
+    }
+
+    fun e(tag: String, message: String, tr: Throwable? = null) {
+        Log.e(tag, message, tr)
+        append("ERROR", tag, message + (tr?.stackTraceToString() ?: ""))
+    }
+
+    private fun append(level: String, tag: String, message: String) {
+        logs.append("${System.currentTimeMillis()} [$level][$tag] $message\n")
+    }
+
+    fun getLogs(): String = logs.toString()
+
+    fun clear() {
+        logs.clear()
+    }
+}

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

@@ -36,6 +36,7 @@ import com.github.nacabaro.vbhelper.screens.adventureScreen.AdventureScreenContr
 import com.github.nacabaro.vbhelper.screens.cardScreen.CardAdventureScreen
 import com.github.nacabaro.vbhelper.screens.cardScreen.CardScreenControllerImpl
 import com.github.nacabaro.vbhelper.screens.settingsScreen.CreditsScreen
+import com.github.nacabaro.vbhelper.screens.settingsScreen.LoggerScreen
 import com.github.nacabaro.vbhelper.screens.spriteViewer.SpriteViewerControllerImpl
 import com.github.nacabaro.vbhelper.screens.storageScreen.StorageScreenControllerImpl
 import com.github.nacabaro.vbhelper.source.StorageRepository
@@ -54,7 +55,6 @@ data class AppNavigationHandlers(
 @Composable
 fun AppNavigation(
     applicationNavigationHandlers: AppNavigationHandlers,
-    initialRoute: String? = null
 ) {
     val navController = rememberNavController()
 
@@ -65,7 +65,7 @@ fun AppNavigation(
     ) { contentPadding ->
         NavHost(
             navController = navController,
-            startDestination = initialRoute ?: NavigationItems.Home.route,
+            startDestination = NavigationItems.Home.route,
             enterTransition = {
                 fadeIn(
                     animationSpec = tween(200)
@@ -183,6 +183,11 @@ fun AppNavigation(
                     )
                 }
             }
+            composable(NavigationItems.Logger.route) {
+                LoggerScreen(
+                    navController = navController
+                )
+            }
         }
     }
 }

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

@@ -30,17 +30,10 @@ fun BottomNavigationBar(navController: NavController) {
                 label = { Text(text = stringResource(item.label)) },
                 selected = currentRoute == item.route,
                 onClick = {
-                    if (item == NavigationItems.Home) {
-                        navController.navigate(NavigationItems.Home.route) {
-                            popUpTo(0) { inclusive = false }
-                            launchSingleTop = true
-                        }
-                    } else {
-                        navController.navigate(item.route) {
-                            popUpTo(navController.graph.startDestinationId) { saveState = true }
-                            launchSingleTop = true
-                            restoreState = true
-                        }
+                    navController.navigate(item.route) {
+                        popUpTo(navController.graph.startDestinationId) { saveState = true }
+                        launchSingleTop = true
+                        restoreState = true
                     }
                 }
             )

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

@@ -98,4 +98,10 @@ sealed class NavigationItems(
         R.drawable.baseline_data_24,
         R.string.nav_credits
     )
+
+    object Logger : NavigationItems(
+        "Logger",
+        R.drawable.baseline_bug_report,
+        R.string.nav_logs
+    )
 }

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

@@ -1,6 +1,5 @@
 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
@@ -98,8 +97,8 @@ fun CardsScreen(
                 selectedCard.value = null
             },
             onRename = { newName ->
-                Log.d("CardsScreen", "New name: $newName")
-                Log.d("CardsScreen", "Card: ${selectedCard.value.toString()}")
+                AppLogger.d("CardsScreen", "New name: $newName")
+                AppLogger.d("CardsScreen", "Card: ${selectedCard.value.toString()}")
                 cardScreenController
                     .renameCard(
                         cardId = selectedCard.value!!.cardId,

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

@@ -2,7 +2,6 @@ package com.github.nacabaro.vbhelper.screens.homeScreens
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -41,8 +40,6 @@ import com.github.nacabaro.vbhelper.source.StorageRepository
 import com.github.nacabaro.vbhelper.R
 import com.github.nacabaro.vbhelper.dtos.CardDtos
 import com.github.nacabaro.vbhelper.source.CardRepository
-import com.github.nacabaro.vbhelper.source.VitalWearCharacterExporter
-import android.widget.Toast
 import com.github.nacabaro.vbhelper.utils.BitmapData
 import kotlinx.coroutines.flow.flowOf
 import kotlin.collections.emptyList
@@ -139,66 +136,42 @@ fun HomeScreen(
                 Text(text = stringResource(R.string.adventure_empty_state))
             }
         } else {
-            Column(modifier = Modifier.padding(top = contentPadding.calculateTopPadding())) {
-                val cardIcon = BitmapData(
-                    bitmap = cardIconData!!.cardIcon,
-                    width = cardIconData!!.cardIconWidth,
-                    height = cardIconData!!.cardIconHeight
+            val cardIcon = BitmapData(
+                bitmap = cardIconData!!.cardIcon,
+                width = cardIconData!!.cardIconWidth,
+                height = cardIconData!!.cardIconHeight
+            )
+
+            if (activeMon!!.isBemCard && beData != null) {
+                BEBEmHomeScreen(
+                    activeMon = activeMon!!,
+                    beData = beData!!,
+                    transformationHistory = transformationHistory,
+                    contentPadding = contentPadding,
+                    cardIcon = cardIcon
                 )
-
-                if (activeMon!!.isBemCard && beData != null) {
-                    BEBEmHomeScreen(
-                        activeMon = activeMon!!,
-                        beData = beData!!,
-                        transformationHistory = transformationHistory,
-                        contentPadding = PaddingValues(0.dp),
-                        cardIcon = cardIcon
-                    )
-                } else if (!activeMon!!.isBemCard && activeMon!!.characterType == DeviceType.BEDevice && beData != null) {
-                    BEDiMHomeScreen(
-                        activeMon = activeMon!!,
-                        beData = beData!!,
-                        transformationHistory = transformationHistory,
-                        contentPadding = PaddingValues(0.dp),
-                        cardIcon = cardIcon
-                    )
-                } else if (vbData != null) {
-                    VBDiMHomeScreen(
-                        activeMon = activeMon!!,
-                        vbData = vbData!!,
-                        transformationHistory = transformationHistory,
-                        contentPadding = PaddingValues(0.dp),
-                        specialMissions = vbSpecialMissions,
-                        homeScreenController = homeScreenController,
-                        onClickCollect = { item, currency ->
-                            collectedItem = item
-                            collectedCurrency = currency
-                        },
-                        cardIcon = cardIcon
-                    )
-                }
-
-                Button(
-                    onClick = {
-                        try {
-                            val intent = VitalWearCharacterExporter(application, application.container.db)
-                                .buildShareIntent(activeMon!!.id)
-                                .addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK)
-                            application.startActivity(intent)
-                        } catch (e: Exception) {
-                            Toast.makeText(
-                                application,
-                                "Could not send character to VitalWear: ${e.message}",
-                                Toast.LENGTH_LONG
-                            ).show()
-                        }
+            } else if (!activeMon!!.isBemCard && activeMon!!.characterType == DeviceType.BEDevice && beData != null) {
+                BEDiMHomeScreen(
+                    activeMon = activeMon!!,
+                    beData = beData!!,
+                    transformationHistory = transformationHistory,
+                    contentPadding = contentPadding,
+                    cardIcon = cardIcon
+                )
+            } else if (vbData != null) {
+                VBDiMHomeScreen(
+                    activeMon = activeMon!!,
+                    vbData = vbData!!,
+                    transformationHistory = transformationHistory,
+                    contentPadding = contentPadding,
+                    specialMissions = vbSpecialMissions,
+                    homeScreenController = homeScreenController,
+                    onClickCollect = { item, currency ->
+                        collectedItem = item
+                        collectedCurrency = currency
                     },
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(16.dp)
-                ) {
-                    Text(text = "Send to VitalWear")
-                }
+                    cardIcon = cardIcon
+                )
             }
         }
     }
@@ -248,3 +221,5 @@ fun HomeScreen(
         }
     }
 }
+
+

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

@@ -45,12 +45,11 @@ class HomeScreenControllerImpl(
                 .clearSpecialMission(missionId)
 
             if (missionStatus.status == SpecialMission.Status.COMPLETED) {
-                val allItems = database.itemDao().getAllItems().first()
-                if (allItems.isEmpty()) {
-                    onCleared(null, null)
-                    return@launch
-                }
-                val randomItem = allItems.random()
+                val randomItem = database
+                    .itemDao()
+                    .getAllItems()
+                    .first()
+                    .random()
 
                 val randomItemAmount = (Random.nextFloat() * 5).roundToInt()
 

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

@@ -1,241 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.homeScreens.screens
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.res.stringResource
-import com.github.nacabaro.vbhelper.R
-import com.github.nacabaro.vbhelper.screens.homeScreens.dialogs.DeleteSpecialMissionDialog
-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.UnifiedCharacter
-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.screens.itemsScreen.getIconResource
-import com.github.nacabaro.vbhelper.screens.itemsScreen.ItemsScreenControllerImpl
-import com.github.nacabaro.vbhelper.utils.BitmapData
-import java.util.Locale
-
-@Composable
-fun UnifiedHomeScreen(
-    activeMon: CharacterDtos.CharacterWithSprites,
-    cardIcon: BitmapData,
-    unifiedChar: UnifiedCharacter,
-    specialMissions: List<SpecialMissions>,
-    transformationHistory: List<CharacterDtos.TransformationHistory>,
-    contentPadding: PaddingValues,
-    homeScreenController: HomeScreenControllerImpl,
-    onClickCollect: (ItemDtos.PurchasedItem?, Int?) -> Unit
-) {
-    var selectedSpecialMissionId by remember { mutableStateOf<Long>(-1) }
-
-    Column(
-        modifier = Modifier
-            .padding(top = contentPadding.calculateTopPadding())
-            .verticalScroll(state = rememberScrollState())
-    ) {
-        // CORE SLOT: Always the same for VB and BE
-        Row(modifier = Modifier.fillMaxWidth()) {
-            CharacterEntry(
-                icon = BitmapData(
-                    bitmap = activeMon.spriteIdle,
-                    width = activeMon.spriteWidth,
-                    height = activeMon.spriteHeight
-                ),
-                cardIcon = cardIcon,
-                multiplier = 8,
-                shape = androidx.compose.material.MaterialTheme.shapes.small,
-                modifier = Modifier.weight(1f).aspectRatio(1f)
-            )
-            Column(modifier = Modifier.weight(0.5f).aspectRatio(0.5f)) {
-                ItemDisplay(
-                    icon = R.drawable.baseline_vitals_24,
-                    textValue = activeMon.vitalPoints.toString(),
-                    definition = stringResource(R.string.home_vbdim_vitals),
-                    modifier = Modifier.weight(0.5f).aspectRatio(1f).padding(8.dp)
-                )
-                ItemDisplay(
-                    icon = R.drawable.baseline_trophy_24,
-                    textValue = activeMon.trophies.toString(),
-                    definition = stringResource(R.string.home_vbdim_trophies),
-                    modifier = Modifier.weight(0.5f).aspectRatio(1f).padding(8.dp)
-                )
-            }
-        }
-
-        // STATS ROW 1: mood and timing (VB timer vs BE training limit)
-        Row(modifier = Modifier.fillMaxWidth()) {
-            ItemDisplay(
-                icon = R.drawable.baseline_mood_24,
-                textValue = activeMon.mood.toString(),
-                definition = stringResource(R.string.home_vbdim_mood),
-                modifier = Modifier.weight(1f).aspectRatio(1f).padding(8.dp)
-            )
-            
-            if (unifiedChar.isVB()) {
-                val transformationCountdownInHours = activeMon.transformationCountdown / 60
-                ItemDisplay(
-                    icon = R.drawable.baseline_next_24,
-                    textValue = when (transformationCountdownInHours) {
-                        0 -> "${activeMon.transformationCountdown} m"
-                        else -> "$transformationCountdownInHours h"
-                    },
-                    definition = stringResource(R.string.home_vbdim_next_timer),
-                    modifier = Modifier.weight(1f).aspectRatio(1f).padding(8.dp)
-                )
-            } else {
-                val timeInHours = (unifiedChar.beData?.remainingTrainingTimeInMinutes ?: 0) / 60
-                ItemDisplay(
-                    icon = R.drawable.baseline_timer_24,
-                    textValue = "$timeInHours h",
-                    definition = "Training limit",
-                    modifier = Modifier.weight(1f).aspectRatio(1f).padding(8.dp)
-                )
-            }
-
-            if (unifiedChar.isBE()) {
-                ItemDisplay(
-                    icon = R.drawable.baseline_rank_24,
-                    textValue = (unifiedChar.beData?.rank ?: 0).toString(),
-                    definition = "Rank",
-                    modifier = Modifier.weight(1f).aspectRatio(1f).padding(8.dp)
-                )
-            } else {
-                // For VB, maybe put a spacer or other stat here to keep row balance
-            }
-        }
-
-        // STATS ROW 2: Battle stats and Items
-        Row(modifier = Modifier.fillMaxWidth()) {
-            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)
-            )
-            
-            // Battle stats (Common)
-            ItemDisplay(
-                icon = R.drawable.baseline_swords_24,
-                textValue = calculateWinPercent(activeMon.totalBattlesWon, activeMon.totalBattlesLost),
-                definition = "Total battle win %",
-                modifier = Modifier.weight(1f).aspectRatio(1f).padding(8.dp)
-            )
-            ItemDisplay(
-                icon = R.drawable.baseline_swords_24,
-                textValue = calculateWinPercent(activeMon.currentPhaseBattlesWon, activeMon.currentPhaseBattlesLost),
-                definition = "Current phase win %",
-                modifier = Modifier.weight(1f).aspectRatio(1f).padding(8.dp)
-            )
-
-            if (unifiedChar.isBE()) {
-                val beData = unifiedChar.beData
-                if (beData != null && beData.itemRemainingTime != 0) {
-                    ItemDisplay(
-                        icon = getIconResource(beData.itemType),
-                        textValue = "${beData.itemRemainingTime} m",
-                        definition = getItemTypeName(beData.itemType),
-                        modifier = Modifier.weight(1f).aspectRatio(1f).padding(8.dp)
-                    )
-                }
-            }
-        }
-
-        // HISTORY SLOT: Common
-        Row(modifier = Modifier.fillMaxWidth()) {
-            TransformationHistoryCard(
-                transformationHistory = transformationHistory,
-                modifier = Modifier.weight(1f).padding(8.dp)
-            )
-        }
-
-        // CONTEXTUAL BOTTOM SLOT
-        if (unifiedChar.isVB()) {
-            Row(modifier = Modifier.padding(16.dp)) {
-                Text(text = stringResource(R.string.home_vbdim_special_missions), fontSize = 24.sp)
-            }
-            for (mission in specialMissions) {
-                Row(modifier = Modifier.fillMaxWidth()) {
-                    SpecialMissionsEntry(
-                        specialMission = mission,
-                        modifier = Modifier.weight(1f).padding(8.dp),
-                        onClickMission = { missionId -> selectedSpecialMissionId = missionId },
-                        onClickCollect = { homeScreenController.clearSpecialMission(selectedSpecialMissionId, onClickCollect) }
-                    )
-                }
-            }
-        } else if (unifiedChar.isBE()) {
-            Row(modifier = Modifier.fillMaxWidth()) {
-                val beData = unifiedChar.beData ?: return@Column
-                ItemDisplay(
-                    icon = R.drawable.baseline_health_24,
-                    textValue = "+${beData.trainingHp}",
-                    definition = "Training HP",
-                    modifier = Modifier.weight(1f).aspectRatio(1f).padding(8.dp)
-                )
-                ItemDisplay(
-                    icon = R.drawable.baseline_agility_24,
-                    textValue = "+${beData.trainingBp}",
-                    definition = "Training BP",
-                    modifier = Modifier.weight(1f).aspectRatio(1f).padding(8.dp)
-                )
-                ItemDisplay(
-                    icon = R.drawable.baseline_attack_24,
-                    textValue = "+${beData.trainingAp}",
-                    definition = "Training AP",
-                    modifier = Modifier.weight(1f).aspectRatio(1f).padding(8.dp)
-                )
-            }
-        }
-    }
-
-    if (selectedSpecialMissionId.toInt() != -1 && unifiedChar.isVB()) {
-        DeleteSpecialMissionDialog(
-            onClickDismiss = { selectedSpecialMissionId = -1 },
-            onClickDelete = {
-                homeScreenController.clearSpecialMission(selectedSpecialMissionId, onClickCollect)
-                selectedSpecialMissionId = -1
-            }
-        )
-    }
-}
-
-private fun calculateWinPercent(won: Int, lost: Int): String {
-    return if (lost == 0) "0.00 %" else {
-        val percentage = won.toFloat() / (won + lost).toFloat()
-        String.format(Locale.getDefault(), "%.2f", percentage * 100) + " %"
-    }
-}
-
-private fun getItemTypeName(itemId: Int): String {
-    return when (itemId) {
-        ItemsScreenControllerImpl.ItemTypes.PPTraining.id -> "PP Training"
-        ItemsScreenControllerImpl.ItemTypes.HPTraining.id -> "HP Training"
-        ItemsScreenControllerImpl.ItemTypes.APTraining.id -> "AP Training"
-        ItemsScreenControllerImpl.ItemTypes.BPTraining.id -> "BP Training"
-        ItemsScreenControllerImpl.ItemTypes.AllTraining.id -> "All Training"
-        else -> ""
-    }
-}

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

@@ -142,7 +142,7 @@ fun VBDiMHomeScreen(
             ItemDisplay(
                 icon = R.drawable.baseline_swords_24,
                 textValue = when {
-                    activeMon.currentPhaseBattlesWon + activeMon.currentPhaseBattlesLost == 0 -> "0.00 %"
+                    activeMon.totalBattlesLost == 0 -> "0.00 %"
                     else -> {
                         val battleWinPercentage =
                             activeMon.currentPhaseBattlesWon.toFloat() / (activeMon.currentPhaseBattlesWon + activeMon.currentPhaseBattlesLost).toFloat()
@@ -150,7 +150,7 @@ fun VBDiMHomeScreen(
                             Locale.getDefault(),
                             "%.2f",
                             battleWinPercentage * 100
-                        ) + " %"
+                        ) + " %" // Specify locale
                     }
                 },
                 definition = stringResource(R.string.home_vbdim_current_phase_win),
@@ -193,9 +193,9 @@ fun VBDiMHomeScreen(
                     onClickMission = { missionId ->
                         selectedSpecialMissionId = missionId
                     },
-                    onClickCollect = { missionId ->
+                    onClickCollect = {
                         homeScreenController
-                            .clearSpecialMission(missionId, onClickCollect)
+                            .clearSpecialMission(selectedSpecialMissionId, onClickCollect)
                     }
                 )
             }

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

@@ -4,9 +4,9 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.PrimaryTabRow
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Tab
+import androidx.compose.material3.TabRow
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -34,7 +34,7 @@ fun ItemsScreen(
         topBar = {
             Column {
                 TopBanner(text = stringResource(R.string.items_title))
-                PrimaryTabRow(
+                TabRow(
                     selectedTabIndex = selectedTabItem,
                     modifier = Modifier
                 ) {

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

@@ -42,11 +42,6 @@ fun ChooseConnectOption(
                 .fillMaxSize()
                 .padding(contentPadding)
         ) {
-            Text(
-                text = "VB, VH, VBBE",
-                fontSize = 14.sp,
-                modifier = Modifier.padding(bottom = 24.dp)
-            )
             ScanButton(
                 text = stringResource(R.string.scan_vb_to_app),
                 disabled = onClickRead == null,

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

@@ -1,8 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.scanScreen
-
-enum class DetectedTransport {
-    UNKNOWN,
-    NFC_A,
-    ISO_DEP,
-}
-

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

@@ -44,8 +44,14 @@ fun ScanScreen(
 
     val context = LocalContext.current
 
-    LaunchedEffect(characterId) {
+    LaunchedEffect(storageRepository) {
         withContext(Dispatchers.IO) {
+            /*
+            First check if there is a character sent through the navigation system
+            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)
             }

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

@@ -3,11 +3,9 @@ package com.github.nacabaro.vbhelper.screens.scanScreen
 import android.content.Intent
 import android.nfc.NfcAdapter
 import android.nfc.Tag
-import android.nfc.tech.IsoDep
 import android.nfc.tech.NfcA
 import android.os.Bundle
 import android.provider.Settings
-import android.util.Log
 import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.lifecycle.lifecycleScope
@@ -16,16 +14,12 @@ 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.database.AppDatabase
 import com.github.nacabaro.vbhelper.domain.card.Card
 import com.github.nacabaro.vbhelper.screens.scanScreen.converters.FromNfcConverter
 import com.github.nacabaro.vbhelper.screens.scanScreen.converters.ToNfcConverter
-import com.github.nacabaro.vbhelper.source.VitalWearCharacterExporter
-import com.github.nacabaro.vbhelper.source.VitalWearCharacterImporter
 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.transfer.hce.VitalWearHceReaderClient
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.stateIn
@@ -37,10 +31,8 @@ class ScanScreenControllerImpl(
     private val componentActivity: ComponentActivity,
     private val registerActivityLifecycleListener: (String, ActivityLifecycleListener)->Unit,
     private val unregisterActivityLifecycleListener: (String)->Unit,
-    private val database: AppDatabase,
 ): ScanScreenController {
     private var lastScannedCharacter: NfcCharacter? = null
-    private var pendingExportCharacterId: Long? = null
     private val nfcAdapter: NfcAdapter
 
     init {
@@ -53,46 +45,16 @@ class ScanScreenControllerImpl(
     }
 
     override fun onClickRead(secrets: Secrets, onComplete: ()->Unit, onMultipleCards: (List<Card>) -> Unit) {
-        handleTag(
-            secrets,
-            handlerFunc = { tagCommunicator ->
-                try {
-                    val character = tagCommunicator.receiveCharacter()
-                    val resultMessage = characterFromNfc(character) { cards, nfcCharacter ->
-                        lastScannedCharacter = nfcCharacter
-                        onMultipleCards(cards)
-                    }
-                    onComplete.invoke()
-                    resultMessage
-                } catch (e: Exception) {
-                    Log.e("NFC_READ", "Error reading character from NFC", e)
-                    componentActivity.runOnUiThread {
-                        Toast.makeText(componentActivity, componentActivity.getString(R.string.scan_error_generic) + ": " + (e.message ?: e.javaClass.simpleName), Toast.LENGTH_LONG).show()
-                    }
-                    onComplete.invoke()
-                    componentActivity.getString(R.string.scan_error_generic)
-                }
-            },
-            hceHandler = { isoDep ->
-                try {
-                    val client = VitalWearHceReaderClient(isoDep)
-                    val character = client.receiveCharacterFromWatch()
-                    val importer = VitalWearCharacterImporter(database)
-                    val result = importer.importCharacter(character)
-                    Log.i("NFC_READ", "VitalWear HCE import: ${result.message}")
-                    componentActivity.runOnUiThread {
-                        Toast.makeText(componentActivity, result.message, Toast.LENGTH_SHORT).show()
-                    }
-                } catch (e: Exception) {
-                    Log.e("NFC_READ", "Error reading character from VitalWear HCE", e)
-                    componentActivity.runOnUiThread {
-                        Toast.makeText(componentActivity, componentActivity.getString(R.string.scan_error_generic) + ": " + (e.message ?: e.javaClass.simpleName), Toast.LENGTH_LONG).show()
-                    }
-                } finally {
-                    onComplete()
-                }
+        handleTag(secrets) { tagCommunicator ->
+            val character = tagCommunicator.receiveCharacter()
+            val resultMessage = characterFromNfc(character) { cards, nfcCharacter ->
+                lastScannedCharacter = nfcCharacter
+                onMultipleCards(cards)
+
             }
-        )
+            onComplete.invoke()
+            resultMessage
+        }
     }
 
     override fun cancelRead() {
@@ -112,53 +74,35 @@ class ScanScreenControllerImpl(
         unregisterActivityLifecycleListener.invoke(key)
     }
 
-    private fun handleTag(
-        secrets: Secrets,
-        handlerFunc: (TagCommunicator) -> String,
-        hceHandler: ((IsoDep) -> Unit)? = null,
-    ) {
+    // EXTRACTED DIRECTLY FROM EXAMPLE APP
+    private fun handleTag(secrets: Secrets, handlerFunc: (TagCommunicator)->String) {
         if (!nfcAdapter.isEnabled) {
             showWirelessSettings()
         } else {
             val options = Bundle()
             // Work around for some broken Nfc firmware implementations that poll the card too fast
             options.putInt(NfcAdapter.EXTRA_READER_PRESENCE_CHECK_DELAY, 250)
-            nfcAdapter.enableReaderMode(
-                componentActivity,
-                buildOnReadTag(secrets, handlerFunc, hceHandler),
-                NfcAdapter.FLAG_READER_NFC_A or NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK,
+            nfcAdapter.enableReaderMode(componentActivity, buildOnReadTag(secrets, handlerFunc), NfcAdapter.FLAG_READER_NFC_A or NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK,
                 options
             )
         }
     }
 
-    private fun buildOnReadTag(
-        secrets: Secrets,
-        handlerFunc: (TagCommunicator) -> String,
-        hceHandler: ((IsoDep) -> Unit)? = null,
-    ): (Tag) -> Unit {
-        return { tag ->
-            val isoDep = IsoDep.get(tag)
-            if (isoDep != null && hceHandler != null) {
-                // VitalWear watch via HCE / ISO-DEP
-                isoDep.connect()
-                isoDep.use { hceHandler(isoDep) }
-            } else {
-                // Physical Vital Bracelet via raw NFC-A
-                val nfcData = NfcA.get(tag)
-                if (nfcData == null) {
-                    componentActivity.runOnUiThread {
-                        Toast.makeText(componentActivity, componentActivity.getString(R.string.scan_tag_not_vb), Toast.LENGTH_SHORT).show()
-                    }
-                } else {
-                    nfcData.connect()
-                    nfcData.use {
-                        val tagCommunicator = TagCommunicator.getInstance(nfcData, secrets.getCryptographicTransformerMap())
-                        val successText = handlerFunc(tagCommunicator)
-                        componentActivity.runOnUiThread {
-                            Toast.makeText(componentActivity, successText, Toast.LENGTH_SHORT).show()
-                        }
-                    }
+    // EXTRACTED DIRECTLY FROM EXAMPLE APP
+    private fun buildOnReadTag(secrets: Secrets, handlerFunc: (TagCommunicator)->String): (Tag)->Unit {
+        return { tag->
+            val nfcData = NfcA.get(tag)
+            if (nfcData == null) {
+                componentActivity.runOnUiThread {
+                    Toast.makeText(componentActivity, componentActivity.getString(R.string.scan_tag_not_vb), Toast.LENGTH_SHORT).show()
+                }
+            }
+            nfcData.connect()
+            nfcData.use {
+                val tagCommunicator = TagCommunicator.getInstance(nfcData, secrets.getCryptographicTransformerMap())
+                val successText = handlerFunc(tagCommunicator)
+                componentActivity.runOnUiThread {
+                    Toast.makeText(componentActivity, successText, Toast.LENGTH_SHORT).show()
                 }
             }
         }
@@ -179,29 +123,24 @@ class ScanScreenControllerImpl(
         nfcCharacter: NfcCharacter,
         onComplete: () -> Unit
     ) {
-        handleTag(
-            secrets,
-            handlerFunc = { tagCommunicator ->
-                try {
-                    if (nfcCharacter is VBNfcCharacter) {
-                        Log.d("SendCharacter", "VBNfcCharacter")
-                        tagCommunicator.sendCharacter(nfcCharacter)
-                    } else if (nfcCharacter is BENfcCharacter) {
-                        Log.d("SendCharacter", "BENfcCharacter")
-                        tagCommunicator.sendCharacter(nfcCharacter)
-                    }
-                    onComplete.invoke()
-                    componentActivity.getString(R.string.scan_sent_character_success)
-                } catch (e: Throwable) {
-                    Log.e("TAG", e.stackTraceToString())
-                    componentActivity.getString(R.string.scan_error_generic)
+        handleTag(secrets) { tagCommunicator ->
+            try {
+                if (nfcCharacter is VBNfcCharacter) {
+                    AppLogger.d("SendCharacter", "VBNfcCharacter")
+                    val castNfcCharacter: VBNfcCharacter = nfcCharacter
+                    tagCommunicator.sendCharacter(castNfcCharacter)
+                } else if (nfcCharacter is BENfcCharacter) {
+                    AppLogger.d("SendCharacter", "BENfcCharacter")
+                    val castNfcCharacter: BENfcCharacter = nfcCharacter
+                    tagCommunicator.sendCharacter(castNfcCharacter)
                 }
-            },
-            hceHandler = { _ ->
-                // Character was already sent in onClickCheckCard's HCE handler.
-                onComplete()
+                onComplete.invoke()
+                componentActivity.getString(R.string.scan_sent_character_success)
+            } catch (e: Throwable) {
+                AppLogger.e("TAG", e.stackTraceToString())
+                componentActivity.getString(R.string.scan_error_generic)
             }
-        )
+        }
     }
 
     override fun onClickCheckCard(
@@ -209,42 +148,11 @@ class ScanScreenControllerImpl(
         nfcCharacter: NfcCharacter,
         onComplete: () -> Unit
     ) {
-        handleTag(
-            secrets,
-            handlerFunc = { tagCommunicator ->
-                tagCommunicator.prepareDIMForCharacter(nfcCharacter.dimId)
-                onComplete.invoke()
-                componentActivity.getString(R.string.scan_sent_dim_success)
-            },
-            hceHandler = { isoDep ->
-                // VitalWear watch: send the character proto directly via HCE.
-                val characterId = pendingExportCharacterId
-                if (characterId == null) {
-                    Log.e("NFC_WRITE", "No pending character to send to VitalWear")
-                    componentActivity.runOnUiThread {
-                        Toast.makeText(componentActivity, componentActivity.getString(R.string.scan_error_generic), Toast.LENGTH_SHORT).show()
-                    }
-                    onComplete()
-                    return@handleTag
-                }
-                try {
-                    val proto = VitalWearCharacterExporter(componentActivity, database).buildCharacterProto(characterId)
-                    val client = VitalWearHceReaderClient(isoDep)
-                    client.sendCharacterToWatch(proto)
-                    Log.i("NFC_WRITE", "Character sent to VitalWear (id=$characterId), deletion deferred to WritingScreen")
-                    componentActivity.runOnUiThread {
-                        Toast.makeText(componentActivity, componentActivity.getString(R.string.scan_sent_character_success), Toast.LENGTH_SHORT).show()
-                    }
-                } catch (e: Exception) {
-                    Log.e("NFC_WRITE", "Error sending character to VitalWear HCE", e)
-                    componentActivity.runOnUiThread {
-                        Toast.makeText(componentActivity, componentActivity.getString(R.string.scan_error_generic) + ": " + (e.message ?: e.javaClass.simpleName), Toast.LENGTH_LONG).show()
-                    }
-                } finally {
-                    onComplete()
-                }
-            }
-        )
+        handleTag(secrets) { tagCommunicator ->
+            tagCommunicator.prepareDIMForCharacter(nfcCharacter.dimId)
+            onComplete.invoke()
+            componentActivity.getString(R.string.scan_sent_dim_success)
+        }
     }
 
     // EXTRACTED DIRECTLY FROM EXAMPLE APP
@@ -264,10 +172,12 @@ class ScanScreenControllerImpl(
     }
 
     override suspend fun characterToNfc(characterId: Long): NfcCharacter {
-        pendingExportCharacterId = characterId
-        val nfcGenerator = ToNfcConverter(componentActivity = componentActivity)
+        val nfcGenerator = ToNfcConverter(
+            componentActivity = componentActivity
+        )
+
         val character = nfcGenerator.characterToNfc(characterId)
-        Log.d("CharacterType", character.toString())
+        AppLogger.d("CharacterType", character.toString())
         return character
     }
 

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

@@ -1,51 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.scanScreen
-
-import android.content.Context
-import android.os.Build
-import android.os.VibrationEffect
-import android.os.Vibrator
-import android.os.VibratorManager
-import timber.log.Timber
-
-class TransferHaptics(context: Context) {
-    private val vibrator: Vibrator? = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-        val manager = context.getSystemService(VibratorManager::class.java)
-        manager?.defaultVibrator
-    } else {
-        @Suppress("DEPRECATION")
-        context.getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator
-    }
-
-    fun onTransferStart() {
-        vibrate(VibrationEffect.createOneShot(100L, VibrationEffect.DEFAULT_AMPLITUDE))
-    }
-
-    fun onTransferProgress() {
-        vibrate(VibrationEffect.createOneShot(50L, VibrationEffect.DEFAULT_AMPLITUDE))
-    }
-
-    fun onTransferComplete() {
-        vibrate(VibrationEffect.createWaveform(longArrayOf(0L, 100L, 80L, 150L), -1))
-    }
-
-    fun onTransferFailed() {
-        vibrate(VibrationEffect.createOneShot(250L, VibrationEffect.DEFAULT_AMPLITUDE))
-    }
-
-    fun onDeviceDetected() {
-        vibrate(VibrationEffect.createOneShot(80L, VibrationEffect.DEFAULT_AMPLITUDE))
-    }
-
-    private fun vibrate(effect: VibrationEffect) {
-        val deviceVibrator = vibrator ?: return
-        if (!deviceVibrator.hasVibrator()) {
-            return
-        }
-        runCatching {
-            deviceVibrator.vibrate(effect)
-        }.onFailure { error ->
-            Timber.w(error, "Transfer haptics vibration skipped")
-        }
-    }
-}
-

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

@@ -2,7 +2,6 @@ package com.github.nacabaro.vbhelper.screens.scanScreen.converters
 
 import android.icu.util.Calendar
 import android.icu.util.TimeZone
-import android.util.Log
 import androidx.activity.ComponentActivity
 import com.github.cfogrady.vbnfc.be.BENfcCharacter
 import com.github.cfogrady.vbnfc.be.FirmwareVersion
@@ -161,7 +160,7 @@ class ToNfcConverter(
         }
 
         nfcVitalsHistory.map {
-            Log.d("NFC", it.toString())
+            AppLogger.d("NFC", it.toString())
         }
 
         return nfcVitalsHistory
@@ -247,7 +246,7 @@ class ToNfcConverter(
                 val calendar = android.icu.util.GregorianCalendar(TimeZone.getTimeZone("UTC"))
                 calendar.time = date
 
-                Log.d(
+                AppLogger.d(
                     "TransformationHistory",
                     "Year: ${calendar.get(Calendar.YEAR)}, " +
                             "Month: ${calendar.get(Calendar.MONTH) + 1}, " +

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

@@ -1,267 +0,0 @@
-package com.github.nacabaro.vbhelper.screens.scanScreen.screens
-
-import androidx.compose.animation.core.FastOutLinearInEasing
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.animateIntAsState
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material3.Button
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.Card
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-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.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.scale
-import androidx.compose.ui.graphics.FilterQuality
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.github.nacabaro.vbhelper.components.TopBanner
-import com.github.nacabaro.vbhelper.R
-import com.github.nacabaro.vbhelper.utils.ImageBitmapData
-import kotlinx.coroutines.delay
-
-@Composable
-fun TransferAnimationScreen(
-    topBannerText: String,
-    detectedTransportMessage: String?,
-    transferStatusMessage: String?,
-    characterPreview: ImageBitmapData? = null,
-    onClickCancel: () -> Unit,
-    isTransferring: Boolean = true,
-) {
-    var pulseScale by remember { mutableStateOf(1f) }
-    var animationProgress by remember { mutableStateOf(0) }
-
-    val scale by animateFloatAsState(
-        targetValue = pulseScale,
-        animationSpec = tween(durationMillis = 800),
-        label = "pulse_scale"
-    )
-
-    val progress by animateIntAsState(
-        targetValue = animationProgress,
-        animationSpec = tween(durationMillis = 100, easing = FastOutLinearInEasing),
-        label = "progress"
-    )
-
-    LaunchedEffect(isTransferring) {
-        if (isTransferring) {
-            while (true) {
-                pulseScale = 1.2f
-                delay(400)
-                pulseScale = 1f
-                delay(400)
-            }
-        }
-    }
-
-    LaunchedEffect(isTransferring) {
-        if (isTransferring) {
-            while (animationProgress < 100) {
-                delay(50)
-                animationProgress += 2
-            }
-        }
-    }
-
-    Scaffold(
-        topBar = {
-            TopBanner(
-                text = topBannerText,
-                onBackClick = onClickCancel
-            )
-        }
-    ) { innerPadding ->
-        Column(
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.Center,
-            modifier = Modifier
-                .padding(innerPadding)
-                .fillMaxSize()
-        ) {
-            characterPreview?.let { preview ->
-                Card(
-                    modifier = Modifier.padding(bottom = 24.dp)
-                ) {
-                    Image(
-                        bitmap = preview.imageBitmap,
-                        contentDescription = "Transferred character sprite",
-                        modifier = Modifier
-                            .size(preview.dpWidth, preview.dpHeight)
-                            .padding(8.dp),
-                        filterQuality = FilterQuality.None
-                    )
-                }
-            }
-
-            // Animated pulsing circle indicator
-            Box(
-                modifier = Modifier
-                    .size(120.dp)
-                    .scale(scale)
-                    .background(
-                        color = Color(0xFF6366F1).copy(alpha = 0.2f),
-                        shape = CircleShape
-                    ),
-                contentAlignment = Alignment.Center
-            ) {
-                Box(
-                    modifier = Modifier
-                        .size(80.dp)
-                        .background(
-                            color = Color(0xFF6366F1),
-                            shape = CircleShape
-                        ),
-                    contentAlignment = Alignment.Center
-                ) {
-                    Text(
-                        text = "🔄",
-                        fontSize = 40.sp,
-                        modifier = Modifier.scale(if (scale > 1f) 1.1f else 1f)
-                    )
-                }
-            }
-
-            Text(
-                text = stringResource(R.string.action_place_near_reader),
-                fontSize = 16.sp,
-                modifier = Modifier.padding(top = 24.dp),
-                fontWeight = FontWeight.Medium
-            )
-
-            if (!detectedTransportMessage.isNullOrBlank()) {
-                Text(
-                    text = detectedTransportMessage,
-                    modifier = Modifier.padding(top = 12.dp, start = 16.dp, end = 16.dp),
-                    fontSize = 14.sp
-                )
-            }
-
-            if (!transferStatusMessage.isNullOrBlank()) {
-                Text(
-                    text = transferStatusMessage,
-                    modifier = Modifier.padding(top = 12.dp, start = 16.dp, end = 16.dp),
-                    fontSize = 14.sp,
-                    fontWeight = FontWeight.Bold,
-                    color = Color(0xFF6366F1)
-                )
-            }
-
-            // Progress ring
-            if (isTransferring) {
-                CircularProgressIndicator(
-                    progress = { progress / 100f },
-                    modifier = Modifier
-                        .size(100.dp)
-                        .padding(top = 24.dp),
-                    strokeWidth = 4.dp
-                )
-
-                Text(
-                    text = "$progress%",
-                    modifier = Modifier.padding(top = 8.dp),
-                    fontSize = 12.sp,
-                    color = Color.Gray
-                )
-            }
-
-            Button(
-                onClick = onClickCancel,
-                modifier = Modifier.padding(top = 32.dp, bottom = 16.dp)
-            ) {
-                Text(stringResource(R.string.action_cancel))
-            }
-        }
-    }
-}
-
-@Composable
-fun TransferCompleteScreen(
-    topBannerText: String,
-    resultMessage: String,
-    onClickOk: () -> Unit,
-    isSuccess: Boolean = true,
-) {
-    var showCheckmark by remember { mutableStateOf(false) }
-
-    val scale by animateFloatAsState(
-        targetValue = if (showCheckmark) 1f else 0f,
-        animationSpec = tween(durationMillis = 600, easing = FastOutLinearInEasing),
-        label = "checkmark_scale"
-    )
-
-    LaunchedEffect(Unit) {
-        delay(300)
-        showCheckmark = true
-    }
-
-    Scaffold(
-        topBar = {
-            TopBanner(
-                text = topBannerText,
-                onBackClick = {}
-            )
-        }
-    ) { innerPadding ->
-        Column(
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.Center,
-            modifier = Modifier
-                .padding(innerPadding)
-                .fillMaxSize()
-        ) {
-            Box(
-                modifier = Modifier
-                    .size(120.dp)
-                    .scale(scale)
-                    .background(
-                        color = if (isSuccess) Color(0xFF10B981) else Color(0xFFEF4444),
-                        shape = CircleShape
-                    ),
-                contentAlignment = Alignment.Center
-            ) {
-                Text(
-                    text = if (isSuccess) "✓" else "✕",
-                    fontSize = 60.sp,
-                    color = Color.White,
-                    fontWeight = FontWeight.Bold
-                )
-            }
-
-            Text(
-                text = resultMessage,
-                fontSize = 16.sp,
-                modifier = Modifier.padding(top = 24.dp, start = 16.dp, end = 16.dp),
-                fontWeight = FontWeight.Medium,
-                textAlign = TextAlign.Center
-            )
-
-            Button(
-                onClick = onClickOk,
-                modifier = Modifier.padding(top = 32.dp, bottom = 16.dp)
-            ) {
-                Text("OK")
-            }
-        }
-    }
-}
-

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

@@ -38,8 +38,6 @@ fun CreditsScreen(
             SettingsEntry(title = "nacabaro", description = stringResource(R.string.credits_nacabaro_description)) { }
             SettingsEntry(title = "lightheel", description = stringResource(R.string.credits_lightheel_description)) { }
             SettingsEntry(title = "shvstrz", description = stringResource(R.string.credits_shvstrz_description)) { }
-
-            SettingsEntry(title = "redeyez", description = stringResource(R.string.credits_RedEyez_description)) { }
         }
     }
 }

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

@@ -0,0 +1,44 @@
+package com.github.nacabaro.vbhelper.screens.settingsScreen
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.navigation.NavController
+import com.github.nacabaro.vbhelper.R
+import com.github.nacabaro.vbhelper.components.TopBanner
+
+@Composable
+fun LoggerScreen(
+    navController: NavController
+) {
+    Scaffold (
+        topBar = {
+            TopBanner(
+                text = stringResource(R.string.logs_title),
+                onBackClick = {
+                    navController.popBackStack()
+                }
+            )
+        },
+        modifier = Modifier
+            .fillMaxSize()
+    ) { contentPadding ->
+        Column (
+            modifier = Modifier
+                .padding(top = contentPadding.calculateTopPadding())
+        ) {
+            Text(
+                text = AppLogger.getLogs(),
+                modifier = Modifier
+                    .verticalScroll(rememberScrollState())
+            )
+        }
+    }
+}

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

@@ -1,7 +1,6 @@
 package com.github.nacabaro.vbhelper.screens.settingsScreen
 
 import android.content.Intent
-import android.net.Uri
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -24,6 +23,7 @@ import androidx.navigation.NavController
 import com.github.nacabaro.vbhelper.components.TopBanner
 import com.github.nacabaro.vbhelper.navigation.NavigationItems
 import com.github.nacabaro.vbhelper.R
+import androidx.core.net.toUri
 
 
 @Composable
@@ -80,10 +80,16 @@ fun SettingsScreen(
             ) {
                 val browserIntent = Intent(
                     Intent.ACTION_VIEW,
-                    Uri.parse("https://github.com/nacabaro/vbhelper/")
+                    "https://github.com/nacabaro/vbhelper/".toUri()
                 )
                 context.startActivity(browserIntent)
             }
+            SettingsEntry(
+                title = stringResource(R.string.settings_logs_title),
+                description = stringResource(R.string.settings_logs_desc)
+            ) {
+                navController.navigate(NavigationItems.Logger.route)
+            }
 
             SettingsSection(title = stringResource(R.string.settings_section_data))
             SettingsEntry(