feature(bank-sdk): Skonto + Return Assistant.

Gemfile.lock

@@ -210,6 +210,7 @@ GEM
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
+  ruby
   x86_64-darwin-20
   x86_64-linux
 

RELEASE-ORDER.md

@@ -1,40 +1,40 @@
 DO NOT EDIT MANUALLY!
 Automatically created by the updateReleaseOrderFile task.
 
-Release order for :capture-sdk:sdk 3.11.1:
- 1. :capture-sdk:sdk 3.11.1
+Release order for :capture-sdk:sdk 3.11.3:
+ 1. :capture-sdk:sdk 3.11.3
 
-Release order for :core-api-library:library 2.2.1:
- 1. :core-api-library:library 2.2.1
+Release order for :core-api-library:library 2.2.2:
+ 1. :core-api-library:library 2.2.2
 
-Release order for :bank-api-library:library 3.2.1:
- 1. :core-api-library:library 2.2.1
- 2. :bank-api-library:library 3.2.1
+Release order for :bank-api-library:library 3.2.2:
+ 1. :core-api-library:library 2.2.2
+ 2. :bank-api-library:library 3.2.2
 
 Release order for :health-api-library:library 4.3.0:
- 1. :core-api-library:library 2.2.1
+ 1. :core-api-library:library 2.2.2
  2. :health-api-library:library 4.3.0
 
 Release order for :health-sdk:sdk 4.3.0:
- 1. :core-api-library:library 2.2.1
+ 1. :core-api-library:library 2.2.2
  2. :health-api-library:library 4.3.0
  3. :health-sdk:sdk 4.3.0
 
 Release order for :merchant-sdk:sdk 1.0.0:
- 1. :core-api-library:library 2.2.1
+ 1. :core-api-library:library 2.2.2
  2. :health-api-library:library 4.3.0
  3. :merchant-sdk:sdk 1.0.0
 
-Release order for :capture-sdk:default-network 3.11.1:
- 1. :core-api-library:library 2.2.1
- 2. :bank-api-library:library 3.2.1
- 3. :capture-sdk:sdk 3.11.1
- 4. :capture-sdk:default-network 3.11.1
-
-Release order for :bank-sdk:sdk 3.12.1:
- 1. :core-api-library:library 2.2.1
- 2. :bank-api-library:library 3.2.1
- 3. :capture-sdk:sdk 3.11.1
- 4. :capture-sdk:default-network 3.11.1
- 5. :bank-sdk:sdk 3.12.1
+Release order for :capture-sdk:default-network 3.11.3:
+ 1. :core-api-library:library 2.2.2
+ 2. :bank-api-library:library 3.2.2
+ 3. :capture-sdk:sdk 3.11.3
+ 4. :capture-sdk:default-network 3.11.3
+
+Release order for :bank-sdk:sdk 3.13.1:
+ 1. :core-api-library:library 2.2.2
+ 2. :bank-api-library:library 3.2.2
+ 3. :capture-sdk:sdk 3.11.3
+ 4. :capture-sdk:default-network 3.11.3
+ 5. :bank-sdk:sdk 3.13.1
 

bank-api-library/library/gradle.properties

@@ -1,7 +1,7 @@
 # Maven coordinates
 # groupId is in the root gradle.properties
 artifactId=gini-bank-api-lib
-version=3.2.1
+version=3.2.2
 # Version code is visible only in the generated BuildConfig file
 versionCode=0
 

bank-api-library/library/src/doc/source/guides/getting-started.rst

@@ -13,7 +13,7 @@ build.gradle:
 .. code-block:: groovy
 
     dependencies {
-        implementation 'net.gini.android:gini-bank-api-lib:3.2.1'
+        implementation 'net.gini.android:gini-bank-api-lib:3.2.2'
     }
 
 Integrating the Gini Bank API Library

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

@@ -13,6 +13,8 @@ import net.gini.android.bank.api.requests.ErrorEvent
 import net.gini.android.bank.api.requests.ResolvePaymentBody
 import net.gini.android.bank.api.response.ConfigurationResponse
 import net.gini.android.bank.api.response.ResolvePaymentResponse
+import net.gini.android.core.api.response.DocumentLayoutResponse
+import net.gini.android.core.api.response.DocumentPageResponse
 import net.gini.android.core.api.response.PaymentRequestResponse
 import net.gini.android.core.api.response.PaymentResponse
 import okhttp3.RequestBody
