Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(bank-sdk): Skonto screen. Edit amounts implementation #488

Merged
merged 4 commits into from
Jul 15, 2024
Merged

feat(bank-sdk): Skonto screen. Edit amounts implementation #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3d110e
feat(bank-sdk): Skonto screen. Edit amounts implementation
ndubkov-distcotech Jul 10, 2024
8266514
feat(bank-sdk): Skonto screen. Edit amounts implementation
ndubkov-distcotech Jul 11, 2024
154dda5
feat(bank-sdk): Skonto screen. Edit amounts implementation
ndubkov-distcotech Jul 11, 2024
19aa716
feat(bank-sdk): Skonto screen. Edit amounts implementation
ndubkov-distcotech Jul 11, 2024
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
103 changes: 52 additions & 51 deletions bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
@file:OptIn(ExperimentalMaterial3Api::class)

package net.gini.android.bank.sdk.capture.skonto

import android.content.res.Configuration.UI_MODE_NIGHT_YES
import android.os.Bundle
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
Expand All @@ -28,7 +27,6 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
Expand Down Expand Up @@ -62,18 +60,22 @@ import net.gini.android.bank.sdk.capture.skonto.colors.section.SkontoFooterSecti
import net.gini.android.bank.sdk.capture.skonto.colors.section.SkontoInvoiceScanSectionColors
import net.gini.android.bank.sdk.capture.skonto.colors.section.SkontoSectionColors
import net.gini.android.bank.sdk.capture.skonto.colors.section.WithoutSkontoSectionColors
import net.gini.android.bank.sdk.capture.util.currencyFormatterWithoutSymbol
import net.gini.android.capture.GiniCapture
import net.gini.android.capture.ui.components.button.filled.GiniButton
import net.gini.android.capture.ui.components.picker.date.GiniDatePickerDialog
import net.gini.android.capture.ui.components.switcher.GiniSwitch
import net.gini.android.capture.ui.components.textinput.GiniTextInput
import net.gini.android.capture.ui.components.textinput.amount.GiniAmountTextInput
import net.gini.android.capture.ui.components.topbar.GiniTopBar
import net.gini.android.capture.ui.components.topbar.GiniTopBarColors
import net.gini.android.capture.ui.theme.GiniTheme
import java.math.BigDecimal
import java.math.RoundingMode
import java.text.DecimalFormat
import java.time.LocalDate
import java.time.format.DateTimeFormatter


