Small code cleanup

saket · Dec 10, 2024 · 09ac42d · 09ac42d
1 parent 1274e79
commit 09ac42d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/...mpling-image/src/main/kotlin/me/saket/telephoto/subsamplingimage/SubSamplingImageState.kt b/...mpling-image/src/main/kotlin/me/saket/telephoto/subsamplingimage/SubSamplingImageState.kt
@@ -1,5 +1,4 @@
 @file:Suppress("NAME_SHADOWING")
-@file:OptIn(ExperimentalCoroutinesApi::class)
 
 package me.saket.telephoto.subsamplingimage
 

diff --git a/zoomable/src/commonMain/kotlin/me/saket/telephoto/zoomable/RealZoomableState.kt b/zoomable/src/commonMain/kotlin/me/saket/telephoto/zoomable/RealZoomableState.kt
@@ -150,7 +150,7 @@ internal class RealZoomableState internal constructor(
     }
   )
 
-  private val gestureStateInputs: GestureStateInputsCalculator by derivedStateOf {
+  private val gestureStateInputsCalculator: GestureStateInputsCalculator by derivedStateOf {
     GestureStateInputsCalculator { viewportSize ->
       if (viewportSize.isUnspecifiedOrEmpty || unscaledContentLocation == ZoomableContentLocation.Unspecified) {
         return@GestureStateInputsCalculator null
@@ -191,7 +191,7 @@ internal class RealZoomableState internal constructor(
   }
 
   private val currentGestureStateInputs: GestureStateInputs? by derivedStateOf {
-    gestureStateInputs.calculate(viewportSize)
+    gestureStateInputsCalculator.calculate(viewportSize)
   }
 
   /** See [PlaceholderBoundsProvider]. */
@@ -344,16 +344,16 @@ internal class RealZoomableState internal constructor(
     //
     // Note to self: these values are divided by zoom because that's how the final offset
     // for UI is calculated: -offset * zoom.
-    return transformUserOffset { finalOffset ->
+    return transformUserOffset { currentOffset ->
       //
       // Move the centroid to the center
       //      of panned content(?)
-      //                 |                         Scale
-      //                 |                           |                Move back
-      //                 |                           |           (+ new translation)
-      //                 |                           |                    |
-      // ________________|______________     ________|_________   ________|_________
-      ((finalOffset + centroid / oldZoom) - (centroid / newZoom + panDelta / oldZoom)).also {
+      //                 |                           Scale
+      //                 |                             |                Move back
+      //                 |                             |           (+ new translation)
+      //                 |                             |                    |
+      // ________________|_______________      ________|_________   ________|_________
+      ((currentOffset + centroid / oldZoom) - (centroid / newZoom + panDelta / oldZoom)).also {
         check(it.isFinite) {
           val debugInfo = collectDebugInfoForIssue41(
             "centroid" to centroid,