summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt5
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt10
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt4
-rw-r--r--src/android/gradle.properties1
4 files changed, 15 insertions, 5 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt
index ea3d47d82..b28750eee 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt
@@ -56,7 +56,10 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView {
if (InsetsHelper.getSystemGestureType(applicationContext) != InsetsHelper.GESTURE_NAVIGATION) {
binding.navigationBarShade.setBackgroundColor(
ThemeHelper.getColorWithOpacity(
- MaterialColors.getColor(binding.navigationBarShade, R.attr.colorSurface),
+ MaterialColors.getColor(
+ binding.navigationBarShade,
+ com.google.android.material.R.attr.colorSurface
+ ),
ThemeHelper.SYSTEM_BAR_ALPHA
)
)
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 0b4ae8744..07d0cd3d8 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
@@ -64,10 +64,16 @@ class GamesFragment : Fragment() {
// Set theme color to the refresh animation's background
binding.swipeRefresh.setProgressBackgroundColorSchemeColor(
- MaterialColors.getColor(binding.swipeRefresh, R.attr.colorPrimary)
+ MaterialColors.getColor(
+ binding.swipeRefresh,
+ com.google.android.material.R.attr.colorPrimary
+ )
)
binding.swipeRefresh.setColorSchemeColors(
- MaterialColors.getColor(binding.swipeRefresh, R.attr.colorOnPrimary)
+ MaterialColors.getColor(
+ binding.swipeRefresh,
+ com.google.android.material.R.attr.colorOnPrimary
+ )
)
// Watch for when we get updates to any of our games lists
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 8edf01fea..b2499168e 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
@@ -72,7 +72,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
ThemeHelper.getColorWithOpacity(
MaterialColors.getColor(
binding.root,
- R.attr.colorSurface
+ com.google.android.material.R.attr.colorSurface
),
ThemeHelper.SYSTEM_BAR_ALPHA
)
@@ -82,7 +82,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
ThemeHelper.getColorWithOpacity(
MaterialColors.getColor(
binding.root,
- R.attr.colorSurface
+ com.google.android.material.R.attr.colorSurface
),
ThemeHelper.SYSTEM_BAR_ALPHA
)
diff --git a/src/android/gradle.properties b/src/android/gradle.properties
index 885e2af85..82b01e7d3 100644
--- a/src/android/gradle.properties
+++ b/src/android/gradle.properties
@@ -11,3 +11,4 @@ android.useAndroidX=true
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
+android.nonTransitiveRClass=true