Merge pull request #612 from bitcoinppl/use-methods

Refactor UniFFI standalone functions to enum/record methods

Author: praveenperera

android/app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "org.bitcoinppl.cove"
         minSdk = 33
         targetSdk = 36
-        versionCode = 16
-        versionName = "1.2.1"
+        versionCode = 17
+        versionName = "1.3.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

android/app/src/main/java/org/bitcoinppl/cove/MainActivity.kt

@@ -82,7 +82,6 @@ import org.bitcoinppl.cove.views.TermsAndConditionsSheet
 import org.bitcoinppl.cove_core.bootstrap
 import org.bitcoinppl.cove_core.activeMigration
 import org.bitcoinppl.cove_core.bootstrapProgress
-import org.bitcoinppl.cove.utils.isMigrationInProgress
 import org.bitcoinppl.cove_core.cancelBootstrap
 import org.bitcoinppl.cove_core.AfterPinAction
 import org.bitcoinppl.cove_core.AppInitException
@@ -390,7 +389,7 @@ class MainActivity : FragmentActivity() {
             delay(66)
 
             val step = bootstrapProgress()
-            if (!migrationDetected && step.isMigrationInProgress) {
+            if (!migrationDetected && step.isMigrationInProgress()) {
                 migrationDetected = true
             }
 

android/app/src/main/java/org/bitcoinppl/cove/flows/SettingsFlow/AppearanceSettingsScreen.kt

@@ -36,7 +36,6 @@ import org.bitcoinppl.cove.views.SectionHeader
 import org.bitcoinppl.cove_core.AppAction
 import org.bitcoinppl.cove_core.types.ColorSchemeSelection
 import org.bitcoinppl.cove_core.types.allColorSchemes
-import org.bitcoinppl.cove_core.types.colorSchemeSelectionCapitalizedString
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -118,7 +117,7 @@ private fun ColorSchemeRow(
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Text(
-            text = colorSchemeSelectionCapitalizedString(colorScheme),
+            text = colorScheme.capitalizedString(),
             style = MaterialTheme.typography.bodyLarge,
         )
 

android/app/src/main/java/org/bitcoinppl/cove/flows/SettingsFlow/FiatCurrencySettingsScreen.kt

@@ -36,8 +36,6 @@ import org.bitcoinppl.cove.views.SectionHeader
 import org.bitcoinppl.cove_core.AppAction
 import org.bitcoinppl.cove_core.FiatCurrency
 import org.bitcoinppl.cove_core.allFiatCurrencies
-import org.bitcoinppl.cove_core.fiatCurrencyEmoji
-import org.bitcoinppl.cove_core.fiatCurrencyToString
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -119,7 +117,7 @@ private fun FiatCurrencyRow(
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Text(
-            text = "${fiatCurrencyEmoji(fiatCurrency)} ${fiatCurrencyToString(fiatCurrency)}",
+            text = "${fiatCurrency.emojiString()} ${fiatCurrency}",
             style = MaterialTheme.typography.bodyLarge,
         )
 

android/app/src/main/java/org/bitcoinppl/cove/flows/SettingsFlow/NetworkSettingsScreen.kt

@@ -41,7 +41,6 @@ import org.bitcoinppl.cove.views.SectionHeader
 import org.bitcoinppl.cove_core.AppAction
 import org.bitcoinppl.cove_core.types.Network
 import org.bitcoinppl.cove_core.types.allNetworks
-import org.bitcoinppl.cove_core.types.networkToString
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -113,7 +112,7 @@ fun NetworkSettingsScreen(
         AlertDialog(
             onDismissRequest = { pendingNetworkChange = null },
             title = { Text("Warning: Network Changed") },
-            text = { Text("You've changed your network to ${networkToString(network)}") },
+            text = { Text("You've changed your network to ${network.toString()}") },
             confirmButton = {
                 TextButton(
                     onClick = {
@@ -153,7 +152,7 @@ private fun NetworkRow(
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Text(
-            text = networkToString(network),
+            text = network.toString(),
             style = MaterialTheme.typography.bodyLarge,
         )
 

android/app/src/main/java/org/bitcoinppl/cove/flows/SettingsFlow/NodeSettingsScreen.kt

@@ -60,7 +60,6 @@ import org.bitcoinppl.cove_core.ApiType
 import org.bitcoinppl.cove_core.NodeSelection
 import org.bitcoinppl.cove_core.NodeSelector
 import org.bitcoinppl.cove_core.NodeSelectorException
-import org.bitcoinppl.cove_core.nodeSelectionToNode
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -75,7 +74,7 @@ fun NodeSettingsScreen(
     val nodeList = remember { nodeSelector.nodeList() }
     var selectedNodeSelection by remember { mutableStateOf(nodeSelector.selectedNode()) }
     var selectedNodeName by remember {
-        mutableStateOf(nodeSelectionToNode(selectedNodeSelection).name)
+        mutableStateOf(selectedNodeSelection.toNode().name)
     }
 
     var customUrl by remember { mutableStateOf("") }
@@ -109,7 +108,7 @@ fun NodeSettingsScreen(
         if (showCustomFields && customUrl.isEmpty()) {
             val savedNode = selectedNodeSelection
             if (savedNode is NodeSelection.Custom) {
-                val node = nodeSelectionToNode(savedNode)
+                val node = savedNode.toNode()
                 val matchesType =
                     when (selectedNodeName) {
                         customElectrum -> node.apiType == ApiType.ELECTRUM
@@ -266,7 +265,7 @@ fun NodeSettingsScreen(
                     Column {
                         // preset nodes
                         nodeList.forEachIndexed { index, nodeSelection ->
-                            val node = nodeSelectionToNode(nodeSelection)
+                            val node = nodeSelection.toNode()
                             NodeRow(
                                 nodeName = node.name,
                                 isSelected = selectedNodeName == node.name,

android/app/src/main/java/org/bitcoinppl/cove/flows/TapSignerFlow/TapSignerEnterPinView.kt

@@ -383,5 +383,5 @@ private suspend fun signAction(
 private fun isAuthError(error: Exception): Boolean {
     // check if error is a bad auth error using type-safe FFI function
     return error is org.bitcoinppl.cove_core.TapSignerReaderException &&
-        org.bitcoinppl.cove_core.tapSignerErrorIsAuthError(error)
+        error.isAuthError()
 }