android: Enable non-transitive R classes
New default going forward for new android projects. Best to follow the new standard.
This commit is contained in:
		| @@ -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 | ||||
|                 ) | ||||
|             ) | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|                 ) | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user