franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: Enable non-transitive R classes

Browse Source 
New default going forward for new android projects. Best to follow the new standard.
This commit is contained in:
Charles Lombardo 2023-05-04 03:40:43 -04:00 committed by bunnei
parent 570c4a2c1b
commit 48065c7a0e
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt
View File

@ -56,7 +56,10 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView {
if (InsetsHelper.getSystemGestureType(applicationContext) != InsetsHelper.GESTURE_NAVIGATION) { if (InsetsHelper.getSystemGestureType(applicationContext) != InsetsHelper.GESTURE_NAVIGATION) {
binding.navigationBarShade.setBackgroundColor( binding.navigationBarShade.setBackgroundColor(
ThemeHelper.getColorWithOpacity( ThemeHelper.getColorWithOpacity(
MaterialColors.getColor(binding.navigationBarShade, R.attr.colorSurface), MaterialColors.getColor(
binding.navigationBarShade,
com.google.android.material.R.attr.colorSurface
),
ThemeHelper.SYSTEM_BAR_ALPHA ThemeHelper.SYSTEM_BAR_ALPHA
) )
) )

10
src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt
View File

@ -64,10 +64,16 @@ class GamesFragment : Fragment() {
// Set theme color to the refresh animation's background // Set theme color to the refresh animation's background
binding.swipeRefresh.setProgressBackgroundColorSchemeColor( binding.swipeRefresh.setProgressBackgroundColorSchemeColor(
MaterialColors.getColor(binding.swipeRefresh, R.attr.colorPrimary) MaterialColors.getColor(
binding.swipeRefresh,
com.google.android.material.R.attr.colorPrimary
)
) )
binding.swipeRefresh.setColorSchemeColors( 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 // Watch for when we get updates to any of our games lists

4
src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
View File

@ -72,7 +72,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
ThemeHelper.getColorWithOpacity( ThemeHelper.getColorWithOpacity(
MaterialColors.getColor( MaterialColors.getColor(
binding.root, binding.root,
R.attr.colorSurface com.google.android.material.R.attr.colorSurface
), ),
ThemeHelper.SYSTEM_BAR_ALPHA ThemeHelper.SYSTEM_BAR_ALPHA
) )
@ -82,7 +82,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
ThemeHelper.getColorWithOpacity( ThemeHelper.getColorWithOpacity(
MaterialColors.getColor( MaterialColors.getColor(
binding.root, binding.root,
R.attr.colorSurface com.google.android.material.R.attr.colorSurface
), ),
ThemeHelper.SYSTEM_BAR_ALPHA ThemeHelper.SYSTEM_BAR_ALPHA
) )

1
src/android/gradle.properties
View File

@ -11,3 +11,4 @@ android.useAndroidX=true
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 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 for this project: "official" or "obsolete":
kotlin.code.style=official kotlin.code.style=official
android.nonTransitiveRClass=true