From 4121163008befc87e25211cf685c0918e15441b5 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 11 Apr 2023 13:23:19 -0500 Subject: [PATCH] Non-transitive R classes --- .../main/java/com/todoroo/astrid/core/CriterionViewHolder.kt | 4 ++-- app/src/main/java/org/tasks/dialogs/IconPickerAdapter.java | 2 +- app/src/main/java/org/tasks/fragments/CommentBarFragment.kt | 2 +- .../main/java/org/tasks/repeats/CustomRecurrenceDialog.java | 4 ++-- app/src/main/java/org/tasks/tags/CheckBoxTriStates.java | 2 +- app/src/main/java/org/tasks/tasklist/ViewHolderFactory.kt | 4 ++-- app/src/main/java/org/tasks/themes/ThemeAccent.java | 2 +- gradle.properties | 1 + 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/todoroo/astrid/core/CriterionViewHolder.kt b/app/src/main/java/com/todoroo/astrid/core/CriterionViewHolder.kt index f88b3adeb..e6154a5a9 100644 --- a/app/src/main/java/com/todoroo/astrid/core/CriterionViewHolder.kt +++ b/app/src/main/java/com/todoroo/astrid/core/CriterionViewHolder.kt @@ -70,9 +70,9 @@ class CriterionViewHolder( fun setMoving(moving: Boolean) { if (moving) { - row.setBackgroundColor(ResourceResolver.getData(context, R.attr.colorControlHighlight)) + row.setBackgroundColor(ResourceResolver.getData(context, androidx.appcompat.R.attr.colorControlHighlight)) } else { - row.setBackgroundResource(ResourceResolver.getResourceId(context, R.attr.selectableItemBackground)) + row.setBackgroundResource(ResourceResolver.getResourceId(context, androidx.appcompat.R.attr.selectableItemBackground)) row.background.jumpToCurrentState() } } diff --git a/app/src/main/java/org/tasks/dialogs/IconPickerAdapter.java b/app/src/main/java/org/tasks/dialogs/IconPickerAdapter.java index d161b7d13..bf095152a 100644 --- a/app/src/main/java/org/tasks/dialogs/IconPickerAdapter.java +++ b/app/src/main/java/org/tasks/dialogs/IconPickerAdapter.java @@ -47,7 +47,7 @@ class IconPickerAdapter extends ListAdapter { Integer icon = CustomIcons.getIconResId(index); if (icon != null) { int tint = index == current - ? getData(activity, R.attr.colorAccent) + ? getData(activity, androidx.appcompat.R.attr.colorAccent) : activity.getColor(R.color.icon_tint); boolean available = index < 1000 || inventory.getHasPro(); float alpha = diff --git a/app/src/main/java/org/tasks/fragments/CommentBarFragment.kt b/app/src/main/java/org/tasks/fragments/CommentBarFragment.kt index a1402c94d..b4a6335f0 100644 --- a/app/src/main/java/org/tasks/fragments/CommentBarFragment.kt +++ b/app/src/main/java/org/tasks/fragments/CommentBarFragment.kt @@ -168,7 +168,7 @@ class CommentBarFragment : Fragment() { private fun resetPictureButton() { val typedValue = TypedValue() - activity.theme.resolveAttribute(R.attr.colorOnPrimary, typedValue, true) + activity.theme.resolveAttribute(com.google.android.material.R.attr.colorOnPrimary, typedValue, true) val drawable = activity.getDrawable(R.drawable.ic_outline_photo_camera_24px)!!.mutate() drawable.setTint(typedValue.data) pictureButton.setImageDrawable(drawable) diff --git a/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java b/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java index 8d1fa61b0..6a9276e7f 100644 --- a/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java +++ b/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java @@ -296,11 +296,11 @@ public class CustomRecurrenceDialog extends DialogFragment { new int[] {android.R.attr.state_checked}, new int[] {-android.R.attr.state_checked} }, new int[] { - ResourceResolver.getData(context, R.attr.colorOnSecondary), + ResourceResolver.getData(context, com.google.android.material.R.attr.colorOnSecondary), context.getColor(R.color.text_primary) }); int inset = (int) context.getResources().getDimension(R.dimen.week_button_inset); - int accentColor = ResourceResolver.getData(context, R.attr.colorAccent); + int accentColor = ResourceResolver.getData(context, androidx.appcompat.R.attr.colorAccent); int animationDuration = context.getResources().getInteger(android.R.integer.config_shortAnimTime); diff --git a/app/src/main/java/org/tasks/tags/CheckBoxTriStates.java b/app/src/main/java/org/tasks/tags/CheckBoxTriStates.java index 013be7a4a..1cdcc4b61 100644 --- a/app/src/main/java/org/tasks/tags/CheckBoxTriStates.java +++ b/app/src/main/java/org/tasks/tags/CheckBoxTriStates.java @@ -116,7 +116,7 @@ public class CheckBoxTriStates extends AppCompatCheckBox { Drawable drawable; int color = state == State.UNCHECKED ? getContext().getColor(R.color.icon_tint) - : getData(getContext(), R.attr.colorAccent); + : getData(getContext(), androidx.appcompat.R.attr.colorAccent); drawable = original.mutate(); drawable.setTint(color); drawable.setAlpha(alpha); diff --git a/app/src/main/java/org/tasks/tasklist/ViewHolderFactory.kt b/app/src/main/java/org/tasks/tasklist/ViewHolderFactory.kt index 05df83781..c1ae8eb77 100644 --- a/app/src/main/java/org/tasks/tasklist/ViewHolderFactory.kt +++ b/app/src/main/java/org/tasks/tasklist/ViewHolderFactory.kt @@ -30,8 +30,8 @@ class ViewHolderFactory @Inject constructor( private val textColorOverdue: Int = context.getColor(R.color.overdue) private val fontSize: Int = preferences.fontSize private val metrics: DisplayMetrics = context.resources.displayMetrics - private val background: Int = ResourceResolver.getResourceId(context, R.attr.selectableItemBackground) - private val selectedColor: Int = ResourceResolver.getData(context, R.attr.colorControlHighlight) + private val background: Int = ResourceResolver.getResourceId(context, androidx.appcompat.R.attr.selectableItemBackground) + private val selectedColor: Int = ResourceResolver.getData(context, androidx.appcompat.R.attr.colorControlHighlight) private val rowPaddingDp = preferences.getInt(R.string.p_rowPadding, 16) private val rowPaddingPx: Int = AndroidUtilities.convertDpToPixels(metrics, rowPaddingDp) private val markdown = diff --git a/app/src/main/java/org/tasks/themes/ThemeAccent.java b/app/src/main/java/org/tasks/themes/ThemeAccent.java index a2de032b7..52bcf59ea 100644 --- a/app/src/main/java/org/tasks/themes/ThemeAccent.java +++ b/app/src/main/java/org/tasks/themes/ThemeAccent.java @@ -70,7 +70,7 @@ public class ThemeAccent implements Pickable { public ThemeAccent(Context context, int style) { this.style = style; Resources.Theme theme = new ContextThemeWrapper(context, style).getTheme(); - this.accentColor = resolveAttribute(theme, R.attr.colorSecondary); + this.accentColor = resolveAttribute(theme, com.google.android.material.R.attr.colorSecondary); } private ThemeAccent(Parcel source) { diff --git a/gradle.properties b/gradle.properties index d5ee89b27..32a21b5b5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,3 +20,4 @@ org.gradle.unsafe.configuration-cache=true android.databinding.incremental=true kapt.incremental.apt=true kotlin.incremental=true +android.nonTransitiveRClass=true