Color StatusBar for Settings and SelectLocation fragments

3 files changed, 28 insertions, 2 deletions

diff --git a/android/build.gradle b/android/build.gradle
index 4fc1512444..407a680258 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -101,6 +101,7 @@ repositories {
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation "androidx.fragment:fragment-ktx:1.3.0"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.3.0"
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'commons-validator:commons-validator:1.7'
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt
index ddc89d973b..6a34491e89 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt
@@ -9,8 +9,11 @@ import android.view.animation.Animation
 import android.view.animation.Animation.AnimationListener
 import android.view.animation.AnimationUtils
 import android.widget.ImageButton
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.flow.collect
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.model.Constraint
 import net.mullvad.mullvadvpn.model.KeygenEvent
@@ -23,7 +26,8 @@ import net.mullvad.mullvadvpn.relaylist.RelayListAdapter
 import net.mullvad.mullvadvpn.ui.widget.CustomRecyclerView
 import net.mullvad.mullvadvpn.util.AdapterWithHeader
 
-class SelectLocationFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
+class SelectLocationFragment :
+    ServiceDependentFragment(OnNoService.GoToLaunchScreen), StatusBarPainter {
     private enum class RelayListState {
         Initializing,
         Loading,
@@ -130,6 +134,15 @@ class SelectLocationFragment : ServiceDependentFragment(OnNoService.GoToLaunchSc
         titleController.onDestroy()
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        lifecycleScope.launchWhenResumed {
+            transitionFinishedFlow.collect {
+                paintStatusBar(ContextCompat.getColor(requireContext(), R.color.darkBlue))
+            }
+        }
+    }
+
     fun close() {
         activity?.onBackPressed()
     }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
index 4f823fada2..c539cdd753 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
@@ -5,6 +5,9 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageButton
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.flow.collect
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.dataproxy.AppVersionInfoCache
 import net.mullvad.mullvadvpn.service.AccountCache
@@ -13,7 +16,7 @@ import net.mullvad.mullvadvpn.ui.widget.AccountCell
 import net.mullvad.mullvadvpn.ui.widget.AppVersionCell
 import net.mullvad.mullvadvpn.ui.widget.NavigateCell
 
-class SettingsFragment : ServiceAwareFragment() {
+class SettingsFragment : ServiceAwareFragment(), StatusBarPainter {
     private lateinit var accountMenu: AccountCell
     private lateinit var appVersionMenu: AppVersionCell
     private lateinit var preferencesMenu: View
@@ -73,6 +76,15 @@ class SettingsFragment : ServiceAwareFragment() {
         return view
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        lifecycleScope.launchWhenResumed {
+            transitionFinishedFlow.collect {
+                paintStatusBar(ContextCompat.getColor(requireContext(), R.color.darkBlue))
+            }
+        }
+    }
+
     override fun onStart() {
         super.onStart()