Resolved conflicts save invoice locally and payment due hint

bank-api-library/library/src/main/java/net/gini/android/bank/api/models/Configuration.kt

@@ -6,9 +6,11 @@ data class Configuration(
     val isSkontoEnabled: Boolean,
     val isReturnAssistantEnabled: Boolean,
     val amplitudeApiKey: String?,
-    val transactionDocsEnabled: Boolean,
-    val instantPaymentEnabled: Boolean,
+    val isTransactionDocsEnabled: Boolean,
+    val isInstantPaymentEnabled: Boolean,
     val isEInvoiceEnabled: Boolean,
-    val qrCodeEducationEnabled: Boolean,
-    val paymentHintsEnabled: Boolean
+    val isQrCodeEducationEnabled: Boolean,
+    val isSavePhotosLocallyEnabled: Boolean,
+    val isAlreadyPaidHintEnabled: Boolean,
+    val isPaymentDueHintEnabled: Boolean,
 )

bank-api-library/library/src/main/java/net/gini/android/bank/api/response/ConfigurationResponse.kt

@@ -15,7 +15,9 @@ data class ConfigurationResponse(
     @Json(name = "qrCodeEducationEnabled") val qrCodeEducationEnabled: Boolean?,
     @Json(name = "instantPaymentEnabled") val instantPaymentEnabled: Boolean?,
     @Json(name = "eInvoiceEnabled") val eInvoiceEnabled: Boolean?,
-    @Json(name = "paymentHintsEnabled") val paymentHintsEnabled: Boolean?,
+    @Json(name = "alreadyPaidHintEnabled") val alreadyPaidHintEnabled: Boolean?,
+    @Json(name = "paymentDueHintEnabled") val paymentDueHintEnabled: Boolean?,
+    @Json(name = "savePhotosLocallyEnabled") val savePhotosLocallyEnabled: Boolean?,
 )
 
 internal fun ConfigurationResponse.toConfiguration() = Configuration(
@@ -24,10 +26,12 @@ internal fun ConfigurationResponse.toConfiguration() = Configuration(
     isSkontoEnabled = skontoEnabled ?: false,
     isReturnAssistantEnabled = returnAssistantEnabled ?: false,
     amplitudeApiKey = amplitudeApiKey,
-    transactionDocsEnabled = transactionDocsEnabled ?: false,
-    qrCodeEducationEnabled = qrCodeEducationEnabled ?: false,
-    instantPaymentEnabled = instantPaymentEnabled ?: false,
+    isTransactionDocsEnabled = transactionDocsEnabled ?: false,
+    isQrCodeEducationEnabled = qrCodeEducationEnabled ?: false,
+    isInstantPaymentEnabled = instantPaymentEnabled ?: false,
     isEInvoiceEnabled = eInvoiceEnabled ?: false,
-    paymentHintsEnabled = paymentHintsEnabled ?: false
+    isAlreadyPaidHintEnabled = alreadyPaidHintEnabled ?: false,
+    isPaymentDueHintEnabled = paymentDueHintEnabled ?: false,
+    isSavePhotosLocallyEnabled = savePhotosLocallyEnabled ?: false,
 )
 

bank-api-library/library/src/test/java/net/gini/android/bank/api/BankApiDocumentRemoteSourceTest.kt

@@ -114,17 +114,22 @@ class BankApiDocumentRemoteSourceTest {
         }
 
         override suspend fun getConfigurations(bearer: Map<String, String>): Response<ConfigurationResponse> {
-            return Response.success(ConfigurationResponse(
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                 null
-            ))
+            return Response.success(
+                ConfigurationResponse(
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null
+                )
+            )
         }
 
         override suspend fun uploadDocument(

bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/ConfigurationActivity.kt

@@ -18,9 +18,11 @@ import net.gini.android.bank.sdk.exampleapp.core.DefaultNetworkServicesProvider
 import net.gini.android.bank.sdk.exampleapp.databinding.ActivityConfigurationBinding
 import net.gini.android.bank.sdk.exampleapp.ui.MainActivity.Companion.CAMERA_PERMISSION_BUNDLE
 import net.gini.android.bank.sdk.exampleapp.ui.MainActivity.Companion.CONFIGURATION_BUNDLE
-import net.gini.android.bank.sdk.exampleapp.ui.data.Configuration
+import net.gini.android.bank.sdk.exampleapp.ui.data.ExampleAppBankConfiguration
 import net.gini.android.capture.DocumentImportEnabledFileTypes
 import net.gini.android.capture.internal.util.ActivityHelper.interceptOnBackPressed
+import net.gini.android.capture.util.SharedPreferenceHelper
+import net.gini.android.capture.util.SharedPreferenceHelper.SAF_STORAGE_URI_KEY
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -107,14 +109,16 @@ class ConfigurationActivity : AppCompatActivity() {
         finish()
     }
 
-    private fun updateUIWithConfigurationObject(configuration: Configuration) {
+    private fun updateUIWithConfigurationObject(configuration: ExampleAppBankConfiguration) {
         // setup sdk with default configuration
         binding.layoutFeatureToggle.switchSetupSdkWithDefaultConfiguration.isChecked =
             configuration.isDefaultSDKConfigurationsEnabled
         // file import
         binding.layoutFeatureToggle.switchOpenWith.isChecked = configuration.isFileImportEnabled
         // Capture SDK
         binding.layoutFeatureToggle.switchCaptureSdk.isChecked = configuration.isCaptureSDK
+        // Saving Invoices Locally
+        binding.layoutFeatureToggle.switchSaveInvoicesLocallyFeature.isChecked = configuration.saveInvoicesLocallyEnabled
         // QR code scanning
         binding.layoutFeatureToggle.switchQrCodeScanning.isChecked = configuration.isQrCodeEnabled
         // only QR code scanning
@@ -225,8 +229,16 @@ class ConfigurationActivity : AppCompatActivity() {
             configuration.isReturnAssistantEnabled
 
         // enable payment hints
-        binding.layoutFeatureToggle.switchSetupPaymentHints.isChecked =
-            configuration.isPaymentHintsEnabled
+        binding.layoutFeatureToggle.switchSetupAlreadyPaidHintEnabled.isChecked =
+            configuration.isAlreadyPaidHintEnabled
+
+        // enable payment due hint
+        binding.layoutFeatureToggle.switchPaymentDueHint.isChecked =
+            configuration.isPaymentDueHintEnabled
+
+        // set payment due hint threshold days
+        binding.layoutFeatureToggle.editTextPaymentDueHintThresholdDays.hint =
+            configuration.paymentDueHintThresholdDays.toString()
 
         // enable return reasons dialog
         binding.layoutReturnAssistantToggles.switchReturnReasonsDialog.isChecked =
@@ -561,14 +573,36 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         //enable payment hints for showing warning
-        binding.layoutFeatureToggle.switchSetupPaymentHints.setOnCheckedChangeListener{ _, isChecked ->
+        binding.layoutFeatureToggle.switchSetupAlreadyPaidHintEnabled.setOnCheckedChangeListener{ _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
-                    isPaymentHintsEnabled = isChecked
+                    isAlreadyPaidHintEnabled = isChecked
                 )
             )
         }
 
+        //enable payment due hint for showing warning
+        binding.layoutFeatureToggle.switchPaymentDueHint.setOnCheckedChangeListener{ _, isChecked ->
+            configurationViewModel.setConfiguration(
+                configurationViewModel.configurationFlow.value.copy(
+                    isPaymentDueHintEnabled = isChecked
+                )
+            )
+        }
+
+        // set payment due hint threshold days
+        binding.layoutFeatureToggle.editTextPaymentDueHintThresholdDays
+            .doAfterTextChanged {
+                if (it.toString().isNotEmpty()) {
+                    configurationViewModel.setConfiguration(
+                        configurationViewModel.configurationFlow.value.copy(
+                            paymentDueHintThresholdDays = it.toString().toInt()
+                        )
+                    )
+                }
+            }
+
+
         // enable supported format help screen
         binding.layoutHelpToggles.switchSupportedFormatsScreen.setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
@@ -618,6 +652,21 @@ class ConfigurationActivity : AppCompatActivity() {
                 )
             }
 
+        // for internal testing: To simulate the SAF first time experience, in which the picker
+        // will be shown
+        binding.layoutFeatureToggle.btnRemoveSafData.setOnClickListener {
+            SharedPreferenceHelper.saveString(SAF_STORAGE_URI_KEY, "", this)
+        }
+        // For testing Save Invoices Locally SDK flag, this is how clients can enable/disable it
+        binding.layoutFeatureToggle.switchSaveInvoicesLocallyFeature
+            .setOnCheckedChangeListener { _, isChecked ->
+                configurationViewModel.setConfiguration(
+                    configurationViewModel.configurationFlow.value.copy(
+                        saveInvoicesLocallyEnabled = isChecked
+                    )
+                )
+            }
+
         // enable Gini error logger
         binding.layoutDebugDevelopmentOptionsToggles.switchGiniErrorLogger
             .setOnCheckedChangeListener { _, isChecked ->

bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/ConfigurationViewModel.kt

@@ -34,7 +34,7 @@ import net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomReviewNavigationBa
 import net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomSkontoHelpNavigationBarBottomAdapter
 import net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomSkontoNavigationBarBottomAdapter
 import net.gini.android.bank.sdk.exampleapp.ui.composables.CustomGiniComposableStyleProvider
-import net.gini.android.bank.sdk.exampleapp.ui.data.Configuration
+import net.gini.android.bank.sdk.exampleapp.ui.data.ExampleAppBankConfiguration
 import net.gini.android.capture.GiniCaptureDebug
 import net.gini.android.capture.help.HelpItem
 import net.gini.android.capture.internal.util.FileImportValidator
@@ -59,7 +59,7 @@ class ConfigurationViewModel @Inject constructor(
     private val _disableCameraPermissionFlow = MutableStateFlow(false)
     val disableCameraPermissionFlow: StateFlow<Boolean> = _disableCameraPermissionFlow
 
-    private val _configurationFlow = MutableStateFlow(Configuration())
+    private val _configurationFlow = MutableStateFlow(ExampleAppBankConfiguration())
 
     fun getAlwaysAttachSetting(context: Context): Boolean {
         configureGiniBank(context) // Gini Bank should be configured before using transactionDocs
@@ -77,18 +77,18 @@ class ConfigurationViewModel @Inject constructor(
         }
     }
 
-    val configurationFlow: StateFlow<Configuration> = _configurationFlow
+    val configurationFlow: StateFlow<ExampleAppBankConfiguration> = _configurationFlow
 
     fun disableCameraPermission(cameraPermission: Boolean) {
         _disableCameraPermissionFlow.value = cameraPermission
     }
 
-    fun setConfiguration(configuration: Configuration) {
+    fun setConfiguration(configuration: ExampleAppBankConfiguration) {
         _configurationFlow.value = configuration
     }
 
     fun setupSDKWithDefaultConfigurations() {
-        _configurationFlow.value = Configuration.setupSDKWithDefaultConfiguration(
+        _configurationFlow.value = ExampleAppBankConfiguration.setupSDKWithDefaultConfiguration(
             configurationFlow.value,
             CaptureConfiguration(defaultNetworkServicesProvider.defaultNetworkServiceDebugEnabled)
         )
@@ -122,7 +122,11 @@ class ConfigurationViewModel @Inject constructor(
             // enable bottom navigation bar
             bottomNavigationBarEnabled = configuration.isBottomNavigationBarEnabled,
             // enable payment hints
-            paymentHintsEnabled = configuration.isPaymentHintsEnabled,
+            alreadyPaidHintEnabled = configuration.isAlreadyPaidHintEnabled,
+            // enable payment due hint
+            paymentDueHintEnabled = configuration.isPaymentDueHintEnabled,
+            // set payment due hint threshold days
+            paymentDueHintThresholdDays = configuration.paymentDueHintThresholdDays,
             // enable onboarding screens at first launch
             showOnboardingAtFirstRun = configuration.isOnboardingAtFirstRunEnabled,
             // enable onboarding at every launch
@@ -142,6 +146,9 @@ class ConfigurationViewModel @Inject constructor(
 
             // enable transaction docs
             transactionDocsEnabled = configuration.isTransactionDocsEnabled,
+
+            // enables saving invoices locally after analysis
+            saveInvoicesLocallyEnabled = configuration.saveInvoicesLocallyEnabled,
         )
 
         // enable Help screens custom bottom navigation bar

bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/MainActivity.kt

@@ -24,7 +24,7 @@ import net.gini.android.bank.sdk.exampleapp.R
 import net.gini.android.bank.sdk.exampleapp.core.ExampleUtil.isIntentActionViewOrSend
 import net.gini.android.bank.sdk.exampleapp.core.PermissionHandler
 import net.gini.android.bank.sdk.exampleapp.databinding.ActivityMainBinding
-import net.gini.android.bank.sdk.exampleapp.ui.data.Configuration
+import net.gini.android.bank.sdk.exampleapp.ui.data.ExampleAppBankConfiguration
 import net.gini.android.bank.sdk.exampleapp.ui.transactiondocs.TransactionDocsActivity
 import net.gini.android.capture.Document
 import net.gini.android.capture.EntryPoint
@@ -104,7 +104,7 @@ class MainActivity : AppCompatActivity() {
                 when (result.resultCode) {
                     RESULT_CANCELED -> {}
                     RESULT_OK -> {
-                        val configurationResult: Configuration? = result.data?.getParcelableExtra(
+                        val configurationResult: ExampleAppBankConfiguration? = result.data?.getParcelableExtra(
                             CONFIGURATION_BUNDLE
                         )
                         if (configurationResult != null) {

bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/data/Configuration.kt → bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/data/ExampleAppBankConfiguration.kt

@@ -5,11 +5,12 @@ import kotlinx.parcelize.Parcelize
 import net.gini.android.bank.sdk.capture.CaptureConfiguration
 import net.gini.android.capture.DocumentImportEnabledFileTypes
 import net.gini.android.capture.EntryPoint
+import net.gini.android.capture.GiniCapture
 import net.gini.android.capture.internal.util.FileImportValidator
 
 
 @Parcelize
-data class Configuration(
+data class ExampleAppBankConfiguration(
     // setup sdk with default configurations
     val isDefaultSDKConfigurationsEnabled: Boolean = false,
 
@@ -152,7 +153,13 @@ data class Configuration(
     val isReturnReasonsEnabled: Boolean = false,
 
     // enable show warning for paid invoices
-    val isPaymentHintsEnabled: Boolean = true,
+    val isAlreadyPaidHintEnabled: Boolean = true,
+
+    // enable payment due hint
+    val isPaymentDueHintEnabled: Boolean = true,
+
+    //  payment due hint threshold days
+    val paymentDueHintThresholdDays: Int = GiniCapture.PAYMENT_DUE_HINT_THRESHOLD_DAYS,
 
     // Digital invoice onboarding custom illustration
     val isDigitalInvoiceOnboardingCustomIllustrationEnabled: Boolean = false,
@@ -190,13 +197,16 @@ data class Configuration(
     // enable Capture Sdk
     val isCaptureSDK: Boolean = false,
 
-    ) : Parcelable {
+    // enable/disable save invoices locally feature
+    val saveInvoicesLocallyEnabled: Boolean = true,
+
+) : Parcelable {
 
-    companion object {
+    companion object Companion {
         fun setupSDKWithDefaultConfiguration(
-            currentConfiguration: Configuration,
+            currentConfiguration: ExampleAppBankConfiguration,
             defaultCaptureConfiguration: CaptureConfiguration,
-        ): Configuration {
+        ): ExampleAppBankConfiguration {
             return currentConfiguration.copy(
                 isFileImportEnabled = defaultCaptureConfiguration.fileImportEnabled,
                 isQrCodeEnabled = defaultCaptureConfiguration.qrCodeScanningEnabled,
@@ -206,7 +216,9 @@ data class Configuration(
                 isFlashDefaultStateEnabled = defaultCaptureConfiguration.flashOnByDefault,
                 documentImportEnabledFileTypes = defaultCaptureConfiguration.documentImportEnabledFileTypes,
                 isBottomNavigationBarEnabled = defaultCaptureConfiguration.bottomNavigationBarEnabled,
-                isPaymentHintsEnabled = defaultCaptureConfiguration.paymentHintsEnabled,
+                isAlreadyPaidHintEnabled = defaultCaptureConfiguration.alreadyPaidHintEnabled,
+                isPaymentDueHintEnabled = defaultCaptureConfiguration.paymentDueHintEnabled,
+                paymentDueHintThresholdDays = defaultCaptureConfiguration.paymentDueHintThresholdDays,
                 isOnboardingAtFirstRunEnabled = defaultCaptureConfiguration.showOnboardingAtFirstRun,
                 isOnboardingAtEveryLaunchEnabled = defaultCaptureConfiguration.showOnboarding,
                 isSupportedFormatsHelpScreenEnabled = defaultCaptureConfiguration.supportedFormatsHelpScreenEnabled,
@@ -215,7 +227,8 @@ data class Configuration(
                 isAllowScreenshotsEnabled = defaultCaptureConfiguration.allowScreenshots,
                 isSkontoEnabled = defaultCaptureConfiguration.skontoEnabled,
                 isTransactionDocsEnabled = defaultCaptureConfiguration.transactionDocsEnabled,
-                isCaptureSDK = currentConfiguration.isCaptureSDK
+                isCaptureSDK = currentConfiguration.isCaptureSDK,
+                saveInvoicesLocallyEnabled = currentConfiguration.saveInvoicesLocallyEnabled
             )
         }
     }