nonTransitiveRClass

yueeng · Aug 20, 2023 · ff95158 · ff95158
1 parent 6d95f33
commit ff95158
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/src/main/java/com/github/yueeng/moebooru/MainApplication.kt b/app/src/main/java/com/github/yueeng/moebooru/MainApplication.kt
@@ -139,7 +139,7 @@ open class MoeActivity(contentLayoutId: Int) : AppCompatActivity(contentLayoutId
                 findViewById<View>(android.R.id.content).transitionName = "shared_element_container"
                 setEnterSharedElementCallback(MaterialContainerTransformSharedElementCallback())
                 setExitSharedElementCallback(MaterialContainerTransformSharedElementCallback())
-                val background = theme.obtainStyledAttributes(intArrayOf(R.attr.colorSurface)).use {
+                val background = theme.obtainStyledAttributes(intArrayOf(com.google.android.material.R.attr.colorSurface)).use {
                     it.getColor(0, Color.WHITE)
                 }
                 window.sharedElementEnterTransition = MaterialContainerTransform().apply {

diff --git a/app/src/main/java/com/github/yueeng/moebooru/PreviewActivity.kt b/app/src/main/java/com/github/yueeng/moebooru/PreviewActivity.kt
@@ -154,7 +154,7 @@ class PreviewFragment : Fragment(), SavedFragment.Queryable {
                     var anim: ObjectAnimator? = null
                     fun trans(to: Int) {
                         val from = (binding.root.background as? ColorDrawable)?.color ?: 0
-                        val target = if (to != 0) to else requireActivity().theme.obtainStyledAttributes(intArrayOf(R.attr.colorSurface)).use {
+                        val target = if (to != 0) to else requireActivity().theme.obtainStyledAttributes(intArrayOf(com.google.android.material.R.attr.colorSurface)).use {
                             it.getColor(0, Color.WHITE)
                         }
                         anim = ObjectAnimator.ofObject(binding.root, "backgroundColor", ArgbEvaluator(), from, target).apply {

diff --git a/gradle.properties b/gradle.properties
@@ -21,5 +21,5 @@ android.enableJetifier=true
 kotlin.code.style=official
 org.gradle.unsafe.configuration-cache=true
 android.defaults.buildfeatures.buildconfig=true
-android.nonTransitiveRClass=false
+android.nonTransitiveRClass=true
 android.nonFinalResIds=false