From e76180839756de2a81114b86d452ec573bc23c9b Mon Sep 17 00:00:00 2001 From: "ingvar.skogen" Date: Mon, 26 Feb 2024 16:24:41 +0100 Subject: [PATCH] Hide the Block Explorer feature behind the new isBlockExplorerEnabled flag --- .../ui/common/recyclerView/CommonAdapter.kt | 2 +- .../allSettings/AllSettingsViewModel.kt | 19 +++++++++++-------- .../fragment/tx/details/TxDetailsFragment.kt | 7 ++++++- .../tari/android/wallet/util/DebugConfig.kt | 2 ++ app/src/main/res/values/strings.xml | 4 ++-- 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/tari/android/wallet/ui/common/recyclerView/CommonAdapter.kt b/app/src/main/java/com/tari/android/wallet/ui/common/recyclerView/CommonAdapter.kt index bad5bab7f..159db6e0e 100644 --- a/app/src/main/java/com/tari/android/wallet/ui/common/recyclerView/CommonAdapter.kt +++ b/app/src/main/java/com/tari/android/wallet/ui/common/recyclerView/CommonAdapter.kt @@ -11,7 +11,7 @@ abstract class CommonAdapter : ListAdapter - fun update(newItems: MutableList) { + fun update(newItems: List) { submitList(newItems.toList()) } diff --git a/app/src/main/java/com/tari/android/wallet/ui/fragment/settings/allSettings/AllSettingsViewModel.kt b/app/src/main/java/com/tari/android/wallet/ui/fragment/settings/allSettings/AllSettingsViewModel.kt index d67be388e..d8e9eb31c 100644 --- a/app/src/main/java/com/tari/android/wallet/ui/fragment/settings/allSettings/AllSettingsViewModel.kt +++ b/app/src/main/java/com/tari/android/wallet/ui/fragment/settings/allSettings/AllSettingsViewModel.kt @@ -20,6 +20,7 @@ import com.tari.android.wallet.R.drawable.vector_all_settings_screen_recording_i import com.tari.android.wallet.R.drawable.vector_all_settings_select_base_node_icon import com.tari.android.wallet.R.drawable.vector_all_settings_select_network_icon import com.tari.android.wallet.R.drawable.vector_all_settings_select_theme_icon +import com.tari.android.wallet.R.drawable.vector_all_settings_block_explorer_icon import com.tari.android.wallet.R.drawable.vector_all_settings_user_agreement_icon import com.tari.android.wallet.R.drawable.vector_all_settings_visit_tari_icon import com.tari.android.wallet.R.drawable.vector_all_settings_yat_icon @@ -30,6 +31,7 @@ import com.tari.android.wallet.R.string.all_settings_biometrics import com.tari.android.wallet.R.string.all_settings_bluetooth_settings import com.tari.android.wallet.R.string.all_settings_bridge_configuration import com.tari.android.wallet.R.string.all_settings_connect_yats +import com.tari.android.wallet.R.string.explorer_url import com.tari.android.wallet.R.string.all_settings_contribute import com.tari.android.wallet.R.string.all_settings_create_pin_code import com.tari.android.wallet.R.string.all_settings_data_collection @@ -41,6 +43,7 @@ import com.tari.android.wallet.R.string.all_settings_report_a_bug import com.tari.android.wallet.R.string.all_settings_secondary_settings_label import com.tari.android.wallet.R.string.all_settings_security_label import com.tari.android.wallet.R.string.all_settings_select_base_node +import com.tari.android.wallet.R.string.all_settings_explorer import com.tari.android.wallet.R.string.all_settings_select_network import com.tari.android.wallet.R.string.all_settings_select_theme import com.tari.android.wallet.R.string.all_settings_store @@ -86,6 +89,7 @@ import com.tari.android.wallet.ui.fragment.settings.allSettings.title.SettingsTi import com.tari.android.wallet.ui.fragment.settings.allSettings.version.SettingsVersionViewHolderItem import com.tari.android.wallet.ui.fragment.settings.backup.data.BackupSettingsRepository import com.tari.android.wallet.ui.fragment.settings.userAutorization.BiometricAuthenticationViewModel +import com.tari.android.wallet.util.DebugConfig import com.tari.android.wallet.yat.YatAdapter import com.tari.android.wallet.yat.YatSharedRepository import javax.inject.Inject @@ -116,8 +120,8 @@ class AllSettingsViewModel : CommonViewModel() { private val _openYatOnboarding = SingleLiveEvent() val openYatOnboarding: LiveData = _openYatOnboarding - private val _allSettingsOptions = MutableLiveData>() - val allSettingsOptions: LiveData> = _allSettingsOptions + private val _allSettingsOptions = MutableLiveData>() + val allSettingsOptions: LiveData> = _allSettingsOptions init { component.inject(this) @@ -141,7 +145,7 @@ class AllSettingsViewModel : CommonViewModel() { val alias = settingsRepository.name.orEmpty() + " " + settingsRepository.surname.orEmpty() val pinCode = securityPrefRepository.pinCode - val allOptions = mutableListOf( + _allSettingsOptions.postValue(listOfNotNull( MyProfileViewHolderItem(settingsRepository.emojiId.orEmpty(), yatSharedPrefsRepository.connectedYat.orEmpty(), alias) { navigation.postValue(AllSettingsNavigation.ToMyProfile) }, @@ -208,9 +212,9 @@ class AllSettingsViewModel : CommonViewModel() { _openLink.postValue(resourceManager.getString(disclaimer_url)) }, DividerViewHolderItem(), -// ButtonViewDto(resourceManager.getString(all_settings_explorer), vector_all_settings_block_explorer_icon) { -// _openLink.postValue(resourceManager.getString(explorer_url)) -// }, + SettingsRowViewDto(resourceManager.getString(all_settings_explorer), vector_all_settings_block_explorer_icon) { + _openLink.postValue(resourceManager.getString(explorer_url)) + }.takeIf { DebugConfig.isBlockExplorerEnabled }, SettingsTitleViewHolderItem(resourceManager.getString(all_settings_advanced_settings_label)), SettingsRowViewDto(resourceManager.getString(all_settings_select_theme), vector_all_settings_select_theme_icon) { navigation.postValue(AllSettingsNavigation.ToThemeSelection) @@ -251,9 +255,8 @@ class AllSettingsViewModel : CommonViewModel() { style = SettingsRowStyle.Warning, ) { navigation.postValue(AllSettingsNavigation.ToDeleteWallet) }, DividerViewHolderItem(), - SettingsVersionViewHolderItem(versionText) { _copyToClipboard.postValue(versionArgs) } + SettingsVersionViewHolderItem(versionText) { _copyToClipboard.postValue(versionArgs) }) ) - _allSettingsOptions.postValue(allOptions) } private fun onBackupStateChanged(backupState: BackupsState?) { diff --git a/app/src/main/java/com/tari/android/wallet/ui/fragment/tx/details/TxDetailsFragment.kt b/app/src/main/java/com/tari/android/wallet/ui/fragment/tx/details/TxDetailsFragment.kt index 0e7803aca..1c28855eb 100644 --- a/app/src/main/java/com/tari/android/wallet/ui/fragment/tx/details/TxDetailsFragment.kt +++ b/app/src/main/java/com/tari/android/wallet/ui/fragment/tx/details/TxDetailsFragment.kt @@ -107,6 +107,7 @@ import com.tari.android.wallet.ui.fragment.contact_book.data.contacts.ContactDto import com.tari.android.wallet.ui.fragment.tx.details.gif.GIFView import com.tari.android.wallet.ui.fragment.tx.details.gif.GIFViewModel import com.tari.android.wallet.ui.fragment.tx.details.gif.TxState +import com.tari.android.wallet.util.DebugConfig import com.tari.android.wallet.util.WalletUtil import java.util.Date @@ -161,7 +162,11 @@ class TxDetailsFragment : CommonFragment + if (DebugConfig.isBlockExplorerEnabled) { + showExplorerLink(link) + } + } } private fun updateContactInfo(contact: ContactDto) { diff --git a/app/src/main/java/com/tari/android/wallet/util/DebugConfig.kt b/app/src/main/java/com/tari/android/wallet/util/DebugConfig.kt index 9e1655dd3..c1a536c99 100644 --- a/app/src/main/java/com/tari/android/wallet/util/DebugConfig.kt +++ b/app/src/main/java/com/tari/android/wallet/util/DebugConfig.kt @@ -49,6 +49,8 @@ object DebugConfig { private const val _useYatSandbox = false val yatEnvironment = if (_useYatSandbox && isDebug()) YatEnvironment.SANDBOX else YatEnvironment.PRODUCTION + val isBlockExplorerEnabled = false + private fun isDebug() = BuildConfig.BUILD_TYPE == "debug" } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 58b3984a4..ef75d6f5e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -11,8 +11,8 @@ https://www.tari.com/user_agreement/ https://www.tari.com/privacy_policy/ https://www.tari.com/disclaimer/ - https://explore-esme.tari.com/ - https://explore-esme.tari.com/kernel/ + https://explore.tari.com/ + https://explore.tari.com/kernel/ https://bridges.torproject.org/bridges https://tlu.tarilabs.com/