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
14 changes: 14 additions & 0 deletions apps/flipcash/core/src/main/res/drawable/ic_send_large.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="128dp"
android:height="128dp"
android:viewportWidth="128"
android:viewportHeight="128">
<path
android:pathData="M54.34,60.26L99.71,35.02M64.33,101.05L104.62,32.29H26.04L53.11,60.94L64.33,101.05Z"
android:strokeAlpha="0.5"
android:strokeWidth="5.89366"
android:fillColor="#00000000"
android:strokeColor="#ffffff"
android:fillAlpha="0.5"
android:strokeLineCap="square"/>
</vector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="128dp"
android:height="128dp"
android:viewportWidth="128"
android:viewportHeight="128">
<path
android:pathData="M64,53.27V71.22M64,82.39V82.43M64,24.11L21.38,95.89H106.61L64,24.11Z"
android:strokeAlpha="0.4"
android:strokeWidth="5"
android:fillColor="#00000000"
android:strokeColor="#ffffff"
android:fillAlpha="0.4"
android:strokeLineCap="square"/>
</vector>
5 changes: 5 additions & 0 deletions apps/flipcash/core/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,12 @@
<string name="error_title_ignoredContactPermissions">Are You Sure?</string>
<string name="error_description_ignoredContactPermissions">You won\'t be able to send cash to your contacts</string>

<string name="permissions_title_contactsSimple">Send Money To Your Friends</string>
<string name="permissions_description_contactsSimple">Sync your contacts to find, invite, and pay friends</string>

<string name="permissions_title_contactsRationale">Send Money to Your Friends</string>
<string name="permissions_title_contactsRationaleSimple">Allow Contact Access</string>
<string name="permissions_description_contactsRationaleSimple">Turn on contact access so you can find people, send cash, and message them</string>
<string name="rationale_bullet_contactChoice">You decide which contacts to add</string>
<string name="rationale_bullet_secure">Your information is always secure</string>
<string name="rationale_bullet_changeAccess">Change contact access at any time</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.flipcash.app.analytics.Button
import com.flipcash.app.core.send.SendResult
Expand All @@ -16,6 +17,7 @@ import com.flipcash.app.permissions.ContactAccessResult
import com.flipcash.app.permissions.internal.contacts.ContactRationaleContent
import com.flipcash.app.permissions.internal.contacts.ContactScreenContent
import com.flipcash.app.permissions.rememberContactAccessHandle
import com.flipcash.features.directsend.R
import com.getcode.libs.analytics.LocalAnalytics
import com.getcode.navigation.flow.flowSharedViewModel
import com.getcode.navigation.flow.rememberFlowNavigator
Expand Down Expand Up @@ -103,7 +105,7 @@ internal fun ContactsPermissionGateScreen() {
CodeScaffold(
topBar = {
AppBarWithTitle(
title = "",
title = stringResource(R.string.title_send),
endContent = {
AppBarDefaults.Close { flowNavigator.exitCanceled() }
},
Expand All @@ -112,10 +114,11 @@ internal fun ContactsPermissionGateScreen() {
) { innerPadding ->
Box(modifier = Modifier.padding(innerPadding)) {
if (showRationale) {
ContactRationaleContent()
ContactRationaleContent(simplified = true)
} else {
ContactScreenContent(
accessHandle = accessHandle,
simplified = true,
isLoading = state.contactSyncState.loading,
isSuccess = state.contactSyncState.success,
)
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.flipcash.app.permissions.internal.contacts

import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
Expand All @@ -10,6 +12,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
Expand All @@ -31,10 +34,21 @@ import com.getcode.util.permissions.rememberContactPermission
@Composable
fun ContactScreenContent(
accessHandle: ContactAccessHandle,
simplified: Boolean = false,
onSkip: (() -> Unit)? = null,
isLoading: Boolean = false,
isSuccess: Boolean = false,
) {
if (simplified) {
SimplifiedContactScreenContent(
accessHandle = accessHandle,
onSkip = onSkip,
isLoading = isLoading,
isSuccess = isSuccess,
)
return
}

CodeScaffold(
bottomBar = {
ContactPermissionBottomBar(
Expand Down Expand Up @@ -76,6 +90,74 @@ fun ContactScreenContent(
}
}

@Composable
private fun SimplifiedContactScreenContent(
accessHandle: ContactAccessHandle,
onSkip: (() -> Unit)? = null,
isLoading: Boolean = false,
isSuccess: Boolean = false,
) {
CodeScaffold(
bottomBar = {
ContactPermissionBottomBar(
accessHandle = accessHandle,
onSkip = onSkip,
isLoading = isLoading,
isSuccess = isSuccess,
action = stringResource(R.string.action_continue),
)
}
) { padding ->
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
Column(
modifier = Modifier.fillMaxWidth(),
verticalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x6),
horizontalAlignment = Alignment.CenterHorizontally,
) {
Image(
painter = painterResource(R.drawable.ic_send_large),
contentDescription = null,
)
Column(
modifier = Modifier.fillMaxWidth(0.8f),
verticalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x2),
horizontalAlignment = Alignment.CenterHorizontally,
) {
Text(
text = stringResource(R.string.permissions_title_contactsSimple),
style = CodeTheme.typography.textLarge,
color = CodeTheme.colors.textMain,
)
Text(
modifier = Modifier.fillMaxWidth(),
text = stringResource(R.string.permissions_description_contactsSimple),
style = CodeTheme.typography.textSmall,
color = CodeTheme.colors.textSecondary,
textAlign = TextAlign.Center,
)
}
Column(
modifier = Modifier.fillMaxWidth(),
verticalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x2),
horizontalAlignment = Alignment.CenterHorizontally,

) {
BulletRow(
painter = painterResource(com.flipcash.core.R.drawable.ic_checklist),
text = stringResource(com.flipcash.core.R.string.rationale_bullet_contactChoice),
textColor = CodeTheme.colors.textMain,
)
BulletRow(
painter = painterResource(com.flipcash.core.R.drawable.ic_people_gear),
text = stringResource(com.flipcash.core.R.string.rationale_bullet_changeAccess),
textColor = CodeTheme.colors.textMain,
)
}
}
}
}
}

@Composable
@Preview
@PreviewWrapper(FlipcashThemeWrapper::class)
Expand All @@ -86,4 +168,16 @@ private fun PreviewContactPermissionScreen() {
ContactScreenContent(state.asContactAccessHandle(), onSkip = { })
}
}
}

@Composable
@Preview
@PreviewWrapper(FlipcashThemeWrapper::class)
private fun PreviewSimplifiedContactPermissionScreen() {
CompositionLocalProvider(LocalAnalytics provides StubFlipcashAnalytics()) {
ProvideTestPermissions(granted = emptySet()) {
val state = rememberContactPermission()
ContactScreenContent(state.asContactAccessHandle(), simplified = true)
}
}
}
Loading
Loading