diff --git a/photoview/src/main/kotlin/io/getstream/photoview/PhotoView.kt b/photoview/src/main/kotlin/io/getstream/photoview/PhotoView.kt index 62190cc8..3bb7c278 100644 --- 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 index 8ccd5ab6..ca527107 100755 --- 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",