Merge pull request #47 from Omega-R/develop

Develop

Author: anton-knyazev

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.5.31'
+    ext.kotlin_version = '1.9.20'
     ext.kotlinCorutines_version = '1.2.1'
     ext.supportVersion = '28.0.0'
     ext.compileSdkVersion = 28
@@ -12,9 +12,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31"
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
+        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

glide/build.gradle

@@ -1,16 +1,29 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+apply plugin: 'maven-publish'
 
-apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.Omega-R'
+
+publishing {
+    publications {
+        release(MavenPublication) {
+            groupId 'com.github.Omega-R'
+            afterEvaluate {
+                from components.release
+            }
+        }
+    }
+}
+
+
 android {
-    compileSdkVersion 28
+    compileSdkVersion 34
 
 
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 

glide/src/androidTest/java/com/omega_r/libs/omegatypes/glide/ExampleInstrumentedTest.java

@@ -10,6 +10,7 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.RequestBuilder
 import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.GlideException
+import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.target.CustomViewTarget
 import com.bumptech.glide.request.target.Target
@@ -19,6 +20,9 @@ import com.omega_r.libs.omegatypes.decoders.SimpleBitmapDecoders
 import com.omega_r.libs.omegatypes.image.Image.Companion.NO_PLACEHOLDER_RES
 import java.io.InputStream
 import kotlin.reflect.KClass
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.DurationUnit
 
 /**
  * Created by Anton Knyazev on 2019-10-03.
@@ -27,6 +31,7 @@ open class GlideImagesProcessor(
     protected val oldImagesProcessor: ImageProcessors,
     vararg excludeImageClasses: KClass<out Image>,
     private val customBuilder: CustomRequestBuilder? = null,
+    private val fadeDuration: Duration? = 500.milliseconds
 ) : ImageProcessors() {
 
     companion object {
@@ -64,7 +69,8 @@ open class GlideImagesProcessor(
             .asDrawable()
             .createRequestBuilder(this)
             ?.applyPlaceholder(placeholderResId)
-            ?.listener(GlideImageRequestListener(onImageApplied))
+            ?.addListener(GlideImageRequestListener(onImageApplied))
+            ?.run { fadeDuration?.let { transition(DrawableTransitionOptions.withCrossFade(it.toInt(DurationUnit.MILLISECONDS)))}}
             ?.into(imageView)
             ?: applyOld { applyImage(imageView, placeholderResId) }
     }
@@ -159,10 +165,9 @@ class GlideImageRequestListener(private val onImageLoaded: (() -> Unit)?) : Requ
         dataSource: DataSource,
         isFirstResource: Boolean,
     ): Boolean {
-        target.onResourceReady(resource, null)
         if (isFirstResource) {
             onImageLoaded?.invoke()
         }
-        return true
+        return false
     }
 }

glide/src/main/java/com/omega_r/libs/omegatypes/image/GlideImagesProcessor.kt

@@ -1,16 +1,16 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+apply plugin: 'maven-publish'
 
-apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.Omega-R'
 android {
-    compileSdkVersion 28
+    compileSdkVersion 34
 
 
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 

glide/src/test/java/com/omega_r/libs/omegatypes/glide/ExampleUnitTest.java

@@ -1,6 +1,6 @@
-#Tue Apr 21 10:08:25 MSK 2020
+#Thu Aug 08 15:02:53 MSK 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

googledrive/build.gradle

@@ -1,9 +1,20 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+apply plugin: 'maven-publish'
 
-apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.Omega-R'
 
+publishing {
+    publications {
+        release(MavenPublication) {
+            groupId 'com.github.Omega-R'
+            afterEvaluate {
+                from components.release
+            }
+        }
+    }
+}
+
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion