Multiplatform: Port :zoomable module to Compose Multiplatform

.editorconfig

@@ -1,4 +1,4 @@
-[*.{kt, kts}]
+[*.{kt,kts}]
 indent_size = 2
 insert_final_newline = true
 max_line_length = 120

build.gradle

@@ -13,6 +13,7 @@ allprojects {
   repositories {
     google()
     mavenCentral()
+    maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" }
     maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
   }
 }

buildSrc/build.gradle.kts

@@ -13,6 +13,7 @@ dependencies  {
 
   implementation(libs.plugin.agp)
   implementation(libs.plugin.kotlin)
+  implementation(libs.plugin.jetbrains.compose)
   implementation(libs.plugin.dokka)
   implementation(libs.plugin.mavenPublish)
   implementation(libs.plugin.dropshots)

buildSrc/src/main/kotlin/android-library-convention.gradle.kts

@@ -24,7 +24,7 @@ android {
   }
   lint.abortOnError = true
   buildFeatures.compose = true
-  composeOptions.kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
+  composeOptions.kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
 }
 
 dependencies {

buildSrc/src/main/kotlin/kotlin-multiplatform-library-convention.gradle.kts

@@ -0,0 +1,72 @@
+@file:Suppress("UnstableApiUsage")
+
+plugins {
+  id("org.jetbrains.kotlin.multiplatform")
+  id("org.jetbrains.compose")
+  id("com.android.library")
+}
+
+kotlin {
+  android {
+    publishLibraryVariants("release")
+    compilations.configureEach {
+      kotlinOptions {
+        jvmTarget = "11"
+      }
+    }
+  }
+
+  jvm("desktop") {
+    compilations.configureEach {
+      kotlinOptions {
+        jvmTarget = "11"
+      }
+    }
+  }
+
+  // TODO what other targets?
+
+  targets.configureEach {
+    compilations.configureEach {
+      compilerOptions.configure {
+        freeCompilerArgs.addAll(
+          "-Xcontext-receivers",
+          "-Xjvm-default=all", // TODO IDE complains this isn't set (transformableState.kt). is it working?
+        )
+      }
+    }
+  }
+
+  sourceSets {
+    named("commonMain") {
+      dependencies {
+        implementation(compose.runtime)
+      }
+    }
+
+    named("commonTest") {
+      dependencies {
+        implementation(libs.assertk)
+      }
+    }
+  }
+}
+
+compose {
+  val compilerDependencyDeclaration = libs.androidx.compose.compiler.get()
+    .run { "$module:$version" }
+  kotlinCompilerPlugin.set(compilerDependencyDeclaration)
+}
+
+android {
+  compileSdk = 33
+  defaultConfig {
+    minSdk = 24
+    resourcePrefix = "_telephoto"
+  }
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+  }
+  lint.abortOnError = true
+}

gradle.properties

@@ -2,6 +2,8 @@ org.gradle.jvmargs=-Xmx1536m
 android.enableJetifier=false
 android.useAndroidX=true
 
+kotlin.mpp.androidSourceSetLayoutVersion=2
+
 GROUP=me.saket.telephoto
 VERSION_NAME=0.2.0
 

gradle/libs.versions.toml

@@ -2,12 +2,14 @@
 minSdk = "24"
 compileSdk = "33"
 kotlin = "1.8.10"
+jetbrains-compose = "1.4.0"
 agp = "7.4.2"
 compose-runtime = "1.4.3"
-compose-compiler = "1.4.4"
 compose-ui = "1.4.3"
 compose-ui-material3 = "1.1.0-rc01"
 accompanist = "0.30.0"
+androidx-annotation = "1.7.0-alpha02"
+androidx-compose-compiler = "1.4.4"
 androidx-appcompat = "1.6.1"
 androidx-activity = "1.7.1"
 androidx-ktx = "1.10.0"
@@ -30,16 +32,19 @@ emulatorWtf-cli = "0.9.8"   # https://docs.emulator.wtf/changelog/
 okio = "3.3.0"
 okhttp-mockWebServer = "4.11.0"
 dokka = "1.8.10"
+assertk = "0.26"
 
 [libraries]
 plugin-paparazzi = { module = "app.cash.paparazzi:paparazzi-gradle-plugin", version.ref = "paparazzi" }
 plugin-agp = { module = "com.android.tools.build:gradle", version.ref = "agp" }
 plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+plugin-jetbrains-compose = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "jetbrains-compose" }
 plugin-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
 plugin-mavenPublish = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "mavenPublish" }
 plugin-dropshots = { module = "com.dropbox.dropshots:dropshots-gradle-plugin", version.ref = "dropshots" }
 plugin-emulatorWtf = { module = "wtf.emulator:gradle-plugin", version.ref = "emulatorWtf" }
 
+androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "androidx-annotation" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
 androidx-ktx-core = { module = "androidx.core:core-ktx", version.ref = "androidx-ktx" }
 androidx-ktx-palette = { module = "androidx.palette:palette-ktx", version.ref = "androidx-ktx-palette" }
@@ -48,6 +53,8 @@ androidx-activity = { module = "androidx.activity:activity-compose", version.ref
 androidx-test-ktx = "androidx.test:core-ktx:1.5.0"
 androidx-test-rules = "androidx.test:rules:1.5.0"
 androidx-test-junit = "androidx.test.ext:junit-ktx:1.1.5"
+androidx-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "androidx-compose-compiler" }
+# TODO remove compose libs in favor of declaring via jetbrains compose plugin
 compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "compose-runtime" }
 compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose-ui" }
 compose-ui-util = { module = "androidx.compose.ui:ui-util", version.ref = "compose-ui" }
@@ -78,3 +85,5 @@ dropshots = { module = "com.dropbox.dropshots:dropshots", version.ref = "dropsho
 dropboxDiffer = { module = "com.dropbox.differ:differ", version.ref = "dropboxDiffer" }
 
 appyx = { module = "com.bumble.appyx:core", version.ref = "appyx" }
+
+assertk = { module = "com.willowtreeapps.assertk:assertk", version.ref = "assertk" }

sample/build.gradle

@@ -23,7 +23,7 @@ android {
     lintConfig = file("lint.xml")
   }
   buildFeatures.compose = true
-  composeOptions.kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
+  composeOptions.kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
 }
 
 dependencies {

zoomable/build.gradle.kts

@@ -0,0 +1,30 @@
+import org.jetbrains.compose.compose
+
+plugins {
+  id("kotlin-multiplatform-library-convention")
+  id("published-library-convention")
+}
+
+apply(plugin = "kotlin-parcelize")
+
+kotlin {
+  sourceSets {
+    named("commonMain") {
+      dependencies {
+        implementation(compose("org.jetbrains.compose.ui:ui-util"))
+        api(compose.foundation)
+        api(libs.androidx.annotation)
+      }
+    }
+
+    named("commonTest") {
+      dependencies {
+        implementation(kotlin("test"))
+      }
+    }
+  }
+}
+
+android {
+  namespace = "me.saket.telephoto.zoomable"
+}

zoomable/src/androidMain/kotlin/me/saket/telephoto/zoomable/internal/haptics.kt

@@ -0,0 +1,34 @@
+package me.saket.telephoto.zoomable.internal
+
+import android.os.Build
+import android.view.HapticFeedbackConstants
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.platform.LocalView
+
+@Composable
+internal actual fun rememberHapticFeedbackPerformer(): HapticFeedbackPerformer {
+  val view = LocalView.current
+
+  return remember(view) {
+    object : HapticFeedbackPerformer {
+      override fun performHapticFeedback() {
+        view.performHapticFeedback(HapticFeedbackConstantsCompat.GESTURE_END)
+      }
+    }
+  }
+}
+
+// Can be removed once https://issuetracker.google.com/u/1/issues/195043382 is fixed.
+private object HapticFeedbackConstantsCompat {
+  val GESTURE_END: Int
+    get() {
+      return if (Build.VERSION.SDK_INT >= 30) {
+        HapticFeedbackConstants.GESTURE_END
+      } else {
+        // PhoneWindowManager#getVibrationEffect() maps
+        // GESTURE_END and CONTEXT_CLICK to the same effect.
+        HapticFeedbackConstants.CONTEXT_CLICK
+      }
+    }
+}

zoomable/src/androidMain/kotlin/me/saket/telephoto/zoomable/internal/parcelable.kt

@@ -0,0 +1,8 @@
+package me.saket.telephoto.zoomable.internal
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+actual typealias AndroidParcelize = Parcelize
+
+actual typealias AndroidParcelable = Parcelable

zoomable/src/main/kotlin/me/saket/telephoto/zoomable/Zoomable.kt → zoomable/src/commonMain/kotlin/me/saket/telephoto/zoomable/Zoomable.kt

@@ -2,8 +2,6 @@
 
 package me.saket.telephoto.zoomable
 
-import android.os.Build
-import android.view.HapticFeedbackConstants
 import androidx.compose.foundation.MutatePriority
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
@@ -21,11 +19,11 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.unit.toSize
 import kotlinx.coroutines.launch
 import me.saket.telephoto.zoomable.internal.MutatePriorities
 import me.saket.telephoto.zoomable.internal.doubleTapZoomable
+import me.saket.telephoto.zoomable.internal.rememberHapticFeedbackPerformer
 import me.saket.telephoto.zoomable.internal.stopTransformation
 import me.saket.telephoto.zoomable.internal.transformable
 
@@ -59,7 +57,7 @@ fun Modifier.zoomable(
   val onClick by rememberUpdatedState(onClick)
 
   val zoomableModifier = if (state.isReadyToInteract) {
-    val view = LocalView.current
+    val hapticFeedbackPerformer = rememberHapticFeedbackPerformer()
     val density = LocalDensity.current
     val scope = rememberCoroutineScope()
     var isQuickZooming by remember { mutableStateOf(false) }
@@ -72,7 +70,7 @@ fun Modifier.zoomable(
         onTransformStopped = { velocity ->
           scope.launch {
             if (state.isZoomOutsideRange()) {
-              view.performHapticFeedback(HapticFeedbackConstantsCompat.GESTURE_END)
+              hapticFeedbackPerformer.performHapticFeedback()
               state.smoothlySettleZoomOnGestureEnd()
             } else {
               state.fling(velocity = velocity, density = density)
@@ -110,7 +108,7 @@ fun Modifier.zoomable(
           scope.launch {
             isQuickZooming = false
             if (state.isZoomOutsideRange()) {
-              view.performHapticFeedback(HapticFeedbackConstantsCompat.GESTURE_END)
+              hapticFeedbackPerformer.performHapticFeedback()
               state.smoothlySettleZoomOnGestureEnd()
             }
           }
@@ -137,17 +135,3 @@ fun Modifier.zoomable(
       }
     )
 }
-
-// Can be removed once https://issuetracker.google.com/u/1/issues/195043382 is fixed.
-private object HapticFeedbackConstantsCompat {
-  val GESTURE_END: Int
-    get() {
-      return if (Build.VERSION.SDK_INT >= 30) {
-        HapticFeedbackConstants.GESTURE_END
-      } else {
-        // PhoneWindowManager#getVibrationEffect() maps
-        // GESTURE_END and CONTEXT_CLICK to the same effect.
-        HapticFeedbackConstants.CONTEXT_CLICK
-      }
-    }
-}

zoomable/src/commonMain/kotlin/me/saket/telephoto/zoomable/internal/haptics.kt

@@ -0,0 +1,12 @@
+package me.saket.telephoto.zoomable.internal
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.hapticfeedback.HapticFeedback
+
+@Composable
+internal expect fun rememberHapticFeedbackPerformer(): HapticFeedbackPerformer
+
+/** Migrate to [HapticFeedback] once it supports the constant(s) we want */
+internal interface HapticFeedbackPerformer {
+  fun performHapticFeedback()
+}

zoomable/src/commonMain/kotlin/me/saket/telephoto/zoomable/internal/parcelable.kt

@@ -0,0 +1,10 @@
+package me.saket.telephoto.zoomable.internal
+
+@OptIn(ExperimentalMultiplatform::class)
+@OptionalExpectation
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.BINARY)
+expect annotation class AndroidParcelize()
+
+expect interface AndroidParcelable
+

zoomable/src/main/kotlin/me/saket/telephoto/zoomable/internal/savedState.kt → zoomable/src/commonMain/kotlin/me/saket/telephoto/zoomable/internal/savedState.kt

@@ -1,19 +1,17 @@
 package me.saket.telephoto.zoomable.internal
 
-import android.os.Parcelable
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.layout.ScaleFactor
-import kotlinx.parcelize.Parcelize
 import me.saket.telephoto.zoomable.ContentZoom
 import me.saket.telephoto.zoomable.RawTransformation
 
-@Parcelize
+@AndroidParcelize
 internal data class ZoomableSavedState(
   private val offsetX: Float?,
   private val offsetY: Float?,
-  private val userZoom: Float?,
-) : Parcelable {
+  private val userZoom: Float?
+) : AndroidParcelable {
 
   fun gestureTransformation(): RawTransformation? {
     return RawTransformation(

zoomable/src/test/kotlin/me/saket/telephoto/zoomable/internal/CoerceInsideTest.kt → zoomable/src/commonTest/kotlin/me/saket/telephoto/zoomable/internal/CoerceInsideTest.kt

@@ -5,8 +5,9 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.unit.LayoutDirection
-import com.google.common.truth.Truth.assertThat
-import org.junit.Test
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import kotlin.test.Test
 
 class CoerceInsideTest {
   @Test fun `no zoom`() {