Merge remote-tracking branch 'origin/develop' into develop

AndroidLiba · AndroidLiba · commit 6536907ba515 · 2019-04-25T22:17:20.000+03:00
# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/src/main/java/omega_r/com/omegatypesexample/MainActivity.kt
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,7 +26,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
 
     api project(':omegatypes')
-    api project(':picasso')
+    api project(':glide')
 
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.1.1'
diff --git a/app/src/main/java/omega_r/com/omegatypesexample/MainActivity.kt b/app/src/main/java/omega_r/com/omegatypesexample/MainActivity.kt
@@ -6,7 +6,6 @@ import android.os.Bundle
 import android.widget.ImageView
 import android.widget.TextView
 import com.omega_r.libs.omegatypes.*
-import com.omega_r.libs.omegatypes.picasso.from
 import kotlin.concurrent.thread
 
 class MainActivity : BaseActivity() {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -17,9 +17,11 @@
 
     <ImageView
         android:id="@+id/imageview"
-        android:layout_width="150dp"
-        android:layout_height="150dp"
+        android:layout_width="250dp"
+        android:layout_height="250dp"
         android:layout_centerInParent="true"
+        android:scaleType="centerInside"
+        android:background="@color/colorAccent"
         tools:src="@mipmap/ic_launcher"/>
 
 </RelativeLayout>
diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.11'
-    ext.kotlin_version = '1.2.71'
+    ext.kotlin_version = '1.3.30'
     ext.supportVersion = '28.0.0'
     ext.compileSdkVersion = 28
     ext.targetSdkVersion = 28
diff --git a/glide/.gitignore b/glide/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/glide/build.gradle b/glide/build.gradle
@@ -0,0 +1,43 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+apply plugin: 'com.github.dcendents.android-maven'
+group = 'com.github.Omega-R'
+android {
+    compileSdkVersion 28
+
+
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+    implementation project(':omegatypes')
+
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation ("com.github.bumptech.glide:glide:4.9.0") {
+        exclude group: "com.android.support"
+    }
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
+repositories {
+    mavenCentral()
+}
diff --git a/glide/proguard-rules.pro b/glide/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/glide/src/androidTest/java/com/omega_r/libs/omegatypes/glide/ExampleInstrumentedTest.java b/glide/src/androidTest/java/com/omega_r/libs/omegatypes/glide/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.omega_r.libs.omegatypes.glide;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.omega_r.libs.omegatypes.glide.test", appContext.getPackageName());
+    }
+}
diff --git a/glide/src/main/AndroidManifest.xml b/glide/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.omega_r.libs.omegatypes.glide"/>
diff --git a/glide/src/main/java/com/omega_r/libs/omegatypes/UrlImageExtensions.kt b/glide/src/main/java/com/omega_r/libs/omegatypes/UrlImageExtensions.kt
@@ -0,0 +1,9 @@
+package com.omega_r.libs.omegatypes
+
+import com.omega_r.libs.omegatypes.glide.GlideImage
+
+/**
+ * Created by Anton Knyazev on 15.04.19.
+ */
+
+fun Image.Companion.from(url: String) = GlideImage(url)
diff --git a/glide/src/main/java/com/omega_r/libs/omegatypes/glide/GlideImage.kt b/glide/src/main/java/com/omega_r/libs/omegatypes/glide/GlideImage.kt
@@ -0,0 +1,84 @@
+package com.omega_r.libs.omegatypes.glide
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.view.View
+import android.widget.ImageView
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.target.CustomTarget
+import com.bumptech.glide.request.target.CustomViewTarget
+import com.bumptech.glide.request.transition.Transition
+import com.omega_r.libs.omegatypes.Image
+import com.omega_r.libs.omegatypes.UrlImage
+import com.omega_r.libs.omegatypes.toInputStream
+import java.io.InputStream
+
+/**
+ * Created by Anton Knyazev on 15.04.19.
+ */
+
+
+class GlideImage(override val url: String) : Image(), UrlImage {
+
+    override fun applyImage(imageView: ImageView, placeholderResId: Int) {
+        Glide.with(imageView)
+                .load(url)
+                .apply {
+                    if (placeholderResId != 0) placeholder(placeholderResId)
+                    into(imageView)
+                }
+    }
+
+    override fun applyBackground(view: View, placeholderResId: Int) {
+        super.applyBackground(view, placeholderResId)
+
+        Glide.with(view)
+                .load(url)
+                .apply {
+                    if (placeholderResId != 0) placeholder(placeholderResId)
+
+                    into(object : CustomViewTarget<View, Drawable>(view) {
+                        override fun onLoadFailed(errorDrawable: Drawable?) {
+                            applyBackground(view, errorDrawable)
+                        }
+
+                        override fun onResourceCleared(placeholder: Drawable?) {
+                            applyBackground(view, placeholder)
+                        }
+
+                        override fun onResourceReady(resource: Drawable, transition: Transition<in Drawable>?) {
+                            applyBackground(view, resource)
+                        }
+
+                    })
+                }
+    }
+
+    override fun getStream(context: Context, compressFormat: Bitmap.CompressFormat, quality: Int): InputStream {
+        val stream = WrapperInputStream()
+
+        Glide.with(context)
+                .asBitmap()
+                .load(url)
+                .into(object : CustomTarget<Bitmap>() {
+                    override fun onLoadCleared(placeholder: Drawable?) {
+                        // stream can only send data once
+                    }
+
+                    override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
+                        stream.inputStream = resource.toInputStream(compressFormat, quality)
+                    }
+
+                    override fun onLoadFailed(errorDrawable: Drawable?) {
+                        stream.inputStream = null
+                    }
+
+                })
+
+
+        return stream
+    }
+
+}
+
diff --git a/glide/src/main/java/com/omega_r/libs/omegatypes/glide/WrapperInputStream.kt b/glide/src/main/java/com/omega_r/libs/omegatypes/glide/WrapperInputStream.kt
@@ -0,0 +1,38 @@
+package com.omega_r.libs.omegatypes.glide
+
+import java.io.InputStream
+
+/**
+ * Created by Anton Knyazev on 28.12.18.
+ */
+internal class WrapperInputStream : InputStream() {
+
+    internal var inputStream: InputStream? = null
+        set(value) {
+            field = value
+            availableInitValue = 0
+            synchronized(o) {
+                o.notify()
+            }
+        }
+
+    private val o = Object()
+
+    private var availableInitValue = 1
+
+    override fun read(): Int {
+        if (inputStream == null) {
+            synchronized(o) {
+                o.wait()
+            }
+        }
+        val inputStream = inputStream ?: return -1
+        return inputStream.read()
+    }
+
+    override fun available(): Int {
+        val inputStream = inputStream ?: return availableInitValue
+        return inputStream.available()
+    }
+
+}
diff --git a/glide/src/main/res/values/strings.xml b/glide/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Glide</string>
+</resources>
diff --git a/glide/src/test/java/com/omega_r/libs/omegatypes/glide/ExampleUnitTest.java b/glide/src/test/java/com/omega_r/libs/omegatypes/glide/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.omega_r.libs.omegatypes.glide;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
diff --git a/picasso/src/main/java/com/omega_r/libs/omegatypes/UrlImageExtension.kt b/picasso/src/main/java/com/omega_r/libs/omegatypes/UrlImageExtension.kt
@@ -0,0 +1,9 @@
+package com.omega_r.libs.omegatypes
+
+import com.omega_r.libs.omegatypes.picasso.PicassoImage
+
+/**
+ * Created by Anton Knyazev on 15.04.19.
+ */
+
+fun Image.Companion.from(url: String) = PicassoImage(url)
diff --git a/picasso/src/main/java/com/omega_r/libs/omegatypes/picasso/PicassoImage.kt b/picasso/src/main/java/com/omega_r/libs/omegatypes/picasso/PicassoImage.kt
@@ -19,7 +19,6 @@ import java.io.InputStream
  * Created by Anton Knyazev on 28.12.18.
  */
 
-fun Image.Companion.from(url: String) = PicassoImage(url)
 
 class PicassoImage(override val url: String) : Image(), UrlImage {
 
@@ -105,4 +104,4 @@ class PicassoImage(override val url: String) : Image(), UrlImage {
         return stream
     }
 
-}
+}
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':app', ':omegatypes', ':picasso'
+include ':app', ':omegatypes', ':picasso', ':glide'
