[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-android] branch master updated: [wallet] Show version info
From: |
gnunet |
Subject: |
[taler-taler-android] branch master updated: [wallet] Show version info even when not in developer mode |
Date: |
Tue, 05 Mar 2024 15:24:03 +0100 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository taler-android.
The following commit(s) were added to refs/heads/master by this push:
new b311911 [wallet] Show version info even when not in developer mode
b311911 is described below
commit b3119118d5fb1e19cf71265d20408f1f601a1ee3
Author: Iván Ávalos <avalos@disroot.org>
AuthorDate: Wed Feb 28 09:01:03 2024 -0600
[wallet] Show version info even when not in developer mode
bug 0008536
---
wallet/src/main/java/net/taler/wallet/MainActivity.kt | 16 +++++++---------
.../java/net/taler/wallet/settings/SettingsFragment.kt | 13 +++++--------
wallet/src/main/res/xml/settings_main.xml | 4 ++--
3 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/wallet/src/main/java/net/taler/wallet/MainActivity.kt
b/wallet/src/main/java/net/taler/wallet/MainActivity.kt
index ffc6c88..65e5c2a 100644
--- a/wallet/src/main/java/net/taler/wallet/MainActivity.kt
+++ b/wallet/src/main/java/net/taler/wallet/MainActivity.kt
@@ -111,15 +111,13 @@ class MainActivity : AppCompatActivity(),
OnNavigationItemSelectedListener,
}
val versionView: TextView =
ui.navView.getHeaderView(0).findViewById(R.id.versionView)
- model.devMode.observe(this) { enabled ->
- // Uncomment if any dev options are added in the future
- // ui.navView.menu.findItem(R.id.nav_dev).isVisible = enabled
- if (enabled) {
- @SuppressLint("SetTextI18n")
- versionView.text = "$VERSION_NAME ($VERSION_CODE)"
- versionView.visibility = VISIBLE
- } else versionView.visibility = GONE
- }
+ @SuppressLint("SetTextI18n")
+ versionView.text = "$VERSION_NAME ($VERSION_CODE)"
+
+ // Uncomment if any dev options are added in the future
+ // model.devMode.observe(this) { enabled ->
+ // ui.navView.menu.findItem(R.id.nav_dev).isVisible = enabled
+ // }
if (intent.action == ACTION_VIEW) intent.dataString?.let { uri ->
handleTalerUri(uri, "intent")
diff --git a/wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt
b/wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt
index a9881bf..6af5ed1 100644
--- a/wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt
@@ -60,8 +60,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
prefLogcat,
prefExportDb,
prefImportDb,
- prefVersionApp,
- prefVersionCore,
prefVersionExchange,
prefVersionMerchant,
prefTest,
@@ -99,14 +97,13 @@ class SettingsFragment : PreferenceFragmentCompat() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
+ prefVersionApp.summary = "$VERSION_NAME ($FLAVOR $VERSION_CODE)"
+ prefVersionCore.summary = "${model.walletVersion}
(${model.walletVersionHash?.take(7)})"
+ model.exchangeVersion?.let { prefVersionExchange.summary = it }
+ model.merchantVersion?.let { prefVersionMerchant.summary = it }
+
model.devMode.observe(viewLifecycleOwner) { enabled ->
prefDevMode.isChecked = enabled
- if (enabled) {
- prefVersionApp.summary = "$VERSION_NAME ($FLAVOR
$VERSION_CODE)"
- prefVersionCore.summary = "${model.walletVersion}
(${model.walletVersionHash?.take(7)})"
- model.exchangeVersion?.let { prefVersionExchange.summary = it }
- model.merchantVersion?.let { prefVersionMerchant.summary = it }
- }
devPrefs.forEach { it.isVisible = enabled }
}
prefDevMode.setOnPreferenceChangeListener { _, newValue ->
diff --git a/wallet/src/main/res/xml/settings_main.xml
b/wallet/src/main/res/xml/settings_main.xml
index 739e119..175465f 100644
--- a/wallet/src/main/res/xml/settings_main.xml
+++ b/wallet/src/main/res/xml/settings_main.xml
@@ -65,7 +65,7 @@
<Preference
app:icon="@drawable/ic_account_balance_wallet"
- app:isPreferenceVisible="false"
+ app:isPreferenceVisible="true"
app:key="pref_version_app"
app:selectable="false"
app:summary="@string/settings_version_unknown"
@@ -74,7 +74,7 @@
<Preference
app:icon="@drawable/ic_adjust"
- app:isPreferenceVisible="false"
+ app:isPreferenceVisible="true"
app:key="pref_version_core"
app:selectable="false"
app:summary="@string/settings_version_unknown"
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-taler-android] branch master updated: [wallet] Show version info even when not in developer mode,
gnunet <=