Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions api/src/main/java/com/getcode/model/Feature.kt
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,9 @@ data class CameraAFFeature(
data class CameraZoomFeature(
override val enabled: Boolean = BetaOptions.Defaults.cameraPinchZoomEnabled,
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
): Feature
2 changes: 1 addition & 1 deletion api/src/main/java/com/getcode/model/PrefBool.kt
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ sealed class PrefsBool(val value: String) {
data object KADO_WEBVIEW_ENABLED : PrefsBool("kado_inapp_enabled"), BetaFlag
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_AF_ENABLED: PrefsBool("camera_af_enabled"), BetaFlag
data object CAMERA_PINCH_ZOOM: PrefsBool("camera_pinch_zoom_enabled"), BetaFlag
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ data class BetaOptions(
val tipCardOnHomeScreen: Boolean,
val cameraAFEnabled: Boolean,
val cameraPinchZoomEnabled: Boolean,
val canFlipTipCard: Boolean,
) {
companion object {
// Default states for various beta flags in app.
Expand All @@ -44,6 +45,7 @@ data class BetaOptions(
tipCardOnHomeScreen = true,
cameraAFEnabled = true,
cameraPinchZoomEnabled = true,
canFlipTipCard = false
)
}
}
Expand Down Expand Up @@ -83,6 +85,7 @@ class BetaFlagsRepository @Inject constructor(
observeBetaFlag(PrefsBool.TIP_CARD_ON_HOMESCREEN, defaults.tipCardOnHomeScreen),
observeBetaFlag(PrefsBool.CAMERA_AF_ENABLED, defaults.cameraAFEnabled),
observeBetaFlag(PrefsBool.CAMERA_PINCH_ZOOM, defaults.cameraPinchZoomEnabled),
observeBetaFlag(PrefsBool.TIP_CARD_FLIPPABLE, defaults.canFlipTipCard)
) {
BetaOptions(
showNetworkDropOff = it[0],
Expand All @@ -101,7 +104,8 @@ class BetaFlagsRepository @Inject constructor(
shareTweetToTip = it[13],
tipCardOnHomeScreen = it[14],
cameraAFEnabled = it[15],
cameraPinchZoomEnabled = it[16]
cameraPinchZoomEnabled = it[16],
canFlipTipCard = it[17]
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import com.getcode.model.TipCardFeature
import com.getcode.model.TipCardOnHomeScreenFeature
import com.getcode.model.ConversationCashFeature
import com.getcode.model.ConversationsFeature
import com.getcode.model.FlippableTipCardFeature
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.map
import javax.inject.Inject
Expand All @@ -27,6 +28,7 @@ class FeatureRepository @Inject constructor(

val tipCards = betaFlags.observe().map { TipCardFeature(it.tipsEnabled) }
val tipCardOnHomeScreen = betaFlags.observe().map { TipCardOnHomeScreenFeature(it.tipCardOnHomeScreen) }
val tipCardFlippable = betaFlags.observe().map { FlippableTipCardFeature(it.canFlipTipCard) }
val conversations = betaFlags.observe().map { ConversationsFeature(it.conversationsEnabled) }
val conversationsCash = betaFlags.observe().map { ConversationCashFeature(it.conversationCashEnabled) }

Expand Down
13 changes: 10 additions & 3 deletions app/src/main/java/com/getcode/models/BillState.kt
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ sealed interface Bill {
is Tip -> true
}

val canFlip: Boolean

val metadata: Metadata
get() {
return when (this) {
Expand Down Expand Up @@ -135,8 +137,10 @@ sealed interface Bill {
override val amount: KinAmount,
override val didReceive: Boolean = false,
override val data: List<Byte> = emptyList(),
val kind: Kind = Kind.cash
) : Bill
val kind: Kind = Kind.cash,
) : Bill {
override val canFlip: Boolean = false
}

data class Payment(
override val amount: KinAmount,
Expand All @@ -145,6 +149,7 @@ sealed interface Bill {
) : Bill {
override val didReceive: Boolean = false
override val data: List<Byte> = payload.codeData.toList()
override val canFlip: Boolean = false
}

data class Login(
Expand All @@ -154,11 +159,13 @@ sealed interface Bill {
) : Bill {
override val didReceive: Boolean = false
override val data: List<Byte> = payload.codeData.toList()
override val canFlip: Boolean = false
}

data class Tip(
val payload: CodePayload,
val request: DeepLinkRequest? = null
val request: DeepLinkRequest? = null,
override val canFlip: Boolean = false
) : Bill {
override val amount: KinAmount = KinAmount.newInstance(Kin.fromKin(0), Rate.oneToOne)
override val didReceive: Boolean = false
Expand Down
66 changes: 36 additions & 30 deletions app/src/main/java/com/getcode/view/main/account/BetaFlagsScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,42 @@ fun BetaFlagsScreen(
val tipsEngine = LocalTipsEngine.current

val options = listOf(
BetaFeature(
PrefsBool.KADO_WEBVIEW_ENABLED,
R.string.beta_kado_webview,
stringResource(id = R.string.beta_kado_webview_description),
state.kadoWebViewEnabled,
),
BetaFeature(
PrefsBool.SHARE_TWEET_TO_TIP,
R.string.beta_share_tweet_tip,
stringResource(id = R.string.beta_share_tweet_tip_description),
state.shareTweetToTip,
),
BetaFeature(
PrefsBool.CAMERA_AF_ENABLED,
R.string.beta_camera_af,
stringResource(id = R.string.beta_camera_af_description),
state.cameraAFEnabled,
),
BetaFeature(
PrefsBool.CAMERA_PINCH_ZOOM,
R.string.beta_camera_pinch_zoom,
stringResource(id = R.string.beta_camera_pinch_zoom_description),
state.cameraPinchZoomEnabled,
),
BetaFeature(
PrefsBool.TIP_CARD_FLIPPABLE,
R.string.beta_tipcard_can_flip,
stringResource(id = R.string.beta_tipcard_can_flip_description),
state.canFlipTipCard,
),
BetaFeature(
PrefsBool.CONVERSATIONS_ENABLED,
R.string.beta_conversations,
stringResource(id = R.string.beta_conversations_description),
state.conversationsEnabled,
),
BetaFeature(
PrefsBool.VIBRATE_ON_SCAN,
R.string.beta_vibrate_on_scan,
Expand Down Expand Up @@ -96,42 +132,12 @@ fun BetaFlagsScreen(
stringResource(id = R.string.beta_tipcard_on_homescreen_description),
state.tipCardOnHomeScreen,
),
BetaFeature(
PrefsBool.CONVERSATIONS_ENABLED,
R.string.beta_conversations,
stringResource(id = R.string.beta_conversations_description),
state.conversationsEnabled,
),
BetaFeature(
PrefsBool.CONVERSATION_CASH_ENABLED,
R.string.beta_conversations_cash,
stringResource(id = R.string.beta_conversations_cash_description),
state.conversationCashEnabled,
),
BetaFeature(
PrefsBool.KADO_WEBVIEW_ENABLED,
R.string.beta_kado_webview,
stringResource(id = R.string.beta_kado_webview_description),
state.kadoWebViewEnabled,
),
BetaFeature(
PrefsBool.SHARE_TWEET_TO_TIP,
R.string.beta_share_tweet_tip,
stringResource(id = R.string.beta_share_tweet_tip_description),
state.shareTweetToTip,
),
BetaFeature(
PrefsBool.CAMERA_AF_ENABLED,
R.string.beta_camera_af,
stringResource(id = R.string.beta_camera_af_description),
state.cameraAFEnabled,
),
BetaFeature(
PrefsBool.CAMERA_PINCH_ZOOM,
R.string.beta_camera_pinch_zoom,
stringResource(id = R.string.beta_camera_pinch_zoom),
state.cameraPinchZoomEnabled,
),
BetaFeature(
PrefsBool.DISPLAY_ERRORS,
R.string.beta_display_errors,
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/getcode/view/main/bill/Bill.kt
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ fun Bill(
modifier = modifier,
username = bill.payload.username.orEmpty(),
data = bill.data,
interactive = bill.canFlip
)
}
}
Expand Down
Loading