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
1 change: 1 addition & 0 deletions apps/flipcash/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ dependencies {
implementation(project(":apps:flipcash:shared:google-play-billing"))
implementation(project(":apps:flipcash:shared:currency-selection:core"))
implementation(project(":apps:flipcash:shared:currency-selection:ui"))
implementation(project(":apps:flipcash:shared:contacts"))
implementation(project(":apps:flipcash:shared:notifications"))
implementation(project(":apps:flipcash:shared:onramp:coinbase"))
implementation(project(":apps:flipcash:shared:onramp:deeplinks"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import com.flipcash.app.appsettings.LocalAppSettings
import com.flipcash.app.bill.customization.BillPlaygroundController
import com.flipcash.app.bill.customization.LocalBillPlaygroundController
import com.flipcash.app.billing.BillingClient
import com.flipcash.app.contacts.ContactCoordinator
import com.flipcash.app.contacts.LocalContactCoordinator
import com.flipcash.app.core.LocalUserManager
import com.flipcash.app.core.verification.email.EmailCodeChannel
import com.flipcash.app.core.verification.email.LocalEmailCodeChannel
Expand Down Expand Up @@ -115,6 +117,9 @@ class MainActivity : FragmentActivity() {
@Inject
lateinit var emailCodeChannel: EmailCodeChannel

@Inject
lateinit var contactCoordinator: ContactCoordinator

@Inject
lateinit var coinbaseOnRampController: CoinbaseOnRampController

Expand All @@ -141,6 +146,7 @@ class MainActivity : FragmentActivity() {
LocalBillPlaygroundController provides billPlaygroundController,
LocalAppUpdater provides appUpdater,
LocalEmailCodeChannel provides emailCodeChannel,
LocalContactCoordinator provides contactCoordinator,
LocalCoinbaseOnRampController provides coinbaseOnRampController,
LocalUiTesting provides intent.getBooleanExtra(UI_TEST, false),
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ sealed interface AppRoute : NavKey, Parcelable {
@Serializable
data class Purchase(val fromLogin: Boolean = false) : Onboarding

@Serializable
data class ContactPermission(val postCreate: Boolean): Onboarding
@Serializable
data class NotificationPermission(val postCreate: Boolean = false) : Onboarding
@Serializable
Expand Down Expand Up @@ -88,6 +90,8 @@ sealed interface AppRoute : NavKey, Parcelable {
val includeEmail: Boolean = true,
val email: String? = null,
val emailVerificationCode: String? = null,
val target: AppRoute? = null,
val fullScreen: Boolean = false,
) : AppRoute, FlowRouteWithResult<VerificationResult> {
override val initialStack: List<NavKey>
get() = buildVerificationInitialStack(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ fun VerificationFlowScreen(
route = route,
value = NavResultOrCanceled.ReturnValue(result),
)
outerNavigator.pop()
if (route.target != null && result is VerificationResult.Success) {
outerNavigator.replace(route.target!!)
} else {
outerNavigator.pop()
}
},
entryProvider = verificationEntryProvider(route),
)
Expand All @@ -59,13 +63,13 @@ private fun verificationEntryProvider(
VerificationFlowIntroContent(isForOnRamp = step.isForOnRamp)
}
annotatedEntry<VerificationStep.PhoneEntry> {
PhoneVerificationContent()
PhoneVerificationContent(isInModal = !route.fullScreen)
}
annotatedEntry<VerificationStep.PhoneCode> {
PhoneCodeContent(includeEmail = route.includeEmail)
PhoneCodeContent(includeEmail = route.includeEmail, isInModal = !route.fullScreen)
}
annotatedEntry<VerificationStep.PhoneCountryCode> {
PhoneCountryCodeContent()
PhoneCountryCodeContent(isInModal = !route.fullScreen)
}
annotatedEntry<VerificationStep.EmailEntry> {
EmailVerificationContent(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import kotlinx.coroutines.flow.onEach
@Composable
fun PhoneCodeContent(
includeEmail: Boolean,
isInModal: Boolean = true,
) {
val flowNavigator = rememberFlowNavigator<VerificationStep, VerificationResult>()
val viewModel = flowSharedViewModel<PhoneVerificationViewModel>()
Expand All @@ -34,7 +35,7 @@ fun PhoneCodeContent(
) {
AppBarWithTitle(
title = stringResource(R.string.title_enterTheCode),
isInModal = true,
isInModal = isInModal,
titleAlignment = Alignment.CenterHorizontally,
backButton = true,
onBackIconClicked = { flowNavigator.back() },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach

@Composable
fun PhoneCountryCodeContent() {
fun PhoneCountryCodeContent(isInModal: Boolean = true) {
val flowNavigator = rememberFlowNavigator<VerificationStep, VerificationResult>()
val viewModel = flowSharedViewModel<PhoneVerificationViewModel>()

Expand All @@ -30,7 +30,7 @@ fun PhoneCountryCodeContent() {
) {
AppBarWithTitle(
title = stringResource(R.string.title_verifyPhoneNumber),
isInModal = true,
isInModal = isInModal,
titleAlignment = Alignment.CenterHorizontally,
backButton = true,
onBackIconClicked = { flowNavigator.back() },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach

@Composable
fun PhoneVerificationContent() {
fun PhoneVerificationContent(isInModal: Boolean = true) {
val codeNavigator = LocalCodeNavigator.current
val flowNavigator = rememberFlowNavigator<VerificationStep, VerificationResult>()
val viewModel = flowSharedViewModel<PhoneVerificationViewModel>()
Expand All @@ -37,7 +37,7 @@ fun PhoneVerificationContent() {
) {
AppBarWithTitle(
title = stringResource(R.string.title_verifyPhoneNumber),
isInModal = true,
isInModal = isInModal,
titleAlignment = Alignment.CenterHorizontally,
backButton = true,
onBackIconClicked = {
Expand Down
2 changes: 2 additions & 0 deletions apps/flipcash/shared/contacts/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
build/
.gradle/
23 changes: 23 additions & 0 deletions apps/flipcash/shared/contacts/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
plugins {
alias(libs.plugins.flipcash.android.feature)
}

android {
namespace = "${Gradle.flipcashNamespace}.shared.contacts"
}

dependencies {
testImplementation(kotlin("test"))
testImplementation(libs.bundles.unit.testing)
testImplementation(libs.robolectric)

implementation(project(":services:flipcash"))
implementation(project(":services:opencode"))
implementation(project(":apps:flipcash:shared:persistence:db"))
implementation(project(":apps:flipcash:shared:phone"))
implementation(project(":apps:flipcash:shared:featureflags"))
implementation(project(":libs:encryption:keys"))
implementation(project(":libs:network:connectivity:public"))
implementation(libs.androidx.lifecycle.process)
implementation(libs.bundles.room)
}
8 changes: 8 additions & 0 deletions apps/flipcash/shared/contacts/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.READ_CONTACTS" />
<application>

</application>

</manifest>
Loading
Loading