Use AppCompatResources to resolve colors and drawables (#38)

* Resolve colors with AppCompatResources to ensure attribute-backed selectors resolve correctly on API < 23
* Resolve drawables with AppCompatResources
* Add AppCompat as a production dependency of Deferred Resources

Author: drewhamilton

deferred-resources/build.gradle

@@ -42,11 +42,9 @@ android {
 dependencies {
     implementation deps.androidAnnotations
 
+    implementation deps.appCompat
     implementation deps.coreKtx
 
-    // TODO WORKAROUND: Instrumented tests won't run without this
-    debugImplementation deps.appCompat
-
     androidTestImplementation deps.junitAndroidX
     androidTestImplementation deps.androidTestRules
     androidTestImplementation deps.androidTestRunner

deferred-resources/src/androidTest/java/com/backbase/deferredresources/DeferredColorTest.kt

@@ -1,7 +1,6 @@
 package com.backbase.deferredresources
 
 import android.graphics.Color
-import androidx.test.filters.SdkSuppress
 import com.backbase.deferredresources.test.R
 import com.google.common.truth.Truth.assertThat
 import org.junit.Test
@@ -45,7 +44,6 @@ internal class DeferredColorTest {
         assertThat(deferred.resolve(AppCompatContext())).isEqualTo(Color.parseColor("#aaaaaa"))
     }
 
-    @SdkSuppress(minSdkVersion = 23)
     @Test fun resourceResolve_withSelectorColorWithAttribute_resolvesDefaultColor() {
         val deferred = DeferredColor.Resource(R.color.stateful_color_with_attr)
         assertThat(deferred.resolve(AppCompatContext())).isEqualTo(Color.parseColor("#987654"))
@@ -71,7 +69,6 @@ internal class DeferredColorTest {
         assertThat(resolved.defaultColor).isEqualTo(Color.parseColor("#aaaaaa"))
     }
 
-    @SdkSuppress(minSdkVersion = 23)
     @Test fun resourceResolveToStateList_withSelectorColorWithAttribute_resolvesExpectedStateList() {
         val deferred = DeferredColor.Resource(R.color.stateful_color_with_attr)
 
@@ -95,7 +92,6 @@ internal class DeferredColorTest {
         assertThat(deferred.resolve(AppCompatContext())).isEqualTo(Color.parseColor("#aaaaaa"))
     }
 
-    @SdkSuppress(minSdkVersion = 23)
     @Test fun attributeResolve_withSelectorColorWithAttributeDefault_resolvesDefaultColor() {
         val deferred = DeferredColor.Attribute(R.attr.titleTextColor)
         assertThat(deferred.resolve(AppCompatContext())).isEqualTo(Color.parseColor("#987654"))
@@ -127,7 +123,6 @@ internal class DeferredColorTest {
         assertThat(resolved.defaultColor).isEqualTo(Color.parseColor("#aaaaaa"))
     }
 
-    @SdkSuppress(minSdkVersion = 23)
     @Test fun attributeResolveToStateList_withSelectorColorWithAttribute_resolvesExpectedStateList() {
         val deferred = DeferredColor.Attribute(R.attr.titleTextColor)
 

deferred-resources/src/androidTest/java/com/backbase/deferredresources/DeferredDrawableTest.kt

@@ -3,7 +3,7 @@ package com.backbase.deferredresources
 import android.graphics.Color
 import android.graphics.drawable.GradientDrawable
 import android.os.Build
-import androidx.core.content.ContextCompat
+import androidx.appcompat.content.res.AppCompatResources
 import com.backbase.deferredresources.test.R
 import com.google.common.truth.Truth.assertThat
 import org.junit.After
@@ -22,7 +22,7 @@ internal class DeferredDrawableTest {
         // Radius XML is not honored on API 21, so mutate=false tests are skipped
         if (Build.VERSION.SDK_INT == 21) return
 
-        val loadedAgain = ContextCompat.getDrawable(context, R.drawable.oval) as GradientDrawable
+        val loadedAgain = AppCompatResources.getDrawable(context, R.drawable.oval) as GradientDrawable
         loadedAgain.gradientRadius = defaultOvalGradientFraction
     }
 
@@ -45,7 +45,7 @@ internal class DeferredDrawableTest {
         resolved.gradientRadius = 0.5f
 
         // Since it's not mutated, transformations SHOULD apply to re-loaded instances:
-        val loadedAgain = ContextCompat.getDrawable(context, R.drawable.oval) as GradientDrawable
+        val loadedAgain = AppCompatResources.getDrawable(context, R.drawable.oval) as GradientDrawable
         assertThat(loadedAgain.gradientRadiusCompat).isEqualTo(0.5f)
     }
 
@@ -62,7 +62,7 @@ internal class DeferredDrawableTest {
         resolved.gradientRadius = 0.4f
 
         // Since it's mutated, transformations SHOULD NOT apply to re-loaded instances:
-        val loadedAgain = ContextCompat.getDrawable(context, R.drawable.oval) as GradientDrawable
+        val loadedAgain = AppCompatResources.getDrawable(context, R.drawable.oval) as GradientDrawable
         assertThat(loadedAgain.gradientRadiusCompat).isEqualTo(defaultOvalGradientFraction)
     }
 

deferred-resources/src/main/java/com/backbase/deferredresources/DeferredColor.kt

@@ -7,7 +7,7 @@ import android.util.TypedValue
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.annotation.ColorRes
-import androidx.core.content.ContextCompat
+import androidx.appcompat.content.res.AppCompatResources
 import com.backbase.deferredresources.internal.resolveAttribute
 import dev.drewhamilton.extracare.DataApi
 
@@ -46,7 +46,7 @@ public interface DeferredColor {
         /**
          * Always resolves to [value] wrapped in a new [ColorStateList].
          */
-        override fun resolveToStateList(context: Context): ColorStateList =  ColorStateList.valueOf(value)
+        override fun resolveToStateList(context: Context): ColorStateList = ColorStateList.valueOf(value)
     }
 
     /**
@@ -58,18 +58,16 @@ public interface DeferredColor {
         /**
          * Resolve [resId] to a [ColorInt] with the given [context]. If [resId] resolves to a color selector resource,
          * resolves the default color of that selector.
-         *
-         * Warning: On API < 23, resolving a color selector with [context]'s theme is unsupported. Thus, a color
-         * selector with an attribute reference as its default color will not resolve to the correct color on API 22 and
-         * below. A color selector with a resource reference as its default color will resolve correctly.
          */
-        @ColorInt override fun resolve(context: Context): Int = ContextCompat.getColor(context, resId)
+        @ColorInt override fun resolve(context: Context): Int =
+            // Forward to `resolveToStateList` to ensure attribute-backed selectors resolve correctly:
+            resolveToStateList(context).defaultColor
 
         /**
          * Resolve [resId] to a [ColorStateList] with the given [context].
          */
         override fun resolveToStateList(context: Context): ColorStateList =
-            requireNotNull(ContextCompat.getColorStateList(context, resId)) {
+            requireNotNull(AppCompatResources.getColorStateList(context, resId)) {
                 "Could not resolve ${context.resources.getResourceName(resId)} to a ColorStateList with $context."
             }
     }
@@ -88,10 +86,6 @@ public interface DeferredColor {
          * Resolve [resId] to a [ColorInt] with the given [context]'s theme. If [resId] would resolve a color selector,
          * resolves to the default color of that selector.
          *
-         * Warning: On API < 23, resolving a color selector with [context]'s theme is unsupported. Thus, a color
-         * selector with an attribute reference as its default color will not resolve to the correct color on API 22 and
-         * below. A color selector with a resource reference as its default color will resolve correctly.
-         *
          * @throws IllegalArgumentException if [resId] cannot be resolved to a color.
          */
         @ColorInt override fun resolve(context: Context): Int = context.resolveColorAttribute {
@@ -124,7 +118,7 @@ public interface DeferredColor {
             resolveRefs = false
         ) {
             val colorSelectorResId = data
-            ContextCompat.getColorStateList(this@resolveColorStateList, colorSelectorResId)!!
+            AppCompatResources.getColorStateList(this@resolveColorStateList, colorSelectorResId)
         }
     }
 }

deferred-resources/src/main/java/com/backbase/deferredresources/DeferredDrawable.kt

@@ -3,7 +3,7 @@ package com.backbase.deferredresources
 import android.content.Context
 import android.graphics.drawable.Drawable
 import androidx.annotation.DrawableRes
-import androidx.core.content.ContextCompat
+import androidx.appcompat.content.res.AppCompatResources
 import dev.drewhamilton.extracare.DataApi
 
 /**
@@ -53,7 +53,7 @@ public interface DeferredDrawable {
          * [Drawable.mutate] instead of the original Drawable. Applies [transformations] before returning.
          */
         override fun resolve(context: Context): Drawable? {
-            val original = ContextCompat.getDrawable(context, resId)
+            val original = AppCompatResources.getDrawable(context, resId)
             val drawable = if (mutate) original?.mutate() else original
             return drawable?.apply { transformations(context) }
         }

deferred-resources/src/main/java/com/backbase/deferredresources/color/SdkIntDeferredColor.kt

@@ -10,8 +10,8 @@ import dev.drewhamilton.extracare.DataApi
 /**
  * A [DeferredColor] with a different source depending on the runtime Android SDK version.
  *
- * This is useful because different SDK levels treat colors differently in some contexts. For example, SDK 23+ can
- * resolve color selectors backed by color attributes, but lower SDKs cannot.
+ * This is useful because different SDK levels treat colors differently in some contexts. For example, SDK 27+ can
+ * support light system navigation bar colors, but lower SDKs cannot.
  */
 @DataApi public class SdkIntDeferredColor private constructor(
     private val source: DeferredColor