Fix view tree observer usage; update dependencies; update target SDK; add ImageView fetch method with Uri parameter

Author: solkin

app/build.gradle

@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.tomclaw.imageloader.demo"
         minSdk 21
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
     }
@@ -32,8 +32,8 @@ android {
 
 dependencies {
     implementation project(path: ':imageloader')
-    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation "androidx.recyclerview:recyclerview:1.2.1"
-    implementation 'com.google.android.material:material:1.8.0'
-}
+    implementation "androidx.recyclerview:recyclerview:1.3.2"
+    implementation 'com.google.android.material:material:1.11.0'
+}

app/src/main/java/com/tomclaw/imageloader/demo/CustomAdapter.kt

@@ -38,7 +38,7 @@ class CustomAdapter(private val list: List<ItemsViewModel>) :
         return list.size
     }
 
-    class ViewHolder(ItemView: View) : RecyclerView.ViewHolder(ItemView) {
+    class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         val imageView: ImageView = itemView.findViewById(R.id.image_view)
         val titleView: TextView = itemView.findViewById(R.id.title_view)
         val subtitleView: TextView = itemView.findViewById(R.id.subtitle_view)

build.gradle

@@ -5,8 +5,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21'
+        classpath 'com.android.tools.build:gradle:8.2.1'
+        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
@@ -15,4 +15,4 @@ buildscript {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}

imageloader/build.gradle

@@ -5,11 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         minSdk 14
-        targetSdk 33
+        targetSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -33,22 +33,8 @@ android {
 
 dependencies {
     implementation 'com.github.solkin:disk-lru-cache:1.5'
-    implementation 'androidx.exifinterface:exifinterface:1.3.6'
+    implementation 'androidx.exifinterface:exifinterface:1.3.7'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
-
-afterEvaluate {
-    publishing {
-        publications {
-            release(MavenPublication) {
-                from components.release
-
-                groupId = 'com.tomclaw.imageloader'
-                artifactId = 'imageloader'
-                version = '0.9.0'
-            }
-        }
-    }
-}

imageloader/src/main/java/com/tomclaw/imageloader/util/ImageViewHolder.kt

@@ -16,15 +16,14 @@ class ImageViewHolder(private val imageView: ImageView) : ViewHolder<ImageView>
         var viewSize = ViewSize(0, 0)
         val latch = CountDownLatch(1)
 
-        val viewTreeObserver = imageView.viewTreeObserver
         val preDrawListener = object : ViewTreeObserver.OnPreDrawListener {
             private var isResumed = false
 
             override fun onPreDraw(): Boolean {
                 val size = optSize()
                 if (size != null) {
                     viewSize = size
-                    viewTreeObserver.removeOnPreDrawListener(this)
+                    imageView.viewTreeObserver.removeOnPreDrawListener(this)
 
                     if (!isResumed) {
                         isResumed = true
@@ -34,7 +33,7 @@ class ImageViewHolder(private val imageView: ImageView) : ViewHolder<ImageView>
                 return true
             }
         }
-        viewTreeObserver.addOnPreDrawListener(preDrawListener)
+        imageView.viewTreeObserver.addOnPreDrawListener(preDrawListener)
 
         latch.await()
         return viewSize

imageloader/src/main/java/com/tomclaw/imageloader/util/ImageViews.kt

@@ -1,9 +1,14 @@
 package com.tomclaw.imageloader.util
 
+import android.net.Uri
 import android.widget.ImageView
 import com.tomclaw.imageloader.SimpleImageLoader.imageLoader
 import com.tomclaw.imageloader.core.Handlers
 
+fun ImageView.fetch(uri: Uri, params: Handlers<ImageView>.() -> Unit = {}) {
+    fetch(uri.toString(), params)
+}
+
 fun ImageView.fetch(url: String, params: Handlers<ImageView>.() -> Unit = {}) {
     val handlers = Handlers<ImageView>()
         .apply {
@@ -14,4 +19,4 @@ fun ImageView.fetch(url: String, params: Handlers<ImageView>.() -> Unit = {}) {
         .apply(params)
     val viewHolder = ImageViewHolder(this)
     context.imageLoader().load(viewHolder, url, handlers)
-}
+}