Refactor to create `NotificationBanner` helper

2 files changed, 22 insertions, 9 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt
index 766c3137fb..c38321dfc9 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt
@@ -10,7 +10,7 @@ import android.view.ViewGroup
 class ConnectFragment : Fragment() {
     private lateinit var actionButton: ConnectActionButton
     private lateinit var headerBar: HeaderBar
-    private lateinit var notificationBanner: View
+    private lateinit var notificationBanner: NotificationBanner
     private lateinit var status: ConnectionStatus
 
     private lateinit var connectHandler: Handler
@@ -19,7 +19,9 @@ class ConnectFragment : Fragment() {
         set(value) {
             actionButton.state = value
             headerBar.state = value
+            notificationBanner.state = value
             status.state = value
+
             field = value
         }
 
@@ -36,9 +38,8 @@ class ConnectFragment : Fragment() {
     ): View {
         val view = inflater.inflate(R.layout.connect, container, false)
 
-        notificationBanner = view.findViewById(R.id.notification_banner)
-
         headerBar = HeaderBar(view, context!!)
+        notificationBanner = NotificationBanner(view)
         status = ConnectionStatus(view, context!!)
 
         actionButton = ConnectActionButton(view)
@@ -54,22 +55,16 @@ class ConnectFragment : Fragment() {
     private fun connect() {
         state = ConnectionState.Connecting
 
-        notificationBanner.visibility = View.VISIBLE
-
         connectHandler.postDelayed(Runnable { connected() }, 1000)
     }
 
     private fun disconnect() {
         state = ConnectionState.Disconnected
 
-        notificationBanner.visibility = View.GONE
-
         connectHandler.removeCallbacksAndMessages(null)
     }
 
     private fun connected() {
         state = ConnectionState.Connected
-
-        notificationBanner.visibility = View.GONE
     }
 }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt
new file mode 100644
index 0000000000..445df2d914
--- /dev/null
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt
@@ -0,0 +1,18 @@
+package net.mullvad.mullvadvpn
+
+import android.view.View
+
+class NotificationBanner(val parentView: View) {
+    private val banner: View = parentView.findViewById(R.id.notification_banner)
+
+    var state = ConnectionState.Disconnected
+        set(value) {
+            when (value) {
+                ConnectionState.Disconnected -> banner.visibility = View.GONE
+                ConnectionState.Connecting -> banner.visibility = View.VISIBLE
+                ConnectionState.Connected -> banner.visibility = View.GONE
+            }
+
+            field = value
+        }
+}