@@ -169,6 +171,20 @@ class BankApiDocumentRemoteSourceTest {
             return Response.success(null)
         }
 
+        override suspend fun getDocumentLayout(
+            bearer: Map<String, String>,
+            documentId: String
+        ): Response<DocumentLayoutResponse> {
+            return Response.success(null)
+        }
+
+        override suspend fun getDocumentPages(
+            bearer: Map<String, String>,
+            documentId: String
+        ): Response<List<DocumentPageResponse>> {
+            return Response.success(null)
+        }
+
         override suspend fun getPaymentRequests(bearer: Map<String, String>): Response<List<PaymentRequestResponse>> {
             // Is tested in core api library
             return Response.success(null)

bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/core/DefaultNetworkServicesProvider.kt

@@ -13,8 +13,10 @@ class DefaultNetworkServicesProvider (internal val context: Context, internal va
     private var clientSecret: String? = null
     private var clientId: String? = null
     var giniBankAPI: GiniBankAPI = bindGiniBankAPI(context, logger)
-    var defaultNetworkServiceDebugEnabled: GiniCaptureDefaultNetworkService = bindGiniCaptureNetworkServiceDebugEnabled(context, logger)
-    var defaultNetworkServiceDebugDisabled: GiniCaptureDefaultNetworkService = bindGiniCaptureNetworkServiceDebugDisabled(context, logger)
+    var defaultNetworkServiceDebugEnabled: GiniCaptureDefaultNetworkService
+    = bindGiniCaptureNetworkServiceDebugEnabled(context, logger)
+    var defaultNetworkServiceDebugDisabled: GiniCaptureDefaultNetworkService
+    = bindGiniCaptureNetworkServiceDebugDisabled(context, logger)
 
     fun reinitNetworkServices(clientId: String, clientSecret: String) {
         this.clientId = clientId
@@ -73,7 +75,9 @@ class DefaultNetworkServicesProvider (internal val context: Context, internal va
         val clientSecret = context.getString(R.string.gini_api_client_secret)
         if (TextUtils.isEmpty(clientId) || TextUtils.isEmpty(clientSecret)) {
             logger.warn(
-                "Missing Gini API client credentials. Either create a local.properties file " + "with clientId and clientSecret properties or pass them in as gradle " + "parameters with -PclientId and -PclientSecret."
+                "Missing Gini API client credentials. Either create a local.properties file "
+                        + "with clientId and clientSecret properties or pass them in as gradle "
+                        + "parameters with -PclientId and -PclientSecret."
             )
         }
         return Pair(clientId, clientSecret)
@@ -86,5 +90,4 @@ class DefaultNetworkServicesProvider (internal val context: Context, internal va
 
         return documentMetadata
     }
-
-}
+}

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

@@ -149,6 +149,10 @@ class ConfigurationActivity : AppCompatActivity() {
         binding.layoutBottomNavigationToggles.switchSkontoHelpCustomBottomNavbar.isChecked  =
             configuration.isSkontoHelpCustomNavBarEnabled
 
+        // 42 enable digital invoice skonto screen custom bottom navigation bar
+        binding.layoutBottomNavigationToggles.switchDigitalInvoiceSkontoCustomBottomNavbar.isChecked  =
+            configuration.isDigitalInvoiceSkontoCustomNavBarEnabled
+
         // 12 enable image picker screens custom bottom navigation bar -> was implemented on iOS, not needed for Android
 
         // 13 enable onboarding screens at first launch
@@ -235,6 +239,7 @@ class ConfigurationActivity : AppCompatActivity() {
         binding.layoutDebugDevelopmentOptionsToggles.editTextClientSecret.hint = configuration.clientSecret
     }
 
+    @Suppress("CyclomaticComplexMethod", "LongMethod")
     private fun setConfigurationFeatures() {
         // 0 setup sdk with default configuration
         binding.layoutFeatureToggle.switchSetupSdkWithDefaultConfiguration.setOnCheckedChangeListener { _, isChecked ->
@@ -396,14 +401,25 @@ class ConfigurationActivity : AppCompatActivity() {
         }
 
         // 41 enable skonto screens custom bottom navigation bar
-        binding.layoutBottomNavigationToggles.switchSkontoHelpCustomBottomNavbar.setOnCheckedChangeListener { _, isChecked ->
+        binding.layoutBottomNavigationToggles.switchSkontoHelpCustomBottomNavbar
+            .setOnCheckedChangeListener { _, isChecked ->
             configurationViewModel.setConfiguration(
                 configurationViewModel.configurationFlow.value.copy(
                     isSkontoHelpCustomNavBarEnabled = isChecked
                 )
             )
         }
 
+        // 42 enable digital invoice skonto screens custom bottom navigation bar
+        binding.layoutBottomNavigationToggles.switchDigitalInvoiceSkontoCustomBottomNavbar
+            .setOnCheckedChangeListener { _, isChecked ->
+            configurationViewModel.setConfiguration(
+                configurationViewModel.configurationFlow.value.copy(
+                    isDigitalInvoiceSkontoCustomNavBarEnabled = isChecked
+                )
+            )
+            }
+
         // 12 enable image picker screens custom bottom navigation bar -> was implemented on iOS, not needed for Android
 
         // 13 enable onboarding screens at first launch

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

@@ -18,6 +18,7 @@ import net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomCameraNavigationBa
 import net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomDigitalInvoiceHelpNavigationBarBottomAdapter
 import net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomDigitalInvoiceNavigationBarBottomAdapter
 import net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomDigitalInvoiceOnboardingNavigationBarBottomAdapter
+import net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomDigitalInvoiceSkontoNavigationBarBottomAdapter
 import net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomHelpNavigationBarBottomAdapter
 import net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomLottiLoadingIndicatorAdapter
 import net.gini.android.bank.sdk.exampleapp.ui.adapters.CustomNavigationBarTopAdapter
@@ -77,7 +78,10 @@ class ConfigurationViewModel @Inject constructor(
 
         var captureConfiguration = CaptureConfiguration(
             // 37 Debug mode
-            networkService = if (configuration.isDebugModeEnabled) defaultNetworkServicesProvider.defaultNetworkServiceDebugEnabled else defaultNetworkServicesProvider.defaultNetworkServiceDebugDisabled,
+            networkService = if (configuration.isDebugModeEnabled)
+                defaultNetworkServicesProvider.defaultNetworkServiceDebugEnabled
+            else
+                defaultNetworkServicesProvider.defaultNetworkServiceDebugDisabled,
             // 1 file import
             fileImportEnabled = configuration.isFileImportEnabled,
             // 2 QR code scanning
@@ -283,6 +287,13 @@ class ConfigurationViewModel @Inject constructor(
             GiniBank.skontoNavigationBarBottomAdapter = null
         }
 
+        if (configuration.isDigitalInvoiceSkontoCustomNavBarEnabled) {
+            GiniBank.digitalInvoiceSkontoNavigationBarBottomAdapter =
+                CustomDigitalInvoiceSkontoNavigationBarBottomAdapter()
+        } else {
+            GiniBank.digitalInvoiceSkontoNavigationBarBottomAdapter = null
+        }
+
         if (configuration.isSkontoHelpCustomNavBarEnabled) {
             GiniBank.skontoHelpNavigationBarBottomAdapter = CustomSkontoHelpNavigationBarBottomAdapter()
         } else {

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

@@ -3,6 +3,7 @@ package net.gini.android.bank.sdk.exampleapp.ui.adapters
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import net.gini.android.bank.sdk.capture.digitalinvoice.view.DigitalInvoiceNavigationBarBottomAdapter
 import net.gini.android.bank.sdk.exampleapp.databinding.CustomDigitalInvoiceNavigationBarBinding
 
@@ -35,4 +36,22 @@ class CustomDigitalInvoiceNavigationBarBottomAdapter: DigitalInvoiceNavigationBa
         binding = null
     }
 
+
+    override fun onSkontoPercentageBadgeUpdated(text: String) {
+        super.onSkontoPercentageBadgeUpdated(text)
+        binding?.skontoDiscountLabel?.text = text
+    }
+
+    override fun onSkontoPercentageBadgeVisibilityUpdate(isVisible: Boolean) {
+        binding?.skontoDiscountLabel?.isVisible = isVisible
+    }
+
+    override fun onSkontoSavingsAmountUpdated(text: String) {
+        binding?.skontoSavedAmount?.text = text
+    }
+
+    override fun onSkontoSavingsAmountVisibilityUpdated(isVisible: Boolean) {
+        binding?.skontoSavedAmount?.isVisible = isVisible
+    }
+
 }

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

@@ -0,0 +1,37 @@
+package net.gini.android.bank.sdk.exampleapp.ui.adapters
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import net.gini.android.bank.sdk.capture.digitalinvoice.skonto.DigitalInvoiceSkontoNavigationBarBottomAdapter
+import net.gini.android.bank.sdk.capture.skonto.SkontoNavigationBarBottomAdapter
+import net.gini.android.bank.sdk.exampleapp.databinding.CustomDigitalInvoiceSkontoNavigationBarBinding
+import net.gini.android.bank.sdk.exampleapp.databinding.CustomSkontoNavigationBarBinding
+
+class CustomDigitalInvoiceSkontoNavigationBarBottomAdapter : DigitalInvoiceSkontoNavigationBarBottomAdapter {
+
+    private var binding: CustomDigitalInvoiceSkontoNavigationBarBinding? = null
+
+    override fun setOnBackClickListener(onClick: () -> Unit) {
+        binding?.gbsBackBtn?.setOnClickListener { onClick() }
+    }
+
+
+    override fun setOnHelpClickListener(onClick: () -> Unit) {
+        binding?.gbsHelpBtn?.setOnClickListener { onClick() }
+    }
+
+    override fun onCreateView(container: ViewGroup): View {
+        binding = CustomDigitalInvoiceSkontoNavigationBarBinding.inflate(
+            LayoutInflater.from(container.context),
+            container,
+            false
+        )
+        return binding!!.root
+    }
+
+    override fun onDestroy() {
+        binding = null
+    }
+}

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

@@ -15,7 +15,8 @@ class CustomSkontoHelpNavigationBarBottomAdapter:
     }
 
     override fun onCreateView(container: ViewGroup): View {
-        val binding = CustomSkontoHelpNavigationBarBottomBinding.inflate(LayoutInflater.from(container.context), container, false)
+        val binding = CustomSkontoHelpNavigationBarBottomBinding
+            .inflate(LayoutInflater.from(container.context), container, false)
         viewBinding = binding
 
         return viewBinding!!.root
@@ -24,4 +25,4 @@ class CustomSkontoHelpNavigationBarBottomAdapter:
     override fun onDestroy() {
         viewBinding = null
     }
-}
+}

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

@@ -170,6 +170,9 @@ data class Configuration(
     // 41 Skonto help Custom bottom navigation
     val isSkontoHelpCustomNavBarEnabled: Boolean = false,
 
+    // 42 Digital Invoice Skonto Custom bottom navigation
+    val isDigitalInvoiceSkontoCustomNavBarEnabled: Boolean = false,
+
     ) : Parcelable {
 
     companion object {

bank-sdk/example-app/src/main/res/layout/custom_digital_invoice_navigation_bar.xml

@@ -44,6 +44,34 @@
         app:layout_constraintTop_toBottomOf="@id/total_label"
         tools:text="€242.99" />
 
+    <TextView
+        android:id="@+id/skonto_saved_amount"
+        style="@style/GiniCaptureTheme.Typography.Caption1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/gc_large_24"
+        android:textColor="@color/gc_dark_01"
+        app:layout_constraintHorizontal_chainStyle="spread_inside"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/gross_price_total"
+        tools:text="Save 0,55 EUR" />
+
+    <TextView
+        android:id="@+id/skonto_discount_label"
+        style="@style/GiniCaptureTheme.Typography.Caption1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/gc_large_24"
+        android:paddingHorizontal="@dimen/gc_medium"
+        android:paddingVertical="@dimen/gc_small"
+        android:textColor="@color/gc_dark_01"
+        app:layout_constraintBaseline_toBaselineOf="@+id/total_label"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintHorizontal_chainStyle="spread_inside"
+        app:layout_constraintStart_toEndOf="@+id/total_label"
+        tools:text="3% Skonto discount " />
+
     <com.google.android.material.button.MaterialButton
         android:id="@+id/gbs_pay"
         style="@style/GiniCaptureTheme.Widget.Button.UnelevatedButton"