chore: cleanup

Author: ovitrif

README.md

@@ -60,6 +60,17 @@ Set up local env:
 
 Run `just list` to see available commands. The common ones are `just init`, `just compile`, `just run`, `just build`, `just release`, `just test`, `just lint`, and `just translations pull`. `just run` prefers a physical device and falls back to an emulator.
 
+### Trezor Bridge In Android Studio
+
+When testing the Trezor Bridge emulator from bitkit-docker through Android Studio, add these gitignored local values to `local.properties`:
+
+```properties
+TREZOR_BRIDGE=true
+TREZOR_BRIDGE_URL=http://10.0.2.2:21325
+```
+
+CLI builds can still pass the same values as environment variables.
+
 ### Lint
 
 This project uses detekt with default ktlint and compose-rules for android code linting.

app/build.gradle.kts

@@ -41,6 +41,21 @@ val keystoreProperties by lazy {
     keystoreProperties
 }
 
+val localProperties by lazy {
+    Properties().apply {
+        val localPropertiesFile = rootProject.file("local.properties")
+        if (localPropertiesFile.exists()) {
+            localPropertiesFile.inputStream().use { load(it) }
+        }
+    }
+}
+
+fun localProp(key: String): String? {
+    return System.getenv(key)
+        ?: providers.gradleProperty(key).orNull
+        ?: localProperties.getProperty(key)
+}
+
 // Android resource qualifier format for androidResources.localeFilters
 val androidLocales = listOf(
     "en", "ar", "b+es+419", "ca", "cs", "de", "el", "es", "es-rES", "fr", "it", "nl", "pl", "pt", "pt-rBR", "ru"
@@ -51,8 +66,8 @@ val bcp47Locales = listOf(
 )
 val e2eBackendEnv = System.getenv("E2E_BACKEND") ?: "local"
 val e2eHomegateUrlEnv = System.getenv("E2E_HOMEGATE_URL") ?: "http://127.0.0.1:6288"
-val trezorBridgeEnv = System.getenv("TREZOR_BRIDGE")?.toBoolean()?.toString() ?: "false"
-val trezorBridgeUrlEnv = System.getenv("TREZOR_BRIDGE_URL") ?: "http://10.0.2.2:21325"
+val trezorBridgeEnv = localProp("TREZOR_BRIDGE")?.toBoolean()?.toString() ?: "false"
+val trezorBridgeUrlEnv = localProp("TREZOR_BRIDGE_URL") ?: "http://10.0.2.2:21325"
 val requestedNdkVersion = System.getenv("NDK_VERSION")?.takeIf { it.isNotBlank() }
 val androidTestAnnotationPackage = "to.bitkit.test.annotations"
 val androidTestTaskPrefix = "connectedDevDebug"

app/src/main/java/to/bitkit/ui/settings/general/HardwareWalletsSettingsScreen.kt

@@ -161,7 +161,7 @@ private fun EmptyState(modifier: Modifier = Modifier) {
         VerticalSpacer(8.dp)
         BodyM(
             text = stringResource(R.string.settings__hardware_wallets__empty_text),
-            color = Colors.White64,
+            color = Colors.White80,
         )
     }
 }

app/src/test/java/to/bitkit/ui/screens/wallets/HwWalletViewModelTest.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.advanceUntilIdle
@@ -23,6 +24,7 @@ import to.bitkit.utils.AppError
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
 
+@OptIn(ExperimentalCoroutinesApi::class)
 class HwWalletViewModelTest : BaseUnitTest() {
 
     private val context: Context = mock()
@@ -49,14 +51,12 @@ class HwWalletViewModelTest : BaseUnitTest() {
     )
 
     private lateinit var wallets: MutableStateFlow<ImmutableList<HwWallet>>
-    private lateinit var walletsLoaded: MutableStateFlow<Boolean>
 
     @Before
     fun setUp() {
         wallets = MutableStateFlow(listOf(wallet).toImmutableList())
-        walletsLoaded = MutableStateFlow(true)
         whenever(hwWalletRepo.wallets).thenReturn(wallets)
-        whenever(hwWalletRepo.walletsLoaded).thenReturn(walletsLoaded)
+        whenever(hwWalletRepo.walletsLoaded).thenReturn(MutableStateFlow(true))
         whenever(context.getString(R.string.common__error)).thenReturn("Error")
         whenever(context.getString(R.string.hardware__remove_error)).thenReturn("Could not remove")
     }