Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

android: Allow search bar to scroll offscreen

Charles Lombardo1684d4905f11
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.kt
index 5c58dd255a..3ca529b200 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
@@ -125,6 +125,7 @@ class GamesFragment : Fragment() {
TransitionState.HIDING -> {
gamesViewModel.setSearchedGames(emptyList())
searchHidden()
+ binding.appBarSearch.setExpanded(true)
}
}
}
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 a334696449..e8284471a8 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
@@ -75,11 +75,9 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
setUpNavigation(navHostFragment.navController)
binding.statusBarShade.setBackgroundColor(
- ThemeHelper.getColorWithOpacity(
- MaterialColors.getColor(
- binding.root,
- R.attr.colorSurface
- ), ThemeHelper.SYSTEM_BAR_ALPHA
+ MaterialColors.getColor(
+ binding.root,
+ R.attr.colorSurface
)
)
diff --git a/src/android/app/src/main/res/layout/fragment_games.xml b/src/android/app/src/main/res/layout/fragment_games.xml
index 5cfe76de31..c4c3eacf4b 100644
--- a/src/android/app/src/main/res/layout/fragment_games.xml
+++ b/src/android/app/src/main/res/layout/fragment_games.xml
@@ -44,20 +44,14 @@
android:id="@+id/app_bar_search"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:fitsSystemWindows="true"
app:liftOnScrollTargetViewId="@id/grid_games">
- <FrameLayout
+ <com.google.android.material.search.SearchBar
+ android:id="@+id/search_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:fitsSystemWindows="true">
-
- <com.google.android.material.search.SearchBar
- android:id="@+id/search_bar"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:hint="@string/home_search_games" />
-
- </FrameLayout>
+ android:hint="@string/home_search_games" />
</com.google.android.material.appbar.AppBarLayout>