Compile against Android Q SDK where Insets is public API

consp1racy · Mar 28, 2019 · bbd19e2 · bbd19e2
1 parent 2f6e31c
commit bbd19e2
Show file tree

Hide file tree

Showing 22 changed files with 20 additions and 253 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/insets-extensions/build.gradle b/insets-extensions/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'digital.wup.android-maven-publish'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 'android-Q'
 
     defaultConfig {
         minSdkVersion 16
@@ -25,9 +25,6 @@ dependencies {
 
     implementation project(':insets')
 
-    compileOnly project(':platform-insets-private')
-    testCompileOnly project(':platform-insets')
-
     implementation 'androidx.annotation:annotation:1.0.2'
 
     testImplementation 'junit:junit:4.12'

diff --git a/insets-helper/build.gradle b/insets-helper/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'digital.wup.android-maven-publish'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 'android-Q'
 
     defaultConfig {
         minSdkVersion 16
@@ -26,9 +26,6 @@ dependencies {
     implementation project(':insets')
     implementation project(':insets-extensions')
 
-    compileOnly project(':platform-insets')
-    testCompileOnly project(':platform-insets')
-
     implementation 'androidx.annotation:annotation:1.0.2'
 
     testImplementation 'junit:junit:4.12'

diff --git a/insets/build.gradle b/insets/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'digital.wup.android-maven-publish'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 'android-Q'
 
     defaultConfig {
         minSdkVersion 16
@@ -33,9 +33,6 @@ android {
  */
 
 dependencies {
-    compileOnly project(':platform-insets-private')
-    testCompileOnly project(':platform-insets')
-
     implementation 'androidx.annotation:annotation:1.0.2'
 
     testImplementation 'junit:junit:4.12'

diff --git a/insets/src/main/java/net/xpece/androidx/optical/InsetsCompat.java b/insets/src/main/java/net/xpece/androidx/optical/InsetsCompat.java
@@ -1,18 +1,15 @@
 package net.xpece.androidx.optical;
 
-import android.annotation.SuppressLint;
 import android.graphics.Insets;
 import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
 import android.graphics.drawable.InsetDrawable;
 import android.os.Build;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
 
-import java.lang.reflect.Method;
-
 /**
  * An Insets instance holds four integer offsets which describe changes to the four
  * edges of a Rectangle. By convention, positive values move edges towards the
@@ -21,7 +18,6 @@
  * Insets are immutable so may be treated as values.
  */
 @RequiresApi(16)
-@SuppressLint("PrivateApi")
 @SuppressWarnings("unused")
 public final class InsetsCompat {
 
@@ -60,7 +56,7 @@ public static Insets of(int left, int top, int right, int bottom) {
             return Insets.of(left, top, right, bottom);
         } else {
             final InsetDrawable insets = new InsetDrawable(null, left, top, right, bottom);
-            return Reflection.getOpticalBounds(insets);
+            return insets.getOpticalInsets();
         }
     }
 
@@ -89,31 +85,4 @@ static Insets union(final @NonNull Insets... insets) {
         }
         return of(left, top, right, bottom);
     }
-
-    // Having separate class prevents reflective method lookup when it's not needed.
-    @SuppressWarnings("JavaReflectionMemberAccess")
-    private static class Reflection {
-
-        private static Method METHOD_GET_OPTICAL_INSETS;
-
-        static {
-            try {
-                METHOD_GET_OPTICAL_INSETS = Drawable.class.getDeclaredMethod("getOpticalInsets");
-            } catch (NoSuchMethodException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        private Reflection() {
-        }
-
-        @NonNull
-        static Insets getOpticalBounds(final @NonNull Drawable drawable) {
-            try {
-                return (Insets) METHOD_GET_OPTICAL_INSETS.invoke(drawable);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
 }
diff --git a/platform-hidden/build.gradle b/platform-hidden/build.gradle
diff --git a/platform-hidden/src/main/java/android/graphics/Rect.java b/platform-hidden/src/main/java/android/graphics/Rect.java
diff --git a/platform-hidden/src/main/java/android/os/Parcelable.java b/platform-hidden/src/main/java/android/os/Parcelable.java
diff --git a/platform-insets-private/build.gradle b/platform-insets-private/build.gradle
diff --git a/platform-insets-private/src/main/java/android/graphics/Insets.java b/platform-insets-private/src/main/java/android/graphics/Insets.java
diff --git a/platform-insets/build.gradle b/platform-insets/build.gradle
@@ -2,11 +2,13 @@ apply plugin: 'java-library'
 apply plugin: 'maven-publish'
 
 /*
+ * You don't need this if you compile against Android Q SDK, as Insets are now public API.
+ *
+ * This is a compileOnly dependency for consumers who wish to extend Xpece Android Support Optical.
+ *
  * This library can only be compileOnly dependency of other modules if it's not an Android library.
  * At the same time we only want to expose the Insets class so we need to hide any other classes
  * from the Android SDK in another compileOnly dependency of this module.
- *
- * This is a compileOnly dependency for consumers who wish to extend this library.
  */
 
 sourceCompatibility = "6"

diff --git a/root-constraint-layout/build.gradle b/root-constraint-layout/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'digital.wup.android-maven-publish'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 'android-Q'
 
     defaultConfig {
         minSdkVersion 16
@@ -27,9 +27,6 @@ android {
 dependencies {
     implementation project(':insets')
 
-    compileOnly project(':platform-insets')
-    testCompileOnly project(':platform-insets')
-
     implementation 'androidx.annotation:annotation:1.0.2'
 
     //noinspection GradleDependency

diff --git a/root-coordinator-layout/build.gradle b/root-coordinator-layout/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'digital.wup.android-maven-publish'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 'android-Q'
 
     defaultConfig {
         minSdkVersion 16
@@ -27,9 +27,6 @@ android {
 dependencies {
     implementation project(':insets')
 
-    compileOnly project(':platform-insets')
-    testCompileOnly project(':platform-insets')
-
     implementation 'androidx.annotation:annotation:1.0.2'
 
     api 'androidx.coordinatorlayout:coordinatorlayout:1.0.0'

diff --git a/root-flexbox-layout/build.gradle b/root-flexbox-layout/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'digital.wup.android-maven-publish'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 'android-Q'
 
     defaultConfig {
         minSdkVersion 16
@@ -27,9 +27,6 @@ android {
 dependencies {
     implementation project(':insets')
 
-    compileOnly project(':platform-insets')
-    testCompileOnly project(':platform-insets')
-
     implementation 'androidx.annotation:annotation:1.0.2'
 
     //noinspection GradleDependency