VERY experimental Nintendo Switch 2 emulator
C++
android: Adjust setup fragment layout
Charles Lombardoced5b29eebf0
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.ktindex 8ca768dcfa..e00013c1b9 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt@@ -19,6 +19,7 @@ import androidx.core.content.ContextCompatimport androidx.core.view.ViewCompatimport androidx.core.view.WindowInsetsCompatimport androidx.core.view.isVisible+import androidx.core.view.updatePaddingimport androidx.fragment.app.Fragmentimport androidx.fragment.app.activityViewModelsimport androidx.navigation.findNavController@@ -351,15 +352,29 @@ class SetupFragment : Fragment() {private fun setInsets() =ViewCompat.setOnApplyWindowInsetsListener(binding.root- ) { view: View, windowInsets: WindowInsetsCompat ->+ ) { _: View, windowInsets: WindowInsetsCompat ->val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())- view.setPadding(- barInsets.left + cutoutInsets.left,- barInsets.top + cutoutInsets.top,- barInsets.right + cutoutInsets.right,- barInsets.bottom + cutoutInsets.bottom- )++ val leftPadding = barInsets.left + cutoutInsets.left+ val topPadding = barInsets.top + cutoutInsets.top+ val rightPadding = barInsets.right + cutoutInsets.right+ val bottomPadding = barInsets.bottom + cutoutInsets.bottom++ if (resources.getBoolean(R.bool.small_layout)) {+ binding.viewPager2+ .updatePadding(left = leftPadding, top = topPadding, right = rightPadding)+ binding.constraintButtons+ .updatePadding(left = leftPadding, right = rightPadding, bottom = bottomPadding)+ } else {+ binding.viewPager2.updatePadding(top = topPadding, bottom = bottomPadding)+ binding.constraintButtons+ .updatePadding(+ left = leftPadding,+ right = rightPadding,+ bottom = bottomPadding+ )+ }windowInsets}}diff --git a/src/android/app/src/main/res/layout-w600dp/fragment_setup.xml b/src/android/app/src/main/res/layout-w600dp/fragment_setup.xmlindex cbe631d888..406df9eabd 100644--- a/src/android/app/src/main/res/layout-w600dp/fragment_setup.xml+++ b/src/android/app/src/main/res/layout-w600dp/fragment_setup.xml@@ -1,5 +1,5 @@<?xml version="1.0" encoding="utf-8"?>-<androidx.constraintlayout.widget.ConstraintLayout+<RelativeLayoutxmlns:android="http://schemas.android.com/apk/res/android"xmlns:app="http://schemas.android.com/apk/res-auto"android:id="@+id/setup_root"@@ -8,33 +8,39 @@<androidx.viewpager2.widget.ViewPager2android:id="@+id/viewPager2"- android:layout_width="0dp"- android:layout_height="0dp"- app:layout_constraintBottom_toBottomOf="parent"- app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toTopOf="parent" />+ android:layout_width="match_parent"+ android:layout_height="match_parent"+ android:layout_alignParentTop="true"+ android:layout_alignParentBottom="true"+ android:clipToPadding="false" />- <com.google.android.material.button.MaterialButton- style="@style/Widget.Material3.Button.TextButton"- android:id="@+id/button_next"- android:layout_width="wrap_content"+ <androidx.constraintlayout.widget.ConstraintLayout+ android:id="@+id/constraint_buttons"+ android:layout_width="match_parent"android:layout_height="wrap_content"- android:layout_margin="16dp"- android:text="@string/next"- android:visibility="invisible"- app:layout_constraintBottom_toBottomOf="parent"- app:layout_constraintEnd_toEndOf="parent" />+ android:layout_alignParentBottom="true"+ android:layout_margin="8dp">- <com.google.android.material.button.MaterialButton- android:id="@+id/button_back"- style="@style/Widget.Material3.Button.TextButton"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:layout_margin="16dp"- android:text="@string/back"- android:visibility="invisible"- app:layout_constraintBottom_toBottomOf="parent"- app:layout_constraintStart_toStartOf="parent" />+ <com.google.android.material.button.MaterialButton+ android:id="@+id/button_next"+ style="@style/Widget.Material3.Button.TextButton"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:text="@string/next"+ android:visibility="invisible"+ app:layout_constraintBottom_toBottomOf="parent"+ app:layout_constraintEnd_toEndOf="parent" />++ <com.google.android.material.button.MaterialButton+ android:id="@+id/button_back"+ style="@style/Widget.Material3.Button.TextButton"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:text="@string/back"+ android:visibility="invisible"+ app:layout_constraintBottom_toBottomOf="parent"+ app:layout_constraintStart_toStartOf="parent" />++ </androidx.constraintlayout.widget.ConstraintLayout>-</androidx.constraintlayout.widget.ConstraintLayout>+</RelativeLayout>diff --git a/src/android/app/src/main/res/layout/fragment_setup.xml b/src/android/app/src/main/res/layout/fragment_setup.xmlindex d7bafaea24..9499f64636 100644--- a/src/android/app/src/main/res/layout/fragment_setup.xml+++ b/src/android/app/src/main/res/layout/fragment_setup.xml@@ -1,5 +1,5 @@<?xml version="1.0" encoding="utf-8"?>-<androidx.constraintlayout.widget.ConstraintLayout+<RelativeLayoutxmlns:android="http://schemas.android.com/apk/res/android"xmlns:app="http://schemas.android.com/apk/res-auto"android:id="@+id/setup_root"@@ -8,35 +8,39 @@<androidx.viewpager2.widget.ViewPager2android:id="@+id/viewPager2"- android:layout_width="0dp"- android:layout_height="0dp"- android:clipToPadding="false"- android:layout_marginBottom="16dp"- app:layout_constraintBottom_toTopOf="@+id/button_next"- app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toTopOf="parent" />-- <com.google.android.material.button.MaterialButton- style="@style/Widget.Material3.Button.TextButton"- android:id="@+id/button_next"- android:layout_width="wrap_content"+ android:layout_width="match_parent"android:layout_height="wrap_content"- android:layout_margin="12dp"- android:text="@string/next"- android:visibility="invisible"- app:layout_constraintBottom_toBottomOf="parent"- app:layout_constraintEnd_toEndOf="parent" />+ android:layout_above="@+id/constraint_buttons"+ android:layout_alignParentTop="true"+ android:clipToPadding="false" />- <com.google.android.material.button.MaterialButton- style="@style/Widget.Material3.Button.TextButton"- android:id="@+id/button_back"- android:layout_width="wrap_content"+ <androidx.constraintlayout.widget.ConstraintLayout+ android:id="@+id/constraint_buttons"+ android:layout_width="match_parent"android:layout_height="wrap_content"- android:layout_margin="12dp"- android:text="@string/back"- android:visibility="invisible"- app:layout_constraintBottom_toBottomOf="parent"- app:layout_constraintStart_toStartOf="parent" />+ android:layout_margin="8dp"+ android:layout_alignParentBottom="true">++ <com.google.android.material.button.MaterialButton+ android:id="@+id/button_next"+ style="@style/Widget.Material3.Button.TextButton"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:text="@string/next"+ android:visibility="invisible"+ app:layout_constraintBottom_toBottomOf="parent"+ app:layout_constraintEnd_toEndOf="parent" />++ <com.google.android.material.button.MaterialButton+ android:id="@+id/button_back"+ style="@style/Widget.Material3.Button.TextButton"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:text="@string/back"+ android:visibility="invisible"+ app:layout_constraintBottom_toBottomOf="parent"+ app:layout_constraintStart_toStartOf="parent" />++ </androidx.constraintlayout.widget.ConstraintLayout>-</androidx.constraintlayout.widget.ConstraintLayout>+</RelativeLayout>