diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/Navigation.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/Navigation.kt index cdca320dc..49e94e0fe 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/Navigation.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/Navigation.kt @@ -28,6 +28,7 @@ import co.electriccoin.zcash.ui.NavigationArguments.SEND_SCAN_ZIP_321_URI import co.electriccoin.zcash.ui.NavigationTargets.ABOUT import co.electriccoin.zcash.ui.NavigationTargets.ADVANCED_SETTINGS import co.electriccoin.zcash.ui.NavigationTargets.CHOOSE_SERVER +import co.electriccoin.zcash.ui.NavigationTargets.CRASH_REPORTING_OPT_IN import co.electriccoin.zcash.ui.NavigationTargets.DELETE_WALLET import co.electriccoin.zcash.ui.NavigationTargets.EXCHANGE_RATE_OPT_IN import co.electriccoin.zcash.ui.NavigationTargets.EXPORT_PRIVATE_DATA @@ -296,6 +297,9 @@ internal fun MainActivity.Navigation() { composable(SETTINGS_EXCHANGE_RATE_OPT_IN) { AndroidSettingsExchangeRateOptIn() } + composable(CRASH_REPORTING_OPT_IN) { + AndroidSettingsExchangeRateOptIn() + } composable { WrapScanKeystoneSignInRequest() } @@ -617,6 +621,7 @@ object NavigationTargets { const val SEED_RECOVERY = "seed_recovery" const val SETTINGS = "settings" const val SETTINGS_EXCHANGE_RATE_OPT_IN = "settings_exchange_rate_opt_in" + const val CRASH_REPORTING_OPT_IN = "crash_reporting_opt_in" const val SUPPORT = "support" const val WHATS_NEW = "whats_new" } diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/advancedsettings/view/AdvancedSettingsView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/advancedsettings/view/AdvancedSettingsView.kt index af5c45e4f..528b1c470 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/advancedsettings/view/AdvancedSettingsView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/advancedsettings/view/AdvancedSettingsView.kt @@ -164,6 +164,11 @@ private fun AdvancedSettingsPreview() = title = stringRes(R.string.advanced_settings_currency_conversion), icon = R.drawable.ic_advanced_settings_currency_conversion, onClick = {} + ), + ZashiListItemState( + title = stringRes(R.string.advanced_settings_crash_reporting), + icon = R.drawable.ic_advanced_settings_crash_reporting, + onClick = {} ) ), deleteButton = diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/advancedsettings/viewmodel/AdvancedSettingsViewModel.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/advancedsettings/viewmodel/AdvancedSettingsViewModel.kt index 44a014ba2..884d21bf9 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/advancedsettings/viewmodel/AdvancedSettingsViewModel.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/advancedsettings/viewmodel/AdvancedSettingsViewModel.kt @@ -74,6 +74,12 @@ class AdvancedSettingsViewModel( icon = R.drawable.ic_advanced_settings_currency_conversion, onClick = ::onCurrencyConversionClick + ), + ZashiListItemState( + title = stringRes(R.string.advanced_settings_crash_reporting), + icon = + R.drawable.ic_advanced_settings_crash_reporting, + onClick = ::onCrashReportingClick ) ).toImmutableList(), deleteButton = @@ -89,6 +95,8 @@ class AdvancedSettingsViewModel( private fun onCurrencyConversionClick() = navigationRouter.forward(NavigationTargets.SETTINGS_EXCHANGE_RATE_OPT_IN) + private fun onCrashReportingClick() = navigationRouter.forward(NavigationTargets.CRASH_REPORTING_OPT_IN) + private fun onTaxExportClick() = viewModelScope.launch { navigateToTaxExport() diff --git a/ui-lib/src/main/res/ui/advanced_settings/drawable-night/ic_advanced_settings_crash_reporting.xml b/ui-lib/src/main/res/ui/advanced_settings/drawable-night/ic_advanced_settings_crash_reporting.xml new file mode 100644 index 000000000..dccf5d30f --- /dev/null +++ b/ui-lib/src/main/res/ui/advanced_settings/drawable-night/ic_advanced_settings_crash_reporting.xml @@ -0,0 +1,16 @@ + + + + diff --git a/ui-lib/src/main/res/ui/advanced_settings/drawable/ic_advanced_settings_crash_reporting.xml b/ui-lib/src/main/res/ui/advanced_settings/drawable/ic_advanced_settings_crash_reporting.xml new file mode 100644 index 000000000..8bb04e3dd --- /dev/null +++ b/ui-lib/src/main/res/ui/advanced_settings/drawable/ic_advanced_settings_crash_reporting.xml @@ -0,0 +1,16 @@ + + + + diff --git a/ui-lib/src/main/res/ui/advanced_settings/values-es/strings.xml b/ui-lib/src/main/res/ui/advanced_settings/values-es/strings.xml index e0ec9eeb1..19937eb68 100644 --- a/ui-lib/src/main/res/ui/advanced_settings/values-es/strings.xml +++ b/ui-lib/src/main/res/ui/advanced_settings/values-es/strings.xml @@ -5,6 +5,7 @@ Exportar Datos Privados Elegir un Servidor Conversión de Moneda + Crash Reporting Se te pedirá confirmación en la siguiente pantalla Restablecer Zashi Exportar Archivo de Impuestos diff --git a/ui-lib/src/main/res/ui/advanced_settings/values/strings.xml b/ui-lib/src/main/res/ui/advanced_settings/values/strings.xml index 43dfda73c..eeaeff7ac 100644 --- a/ui-lib/src/main/res/ui/advanced_settings/values/strings.xml +++ b/ui-lib/src/main/res/ui/advanced_settings/values/strings.xml @@ -5,6 +5,7 @@ Export Private Data Choose a Server Currency Conversion + Crash Reporting You will be asked to confirm on the next screen Reset Zashi Export Tax File