Merge pull request #189 from synonymdev/feat/advanced-settings

Advanced Settings Screen overview

Author: ovitrif

app/src/main/java/to/bitkit/models/AddressType.kt

@@ -0,0 +1,53 @@
+package to.bitkit.models
+
+import uniffi.bitkitcore.AddressType
+
+data class AddressTypeInfo(
+    val path: String,
+    val name: String,
+    val shortName: String,
+    val description: String,
+    val example: String,
+)
+
+fun AddressType.addressTypeInfo(): AddressTypeInfo = when (this) {
+    AddressType.P2TR -> AddressTypeInfo(
+        path = "m/86'/0'/0'/0/0",
+        name = "Taproot",
+        shortName = "Taproot",
+        description = "Taproot Address",
+        example = "(bc1px...)",
+    )
+
+    AddressType.P2WPKH -> AddressTypeInfo(
+        path = "m/84'/0'/0'/0/0",
+        name = "Native Segwit Bech32",
+        shortName = "Native Segwit",
+        description = "Pay-to-witness-public-key-hash",
+        example = "(bc1x...)",
+    )
+
+    AddressType.P2SH -> AddressTypeInfo(
+        path = "m/49'/0'/0'/0/0",
+        name = "Nested Segwit",
+        shortName = "Segwit",
+        description = "Pay-to-Script-Hash",
+        example = "(3x...)",
+    )
+
+    AddressType.P2PKH -> AddressTypeInfo(
+        path = "m/44'/0'/0'/0/0",
+        name = "Legacy",
+        shortName = "Legacy",
+        description = "Pay-to-public-key-hash",
+        example = "(1x...)",
+    )
+
+    else -> AddressTypeInfo(
+        path = "",
+        name = "Unknown",
+        shortName = "Unknown",
+        description = "Unknown",
+        example = "",
+    )
+}

app/src/main/java/to/bitkit/models/Network.kt

@@ -0,0 +1,10 @@
+package to.bitkit.models
+
+import org.lightningdevkit.ldknode.Network
+
+fun Network.networkUiText(): String = when (this) {
+    Network.BITCOIN -> "Mainnet"
+    Network.TESTNET -> "Testnet"
+    Network.SIGNET -> "Signet"
+    Network.REGTEST -> "Regtest"
+}

app/src/main/java/to/bitkit/models/TransactionSpeed.kt

@@ -1,12 +1,15 @@
 package to.bitkit.models
 
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.descriptors.PrimitiveKind
 import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
+import to.bitkit.R
 
 @Serializable(with = TransactionSpeedSerializer::class)
 sealed class TransactionSpeed {
@@ -51,3 +54,13 @@ private object TransactionSpeedSerializer : KSerializer<TransactionSpeed> {
         return TransactionSpeed.fromString(decoder.decodeString())
     }
 }
+
+@Composable
+fun TransactionSpeed.transactionSpeedUiText(): String {
+    return when (this) {
+        is TransactionSpeed.Fast -> stringResource(R.string.settings__fee__fast__value)
+        is TransactionSpeed.Medium -> stringResource(R.string.settings__fee__normal__value)
+        is TransactionSpeed.Slow -> stringResource(R.string.settings__fee__slow__value)
+        is TransactionSpeed.Custom -> stringResource(R.string.settings__fee__custom__value)
+    }
+}

app/src/main/java/to/bitkit/repositories/WalletRepo.kt

@@ -28,6 +28,7 @@ import to.bitkit.utils.Logger
 import to.bitkit.utils.ServiceError
 import uniffi.bitkitcore.Activity
 import uniffi.bitkitcore.ActivityFilter
+import uniffi.bitkitcore.AddressType
 import uniffi.bitkitcore.PaymentType
 import uniffi.bitkitcore.Scanner
 import uniffi.bitkitcore.decode
@@ -540,4 +541,5 @@ data class WalletState(
     val walletExists: Boolean = false,
     val isRestoringWallet: Boolean = false,
     val balanceDetails: BalanceDetails? = null, //TODO KEEP ONLY BalanceState IF POSSIBLE
+    val addressType: AddressType = AddressType.P2WPKH,
 )

app/src/main/java/to/bitkit/ui/ContentView.kt

@@ -103,6 +103,15 @@ import to.bitkit.ui.settings.LogsScreen
 import to.bitkit.ui.settings.OrderDetailScreen
 import to.bitkit.ui.settings.SecuritySettingsScreen
 import to.bitkit.ui.settings.SettingsScreen
+import to.bitkit.ui.settings.advanced.AddressTypePreferenceScreen
+import to.bitkit.ui.settings.advanced.AddressViewerScreen
+import to.bitkit.ui.settings.advanced.BitcoinNetworkSelectionScreen
+import to.bitkit.ui.settings.advanced.CoinSelectPreferenceScreen
+import to.bitkit.ui.settings.advanced.ElectrumConfigScreen
+import to.bitkit.ui.settings.advanced.GapLimitScreen
+import to.bitkit.ui.settings.advanced.PaymentPreferenceScreen
+import to.bitkit.ui.settings.advanced.RgsServerScreen
+import to.bitkit.ui.settings.advanced.WebRelayScreen
 import to.bitkit.ui.settings.backups.BackupNavigationSheet
 import to.bitkit.ui.settings.backups.BackupSheet
 import to.bitkit.ui.settings.backups.ResetAndRestoreScreen
