diff options
| author | 2023-05-16 15:18:10 -0400 | |
|---|---|---|
| committer | 2023-06-03 00:06:02 -0700 | |
| commit | 8d3288b6ff7067cde2b8199c941454638eb40f18 (patch) | |
| tree | cbdd02a874235ec9a1bba5aa78fa77ebbd95eca7 /src/android | |
| parent | android: Use cutout insets on setup fragment (diff) | |
| download | yuzu-8d3288b6ff7067cde2b8199c941454638eb40f18.tar.gz yuzu-8d3288b6ff7067cde2b8199c941454638eb40f18.tar.xz yuzu-8d3288b6ff7067cde2b8199c941454638eb40f18.zip | |
android: Fix navigation rail animation in rtl layout
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt | 18 |
1 files changed, 14 insertions, 4 deletions
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.kt index 8e3422922..961b5b822 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 | |||
| @@ -164,9 +164,15 @@ class MainActivity : AppCompatActivity(), ThemeProvider { | |||
| 164 | binding.navigationView.height.toFloat() * 2 | 164 | binding.navigationView.height.toFloat() * 2 |
| 165 | translationY(0f) | 165 | translationY(0f) |
| 166 | } else { | 166 | } else { |
| 167 | binding.navigationView.translationX = | 167 | if (ViewCompat.getLayoutDirection(binding.navigationView) == ViewCompat.LAYOUT_DIRECTION_LTR) { |
| 168 | binding.navigationView.width.toFloat() * -2 | 168 | binding.navigationView.translationX = |
| 169 | translationX(0f) | 169 | binding.navigationView.width.toFloat() * -2 |
| 170 | translationX(0f) | ||
| 171 | } else { | ||
| 172 | binding.navigationView.translationX = | ||
| 173 | binding.navigationView.width.toFloat() * 2 | ||
| 174 | translationX(0f) | ||
| 175 | } | ||
| 170 | } | 176 | } |
| 171 | } else { | 177 | } else { |
| 172 | duration = 300 | 178 | duration = 300 |
| @@ -175,7 +181,11 @@ class MainActivity : AppCompatActivity(), ThemeProvider { | |||
| 175 | if (smallLayout) { | 181 | if (smallLayout) { |
| 176 | translationY(binding.navigationView.height.toFloat() * 2) | 182 | translationY(binding.navigationView.height.toFloat() * 2) |
| 177 | } else { | 183 | } else { |
| 178 | translationX(binding.navigationView.width.toFloat() * -2) | 184 | if (ViewCompat.getLayoutDirection(binding.navigationView) == ViewCompat.LAYOUT_DIRECTION_LTR) { |
| 185 | translationX(binding.navigationView.width.toFloat() * -2) | ||
| 186 | } else { | ||
| 187 | translationX(binding.navigationView.width.toFloat() * 2) | ||
| 188 | } | ||
| 179 | } | 189 | } |
| 180 | } | 190 | } |
| 181 | }.withEndAction { | 191 | }.withEndAction { |