[taler-taler-android] 01/02: [wallet] Add offline banner

[gnunet]

This is an automated email from the git hooks/post-receive script.

torsten-grote pushed a commit to branch master
in repository taler-android.

commit 69a2882f87d818d2b03e7b5b1ea8fa8cac40eb8f
Author: Iván Ávalos <avalos@disroot.org>
AuthorDate: Sun Sep 17 17:02:22 2023 -0600

    [wallet] Add offline banner
---
 .../src/main/java/net/taler/wallet/MainActivity.kt | 13 ++++++
 .../main/java/net/taler/wallet/MainViewModel.kt    |  1 +
 .../main/java/net/taler/wallet/NetworkManager.kt   | 49 ++++++++++++++++++++++
 wallet/src/main/res/layout/app_content_main.xml    | 24 ++++++++++-
 wallet/src/main/res/values/strings.xml             |  1 +
 5 files changed, 87 insertions(+), 1 deletion(-)

diff --git a/wallet/src/main/java/net/taler/wallet/MainActivity.kt 
b/wallet/src/main/java/net/taler/wallet/MainActivity.kt
index e0c2419..bf1fd6d 100644
--- a/wallet/src/main/java/net/taler/wallet/MainActivity.kt
+++ b/wallet/src/main/java/net/taler/wallet/MainActivity.kt
@@ -22,6 +22,8 @@ import android.content.Context
 import android.content.Intent
 import android.content.Intent.ACTION_VIEW
 import android.content.IntentFilter
+import android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET
+import android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED
 import android.net.Uri
 import android.os.Bundle
 import android.util.Log
@@ -139,6 +141,17 @@ class MainActivity : AppCompatActivity(), 
OnNavigationItemSelectedListener,
             }
             if (it) barcodeLauncher.launch(scanOptions)
         })
+
+        model.networkManager.networkStatus.observe(this) {
+            ui.content.offlineBanner.visibility =
+                if (it != null
+                    && it.hasCapability(NET_CAPABILITY_INTERNET)
+                    && it.hasCapability(NET_CAPABILITY_VALIDATED)) {
+                    GONE
+                } else {
+                    VISIBLE
+                }
+        }
     }
 
     @Deprecated("Deprecated in Java")
diff --git a/wallet/src/main/java/net/taler/wallet/MainViewModel.kt 
b/wallet/src/main/java/net/taler/wallet/MainViewModel.kt
index dbe4261..ea4139b 100644
--- a/wallet/src/main/java/net/taler/wallet/MainViewModel.kt
+++ b/wallet/src/main/java/net/taler/wallet/MainViewModel.kt
@@ -73,6 +73,7 @@ class MainViewModel(
 
     private val api = WalletBackendApi(app, this, this)
 
+    val networkManager = NetworkManager(app.applicationContext)
     val withdrawManager = WithdrawManager(api, viewModelScope)
     val tipManager = TipManager(api, viewModelScope)
     val paymentManager = PaymentManager(api, viewModelScope)
diff --git a/wallet/src/main/java/net/taler/wallet/NetworkManager.kt 
b/wallet/src/main/java/net/taler/wallet/NetworkManager.kt
new file mode 100644
index 0000000..2f64f4e
--- /dev/null
+++ b/wallet/src/main/java/net/taler/wallet/NetworkManager.kt
@@ -0,0 +1,49 @@
+/*
+ * This file is part of GNU Taler
+ * (C) 2023 Taler Systems S.A.
+ *
+ * GNU Taler is free software; you can redistribute it and/or modify it under 
the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 3, or (at your option) any later version.
+ *
+ * GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
FOR
+ * A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+package net.taler.wallet
+
+import android.content.Context
+import android.content.Context.CONNECTIVITY_SERVICE
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import androidx.annotation.UiThread
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+
+class NetworkManager(context: Context) : ConnectivityManager.NetworkCallback() 
{
+    private val connectivityManager: ConnectivityManager
+
+    private val _networkStatus = MutableLiveData<NetworkCapabilities?>(null)
+    val networkStatus: LiveData<NetworkCapabilities?> = _networkStatus
+
+    init {
+        connectivityManager = context.getSystemService(CONNECTIVITY_SERVICE) 
as ConnectivityManager
+        connectivityManager.registerDefaultNetworkCallback( this)
+    }
+
+    @UiThread
+    override fun onCapabilitiesChanged(network: Network, networkCapabilities: 
NetworkCapabilities) {
+        super.onCapabilitiesChanged(network, networkCapabilities)
+        _networkStatus.postValue(networkCapabilities)
+    }
+
+    override fun onLost(network: Network) {
+        super.onLost(network)
+        _networkStatus.postValue(null)
+    }
+}
\ No newline at end of file
diff --git a/wallet/src/main/res/layout/app_content_main.xml 
b/wallet/src/main/res/layout/app_content_main.xml
index b53717f..71fbcd4 100644
--- a/wallet/src/main/res/layout/app_content_main.xml
+++ b/wallet/src/main/res/layout/app_content_main.xml
@@ -39,8 +39,30 @@
                 android:theme="@style/Widget.Material3.ActionBar.Solid"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <FrameLayout
+                android:id="@+id/offline_banner"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:background="?attr/colorPrimary"
+                app:layout_constraintTop_toBottomOf="@id/toolbar"
+                app:layout_constraintBottom_toTopOf="@id/progress_bar"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                android:animateLayoutChanges="true"
+                android:visibility="gone"
+                tools:visibility="visible">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10dp"
+                    android:textAlignment="center"
+                    android:textColor="?attr/colorOnPrimary"
+                    android:text="@string/offline_banner" />
+            </FrameLayout>
+
             <me.zhanghai.android.materialprogressbar.MaterialProgressBar
                 android:id="@+id/progress_bar"
                 style="@style/Widget.MaterialProgressBar.ProgressBar"
@@ -49,7 +71,7 @@
                 android:elevation="4dp"
                 android:indeterminate="true"
                 android:visibility="invisible"
-                app:layout_constraintBottom_toBottomOf="@+id/toolbar"
+                app:layout_constraintBottom_toBottomOf="@+id/offline_banner"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:mpb_progressStyle="horizontal"
diff --git a/wallet/src/main/res/values/strings.xml 
b/wallet/src/main/res/values/strings.xml
index 9e2b38d..17e4e24 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -61,6 +61,7 @@ GNU Taler is immune against many types of fraud, such as 
phishing of credit card
     <string name="char_count">%1$d/%2$d</string>
 
     <string name="offline">Operation requires internet access. Please ensure 
your internet connection works and try again.</string>
+    <string name="offline_banner">No internet access</string>
     <string name="error_unsupported_uri">Error: This Taler URI is not 
supported.</string>
 
     <string name="menu_settings">Settings</string>

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.