@@ -415,7 +424,7 @@ private fun RootNavHost(
         channelOrdersSettings(navController)
         orderDetailSettings(navController)
         cjitDetailSettings(navController)
-        lightning(walletViewModel, navController)
+        lightningConnections(walletViewModel, navController)
         devSettings(walletViewModel, navController)
         regtestSettings(navController)
         activityItem(activityListViewModel, navController)
@@ -729,6 +738,33 @@ private fun NavGraphBuilder.advancedSettings(navController: NavHostController) {
     composableWithDefaultTransitions<Routes.AdvancedSettings> {
         AdvancedSettingsScreen(navController)
     }
+    composableWithDefaultTransitions<Routes.AddressTypePreference> {
+        AddressTypePreferenceScreen(navController)
+    }
+    composableWithDefaultTransitions<Routes.CoinSelectPreference> {
+        CoinSelectPreferenceScreen(navController)
+    }
+    composableWithDefaultTransitions<Routes.PaymentPreference> {
+        PaymentPreferenceScreen(navController)
+    }
+    composableWithDefaultTransitions<Routes.GapLimit> {
+        GapLimitScreen(navController)
+    }
+    composableWithDefaultTransitions<Routes.ElectrumConfig> {
+        ElectrumConfigScreen(navController)
+    }
+    composableWithDefaultTransitions<Routes.RgsServer> {
+        RgsServerScreen(navController)
+    }
+    composableWithDefaultTransitions<Routes.WebRelay> {
+        WebRelayScreen(navController)
+    }
+    composableWithDefaultTransitions<Routes.BitcoinNetworkSelection> {
+        BitcoinNetworkSelectionScreen(navController)
+    }
+    composableWithDefaultTransitions<Routes.AddressViewer> {
+        AddressViewerScreen(navController)
+    }
 }
 
 private fun NavGraphBuilder.aboutSettings(navController: NavHostController) {
@@ -854,11 +890,11 @@ private fun NavGraphBuilder.cjitDetailSettings(
     }
 }
 
-private fun NavGraphBuilder.lightning(
+private fun NavGraphBuilder.lightningConnections(
     viewModel: WalletViewModel,
     navController: NavHostController,
 ) {
-    composableWithDefaultTransitions<Routes.Lightning> {
+    composableWithDefaultTransitions<Routes.LightningConnections> {
         LightningSettingsScreen(viewModel, navController)
     }
 }
@@ -1258,10 +1294,6 @@ fun NavController.navigateToCjitDetail(id: String) = navigate(
     route = Routes.CjitDetail(id),
 )
 
-fun NavController.navigateToLightning() = navigate(
-    route = Routes.Lightning,
-)
-
 fun NavController.navigateToDevSettings() = navigate(
     route = Routes.DevSettings,
 )
@@ -1368,6 +1400,33 @@ object Routes {
     @Serializable
     data object AdvancedSettings
 
+    @Serializable
+    data object AddressTypePreference
+
+    @Serializable
+    data object CoinSelectPreference
+
+    @Serializable
+    data object PaymentPreference
+
+    @Serializable
+    data object GapLimit
+
+    @Serializable
+    data object ElectrumConfig
+
+    @Serializable
+    data object RgsServer
+
+    @Serializable
+    data object WebRelay
+
+    @Serializable
+    data object BitcoinNetworkSelection
+
+    @Serializable
+    data object AddressViewer
+
     @Serializable
     data object AboutSettings
 
@@ -1428,7 +1487,7 @@ object Routes {
     data class CjitDetail(val id: String)
 
     @Serializable
-    data object Lightning
+    data object LightningConnections
 
     @Serializable
     data object DevSettings

app/src/main/java/to/bitkit/ui/screens/DevSettingsScreen.kt

@@ -19,7 +19,6 @@ import to.bitkit.ui.components.settings.SettingsTextButtonRow
 import to.bitkit.ui.currencyViewModel
 import to.bitkit.ui.navigateToChannelOrdersSettings
 import to.bitkit.ui.navigateToHome
-import to.bitkit.ui.navigateToLightning
 import to.bitkit.ui.navigateToLogs
 import to.bitkit.ui.navigateToRegtestSettings
 import to.bitkit.ui.scaffold.AppTopBar
@@ -48,7 +47,6 @@ fun DevSettingsScreen(
                 .padding(horizontal = 16.dp)
                 .verticalScroll(rememberScrollState())
         ) {
-            SettingsButtonRow("Lightning") { navController.navigateToLightning() }
             SettingsButtonRow("Channel Orders") { navController.navigateToChannelOrdersSettings() }
             SettingsButtonRow("Logs") { navController.navigateToLogs() }