From 47c2024f6716c49aa35bb886eef4ef7d47c40329 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 14 Sep 2023 15:14:50 +0200
Subject: [PATCH] Removed code to alter nav bar color

---
 .../linphone/ui/assistant/fragment/LoginFragment.kt  | 12 ------------
 .../ui/assistant/fragment/QrCodeScannerFragment.kt   |  7 -------
 .../main/java/org/linphone/ui/voip/VoipActivity.kt   |  7 -------
 app/src/main/res/values-night/themes.xml             |  2 --
 app/src/main/res/values/themes.xml                   |  2 --
 5 files changed, 30 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/assistant/fragment/LoginFragment.kt b/app/src/main/java/org/linphone/ui/assistant/fragment/LoginFragment.kt
index f15c302ef..886928e4f 100644
--- a/app/src/main/java/org/linphone/ui/assistant/fragment/LoginFragment.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/fragment/LoginFragment.kt
@@ -26,7 +26,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.UiThread
-import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
@@ -139,17 +138,6 @@ class LoginFragment : Fragment() {
         }
     }
 
-    override fun onResume() {
-        super.onResume()
-
-        // In case we come back from QrCodeScannerFragment
-        val white = ContextCompat.getColor(
-            requireContext(),
-            R.color.white
-        )
-        requireActivity().window.navigationBarColor = white
-    }
-
     private fun goBack() {
         requireActivity().finish()
     }
diff --git a/app/src/main/java/org/linphone/ui/assistant/fragment/QrCodeScannerFragment.kt b/app/src/main/java/org/linphone/ui/assistant/fragment/QrCodeScannerFragment.kt
index d264c285b..98c0cc31b 100644
--- a/app/src/main/java/org/linphone/ui/assistant/fragment/QrCodeScannerFragment.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/fragment/QrCodeScannerFragment.kt
@@ -101,13 +101,6 @@ class QrCodeScannerFragment : Fragment() {
             Log.w("$TAG Camera permission wasn't granted yet, asking for it now")
             requestPermissionLauncher.launch(Manifest.permission.CAMERA)
         }
-
-        // Better to have black background in navigation bar when doing full screen video
-        val black = ContextCompat.getColor(
-            requireContext(),
-            R.color.black
-        )
-        requireActivity().window.navigationBarColor = black
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/org/linphone/ui/voip/VoipActivity.kt b/app/src/main/java/org/linphone/ui/voip/VoipActivity.kt
index fcdcdc4e1..228282670 100644
--- a/app/src/main/java/org/linphone/ui/voip/VoipActivity.kt
+++ b/app/src/main/java/org/linphone/ui/voip/VoipActivity.kt
@@ -26,7 +26,6 @@ import android.view.ViewGroup
 import androidx.annotation.DrawableRes
 import androidx.annotation.UiThread
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
@@ -71,12 +70,6 @@ class VoipActivity : AppCompatActivity() {
         WindowCompat.setDecorFitsSystemWindows(window, true)
         super.onCreate(savedInstanceState)
 
-        val inCallBlackColor = ContextCompat.getColor(
-            this,
-            R.color.in_call_black
-        )
-        window.navigationBarColor = inCallBlackColor
-
         while (!LinphoneApplication.coreContext.isReady()) {
             Thread.sleep(20)
         }
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 41f202b3c..3ef35995a 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -10,12 +10,10 @@
         <!-- Customize your theme here. -->
         <item name="android:windowActivityTransitions">true</item>
         <item name="android:windowBackground">@color/white</item>
-        <item name="android:navigationBarColor">@color/white</item>
     </style>
 
     <style name="Theme.LinphoneDialog" parent="Theme.Linphone">
         <item name="android:windowAnimationStyle">@null</item>
         <item name="android:windowBackground">@color/transparent_color</item>
-        <item name="android:navigationBarColor">@color/black</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 41f202b3c..3ef35995a 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -10,12 +10,10 @@
         <!-- Customize your theme here. -->
         <item name="android:windowActivityTransitions">true</item>
         <item name="android:windowBackground">@color/white</item>
-        <item name="android:navigationBarColor">@color/white</item>
     </style>
 
     <style name="Theme.LinphoneDialog" parent="Theme.Linphone">
         <item name="android:windowAnimationStyle">@null</item>
         <item name="android:windowBackground">@color/transparent_color</item>
-        <item name="android:navigationBarColor">@color/black</item>
     </style>
 </resources>
\ No newline at end of file