Merge pull request #4 from GetStream/fix/scaletype

Check if the photo attacher is initialized on setting the scale type
GetStream · Feb 21, 2024 · 0dbe3e0 · 0dbe3e0
2 parents 92b1415 + f6062fa
commit 0dbe3e0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/photoview/src/main/kotlin/io/getstream/photoview/PhotoView.kt b/photoview/src/main/kotlin/io/getstream/photoview/PhotoView.kt
@@ -46,7 +46,7 @@ public class PhotoView @JvmOverloads constructor(
    *
    * @return the attacher.
    */
-  private lateinit var attacher: PhotoViewAttacher
+  private lateinit var attacher: PhotoViewAttacher // Don't remove lateinit
   private var pendingScaleType: ScaleType? = null
 
   init {
@@ -76,7 +76,7 @@ public class PhotoView @JvmOverloads constructor(
   }
 
   override fun setScaleType(scaleType: ScaleType) {
-    if (drawable == null) {
+    if (drawable == null || !::attacher.isInitialized) {
       pendingScaleType = scaleType
     } else {
       attacher.scaleType = scaleType

diff --git a/sample/src/main/kotlin/io/getstream/photoview/sample/LauncherActivity.kt b/sample/src/main/kotlin/io/getstream/photoview/sample/LauncherActivity.kt
@@ -111,7 +111,6 @@ class LauncherActivity : AppCompatActivity() {
       "Simple Sample",
       "ViewPager Sample",
       "Rotation Sample",
-      "Picasso Sample",
       "Coil Sample",
       "Glide Sample",
       "Activity Transition Sample",