-
Notifications
You must be signed in to change notification settings - Fork 130
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #10772 from woocommerce/issue/10721-blaze-payment-…
…methods-list [Blaze] Payment methods list
- Loading branch information
Showing
8 changed files
with
556 additions
and
32 deletions.
There are no files selected for viewing
51 changes: 51 additions & 0 deletions
51
.../woocommerce/android/ui/blaze/creation/payment/BlazeCampaignPaymentMethodsListFragment.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
package com.woocommerce.android.ui.blaze.creation.payment | ||
|
||
import android.os.Bundle | ||
import android.view.LayoutInflater | ||
import android.view.View | ||
import android.view.ViewGroup | ||
import androidx.fragment.app.viewModels | ||
import androidx.navigation.fragment.findNavController | ||
import com.woocommerce.android.extensions.navigateBackWithResult | ||
import com.woocommerce.android.ui.base.BaseFragment | ||
import com.woocommerce.android.ui.compose.composeView | ||
import com.woocommerce.android.ui.compose.theme.WooThemeWithBackground | ||
import com.woocommerce.android.ui.main.AppBarStatus | ||
import com.woocommerce.android.viewmodel.MultiLiveEvent | ||
import dagger.hilt.android.AndroidEntryPoint | ||
|
||
@AndroidEntryPoint | ||
class BlazeCampaignPaymentMethodsListFragment : BaseFragment() { | ||
companion object { | ||
const val SELECTED_PAYMENT_METHOD_KEY = "selectedPaymentMethodId" | ||
} | ||
|
||
override val activityAppBarStatus: AppBarStatus | ||
get() = AppBarStatus.Hidden | ||
|
||
private val viewModel: BlazeCampaignPaymentMethodsListViewModel by viewModels() | ||
|
||
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { | ||
return composeView { | ||
WooThemeWithBackground { | ||
BlazeCampaignPaymentMethodsListScreen(viewModel) | ||
} | ||
} | ||
} | ||
|
||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
handleResults() | ||
} | ||
|
||
private fun handleResults() { | ||
viewModel.event.observe(viewLifecycleOwner) { event -> | ||
when (event) { | ||
MultiLiveEvent.Event.Exit -> findNavController().navigateUp() | ||
is MultiLiveEvent.Event.ExitWithResult<*> -> navigateBackWithResult( | ||
key = SELECTED_PAYMENT_METHOD_KEY, | ||
result = event.data | ||
) | ||
} | ||
} | ||
} | ||
} |
310 changes: 310 additions & 0 deletions
310
...om/woocommerce/android/ui/blaze/creation/payment/BlazeCampaignPaymentMethodsListScreen.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,310 @@ | ||
package com.woocommerce.android.ui.blaze.creation.payment | ||
|
||
import android.content.res.Configuration | ||
import androidx.compose.foundation.Image | ||
import androidx.compose.foundation.clickable | ||
import androidx.compose.foundation.layout.Column | ||
import androidx.compose.foundation.layout.Row | ||
import androidx.compose.foundation.layout.Spacer | ||
import androidx.compose.foundation.layout.fillMaxWidth | ||
import androidx.compose.foundation.layout.height | ||
import androidx.compose.foundation.layout.padding | ||
import androidx.compose.foundation.lazy.LazyColumn | ||
import androidx.compose.foundation.lazy.items | ||
import androidx.compose.material.ContentAlpha | ||
import androidx.compose.material.Divider | ||
import androidx.compose.material.Icon | ||
import androidx.compose.material.MaterialTheme | ||
import androidx.compose.material.Scaffold | ||
import androidx.compose.material.Text | ||
import androidx.compose.material.icons.Icons | ||
import androidx.compose.material.icons.filled.Add | ||
import androidx.compose.material.icons.filled.ArrowBack | ||
import androidx.compose.material.icons.filled.Check | ||
import androidx.compose.material.icons.filled.Clear | ||
import androidx.compose.material.icons.outlined.VerifiedUser | ||
import androidx.compose.runtime.Composable | ||
import androidx.compose.runtime.livedata.observeAsState | ||
import androidx.compose.runtime.remember | ||
import androidx.compose.ui.Alignment | ||
import androidx.compose.ui.Modifier | ||
import androidx.compose.ui.res.dimensionResource | ||
import androidx.compose.ui.res.painterResource | ||
import androidx.compose.ui.res.stringResource | ||
import androidx.compose.ui.tooling.preview.Preview | ||
import com.woocommerce.android.R | ||
import com.woocommerce.android.model.CreditCardType | ||
import com.woocommerce.android.ui.blaze.BlazeRepository.PaymentMethod | ||
import com.woocommerce.android.ui.blaze.BlazeRepository.PaymentMethodUrls | ||
import com.woocommerce.android.ui.compose.component.Toolbar | ||
import com.woocommerce.android.ui.compose.component.WCColoredButton | ||
import com.woocommerce.android.ui.compose.component.WCTextButton | ||
import com.woocommerce.android.ui.compose.theme.WooThemeWithBackground | ||
|
||
@Composable | ||
fun BlazeCampaignPaymentMethodsListScreen(viewModel: BlazeCampaignPaymentMethodsListViewModel) { | ||
viewModel.viewState.observeAsState().value?.let { | ||
BlazeCampaignPaymentMethodsListScreen( | ||
viewState = it | ||
) | ||
} | ||
} | ||
|
||
@Composable | ||
private fun BlazeCampaignPaymentMethodsListScreen(viewState: BlazeCampaignPaymentMethodsListViewModel.ViewState) { | ||
Scaffold( | ||
topBar = { | ||
Toolbar( | ||
title = stringResource(id = R.string.blaze_campaign_payment_list_screen_title), | ||
onNavigationButtonClick = viewState.onDismiss, | ||
navigationIcon = when (viewState) { | ||
is BlazeCampaignPaymentMethodsListViewModel.ViewState.PaymentMethodsList -> Icons.Default.ArrowBack | ||
is BlazeCampaignPaymentMethodsListViewModel.ViewState.AddPaymentMethodWebView -> Icons.Default.Clear | ||
} | ||
) | ||
}, | ||
backgroundColor = MaterialTheme.colors.surface | ||
) { paddingValues -> | ||
when (viewState) { | ||
is BlazeCampaignPaymentMethodsListViewModel.ViewState.PaymentMethodsList -> { | ||
PaymentMethodsList( | ||
state = viewState, | ||
modifier = Modifier.padding(paddingValues) | ||
) | ||
} | ||
|
||
is BlazeCampaignPaymentMethodsListViewModel.ViewState.AddPaymentMethodWebView -> { | ||
AddPaymentMethodWebView( | ||
urls = viewState.urls, | ||
onUrlLoaded = viewState.onUrlLoaded, | ||
modifier = Modifier.padding(paddingValues) | ||
) | ||
} | ||
} | ||
} | ||
} | ||
|
||
@Composable | ||
private fun PaymentMethodsList( | ||
state: BlazeCampaignPaymentMethodsListViewModel.ViewState.PaymentMethodsList, | ||
modifier: Modifier | ||
) { | ||
Column(modifier) { | ||
PaymentMethodsHeader(Modifier.fillMaxWidth()) | ||
if (state.paymentMethods.isEmpty()) { | ||
EmptyPaymentMethodsView( | ||
onAddPaymentMethodClicked = state.onAddPaymentMethodClicked, | ||
modifier = modifier | ||
.fillMaxWidth() | ||
.weight(1f) | ||
) | ||
} else { | ||
PaymentMethodsListView( | ||
paymentMethods = state.paymentMethods, | ||
accountEmail = state.accountEmail, | ||
accountUsername = state.accountUsername, | ||
selectedPaymentMethod = state.selectedPaymentMethod!!, | ||
onPaymentMethodClicked = state.onPaymentMethodClicked, | ||
onAddPaymentMethodClicked = state.onAddPaymentMethodClicked, | ||
modifier = modifier | ||
.fillMaxWidth() | ||
.weight(1f) | ||
) | ||
} | ||
} | ||
} | ||
|
||
@Composable | ||
private fun PaymentMethodsHeader(modifier: Modifier = Modifier) { | ||
Row(modifier.padding(dimensionResource(id = R.dimen.major_100))) { | ||
Icon( | ||
imageVector = Icons.Outlined.VerifiedUser, | ||
tint = MaterialTheme.colors.primary, | ||
contentDescription = null | ||
) | ||
Spacer(modifier = Modifier.padding(dimensionResource(id = R.dimen.minor_100))) | ||
Text(text = stringResource(id = R.string.blaze_campaign_payment_list_header_text)) | ||
} | ||
} | ||
|
||
@Composable | ||
private fun PaymentMethodsListView( | ||
paymentMethods: List<PaymentMethod>, | ||
selectedPaymentMethod: PaymentMethod, | ||
accountEmail: String, | ||
accountUsername: String, | ||
onPaymentMethodClicked: (PaymentMethod) -> Unit, | ||
onAddPaymentMethodClicked: () -> Unit, | ||
modifier: Modifier | ||
) { | ||
LazyColumn(modifier = modifier) { | ||
items(paymentMethods) { paymentMethod -> | ||
Column { | ||
PaymentMethodItem( | ||
paymentMethod = paymentMethod, | ||
onPaymentMethodClicked = { onPaymentMethodClicked(paymentMethod) }, | ||
isSelected = paymentMethod == selectedPaymentMethod | ||
) | ||
} | ||
Divider() | ||
} | ||
|
||
item { | ||
Text( | ||
text = stringResource( | ||
id = R.string.blaze_campaign_payment_list_hint, | ||
accountUsername, | ||
accountEmail | ||
), | ||
style = MaterialTheme.typography.caption, | ||
color = MaterialTheme.colors.onSurface.copy( | ||
alpha = ContentAlpha.medium | ||
), | ||
modifier = Modifier.padding(dimensionResource(id = R.dimen.major_100)) | ||
) | ||
} | ||
|
||
item { | ||
WCTextButton( | ||
onClick = onAddPaymentMethodClicked, | ||
icon = Icons.Default.Add, | ||
text = stringResource(id = R.string.blaze_campaign_payment_list_add_new_payment_method_button) | ||
) | ||
} | ||
} | ||
} | ||
|
||
@Composable | ||
private fun PaymentMethodItem( | ||
paymentMethod: PaymentMethod, | ||
onPaymentMethodClicked: () -> Unit, | ||
isSelected: Boolean, | ||
modifier: Modifier = Modifier | ||
) { | ||
Row( | ||
verticalAlignment = Alignment.CenterVertically, | ||
modifier = modifier | ||
.clickable(onClick = onPaymentMethodClicked) | ||
.padding(dimensionResource(id = R.dimen.major_100)) | ||
) { | ||
Column(modifier = Modifier.weight(1f)) { | ||
Text( | ||
text = paymentMethod.name, | ||
style = MaterialTheme.typography.subtitle1 | ||
) | ||
paymentMethod.subtitle?.let { | ||
Text( | ||
text = it, | ||
style = MaterialTheme.typography.body2, | ||
color = MaterialTheme.colors.onSurface.copy( | ||
alpha = ContentAlpha.medium | ||
) | ||
) | ||
} | ||
} | ||
|
||
if (isSelected) { | ||
Icon( | ||
imageVector = Icons.Default.Check, | ||
tint = MaterialTheme.colors.primary, | ||
contentDescription = null | ||
) | ||
} | ||
} | ||
} | ||
|
||
@Composable | ||
private fun EmptyPaymentMethodsView( | ||
onAddPaymentMethodClicked: () -> Unit, | ||
modifier: Modifier | ||
) { | ||
Column( | ||
horizontalAlignment = Alignment.CenterHorizontally, | ||
modifier = modifier.padding( | ||
horizontal = dimensionResource(id = R.dimen.major_100), | ||
vertical = dimensionResource(id = R.dimen.major_200) | ||
) | ||
) { | ||
Spacer(modifier = Modifier.weight(1f)) | ||
Text(text = stringResource(id = R.string.blaze_campaign_payment_list_empty_state_text)) | ||
Spacer(modifier = Modifier.height(dimensionResource(id = R.dimen.major_200))) | ||
Image( | ||
painter = painterResource(id = R.drawable.img_empty_orders_all_fulfilled), | ||
contentDescription = null | ||
) | ||
Spacer(modifier = Modifier.height(dimensionResource(id = R.dimen.major_200))) | ||
WCColoredButton( | ||
onClick = onAddPaymentMethodClicked, | ||
text = stringResource(id = R.string.blaze_campaign_payment_list_add_payment_method_button) | ||
) | ||
Spacer(modifier = Modifier.weight(2f)) | ||
} | ||
} | ||
|
||
@Suppress("UNUSED_PARAMETER") | ||
@Composable | ||
fun AddPaymentMethodWebView( | ||
urls: PaymentMethodUrls, | ||
onUrlLoaded: (String) -> Unit, | ||
modifier: Modifier | ||
) { | ||
TODO("Not yet implemented") | ||
} | ||
|
||
@Preview(name = "dark", uiMode = Configuration.UI_MODE_NIGHT_YES) | ||
@Preview(name = "light", uiMode = Configuration.UI_MODE_NIGHT_NO) | ||
@Composable | ||
private fun EmptyPaymentMethodsListPreview() { | ||
WooThemeWithBackground { | ||
BlazeCampaignPaymentMethodsListScreen( | ||
viewState = BlazeCampaignPaymentMethodsListViewModel.ViewState.PaymentMethodsList( | ||
paymentMethods = emptyList(), | ||
selectedPaymentMethod = null, | ||
accountEmail = "email", | ||
accountUsername = "username", | ||
onPaymentMethodClicked = {}, | ||
onAddPaymentMethodClicked = {}, | ||
onDismiss = {} | ||
) | ||
) | ||
} | ||
} | ||
|
||
@Preview(name = "dark", uiMode = Configuration.UI_MODE_NIGHT_YES) | ||
@Preview(name = "light", uiMode = Configuration.UI_MODE_NIGHT_NO) | ||
@Composable | ||
private fun PaymentMethodsListPreview() { | ||
val paymentMethods = remember { | ||
listOf( | ||
PaymentMethod( | ||
id = "1", | ||
name = "Visa", | ||
info = PaymentMethod.PaymentMethodInfo.CreditCard( | ||
CreditCardType.VISA, | ||
"John Doe" | ||
) | ||
), | ||
PaymentMethod( | ||
id = "2", | ||
name = "MasterCard", | ||
info = PaymentMethod.PaymentMethodInfo.CreditCard( | ||
CreditCardType.MASTERCARD, | ||
"John Doe" | ||
) | ||
) | ||
) | ||
} | ||
WooThemeWithBackground { | ||
BlazeCampaignPaymentMethodsListScreen( | ||
viewState = BlazeCampaignPaymentMethodsListViewModel.ViewState.PaymentMethodsList( | ||
paymentMethods = paymentMethods, | ||
selectedPaymentMethod = paymentMethods.first(), | ||
accountEmail = "email", | ||
accountUsername = "username", | ||
onPaymentMethodClicked = {}, | ||
onAddPaymentMethodClicked = {}, | ||
onDismiss = {} | ||
) | ||
) | ||
} | ||
} |
Oops, something went wrong.