class SkontoFragment : Fragment() {

val bottomNavBar = GiniCapture.getInstance().internal().navigationBarTopAdapterInstance
Expand Down Expand Up @@ -119,8 +121,8 @@ private fun ScreenContent(
private fun ScreenStateContent(
state: SkontoFragmentContract.State,
onDiscountSectionActiveChange: (Boolean) -> Unit,
onSkontoAmountChange: (String) -> Unit,
onFullAmountChange: (String) -> Unit,
onSkontoAmountChange: (BigDecimal) -> Unit,
onFullAmountChange: (BigDecimal) -> Unit,
onDueDateChanged: (LocalDate) -> Unit,
modifier: Modifier = Modifier,
screenColorScheme: SkontoScreenColors = SkontoScreenColors.colors()
Expand All @@ -144,12 +146,13 @@ private fun ScreenStateContent(
private fun ScreenReadyState(
state: SkontoFragmentContract.State.Ready,
onDiscountSectionActiveChange: (Boolean) -> Unit,
onDiscountAmountChange: (String) -> Unit,
onDiscountAmountChange: (BigDecimal) -> Unit,
onDueDateChanged: (LocalDate) -> Unit,
onFullAmountChange: (String) -> Unit,
onFullAmountChange: (BigDecimal) -> Unit,
modifier: Modifier = Modifier,
screenColorScheme: SkontoScreenColors = SkontoScreenColors.colors(),
) {

val scrollState = rememberScrollState()
Scaffold(modifier = modifier,
containerColor = screenColorScheme.backgroundColor,
Expand Down Expand Up @@ -189,7 +192,7 @@ private fun ScreenReadyState(
isActive = !state.isSkontoSectionActive,
amount = state.fullAmount,
currencyCode = "EUR",
onFullAmountChange = onFullAmountChange
onFullAmountChange = onFullAmountChange,
)
}
}
Expand Down Expand Up @@ -280,26 +283,19 @@ private fun YourInvoiceScanSection(
@Composable
private fun SkontoSection(
colors: SkontoSectionColors,
amount: Float,
amount: BigDecimal,
currencyCode: String,
dueDate: LocalDate,
infoPaymentInDays: Int,
infoDiscountValue: Float,
infoDiscountValue: BigDecimal,
onActiveChange: (Boolean) -> Unit,
onSkontoAmountChange: (String) -> Unit,
onSkontoAmountChange: (BigDecimal) -> Unit,
onDueDateChanged: (LocalDate) -> Unit,
modifier: Modifier = Modifier,
isActive: Boolean = true,
isActive: Boolean,
) {
val dateFormatter = DateTimeFormatter.ofPattern("dd.MM.yyyy")

val amountText = if (isActive) {
"%.2f".format(amount)
} else {
"$amount $currencyCode"
}


var isDatePickerVisible by remember { mutableStateOf(false) }
val amountFieldFocusRequester = remember { FocusRequester() }
val focusManager = LocalFocusManager.current
Expand Down Expand Up @@ -338,23 +334,18 @@ private fun SkontoSection(
}
InfoBanner(
paymentIn = infoPaymentInDays.toString(),
discountValue = infoDiscountValue.toString(),
discountValue = infoDiscountValue,
modifier = Modifier.fillMaxWidth(),
colors = colors.infoBannerColors,
)

GiniTextInput(
GiniAmountTextInput(
amount = amount,
modifier = Modifier
.fillMaxWidth()
.padding(top = 16.dp),
enabled = isActive,
colors = colors.amountFieldColors,
keyboardOptions = KeyboardOptions(
keyboardType = KeyboardType.Number,
imeAction = ImeAction.Done,
),
onValueChange = onSkontoAmountChange,
text = amountText,
onValueChange = { onSkontoAmountChange(it) },
label = stringResource(id = R.string.gbs_skonto_section_discount_field_amount_hint),
trailingContent = {
AnimatedVisibility(visible = isActive) {
Expand Down Expand Up @@ -410,7 +401,7 @@ private fun SkontoSection(
private fun InfoBanner(
colors: SkontoSectionColors.InfoBannerColors,
paymentIn: String,
discountValue: String,
discountValue: BigDecimal,
modifier: Modifier = Modifier,
) {
Row(
Expand All @@ -425,11 +416,15 @@ private fun InfoBanner(
contentDescription = null,
tint = colors.iconTint,
)
val animatedDiscountAmount by animateFloatAsState(
targetValue = discountValue.toFloat(), label = "discountAmount"
)

Text(
text = stringResource(
id = R.string.gbs_skonto_section_discount_info_banner_message,
paymentIn,
discountValue
animatedDiscountAmount.formatAsDiscountPercentage()
),
style = GiniTheme.typography.subtitle2,
color = colors.textColor,
Expand All @@ -440,11 +435,11 @@ private fun InfoBanner(
@Composable
private fun WithoutSkontoSection(
colors: WithoutSkontoSectionColors,
amount: String,
amount: BigDecimal,
currencyCode: String,
modifier: Modifier = Modifier,
onFullAmountChange: (String) -> Unit,
isActive: Boolean = true,
onFullAmountChange: (BigDecimal) -> Unit,
isActive: Boolean,
) {
Card(
modifier = modifier.fillMaxWidth(),
Expand Down Expand Up @@ -473,18 +468,14 @@ private fun WithoutSkontoSection(
)
}
}
GiniTextInput(
GiniAmountTextInput(
modifier = Modifier
.fillMaxWidth()
.padding(top = 16.dp),
enabled = isActive,
colors = colors.amountFieldColors,
keyboardOptions = KeyboardOptions(
keyboardType = KeyboardType.Number,
imeAction = ImeAction.Done,
),
onValueChange = { onFullAmountChange(it) },
text = amount,
amount = amount,
onValueChange = onFullAmountChange,
label = stringResource(id = R.string.gbs_skonto_section_without_discount_field_amount_hint),
trailingContent = {
AnimatedVisibility(visible = isActive) {
Expand All @@ -501,8 +492,8 @@ private fun WithoutSkontoSection(

@Composable
private fun FooterSection(
totalAmount: Float,
discountValue: Float,
totalAmount: BigDecimal,
discountValue: BigDecimal,
currency: String,
colors: SkontoFooterSectionColors,
modifier: Modifier = Modifier,
Expand All @@ -527,9 +518,11 @@ private fun FooterSection(
horizontalArrangement = Arrangement.Start,
verticalAlignment = Alignment.CenterVertically,
) {
val amount by animateFloatAsState(targetValue = totalAmount, label = "")
val animatedTotalAmount by animateFloatAsState(
targetValue = totalAmount.toFloat(), label = "totalAmount"
)
Text(
text = "${"%.2f".format(amount)} $currency",
text = "${currencyFormatterWithoutSymbol().format(animatedTotalAmount)} $currency",
style = GiniTheme.typography.headline5,
color = colors.amountTextColor,
)
Expand All @@ -542,11 +535,15 @@ private fun FooterSection(
RoundedCornerShape(4.dp)
),
) {
val animatedDiscountAmount by animateFloatAsState(
targetValue = discountValue.toFloat(), label = "discountAmount"
)

Text(
modifier = Modifier.padding(vertical = 4.dp, horizontal = 8.dp),
text = stringResource(
id = R.string.gbs_skonto_section_footer_label_discount,
"$discountValue%"
animatedDiscountAmount.formatAsDiscountPercentage()
),
style = GiniTheme.typography.caption1,
color = colors.discountLabelColorScheme.textColor,
Expand Down Expand Up @@ -592,14 +589,18 @@ private fun ScreenReadyStatePreview() {
}
}

private fun Float.formatAsDiscountPercentage(): String {
val value = BigDecimal(this.toString()).setScale(2, RoundingMode.HALF_UP)
return "${value.toString().trimEnd('0').trimEnd('.')}%"
}

private val previewState = SkontoFragmentContract.State.Ready(
isSkontoSectionActive = true,
paymentInDays = 14,
discountValue = 3.0f,
skontoAmount = 97.0f,
discountValue = BigDecimal("3"),
skontoAmount = BigDecimal("97"),
discountDueDate = LocalDate.now(),
fullAmount = "100.00",
totalAmount = 97.0f,
totalDiscount = 3.0f,
fullAmount = BigDecimal("100"),
totalAmount = BigDecimal("97"),
currency = "EUR"
)
10 changes: 5 additions & 5 deletions ...-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoFragmentContract.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package net.gini.android.bank.sdk.capture.skonto

import java.math.BigDecimal
import java.time.LocalDate

object SkontoFragmentContract {
Expand All @@ -10,13 +11,12 @@ object SkontoFragmentContract {
data class Ready(
val isSkontoSectionActive: Boolean,
val paymentInDays: Int,
val discountValue: Float,
val skontoAmount: Float,
val discountValue: BigDecimal,
val skontoAmount: BigDecimal,
val discountDueDate: LocalDate,
val fullAmount: String,
val totalAmount: Float,
val fullAmount: BigDecimal,
val totalAmount: BigDecimal,
val currency: String,
val totalDiscount: Float,
) : State()
}

Expand Down
Loading
Loading