VERY experimental Nintendo Switch 2 emulator
C++
android: Use navigation bar shade view
Charles Lombardofcebfe894347
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.ktindex 5fafc2d2d0..8edf01fead 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt@@ -65,13 +65,29 @@ class MainActivity : AppCompatActivity(), ThemeProvider {window.statusBarColor =ContextCompat.getColor(applicationContext, android.R.color.transparent)- ThemeHelper.setNavigationBarColor(- this,- ElevationOverlayProvider(binding.navigationView.context).compositeOverlay(- MaterialColors.getColor(binding.navigationView, R.attr.colorSurface),- binding.navigationView.elevation+ window.navigationBarColor =+ ContextCompat.getColor(applicationContext, android.R.color.transparent)++ binding.statusBarShade.setBackgroundColor(+ ThemeHelper.getColorWithOpacity(+ MaterialColors.getColor(+ binding.root,+ R.attr.colorSurface+ ),+ ThemeHelper.SYSTEM_BAR_ALPHA))+ if (InsetsHelper.getSystemGestureType(applicationContext) != InsetsHelper.GESTURE_NAVIGATION) {+ binding.navigationBarShade.setBackgroundColor(+ ThemeHelper.getColorWithOpacity(+ MaterialColors.getColor(+ binding.root,+ R.attr.colorSurface+ ),+ ThemeHelper.SYSTEM_BAR_ALPHA+ )+ )+ }val navHostFragment =supportFragmentManager.findFragmentById(R.id.fragment_container) as NavHostFragment@@ -83,16 +99,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {}}- binding.statusBarShade.setBackgroundColor(- ThemeHelper.getColorWithOpacity(- MaterialColors.getColor(- binding.root,- R.attr.colorSurface- ),- ThemeHelper.SYSTEM_BAR_ALPHA- )- )-// Prevents navigation from being drawn for a short time on recreation if set to hiddenif (!homeViewModel.navigationVisible.value?.first!!) {binding.navigationView.visibility = View.INVISIBLE@@ -116,14 +122,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {navController.navigate(R.id.action_firstTimeSetupFragment_to_gamesFragment)(binding.navigationView as NavigationBarView).setupWithNavController(navController)showNavigation(visible = true, animated = true)-- ThemeHelper.setNavigationBarColor(- this,- ElevationOverlayProvider(binding.navigationView.context).compositeOverlay(- MaterialColors.getColor(binding.navigationView, R.attr.colorSurface),- binding.navigationView.elevation- )- )}private fun setUpNavigation(navController: NavController) {@@ -210,11 +208,18 @@ class MainActivity : AppCompatActivity(), ThemeProvider {}private fun setInsets() =- ViewCompat.setOnApplyWindowInsetsListener(binding.statusBarShade) { view: View, windowInsets: WindowInsetsCompat ->+ ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _: View, windowInsets: WindowInsetsCompat ->val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())- val mlpShade = view.layoutParams as MarginLayoutParams- mlpShade.height = insets.top- binding.statusBarShade.layoutParams = mlpShade+ val mlpStatusShade = binding.statusBarShade.layoutParams as MarginLayoutParams+ mlpStatusShade.height = insets.top+ binding.statusBarShade.layoutParams = mlpStatusShade++ // The only situation where we care to have a nav bar shade is when it's at the bottom+ // of the screen where scrolling list elements can go behind it.+ val mlpNavShade = binding.navigationBarShade.layoutParams as MarginLayoutParams+ mlpNavShade.height = insets.bottom+ binding.navigationBarShade.layoutParams = mlpNavShade+windowInsets}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ThemeHelper.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ThemeHelper.ktindex 1295b42577..1a9495ea7c 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ThemeHelper.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ThemeHelper.kt@@ -44,28 +44,6 @@ object ThemeHelper {}}- @JvmStatic- fun setNavigationBarColor(activity: Activity, @ColorInt color: Int) {- val gestureType = InsetsHelper.getSystemGestureType(activity.applicationContext)- val orientation = activity.resources.configuration.orientation-- if ((gestureType == InsetsHelper.THREE_BUTTON_NAVIGATION ||- gestureType == InsetsHelper.TWO_BUTTON_NAVIGATION) &&- orientation == Configuration.ORIENTATION_LANDSCAPE- ) {- activity.window.navigationBarColor = color- } else if (gestureType == InsetsHelper.THREE_BUTTON_NAVIGATION ||- gestureType == InsetsHelper.TWO_BUTTON_NAVIGATION- ) {- activity.window.navigationBarColor = getColorWithOpacity(color, SYSTEM_BAR_ALPHA)- } else {- activity.window.navigationBarColor = ContextCompat.getColor(- activity.applicationContext,- android.R.color.transparent- )- }- }-@ColorIntfun getColorWithOpacity(@ColorInt color: Int, alphaFactor: Float): Int {return Color.argb(diff --git a/src/android/app/src/main/res/layout-w600dp/activity_main.xml b/src/android/app/src/main/res/layout-w600dp/activity_main.xmlindex 39b61a13e7..8a4f46bef6 100644--- a/src/android/app/src/main/res/layout-w600dp/activity_main.xml+++ b/src/android/app/src/main/res/layout-w600dp/activity_main.xml@@ -43,4 +43,15 @@app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent" />+ <View+ android:id="@+id/navigation_bar_shade"+ android:layout_width="0dp"+ android:layout_height="1px"+ android:background="@android:color/transparent"+ android:clickable="false"+ android:focusable="false"+ app:layout_constraintBottom_toBottomOf="parent"+ app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintStart_toStartOf="parent" />+</androidx.constraintlayout.widget.ConstraintLayout>diff --git a/src/android/app/src/main/res/layout/activity_main.xml b/src/android/app/src/main/res/layout/activity_main.xmlindex 214acb041d..7db1a409e1 100644--- a/src/android/app/src/main/res/layout/activity_main.xml+++ b/src/android/app/src/main/res/layout/activity_main.xml@@ -43,4 +43,15 @@app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent" />+ <View+ android:id="@+id/navigation_bar_shade"+ android:layout_width="0dp"+ android:layout_height="1px"+ android:background="@android:color/transparent"+ android:clickable="false"+ android:focusable="false"+ app:layout_constraintBottom_toBottomOf="parent"+ app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintStart_toStartOf="parent" />+</androidx.constraintlayout.widget.ConstraintLayout>