Use non-transitive R classes

See https://blog.blundellapps.co.uk/speed-up-your-build-non-transitive-r-files/
ubergeek42 · Feb 18, 2024 · 80f623b · 80f623b
1 parent 6f1d8ad
commit 80f623b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/src/main/java/androidx/preference/FullScreenEditTextPreference.java b/app/src/main/java/androidx/preference/FullScreenEditTextPreference.java
@@ -46,7 +46,7 @@ public FullScreenEditTextPreference(Context context) {
 
     @SuppressWarnings("WeakerAccess")
     public FullScreenEditTextPreference(Context context, AttributeSet attrs) {
-        this(context, attrs, R.attr.editTextPreferenceStyle);
+        this(context, attrs, androidx.preference.R.attr.editTextPreferenceStyle);
     }
 
     @SuppressWarnings("WeakerAccess")

diff --git a/app/src/main/java/com/ubergeek42/WeechatAndroid/service/P.java b/app/src/main/java/com/ubergeek42/WeechatAndroid/service/P.java
@@ -88,7 +88,7 @@ public class P implements SharedPreferences.OnSharedPreferenceChangeListener{
     public static void storeThemeOrColorSchemeColors(Context context) {
         ColorScheme scheme = ColorScheme.get();
         TypedArray colors = context.obtainStyledAttributes(
-                new int[] {R.attr.colorPrimary, R.attr.colorPrimaryDark, R.attr.toolbarIconColor});
+                new int[] {androidx.appcompat.R.attr.colorPrimary, androidx.appcompat.R.attr.colorPrimaryDark, R.attr.toolbarIconColor});
         colorPrimary = scheme.colorPrimary != ColorScheme.NO_COLOR ?
                 scheme.colorPrimary : colors.getColor(0, ColorScheme.NO_COLOR);
         colorPrimaryDark = scheme.colorPrimaryDark != ColorScheme.NO_COLOR ?

diff --git a/gradle.properties b/gradle.properties
@@ -39,5 +39,5 @@ android.useAndroidX=true
 # kapt is the annotation processor for Kotlin
 kapt.incremental.apt=true
 
-android.nonTransitiveRClass=false
+android.nonTransitiveRClass=true
 android.nonFinalResIds=false