Merge pull request #11060 from t895/dividers

Android: Use material dividers
dolphin-emu · Sep 14, 2022 · 09c07d4 · 09c07d4
2 parents 450b77a + 33048d0
commit 09c07d4
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 190 deletions.
diff --git a/...oid/app/src/main/java/org/dolphinemu/dolphinemu/features/cheats/ui/CheatListFragment.java b/...oid/app/src/main/java/org/dolphinemu/dolphinemu/features/cheats/ui/CheatListFragment.java
@@ -14,9 +14,10 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.divider.MaterialDividerItemDecoration;
+
 import org.dolphinemu.dolphinemu.R;
 import org.dolphinemu.dolphinemu.features.cheats.model.CheatsViewModel;
-import org.dolphinemu.dolphinemu.ui.DividerItemDecoration;
 
 public class CheatListFragment extends Fragment
 {
@@ -38,6 +39,10 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
     recyclerView.setAdapter(new CheatsAdapter(activity, viewModel));
     recyclerView.setLayoutManager(new LinearLayoutManager(activity));
-    recyclerView.addItemDecoration(new DividerItemDecoration(activity, null));
+
+    MaterialDividerItemDecoration divider =
+            new MaterialDividerItemDecoration(requireActivity(), LinearLayoutManager.VERTICAL);
+    divider.setLastItemDecorated(false);
+    recyclerView.addItemDecoration(divider);
   }
 }
diff --git a/...id/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java b/...id/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java
@@ -14,10 +14,11 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.divider.MaterialDividerItemDecoration;
+
 import org.dolphinemu.dolphinemu.R;
 import org.dolphinemu.dolphinemu.features.settings.model.Settings;
 import org.dolphinemu.dolphinemu.features.settings.model.view.SettingsItem;
-import org.dolphinemu.dolphinemu.ui.DividerItemDecoration;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -136,7 +137,11 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
     recyclerView.setAdapter(mAdapter);
     recyclerView.setLayoutManager(manager);
-    recyclerView.addItemDecoration(new DividerItemDecoration(requireActivity(), null));
+
+    MaterialDividerItemDecoration divider =
+            new MaterialDividerItemDecoration(requireActivity(), LinearLayoutManager.VERTICAL);
+    divider.setLastItemDecorated(false);
+    recyclerView.addItemDecoration(divider);
 
     SettingsActivityView activity = (SettingsActivityView) getActivity();
     mPresenter.onViewCreated(menuTag, activity.getSettings());

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/DividerItemDecoration.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/DividerItemDecoration.java
diff --git a/Source/Android/app/src/main/res/layout-land/activity_user_data.xml b/Source/Android/app/src/main/res/layout-land/activity_user_data.xml
@@ -50,7 +50,7 @@
                 app:layout_constraintWidth_max="400dp"
                 app:layout_constraintEnd_toStartOf="@id/divider"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@id/divider"
+                app:layout_constraintTop_toTopOf="parent"
                 tools:text="@string/user_data_new_location" />
 
             <TextView
@@ -84,15 +84,14 @@
                 app:barrierDirection="end"
                 app:constraint_referenced_ids="text_type,text_path,text_android_11" />
 
-            <View
+            <com.google.android.material.divider.MaterialDivider
                 android:id="@+id/divider"
                 android:layout_width="1dp"
                 android:layout_height="0dp"
-                android:background="#1F000000"
                 android:layout_marginStart="24dp"
                 android:layout_marginEnd="24dp"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintTop_toTopOf="@id/text_type"
+                app:layout_constraintBottom_toBottomOf="@id/text_android_11"
                 app:layout_constraintStart_toEndOf="@id/barrier_text"
                 app:layout_constraintEnd_toStartOf="@id/barrier_buttons" />
 

diff --git a/Source/Android/app/src/main/res/layout-w680dp-land/activity_convert.xml b/Source/Android/app/src/main/res/layout-w680dp-land/activity_convert.xml
@@ -53,11 +53,10 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/divider" />
 
-            <View
+            <com.google.android.material.divider.MaterialDivider
                 android:id="@+id/divider"
                 android:layout_width="1dp"
                 android:layout_height="0dp"
-                android:background="#1F000000"
                 android:layout_marginStart="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"

diff --git a/Source/Android/app/src/main/res/layout/activity_convert.xml b/Source/Android/app/src/main/res/layout/activity_convert.xml
@@ -51,11 +51,10 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toTopOf="@id/divider" />
 
-            <View
+            <com.google.android.material.divider.MaterialDivider
                 android:id="@+id/divider"
                 android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:background="#1F000000"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="24dp"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"

diff --git a/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml b/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml
@@ -52,11 +52,10 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toTopOf="@id/divider" />
 
-            <View
+            <com.google.android.material.divider.MaterialDivider
                 android:id="@+id/divider"
                 android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:background="#1F000000"
+                android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/spacing_large"
                 android:layout_marginVertical="@dimen/spacing_small"
                 app:layout_constraintStart_toStartOf="parent"

diff --git a/Source/Android/app/src/main/res/layout/dialog_game_details.xml b/Source/Android/app/src/main/res/layout/dialog_game_details.xml
@@ -44,11 +44,10 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/text_description" />
 
-        <View
+        <com.google.android.material.divider.MaterialDivider
             android:id="@+id/divider_1"
             android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:background="#1F000000"
+            android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -145,11 +144,10 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBaseline_toBaselineOf="@id/label_revision" />
 
-        <View
+        <com.google.android.material.divider.MaterialDivider
             android:id="@+id/divider_2"
             android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:background="#1F000000"
+            android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

diff --git a/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml b/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml
@@ -110,13 +110,12 @@
 
     </ScrollView>
 
-    <View
-        android:id="@+id/divider"
+    <com.google.android.material.divider.MaterialDivider
+        android:id="@+id/divider_2"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?attr/colorOnSurfaceVariant"
+        android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
-        android:layout_marginBottom="16dp"/>
+        android:layout_marginBottom="16dp" />
 
     <Button
         android:id="@+id/menu_exit"

diff --git a/Source/Android/app/src/main/res/values/styles.xml b/Source/Android/app/src/main/res/values/styles.xml
@@ -58,4 +58,8 @@
         <item name="tickVisible">false</item>
         <item name="labelBehavior">gone</item>
     </style>
+
+    <style name="DolphinDivider" parent="Widget.Material3.MaterialDivider">
+        <item name="dividerColor">?attr/colorSurfaceVariant</item>
+    </style>
 </resources>
diff --git a/Source/Android/app/src/main/res/values/themes.xml b/Source/Android/app/src/main/res/values/themes.xml
@@ -54,6 +54,7 @@
         <item name="materialAlertDialogTheme">@style/DolphinMaterialDialog</item>
         <item name="popupTheme">@style/DolphinPopup</item>
         <item name="sliderStyle">@style/DolphinSlider</item>
+        <item name="materialDividerStyle">@style/DolphinDivider</item>
     </style>
 
     <!-- Trick for API >= 27 specific changes -->