Merge pull request #541 from code-payments/feat/invert-drag-zoom-beta

chore(camera): reverse drag-to-zoom direction

Author: bmc08gt

api/src/main/java/com/getcode/model/Feature.kt

@@ -48,6 +48,11 @@ data class CameraGesturesFeature(
     override val available: Boolean = true, // always available
 ): Feature
 
+data class InvertedDragZoomFeature(
+    override val enabled: Boolean = BetaOptions.Defaults.invertedDragZoom,
+    override val available: Boolean = true, // always available
+): Feature
+
 data class FlippableTipCardFeature(
     override val enabled: Boolean = BetaOptions.Defaults.canFlipTipCard,
     override val available: Boolean = true, // always available

api/src/main/java/com/getcode/model/PrefBool.kt

@@ -4,6 +4,7 @@ package com.getcode.model
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import dagger.internal.Beta
 
 @Entity
 data class PrefBool(
@@ -61,7 +62,8 @@ sealed class PrefsBool(val value: String) {
     data object SHARE_TWEET_TO_TIP : PrefsBool("share_tweet_to_tip"), BetaFlag, Immutable
     data object TIP_CARD_ON_HOMESCREEN: PrefsBool("tip_card_on_home_screen"), BetaFlag, Immutable
     data object TIP_CARD_FLIPPABLE: PrefsBool("tipcard_flippable"), BetaFlag
-    data object CAMERA_GESTURES_ENABLED: PrefsBool("camera_gestures_enabled"), BetaFlag
+    data object CAMERA_GESTURES_ENABLED: PrefsBool("camera_gestures_enabled"), BetaFlag, Immutable
+    data object CAMERA_DRAG_INVERTED: PrefsBool("camera_drag_inverted"), BetaFlag
 }
 
 val APP_SETTINGS: List<AppSetting> = listOf(PrefsBool.CAMERA_START_BY_DEFAULT, PrefsBool.REQUIRE_BIOMETRICS)

api/src/main/java/com/getcode/network/repository/BetaFlagsRepository.kt

@@ -22,6 +22,7 @@ data class BetaOptions(
     val shareTweetToTip: Boolean,
     val tipCardOnHomeScreen: Boolean,
     val cameraGesturesEnabled: Boolean,
+    val invertedDragZoom: Boolean,
     val canFlipTipCard: Boolean,
 ) {
     companion object {
@@ -43,6 +44,7 @@ data class BetaOptions(
             shareTweetToTip = true,
             tipCardOnHomeScreen = true,
             cameraGesturesEnabled = true,
+            invertedDragZoom = false,
             canFlipTipCard = false
         )
     }
@@ -82,6 +84,7 @@ class BetaFlagsRepository @Inject constructor(
             observeBetaFlag(PrefsBool.SHARE_TWEET_TO_TIP, default = defaults.shareTweetToTip),
             observeBetaFlag(PrefsBool.TIP_CARD_ON_HOMESCREEN, defaults.tipCardOnHomeScreen),
             observeBetaFlag(PrefsBool.CAMERA_GESTURES_ENABLED, defaults.cameraGesturesEnabled),
+            observeBetaFlag(PrefsBool.CAMERA_DRAG_INVERTED, defaults.invertedDragZoom),
             observeBetaFlag(PrefsBool.TIP_CARD_FLIPPABLE, defaults.canFlipTipCard)
         ) {
             BetaOptions(
@@ -101,7 +104,8 @@ class BetaFlagsRepository @Inject constructor(
                 shareTweetToTip = it[13],
                 tipCardOnHomeScreen = it[14],
                 cameraGesturesEnabled = it[15],
-                canFlipTipCard = it[16],
+                invertedDragZoom = it[16],
+                canFlipTipCard = it[17],
             )
         }
     }

api/src/main/java/com/getcode/network/repository/FeatureRepository.kt

@@ -10,6 +10,7 @@ import com.getcode.model.TipCardOnHomeScreenFeature
 import com.getcode.model.ConversationCashFeature
 import com.getcode.model.ConversationsFeature
 import com.getcode.model.FlippableTipCardFeature
+import com.getcode.model.InvertedDragZoomFeature
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
@@ -33,6 +34,7 @@ class FeatureRepository @Inject constructor(
     val conversationsCash = betaFlags.observe().map { ConversationCashFeature(it.conversationCashEnabled) }
 
     val cameraGestures = betaFlags.observe().map { CameraGesturesFeature(it.cameraGesturesEnabled) }
+    val invertedDragZoom = betaFlags.observe().map { InvertedDragZoomFeature(it.invertedDragZoom) }
 
     val requestKin = betaFlags.observe().map { RequestKinFeature(it.giveRequestsEnabled) }
 

app/src/main/java/com/getcode/view/main/account/BetaFlagsScreen.kt

@@ -60,6 +60,12 @@ fun BetaFlagsScreen(
             stringResource(id = R.string.beta_camera_gestures_description),
             state.cameraGesturesEnabled,
         ),
+        BetaFeature(
+            PrefsBool.CAMERA_DRAG_INVERTED,
+            R.string.beta_camera_invert_drag,
+            stringResource(id = R.string.beta_camera_invert_drag_description),
+            state.invertedDragZoom,
+        ),
         BetaFeature(
             PrefsBool.TIP_CARD_FLIPPABLE,
             R.string.beta_tipcard_can_flip,

app/src/main/java/com/getcode/view/main/camera/CodeScanner.kt

@@ -60,6 +60,7 @@ import java.util.concurrent.TimeUnit
 fun CodeScanner(
     scanningEnabled: Boolean,
     cameraGesturesEnabled: Boolean,
+    invertedDragZoomEnabled: Boolean,
     onPreviewStateChanged: (Boolean) -> Unit,
     onCodeScanned: (ScannableKikCode) -> Unit
 ) {
@@ -154,6 +155,7 @@ fun CodeScanner(
                 cameraControl,
                 cameraInfo,
                 cameraGesturesEnabled,
+                invertedDragZoomEnabled,
             ) { point ->
                 autoFocusPoint = point
             }
@@ -220,6 +222,7 @@ private fun setupInteractionControls(
     cameraControl: CameraControl,
     cameraInfo: CameraInfo,
     cameraGesturesEnabled: Boolean,
+    invertedDragZoomEnabled: Boolean,
     onTap: (Offset) -> Unit,
 ) {
     var shouldIgnoreScroll = false
@@ -291,7 +294,11 @@ private fun setupInteractionControls(
                 distanceY: Float
             ): Boolean {
                 if (!shouldIgnoreScroll) {
-                    accumulatedDelta += distanceY
+                    accumulatedDelta = if (invertedDragZoomEnabled) {
+                        accumulatedDelta + distanceY
+                    } else {
+                        accumulatedDelta - distanceY
+                    }
 
                     val deltaZoom = accumulatedDelta / 1000f
                     val maxZoom = cameraInfo.zoomState.value?.maxZoomRatio ?: 1f
@@ -351,4 +358,4 @@ private fun animateZoomReset(cameraInfo: CameraInfo, cameraControl: CameraContro
             }
         }
     })
-}
+}

app/src/main/java/com/getcode/view/main/home/HomeScan.kt

@@ -227,6 +227,7 @@ private fun HomeScan(
             CodeScanner(
                 scanningEnabled = previewing,
                 cameraGesturesEnabled = dataState.cameraGestures.enabled,
+                invertedDragZoomEnabled = dataState.invertedDragZoom.enabled,
                 onPreviewStateChanged = { previewing = it },
                 onCodeScanned = {
                     if (previewing) {

app/src/main/java/com/getcode/view/main/home/HomeViewModel.kt

@@ -32,6 +32,7 @@ import com.getcode.model.Feature
 import com.getcode.model.Fiat
 import com.getcode.model.FlippableTipCardFeature
 import com.getcode.model.IntentMetadata
+import com.getcode.model.InvertedDragZoomFeature
 import com.getcode.model.Kin
 import com.getcode.model.KinAmount
 import com.getcode.model.Kind
@@ -160,6 +161,7 @@ data class HomeUiModel(
     val buyModule: Feature = BuyModuleFeature(),
     val requestKin: Feature = RequestKinFeature(),
     val cameraGestures: Feature = CameraGesturesFeature(),
+    val invertedDragZoom: Feature = InvertedDragZoomFeature(),
     val flippableTipCard: Feature = FlippableTipCardFeature(),
     val actions: List<HomeAction> = listOf(HomeAction.GIVE_KIN, HomeAction.TIP_CARD, HomeAction.BALANCE),
     val tipCardConnected: Boolean = false,
@@ -246,6 +248,14 @@ class HomeViewModel @Inject constructor(
                 }
             }.launchIn(viewModelScope)
 
+        features.invertedDragZoom
+            .distinctUntilChanged()
+            .onEach { module ->
+                uiFlow.update {
+                    it.copy(invertedDragZoom = module)
+                }
+            }.launchIn(viewModelScope)
+
         features.tipCardFlippable
             .distinctUntilChanged()
             .onEach { module ->

app/src/main/res/values/strings-universal.xml

@@ -27,6 +27,7 @@
     <string translatable="false" name="beta_kado_webview">Buy Kin Internally</string>
     <string translatable="false" name="beta_share_tweet_tip">Share Tweets to Tip</string>
     <string translatable="false" name="beta_camera_gestures">Camera Gestures</string>
+    <string translatable="false" name="beta_camera_invert_drag">Invert Camera Drag-to-Zoom</string>
     <string translatable="false" name="beta_tipcard_can_flip">Tap Tip Card to See Back</string>
     <string translatable="false" name="beta_display_errors">Show Errors</string>
     <string name="beta_bucket_debugger_description" translatable="false">If enabled, you\'ll gain the ability to tap the balance on the Balance screen to inspect individual bucket balances.</string>
@@ -44,6 +45,7 @@
     <string name="beta_kado_webview_description" translatable="false">If enabled, the Buy Kin flow will open in an internal WebView.</string>
     <string name="beta_share_tweet_tip_description" translatable="false">If enabled, you\'ll gain the ability to share tweets directly from Twitter to Code to tip the author.</string>
     <string name="beta_camera_gestures_description" translatable="false">If enabled, you\'ll gain the ability to pinch-to-zoom, drag-to-zoom, and tap to auto focus on the camera screen.</string>
+    <string name="beta_camera_invert_drag_description" translatable="false">If enabled, drag-to-zoom will operate in reverse (drag up to zoom instead of down).</string>
     <string name="beta_tipcard_can_flip_description" translatable="false">If enabled, you\'ll gain the ability to tap your own Tip Card to see the back.</string>
     <string name="subtitle_remoteSendText" translatable="false">%1$s %2$s</string>
     <string name="beta_resetTooltips" translatable="false">Reset Tooltips</string>