Merge pull request #11329 from t895/elevation-bar

Android: Use ElevationOverlay for app bar elevation color
dolphin-emu · Dec 10, 2022 · 932926a · 932926a
2 parents 54e01c6 + f2c71a7
commit 932926a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 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
@@ -7,6 +7,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.graphics.Insets;
@@ -16,7 +17,9 @@
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import com.google.android.material.color.MaterialColors;
 import com.google.android.material.divider.MaterialDividerItemDecoration;
+import com.google.android.material.elevation.ElevationOverlayProvider;
 
 import org.dolphinemu.dolphinemu.R;
 import org.dolphinemu.dolphinemu.databinding.FragmentCheatListBinding;
@@ -49,6 +52,13 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     divider.setLastItemDecorated(false);
     mBinding.cheatList.addItemDecoration(divider);
 
+    @ColorInt int color =
+            new ElevationOverlayProvider(mBinding.cheatsWarning.getContext()).compositeOverlay(
+                    MaterialColors.getColor(mBinding.cheatsWarning, R.attr.colorSurface),
+                    getResources().getDimensionPixelSize(R.dimen.elevated_app_bar));
+    mBinding.cheatsWarning.setBackgroundColor(color);
+    mBinding.gfxModsWarning.setBackgroundColor(color);
+
     setInsets();
   }
 

diff --git a/...ndroid/app/src/main/java/org/dolphinemu/dolphinemu/features/cheats/ui/CheatsActivity.java b/...ndroid/app/src/main/java/org/dolphinemu/dolphinemu/features/cheats/ui/CheatsActivity.java
@@ -24,6 +24,7 @@
 
 import com.google.android.material.color.MaterialColors;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.elevation.ElevationOverlayProvider;
 
 import org.dolphinemu.dolphinemu.R;
 import org.dolphinemu.dolphinemu.databinding.ActivityCheatsBinding;
@@ -112,7 +113,9 @@ protected void onCreate(Bundle savedInstanceState)
     setInsets();
 
     @ColorInt int color =
-            MaterialColors.getColor(mBinding.toolbarCheats, R.attr.colorSurfaceVariant);
+            new ElevationOverlayProvider(mBinding.toolbarCheats.getContext()).compositeOverlay(
+                    MaterialColors.getColor(mBinding.toolbarCheats, R.attr.colorSurface),
+                    getResources().getDimensionPixelSize(R.dimen.elevated_app_bar));
     mBinding.toolbarCheats.setBackgroundColor(color);
     ThemeHelper.setStatusBarColor(this, color);
   }

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ThemeHelper.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ThemeHelper.java
@@ -19,6 +19,7 @@
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.color.MaterialColors;
+import com.google.android.material.elevation.ElevationOverlayProvider;
 
 import org.dolphinemu.dolphinemu.R;
 import org.dolphinemu.dolphinemu.ui.main.ThemeProvider;
@@ -222,7 +223,10 @@ public static void enableScrollTint(AppCompatActivity activity, MaterialToolbar
     {
       if (-verticalOffset >= (layout.getTotalScrollRange() / 2))
       {
-        @ColorInt int color = MaterialColors.getColor(toolbar, R.attr.colorSurfaceVariant);
+        @ColorInt int color =
+                new ElevationOverlayProvider(appBarLayout.getContext()).compositeOverlay(
+                        MaterialColors.getColor(appBarLayout, R.attr.colorSurface),
+                        activity.getResources().getDimensionPixelSize(R.dimen.elevated_app_bar));
         toolbar.setBackgroundColor(color);
         setStatusBarColor(activity, color);
       }

diff --git a/Source/Android/app/src/main/res/layout/fragment_cheat_list.xml b/Source/Android/app/src/main/res/layout/fragment_cheat_list.xml
@@ -10,7 +10,7 @@
         android:name="org.dolphinemu.dolphinemu.features.cheats.ui.CheatsDisabledWarningFragment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/colorSurfaceVariant"
+        android:background="?attr/colorSurface"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -21,7 +21,7 @@
         android:name="org.dolphinemu.dolphinemu.features.cheats.ui.GraphicsModsDisabledWarningFragment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/colorSurfaceVariant"
+        android:background="?attr/colorSurface"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/cheats_warning"

diff --git a/Source/Android/app/src/main/res/values/dimens.xml b/Source/Android/app/src/main/res/values/dimens.xml
@@ -7,4 +7,6 @@
     <dimen name="spacing_fab">72dp</dimen>
     <dimen name="menu_width">256dp</dimen>
     <dimen name="card_width">135dp</dimen>
+
+    <dimen name="elevated_app_bar">3dp</dimen>
 </resources>