feat(bank-sdk): Skonto screen. Fix issues

PP-648
gini · Jul 24, 2024 · d6a937f · d6a937f
1 parent 1bd20b3
commit d6a937f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoFragment.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoFragment.kt
@@ -66,6 +66,8 @@ import androidx.compose.ui.window.DialogProperties
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import androidx.navigation.NavController
+import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import net.gini.android.bank.sdk.GiniBank
 import net.gini.android.bank.sdk.R
@@ -124,6 +126,7 @@ class SkontoFragment : Fragment() {
                         viewModel = viewModel,
                         isBottomNavigationBarEnabled = isBottomNavigationBarEnabled,
                         customBottomNavBarAdapter = customBottomNavBarAdapter,
+                        navController = findNavController(),
                     )
                 }
             }
@@ -143,6 +146,7 @@ class SkontoFragment : Fragment() {
 
 @Composable
 private fun ScreenContent(
+    navController: NavController,
     viewModel: SkontoFragmentViewModel,
     modifier: Modifier = Modifier,
     screenColorScheme: SkontoScreenColors = SkontoScreenColors.colors(),
@@ -159,7 +163,7 @@ private fun ScreenContent(
         onDueDateChanged = viewModel::onSkontoDueDateChanged,
         onFullAmountChange = viewModel::onFullAmountFieldChanged,
         isBottomNavigationBarEnabled = isBottomNavigationBarEnabled,
-        onBackClicked = {},
+        onBackClicked = { navController.navigate(SkontoFragmentDirections.toCaptureFragment()) },
         customBottomNavBarAdapter = customBottomNavBarAdapter,
         onProceedClicked = {},
         onInfoBannerClicked = viewModel::onInfoBannerClicked,
@@ -731,10 +735,14 @@ private fun FooterSection(
         targetValue = discountValue.toFloat(), label = "discountAmount"
     )
     val totalPriceText =
-        "${currencyFormatterWithoutSymbol().format(animatedTotalAmount).trim()} ${totalAmount.currencyCode}"
+        "${
+            currencyFormatterWithoutSymbol().format(animatedTotalAmount).trim()
+        } ${totalAmount.currencyCode}"
 
     val savedAmountText =
-        "${currencyFormatterWithoutSymbol().format(animatedSavedAmount).trim()} ${savedAmount.currencyCode}"
+        "${
+            currencyFormatterWithoutSymbol().format(animatedSavedAmount).trim()
+        } ${savedAmount.currencyCode}"
 
     val discountLabelText = stringResource(
         id = R.string.gbs_skonto_section_footer_label_discount,

diff --git a/...sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoFragmentViewModel.kt b/...sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/SkontoFragmentViewModel.kt
@@ -38,7 +38,7 @@ internal class SkontoFragmentViewModel(
         val savedAmount = SkontoData.Amount(savedAmountValue, data.fullAmountToPay.currencyCode)
 
         return SkontoFragmentContract.State.Ready(
-            isSkontoSectionActive = true,
+            isSkontoSectionActive = isSkontoSectionActive,
             paymentInDays = data.skontoRemainingDays,
             discountAmount = discount,
             skontoAmount = data.skontoAmountToPay,
@@ -164,7 +164,7 @@ internal class SkontoFragmentViewModel(
     }
 
     private fun calculateSavedAmount(skontoAmount: BigDecimal, fullAmount: BigDecimal) =
-        fullAmount.minus(skontoAmount).abs()
+        fullAmount.minus(skontoAmount).coerceAtLeast(BigDecimal.ZERO)
 
     private fun validateSkontoAmount(
         skontoAmount: SkontoData.Amount,

diff --git a/bank-sdk/sdk/src/main/res/navigation/gbs_nav_graph.xml b/bank-sdk/sdk/src/main/res/navigation/gbs_nav_graph.xml
@@ -103,6 +103,11 @@
         <argument
             android:name="data"
             app:argType="net.gini.android.bank.sdk.capture.skonto.model.SkontoData" />
+        <action
+            android:id="@+id/to_capture_fragment"
+            app:destination="@id/gbs_destination_capture_fragment"
+            app:popUpTo="@id/capture_flow_nav_graph"
+            app:popUpToInclusive="false" />
     </fragment>
 
 </navigation>