From 977896d29620ce3a4443cc8b98ce73ecf788ccf8 Mon Sep 17 00:00:00 2001 From: lightheel Date: Fri, 6 Mar 2026 12:20:28 -0500 Subject: [PATCH] Merge bugfixes. --- app/build.gradle.kts | 15 +++++++++++++++ .../nacabaro/vbhelper/screens/BattlesScreen.kt | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0ff1234..99c898f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -103,4 +103,19 @@ dependencies { androidTestImplementation(libs.androidx.espresso.core) androidTestImplementation(platform(libs.androidx.compose.bom)) androidTestImplementation(libs.androidx.ui.test.junit4) + + debugImplementation(libs.androidx.ui.tooling) + debugImplementation(libs.androidx.ui.test.manifest) + implementation("androidx.navigation:navigation-compose:2.7.0") + implementation("com.google.android.material:material:1.2.0") + implementation(libs.protobuf.javalite) + implementation("androidx.compose.material:material") + implementation("androidx.datastore:datastore-preferences:1.1.7") + + implementation("com.squareup.retrofit2:retrofit:2.9.0") + implementation("com.squareup.retrofit2:converter-gson:2.9.0") + implementation("com.google.code.gson:gson:2.10.1") + + // HTTP request logging + implementation("com.squareup.okhttp3:logging-interceptor:4.11.0") } \ No newline at end of file diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/screens/BattlesScreen.kt b/app/src/main/java/com/github/nacabaro/vbhelper/screens/BattlesScreen.kt index 66ecbff..b2581c0 100644 --- a/app/src/main/java/com/github/nacabaro/vbhelper/screens/BattlesScreen.kt +++ b/app/src/main/java/com/github/nacabaro/vbhelper/screens/BattlesScreen.kt @@ -2111,7 +2111,7 @@ fun BattlesScreen() { } */ - val activeChar = database.userCharacterDao().getActiveCharacter() + val activeChar = database.userCharacterDao().getActiveCharacter().first() //println("BATTLESCREEN: getActiveCharacter() returned: $activeChar") if (activeChar != null) { @@ -2507,7 +2507,7 @@ fun BattlesScreen() { try { val application = context.applicationContext as VBHelper val database = application.container.db - val activeChar = database.userCharacterDao().getActiveCharacter() + val activeChar = database.userCharacterDao().getActiveCharacter().first() if (activeChar != null) { // Get the full UserCharacter entity to update