summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar liamwhite2023-10-29 19:46:41 -0400
committerGravatar GitHub2023-10-29 19:46:41 -0400
commit2d608cd62526a0dbde286c80e714d5b24725a8f9 (patch)
tree04f9f9784fc535785e454063bb8cd88d98ac7842 /src
parentMerge pull request #11904 from ameerj/gl_threaded_opts_on (diff)
parentandroid: Break home settings into grid with large screens (diff)
downloadyuzu-2d608cd62526a0dbde286c80e714d5b24725a8f9.tar.gz
yuzu-2d608cd62526a0dbde286c80e714d5b24725a8f9.tar.xz
yuzu-2d608cd62526a0dbde286c80e714d5b24725a8f9.zip
Merge pull request #11909 from t895/card-grid
android: Break home settings into grid with large screens
Diffstat (limited to 'src')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt5
-rw-r--r--src/android/app/src/main/res/layout/card_home_option.xml3
2 files changed, 5 insertions, 3 deletions
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.kt
index fd9785075..f273c880a 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
@@ -26,7 +26,7 @@ import androidx.fragment.app.Fragment
26import androidx.fragment.app.activityViewModels 26import androidx.fragment.app.activityViewModels
27import androidx.navigation.findNavController 27import androidx.navigation.findNavController
28import androidx.navigation.fragment.findNavController 28import androidx.navigation.fragment.findNavController
29import androidx.recyclerview.widget.LinearLayoutManager 29import androidx.recyclerview.widget.GridLayoutManager
30import com.google.android.material.transition.MaterialSharedAxis 30import com.google.android.material.transition.MaterialSharedAxis
31import org.yuzu.yuzu_emu.BuildConfig 31import org.yuzu.yuzu_emu.BuildConfig
32import org.yuzu.yuzu_emu.HomeNavigationDirections 32import org.yuzu.yuzu_emu.HomeNavigationDirections
@@ -186,7 +186,8 @@ class HomeSettingsFragment : Fragment() {
186 } 186 }
187 187
188 binding.homeSettingsList.apply { 188 binding.homeSettingsList.apply {
189 layoutManager = LinearLayoutManager(requireContext()) 189 layoutManager =
190 GridLayoutManager(requireContext(), resources.getInteger(R.integer.grid_columns))
190 adapter = HomeSettingAdapter( 191 adapter = HomeSettingAdapter(
191 requireActivity() as AppCompatActivity, 192 requireActivity() as AppCompatActivity,
192 viewLifecycleOwner, 193 viewLifecycleOwner,
diff --git a/src/android/app/src/main/res/layout/card_home_option.xml b/src/android/app/src/main/res/layout/card_home_option.xml
index f9f1d89fb..6e8a232f9 100644
--- a/src/android/app/src/main/res/layout/card_home_option.xml
+++ b/src/android/app/src/main/res/layout/card_home_option.xml
@@ -16,7 +16,8 @@
16 <LinearLayout 16 <LinearLayout
17 android:id="@+id/option_layout" 17 android:id="@+id/option_layout"
18 android:layout_width="match_parent" 18 android:layout_width="match_parent"
19 android:layout_height="wrap_content"> 19 android:layout_height="wrap_content"
20 android:layout_gravity="center_vertical">
20 21
21 <ImageView 22 <ImageView
22 android:id="@+id/option_icon" 23 android:id="@+id/option_icon"