VERY experimental Nintendo Switch 2 emulator
C++
android: Use utility function for applying view margins
t895db95f51c6925
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.ktindex d7ab0b5d9c..6f6e7be10f 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.kt@@ -8,7 +8,6 @@ import android.os.Bundleimport android.view.LayoutInflaterimport android.view.Viewimport android.view.ViewGroup-import android.view.ViewGroup.MarginLayoutParamsimport androidx.core.view.ViewCompatimport androidx.core.view.WindowInsetsCompatimport androidx.core.view.updatePadding@@ -27,6 +26,7 @@ import org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.databinding.FragmentSettingsBindingimport org.yuzu.yuzu_emu.features.settings.model.Settingsimport org.yuzu.yuzu_emu.model.SettingsViewModel+import org.yuzu.yuzu_emu.utils.ViewUtils.updateMarginsclass SettingsFragment : Fragment() {private lateinit var presenter: SettingsFragmentPresenter@@ -125,18 +125,10 @@ class SettingsFragment : Fragment() {val leftInsets = barInsets.left + cutoutInsets.leftval rightInsets = barInsets.right + cutoutInsets.right- val mlpSettingsList = binding.listSettings.layoutParams as MarginLayoutParams- mlpSettingsList.leftMargin = leftInsets- mlpSettingsList.rightMargin = rightInsets- binding.listSettings.layoutParams = mlpSettingsList- binding.listSettings.updatePadding(- bottom = barInsets.bottom- )-- val mlpAppBar = binding.appbarSettings.layoutParams as MarginLayoutParams- mlpAppBar.leftMargin = leftInsets- mlpAppBar.rightMargin = rightInsets- binding.appbarSettings.layoutParams = mlpAppBar+ binding.listSettings.updateMargins(left = leftInsets, right = rightInsets)+ binding.listSettings.updatePadding(bottom = barInsets.bottom)++ binding.appbarSettings.updateMargins(left = leftInsets, right = rightInsets)windowInsets}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.ktindex 5ab38ffdaf..ff4f0e5dfb 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt@@ -13,7 +13,6 @@ import android.os.Bundleimport android.view.LayoutInflaterimport android.view.Viewimport android.view.ViewGroup-import android.view.ViewGroup.MarginLayoutParamsimport android.widget.Toastimport androidx.core.view.ViewCompatimport androidx.core.view.WindowInsetsCompat@@ -26,6 +25,7 @@ import org.yuzu.yuzu_emu.BuildConfigimport org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.databinding.FragmentAboutBindingimport org.yuzu.yuzu_emu.model.HomeViewModel+import org.yuzu.yuzu_emu.utils.ViewUtils.updateMarginsclass AboutFragment : Fragment() {private var _binding: FragmentAboutBinding? = null@@ -114,15 +114,8 @@ class AboutFragment : Fragment() {val leftInsets = barInsets.left + cutoutInsets.leftval rightInsets = barInsets.right + cutoutInsets.right- val mlpToolbar = binding.toolbarAbout.layoutParams as MarginLayoutParams- mlpToolbar.leftMargin = leftInsets- mlpToolbar.rightMargin = rightInsets- binding.toolbarAbout.layoutParams = mlpToolbar-- val mlpScrollAbout = binding.scrollAbout.layoutParams as MarginLayoutParams- mlpScrollAbout.leftMargin = leftInsets- mlpScrollAbout.rightMargin = rightInsets- binding.scrollAbout.layoutParams = mlpScrollAbout+ binding.toolbarAbout.updateMargins(left = leftInsets, right = rightInsets)+ binding.scrollAbout.updateMargins(left = leftInsets, right = rightInsets)binding.contentAbout.updatePadding(bottom = barInsets.bottom)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.ktindex adb65812c7..f5647fa955 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt@@ -31,6 +31,7 @@ import org.yuzu.yuzu_emu.model.AddonViewModelimport org.yuzu.yuzu_emu.model.HomeViewModelimport org.yuzu.yuzu_emu.utils.AddonUtilimport org.yuzu.yuzu_emu.utils.FileUtil.copyFilesTo+import org.yuzu.yuzu_emu.utils.ViewUtils.updateMarginsimport java.io.Fileclass AddonsFragment : Fragment() {@@ -202,27 +203,19 @@ class AddonsFragment : Fragment() {val leftInsets = barInsets.left + cutoutInsets.leftval rightInsets = barInsets.right + cutoutInsets.right- val mlpToolbar = binding.toolbarAddons.layoutParams as ViewGroup.MarginLayoutParams- mlpToolbar.leftMargin = leftInsets- mlpToolbar.rightMargin = rightInsets- binding.toolbarAddons.layoutParams = mlpToolbar-- val mlpAddonsList = binding.listAddons.layoutParams as ViewGroup.MarginLayoutParams- mlpAddonsList.leftMargin = leftInsets- mlpAddonsList.rightMargin = rightInsets- binding.listAddons.layoutParams = mlpAddonsList+ binding.toolbarAddons.updateMargins(left = leftInsets, right = rightInsets)+ binding.listAddons.updateMargins(left = leftInsets, right = rightInsets)binding.listAddons.updatePadding(bottom = barInsets.bottom +resources.getDimensionPixelSize(R.dimen.spacing_bottom_list_fab))val fabSpacing = resources.getDimensionPixelSize(R.dimen.spacing_fab)- val mlpFab =- binding.buttonInstall.layoutParams as ViewGroup.MarginLayoutParams- mlpFab.leftMargin = leftInsets + fabSpacing- mlpFab.rightMargin = rightInsets + fabSpacing- mlpFab.bottomMargin = barInsets.bottom + fabSpacing- binding.buttonInstall.layoutParams = mlpFab+ binding.buttonInstall.updateMargins(+ left = leftInsets + fabSpacing,+ right = rightInsets + fabSpacing,+ bottom = barInsets.bottom + fabSpacing+ )windowInsets}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AppletLauncherFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AppletLauncherFragment.ktindex 1f66b440d2..73ca404841 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AppletLauncherFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AppletLauncherFragment.kt@@ -21,6 +21,7 @@ import org.yuzu.yuzu_emu.databinding.FragmentAppletLauncherBindingimport org.yuzu.yuzu_emu.model.Appletimport org.yuzu.yuzu_emu.model.AppletInfoimport org.yuzu.yuzu_emu.model.HomeViewModel+import org.yuzu.yuzu_emu.utils.ViewUtils.updateMarginsclass AppletLauncherFragment : Fragment() {private var _binding: FragmentAppletLauncherBinding? = null@@ -95,16 +96,8 @@ class AppletLauncherFragment : Fragment() {val leftInsets = barInsets.left + cutoutInsets.leftval rightInsets = barInsets.right + cutoutInsets.right- val mlpAppBar = binding.toolbarApplets.layoutParams as ViewGroup.MarginLayoutParams- mlpAppBar.leftMargin = leftInsets- mlpAppBar.rightMargin = rightInsets- binding.toolbarApplets.layoutParams = mlpAppBar-- val mlpListApplets =- binding.listApplets.layoutParams as ViewGroup.MarginLayoutParams- mlpListApplets.leftMargin = leftInsets- mlpListApplets.rightMargin = rightInsets- binding.listApplets.layoutParams = mlpListApplets+ binding.toolbarApplets.updateMargins(left = leftInsets, right = rightInsets)+ binding.listApplets.updateMargins(left = leftInsets, right = rightInsets)binding.listApplets.updatePadding(bottom = barInsets.bottom)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.ktindex bf017cd7c0..41cff46c17 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.kt@@ -34,6 +34,7 @@ import org.yuzu.yuzu_emu.model.HomeViewModelimport org.yuzu.yuzu_emu.utils.FileUtilimport org.yuzu.yuzu_emu.utils.GpuDriverHelperimport org.yuzu.yuzu_emu.utils.NativeConfig+import org.yuzu.yuzu_emu.utils.ViewUtils.updateMarginsimport java.io.Fileimport java.io.IOException@@ -141,23 +142,15 @@ class DriverManagerFragment : Fragment() {val leftInsets = barInsets.left + cutoutInsets.leftval rightInsets = barInsets.right + cutoutInsets.right- val mlpAppBar = binding.toolbarDrivers.layoutParams as ViewGroup.MarginLayoutParams- mlpAppBar.leftMargin = leftInsets- mlpAppBar.rightMargin = rightInsets- binding.toolbarDrivers.layoutParams = mlpAppBar-- val mlplistDrivers = binding.listDrivers.layoutParams as ViewGroup.MarginLayoutParams- mlplistDrivers.leftMargin = leftInsets- mlplistDrivers.rightMargin = rightInsets- binding.listDrivers.layoutParams = mlplistDrivers+ binding.toolbarDrivers.updateMargins(left = leftInsets, right = rightInsets)+ binding.listDrivers.updateMargins(left = leftInsets, right = rightInsets)val fabSpacing = resources.getDimensionPixelSize(R.dimen.spacing_fab)- val mlpFab =- binding.buttonInstall.layoutParams as ViewGroup.MarginLayoutParams- mlpFab.leftMargin = leftInsets + fabSpacing- mlpFab.rightMargin = rightInsets + fabSpacing- mlpFab.bottomMargin = barInsets.bottom + fabSpacing- binding.buttonInstall.layoutParams = mlpFab+ binding.buttonInstall.updateMargins(+ left = leftInsets + fabSpacing,+ right = rightInsets + fabSpacing,+ bottom = barInsets.bottom + fabSpacing+ )binding.listDrivers.updatePadding(bottom = barInsets.bottom +diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EarlyAccessFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EarlyAccessFragment.ktindex dbc16da4af..0534b68ce6 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EarlyAccessFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EarlyAccessFragment.kt@@ -19,6 +19,7 @@ import com.google.android.material.transition.MaterialSharedAxisimport org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.databinding.FragmentEarlyAccessBindingimport org.yuzu.yuzu_emu.model.HomeViewModel+import org.yuzu.yuzu_emu.utils.ViewUtils.updateMarginsclass EarlyAccessFragment : Fragment() {private var _binding: FragmentEarlyAccessBinding? = null@@ -73,10 +74,7 @@ class EarlyAccessFragment : Fragment() {val leftInsets = barInsets.left + cutoutInsets.leftval rightInsets = barInsets.right + cutoutInsets.right- val mlpAppBar = binding.appbarEa.layoutParams as ViewGroup.MarginLayoutParams- mlpAppBar.leftMargin = leftInsets- mlpAppBar.rightMargin = rightInsets- binding.appbarEa.layoutParams = mlpAppBar+ binding.appbarEa.updateMargins(left = leftInsets, right = rightInsets)binding.scrollEa.updatePadding(left = leftInsets,diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameFoldersFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameFoldersFragment.ktindex 341a37fdb2..5c558b1a50 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameFoldersFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameFoldersFragment.kt@@ -26,6 +26,7 @@ import org.yuzu.yuzu_emu.databinding.FragmentFoldersBindingimport org.yuzu.yuzu_emu.model.GamesViewModelimport org.yuzu.yuzu_emu.model.HomeViewModelimport org.yuzu.yuzu_emu.ui.main.MainActivity+import org.yuzu.yuzu_emu.utils.ViewUtils.updateMarginsclass GameFoldersFragment : Fragment() {private var _binding: FragmentFoldersBinding? = null@@ -100,23 +101,16 @@ class GameFoldersFragment : Fragment() {val leftInsets = barInsets.left + cutoutInsets.leftval rightInsets = barInsets.right + cutoutInsets.right- val mlpToolbar = binding.toolbarFolders.layoutParams as ViewGroup.MarginLayoutParams- mlpToolbar.leftMargin = leftInsets- mlpToolbar.rightMargin = rightInsets- binding.toolbarFolders.layoutParams = mlpToolbar+ binding.toolbarFolders.updateMargins(left = leftInsets, right = rightInsets)val fabSpacing = resources.getDimensionPixelSize(R.dimen.spacing_fab)- val mlpFab =- binding.buttonAdd.layoutParams as ViewGroup.MarginLayoutParams- mlpFab.leftMargin = leftInsets + fabSpacing- mlpFab.rightMargin = rightInsets + fabSpacing- mlpFab.bottomMargin = barInsets.bottom + fabSpacing- binding.buttonAdd.layoutParams = mlpFab-- val mlpListFolders = binding.listFolders.layoutParams as ViewGroup.MarginLayoutParams- mlpListFolders.leftMargin = leftInsets- mlpListFolders.rightMargin = rightInsets- binding.listFolders.layoutParams = mlpListFolders+ binding.buttonAdd.updateMargins(+ left = leftInsets + fabSpacing,+ right = rightInsets + fabSpacing,+ bottom = barInsets.bottom + fabSpacing+ )++ binding.listFolders.updateMargins(left = leftInsets, right = rightInsets)binding.listFolders.updatePadding(bottom = barInsets.bottom +diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameInfoFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameInfoFragment.ktindex 5aa3f453fa..dbd56e84f1 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameInfoFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameInfoFragment.kt@@ -27,6 +27,7 @@ import org.yuzu.yuzu_emu.databinding.FragmentGameInfoBindingimport org.yuzu.yuzu_emu.model.GameVerificationResultimport org.yuzu.yuzu_emu.model.HomeViewModelimport org.yuzu.yuzu_emu.utils.GameMetadata+import org.yuzu.yuzu_emu.utils.ViewUtils.updateMarginsclass GameInfoFragment : Fragment() {private var _binding: FragmentGameInfoBinding? = null@@ -122,11 +123,13 @@ class GameInfoFragment : Fragment() {titleId = R.string.verify_success,descriptionId = R.string.operation_completed_successfully)+GameVerificationResult.Failed ->MessageDialogFragment.newInstance(titleId = R.string.verify_failure,descriptionId = R.string.verify_failure_description)+GameVerificationResult.NotImplemented ->MessageDialogFragment.newInstance(titleId = R.string.verify_no_result,@@ -165,15 +168,8 @@ class GameInfoFragment : Fragment() {val leftInsets = barInsets.left + cutoutInsets.leftval rightInsets = barInsets.right + cutoutInsets.right- val mlpToolbar = binding.toolbarInfo.layoutParams as ViewGroup.MarginLayoutParams- mlpToolbar.leftMargin = leftInsets- mlpToolbar.rightMargin = rightInsets- binding.toolbarInfo.layoutParams = mlpToolbar-- val mlpScrollAbout = binding.scrollInfo.layoutParams as ViewGroup.MarginLayoutParams- mlpScrollAbout.leftMargin = leftInsets- mlpScrollAbout.rightMargin = rightInsets- binding.scrollInfo.layoutParams = mlpScrollAbout+ binding.toolbarInfo.updateMargins(left = leftInsets, right = rightInsets)+ binding.scrollInfo.updateMargins(left = leftInsets, right = rightInsets)binding.contentInfo.updatePadding(bottom = barInsets.bottom)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.ktindex 582df01335..d14b2c634a 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt@@ -46,6 +46,7 @@ import org.yuzu.yuzu_emu.utils.FileUtilimport org.yuzu.yuzu_emu.utils.GameIconUtilsimport org.yuzu.yuzu_emu.utils.GpuDriverHelperimport org.yuzu.yuzu_emu.utils.MemoryUtil+import org.yuzu.yuzu_emu.utils.ViewUtils.updateMarginsimport java.io.BufferedOutputStreamimport java.io.File@@ -320,46 +321,25 @@ class GamePropertiesFragment : Fragment() {val smallLayout = resources.getBoolean(R.bool.small_layout)if (smallLayout) {- val mlpListAll =- binding.listAll.layoutParams as ViewGroup.MarginLayoutParams- mlpListAll.leftMargin = leftInsets- mlpListAll.rightMargin = rightInsets- binding.listAll.layoutParams = mlpListAll+ binding.listAll.updateMargins(left = leftInsets, right = rightInsets)} else {if (ViewCompat.getLayoutDirection(binding.root) ==ViewCompat.LAYOUT_DIRECTION_LTR) {- val mlpListAll =- binding.listAll.layoutParams as ViewGroup.MarginLayoutParams- mlpListAll.rightMargin = rightInsets- binding.listAll.layoutParams = mlpListAll-- val mlpIconLayout =- binding.iconLayout!!.layoutParams as ViewGroup.MarginLayoutParams- mlpIconLayout.topMargin = barInsets.top- mlpIconLayout.leftMargin = leftInsets- binding.iconLayout!!.layoutParams = mlpIconLayout+ binding.listAll.updateMargins(right = rightInsets)+ binding.iconLayout!!.updateMargins(top = barInsets.top, left = leftInsets)} else {- val mlpListAll =- binding.listAll.layoutParams as ViewGroup.MarginLayoutParams- mlpListAll.leftMargin = leftInsets- binding.listAll.layoutParams = mlpListAll-- val mlpIconLayout =- binding.iconLayout!!.layoutParams as ViewGroup.MarginLayoutParams- mlpIconLayout.topMargin = barInsets.top- mlpIconLayout.rightMargin = rightInsets- binding.iconLayout!!.layoutParams = mlpIconLayout+ binding.listAll.updateMargins(left = leftInsets)+ binding.iconLayout!!.updateMargins(top = barInsets.top, right = rightInsets)}}val fabSpacing = resources.getDimensionPixelSize(R.dimen.spacing_fab)- val mlpFab =- binding.buttonStart.layoutParams as ViewGroup.MarginLayoutParams- mlpFab.leftMargin = leftInsets + fabSpacing- mlpFab.rightMargin = rightInsets + fabSpacing- mlpFab.bottomMargin = barInsets.bottom + fabSpacing- binding.buttonStart.layoutParams = mlpFab+ binding.buttonStart.updateMargins(+ left = leftInsets + fabSpacing,+ right = rightInsets + fabSpacing,+ bottom = barInsets.bottom + fabSpacing+ )binding.layoutAll.updatePadding(top = barInsets.top,diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.ktindex 1f3578b22b..87e130d3e0 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt@@ -12,7 +12,6 @@ import android.provider.DocumentsContractimport android.view.LayoutInflaterimport android.view.Viewimport android.view.ViewGroup-import android.view.ViewGroup.MarginLayoutParamsimport android.widget.Toastimport androidx.appcompat.app.AppCompatActivityimport androidx.core.app.ActivityCompat@@ -44,6 +43,7 @@ import org.yuzu.yuzu_emu.ui.main.MainActivityimport org.yuzu.yuzu_emu.utils.FileUtilimport org.yuzu.yuzu_emu.utils.GpuDriverHelperimport org.yuzu.yuzu_emu.utils.Log+import org.yuzu.yuzu_emu.utils.ViewUtils.updateMarginsclass HomeSettingsFragment : Fragment() {private var _binding: FragmentHomeSettingsBinding? = null@@ -408,10 +408,7 @@ class HomeSettingsFragment : Fragment() {bottom = barInsets.bottom)- val mlpScrollSettings = binding.scrollViewSettings.layoutParams as MarginLayoutParams- mlpScrollSettings.leftMargin = leftInsets- mlpScrollSettings.rightMargin = rightInsets- binding.scrollViewSettings.layoutParams = mlpScrollSettings+ binding.scrollViewSettings.updateMargins(left = leftInsets, right = rightInsets)binding.linearLayoutSettings.updatePadding(bottom = spacingNavigation)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/InstallableFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/InstallableFragment.ktindex 7df8e6bf46..63112dc6f0 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/InstallableFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/InstallableFragment.kt@@ -34,6 +34,7 @@ import org.yuzu.yuzu_emu.model.TaskStateimport org.yuzu.yuzu_emu.ui.main.MainActivityimport org.yuzu.yuzu_emu.utils.DirectoryInitializationimport org.yuzu.yuzu_emu.utils.FileUtil+import org.yuzu.yuzu_emu.utils.ViewUtils.updateMarginsimport java.io.BufferedOutputStreamimport java.io.Fileimport java.math.BigInteger@@ -172,16 +173,8 @@ class InstallableFragment : Fragment() {val leftInsets = barInsets.left + cutoutInsets.leftval rightInsets = barInsets.right + cutoutInsets.right- val mlpAppBar = binding.toolbarInstallables.layoutParams as ViewGroup.MarginLayoutParams- mlpAppBar.leftMargin = leftInsets- mlpAppBar.rightMargin = rightInsets- binding.toolbarInstallables.layoutParams = mlpAppBar-- val mlpScrollAbout =- binding.listInstallables.layoutParams as ViewGroup.MarginLayoutParams- mlpScrollAbout.leftMargin = leftInsets- mlpScrollAbout.rightMargin = rightInsets- binding.listInstallables.layoutParams = mlpScrollAbout+ binding.toolbarInstallables.updateMargins(left = leftInsets, right = rightInsets)+ binding.listInstallables.updateMargins(left = leftInsets, right = rightInsets)binding.listInstallables.updatePadding(bottom = barInsets.bottom)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/LicensesFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/LicensesFragment.ktindex b6e9129f7d..f17f621f85 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/LicensesFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/LicensesFragment.kt@@ -7,7 +7,6 @@ import android.os.Bundleimport android.view.LayoutInflaterimport android.view.Viewimport android.view.ViewGroup-import android.view.ViewGroup.MarginLayoutParamsimport androidx.appcompat.app.AppCompatActivityimport androidx.core.view.ViewCompatimport androidx.core.view.WindowInsetsCompat@@ -22,6 +21,7 @@ import org.yuzu.yuzu_emu.adapters.LicenseAdapterimport org.yuzu.yuzu_emu.databinding.FragmentLicensesBindingimport org.yuzu.yuzu_emu.model.HomeViewModelimport org.yuzu.yuzu_emu.model.License+import org.yuzu.yuzu_emu.utils.ViewUtils.updateMarginsclass LicensesFragment : Fragment() {private var _binding: FragmentLicensesBinding? = null@@ -122,15 +122,8 @@ class LicensesFragment : Fragment() {val leftInsets = barInsets.left + cutoutInsets.leftval rightInsets = barInsets.right + cutoutInsets.right- val mlpAppBar = binding.appbarLicenses.layoutParams as MarginLayoutParams- mlpAppBar.leftMargin = leftInsets- mlpAppBar.rightMargin = rightInsets- binding.appbarLicenses.layoutParams = mlpAppBar-- val mlpScrollAbout = binding.listLicenses.layoutParams as MarginLayoutParams- mlpScrollAbout.leftMargin = leftInsets- mlpScrollAbout.rightMargin = rightInsets- binding.listLicenses.layoutParams = mlpScrollAbout+ binding.appbarLicenses.updateMargins(left = leftInsets, right = rightInsets)+ binding.listLicenses.updateMargins(left = leftInsets, right = rightInsets)binding.listLicenses.updatePadding(bottom = barInsets.bottom)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SettingsSearchFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SettingsSearchFragment.ktindex f95d545bff..a135b80b44 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SettingsSearchFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SettingsSearchFragment.kt@@ -29,6 +29,7 @@ import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItemimport org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapterimport org.yuzu.yuzu_emu.model.SettingsViewModelimport org.yuzu.yuzu_emu.utils.NativeConfig+import org.yuzu.yuzu_emu.utils.ViewUtils.updateMarginsclass SettingsSearchFragment : Fragment() {private var _binding: FragmentSettingsSearchBinding? = null@@ -174,15 +175,14 @@ class SettingsSearchFragment : Fragment() {bottom = barInsets.bottom)- val mlpSettingsList = binding.settingsList.layoutParams as ViewGroup.MarginLayoutParams- mlpSettingsList.leftMargin = leftInsets + sideMargin- mlpSettingsList.rightMargin = rightInsets + sideMargin- binding.settingsList.layoutParams = mlpSettingsList-- val mlpDivider = binding.divider.layoutParams as ViewGroup.MarginLayoutParams- mlpDivider.leftMargin = leftInsets + sideMargin- mlpDivider.rightMargin = rightInsets + sideMargin- binding.divider.layoutParams = mlpDivider+ binding.settingsList.updateMargins(+ left = leftInsets + sideMargin,+ right = rightInsets + sideMargin+ )+ binding.divider.updateMargins(+ left = leftInsets + sideMargin,+ right = rightInsets + sideMargin+ )windowInsets}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.ktindex 54380323e3..23ca49b53d 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt@@ -8,7 +8,6 @@ import android.os.Bundleimport android.view.LayoutInflaterimport android.view.Viewimport android.view.ViewGroup-import android.view.ViewGroup.MarginLayoutParamsimport androidx.appcompat.app.AppCompatActivityimport androidx.core.view.ViewCompatimport androidx.core.view.WindowInsetsCompat@@ -27,6 +26,7 @@ import org.yuzu.yuzu_emu.databinding.FragmentGamesBindingimport org.yuzu.yuzu_emu.layout.AutofitGridLayoutManagerimport org.yuzu.yuzu_emu.model.GamesViewModelimport org.yuzu.yuzu_emu.model.HomeViewModel+import org.yuzu.yuzu_emu.utils.ViewUtils.updateMarginsclass GamesFragment : Fragment() {private var _binding: FragmentGamesBinding? = null@@ -169,15 +169,16 @@ class GamesFragment : Fragment() {val leftInsets = barInsets.left + cutoutInsets.leftval rightInsets = barInsets.right + cutoutInsets.right- val mlpSwipe = binding.swipeRefresh.layoutParams as MarginLayoutParams+ val left: Int+ val right: Intif (ViewCompat.getLayoutDirection(view) == ViewCompat.LAYOUT_DIRECTION_LTR) {- mlpSwipe.leftMargin = leftInsets + spacingNavigationRail- mlpSwipe.rightMargin = rightInsets+ left = leftInsets + spacingNavigationRail+ right = rightInsets} else {- mlpSwipe.leftMargin = leftInsets- mlpSwipe.rightMargin = rightInsets + spacingNavigationRail+ left = leftInsets+ right = rightInsets + spacingNavigationRail}- binding.swipeRefresh.layoutParams = mlpSwipe+ binding.swipeRefresh.updateMargins(left = left, right = right)binding.noticeText.updatePadding(bottom = spacingNavigation)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ViewUtils.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ViewUtils.ktindex f9a3e4126b..ffbfa93377 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ViewUtils.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ViewUtils.kt@@ -4,6 +4,7 @@package org.yuzu.yuzu_emu.utilsimport android.view.View+import android.view.ViewGroupobject ViewUtils {fun showView(view: View, length: Long = 300) {@@ -32,4 +33,28 @@ object ViewUtils {view.visibility = View.INVISIBLE}.start()}++ fun View.updateMargins(+ left: Int = -1,+ top: Int = -1,+ right: Int = -1,+ bottom: Int = -1+ ) {+ val layoutParams = this.layoutParams as ViewGroup.MarginLayoutParams+ layoutParams.apply {+ if (left != -1) {+ leftMargin = left+ }+ if (top != -1) {+ topMargin = top+ }+ if (right != -1) {+ rightMargin = right+ }+ if (bottom != -1) {+ bottomMargin = bottom+ }+ }+ this.layoutParams = layoutParams+ }}