feat(internal-sdk): Built share with landscape UI

bank-sdk/sdk/build.gradle.kts

@@ -135,6 +135,10 @@ dependencies {
     implementation(libs.koin.android)
     implementation(libs.koin.androidx.compose)
 
+    implementation(libs.orbitmvi.test)
+    implementation(libs.orbitmvi.compose)
+    implementation(libs.orbitmvi.viewmodel)
+
     testImplementation(libs.junit)
     testImplementation(libs.mockk)
     testImplementation(libs.kotlinx.coroutines.test)

bank-sdk/sdk/detekt-baseline.xml

@@ -137,7 +137,7 @@
     <ID>NewLineAtEndOfFile:SkontoFragment.kt$net.gini.android.bank.sdk.capture.skonto.SkontoFragment.kt</ID>
     <ID>NewLineAtEndOfFile:SkontoFragmentContract.kt$net.gini.android.bank.sdk.capture.skonto.SkontoFragmentContract.kt</ID>
     <ID>NewLineAtEndOfFile:SkontoFragmentListener.kt$net.gini.android.bank.sdk.capture.skonto.SkontoFragmentListener.kt</ID>
-    <ID>NewLineAtEndOfFile:SkontoFragmentViewModel.kt$net.gini.android.bank.sdk.capture.skonto.SkontoFragmentViewModel.kt</ID>
+    <ID>NewLineAtEndOfFile:SkontoFragmentViewModel.kt$net.gini.android.bank.sdk.capture.skonto.viewmodel.SkontoFragmentViewModel.kt</ID>
     <ID>NewLineAtEndOfFile:SkontoInfoDialogColors.kt$net.gini.android.bank.sdk.capture.skonto.colors.section.SkontoInfoDialogColors.kt</ID>
     <ID>NewLineAtEndOfFile:SkontoInvoiceScanSectionColors.kt$net.gini.android.bank.sdk.capture.skonto.colors.section.SkontoInvoiceScanSectionColors.kt</ID>
     <ID>NewLineAtEndOfFile:SkontoNavigationBarBottomAdapter.kt$net.gini.android.bank.sdk.capture.skonto.SkontoNavigationBarBottomAdapter.kt</ID>

bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/skonto/DigitalInvoiceSkontoFragment.kt

@@ -2,7 +2,6 @@
 
 package net.gini.android.bank.sdk.capture.digitalinvoice.skonto
 
-import android.annotation.SuppressLint
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
 import android.icu.util.Calendar
 import android.os.Bundle
@@ -44,7 +43,6 @@ import androidx.compose.material3.SelectableDates
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -55,7 +53,6 @@ import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.pluralStringResource
@@ -65,23 +62,26 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
+import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.setFragmentResult
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.navArgs
 import net.gini.android.bank.sdk.GiniBank
 import net.gini.android.bank.sdk.R
+import net.gini.android.bank.sdk.capture.digitalinvoice.skonto.args.DigitalInvoiceSkontoResultArgs
 import net.gini.android.bank.sdk.capture.digitalinvoice.skonto.colors.DigitalInvoiceSkontoScreenColors
 import net.gini.android.bank.sdk.capture.digitalinvoice.skonto.colors.section.DigitalInvoiceSkontoFooterSectionColors
 import net.gini.android.bank.sdk.capture.digitalinvoice.skonto.colors.section.DigitalInvoiceSkontoInfoDialogColors
 import net.gini.android.bank.sdk.capture.digitalinvoice.skonto.colors.section.DigitalInvoiceSkontoInvoicePreviewSectionColors
 import net.gini.android.bank.sdk.capture.digitalinvoice.skonto.colors.section.DigitalInvoiceSkontoSectionColors
+import net.gini.android.bank.sdk.capture.digitalinvoice.skonto.mapper.toErrorMessage
+import net.gini.android.bank.sdk.capture.digitalinvoice.skonto.viewmodel.DigitalInvoiceSkontoViewModel
 import net.gini.android.bank.sdk.capture.skonto.model.SkontoData
 import net.gini.android.bank.sdk.capture.skonto.model.SkontoEdgeCase
 import net.gini.android.bank.sdk.di.koin.giniBankViewModel
 import net.gini.android.bank.sdk.util.disallowScreenshots
+import net.gini.android.bank.sdk.util.ui.keyboardAsState
 import net.gini.android.capture.Amount
 import net.gini.android.capture.GiniCapture
 import net.gini.android.capture.internal.util.ActivityHelper
@@ -93,8 +93,11 @@ 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 net.gini.android.capture.ui.theme.modifier.tabletMaxWidth
+import net.gini.android.capture.util.compose.keyboardPadding
 import net.gini.android.capture.view.InjectedViewAdapterInstance
 import org.koin.core.parameter.parametersOf
+import org.orbitmvi.orbit.compose.collectAsState
+import org.orbitmvi.orbit.compose.collectSideEffect
 import java.math.BigDecimal
 import java.math.RoundingMode
 import java.time.LocalDate
@@ -149,12 +152,9 @@ class DigitalInvoiceSkontoFragment : Fragment() {
                         isBottomNavigationBarEnabled = isBottomNavigationBarEnabled,
                         customBottomNavBarAdapter = customBottomNavBarAdapter,
                         navigateBack = {
-                            setFragmentResult(REQUEST_KEY, Bundle().apply {
-                                putParcelable(
-                                    RESULT_KEY,
-                                    viewModel.provideFragmentResult()
-                                )
-                            }
+                            setFragmentResult(
+                                REQUEST_KEY,
+                                bundleOf(RESULT_KEY to it)
                             )
                             findNavController().popBackStack()
                         },
@@ -182,27 +182,11 @@ class DigitalInvoiceSkontoFragment : Fragment() {
     }
 }
 
-@Composable
-@SuppressLint("ComposableNaming")
-private fun DigitalInvoiceSkontoViewModel.collectSideEffect(
-    action: (DigitalInvoiceSkontoSideEffect) -> Unit
-) {
-
-    val lifecycleOwner = LocalLifecycleOwner.current
-
-    LaunchedEffect(sideEffectFlow, lifecycleOwner) {
-        lifecycleOwner.lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
-            sideEffectFlow.collect {
-                action(it)
-            }
-        }
-    }
-}
 
 @Composable
 private fun ScreenContent(
     isBottomNavigationBarEnabled: Boolean,
-    navigateBack: () -> Unit,
+    navigateBack: (DigitalInvoiceSkontoResultArgs) -> Unit,
     navigateToHelpScreen: () -> Unit,
     navigateToInvoiceScreen: (documentId: String, infoTextLines: List<String>) -> Unit,
     viewModel: DigitalInvoiceSkontoViewModel,
@@ -211,16 +195,24 @@ private fun ScreenContent(
     screenColorScheme: DigitalInvoiceSkontoScreenColors = DigitalInvoiceSkontoScreenColors.colors(),
 ) {
 
-    BackHandler { navigateBack() }
+    BackHandler { viewModel.onBackClicked() }
 
-    val state by viewModel.stateFlow.collectAsState()
+    val state by viewModel.collectAsState()
+    val keyboardState by keyboardAsState()
+
+    LaunchedEffect(keyboardState) {
+        viewModel.onKeyboardStateChanged(keyboardState)
+    }
 
     viewModel.collectSideEffect {
         when (it) {
-            is DigitalInvoiceSkontoSideEffect.OpenInvoiceScreen ->
+            is SkontoSideEffect.OpenInvoiceScreen ->
                 navigateToInvoiceScreen(it.documentId, it.infoTextLines)
 
-            DigitalInvoiceSkontoSideEffect.OpenHelpScreen ->
+            is SkontoSideEffect.NavigateBack ->
+                navigateBack(it.args)
+
+            SkontoSideEffect.OpenHelpScreen ->
                 navigateToHelpScreen()
         }
     }
@@ -232,18 +224,18 @@ private fun ScreenContent(
         onSkontoAmountChange = viewModel::onSkontoAmountFieldChanged,
         onDueDateChanged = viewModel::onSkontoDueDateChanged,
         isBottomNavigationBarEnabled = isBottomNavigationBarEnabled,
-        onBackClicked = navigateBack,
+        onBackClicked = viewModel::onBackClicked,
         onInfoBannerClicked = viewModel::onInfoBannerClicked,
         onInfoDialogDismissed = viewModel::onInfoDialogDismissed,
         onInvoiceClicked = viewModel::onInvoiceClicked,
         customBottomNavBarAdapter = customBottomNavBarAdapter,
-        onHelpClicked = viewModel::onHelpClicked
+        onHelpClicked = viewModel::onHelpClicked,
     )
 }
 
 @Composable
 private fun ScreenStateContent(
-    state: DigitalInvoiceSkontoScreenState,
+    state: SkontoScreenState,
     isBottomNavigationBarEnabled: Boolean,
     onSkontoAmountChange: (BigDecimal) -> Unit,
     onDueDateChanged: (LocalDate) -> Unit,
@@ -257,7 +249,7 @@ private fun ScreenStateContent(
     screenColorScheme: DigitalInvoiceSkontoScreenColors = DigitalInvoiceSkontoScreenColors.colors()
 ) {
     when (state) {
-        is DigitalInvoiceSkontoScreenState.Ready -> ScreenReadyState(
+        is SkontoScreenState.Ready -> ScreenReadyState(
             modifier = modifier,
             state = state,
             screenColorScheme = screenColorScheme,
@@ -277,7 +269,7 @@ private fun ScreenStateContent(
 
 @Composable
 private fun ScreenReadyState(
-    state: DigitalInvoiceSkontoScreenState.Ready,
+    state: SkontoScreenState.Ready,
     onBackClicked: () -> Unit,
     onInvoiceClicked: () -> Unit,
     onHelpClicked: () -> Unit,
@@ -292,6 +284,8 @@ private fun ScreenReadyState(
 ) {
 
     val scrollState = rememberScrollState()
+    val keyboardPadding by keyboardPadding(108.dp, scrollState)
+
     Scaffold(
         modifier = modifier,
         containerColor = screenColorScheme.backgroundColor,
@@ -316,7 +310,8 @@ private fun ScreenReadyState(
         Column(
             modifier = Modifier
                 .padding(it)
-                .verticalScroll(scrollState),
+                .verticalScroll(scrollState)
+                .padding(bottom = keyboardPadding),
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
             Column(
@@ -352,6 +347,7 @@ private fun ScreenReadyState(
                     onDueDateChanged = onDueDateChanged,
                     edgeCase = state.edgeCase,
                     onInfoBannerClicked = onInfoBannerClicked,
+                    skontoAmountValidationError = state.skontoAmountValidationError,
                 )
             }
         }
@@ -534,9 +530,11 @@ private fun SkontoSection(
     onInfoBannerClicked: () -> Unit,
     edgeCase: SkontoEdgeCase?,
     colors: DigitalInvoiceSkontoSectionColors,
+    skontoAmountValidationError: SkontoScreenState.Ready.SkontoAmountValidationError?,
     modifier: Modifier = Modifier,
 ) {
     val dateFormatter = DateTimeFormatter.ofPattern("dd.MM.yyyy")
+    val resources = LocalContext.current.resources
 
     var isDatePickerVisible by remember { mutableStateOf(false) }
     Card(
@@ -651,6 +649,10 @@ private fun SkontoSection(
                         )
                     }
                 },
+                isError = skontoAmountValidationError != null,
+                supportingText = skontoAmountValidationError?.toErrorMessage(
+                    resources = resources,
+                )
             )
 
             val dueDateOnClickSource = remember { MutableInteractionSource() }
@@ -891,7 +893,7 @@ private fun Float.formatAsDiscountPercentage(): String {
     return "${value.toString().trimEnd('0').trimEnd('.')}%"
 }
 
-private val previewState = DigitalInvoiceSkontoScreenState.Ready(
+private val previewState = SkontoScreenState.Ready(
     isSkontoSectionActive = true,
     paymentInDays = 14,
     skontoPercentage = BigDecimal("3"),
@@ -901,4 +903,5 @@ private val previewState = DigitalInvoiceSkontoScreenState.Ready(
     paymentMethod = SkontoData.SkontoPaymentMethod.PayPal,
     edgeCase = SkontoEdgeCase.PayByCashOnly,
     edgeCaseInfoDialogVisible = false,
+    skontoAmountValidationError = null
 )

bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/digitalinvoice/skonto/DigitalInvoiceSkontoScreenModule.kt

@@ -1,18 +1,57 @@
 package net.gini.android.bank.sdk.capture.digitalinvoice.skonto
 
 import net.gini.android.bank.sdk.capture.digitalinvoice.skonto.args.DigitalInvoiceSkontoArgs
+import net.gini.android.bank.sdk.capture.digitalinvoice.skonto.validation.DigitalInvoiceSkontoAmountValidator
+import net.gini.android.bank.sdk.capture.digitalinvoice.skonto.viewmodel.DigitalInvoiceSkontoViewModel
+import net.gini.android.bank.sdk.capture.digitalinvoice.skonto.viewmodel.SkontoScreenInitialStateFactory
+import net.gini.android.bank.sdk.capture.digitalinvoice.skonto.viewmodel.intent.BackClickIntent
+import net.gini.android.bank.sdk.capture.digitalinvoice.skonto.viewmodel.intent.InfoBannerInteractionIntent
+import net.gini.android.bank.sdk.capture.digitalinvoice.skonto.viewmodel.intent.InvoiceClickIntent
+import net.gini.android.bank.sdk.capture.digitalinvoice.skonto.viewmodel.intent.KeyboardStateChangeIntent
+import net.gini.android.bank.sdk.capture.digitalinvoice.skonto.viewmodel.intent.SkontoAmountFieldChangeIntent
+import net.gini.android.bank.sdk.capture.digitalinvoice.skonto.viewmodel.intent.SkontoDueDateChangeIntent
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
 
 val digitalInvoiceSkontoScreenModule = module {
     viewModel { (data: DigitalInvoiceSkontoArgs) ->
         DigitalInvoiceSkontoViewModel(
             args = data,
-            getSkontoDiscountPercentageUseCase = get(),
-            getSkontoEdgeCaseUseCase = get(),
-            getSkontoRemainingDaysUseCase = get(),
+            skontoScreenInitialStateFactory = get(),
+            invoiceClickIntent = get(),
+            backClickIntent = get(),
+            infoBannerInteractionIntent = get(),
+            keyboardStateChangeIntent = get(),
+            skontoDueDateChangeIntent = get(),
+            skontoAmountFieldChangeIntent = get()
+        )
+    }
+    factory { DigitalInvoiceSkontoAmountValidator() }
+    factory {
+        SkontoScreenInitialStateFactory(
+            getSkontoEdgeCaseUseCase = get()
+        )
+    }
+    factory {
+        InvoiceClickIntent(
             lastAnalyzedDocumentProvider = get(),
-            skontoInvoicePreviewTextLinesFactory = get()
+            skontoInvoicePreviewTextLinesFactory = get(),
         )
     }
+    factory { BackClickIntent() }
+    factory { InfoBannerInteractionIntent() }
+    factory { KeyboardStateChangeIntent() }
+    factory {
+        SkontoDueDateChangeIntent(
+            getSkontoRemainingDaysUseCase = get(),
+            getSkontoEdgeCaseUseCase = get(),
+        )
+    }
+    factory {
+        SkontoAmountFieldChangeIntent(
+            digitalInvoiceSkontoAmountValidator = get(),
+            getSkontoDiscountPercentageUseCase = get(),
+        )
+    }
+
 }