diff options
| author | 2023-04-23 19:43:09 -0400 | |
|---|---|---|
| committer | 2023-06-03 00:05:54 -0700 | |
| commit | 033adb9723b9e4c00ccbeda52d46a596d1faae89 (patch) | |
| tree | eedef97dd3e73c97a42ba62448e8ef3aef26fcd4 /src | |
| parent | android: Disable editing themes during emulation (diff) | |
| download | yuzu-033adb9723b9e4c00ccbeda52d46a596d1faae89.tar.gz yuzu-033adb9723b9e4c00ccbeda52d46a596d1faae89.tar.xz yuzu-033adb9723b9e4c00ccbeda52d46a596d1faae89.zip | |
android: Use navigation bar shade view for settings activity
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt | 14 | ||||
| -rw-r--r-- | src/android/app/src/main/res/layout/activity_settings.xml | 9 |
2 files changed, 20 insertions, 3 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt index e4bdcc991..a92fc1075 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt | |||
| @@ -8,6 +8,7 @@ import android.content.Intent | |||
| 8 | import android.os.Bundle | 8 | import android.os.Bundle |
| 9 | import android.view.Menu | 9 | import android.view.Menu |
| 10 | import android.view.View | 10 | import android.view.View |
| 11 | import android.view.ViewGroup | ||
| 11 | import android.widget.Toast | 12 | import android.widget.Toast |
| 12 | import androidx.activity.viewModels | 13 | import androidx.activity.viewModels |
| 13 | import androidx.appcompat.app.AppCompatActivity | 14 | import androidx.appcompat.app.AppCompatActivity |
| @@ -51,9 +52,11 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView { | |||
| 51 | setSupportActionBar(binding.toolbarSettings) | 52 | setSupportActionBar(binding.toolbarSettings) |
| 52 | supportActionBar!!.setDisplayHomeAsUpEnabled(true) | 53 | supportActionBar!!.setDisplayHomeAsUpEnabled(true) |
| 53 | 54 | ||
| 54 | ThemeHelper.setNavigationBarColor( | 55 | binding.navigationBarShade.setBackgroundColor( |
| 55 | this, | 56 | ThemeHelper.getColorWithOpacity( |
| 56 | MaterialColors.getColor(window.decorView, R.attr.colorSurface) | 57 | MaterialColors.getColor(binding.navigationBarShade, R.attr.colorSurface), |
| 58 | ThemeHelper.SYSTEM_BAR_ALPHA | ||
| 59 | ) | ||
| 57 | ) | 60 | ) |
| 58 | 61 | ||
| 59 | setInsets() | 62 | setInsets() |
| @@ -164,6 +167,11 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView { | |||
| 164 | val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()) | 167 | val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()) |
| 165 | view.updatePadding(left = insets.left, right = insets.right) | 168 | view.updatePadding(left = insets.left, right = insets.right) |
| 166 | InsetsHelper.insetAppBar(insets, binding.appbarSettings) | 169 | InsetsHelper.insetAppBar(insets, binding.appbarSettings) |
| 170 | |||
| 171 | val mlpShade = binding.navigationBarShade.layoutParams as ViewGroup.MarginLayoutParams | ||
| 172 | mlpShade.height = insets.bottom | ||
| 173 | binding.navigationBarShade.layoutParams = mlpShade | ||
| 174 | |||
| 167 | windowInsets | 175 | windowInsets |
| 168 | } | 176 | } |
| 169 | } | 177 | } |
diff --git a/src/android/app/src/main/res/layout/activity_settings.xml b/src/android/app/src/main/res/layout/activity_settings.xml index 2745599f4..b72aee03c 100644 --- a/src/android/app/src/main/res/layout/activity_settings.xml +++ b/src/android/app/src/main/res/layout/activity_settings.xml | |||
| @@ -26,4 +26,13 @@ | |||
| 26 | android:layout_height="match_parent" | 26 | android:layout_height="match_parent" |
| 27 | app:layout_behavior="@string/appbar_scrolling_view_behavior" /> | 27 | app:layout_behavior="@string/appbar_scrolling_view_behavior" /> |
| 28 | 28 | ||
| 29 | <View | ||
| 30 | android:id="@+id/navigation_bar_shade" | ||
| 31 | android:layout_width="match_parent" | ||
| 32 | android:layout_height="1px" | ||
| 33 | android:background="@android:color/transparent" | ||
| 34 | android:clickable="false" | ||
| 35 | android:focusable="false" | ||
| 36 | android:layout_gravity="bottom|center_horizontal" /> | ||
| 37 | |||
| 29 | </androidx.coordinatorlayout.widget.CoordinatorLayout> | 38 | </androidx.coordinatorlayout.widget.CoordinatorLayout> |