Merge bugfixes.

This commit is contained in:
lightheel 2026-03-06 12:20:28 -05:00
parent 654529c851
commit 977896d296
2 changed files with 17 additions and 2 deletions

View File

@ -103,4 +103,19 @@ dependencies {
androidTestImplementation(libs.androidx.espresso.core) androidTestImplementation(libs.androidx.espresso.core)
androidTestImplementation(platform(libs.androidx.compose.bom)) androidTestImplementation(platform(libs.androidx.compose.bom))
androidTestImplementation(libs.androidx.ui.test.junit4) 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")
} }

View File

@ -2111,7 +2111,7 @@ fun BattlesScreen() {
} }
*/ */
val activeChar = database.userCharacterDao().getActiveCharacter() val activeChar = database.userCharacterDao().getActiveCharacter().first()
//println("BATTLESCREEN: getActiveCharacter() returned: $activeChar") //println("BATTLESCREEN: getActiveCharacter() returned: $activeChar")
if (activeChar != null) { if (activeChar != null) {
@ -2507,7 +2507,7 @@ fun BattlesScreen() {
try { try {
val application = context.applicationContext as VBHelper val application = context.applicationContext as VBHelper
val database = application.container.db val database = application.container.db
val activeChar = database.userCharacterDao().getActiveCharacter() val activeChar = database.userCharacterDao().getActiveCharacter().first()
if (activeChar != null) { if (activeChar != null) {
// Get the full UserCharacter entity to update // Get the full UserCharacter entity to update