mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-17 11:28:06 +00:00
Removed code to alter nav bar color
This commit is contained in:
parent
5eb323c662
commit
47c2024f67
5 changed files with 0 additions and 30 deletions
|
|
@ -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()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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() {
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
Loading…
Add table
Reference in a new issue