Merge pull request #509 from squanchy-dev/move_borrowed_code_out

Move borrowed code out

Author: fourlastor

app/build.gradle

@@ -124,6 +124,8 @@ project.afterEvaluate {
 }
 
 dependencies {
+    implementation project(':renderthread')
+
     implementation libraries.app.androidKtx
 
     implementation libraries.app.crashlytics

build.gradle

@@ -48,7 +48,10 @@ subprojects {
 
     apply plugin: 'com.github.ben-manes.versions'
     apply plugin: 'io.gitlab.arturbosch.detekt'
-    apply from: teamPropsFile('static-analysis.gradle')
+
+    if (project.name != 'renderthread') {
+        apply from: teamPropsFile('static-analysis.gradle')
+    }
 }
 
 apply from: teamPropsFile('android-code-quality.gradle')

dependencies.gradle

@@ -42,6 +42,7 @@ ext {
             playServicesAuth   : "com.google.android.gms:play-services-auth:${playServicesVersion}",
             rxJava             : 'io.reactivex.rxjava2:rxjava:2.1.12',
             rxAndroid          : 'io.reactivex.rxjava2:rxandroid:2.0.2',
+            supportAnnotations : "com.android.support:support-annotations:${supportLibVersion}",
             supportAppCompat   : "com.android.support:appcompat-v7:${supportLibVersion}",
             supportConstraint  : 'com.android.support.constraint:constraint-layout:1.1.0-beta6',
             supportDesign      : "com.android.support:design:${supportLibVersion}",

renderthread/build.gradle

@@ -0,0 +1,27 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion Integer.parseInt(project.COMPILE_SDK_VERSION)
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    defaultConfig {
+        minSdkVersion Integer.parseInt(project.MIN_SDK_VERSION)
+        targetSdkVersion Integer.parseInt(project.TARGET_SDK_VERSION)
+
+        versionCode Integer.parseInt(project.VERSION_CODE)
+        versionName project.VERSION_NAME
+    }
+
+    lintOptions {
+        abortOnError = false
+        ignoreWarnings = true
+    }
+
+    dependencies {
+        implementation libraries.app.supportAnnotations
+    }
+}

renderthread/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<manifest
+  package="me.eugeniomarletti.renderthread" />

…arletti/renderthread/CanvasProperty.java …arletti/renderthread/CanvasProperty.javaapp/src/main/java/me/eugeniomarletti/renderthread/CanvasProperty.java renamed to renderthread/src/main/java/me/eugeniomarletti/renderthread/CanvasProperty.java app/src/main/java/me/eugeniomarletti/renderthread/CanvasProperty.java renamed to renderthread/src/main/java/me/eugeniomarletti/renderthread/CanvasProperty.java

@@ -17,26 +17,26 @@ public final class RenderThread {
     private RenderThread() {
     }
 
-    private static RenderThreadDelegate DELEGATE;
+    private static RenderThreadDelegate delegate;
 
     static {
         init(false);
     }
 
     public static void init(boolean skipAndroidVersionCheck) {
-        RenderThreadDelegate delegate = DELEGATE;
+        RenderThreadDelegate delegate = RenderThread.delegate;
         if (delegate == null || !delegate.isSupported()) {
             RenderThreadMethods methods = RenderThreadMethods.create(skipAndroidVersionCheck);
             if (methods != null) {
-                DELEGATE = new RenderThreadDelegateHw(methods);
+                RenderThread.delegate = new RenderThreadDelegateHw(methods);
             } else {
-                DELEGATE = new RenderThreadDelegate();
+                RenderThread.delegate = new RenderThreadDelegate();
             }
         }
     }
 
     public static boolean isSupported() {
-        return DELEGATE.isSupported();
+        return delegate.isSupported();
     }
 
     @NonNull
@@ -45,8 +45,8 @@ public static CanvasProperty<Float> createCanvasProperty(@NonNull Canvas canvas,
     }
 
     @NonNull
-    public static CanvasProperty<Float> createCanvasProperty(@NonNull Canvas canvas, float initialValue, boolean useRenderThread) {
-        return DELEGATE.createCanvasProperty(canvas, initialValue, useRenderThread);
+    private static CanvasProperty<Float> createCanvasProperty(@NonNull Canvas canvas, float initialValue, boolean useRenderThread) {
+        return delegate.createCanvasProperty(canvas, initialValue, useRenderThread);
     }
 
     @NonNull
@@ -55,16 +55,16 @@ public static CanvasProperty<Paint> createCanvasProperty(@NonNull Canvas canvas,
     }
 
     @NonNull
-    public static CanvasProperty<Paint> createCanvasProperty(@NonNull Canvas canvas, @NonNull Paint initialValue, boolean useRenderThread) {
-        return DELEGATE.createCanvasProperty(canvas, initialValue, useRenderThread);
+    private static CanvasProperty<Paint> createCanvasProperty(@NonNull Canvas canvas, @NonNull Paint initialValue, boolean useRenderThread) {
+        return delegate.createCanvasProperty(canvas, initialValue, useRenderThread);
     }
 
     public static boolean isDisplayListCanvas(@NonNull Canvas canvas) {
-        return DELEGATE.isDisplayListCanvas(canvas);
+        return delegate.isDisplayListCanvas(canvas);
     }
 
     public static void setAnimatorTarget(@RenderNodeAnimator @NonNull Animator animator, @DisplayListCanvas @NonNull Canvas target) {
-        DELEGATE.setTarget(animator, target);
+        delegate.setTarget(animator, target);
     }
 
     public static void drawCircle(
@@ -74,7 +74,7 @@ public static void drawCircle(
             @NonNull CanvasProperty<Float> radius,
             @NonNull CanvasProperty<Paint> paint) {
 
-        DELEGATE.drawCircle(canvas, cx, cy, radius, paint);
+        delegate.drawCircle(canvas, cx, cy, radius, paint);
     }
 
     public static void drawRoundRect(
@@ -87,7 +87,7 @@ public static void drawRoundRect(
             @NonNull CanvasProperty<Float> ry,
             @NonNull CanvasProperty<Paint> paint) {
 
-        DELEGATE.drawRoundRect(canvas, left, top, right, bottom, rx, ry, paint);
+        delegate.drawRoundRect(canvas, left, top, right, bottom, rx, ry, paint);
     }
 
     @NonNull
@@ -97,7 +97,7 @@ public static Animator createFloatAnimator(
             @NonNull CanvasProperty<Float> property,
             float targetValue) {
 
-        return DELEGATE.createFloatAnimator(drawable, canvas, property, targetValue);
+        return delegate.createFloatAnimator(drawable, canvas, property, targetValue);
     }
 
     @NonNull
@@ -107,7 +107,7 @@ public static Animator createPaintAlphaAnimator(
             @NonNull CanvasProperty<Paint> property,
             @FloatRange(from = 0f, to = 255f) float targetValue) {
 
-        return DELEGATE.createPaintAlphaAnimator(drawable, canvas, property, targetValue);
+        return delegate.createPaintAlphaAnimator(drawable, canvas, property, targetValue);
     }
 
     @NonNull
@@ -117,6 +117,6 @@ public static Animator createPaintStrokeWidthAnimator(
             @NonNull CanvasProperty<Paint> property,
             float targetValue) {
 
-        return DELEGATE.createPaintStrokeWidthAnimator(drawable, canvas, property, targetValue);
+        return delegate.createPaintStrokeWidthAnimator(drawable, canvas, property, targetValue);
     }
 }