From 16c188ca0ae8b5a12ab73b7cc94fd34ca6d7dd68 Mon Sep 17 00:00:00 2001
From: Subhash Kumar Vatturi <subhash@backbase.com>
Date: Thu, 25 Jan 2024 19:55:43 +0530
Subject: [PATCH 01/15] feat: add card journey initial setup

---
 accounts-journey/build.gradle.kts             |   1 +
 .../accountlist/ui/AccountListFragment.kt     |  10 +++++++-
 .../main/res/layout/fragment_account_list.xml |   8 ++++++
 .../navigation/account_journey_nav_graph.xml  |  12 +++++++--
 .../src/main/res/values/strings.xml           |   2 ++
 app/build.gradle.kts                          |   8 ++++++
 app/src/main/AndroidManifest.xml              |   3 ++-
 app/src/main/assets/backbase/config.json      |   3 +--
 .../main/res/xml/network_security_config.xml  |  23 +++++++++++++++++
 card-journey/.gitignore                       |   1 +
 card-journey/build.gradle.kts                 |  16 ++++++++++++
 card-journey/consumer-rules.pro               |   0
 card-journey/proguard-rules.pro               |  21 +++++++++++++++
 .../cards_journey/ExampleInstrumentedTest.kt  |  24 ++++++++++++++++++
 card-journey/src/main/AndroidManifest.xml     |   4 +++
 .../backbase/cards_journey/CardsJourney.kt    |  24 ++++++++++++++++++
 .../cards_journey/ui/CardListFragment.kt      |  20 +++++++++++++++
 .../main/res/layout/fragment_card_list.xml    |  14 ++++++++++
 .../res/layout/fragment_cards_journey.xml     |  20 +++++++++++++++
 .../main/res/navigation/cards_navigation.xml  |  13 ++++++++++
 card-journey/src/main/res/values/strings.xml  |   4 +++
 .../backbase/cards_journey/ExampleUnitTest.kt |  17 +++++++++++++
 keystore/debug.keystore                       | Bin 0 -> 2106 bytes
 settings.gradle.kts                           |   1 +
 24 files changed, 243 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/xml/network_security_config.xml
 create mode 100644 card-journey/.gitignore
 create mode 100644 card-journey/build.gradle.kts
 create mode 100644 card-journey/consumer-rules.pro
 create mode 100644 card-journey/proguard-rules.pro
 create mode 100644 card-journey/src/androidTest/java/com/backbase/cards_journey/ExampleInstrumentedTest.kt
 create mode 100644 card-journey/src/main/AndroidManifest.xml
 create mode 100644 card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt
 create mode 100644 card-journey/src/main/java/com/backbase/cards_journey/ui/CardListFragment.kt
 create mode 100644 card-journey/src/main/res/layout/fragment_card_list.xml
 create mode 100644 card-journey/src/main/res/layout/fragment_cards_journey.xml
 create mode 100644 card-journey/src/main/res/navigation/cards_navigation.xml
 create mode 100644 card-journey/src/main/res/values/strings.xml
 create mode 100644 card-journey/src/test/java/com/backbase/cards_journey/ExampleUnitTest.kt
 create mode 100644 keystore/debug.keystore

diff --git a/accounts-journey/build.gradle.kts b/accounts-journey/build.gradle.kts
index b6caa0c9..33ef9eae 100644
--- a/accounts-journey/build.gradle.kts
+++ b/accounts-journey/build.gradle.kts
@@ -13,5 +13,6 @@ dependencies {
     // Backbase libraries
     implementation(backbase.bundles.common)
     implementation(libs.bundles.navigation)
+    implementation(project(":card-journey"))
     androidTestImplementation(project("path" to ":fake-accounts-use-case"))
 }
\ No newline at end of file
diff --git a/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/presentation/accountlist/ui/AccountListFragment.kt b/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/presentation/accountlist/ui/AccountListFragment.kt
index 6ce5d404..4ce6c276 100644
--- a/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/presentation/accountlist/ui/AccountListFragment.kt
+++ b/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/presentation/accountlist/ui/AccountListFragment.kt
@@ -73,6 +73,13 @@ class AccountListFragment : Fragment() {
             .onEach { handleUiState(it) }
             .launchIn(lifecycleScope)
         viewModel.onEvent(AccountListEvent.OnGetAccounts)
+
+        //Remove this button and its action later
+        binding.btnCards.setOnClickListener {
+            val navController = findNavController()
+            val action = AccountListFragmentDirections.actionAccountListFragmentToCardsJourney()
+            navController.navigate(action)
+        }
     }
 
     private fun handleUiState(uiState: AccountListScreenState) {
@@ -104,7 +111,8 @@ class AccountListFragment : Fragment() {
 
     private fun itemClicked(id: String) {
         val navController = findNavController()
-        val action = AccountListFragmentDirections.actionAccountListFragmentToAccountDetailFragment(id)
+        val action =
+            AccountListFragmentDirections.actionAccountListFragmentToAccountDetailFragment(id)
         navController.navigate(action)
     }
 
diff --git a/accounts-journey/src/main/res/layout/fragment_account_list.xml b/accounts-journey/src/main/res/layout/fragment_account_list.xml
index bbad7a60..9fe79920 100644
--- a/accounts-journey/src/main/res/layout/fragment_account_list.xml
+++ b/accounts-journey/src/main/res/layout/fragment_account_list.xml
@@ -103,6 +103,14 @@
                 android:visibility="gone"
                 app:constraint_referenced_ids="no_account_image,accounts_result_text"
                 tools:visibility="gone" />
+
+            <Button
+                android:id="@+id/btnCards"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Cards"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>
 
diff --git a/accounts-journey/src/main/res/navigation/account_journey_nav_graph.xml b/accounts-journey/src/main/res/navigation/account_journey_nav_graph.xml
index 66f6d7ab..fa826212 100644
--- a/accounts-journey/src/main/res/navigation/account_journey_nav_graph.xml
+++ b/accounts-journey/src/main/res/navigation/account_journey_nav_graph.xml
@@ -9,18 +9,26 @@
         android:id="@+id/accountListFragment"
         android:name="com.backbase.accounts_journey.presentation.accountlist.ui.AccountListFragment"
         android:label="fragment_account_list"
-        tools:layout="@layout/fragment_account_list" >
+        tools:layout="@layout/fragment_account_list">
         <action
             android:id="@+id/action_accountListFragment_to_accountDetailFragment"
             app:destination="@id/accountDetailFragment" />
+        <action
+            android:id="@+id/action_accountListFragment_to_cardsJourney"
+            app:destination="@id/cardsJourney" />
     </fragment>
     <fragment
         android:id="@+id/accountDetailFragment"
         android:name="com.backbase.accounts_journey.presentation.accountdetail.ui.AccountDetailFragment"
         android:label="fragment_account_detail"
-        tools:layout="@layout/fragment_account_detail" >
+        tools:layout="@layout/fragment_account_detail">
         <argument
             android:name="id"
             app:argType="string" />
     </fragment>
+    <fragment
+        android:id="@+id/cardsJourney"
+        android:name="com.backbase.cards_journey.CardsJourney"
+        android:label="CardsJourney"
+        tools:layout="@layout/fragment_cards_journey" />
 </navigation>
\ No newline at end of file
diff --git a/accounts-journey/src/main/res/values/strings.xml b/accounts-journey/src/main/res/values/strings.xml
index dc579c39..99a53171 100644
--- a/accounts-journey/src/main/res/values/strings.xml
+++ b/accounts-journey/src/main/res/values/strings.xml
@@ -23,4 +23,6 @@
     <string name="interest_details_accured_interest_label">Accrued Interest</string>
     <string name="overdraft_details_overdraft_limit_label">Overdraft Limit</string>
     <string name="other_account_opening_date_label">Account Opening Date</string>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 62e6a817..3059945c 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.gradle.internal.impldep.org.apache.commons.compress.harmony.pack200.PackingUtils.config
+
 plugins {
     id("com.android.application")
     kotlin("android")
@@ -23,6 +25,12 @@ android {
         }
     }
 
+    signingConfigs {
+        getByName("debug") {
+            storeFile = file("/Users/subhash/AndroidStudioProjects/golden-sample-app-android/keystore/debug.keystore")
+        }
+    }
+
     buildTypes {
         release {
             isDebuggable = false
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 13172dbd..0e334d93 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,8 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Backbase"
         tools:replace="android:fullBackupContent,android:theme"
-        tools:targetApi="34">
+        tools:targetApi="34"
+        android:networkSecurityConfig="@xml/network_security_config">
         <activity
             android:name=".presentation.MainActivity"
             android:exported="true">
diff --git a/app/src/main/assets/backbase/config.json b/app/src/main/assets/backbase/config.json
index b3c71486..3b7c1348 100644
--- a/app/src/main/assets/backbase/config.json
+++ b/app/src/main/assets/backbase/config.json
@@ -18,6 +18,5 @@
     "allowedDomains": [
       "*"
     ]
-  },
-  "bankTimeZone": "Europe/Amsterdam"
+  }
 }
\ No newline at end of file
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
new file mode 100644
index 00000000..d7fbd2e0
--- /dev/null
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,23 @@
+<network-security-config>
+    <domain-config>
+        <!-- Make sure your URL Server here -->
+        <domain includeSubdomains="true">app.prd.sdbxaz.azure.backbaseservices.com</domain>
+        <trust-anchors>
+            <certificates src="user"/>
+            <certificates src="system"/>
+        </trust-anchors>
+    </domain-config>
+
+    <debug-overrides>
+        <trust-anchors>
+            <certificates src="user" />
+            <certificates src="system" />
+        </trust-anchors>
+    </debug-overrides>
+
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="system" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>
\ No newline at end of file
diff --git a/card-journey/.gitignore b/card-journey/.gitignore
new file mode 100644
index 00000000..42afabfd
--- /dev/null
+++ b/card-journey/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/card-journey/build.gradle.kts b/card-journey/build.gradle.kts
new file mode 100644
index 00000000..30a30a20
--- /dev/null
+++ b/card-journey/build.gradle.kts
@@ -0,0 +1,16 @@
+plugins {
+    id(backbase.plugins.feature.android.module.get().pluginId)
+    id(libs.plugins.kotlin.parcelize.get().pluginId)
+    id(libs.plugins.navigation.safe.args.get().pluginId)
+    id(backbase.plugins.configured.detekt.get().pluginId)
+}
+
+android {
+    namespace = "com.backbase.cards_journey"
+}
+
+dependencies {
+    // Backbase libraries
+    implementation(backbase.bundles.common)
+    implementation(libs.bundles.navigation)
+}
\ No newline at end of file
diff --git a/card-journey/consumer-rules.pro b/card-journey/consumer-rules.pro
new file mode 100644
index 00000000..e69de29b
diff --git a/card-journey/proguard-rules.pro b/card-journey/proguard-rules.pro
new file mode 100644
index 00000000..481bb434
--- /dev/null
+++ b/card-journey/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/card-journey/src/androidTest/java/com/backbase/cards_journey/ExampleInstrumentedTest.kt b/card-journey/src/androidTest/java/com/backbase/cards_journey/ExampleInstrumentedTest.kt
new file mode 100644
index 00000000..676275f9
--- /dev/null
+++ b/card-journey/src/androidTest/java/com/backbase/cards_journey/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.backbase.cards_journey
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.backbase.card_journey.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/card-journey/src/main/AndroidManifest.xml b/card-journey/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..a5918e68
--- /dev/null
+++ b/card-journey/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt b/card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt
new file mode 100644
index 00000000..0484a6b0
--- /dev/null
+++ b/card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt
@@ -0,0 +1,24 @@
+package com.backbase.cards_journey
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.backbase.cards_journey.databinding.FragmentCardsJourneyBinding
+
+
+class CardsJourney : Fragment() {
+
+    private var _binding: FragmentCardsJourneyBinding? = null
+    private val binding get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        _binding = FragmentCardsJourneyBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+}
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/CardListFragment.kt b/card-journey/src/main/java/com/backbase/cards_journey/ui/CardListFragment.kt
new file mode 100644
index 00000000..27c5b60b
--- /dev/null
+++ b/card-journey/src/main/java/com/backbase/cards_journey/ui/CardListFragment.kt
@@ -0,0 +1,20 @@
+package com.backbase.cards_journey.ui
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.backbase.cards_journey.R
+
+
+class CardListFragment : Fragment() {
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_card_list, container, false)
+    }
+}
\ No newline at end of file
diff --git a/card-journey/src/main/res/layout/fragment_card_list.xml b/card-journey/src/main/res/layout/fragment_card_list.xml
new file mode 100644
index 00000000..127b3cd4
--- /dev/null
+++ b/card-journey/src/main/res/layout/fragment_card_list.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.CardListFragment">
+
+    <TextView
+        android:gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="Card List Fragment" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/card-journey/src/main/res/layout/fragment_cards_journey.xml b/card-journey/src/main/res/layout/fragment_cards_journey.xml
new file mode 100644
index 00000000..5f5a70fd
--- /dev/null
+++ b/card-journey/src/main/res/layout/fragment_cards_journey.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <fragment
+        android:id="@+id/nav_host_container"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        app:defaultNavHost="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:navGraph="@navigation/cards_navigation"
+        android:layout_width="match_parent"
+        android:layout_height="0dp" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/card-journey/src/main/res/navigation/cards_navigation.xml b/card-journey/src/main/res/navigation/cards_navigation.xml
new file mode 100644
index 00000000..c76f5c10
--- /dev/null
+++ b/card-journey/src/main/res/navigation/cards_navigation.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/cards_navigation"
+    app:startDestination="@id/cardListFragment">
+
+    <fragment
+        android:id="@+id/cardListFragment"
+        android:name="com.backbase.cards_journey.ui.CardListFragment"
+        android:label="fragment_card_list"
+        tools:layout="@layout/fragment_card_list" />
+</navigation>
\ No newline at end of file
diff --git a/card-journey/src/main/res/values/strings.xml b/card-journey/src/main/res/values/strings.xml
new file mode 100644
index 00000000..6048840e
--- /dev/null
+++ b/card-journey/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<resources>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
+</resources>
\ No newline at end of file
diff --git a/card-journey/src/test/java/com/backbase/cards_journey/ExampleUnitTest.kt b/card-journey/src/test/java/com/backbase/cards_journey/ExampleUnitTest.kt
new file mode 100644
index 00000000..d7ea4430
--- /dev/null
+++ b/card-journey/src/test/java/com/backbase/cards_journey/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package com.backbase.cards_journey
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/keystore/debug.keystore b/keystore/debug.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..3dc75013d7ccbb17a906e034bfc160cadb503a35
GIT binary patch
literal 2106
zcmbW1Yd8}O8^^bqV`d~`v+;Nsl58^(ULMCK<PaG-B(u~U<{V)x<ebzSIV2?KFe-D(
z<5<l^%!5L6wn8Y9)9dMdKfKrb@%`}s^80XK|NFkL>$ktWzYG8XK!*YT3e>}o80deE
zNc6fAa+T~Ae#nD58huOw0A3K92Hr=D@Cm8%0l~l%ATc127XYS#xmTGR%{D3Ro&ncy
zYtFWeQ~Va!EaWIwOa63hKKY}+YICZERQhgl)o4-|#8e0;1gDE6-(p5)CasUZKSA2M
zsfTtXVs)O_UcvZ9@TEIwIKG~^wtWzKaRx`Ec(@rFZWfQ}B&LSH`JK?o@9|~8q&la`
zCn<;~?^Z5jP?VW)OJQ!q7<eMiS6kWj%Ke-cwxz*!iT7gS?NnuY2UMxLwidh*Rk>dW
z3Tb*^LCsJ6S|1YPHOzb!6$&d7v|nT*&!BR)kpUdkB`MdwbD3E{l|c}!XG=Hf+z^yx
z_1XZt{@mZG()>>F=iHN)^$r~UpKUpYUwS?gx!3m|&u`rs&4ceFWxO`0_^@Jv<gr~F
zOR)fQmA%7Qr=Y%M#T)A5EW*i8vp;zxG-3%drvG%%_E_9;BUKecCBy7@i_BM79!9+g
z@2-?SOD!TkAV;-t-zHejmb-eeVmxwp3<J%0MULHJ`VI%wXU0qVv|6q@x@Yu<9?j;R
zqcw`mY^P06@K>d&EfLJE6{^f`m%rJXGO=1$?^t*zs^cHH?ajePu$$M?p(BVG_FB<1
z#f6^-v#?#Oslmao+!0ziM$IDf@@q!=LTScx8TXoRQGO4|Z<X(#J<ctJDRA)o69M5I
zE-!O!ZUPbK?{olov+@7~2#~xRpx5K{n7~j}KbPd(0!z5J1Sp8|nTfM8&IPOhsA(!U
z){=QA<(i$C3w07kX<$t<z}(UsyxYY1-t;(&78|%5qXHXM7Ffy{jAjIQr8zS`D0dc?
z;o1^x9<4ZR1a>XBbf<RN-L*)5S)7$3)-ZDU9fD!3A&_ez2C{gk_U2w<9=LAN0PfG3
z1xRU$Rn{EeLCwJZg7Klc?|DRd3Vlct${sb<7p*-BzIZ!J{;JGSl9dI1KCw3t+08vj
z_JvZI@y=^7glvtXpB!r9hox*a38z)!E!!$J)_KY$6}58Nh4;(vKH|3S6<RDmI`vdy
zQt0a=xh>+8FHR=E9T%9*u}Cod!QO69%=f0KmCdiM`}OB)e&EWG##6(@Q}Wqb5HtK{
zm}eu8Fixs<+L@?*mUGRG(~NYVmYr&zK)l6~CRHMixP*wdD;LmxQX!$mxK`f23<>gx
z{?bE&ZW$FB)bS}(Ktia;Iy!%9D#z?}ukqA)x!T&NWLK5NQxi?|D#jE=SR<$+awn{y
z?axVA7o8-cda-F&ail<2bD~14LF>kt*jThGCbX}1N56z$)E6NqO;q9lDqm83vJ=|h
z=0`!6=}~4OtJml4Xi(O^3P!W7)&+^Yd9}ijo31qCEiG=HqL8{cWu33bUcW1uXF_UY
zZ3JqofA4%GBxYdry+J51;5NSHW`7adLb8%@DYBLp2mKb@8dYmHf0?yEJjtM#8}-@-
zPoq$`p9y&{)7@ImkJ=rnd+t87sjjn$@LV_2G|3KD!;kdn@qne1LwEj=|2fcF-g{Sc
z{9MdViN_ZPch__YEXg_RVt;&!RjCD>-pXi;zm`_kz7dDEdzy}I7^>TQ*9VEwvHCDT
zQ=Mi%wD*^*&a2QBw$V^7_)++(WZst%6&=3ko?vQ&eS}05a`rD^D`_mk^7|RUV-zLn
zvcB*fZbgog`B#cK-vN~3e*sUA$XFbSE-!QnBNz$5jpbVsML#r@3x^l}QY0_olqUMj
zp)?oKG|()X2J8a?foKSy;E9B@30sguEAj%+S{O<6F+Ls#Fpn_A@ZU<6Gx^)87|}z8
z9&#aJ{{L{y5wzgngijpgZ~-lM9D+rowb7^1S~x5Q>nsJuqBYTIEsewc0{{PL8c_bf
zYaZI0hX#ZK4mS`2(SSfeYt?YDR)1Laa)+3T2?=RihFYD!WW;?^;>#6{ds}?(5hhY>
zNf+;F-($(myS8`75gT8$!LEQ413}bS`F~UqS*)q}(>5d1WBZBEBZo9bTafxA)-AW#
z>NP9@$r}Y@X3dQ?HS1C$9;Pw2#9JKIoIP)NiKsMOfFZmIM!)pjLmn;tSg~>}TZu}Z
z5wOpt;I<AzL7xVWImRf)zOZbf`LZW^$LP)h`Q$L6*4U;^8p1ro3<;|*G|$>r@VI*a
z0c%U;8P}o8Q~qIt#)@saf3;pqxBJ041NyfGKR5m1I2!ZE>>oDj@~dZ}x3fan6wUe!
z2o5i3Mg4H&RXB(T2>9Pe9$p9tKq-8Nfd;q>a9fZB4_PYPY<8&F8v}o`+l5JPKJRX%
zpb>0xT?uC<+|l>?rS_a^hm{6-Athpx%byVL3mq~)Gx1r&uBxitr>&{<Xlpuk3z6bi
zd7e5*>6O{}^XYh*#W20AfjjE%^1N}5w@3H1-`6ue9pq9_-!fm(HxZ|x#i&LSk=qrw
zTB;-K<*M>|TPHiV`>DZKX3R^%gr}pjx6@`=JA?4-uE}pYi}3zl%|U2zCgo^9gt-z?
z{$;HBM!o7Qclr4fE;s)&Rr=|30aWSwqjq?_BBNWd`=YDw3p|Sz;ea|1)5}+M2tt)6
p4>_3e6?sde(4%#okb$6YH-CGm`a)?JG1|0%B*q|zAB}zl{tMf~z(W84

literal 0
HcmV?d00001

diff --git a/settings.gradle.kts b/settings.gradle.kts
index c81eb6db..00fb9753 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -27,3 +27,4 @@ include(":app")
 include(":accounts-journey")
 include(":accounts-use-case")
 include(":fake-accounts-use-case")
+include(":card-journey")

From 189342d51bf381c5d9506b4632902c9c7b1970c8 Mon Sep 17 00:00:00 2001
From: Bhargavi Devi Yamanuri <bhargavi@backbase.com>
Date: Fri, 26 Jan 2024 15:41:59 +0530
Subject: [PATCH 02/15] feat:navigation to custom card journey from accounts
 journey

---
 accounts-journey/build.gradle.kts              |  1 -
 .../accountlist/ui/AccountListFragment.kt      |  6 +++---
 .../router/CardNavigationAction.kt             |  8 ++++++++
 .../navigation/account_journey_nav_graph.xml   |  9 +--------
 app/build.gradle.kts                           |  1 +
 .../golden_sample_app/MainApplication.kt       |  2 ++
 .../golden_sample_app/koin/NavigationModule.kt | 18 ++++++++++++++++++
 .../main/res/navigation/navigation_main.xml    |  8 ++++++++
 .../com/backbase/cards_journey/CardsJourney.kt |  2 ++
 9 files changed, 43 insertions(+), 12 deletions(-)
 create mode 100644 accounts-journey/src/main/kotlin/com/backbase/accounts_journey/router/CardNavigationAction.kt
 create mode 100644 app/src/main/kotlin/com/backbase/golden_sample_app/koin/NavigationModule.kt

diff --git a/accounts-journey/build.gradle.kts b/accounts-journey/build.gradle.kts
index 33ef9eae..b6caa0c9 100644
--- a/accounts-journey/build.gradle.kts
+++ b/accounts-journey/build.gradle.kts
@@ -13,6 +13,5 @@ dependencies {
     // Backbase libraries
     implementation(backbase.bundles.common)
     implementation(libs.bundles.navigation)
-    implementation(project(":card-journey"))
     androidTestImplementation(project("path" to ":fake-accounts-use-case"))
 }
\ No newline at end of file
diff --git a/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/presentation/accountlist/ui/AccountListFragment.kt b/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/presentation/accountlist/ui/AccountListFragment.kt
index 4ce6c276..26d4c006 100644
--- a/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/presentation/accountlist/ui/AccountListFragment.kt
+++ b/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/presentation/accountlist/ui/AccountListFragment.kt
@@ -14,6 +14,7 @@ import com.backbase.accounts_journey.R
 import com.backbase.accounts_journey.configuration.AccountsJourneyConfiguration
 import com.backbase.accounts_journey.configuration.accountlist.AccountListScreenConfiguration
 import com.backbase.accounts_journey.databinding.FragmentAccountListBinding
+import com.backbase.accounts_journey.router.CardNavigationAction
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.koin.android.ext.android.inject
@@ -39,6 +40,7 @@ class AccountListFragment : Fragment() {
     private val accountListAdapter: AccountListAdapter = AccountListAdapter(
         onClick = { itemClicked(it) }
     )
+    private val cardNavigationAction: CardNavigationAction by inject()
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -76,9 +78,7 @@ class AccountListFragment : Fragment() {
 
         //Remove this button and its action later
         binding.btnCards.setOnClickListener {
-            val navController = findNavController()
-            val action = AccountListFragmentDirections.actionAccountListFragmentToCardsJourney()
-            navController.navigate(action)
+            cardNavigationAction.navigateToCards(findNavController())
         }
     }
 
diff --git a/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/router/CardNavigationAction.kt b/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/router/CardNavigationAction.kt
new file mode 100644
index 00000000..6d79df81
--- /dev/null
+++ b/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/router/CardNavigationAction.kt
@@ -0,0 +1,8 @@
+package com.backbase.accounts_journey.router
+
+import androidx.navigation.NavController
+
+interface CardNavigationAction {
+
+    fun navigateToCards(navController: NavController)
+}
\ No newline at end of file
diff --git a/accounts-journey/src/main/res/navigation/account_journey_nav_graph.xml b/accounts-journey/src/main/res/navigation/account_journey_nav_graph.xml
index fa826212..76837ff5 100644
--- a/accounts-journey/src/main/res/navigation/account_journey_nav_graph.xml
+++ b/accounts-journey/src/main/res/navigation/account_journey_nav_graph.xml
@@ -13,9 +13,6 @@
         <action
             android:id="@+id/action_accountListFragment_to_accountDetailFragment"
             app:destination="@id/accountDetailFragment" />
-        <action
-            android:id="@+id/action_accountListFragment_to_cardsJourney"
-            app:destination="@id/cardsJourney" />
     </fragment>
     <fragment
         android:id="@+id/accountDetailFragment"
@@ -26,9 +23,5 @@
             android:name="id"
             app:argType="string" />
     </fragment>
-    <fragment
-        android:id="@+id/cardsJourney"
-        android:name="com.backbase.cards_journey.CardsJourney"
-        android:label="CardsJourney"
-        tools:layout="@layout/fragment_cards_journey" />
+
 </navigation>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3059945c..ebc45105 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -83,6 +83,7 @@ android {
 dependencies {
     implementation(project(":accounts-journey"))
     implementation(project(":accounts-use-case"))
+    implementation(project(":card-journey"))
 
     implementation(platform(libs.kotlin.bom))
     implementation(libs.bundles.android.core)
diff --git a/app/src/main/kotlin/com/backbase/golden_sample_app/MainApplication.kt b/app/src/main/kotlin/com/backbase/golden_sample_app/MainApplication.kt
index df28a9e6..0756c56f 100644
--- a/app/src/main/kotlin/com/backbase/golden_sample_app/MainApplication.kt
+++ b/app/src/main/kotlin/com/backbase/golden_sample_app/MainApplication.kt
@@ -22,6 +22,7 @@ import com.backbase.golden_sample_app.koin.accountsModule
 import com.backbase.golden_sample_app.koin.appModule
 import com.backbase.golden_sample_app.koin.featureFilterModule
 import com.backbase.golden_sample_app.koin.identityAuthModule
+import com.backbase.golden_sample_app.koin.navigationModule
 import com.backbase.golden_sample_app.koin.securityModule
 import com.backbase.golden_sample_app.koin.userModule
 import com.backbase.golden_sample_app.koin.workspacesModule
@@ -104,6 +105,7 @@ class MainApplication : Application() {
 
         loadKoinModules(
             listOf(
+                navigationModule,
                 securityModule(this@MainApplication),
                 userModule,
                 featureFilterModule,
diff --git a/app/src/main/kotlin/com/backbase/golden_sample_app/koin/NavigationModule.kt b/app/src/main/kotlin/com/backbase/golden_sample_app/koin/NavigationModule.kt
new file mode 100644
index 00000000..6f402c32
--- /dev/null
+++ b/app/src/main/kotlin/com/backbase/golden_sample_app/koin/NavigationModule.kt
@@ -0,0 +1,18 @@
+package com.backbase.golden_sample_app.koin
+
+import androidx.navigation.NavController
+import com.backbase.accounts_journey.router.CardNavigationAction
+import com.backbase.golden_sample_app.R
+import org.koin.dsl.module
+
+val navigationModule = module {
+    single<CardNavigationAction> {
+        object : CardNavigationAction {
+            override fun navigateToCards(navController: NavController) {
+                navController.navigate(
+                    R.id.action_global_cardsJourney,
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/navigation/navigation_main.xml b/app/src/main/res/navigation/navigation_main.xml
index 11a9da63..78801c7b 100644
--- a/app/src/main/res/navigation/navigation_main.xml
+++ b/app/src/main/res/navigation/navigation_main.xml
@@ -63,4 +63,12 @@
             android:name="accountId"
             app:argType="string" />
     </fragment>
+    <fragment
+        android:id="@+id/cardsJourney"
+        android:name="com.backbase.cards_journey.CardsJourney"
+        android:label="CardsJourney"
+        tools:layout="@layout/fragment_cards_journey" />
+    <action
+        android:id="@+id/action_global_cardsJourney"
+        app:destination="@id/cardsJourney" />
 </navigation>
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt b/card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt
index 0484a6b0..1d84cf07 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt
+++ b/card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.fragment.app.Fragment
 import com.backbase.cards_journey.databinding.FragmentCardsJourneyBinding
 
@@ -18,6 +19,7 @@ class CardsJourney : Fragment() {
         savedInstanceState: Bundle?
     ): View? {
         _binding = FragmentCardsJourneyBinding.inflate(inflater, container, false)
+        Toast.makeText(requireContext(), "Cards Journey", Toast.LENGTH_SHORT).show()
         return binding.root
     }
 

From 4dcf03665076fb01719e7fb53341c984e8649a11 Mon Sep 17 00:00:00 2001
From: BhargaviYamanuri <bhargavi@backbase.com>
Date: Fri, 26 Jan 2024 21:13:17 +0530
Subject: [PATCH 03/15] feat:custom card client and usecase implementation

---
 app/build.gradle.kts                          |  1 +
 .../golden_sample_app/MainApplication.kt      |  2 +
 card-journey/build.gradle.kts                 |  3 ++
 card-journey/consumer-rules.pro               |  0
 card-journey/proguard-rules.pro               | 21 --------
 card-journey/src/main/AndroidManifest.xml     |  4 --
 .../backbase/cards_journey/CardsJourney.kt    | 25 ++++++++++
 .../data/CustomCardClientImpl.kt              | 38 +++++++++++++++
 .../domain/CustomCardUseCaseImpl.kt           | 36 ++++++++++++++
 .../backbase/cards_journey/koin/CardModule.kt | 48 +++++++++++++++++++
 .../backbase/cards_journey/utils/AppUtils.kt  |  5 ++
 .../cards_journey/utils/BBDbsClient.kt        | 28 +++++++++++
 card-use-case/.gitignore                      |  1 +
 card-use-case/build.gradle.kts                | 16 +++++++
 .../card_use_case/ExampleInstrumentedTest.kt  | 24 ++++++++++
 .../card_use_case/data/CustomCardClient.kt    |  9 ++++
 .../card_use_case/domain/CustomCardUseCase.kt |  8 ++++
 .../backbase/card_use_case/ExampleUnitTest.kt | 17 +++++++
 gradle/backbase.versions.toml                 | 13 +++++
 settings.gradle.kts                           |  1 +
 20 files changed, 275 insertions(+), 25 deletions(-)
 delete mode 100644 card-journey/consumer-rules.pro
 delete mode 100644 card-journey/proguard-rules.pro
 delete mode 100644 card-journey/src/main/AndroidManifest.xml
 create mode 100644 card-journey/src/main/java/com/backbase/cards_journey/data/CustomCardClientImpl.kt
 create mode 100644 card-journey/src/main/java/com/backbase/cards_journey/domain/CustomCardUseCaseImpl.kt
 create mode 100644 card-journey/src/main/java/com/backbase/cards_journey/koin/CardModule.kt
 create mode 100644 card-journey/src/main/java/com/backbase/cards_journey/utils/AppUtils.kt
 create mode 100644 card-journey/src/main/java/com/backbase/cards_journey/utils/BBDbsClient.kt
 create mode 100644 card-use-case/.gitignore
 create mode 100644 card-use-case/build.gradle.kts
 create mode 100644 card-use-case/src/androidTest/java/com/backbase/card_use_case/ExampleInstrumentedTest.kt
 create mode 100644 card-use-case/src/main/java/com/backbase/card_use_case/data/CustomCardClient.kt
 create mode 100644 card-use-case/src/main/java/com/backbase/card_use_case/domain/CustomCardUseCase.kt
 create mode 100644 card-use-case/src/test/java/com/backbase/card_use_case/ExampleUnitTest.kt

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ebc45105..831562db 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -84,6 +84,7 @@ dependencies {
     implementation(project(":accounts-journey"))
     implementation(project(":accounts-use-case"))
     implementation(project(":card-journey"))
+    implementation(project(":card-use-case"))
 
     implementation(platform(libs.kotlin.bom))
     implementation(libs.bundles.android.core)
diff --git a/app/src/main/kotlin/com/backbase/golden_sample_app/MainApplication.kt b/app/src/main/kotlin/com/backbase/golden_sample_app/MainApplication.kt
index 0756c56f..3d237be1 100644
--- a/app/src/main/kotlin/com/backbase/golden_sample_app/MainApplication.kt
+++ b/app/src/main/kotlin/com/backbase/golden_sample_app/MainApplication.kt
@@ -16,6 +16,7 @@ import com.backbase.android.listeners.ModelListener
 import com.backbase.android.model.Model
 import com.backbase.android.model.ModelSource
 import com.backbase.android.utils.net.response.Response
+import com.backbase.cards_journey.koin.cardModule
 import com.backbase.golden_sample_app.authentication.CompositeSessionListener
 import com.backbase.golden_sample_app.common.TAG
 import com.backbase.golden_sample_app.koin.accountsModule
@@ -115,6 +116,7 @@ class MainApplication : Application() {
                 WorkspacesJourney.create(),
                 accountsModule,
                 AccountsJourney.create(configuration = setupAccountsJourneyConfiguration()),
+                cardModule(this@MainApplication),
             )
         )
     }
diff --git a/card-journey/build.gradle.kts b/card-journey/build.gradle.kts
index 30a30a20..7e02e9e2 100644
--- a/card-journey/build.gradle.kts
+++ b/card-journey/build.gradle.kts
@@ -13,4 +13,7 @@ dependencies {
     // Backbase libraries
     implementation(backbase.bundles.common)
     implementation(libs.bundles.navigation)
+    implementation(backbase.bundles.card.client.common)
+
+    implementation(project(":card-use-case"))
 }
\ No newline at end of file
diff --git a/card-journey/consumer-rules.pro b/card-journey/consumer-rules.pro
deleted file mode 100644
index e69de29b..00000000
diff --git a/card-journey/proguard-rules.pro b/card-journey/proguard-rules.pro
deleted file mode 100644
index 481bb434..00000000
--- a/card-journey/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/card-journey/src/main/AndroidManifest.xml b/card-journey/src/main/AndroidManifest.xml
deleted file mode 100644
index a5918e68..00000000
--- a/card-journey/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt b/card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt
index 1d84cf07..4b3eef89 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt
+++ b/card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt
@@ -1,18 +1,26 @@
 package com.backbase.cards_journey
 
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.backbase.card_use_case.domain.CustomCardUseCase
 import com.backbase.cards_journey.databinding.FragmentCardsJourneyBinding
+import kotlinx.coroutines.launch
+import org.koin.android.ext.android.inject
 
 
 class CardsJourney : Fragment() {
 
     private var _binding: FragmentCardsJourneyBinding? = null
     private val binding get() = _binding!!
+    private val cardUseCase: CustomCardUseCase by inject()
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -23,4 +31,21 @@ class CardsJourney : Fragment() {
         return binding.root
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                cardUseCase.getCards().fold(
+                    onSuccess = {
+                        Log.e("TAG", "onViewCreated: $it ", )
+                        Toast.makeText(requireContext(), "${it.size}", Toast.LENGTH_SHORT).show()
+                    },
+                    onFailure = {
+                        Toast.makeText(requireContext(), "Failed", Toast.LENGTH_SHORT).show()
+                    }
+                )
+            }
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/data/CustomCardClientImpl.kt b/card-journey/src/main/java/com/backbase/cards_journey/data/CustomCardClientImpl.kt
new file mode 100644
index 00000000..7598c910
--- /dev/null
+++ b/card-journey/src/main/java/com/backbase/cards_journey/data/CustomCardClientImpl.kt
@@ -0,0 +1,38 @@
+package com.backbase.cards_journey.data
+
+import android.content.Context
+import com.backbase.android.Backbase
+import com.backbase.android.client.cardsclient2.model.CardItem
+import com.backbase.android.clients.common.Call
+import com.backbase.android.clients.common.MoshiResponseBodyParser
+import com.backbase.android.common.utils.dbs.Params
+import com.backbase.android.dbs.DBSDataProvider
+import com.backbase.card_use_case.data.CustomCardClient
+import com.backbase.cards_journey.utils.BBDbsClient
+import com.backbase.cards_journey.utils.Constants
+import com.squareup.moshi.Types
+import java.net.URI
+
+class CustomCardClientImpl(
+    private val parser: MoshiResponseBodyParser,
+    context: Context,
+    serverUri: URI,
+    provider: DBSDataProvider,
+    backbase: Backbase
+) : BBDbsClient(context, serverUri, provider, backbase), CustomCardClient {
+    override fun getCards(): Call<List<CardItem>> {
+        return buildGetRequest(
+            serverUri,
+            Constants.GET_CARDS_END_POINT,
+            Params(),
+            provider
+        ).let {
+            Call(
+                it,
+                provider, parser,
+                Types.newParameterizedType(List::class.java, CardItem::class.java)
+            )
+        }
+    }
+
+}
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/domain/CustomCardUseCaseImpl.kt b/card-journey/src/main/java/com/backbase/cards_journey/domain/CustomCardUseCaseImpl.kt
new file mode 100644
index 00000000..a11452d7
--- /dev/null
+++ b/card-journey/src/main/java/com/backbase/cards_journey/domain/CustomCardUseCaseImpl.kt
@@ -0,0 +1,36 @@
+package com.backbase.cards_journey.domain
+
+import com.backbase.android.client.cardsclient2.model.CardItem
+import com.backbase.android.clients.common.CallResult
+import com.backbase.android.clients.common.coroutines.executeAsSuspended
+import com.backbase.card_use_case.data.CustomCardClient
+import com.backbase.card_use_case.domain.CustomCardUseCase
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+class CustomCardUseCaseImpl(private val customCardClient: CustomCardClient) : CustomCardUseCase {
+    override suspend fun getCards(): Result<List<CardItem>> {
+        return withContext(Dispatchers.IO) {
+            when (val callResult =
+                customCardClient.getCards().executeAsSuspended()) {
+                is CallResult.Success -> {
+                    Result.success(callResult.data)
+                }
+
+                is CallResult.Error -> {
+                    Result.failure(
+                        Throwable(
+                            message = callResult.errorResponse.errorMessage,
+                            cause = Throwable(callResult.errorResponse.causeTrace),
+                        )
+                    )
+                }
+
+                else -> {
+                    Result.failure(Throwable())
+                }
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/koin/CardModule.kt b/card-journey/src/main/java/com/backbase/cards_journey/koin/CardModule.kt
new file mode 100644
index 00000000..c94dbba8
--- /dev/null
+++ b/card-journey/src/main/java/com/backbase/cards_journey/koin/CardModule.kt
@@ -0,0 +1,48 @@
+package com.backbase.cards_journey.koin
+
+import android.content.Context
+import com.backbase.android.Backbase
+import com.backbase.android.clients.common.MoshiResponseBodyParser
+import com.backbase.android.clients.common.base64Adapter
+import com.backbase.android.clients.common.bigDecimalAdapter
+import com.backbase.android.clients.common.dateAdapter
+import com.backbase.android.clients.common.dateTimeAdapter
+import com.backbase.android.dbs.dataproviders.NetworkDBSDataProvider
+import com.backbase.card_use_case.data.CustomCardClient
+import com.backbase.card_use_case.domain.CustomCardUseCase
+import com.backbase.cards_journey.data.CustomCardClientImpl
+import com.backbase.cards_journey.domain.CustomCardUseCaseImpl
+import com.squareup.moshi.Moshi
+import org.koin.dsl.module
+import java.net.URI
+
+val serverUrl: String?
+    get() = Backbase.getInstance()?.configuration?.experienceConfiguration?.serverURL
+private const val CARD_MANAGER_ENDPOINT = "/api/cards-presentation-service"
+private val moshi = Moshi.Builder()
+    .add(bigDecimalAdapter)
+    .add(dateAdapter)
+    .add(dateTimeAdapter)
+    .add(base64Adapter)
+    .build()
+
+fun cardModule(context: Context) = module {
+
+    val backbase = Backbase.requireInstance()
+    single { backbase.getClient(CustomCardClientImpl::class.java) }
+    factory<CustomCardUseCase> {
+        CustomCardUseCaseImpl(
+            customCardClient = get()
+        )
+    }
+    factory<CustomCardClient> {
+        CustomCardClientImpl(
+            context = context,
+            parser = MoshiResponseBodyParser(moshi),
+            serverUri = URI(serverUrl + CARD_MANAGER_ENDPOINT),
+            provider = NetworkDBSDataProvider(context),
+            backbase = Backbase.requireInstance()
+        )
+    }
+
+}
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/utils/AppUtils.kt b/card-journey/src/main/java/com/backbase/cards_journey/utils/AppUtils.kt
new file mode 100644
index 00000000..812200eb
--- /dev/null
+++ b/card-journey/src/main/java/com/backbase/cards_journey/utils/AppUtils.kt
@@ -0,0 +1,5 @@
+package com.backbase.cards_journey.utils
+
+object Constants {
+    const val GET_CARDS_END_POINT = "/client-api/v2/cards"
+}
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/utils/BBDbsClient.kt b/card-journey/src/main/java/com/backbase/cards_journey/utils/BBDbsClient.kt
new file mode 100644
index 00000000..05b61b12
--- /dev/null
+++ b/card-journey/src/main/java/com/backbase/cards_journey/utils/BBDbsClient.kt
@@ -0,0 +1,28 @@
+package com.backbase.cards_journey.utils
+
+import android.content.Context
+import com.backbase.android.Backbase
+import com.backbase.android.common.utils.dbs.CustomNetworkDBSProvider
+import com.backbase.android.common.utils.dbs.DBSDataImpl
+import com.backbase.android.dbs.DBSClient
+import com.backbase.android.dbs.DBSDataProvider
+import java.net.URI
+
+open class BBDbsClient(
+    val context: Context,
+    var serverUri: URI,
+    var provider: DBSDataProvider = CustomNetworkDBSProvider(context),
+    var backbase: Backbase = requireNotNull(Backbase.getInstance()) { "The Backbase instance must not be null!" }
+) : DBSClient, DBSDataImpl(backbase) {
+    override fun setBaseURI(baseUri: URI) {
+        serverUri = baseUri
+    }
+
+    override fun getBaseURI() = this.serverUri
+
+    override fun setDataProvider(provider: DBSDataProvider?) {
+        this.provider = requireNotNull(provider) { "The provider must not be null!" }
+    }
+
+    override fun getDataProvider(): DBSDataProvider = provider
+}
\ No newline at end of file
diff --git a/card-use-case/.gitignore b/card-use-case/.gitignore
new file mode 100644
index 00000000..42afabfd
--- /dev/null
+++ b/card-use-case/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/card-use-case/build.gradle.kts b/card-use-case/build.gradle.kts
new file mode 100644
index 00000000..7228ba58
--- /dev/null
+++ b/card-use-case/build.gradle.kts
@@ -0,0 +1,16 @@
+plugins {
+    id(backbase.plugins.feature.android.module.get().pluginId)
+    id(libs.plugins.kotlin.parcelize.get().pluginId)
+    id(libs.plugins.navigation.safe.args.get().pluginId)
+    id(backbase.plugins.configured.detekt.get().pluginId)
+}
+
+android {
+    namespace = "com.backbase.card_use_case"
+}
+
+dependencies {
+
+    // Backbase libraries
+    implementation(backbase.bundles.card.client.common)
+}
\ No newline at end of file
diff --git a/card-use-case/src/androidTest/java/com/backbase/card_use_case/ExampleInstrumentedTest.kt b/card-use-case/src/androidTest/java/com/backbase/card_use_case/ExampleInstrumentedTest.kt
new file mode 100644
index 00000000..6b99b678
--- /dev/null
+++ b/card-use-case/src/androidTest/java/com/backbase/card_use_case/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.backbase.card_use_case
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.backbase.card_use_case.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/card-use-case/src/main/java/com/backbase/card_use_case/data/CustomCardClient.kt b/card-use-case/src/main/java/com/backbase/card_use_case/data/CustomCardClient.kt
new file mode 100644
index 00000000..f174c089
--- /dev/null
+++ b/card-use-case/src/main/java/com/backbase/card_use_case/data/CustomCardClient.kt
@@ -0,0 +1,9 @@
+package com.backbase.card_use_case.data
+
+import com.backbase.android.client.cardsclient2.model.CardItem
+import com.backbase.android.clients.common.Call
+
+interface CustomCardClient {
+    fun getCards(): Call<List<CardItem>>
+
+}
\ No newline at end of file
diff --git a/card-use-case/src/main/java/com/backbase/card_use_case/domain/CustomCardUseCase.kt b/card-use-case/src/main/java/com/backbase/card_use_case/domain/CustomCardUseCase.kt
new file mode 100644
index 00000000..9f1ee424
--- /dev/null
+++ b/card-use-case/src/main/java/com/backbase/card_use_case/domain/CustomCardUseCase.kt
@@ -0,0 +1,8 @@
+package com.backbase.card_use_case.domain
+
+import com.backbase.android.client.cardsclient2.model.CardItem
+
+interface CustomCardUseCase {
+
+    suspend fun getCards(): Result<List<CardItem>>
+}
\ No newline at end of file
diff --git a/card-use-case/src/test/java/com/backbase/card_use_case/ExampleUnitTest.kt b/card-use-case/src/test/java/com/backbase/card_use_case/ExampleUnitTest.kt
new file mode 100644
index 00000000..cc51b946
--- /dev/null
+++ b/card-use-case/src/test/java/com/backbase/card_use_case/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package com.backbase.card_use_case
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/gradle/backbase.versions.toml b/gradle/backbase.versions.toml
index 8bbe6d37..afbcda06 100644
--- a/gradle/backbase.versions.toml
+++ b/gradle/backbase.versions.toml
@@ -8,6 +8,9 @@ business-journey-common = "5.0.0"
 
 ## C
 clients-common-coroutines = "2.0.0"
+cards-client              = "2.0.0"
+clients-common             = "1.6.2"
+common-utils             = "7.0.0"
 
 ## D
 design-system = "5.5.0"
@@ -42,6 +45,9 @@ business-journey-common = { group = "com.backbase.android.business.journey", nam
 
 ## C
 clients-common-coroutines = { group = "com.backbase.android.clients", name = "clients-common-coroutines", version.ref = "clients-common-coroutines" }
+cards-client = { group = "com.backbase.android.clients", name = "gen-cards-client-2", version.ref = "cards-client" }
+clients-common = { group = "com.backbase.android.clients", name = "clients-common", version.ref = "clients-common" }
+common-utils = { group = "com.backbase.android.common", name = "common-utils", version.ref = "common-utils" }
 
 ## D
 design-system = { group = "com.backbase.android.design", name = "design-system", version.ref = "design-system" }
@@ -106,6 +112,13 @@ common = [
     "retail-journey-common",
     "journey-test",
 ]
+card-client-common = [
+    "cards-client",
+    "clients-common-coroutines",
+    "clients-common",
+    "common-utils",
+    "retail-journey-common",
+]
 
 ## F
 # implementation(backbase.bundles.feature.filter)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 00fb9753..f09be14e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -28,3 +28,4 @@ include(":accounts-journey")
 include(":accounts-use-case")
 include(":fake-accounts-use-case")
 include(":card-journey")
+include(":card-use-case")

From 5b6454b0ac173976b945594e54a7537700210cc1 Mon Sep 17 00:00:00 2001
From: Subhash Kumar Vatturi <subhash@backbase.com>
Date: Mon, 29 Jan 2024 20:08:08 +0530
Subject: [PATCH 04/15] feat:add card list screen

---
 .../golden_sample_app/MainApplication.kt      |  2 +
 card-journey/build.gradle.kts                 |  1 -
 .../backbase/cards_journey/CardsJourney.kt    | 27 -------
 .../cards_journey/CardsJourneyModule.kt       | 13 ++++
 .../cards_journey/CardsJourneyScope.kt        | 60 +++++++++++++++
 .../cards_journey/mvi/BaseViewModel.kt        | 57 ++++++++++++++
 .../backbase/cards_journey/mvi/UiEffect.kt    |  3 +
 .../com/backbase/cards_journey/mvi/UiEvent.kt |  3 +
 .../com/backbase/cards_journey/mvi/UiState.kt |  3 +
 .../cards_journey/ui/CardListFragment.kt      | 20 -----
 .../cards_journey/ui/list/CardListAdapter.kt  | 34 +++++++++
 .../cards_journey/ui/list/CardListFragment.kt | 76 +++++++++++++++++++
 .../ui/list/CardListScreenContract.kt         | 20 +++++
 .../ui/list/CardListViewModel.kt              | 42 ++++++++++
 .../cards_journey/ui/list/CardViewHolder.kt   | 19 +++++
 .../src/main/res/drawable/card_gradient.xml   |  9 +++
 .../src/main/res/drawable/ic_backbase.xml     |  9 +++
 .../src/main/res/drawable/ic_mada_logo.xml    | 34 +++++++++
 .../src/main/res/drawable/ic_mc_logo.xml      | 18 +++++
 .../main/res/layout/fragment_card_list.xml    | 22 ++++--
 .../res/layout/fragment_cards_journey.xml     | 15 ++--
 .../src/main/res/layout/inflate_card.xml      | 73 ++++++++++++++++++
 .../main/res/navigation/cards_navigation.xml  |  2 +-
 card-journey/src/main/res/values/dimens.xml   |  9 +++
 .../card_use_case/data/CustomCardClient.kt    |  1 -
 25 files changed, 507 insertions(+), 65 deletions(-)
 create mode 100644 card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyModule.kt
 create mode 100644 card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyScope.kt
 create mode 100644 card-journey/src/main/java/com/backbase/cards_journey/mvi/BaseViewModel.kt
 create mode 100644 card-journey/src/main/java/com/backbase/cards_journey/mvi/UiEffect.kt
 create mode 100644 card-journey/src/main/java/com/backbase/cards_journey/mvi/UiEvent.kt
 create mode 100644 card-journey/src/main/java/com/backbase/cards_journey/mvi/UiState.kt
 delete mode 100644 card-journey/src/main/java/com/backbase/cards_journey/ui/CardListFragment.kt
 create mode 100644 card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListAdapter.kt
 create mode 100644 card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListFragment.kt
 create mode 100644 card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListScreenContract.kt
 create mode 100644 card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListViewModel.kt
 create mode 100644 card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardViewHolder.kt
 create mode 100644 card-journey/src/main/res/drawable/card_gradient.xml
 create mode 100644 card-journey/src/main/res/drawable/ic_backbase.xml
 create mode 100644 card-journey/src/main/res/drawable/ic_mada_logo.xml
 create mode 100644 card-journey/src/main/res/drawable/ic_mc_logo.xml
 create mode 100644 card-journey/src/main/res/layout/inflate_card.xml
 create mode 100644 card-journey/src/main/res/values/dimens.xml

diff --git a/app/src/main/kotlin/com/backbase/golden_sample_app/MainApplication.kt b/app/src/main/kotlin/com/backbase/golden_sample_app/MainApplication.kt
index 3d237be1..d02af3db 100644
--- a/app/src/main/kotlin/com/backbase/golden_sample_app/MainApplication.kt
+++ b/app/src/main/kotlin/com/backbase/golden_sample_app/MainApplication.kt
@@ -16,6 +16,7 @@ import com.backbase.android.listeners.ModelListener
 import com.backbase.android.model.Model
 import com.backbase.android.model.ModelSource
 import com.backbase.android.utils.net.response.Response
+import com.backbase.cards_journey.cardsJourneyModule
 import com.backbase.cards_journey.koin.cardModule
 import com.backbase.golden_sample_app.authentication.CompositeSessionListener
 import com.backbase.golden_sample_app.common.TAG
@@ -117,6 +118,7 @@ class MainApplication : Application() {
                 accountsModule,
                 AccountsJourney.create(configuration = setupAccountsJourneyConfiguration()),
                 cardModule(this@MainApplication),
+                cardsJourneyModule
             )
         )
     }
diff --git a/card-journey/build.gradle.kts b/card-journey/build.gradle.kts
index 7e02e9e2..be4e568c 100644
--- a/card-journey/build.gradle.kts
+++ b/card-journey/build.gradle.kts
@@ -14,6 +14,5 @@ dependencies {
     implementation(backbase.bundles.common)
     implementation(libs.bundles.navigation)
     implementation(backbase.bundles.card.client.common)
-
     implementation(project(":card-use-case"))
 }
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt b/card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt
index 4b3eef89..0484a6b0 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt
+++ b/card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt
@@ -1,51 +1,24 @@
 package com.backbase.cards_journey
 
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import com.backbase.card_use_case.domain.CustomCardUseCase
 import com.backbase.cards_journey.databinding.FragmentCardsJourneyBinding
-import kotlinx.coroutines.launch
-import org.koin.android.ext.android.inject
 
 
 class CardsJourney : Fragment() {
 
     private var _binding: FragmentCardsJourneyBinding? = null
     private val binding get() = _binding!!
-    private val cardUseCase: CustomCardUseCase by inject()
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
         _binding = FragmentCardsJourneyBinding.inflate(inflater, container, false)
-        Toast.makeText(requireContext(), "Cards Journey", Toast.LENGTH_SHORT).show()
         return binding.root
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.STARTED) {
-                cardUseCase.getCards().fold(
-                    onSuccess = {
-                        Log.e("TAG", "onViewCreated: $it ", )
-                        Toast.makeText(requireContext(), "${it.size}", Toast.LENGTH_SHORT).show()
-                    },
-                    onFailure = {
-                        Toast.makeText(requireContext(), "Failed", Toast.LENGTH_SHORT).show()
-                    }
-                )
-            }
-        }
-    }
-
 }
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyModule.kt b/card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyModule.kt
new file mode 100644
index 00000000..347a0033
--- /dev/null
+++ b/card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyModule.kt
@@ -0,0 +1,13 @@
+package com.backbase.cards_journey
+
+import com.backbase.cards_journey.ui.list.CardListViewModel
+import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.dsl.module
+
+val cardsJourneyModule = module {
+    scope<CardsJourneyScope> {
+        viewModel {
+            CardListViewModel(get())
+        }
+    }
+}
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyScope.kt b/card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyScope.kt
new file mode 100644
index 00000000..49e267c9
--- /dev/null
+++ b/card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyScope.kt
@@ -0,0 +1,60 @@
+package com.backbase.cards_journey
+
+import androidx.annotation.MainThread
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModel
+import com.backbase.android.retail.journey.koin.KoinScopeViewModel
+import com.backbase.android.retail.journey.koin.scoped
+import com.backbase.android.retail.journey.koin.scopedViewModel
+import com.backbase.cards_journey.ui.list.CardListViewModel
+import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.core.context.loadKoinModules
+import org.koin.core.context.unloadKoinModules
+import org.koin.core.module.Module
+import org.koin.core.parameter.ParametersDefinition
+import org.koin.core.qualifier.Qualifier
+import org.koin.dsl.module
+
+interface CardsJourneyScope
+
+@MainThread
+internal inline fun <reified T : Any> Fragment.journeyScoped(
+    qualifier: Qualifier? = null,
+    noinline parameters: ParametersDefinition? = null
+): Lazy<T> =
+    scoped<CardsJourney, CardsJourneyScopeImpl, T>(qualifier, parameters)
+
+@MainThread
+internal inline fun <reified VM : ViewModel> Fragment.journeyScopedViewModel(
+    qualifier: Qualifier? = null,
+    noinline parameters: ParametersDefinition? = null
+): Lazy<VM> =
+    scopedViewModel<CardsJourney, CardsJourneyScopeImpl, VM>(
+        qualifier,
+        parameters
+    )
+
+class CardsJourneyScopeImpl :
+    KoinScopeViewModel(CardsJourneyScope::class, module { }),
+    CardsJourneyScope {
+
+    private var scopeModule: Module? = null
+
+    fun launchWithArguments() {
+        if (scopeModule == null) {
+            scopeModule = ScopedModule<CardsJourneyScope> {
+                /*viewModel {
+                    CardListViewModel(get())
+                }*/
+            }.apply {
+                loadKoinModules(this)
+            }
+        }
+    }
+
+    override fun onCleared() {
+        super.onCleared()
+        scopeModule?.let { unloadKoinModules(it) }
+    }
+}
+
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/mvi/BaseViewModel.kt b/card-journey/src/main/java/com/backbase/cards_journey/mvi/BaseViewModel.kt
new file mode 100644
index 00000000..9fe43338
--- /dev/null
+++ b/card-journey/src/main/java/com/backbase/cards_journey/mvi/BaseViewModel.kt
@@ -0,0 +1,57 @@
+package com.backbase.cards_journey.mvi
+
+import androidx.annotation.VisibleForTesting
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.launch
+
+abstract class BaseViewModel<State : UiState, Effect : UiEffect, Event : UiEvent> : ViewModel() {
+
+    protected val currentState: State
+        get() = _state.value
+
+    @Suppress("VariableNaming")
+    @VisibleForTesting
+    val _state = MutableStateFlow(createInitialState())
+    val state: StateFlow<State> = _state.asStateFlow()
+
+    @Suppress("VariableNaming")
+    protected val _event: MutableSharedFlow<Event> = MutableSharedFlow()
+    private val event: SharedFlow<Event> = _event.asSharedFlow()
+
+    @Suppress("VariableNaming")
+    private val _effect: Channel<Effect> = Channel()
+    val effect = _effect.receiveAsFlow()
+
+    init {
+        viewModelScope.launch {
+            event.collect { handleEvent(it) }
+        }
+    }
+
+    fun sendEvent(event: Event) {
+        viewModelScope.launch { _event.emit(event) }
+    }
+
+    protected fun setState(reduce: State.() -> State) {
+        _state.value = currentState.reduce()
+    }
+
+    protected fun sendEffect(effect: Effect) {
+        viewModelScope.launch { _effect.send(effect) }
+    }
+
+    protected fun launch(block: suspend () -> Unit) = viewModelScope.launch { block() }
+
+    abstract fun handleEvent(event: Event)
+
+    protected abstract fun createInitialState(): State
+}
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/mvi/UiEffect.kt b/card-journey/src/main/java/com/backbase/cards_journey/mvi/UiEffect.kt
new file mode 100644
index 00000000..6847a9c7
--- /dev/null
+++ b/card-journey/src/main/java/com/backbase/cards_journey/mvi/UiEffect.kt
@@ -0,0 +1,3 @@
+package com.backbase.cards_journey.mvi
+
+open class UiEffect
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/mvi/UiEvent.kt b/card-journey/src/main/java/com/backbase/cards_journey/mvi/UiEvent.kt
new file mode 100644
index 00000000..930fb4df
--- /dev/null
+++ b/card-journey/src/main/java/com/backbase/cards_journey/mvi/UiEvent.kt
@@ -0,0 +1,3 @@
+package com.backbase.cards_journey.mvi
+
+open class UiEvent
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/mvi/UiState.kt b/card-journey/src/main/java/com/backbase/cards_journey/mvi/UiState.kt
new file mode 100644
index 00000000..80aab0a9
--- /dev/null
+++ b/card-journey/src/main/java/com/backbase/cards_journey/mvi/UiState.kt
@@ -0,0 +1,3 @@
+package com.backbase.cards_journey.mvi
+
+open class UiState
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/CardListFragment.kt b/card-journey/src/main/java/com/backbase/cards_journey/ui/CardListFragment.kt
deleted file mode 100644
index 27c5b60b..00000000
--- a/card-journey/src/main/java/com/backbase/cards_journey/ui/CardListFragment.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.backbase.cards_journey.ui
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.backbase.cards_journey.R
-
-
-class CardListFragment : Fragment() {
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_card_list, container, false)
-    }
-}
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListAdapter.kt b/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListAdapter.kt
new file mode 100644
index 00000000..fcfbe0dd
--- /dev/null
+++ b/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListAdapter.kt
@@ -0,0 +1,34 @@
+package com.backbase.cards_journey.ui.list
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import com.backbase.android.client.cardsclient2.model.CardItem
+import com.backbase.cards_journey.databinding.InflateCardBinding
+
+class CardListAdapter :
+    ListAdapter<CardItem, CardViewHolder>(BillsDiffCallBack()) {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CardViewHolder {
+        return CardViewHolder(
+            InflateCardBinding.inflate(
+                LayoutInflater.from(parent.context), parent, false
+            )
+        )
+    }
+
+    override fun onBindViewHolder(holder: CardViewHolder, position: Int) {
+        holder.bind(getItem(position))
+    }
+
+    private class BillsDiffCallBack : DiffUtil.ItemCallback<CardItem>() {
+        override fun areItemsTheSame(
+            oldItem: CardItem, newItem: CardItem
+        ): Boolean = oldItem.id == newItem.id
+
+        override fun areContentsTheSame(
+            oldItem: CardItem, newItem: CardItem
+        ): Boolean = oldItem == newItem
+    }
+}
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListFragment.kt b/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListFragment.kt
new file mode 100644
index 00000000..05d40abc
--- /dev/null
+++ b/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListFragment.kt
@@ -0,0 +1,76 @@
+package com.backbase.cards_journey.ui.list
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.viewpager2.widget.ViewPager2
+import com.backbase.android.core.utils.BBLogger
+import com.backbase.cards_journey.R
+import com.backbase.cards_journey.databinding.FragmentCardListBinding
+import com.backbase.cards_journey.journeyScopedViewModel
+import kotlinx.coroutines.launch
+
+
+class CardListFragment : Fragment() {
+
+    private val viewModel by journeyScopedViewModel<CardListViewModel>()
+
+    private var _binding: FragmentCardListBinding? = null
+    private val binding get() = _binding!!
+    private lateinit var cardsAdapter: CardListAdapter
+
+    init {
+        collectState()
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        _binding = FragmentCardListBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        viewModel.sendEvent(CardListScreenEvent.GetCardList)
+
+        cardsAdapter = CardListAdapter()
+        binding.pager.apply {
+            orientation = ViewPager2.ORIENTATION_HORIZONTAL
+            offscreenPageLimit = 2
+//            adjustViewPager(this)
+            adapter = cardsAdapter
+        }
+    }
+
+    private fun collectState() {
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                viewModel.state.collect { state ->
+                    binding.loading.isVisible = state.isLoading
+                    if (state.cards != null) {
+                        cardsAdapter.submitList(state.cards)
+                    }
+                    BBLogger.debug("DDDD", state.isLoading.toString())
+                    BBLogger.debug("DDDD", state.cards.toString())
+                }
+            }
+        }
+    }
+
+    private fun adjustViewPager(viewPager: ViewPager2) {
+        val pageTranslationX = resources.getDimension(R.dimen.margin_200)
+        val pageTransformer = ViewPager2.PageTransformer { page: View, position: Float ->
+            page.translationX = -pageTranslationX * position
+        }
+        viewPager.setPageTransformer(pageTransformer)
+    }
+
+}
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListScreenContract.kt b/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListScreenContract.kt
new file mode 100644
index 00000000..57e19e47
--- /dev/null
+++ b/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListScreenContract.kt
@@ -0,0 +1,20 @@
+package com.backbase.cards_journey.ui.list
+
+import com.backbase.android.client.cardsclient2.model.CardItem
+import com.backbase.cards_journey.mvi.UiEffect
+import com.backbase.cards_journey.mvi.UiEvent
+import com.backbase.cards_journey.mvi.UiState
+
+
+data class CardListScreenViewState(
+    val isLoading: Boolean,
+    val cards: List<CardItem>? = null
+) : UiState()
+
+sealed class CardListScreenEffect : UiEffect() {
+    data object HandleErrorResponse : CardListScreenEffect()
+}
+
+sealed class CardListScreenEvent : UiEvent() {
+    data object GetCardList : CardListScreenEvent()
+}
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListViewModel.kt b/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListViewModel.kt
new file mode 100644
index 00000000..d8447045
--- /dev/null
+++ b/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListViewModel.kt
@@ -0,0 +1,42 @@
+package com.backbase.cards_journey.ui.list
+
+import androidx.lifecycle.viewModelScope
+import com.backbase.android.core.utils.BBLogger
+import com.backbase.card_use_case.domain.CustomCardUseCase
+import com.backbase.cards_journey.mvi.BaseViewModel
+import kotlinx.coroutines.launch
+
+class CardListViewModel(val usecase: CustomCardUseCase) :
+    BaseViewModel<CardListScreenViewState, CardListScreenEffect, CardListScreenEvent>() {
+    override fun handleEvent(event: CardListScreenEvent) {
+        when (event) {
+            CardListScreenEvent.GetCardList -> getCardList()
+        }
+    }
+
+    override fun createInitialState(): CardListScreenViewState {
+        return CardListScreenViewState(false)
+    }
+
+    private fun getCardList() {
+        setState {
+            copy(isLoading = true)
+        }
+
+        viewModelScope.launch {
+            usecase.getCards().fold(
+                onSuccess = { result ->
+                    setState {
+                        copy(
+                            isLoading = false, cards = result
+                        )
+                    }
+                },
+                onFailure = {
+                    setState { copy(isLoading = false) }
+                    sendEffect(CardListScreenEffect.HandleErrorResponse)
+                }
+            )
+        }
+    }
+}
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardViewHolder.kt b/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardViewHolder.kt
new file mode 100644
index 00000000..cde0fafa
--- /dev/null
+++ b/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardViewHolder.kt
@@ -0,0 +1,19 @@
+package com.backbase.cards_journey.ui.list
+
+import androidx.recyclerview.widget.RecyclerView
+import com.backbase.android.client.cardsclient2.model.CardItem
+import com.backbase.cards_journey.databinding.InflateCardBinding
+
+class CardViewHolder(private val binding: InflateCardBinding) :
+    RecyclerView.ViewHolder(binding.root) {
+    fun bind(item: CardItem?) {
+        binding.title.text = item?.name
+        binding.cardNumber.text = getMaskedText(item)
+    }
+
+    private fun getMaskedText(item: CardItem?): String? {
+        return item?.let {
+            "**** **** **** ${it.maskedNumber}"
+        }
+    }
+}
\ No newline at end of file
diff --git a/card-journey/src/main/res/drawable/card_gradient.xml b/card-journey/src/main/res/drawable/card_gradient.xml
new file mode 100644
index 00000000..e588df76
--- /dev/null
+++ b/card-journey/src/main/res/drawable/card_gradient.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="45"
+        android:centerColor="#50000000"
+        android:endColor="#50ffffff"
+        android:startColor="#50ffffff"
+        android:type="linear" />
+</shape>
\ No newline at end of file
diff --git a/card-journey/src/main/res/drawable/ic_backbase.xml b/card-journey/src/main/res/drawable/ic_backbase.xml
new file mode 100644
index 00000000..7990753d
--- /dev/null
+++ b/card-journey/src/main/res/drawable/ic_backbase.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="35.2dp"
+    android:height="43.1dp"
+    android:viewportWidth="35.2"
+    android:viewportHeight="43.1">
+  <path
+      android:pathData="M26.1,20.7v-1.1c6.3,-0.9 7.9,-4.7 7.9,-8.9S30.3,0 21.4,0h-5v5.7h5c4.8,0 6.3,1.5 6.3,5.6c0,4 -1.5,6.2 -6.3,6.2H5.8v25.7h15.7c10.3,0 13.8,-5.9 13.8,-12C35.2,25 33.3,21.6 26.1,20.7zM21.6,37.4h-9.4V23.1h9.4c5.6,0 7.5,1.5 7.5,7.5C29.1,36.5 27.2,37.4 21.6,37.4zM0,0.1v5.9h5.9v6.3H12V0.1H0z"
+      android:fillColor="#091C35"/>
+</vector>
diff --git a/card-journey/src/main/res/drawable/ic_mada_logo.xml b/card-journey/src/main/res/drawable/ic_mada_logo.xml
new file mode 100644
index 00000000..68fc1a9d
--- /dev/null
+++ b/card-journey/src/main/res/drawable/ic_mada_logo.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="87dp"
+    android:height="29dp"
+    android:viewportWidth="87"
+    android:viewportHeight="29">
+  <group>
+    <clip-path
+        android:pathData="M0,0h87v29h-87z"/>
+    <path
+        android:pathData="M36.802,16.723H0L0,28.978H36.802V16.723Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M36.802,0L0,0L0,12.266L36.802,12.266V0Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M73.604,26.488L73.44,26.521C72.871,26.63 72.664,26.674 72.249,26.674C71.287,26.674 70.151,26.182 70.151,23.866C70.151,22.676 70.347,21.092 72.139,21.092H72.15C72.456,21.114 72.806,21.147 73.462,21.343L73.604,21.387V26.488ZM73.899,14.943L73.604,14.997V19.279L73.341,19.202L73.265,19.181C72.97,19.093 72.292,18.896 71.637,18.896C68.053,18.896 67.299,21.605 67.299,23.877C67.299,26.99 69.047,28.782 72.096,28.782C73.385,28.782 74.336,28.651 75.297,28.334C76.182,28.05 76.499,27.646 76.499,26.783V14.495C75.647,14.648 74.762,14.8 73.899,14.943Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M84.258,26.564L84.105,26.608L83.558,26.75C83.045,26.881 82.586,26.957 82.236,26.957C81.395,26.957 80.892,26.542 80.892,25.832C80.892,25.374 81.1,24.598 82.477,24.598H84.258V26.564ZM83.001,18.842C81.897,18.842 80.761,19.038 79.352,19.475L78.434,19.748L78.74,21.824L79.636,21.529C80.575,21.223 81.744,21.026 82.619,21.026C83.012,21.026 84.214,21.026 84.214,22.326V22.894H82.542C79.494,22.894 78.084,23.866 78.084,25.952C78.084,27.733 79.384,28.803 81.57,28.803C82.247,28.803 83.187,28.672 83.995,28.476L84.039,28.465L84.083,28.476L84.356,28.519C85.208,28.672 86.093,28.825 86.957,28.989V22.173C86.957,19.967 85.623,18.842 83.001,18.842Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M63.027,26.564L62.874,26.608L62.328,26.75C61.814,26.881 61.366,26.957 61.006,26.957C60.164,26.957 59.662,26.542 59.662,25.832C59.662,25.374 59.869,24.598 61.235,24.598H63.016L63.027,26.564ZM61.782,18.842C60.667,18.842 59.542,19.038 58.132,19.475L57.214,19.748L57.52,21.824L58.416,21.529C59.356,21.223 60.525,21.026 61.399,21.026C61.792,21.026 62.994,21.026 62.994,22.326V22.894H61.323C58.274,22.894 56.854,23.866 56.854,25.952C56.854,27.733 58.154,28.803 60.35,28.803C61.028,28.803 61.967,28.672 62.776,28.476L62.82,28.465L62.863,28.476L63.126,28.519C63.989,28.672 64.863,28.825 65.726,29V22.184C65.737,19.956 64.404,18.842 61.782,18.842Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M51.521,18.864C50.133,18.864 48.986,19.322 48.56,19.519L48.451,19.573L48.352,19.497C47.762,19.071 46.899,18.853 45.697,18.853C44.637,18.853 43.643,19.006 42.561,19.322C41.632,19.606 41.271,20.054 41.271,20.895V28.683H44.178V21.485L44.32,21.441C44.91,21.245 45.26,21.212 45.598,21.212C46.44,21.212 46.866,21.66 46.866,22.534V28.694H49.729V22.413C49.729,22.042 49.652,21.823 49.641,21.78L49.543,21.594L49.74,21.507C50.177,21.31 50.658,21.212 51.16,21.212C51.739,21.212 52.428,21.441 52.428,22.534V28.694H55.28V22.25C55.28,19.967 54.056,18.864 51.521,18.864Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M82.116,7.995C81.69,7.995 80.979,7.952 80.422,7.843L80.258,7.81V3.605C80.258,3.255 80.193,3.037 80.182,3.004L80.094,2.829L80.28,2.753C80.324,2.731 80.368,2.72 80.422,2.698L80.455,2.676C80.521,2.654 80.586,2.632 80.652,2.611C80.685,2.6 80.706,2.589 80.728,2.589C81.373,2.414 81.963,2.436 82.225,2.414H82.236C84.017,2.414 84.225,3.998 84.225,5.188C84.214,7.504 83.066,7.995 82.116,7.995ZM82.105,0C82.083,0 82.05,0 82.029,0C80.357,0 78.641,0.459 78.029,1.354C77.701,1.791 77.516,2.337 77.505,2.982V7.318C77.505,7.69 77.428,7.832 77.417,7.864L77.319,8.05H72.041V5.035H72.03C71.965,1.857 70.085,0.109 67.365,0.109L67.048,0.109L64.709,0.109C64.6,0.885 64.513,1.431 64.403,2.206H67.048C68.435,2.206 69.168,3.386 69.168,5.199V8.236L68.982,8.137C68.949,8.127 68.719,8.05 68.359,8.05H63.792C63.704,8.629 63.595,9.383 63.475,10.136H77.516C77.996,10.038 78.554,9.951 79.035,9.874C79.745,10.224 81.067,10.409 81.974,10.409C85.022,10.409 87,8.367 87,5.221C86.989,2.108 85.077,0.066 82.105,0Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M57.487,11.414H57.618C60.667,11.414 62.087,10.409 62.087,7.93C62.087,6.149 60.787,4.73 58.602,4.73L55.793,4.73C54.952,4.73 54.449,4.249 54.449,3.441C54.449,2.895 54.657,2.217 56.034,2.217H62.175C62.306,1.42 62.371,0.917 62.492,0.12L56.11,0.12C53.138,0.12 51.641,1.365 51.641,3.441C51.641,5.494 52.941,6.565 55.127,6.565L57.935,6.565C58.776,6.565 59.279,7.231 59.279,7.93C59.279,8.389 59.071,9.339 57.706,9.339H57.236L48.243,9.317H46.604C45.216,9.317 44.244,8.531 44.244,6.707V5.45C44.244,3.55 44.998,2.37 46.604,2.37H49.27C49.39,1.562 49.467,1.049 49.576,0.284L46.254,0.284H45.937C43.216,0.284 41.337,2.108 41.271,5.287V5.407V6.707C41.337,9.885 43.216,11.403 45.937,11.403H46.254H48.592L53.466,11.414H56.373H57.487Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>
diff --git a/card-journey/src/main/res/drawable/ic_mc_logo.xml b/card-journey/src/main/res/drawable/ic_mc_logo.xml
new file mode 100644
index 00000000..6dcd995a
--- /dev/null
+++ b/card-journey/src/main/res/drawable/ic_mc_logo.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="79dp"
+    android:height="50dp"
+    android:viewportWidth="79"
+    android:viewportHeight="50">
+  <path
+      android:pathData="M50.187,5.334H28.824V44.656H50.187V5.334Z"
+      android:fillColor="#F36C2F"/>
+  <path
+      android:pathData="M30.176,25C30.176,17.02 33.819,9.921 39.495,5.345C35.346,1.993 30.104,0 24.407,0C10.929,0 0,11.198 0,25C0,38.813 10.929,50 24.407,50C30.104,50 35.336,48.007 39.495,44.655C33.829,40.079 30.176,32.97 30.176,25Z"
+      android:fillColor="#ED1C24"/>
+  <path
+      android:pathData="M76.669,40.493V39.685H76.989V39.519H76.184V39.685H76.504V40.493H76.669ZM78.237,40.493V39.519H77.99L77.701,40.182L77.412,39.519H77.164V40.493H77.339V39.757L77.608,40.39H77.794L78.062,39.757V40.493H78.237Z"
+      android:fillColor="#F99C32"/>
+  <path
+      android:pathData="M79.001,25C79.001,38.813 68.072,50 54.594,50C48.897,50 43.665,48.007 39.506,44.655C45.182,40.079 48.825,32.97 48.825,25C48.825,17.03 45.182,9.921 39.506,5.345C43.654,1.993 48.897,0 54.594,0C68.072,-0.01 79.001,11.187 79.001,25Z"
+      android:fillColor="#F99C32"/>
+</vector>
diff --git a/card-journey/src/main/res/layout/fragment_card_list.xml b/card-journey/src/main/res/layout/fragment_card_list.xml
index 127b3cd4..ea58d96a 100644
--- a/card-journey/src/main/res/layout/fragment_card_list.xml
+++ b/card-journey/src/main/res/layout/fragment_card_list.xml
@@ -1,14 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.CardListFragment">
+    tools:context=".ui.list.CardListFragment">
 
-    <TextView
-        android:gravity="center"
+    <ProgressBar
+        android:id="@+id/loading"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center" />
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/pager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="Card List Fragment" />
+        android:layout_height="match_parent" />
+ <!--   <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        cen
+        android:src="@drawable/backbase_ic_error"
+        app:tint="@android:color/holo_red_light" />-->
 
 </FrameLayout>
\ No newline at end of file
diff --git a/card-journey/src/main/res/layout/fragment_cards_journey.xml b/card-journey/src/main/res/layout/fragment_cards_journey.xml
index 5f5a70fd..33e586e1 100644
--- a/card-journey/src/main/res/layout/fragment_cards_journey.xml
+++ b/card-journey/src/main/res/layout/fragment_cards_journey.xml
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
 
     <fragment
         android:id="@+id/nav_host_container"
         android:name="androidx.navigation.fragment.NavHostFragment"
-        app:defaultNavHost="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:navGraph="@navigation/cards_navigation"
         android:layout_width="match_parent"
-        android:layout_height="0dp" />
+        android:layout_height="match_parent"
+        app:defaultNavHost="true"
+        app:navGraph="@navigation/cards_navigation" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/card-journey/src/main/res/layout/inflate_card.xml b/card-journey/src/main/res/layout/inflate_card.xml
new file mode 100644
index 00000000..ff422f80
--- /dev/null
+++ b/card-journey/src/main/res/layout/inflate_card.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingHorizontal="@dimen/margin_50"
+    android:paddingVertical="@dimen/margin_100">
+
+    <androidx.cardview.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:cardBackgroundColor="@android:color/holo_blue_light"
+        app:cardCornerRadius="@dimen/margin_16">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/card_gradient">
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/margin_16"
+                android:textColor="@android:color/white"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="Card holder name" />
+
+            <TextView
+                android:id="@+id/cardNumber"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/margin_16"
+                android:layout_marginTop="@dimen/padding_8"
+                android:textColor="@android:color/white"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/title"
+                tools:text="**** **** **** 1234" />
+
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:src="@drawable/ic_backbase"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|left"
+                android:layout_margin="@dimen/margin_16"
+                android:src="@drawable/ic_mc_logo"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right"
+                android:layout_margin="@dimen/margin_16"
+                android:src="@drawable/ic_mada_logo"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.cardview.widget.CardView>
+</FrameLayout>
diff --git a/card-journey/src/main/res/navigation/cards_navigation.xml b/card-journey/src/main/res/navigation/cards_navigation.xml
index c76f5c10..6867e150 100644
--- a/card-journey/src/main/res/navigation/cards_navigation.xml
+++ b/card-journey/src/main/res/navigation/cards_navigation.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/cardListFragment"
-        android:name="com.backbase.cards_journey.ui.CardListFragment"
+        android:name="com.backbase.cards_journey.ui.list.CardListFragment"
         android:label="fragment_card_list"
         tools:layout="@layout/fragment_card_list" />
 </navigation>
\ No newline at end of file
diff --git a/card-journey/src/main/res/values/dimens.xml b/card-journey/src/main/res/values/dimens.xml
new file mode 100644
index 00000000..a0e53c06
--- /dev/null
+++ b/card-journey/src/main/res/values/dimens.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="margin_16">16dp</dimen>
+    <dimen name="padding_8">8dp</dimen>
+    <dimen name="margin_100">100dp</dimen>
+    <dimen name="margin_200">200dp</dimen>
+    <dimen name="margin_150">150dp</dimen>
+    <dimen name="margin_50">50dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/card-use-case/src/main/java/com/backbase/card_use_case/data/CustomCardClient.kt b/card-use-case/src/main/java/com/backbase/card_use_case/data/CustomCardClient.kt
index f174c089..99f0897d 100644
--- a/card-use-case/src/main/java/com/backbase/card_use_case/data/CustomCardClient.kt
+++ b/card-use-case/src/main/java/com/backbase/card_use_case/data/CustomCardClient.kt
@@ -5,5 +5,4 @@ import com.backbase.android.clients.common.Call
 
 interface CustomCardClient {
     fun getCards(): Call<List<CardItem>>
-
 }
\ No newline at end of file

From f61fed95728f46413a81279ba1d3bebce167fcea Mon Sep 17 00:00:00 2001
From: Subhash Kumar Vatturi <subhash@backbase.com>
Date: Tue, 30 Jan 2024 20:09:11 +0530
Subject: [PATCH 05/15] feat:add card details screen

---
 .../backbase/cards_journey/CardsJourney.kt    |   7 +
 .../cards_journey/CardsJourneyModule.kt       |   3 -
 .../cards_journey/CardsJourneyScope.kt        |   8 +-
 .../data/CustomCardClientImpl.kt              |  15 ++
 .../domain/CustomCardUseCaseImpl.kt           |  24 ++++
 .../ui/details/CardDetailsFragment.kt         |  97 +++++++++++++
 .../ui/details/CardDetailsScreenContract.kt   |  20 +++
 .../ui/details/CardDetailsViewModel.kt        |  40 ++++++
 .../cards_journey/ui/list/CardListAdapter.kt  |   4 +-
 .../cards_journey/ui/list/CardListFragment.kt |  29 +++-
 .../ui/list/CardListViewModel.kt              |   1 +
 .../cards_journey/ui/list/CardViewHolder.kt   |  14 +-
 .../backbase/cards_journey/utils/AppUtils.kt  |   9 ++
 .../src/main/res/drawable/ic_back.xml         |   5 +
 .../main/res/layout/fragment_card_details.xml | 129 ++++++++++++++++++
 .../main/res/layout/fragment_card_list.xml    |  24 +++-
 .../src/main/res/layout/inflate_card.xml      |   5 +-
 .../main/res/navigation/cards_navigation.xml  |  15 +-
 card-journey/src/main/res/values/strings.xml  |   9 +-
 card-journey/src/main/res/values/styles.xml   |  15 ++
 .../card_use_case/data/CustomCardClient.kt    |   1 +
 .../card_use_case/domain/CustomCardUseCase.kt |   1 +
 22 files changed, 449 insertions(+), 26 deletions(-)
 create mode 100644 card-journey/src/main/java/com/backbase/cards_journey/ui/details/CardDetailsFragment.kt
 create mode 100644 card-journey/src/main/java/com/backbase/cards_journey/ui/details/CardDetailsScreenContract.kt
 create mode 100644 card-journey/src/main/java/com/backbase/cards_journey/ui/details/CardDetailsViewModel.kt
 create mode 100644 card-journey/src/main/res/drawable/ic_back.xml
 create mode 100644 card-journey/src/main/res/layout/fragment_card_details.xml
 create mode 100644 card-journey/src/main/res/values/styles.xml

diff --git a/card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt b/card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt
index 0484a6b0..06cfc7ab 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt
+++ b/card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt
@@ -5,10 +5,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
 import com.backbase.cards_journey.databinding.FragmentCardsJourneyBinding
 
 
 class CardsJourney : Fragment() {
+    private val scope by viewModels<CardsJourneyScopeImpl>()
 
     private var _binding: FragmentCardsJourneyBinding? = null
     private val binding get() = _binding!!
@@ -17,8 +19,13 @@ class CardsJourney : Fragment() {
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
+        scope.launchWithArguments()
         _binding = FragmentCardsJourneyBinding.inflate(inflater, container, false)
         return binding.root
     }
 
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+    }
 }
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyModule.kt b/card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyModule.kt
index 347a0033..d5f780cf 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyModule.kt
+++ b/card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyModule.kt
@@ -6,8 +6,5 @@ import org.koin.dsl.module
 
 val cardsJourneyModule = module {
     scope<CardsJourneyScope> {
-        viewModel {
-            CardListViewModel(get())
-        }
     }
 }
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyScope.kt b/card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyScope.kt
index 49e267c9..9a49766a 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyScope.kt
+++ b/card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyScope.kt
@@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModel
 import com.backbase.android.retail.journey.koin.KoinScopeViewModel
 import com.backbase.android.retail.journey.koin.scoped
 import com.backbase.android.retail.journey.koin.scopedViewModel
+import com.backbase.cards_journey.ui.details.CardDetailsViewModel
 import com.backbase.cards_journey.ui.list.CardListViewModel
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.core.context.loadKoinModules
@@ -43,9 +44,12 @@ class CardsJourneyScopeImpl :
     fun launchWithArguments() {
         if (scopeModule == null) {
             scopeModule = ScopedModule<CardsJourneyScope> {
-                /*viewModel {
+                viewModel {
                     CardListViewModel(get())
-                }*/
+                }
+                viewModel { (id: String) ->
+                    CardDetailsViewModel(cardId = id, get())
+                }
             }.apply {
                 loadKoinModules(this)
             }
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/data/CustomCardClientImpl.kt b/card-journey/src/main/java/com/backbase/cards_journey/data/CustomCardClientImpl.kt
index 7598c910..0e51b897 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/data/CustomCardClientImpl.kt
+++ b/card-journey/src/main/java/com/backbase/cards_journey/data/CustomCardClientImpl.kt
@@ -35,4 +35,19 @@ class CustomCardClientImpl(
         }
     }
 
+    override fun getCardDetails(id: String): Call<CardItem> {
+        return buildGetRequest(
+            serverUri,
+            Constants.GET_CARD_DETAILS_END_POINT + id,
+            Params(),
+            provider
+        ).let {
+            Call(
+                it,
+                provider, parser,
+                CardItem::class.java
+            )
+        }
+    }
+
 }
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/domain/CustomCardUseCaseImpl.kt b/card-journey/src/main/java/com/backbase/cards_journey/domain/CustomCardUseCaseImpl.kt
index a11452d7..b56526d3 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/domain/CustomCardUseCaseImpl.kt
+++ b/card-journey/src/main/java/com/backbase/cards_journey/domain/CustomCardUseCaseImpl.kt
@@ -33,4 +33,28 @@ class CustomCardUseCaseImpl(private val customCardClient: CustomCardClient) : Cu
         }
     }
 
+    override suspend fun getCardDetails(id: String): Result<CardItem> {
+        return withContext(Dispatchers.IO) {
+            when (val callResult =
+                customCardClient.getCardDetails(id).executeAsSuspended()) {
+                is CallResult.Success -> {
+                    Result.success(callResult.data)
+                }
+
+                is CallResult.Error -> {
+                    Result.failure(
+                        Throwable(
+                            message = callResult.errorResponse.errorMessage,
+                            cause = Throwable(callResult.errorResponse.causeTrace),
+                        )
+                    )
+                }
+
+                else -> {
+                    Result.failure(Throwable())
+                }
+            }
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/details/CardDetailsFragment.kt b/card-journey/src/main/java/com/backbase/cards_journey/ui/details/CardDetailsFragment.kt
new file mode 100644
index 00000000..fe7e45b1
--- /dev/null
+++ b/card-journey/src/main/java/com/backbase/cards_journey/ui/details/CardDetailsFragment.kt
@@ -0,0 +1,97 @@
+package com.backbase.cards_journey.ui.details
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
+import com.backbase.android.client.cardsclient2.model.CardItem
+import com.backbase.cards_journey.databinding.FragmentCardDetailsBinding
+import com.backbase.cards_journey.journeyScopedViewModel
+import com.backbase.cards_journey.utils.getMaskedText
+import kotlinx.coroutines.launch
+import org.koin.core.parameter.parametersOf
+
+
+class CardDetailsFragment : Fragment() {
+
+    private var _binding: FragmentCardDetailsBinding? = null
+    private val args: CardDetailsFragmentArgs by navArgs()
+    private val viewModel by journeyScopedViewModel<CardDetailsViewModel>(
+        parameters = { parametersOf(args.cardId) }
+    )
+    private val binding get() = _binding!!
+
+    init {
+        collectState()
+        collectEffect()
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        _binding = FragmentCardDetailsBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        val params = FrameLayout.LayoutParams(
+            FrameLayout.LayoutParams.MATCH_PARENT,
+            FrameLayout.LayoutParams.MATCH_PARENT
+        )
+        params.setMargins(0, 0, 0, 0)
+        binding.card.cardLayout.layoutParams = params
+        binding.toolbar.setNavigationOnClickListener {
+            findNavController().navigateUp()
+        }
+        viewModel.sendEvent(CardDetailsScreenEvent.GetCardDetails)
+    }
+
+    private fun collectState() {
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                viewModel.state.collect { state ->
+                    binding.loading.isVisible = state.isLoading
+                    applyCardDetails(state.card)
+                }
+            }
+        }
+    }
+
+    private fun collectEffect() {
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                viewModel.effect.collect { effect ->
+                    when (effect) {
+                        CardDetailsScreenEffect.HandleErrorResponse -> binding.error.isVisible =
+                            true
+                    }
+                }
+            }
+        }
+    }
+
+    private fun applyCardDetails(card: CardItem?) {
+        binding.details.isVisible = card != null
+        if (card != null) {
+            binding.error.isVisible = false
+            binding.apply {
+                subType.text = card.subType
+                currency.text = card.currency
+                onlineLimit.text = card.limits?.getOrNull(0)?.amount?.toString()
+                atmLimit.text = card.limits?.getOrNull(1)?.amount?.toString()
+                binding.card.title.text = card.name
+                binding.card.cardNumber.text = getMaskedText(card)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/details/CardDetailsScreenContract.kt b/card-journey/src/main/java/com/backbase/cards_journey/ui/details/CardDetailsScreenContract.kt
new file mode 100644
index 00000000..73bfe4e3
--- /dev/null
+++ b/card-journey/src/main/java/com/backbase/cards_journey/ui/details/CardDetailsScreenContract.kt
@@ -0,0 +1,20 @@
+package com.backbase.cards_journey.ui.details
+
+import com.backbase.android.client.cardsclient2.model.CardItem
+import com.backbase.cards_journey.mvi.UiEffect
+import com.backbase.cards_journey.mvi.UiEvent
+import com.backbase.cards_journey.mvi.UiState
+
+
+data class CardDetailsScreenViewState(
+    val isLoading: Boolean,
+    val card: CardItem? = null
+) : UiState()
+
+sealed class CardDetailsScreenEffect : UiEffect() {
+    data object HandleErrorResponse : CardDetailsScreenEffect()
+}
+
+sealed class CardDetailsScreenEvent : UiEvent() {
+    data object GetCardDetails : CardDetailsScreenEvent()
+}
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/details/CardDetailsViewModel.kt b/card-journey/src/main/java/com/backbase/cards_journey/ui/details/CardDetailsViewModel.kt
new file mode 100644
index 00000000..46735507
--- /dev/null
+++ b/card-journey/src/main/java/com/backbase/cards_journey/ui/details/CardDetailsViewModel.kt
@@ -0,0 +1,40 @@
+package com.backbase.cards_journey.ui.details
+
+import androidx.lifecycle.viewModelScope
+import com.backbase.card_use_case.domain.CustomCardUseCase
+import com.backbase.cards_journey.mvi.BaseViewModel
+import kotlinx.coroutines.launch
+
+class CardDetailsViewModel(val cardId: String, val usecase: CustomCardUseCase) :
+    BaseViewModel<CardDetailsScreenViewState, CardDetailsScreenEffect, CardDetailsScreenEvent>() {
+    override fun handleEvent(event: CardDetailsScreenEvent) {
+        when (event) {
+            CardDetailsScreenEvent.GetCardDetails -> getCardDetails()
+        }
+    }
+
+    override fun createInitialState(): CardDetailsScreenViewState {
+        return CardDetailsScreenViewState(false)
+    }
+
+    private fun getCardDetails() {
+        setState {
+            copy(isLoading = true)
+        }
+        viewModelScope.launch {
+            usecase.getCardDetails(cardId).fold(
+                onSuccess = { result ->
+                    setState {
+                        copy(
+                            isLoading = false, card = result
+                        )
+                    }
+                },
+                onFailure = {
+                    setState { copy(isLoading = false) }
+                    sendEffect(CardDetailsScreenEffect.HandleErrorResponse)
+                }
+            )
+        }
+    }
+}
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListAdapter.kt b/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListAdapter.kt
index fcfbe0dd..d2ce0652 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListAdapter.kt
+++ b/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListAdapter.kt
@@ -7,7 +7,7 @@ import androidx.recyclerview.widget.ListAdapter
 import com.backbase.android.client.cardsclient2.model.CardItem
 import com.backbase.cards_journey.databinding.InflateCardBinding
 
-class CardListAdapter :
+class CardListAdapter(val onclick: (CardItem) -> Unit) :
     ListAdapter<CardItem, CardViewHolder>(BillsDiffCallBack()) {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CardViewHolder {
@@ -19,7 +19,7 @@ class CardListAdapter :
     }
 
     override fun onBindViewHolder(holder: CardViewHolder, position: Int) {
-        holder.bind(getItem(position))
+        holder.bind(getItem(position), onclick)
     }
 
     private class BillsDiffCallBack : DiffUtil.ItemCallback<CardItem>() {
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListFragment.kt b/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListFragment.kt
index 05d40abc..739cdfc9 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListFragment.kt
+++ b/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListFragment.kt
@@ -9,8 +9,9 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
+import androidx.navigation.fragment.findNavController
 import androidx.viewpager2.widget.ViewPager2
-import com.backbase.android.core.utils.BBLogger
+import com.backbase.android.client.cardsclient2.model.CardItem
 import com.backbase.cards_journey.R
 import com.backbase.cards_journey.databinding.FragmentCardListBinding
 import com.backbase.cards_journey.journeyScopedViewModel
@@ -27,6 +28,7 @@ class CardListFragment : Fragment() {
 
     init {
         collectState()
+        collectEffect()
     }
 
     override fun onCreateView(
@@ -41,13 +43,21 @@ class CardListFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         viewModel.sendEvent(CardListScreenEvent.GetCardList)
 
-        cardsAdapter = CardListAdapter()
+        cardsAdapter = CardListAdapter(::onclick)
         binding.pager.apply {
             orientation = ViewPager2.ORIENTATION_HORIZONTAL
             offscreenPageLimit = 2
 //            adjustViewPager(this)
             adapter = cardsAdapter
         }
+        binding.toolbar.setNavigationOnClickListener {
+            findNavController().navigateUp()
+        }
+    }
+
+    private fun onclick(card: CardItem) {
+        findNavController()
+            .navigate(CardListFragmentDirections.actionCardListFragmentToCardDetailsFragment(card.id))
     }
 
     private fun collectState() {
@@ -56,10 +66,21 @@ class CardListFragment : Fragment() {
                 viewModel.state.collect { state ->
                     binding.loading.isVisible = state.isLoading
                     if (state.cards != null) {
+                        binding.error.isVisible = false
                         cardsAdapter.submitList(state.cards)
                     }
-                    BBLogger.debug("DDDD", state.isLoading.toString())
-                    BBLogger.debug("DDDD", state.cards.toString())
+                }
+            }
+        }
+    }
+
+    private fun collectEffect() {
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                viewModel.effect.collect { effect ->
+                    when (effect) {
+                        CardListScreenEffect.HandleErrorResponse -> binding.error.isVisible = true
+                    }
                 }
             }
         }
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListViewModel.kt b/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListViewModel.kt
index d8447045..3327316f 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListViewModel.kt
+++ b/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListViewModel.kt
@@ -19,6 +19,7 @@ class CardListViewModel(val usecase: CustomCardUseCase) :
     }
 
     private fun getCardList() {
+        if (state.value.cards != null) return
         setState {
             copy(isLoading = true)
         }
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardViewHolder.kt b/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardViewHolder.kt
index cde0fafa..508551cd 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardViewHolder.kt
+++ b/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardViewHolder.kt
@@ -3,17 +3,19 @@ package com.backbase.cards_journey.ui.list
 import androidx.recyclerview.widget.RecyclerView
 import com.backbase.android.client.cardsclient2.model.CardItem
 import com.backbase.cards_journey.databinding.InflateCardBinding
+import com.backbase.cards_journey.utils.getMaskedText
 
 class CardViewHolder(private val binding: InflateCardBinding) :
     RecyclerView.ViewHolder(binding.root) {
-    fun bind(item: CardItem?) {
+    fun bind(item: CardItem?, onclick: (CardItem) -> Unit) {
         binding.title.text = item?.name
         binding.cardNumber.text = getMaskedText(item)
-    }
-
-    private fun getMaskedText(item: CardItem?): String? {
-        return item?.let {
-            "**** **** **** ${it.maskedNumber}"
+        binding.root.setOnClickListener {
+            if (item != null) {
+                onclick(item)
+            }
         }
     }
+
+
 }
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/utils/AppUtils.kt b/card-journey/src/main/java/com/backbase/cards_journey/utils/AppUtils.kt
index 812200eb..3856843f 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/utils/AppUtils.kt
+++ b/card-journey/src/main/java/com/backbase/cards_journey/utils/AppUtils.kt
@@ -1,5 +1,14 @@
 package com.backbase.cards_journey.utils
 
+import com.backbase.android.client.cardsclient2.model.CardItem
+
 object Constants {
     const val GET_CARDS_END_POINT = "/client-api/v2/cards"
+    const val GET_CARD_DETAILS_END_POINT = "/client-api/v2/cards/"
+}
+
+fun getMaskedText(item: CardItem?): String? {
+    return item?.let {
+        "**** **** **** ${it.maskedNumber}"
+    }
 }
\ No newline at end of file
diff --git a/card-journey/src/main/res/drawable/ic_back.xml b/card-journey/src/main/res/drawable/ic_back.xml
new file mode 100644
index 00000000..8452791c
--- /dev/null
+++ b/card-journey/src/main/res/drawable/ic_back.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
diff --git a/card-journey/src/main/res/layout/fragment_card_details.xml b/card-journey/src/main/res/layout/fragment_card_details.xml
new file mode 100644
index 00000000..4f49d26a
--- /dev/null
+++ b/card-journey/src/main/res/layout/fragment_card_details.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.list.CardListFragment">
+
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@null"
+        android:layoutDirection="locale"
+        app:contentInsetStartWithNavigation="0dp"
+        app:layout_collapseMode="pin"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:navigationIcon="@drawable/ic_back"
+        app:title="@string/details" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/toolbar">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/details"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <FrameLayout
+                android:id="@+id/cardView"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/margin_200"
+                android:layout_margin="@dimen/margin_16"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <include
+                    android:id="@+id/card"
+                    layout="@layout/inflate_card" />
+            </FrameLayout>
+
+
+            <androidx.cardview.widget.CardView
+                app:cardCornerRadius="@dimen/margin_16"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_margin="@dimen/margin_16"
+                app:layout_constraintTop_toBottomOf="@id/cardView">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="@dimen/margin_16">
+
+                    <TextView
+                        style="@style/title"
+                        android:text="@string/sub_type" />
+
+                    <TextView
+                        android:id="@+id/subType"
+                        style="@style/details"
+                        tools:text="NA" />
+
+                    <TextView
+                        style="@style/title"
+                        android:layout_marginTop="@dimen/margin_16"
+                        android:text="@string/currency" />
+
+                    <TextView
+                        android:id="@+id/currency"
+                        style="@style/details"
+                        tools:text="NA" />
+
+                    <TextView
+                        style="@style/title"
+                        android:layout_marginTop="@dimen/margin_16"
+                        android:text="@string/online_limit" />
+
+                    <TextView
+                        android:id="@+id/onlineLimit"
+                        style="@style/details"
+                        tools:text="NA" />
+
+                    <TextView
+                        style="@style/title"
+                        android:layout_marginTop="@dimen/margin_16"
+                        android:text="@string/atm_limit" />
+
+                    <TextView
+                        android:id="@+id/atmLimit"
+                        style="@style/details"
+                        tools:text="NA" />
+
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
+
+    <ProgressBar
+        android:id="@+id/loading"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:visibility="gone"
+        android:id="@+id/error"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/error_occurred"
+        android:textColor="@android:color/black"
+        app:drawableTint="@android:color/holo_red_dark"
+        app:drawableTopCompat="@drawable/backbase_ic_error"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/card-journey/src/main/res/layout/fragment_card_list.xml b/card-journey/src/main/res/layout/fragment_card_list.xml
index ea58d96a..d2cb7b09 100644
--- a/card-journey/src/main/res/layout/fragment_card_list.xml
+++ b/card-journey/src/main/res/layout/fragment_card_list.xml
@@ -6,6 +6,17 @@
     android:layout_height="match_parent"
     tools:context=".ui.list.CardListFragment">
 
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@null"
+        android:layoutDirection="locale"
+        app:contentInsetStartWithNavigation="0dp"
+        app:layout_collapseMode="pin"
+        app:navigationIcon="@drawable/ic_back"
+        app:title="@string/cards" />
+
     <ProgressBar
         android:id="@+id/loading"
         android:layout_width="wrap_content"
@@ -16,11 +27,16 @@
         android:id="@+id/pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
- <!--   <ImageView
+
+    <TextView
+        android:id="@+id/error"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        cen
-        android:src="@drawable/backbase_ic_error"
-        app:tint="@android:color/holo_red_light" />-->
+        android:layout_gravity="center"
+        android:text="@string/error_occurred"
+        android:textColor="@android:color/black"
+        android:visibility="gone"
+        app:drawableTint="@android:color/holo_red_dark"
+        app:drawableTopCompat="@drawable/backbase_ic_error" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/card-journey/src/main/res/layout/inflate_card.xml b/card-journey/src/main/res/layout/inflate_card.xml
index ff422f80..0e0a9285 100644
--- a/card-journey/src/main/res/layout/inflate_card.xml
+++ b/card-journey/src/main/res/layout/inflate_card.xml
@@ -2,10 +2,11 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/cardLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingHorizontal="@dimen/margin_50"
-    android:paddingVertical="@dimen/margin_100">
+    android:layout_marginHorizontal="@dimen/margin_50"
+    android:layout_marginVertical="@dimen/margin_100">
 
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
diff --git a/card-journey/src/main/res/navigation/cards_navigation.xml b/card-journey/src/main/res/navigation/cards_navigation.xml
index 6867e150..b80f70ff 100644
--- a/card-journey/src/main/res/navigation/cards_navigation.xml
+++ b/card-journey/src/main/res/navigation/cards_navigation.xml
@@ -9,5 +9,18 @@
         android:id="@+id/cardListFragment"
         android:name="com.backbase.cards_journey.ui.list.CardListFragment"
         android:label="fragment_card_list"
-        tools:layout="@layout/fragment_card_list" />
+        tools:layout="@layout/fragment_card_list">
+        <action
+            android:id="@+id/action_cardListFragment_to_cardDetailsFragment"
+            app:destination="@id/cardDetailsFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/cardDetailsFragment"
+        android:name="com.backbase.cards_journey.ui.details.CardDetailsFragment"
+        android:label="CardDetailsFragment"
+        tools:layout="@layout/fragment_card_details" >
+        <argument
+            android:name="cardId"
+            app:argType="string" />
+    </fragment>
 </navigation>
\ No newline at end of file
diff --git a/card-journey/src/main/res/values/strings.xml b/card-journey/src/main/res/values/strings.xml
index 6048840e..273a79dd 100644
--- a/card-journey/src/main/res/values/strings.xml
+++ b/card-journey/src/main/res/values/strings.xml
@@ -1,4 +1,9 @@
 <resources>
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="error_occurred">Error occurred</string>
+    <string name="sub_type">Sub Type</string>
+    <string name="currency">Currency</string>
+    <string name="online_limit">Online limit</string>
+    <string name="atm_limit">Atm limit</string>
+    <string name="details">Details</string>
+    <string name="cards">Cards</string>
 </resources>
\ No newline at end of file
diff --git a/card-journey/src/main/res/values/styles.xml b/card-journey/src/main/res/values/styles.xml
new file mode 100644
index 00000000..fe8d573c
--- /dev/null
+++ b/card-journey/src/main/res/values/styles.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="title">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+
+    <style name="details">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/card-use-case/src/main/java/com/backbase/card_use_case/data/CustomCardClient.kt b/card-use-case/src/main/java/com/backbase/card_use_case/data/CustomCardClient.kt
index 99f0897d..9715ee02 100644
--- a/card-use-case/src/main/java/com/backbase/card_use_case/data/CustomCardClient.kt
+++ b/card-use-case/src/main/java/com/backbase/card_use_case/data/CustomCardClient.kt
@@ -5,4 +5,5 @@ import com.backbase.android.clients.common.Call
 
 interface CustomCardClient {
     fun getCards(): Call<List<CardItem>>
+    fun getCardDetails(id: String): Call<CardItem>
 }
\ No newline at end of file
diff --git a/card-use-case/src/main/java/com/backbase/card_use_case/domain/CustomCardUseCase.kt b/card-use-case/src/main/java/com/backbase/card_use_case/domain/CustomCardUseCase.kt
index 9f1ee424..8303602f 100644
--- a/card-use-case/src/main/java/com/backbase/card_use_case/domain/CustomCardUseCase.kt
+++ b/card-use-case/src/main/java/com/backbase/card_use_case/domain/CustomCardUseCase.kt
@@ -5,4 +5,5 @@ import com.backbase.android.client.cardsclient2.model.CardItem
 interface CustomCardUseCase {
 
     suspend fun getCards(): Result<List<CardItem>>
+    suspend fun getCardDetails(id: String): Result<CardItem>
 }
\ No newline at end of file

From bf8577fb54f85df20ace82c2c38e7f49fd588a78 Mon Sep 17 00:00:00 2001
From: Subhash Kumar Vatturi <subhash@backbase.com>
Date: Thu, 1 Feb 2024 12:40:14 +0530
Subject: [PATCH 06/15] feat:remove static path diclaration

---
 app/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 831562db..ede5b75c 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -27,7 +27,7 @@ android {
 
     signingConfigs {
         getByName("debug") {
-            storeFile = file("/Users/subhash/AndroidStudioProjects/golden-sample-app-android/keystore/debug.keystore")
+            storeFile = file("../keystore/debug.keystore")
         }
     }
 

From 7c69667082d56ed4502d20c45e54500f7cf32905 Mon Sep 17 00:00:00 2001
From: Subhash Kumar Vatturi <subhash@backbase.com>
Date: Thu, 1 Feb 2024 15:07:38 +0530
Subject: [PATCH 07/15] feat:add journey exit navigation action

---
 .../koin/NavigationModule.kt                  |  9 +++++
 .../cards_journey/CardExitNavigationAction.kt |  5 +++
 .../cards_journey/ui/list/CardListFragment.kt |  5 ++-
 .../main/res/layout/fragment_card_list.xml    | 34 +++++++++++--------
 4 files changed, 38 insertions(+), 15 deletions(-)
 create mode 100644 card-journey/src/main/java/com/backbase/cards_journey/CardExitNavigationAction.kt

diff --git a/app/src/main/kotlin/com/backbase/golden_sample_app/koin/NavigationModule.kt b/app/src/main/kotlin/com/backbase/golden_sample_app/koin/NavigationModule.kt
index 6f402c32..49fd0d24 100644
--- a/app/src/main/kotlin/com/backbase/golden_sample_app/koin/NavigationModule.kt
+++ b/app/src/main/kotlin/com/backbase/golden_sample_app/koin/NavigationModule.kt
@@ -2,7 +2,9 @@ package com.backbase.golden_sample_app.koin
 
 import androidx.navigation.NavController
 import com.backbase.accounts_journey.router.CardNavigationAction
+import com.backbase.cards_journey.CardExitNavigationAction
 import com.backbase.golden_sample_app.R
+import com.backbase.golden_sample_app.router.AppRouting
 import org.koin.dsl.module
 
 val navigationModule = module {
@@ -15,4 +17,11 @@ val navigationModule = module {
             }
         }
     }
+    factory<CardExitNavigationAction> {
+        object : CardExitNavigationAction {
+            override fun exit() {
+                get<AppRouting>().getNavController()?.popBackStack()
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/CardExitNavigationAction.kt b/card-journey/src/main/java/com/backbase/cards_journey/CardExitNavigationAction.kt
new file mode 100644
index 00000000..c32f2adf
--- /dev/null
+++ b/card-journey/src/main/java/com/backbase/cards_journey/CardExitNavigationAction.kt
@@ -0,0 +1,5 @@
+package com.backbase.cards_journey
+
+interface CardExitNavigationAction {
+    fun exit()
+}
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListFragment.kt b/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListFragment.kt
index 739cdfc9..67e0830b 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListFragment.kt
+++ b/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListFragment.kt
@@ -12,15 +12,18 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.fragment.findNavController
 import androidx.viewpager2.widget.ViewPager2
 import com.backbase.android.client.cardsclient2.model.CardItem
+import com.backbase.cards_journey.CardExitNavigationAction
 import com.backbase.cards_journey.R
 import com.backbase.cards_journey.databinding.FragmentCardListBinding
 import com.backbase.cards_journey.journeyScopedViewModel
 import kotlinx.coroutines.launch
+import org.koin.android.ext.android.inject
 
 
 class CardListFragment : Fragment() {
 
     private val viewModel by journeyScopedViewModel<CardListViewModel>()
+    private val rounter by inject<CardExitNavigationAction>()
 
     private var _binding: FragmentCardListBinding? = null
     private val binding get() = _binding!!
@@ -51,7 +54,7 @@ class CardListFragment : Fragment() {
             adapter = cardsAdapter
         }
         binding.toolbar.setNavigationOnClickListener {
-            findNavController().navigateUp()
+            rounter.exit()
         }
     }
 
diff --git a/card-journey/src/main/res/layout/fragment_card_list.xml b/card-journey/src/main/res/layout/fragment_card_list.xml
index d2cb7b09..09d3f65c 100644
--- a/card-journey/src/main/res/layout/fragment_card_list.xml
+++ b/card-journey/src/main/res/layout/fragment_card_list.xml
@@ -6,16 +6,27 @@
     android:layout_height="match_parent"
     tools:context=".ui.list.CardListFragment">
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/toolbar"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@null"
-        android:layoutDirection="locale"
-        app:contentInsetStartWithNavigation="0dp"
-        app:layout_collapseMode="pin"
-        app:navigationIcon="@drawable/ic_back"
-        app:title="@string/cards" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@null"
+            android:layoutDirection="locale"
+            app:contentInsetStartWithNavigation="0dp"
+            app:layout_collapseMode="pin"
+            app:navigationIcon="@drawable/ic_back"
+            app:title="@string/cards" />
+
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/pager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </LinearLayout>
 
     <ProgressBar
         android:id="@+id/loading"
@@ -23,11 +34,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center" />
 
-    <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/pager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
     <TextView
         android:id="@+id/error"
         android:layout_width="wrap_content"

From 4a46e743159ebdef813d0e17eb27ca7e0d17388b Mon Sep 17 00:00:00 2001
From: Subhash Kumar Vatturi <subhash@backbase.com>
Date: Fri, 2 Feb 2024 17:33:32 +0530
Subject: [PATCH 08/15] chore:format naming

---
 .../com/backbase/cards_journey/ui/list/CardListViewModel.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListViewModel.kt b/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListViewModel.kt
index 3327316f..bcf011cd 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListViewModel.kt
+++ b/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListViewModel.kt
@@ -6,7 +6,7 @@ import com.backbase.card_use_case.domain.CustomCardUseCase
 import com.backbase.cards_journey.mvi.BaseViewModel
 import kotlinx.coroutines.launch
 
-class CardListViewModel(val usecase: CustomCardUseCase) :
+class CardListViewModel(val useCase: CustomCardUseCase) :
     BaseViewModel<CardListScreenViewState, CardListScreenEffect, CardListScreenEvent>() {
     override fun handleEvent(event: CardListScreenEvent) {
         when (event) {
@@ -25,7 +25,7 @@ class CardListViewModel(val usecase: CustomCardUseCase) :
         }
 
         viewModelScope.launch {
-            usecase.getCards().fold(
+            useCase.getCards().fold(
                 onSuccess = { result ->
                     setState {
                         copy(

From 9236a2c0c696fe510b978e813518a761e5ecadeb Mon Sep 17 00:00:00 2001
From: BhargaviYamanuri <bhargavi@backbase.com>
Date: Fri, 2 Feb 2024 18:44:13 +0530
Subject: [PATCH 09/15] feat:custom card journey restructure

---
 app/build.gradle.kts                          |  4 ++--
 .../golden_sample_app/MainApplication.kt      | 10 ++++----
 .../koin/NavigationModule.kt                  |  2 +-
 .../main/res/navigation/navigation_main.xml   |  2 +-
 card-journey/{ => api}/.gitignore             |  0
 .../api}/build.gradle.kts                     |  2 +-
 .../backbase/api}/ExampleInstrumentedTest.kt  |  4 ++--
 .../backbase/api}/data/CustomCardClient.kt    |  2 +-
 .../backbase/api}/domain/CustomCardUseCase.kt |  2 +-
 .../java/com/backbase/api}/ExampleUnitTest.kt |  2 +-
 .../impl}/.gitignore                          |  0
 card-journey/{ => impl}/build.gradle.kts      |  4 ++--
 .../impl}/ExampleInstrumentedTest.kt          |  4 ++--
 .../impl}/CardExitNavigationAction.kt         |  2 +-
 .../cards_journey/impl}/CardsJourney.kt       |  4 ++--
 .../cards_journey/impl/CardsJourneyModule.kt  |  8 +++++++
 .../cards_journey/impl}/CardsJourneyScope.kt  |  6 ++---
 .../impl}/data/CustomCardClientImpl.kt        |  8 +++----
 .../impl}/domain/CustomCardUseCaseImpl.kt     |  6 ++---
 .../cards_journey/impl}/koin/CardModule.kt    | 13 +++++------
 .../cards_journey/impl}/mvi/BaseViewModel.kt  |  4 ++--
 .../cards_journey/impl/mvi/UiEffect.kt        |  3 +++
 .../cards_journey/impl/mvi/UiEvent.kt         |  3 +++
 .../cards_journey/impl/mvi/UiState.kt         |  3 +++
 .../impl}/ui/details/CardDetailsFragment.kt   |  8 +++----
 .../ui/details/CardDetailsScreenContract.kt   |  8 +++----
 .../impl}/ui/details/CardDetailsViewModel.kt  | 10 ++++----
 .../impl}/ui/list/CardListAdapter.kt          |  4 ++--
 .../impl}/ui/list/CardListFragment.kt         | 23 ++++++-------------
 .../impl}/ui/list/CardListScreenContract.kt   | 10 ++++----
 .../impl}/ui/list/CardListViewModel.kt        |  9 ++++----
 .../impl}/ui/list/CardViewHolder.kt           |  6 ++---
 .../cards_journey/impl}/utils/AppUtils.kt     |  2 +-
 .../cards_journey/impl}/utils/BBDbsClient.kt  |  2 +-
 .../src/main/res/drawable/card_gradient.xml   |  0
 .../src/main/res/drawable/ic_back.xml         |  0
 .../src/main/res/drawable/ic_backbase.xml     |  0
 .../src/main/res/drawable/ic_mada_logo.xml    |  0
 .../src/main/res/drawable/ic_mc_logo.xml      |  0
 .../main/res/layout/fragment_card_details.xml |  0
 .../main/res/layout/fragment_card_list.xml    |  0
 .../res/layout/fragment_cards_journey.xml     |  0
 .../src/main/res/layout/inflate_card.xml      |  0
 .../main/res/navigation/cards_navigation.xml  |  6 ++---
 .../{ => impl}/src/main/res/values/dimens.xml |  0
 .../src/main/res/values/strings.xml           |  0
 .../{ => impl}/src/main/res/values/styles.xml |  0
 .../cards_journey/impl}/ExampleUnitTest.kt    |  2 +-
 .../cards_journey/CardsJourneyModule.kt       | 10 --------
 .../backbase/cards_journey/mvi/UiEffect.kt    |  3 ---
 .../com/backbase/cards_journey/mvi/UiEvent.kt |  3 ---
 .../com/backbase/cards_journey/mvi/UiState.kt |  3 ---
 settings.gradle.kts                           |  4 ++--
 53 files changed, 97 insertions(+), 114 deletions(-)
 rename card-journey/{ => api}/.gitignore (100%)
 rename {card-use-case => card-journey/api}/build.gradle.kts (87%)
 rename card-journey/{src/androidTest/java/com/backbase/cards_journey => api/src/androidTest/java/com/backbase/api}/ExampleInstrumentedTest.kt (83%)
 rename {card-use-case/src/main/java/com/backbase/card_use_case => card-journey/api/src/main/java/com/backbase/api}/data/CustomCardClient.kt (85%)
 rename {card-use-case/src/main/java/com/backbase/card_use_case => card-journey/api/src/main/java/com/backbase/api}/domain/CustomCardUseCase.kt (83%)
 rename {card-use-case/src/test/java/com/backbase/card_use_case => card-journey/api/src/test/java/com/backbase/api}/ExampleUnitTest.kt (90%)
 rename {card-use-case => card-journey/impl}/.gitignore (100%)
 rename card-journey/{ => impl}/build.gradle.kts (81%)
 rename {card-use-case/src/androidTest/java/com/backbase/card_use_case => card-journey/impl/src/androidTest/java/com/backbase/cards_journey/impl}/ExampleInstrumentedTest.kt (81%)
 rename card-journey/{src/main/java/com/backbase/cards_journey => impl/src/main/java/com/backbase/cards_journey/impl}/CardExitNavigationAction.kt (57%)
 rename card-journey/{src/main/java/com/backbase/cards_journey => impl/src/main/java/com/backbase/cards_journey/impl}/CardsJourney.kt (87%)
 create mode 100644 card-journey/impl/src/main/java/com/backbase/cards_journey/impl/CardsJourneyModule.kt
 rename card-journey/{src/main/java/com/backbase/cards_journey => impl/src/main/java/com/backbase/cards_journey/impl}/CardsJourneyScope.kt (91%)
 rename card-journey/{src/main/java/com/backbase/cards_journey => impl/src/main/java/com/backbase/cards_journey/impl}/data/CustomCardClientImpl.kt (87%)
 rename card-journey/{src/main/java/com/backbase/cards_journey => impl/src/main/java/com/backbase/cards_journey/impl}/domain/CustomCardUseCaseImpl.kt (92%)
 rename card-journey/{src/main/java/com/backbase/cards_journey => impl/src/main/java/com/backbase/cards_journey/impl}/koin/CardModule.kt (78%)
 rename card-journey/{src/main/java/com/backbase/cards_journey => impl/src/main/java/com/backbase/cards_journey/impl}/mvi/BaseViewModel.kt (88%)
 create mode 100644 card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiEffect.kt
 create mode 100644 card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiEvent.kt
 create mode 100644 card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiState.kt
 rename card-journey/{src/main/java/com/backbase/cards_journey => impl/src/main/java/com/backbase/cards_journey/impl}/ui/details/CardDetailsFragment.kt (92%)
 rename card-journey/{src/main/java/com/backbase/cards_journey => impl/src/main/java/com/backbase/cards_journey/impl}/ui/details/CardDetailsScreenContract.kt (66%)
 rename card-journey/{src/main/java/com/backbase/cards_journey => impl/src/main/java/com/backbase/cards_journey/impl}/ui/details/CardDetailsViewModel.kt (77%)
 rename card-journey/{src/main/java/com/backbase/cards_journey => impl/src/main/java/com/backbase/cards_journey/impl}/ui/list/CardListAdapter.kt (90%)
 rename card-journey/{src/main/java/com/backbase/cards_journey => impl/src/main/java/com/backbase/cards_journey/impl}/ui/list/CardListFragment.kt (78%)
 rename card-journey/{src/main/java/com/backbase/cards_journey => impl/src/main/java/com/backbase/cards_journey/impl}/ui/list/CardListScreenContract.kt (57%)
 rename card-journey/{src/main/java/com/backbase/cards_journey => impl/src/main/java/com/backbase/cards_journey/impl}/ui/list/CardListViewModel.kt (80%)
 rename card-journey/{src/main/java/com/backbase/cards_journey => impl/src/main/java/com/backbase/cards_journey/impl}/ui/list/CardViewHolder.kt (74%)
 rename card-journey/{src/main/java/com/backbase/cards_journey => impl/src/main/java/com/backbase/cards_journey/impl}/utils/AppUtils.kt (87%)
 rename card-journey/{src/main/java/com/backbase/cards_journey => impl/src/main/java/com/backbase/cards_journey/impl}/utils/BBDbsClient.kt (95%)
 rename card-journey/{ => impl}/src/main/res/drawable/card_gradient.xml (100%)
 rename card-journey/{ => impl}/src/main/res/drawable/ic_back.xml (100%)
 rename card-journey/{ => impl}/src/main/res/drawable/ic_backbase.xml (100%)
 rename card-journey/{ => impl}/src/main/res/drawable/ic_mada_logo.xml (100%)
 rename card-journey/{ => impl}/src/main/res/drawable/ic_mc_logo.xml (100%)
 rename card-journey/{ => impl}/src/main/res/layout/fragment_card_details.xml (100%)
 rename card-journey/{ => impl}/src/main/res/layout/fragment_card_list.xml (100%)
 rename card-journey/{ => impl}/src/main/res/layout/fragment_cards_journey.xml (100%)
 rename card-journey/{ => impl}/src/main/res/layout/inflate_card.xml (100%)
 rename card-journey/{ => impl}/src/main/res/navigation/cards_navigation.xml (79%)
 rename card-journey/{ => impl}/src/main/res/values/dimens.xml (100%)
 rename card-journey/{ => impl}/src/main/res/values/strings.xml (100%)
 rename card-journey/{ => impl}/src/main/res/values/styles.xml (100%)
 rename card-journey/{src/test/java/com/backbase/cards_journey => impl/src/test/java/com/backbase/cards_journey/impl}/ExampleUnitTest.kt (88%)
 delete mode 100644 card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyModule.kt
 delete mode 100644 card-journey/src/main/java/com/backbase/cards_journey/mvi/UiEffect.kt
 delete mode 100644 card-journey/src/main/java/com/backbase/cards_journey/mvi/UiEvent.kt
 delete mode 100644 card-journey/src/main/java/com/backbase/cards_journey/mvi/UiState.kt

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ede5b75c..839e87ea 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -83,8 +83,8 @@ android {
 dependencies {
     implementation(project(":accounts-journey"))
     implementation(project(":accounts-use-case"))
-    implementation(project(":card-journey"))
-    implementation(project(":card-use-case"))
+    implementation(project(":card-journey:impl"))
+    implementation(project(":card-journey:api"))
 
     implementation(platform(libs.kotlin.bom))
     implementation(libs.bundles.android.core)
diff --git a/app/src/main/kotlin/com/backbase/golden_sample_app/MainApplication.kt b/app/src/main/kotlin/com/backbase/golden_sample_app/MainApplication.kt
index d02af3db..1e04940d 100644
--- a/app/src/main/kotlin/com/backbase/golden_sample_app/MainApplication.kt
+++ b/app/src/main/kotlin/com/backbase/golden_sample_app/MainApplication.kt
@@ -16,8 +16,8 @@ import com.backbase.android.listeners.ModelListener
 import com.backbase.android.model.Model
 import com.backbase.android.model.ModelSource
 import com.backbase.android.utils.net.response.Response
-import com.backbase.cards_journey.cardsJourneyModule
-import com.backbase.cards_journey.koin.cardModule
+import com.backbase.cards_journey.impl.cardsJourneyModule
+import com.backbase.cards_journey.impl.koin.cardModule
 import com.backbase.golden_sample_app.authentication.CompositeSessionListener
 import com.backbase.golden_sample_app.common.TAG
 import com.backbase.golden_sample_app.koin.accountsModule
@@ -61,8 +61,7 @@ class MainApplication : Application() {
     }
 
     private fun initializeBackbase(
-        backbaseConfigAssetPath: String = "backbase/config.json",
-        encrypted: Boolean = false
+        backbaseConfigAssetPath: String = "backbase/config.json", encrypted: Boolean = false
     ) {
         Backbase.initialize(this@MainApplication, backbaseConfigAssetPath, encrypted)
         with(Backbase.requireInstance()) {
@@ -74,8 +73,7 @@ class MainApplication : Application() {
                     override fun onError(response: Response) = throw IllegalArgumentException(
                         "backbaseConfigAssetPath must point to a valid model. Instead, ${response.errorMessage}"
                     )
-                },
-                ModelSource.LOCAL
+                }, ModelSource.LOCAL
             )
         }
     }
diff --git a/app/src/main/kotlin/com/backbase/golden_sample_app/koin/NavigationModule.kt b/app/src/main/kotlin/com/backbase/golden_sample_app/koin/NavigationModule.kt
index 49fd0d24..6c3e67b3 100644
--- a/app/src/main/kotlin/com/backbase/golden_sample_app/koin/NavigationModule.kt
+++ b/app/src/main/kotlin/com/backbase/golden_sample_app/koin/NavigationModule.kt
@@ -2,7 +2,7 @@ package com.backbase.golden_sample_app.koin
 
 import androidx.navigation.NavController
 import com.backbase.accounts_journey.router.CardNavigationAction
-import com.backbase.cards_journey.CardExitNavigationAction
+import com.backbase.cards_journey.impl.CardExitNavigationAction
 import com.backbase.golden_sample_app.R
 import com.backbase.golden_sample_app.router.AppRouting
 import org.koin.dsl.module
diff --git a/app/src/main/res/navigation/navigation_main.xml b/app/src/main/res/navigation/navigation_main.xml
index 78801c7b..f7d39b8b 100644
--- a/app/src/main/res/navigation/navigation_main.xml
+++ b/app/src/main/res/navigation/navigation_main.xml
@@ -65,7 +65,7 @@
     </fragment>
     <fragment
         android:id="@+id/cardsJourney"
-        android:name="com.backbase.cards_journey.CardsJourney"
+        android:name="com.backbase.cards_journey.impl.CardsJourney"
         android:label="CardsJourney"
         tools:layout="@layout/fragment_cards_journey" />
     <action
diff --git a/card-journey/.gitignore b/card-journey/api/.gitignore
similarity index 100%
rename from card-journey/.gitignore
rename to card-journey/api/.gitignore
diff --git a/card-use-case/build.gradle.kts b/card-journey/api/build.gradle.kts
similarity index 87%
rename from card-use-case/build.gradle.kts
rename to card-journey/api/build.gradle.kts
index 7228ba58..886fb4e2 100644
--- a/card-use-case/build.gradle.kts
+++ b/card-journey/api/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 android {
-    namespace = "com.backbase.card_use_case"
+    namespace = "com.backbase.cards_journey.api"
 }
 
 dependencies {
diff --git a/card-journey/src/androidTest/java/com/backbase/cards_journey/ExampleInstrumentedTest.kt b/card-journey/api/src/androidTest/java/com/backbase/api/ExampleInstrumentedTest.kt
similarity index 83%
rename from card-journey/src/androidTest/java/com/backbase/cards_journey/ExampleInstrumentedTest.kt
rename to card-journey/api/src/androidTest/java/com/backbase/api/ExampleInstrumentedTest.kt
index 676275f9..b379e0a0 100644
--- a/card-journey/src/androidTest/java/com/backbase/cards_journey/ExampleInstrumentedTest.kt
+++ b/card-journey/api/src/androidTest/java/com/backbase/api/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.backbase.cards_journey
+package com.backbase.api
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.backbase.card_journey.test", appContext.packageName)
+        assertEquals("com.backbase.api.test", appContext.packageName)
     }
 }
\ No newline at end of file
diff --git a/card-use-case/src/main/java/com/backbase/card_use_case/data/CustomCardClient.kt b/card-journey/api/src/main/java/com/backbase/api/data/CustomCardClient.kt
similarity index 85%
rename from card-use-case/src/main/java/com/backbase/card_use_case/data/CustomCardClient.kt
rename to card-journey/api/src/main/java/com/backbase/api/data/CustomCardClient.kt
index 9715ee02..00ee5296 100644
--- a/card-use-case/src/main/java/com/backbase/card_use_case/data/CustomCardClient.kt
+++ b/card-journey/api/src/main/java/com/backbase/api/data/CustomCardClient.kt
@@ -1,4 +1,4 @@
-package com.backbase.card_use_case.data
+package com.backbase.api.data
 
 import com.backbase.android.client.cardsclient2.model.CardItem
 import com.backbase.android.clients.common.Call
diff --git a/card-use-case/src/main/java/com/backbase/card_use_case/domain/CustomCardUseCase.kt b/card-journey/api/src/main/java/com/backbase/api/domain/CustomCardUseCase.kt
similarity index 83%
rename from card-use-case/src/main/java/com/backbase/card_use_case/domain/CustomCardUseCase.kt
rename to card-journey/api/src/main/java/com/backbase/api/domain/CustomCardUseCase.kt
index 8303602f..89fd0c68 100644
--- a/card-use-case/src/main/java/com/backbase/card_use_case/domain/CustomCardUseCase.kt
+++ b/card-journey/api/src/main/java/com/backbase/api/domain/CustomCardUseCase.kt
@@ -1,4 +1,4 @@
-package com.backbase.card_use_case.domain
+package com.backbase.api.domain
 
 import com.backbase.android.client.cardsclient2.model.CardItem
 
diff --git a/card-use-case/src/test/java/com/backbase/card_use_case/ExampleUnitTest.kt b/card-journey/api/src/test/java/com/backbase/api/ExampleUnitTest.kt
similarity index 90%
rename from card-use-case/src/test/java/com/backbase/card_use_case/ExampleUnitTest.kt
rename to card-journey/api/src/test/java/com/backbase/api/ExampleUnitTest.kt
index cc51b946..f7d11e9e 100644
--- a/card-use-case/src/test/java/com/backbase/card_use_case/ExampleUnitTest.kt
+++ b/card-journey/api/src/test/java/com/backbase/api/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.backbase.card_use_case
+package com.backbase.api
 
 import org.junit.Test
 
diff --git a/card-use-case/.gitignore b/card-journey/impl/.gitignore
similarity index 100%
rename from card-use-case/.gitignore
rename to card-journey/impl/.gitignore
diff --git a/card-journey/build.gradle.kts b/card-journey/impl/build.gradle.kts
similarity index 81%
rename from card-journey/build.gradle.kts
rename to card-journey/impl/build.gradle.kts
index be4e568c..8212d794 100644
--- a/card-journey/build.gradle.kts
+++ b/card-journey/impl/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 android {
-    namespace = "com.backbase.cards_journey"
+    namespace = "com.backbase.cards_journey.impl"
 }
 
 dependencies {
@@ -14,5 +14,5 @@ dependencies {
     implementation(backbase.bundles.common)
     implementation(libs.bundles.navigation)
     implementation(backbase.bundles.card.client.common)
-    implementation(project(":card-use-case"))
+    implementation(project(":card-journey:api"))
 }
\ No newline at end of file
diff --git a/card-use-case/src/androidTest/java/com/backbase/card_use_case/ExampleInstrumentedTest.kt b/card-journey/impl/src/androidTest/java/com/backbase/cards_journey/impl/ExampleInstrumentedTest.kt
similarity index 81%
rename from card-use-case/src/androidTest/java/com/backbase/card_use_case/ExampleInstrumentedTest.kt
rename to card-journey/impl/src/androidTest/java/com/backbase/cards_journey/impl/ExampleInstrumentedTest.kt
index 6b99b678..9efba3a0 100644
--- a/card-use-case/src/androidTest/java/com/backbase/card_use_case/ExampleInstrumentedTest.kt
+++ b/card-journey/impl/src/androidTest/java/com/backbase/cards_journey/impl/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.backbase.card_use_case
+package com.backbase.cards_journey.impl
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.backbase.card_use_case.test", appContext.packageName)
+        assertEquals("com.backbase.cards_journey.impl.test", appContext.packageName)
     }
 }
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/CardExitNavigationAction.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/CardExitNavigationAction.kt
similarity index 57%
rename from card-journey/src/main/java/com/backbase/cards_journey/CardExitNavigationAction.kt
rename to card-journey/impl/src/main/java/com/backbase/cards_journey/impl/CardExitNavigationAction.kt
index c32f2adf..a043b250 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/CardExitNavigationAction.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/CardExitNavigationAction.kt
@@ -1,4 +1,4 @@
-package com.backbase.cards_journey
+package com.backbase.cards_journey.impl
 
 interface CardExitNavigationAction {
     fun exit()
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/CardsJourney.kt
similarity index 87%
rename from card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt
rename to card-journey/impl/src/main/java/com/backbase/cards_journey/impl/CardsJourney.kt
index 06cfc7ab..87487c1c 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/CardsJourney.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/CardsJourney.kt
@@ -1,4 +1,4 @@
-package com.backbase.cards_journey
+package com.backbase.cards_journey.impl
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -6,7 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import com.backbase.cards_journey.databinding.FragmentCardsJourneyBinding
+import com.backbase.cards_journey.impl.databinding.FragmentCardsJourneyBinding
 
 
 class CardsJourney : Fragment() {
diff --git a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/CardsJourneyModule.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/CardsJourneyModule.kt
new file mode 100644
index 00000000..5e26b7a5
--- /dev/null
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/CardsJourneyModule.kt
@@ -0,0 +1,8 @@
+package com.backbase.cards_journey.impl
+
+import org.koin.dsl.module
+
+val cardsJourneyModule = module {
+    scope<CardsJourneyScope> {
+    }
+}
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyScope.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/CardsJourneyScope.kt
similarity index 91%
rename from card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyScope.kt
rename to card-journey/impl/src/main/java/com/backbase/cards_journey/impl/CardsJourneyScope.kt
index 9a49766a..5ae739d9 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyScope.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/CardsJourneyScope.kt
@@ -1,4 +1,4 @@
-package com.backbase.cards_journey
+package com.backbase.cards_journey.impl
 
 import androidx.annotation.MainThread
 import androidx.fragment.app.Fragment
@@ -6,8 +6,8 @@ import androidx.lifecycle.ViewModel
 import com.backbase.android.retail.journey.koin.KoinScopeViewModel
 import com.backbase.android.retail.journey.koin.scoped
 import com.backbase.android.retail.journey.koin.scopedViewModel
-import com.backbase.cards_journey.ui.details.CardDetailsViewModel
-import com.backbase.cards_journey.ui.list.CardListViewModel
+import com.backbase.cards_journey.impl.ui.details.CardDetailsViewModel
+import com.backbase.cards_journey.impl.ui.list.CardListViewModel
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.core.context.loadKoinModules
 import org.koin.core.context.unloadKoinModules
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/data/CustomCardClientImpl.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/data/CustomCardClientImpl.kt
similarity index 87%
rename from card-journey/src/main/java/com/backbase/cards_journey/data/CustomCardClientImpl.kt
rename to card-journey/impl/src/main/java/com/backbase/cards_journey/impl/data/CustomCardClientImpl.kt
index 0e51b897..03eb0a06 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/data/CustomCardClientImpl.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/data/CustomCardClientImpl.kt
@@ -1,4 +1,4 @@
-package com.backbase.cards_journey.data
+package com.backbase.cards_journey.impl.data
 
 import android.content.Context
 import com.backbase.android.Backbase
@@ -7,9 +7,9 @@ import com.backbase.android.clients.common.Call
 import com.backbase.android.clients.common.MoshiResponseBodyParser
 import com.backbase.android.common.utils.dbs.Params
 import com.backbase.android.dbs.DBSDataProvider
-import com.backbase.card_use_case.data.CustomCardClient
-import com.backbase.cards_journey.utils.BBDbsClient
-import com.backbase.cards_journey.utils.Constants
+import com.backbase.api.data.CustomCardClient
+import com.backbase.cards_journey.impl.utils.BBDbsClient
+import com.backbase.cards_journey.impl.utils.Constants
 import com.squareup.moshi.Types
 import java.net.URI
 
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/domain/CustomCardUseCaseImpl.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/domain/CustomCardUseCaseImpl.kt
similarity index 92%
rename from card-journey/src/main/java/com/backbase/cards_journey/domain/CustomCardUseCaseImpl.kt
rename to card-journey/impl/src/main/java/com/backbase/cards_journey/impl/domain/CustomCardUseCaseImpl.kt
index b56526d3..3bf4dc50 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/domain/CustomCardUseCaseImpl.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/domain/CustomCardUseCaseImpl.kt
@@ -1,10 +1,10 @@
-package com.backbase.cards_journey.domain
+package com.backbase.cards_journey.impl.domain
 
 import com.backbase.android.client.cardsclient2.model.CardItem
 import com.backbase.android.clients.common.CallResult
 import com.backbase.android.clients.common.coroutines.executeAsSuspended
-import com.backbase.card_use_case.data.CustomCardClient
-import com.backbase.card_use_case.domain.CustomCardUseCase
+import com.backbase.api.data.CustomCardClient
+import com.backbase.api.domain.CustomCardUseCase
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/koin/CardModule.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/koin/CardModule.kt
similarity index 78%
rename from card-journey/src/main/java/com/backbase/cards_journey/koin/CardModule.kt
rename to card-journey/impl/src/main/java/com/backbase/cards_journey/impl/koin/CardModule.kt
index c94dbba8..d0c7aabe 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/koin/CardModule.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/koin/CardModule.kt
@@ -1,4 +1,4 @@
-package com.backbase.cards_journey.koin
+package com.backbase.cards_journey.impl.koin
 
 import android.content.Context
 import com.backbase.android.Backbase
@@ -8,10 +8,9 @@ import com.backbase.android.clients.common.bigDecimalAdapter
 import com.backbase.android.clients.common.dateAdapter
 import com.backbase.android.clients.common.dateTimeAdapter
 import com.backbase.android.dbs.dataproviders.NetworkDBSDataProvider
-import com.backbase.card_use_case.data.CustomCardClient
-import com.backbase.card_use_case.domain.CustomCardUseCase
-import com.backbase.cards_journey.data.CustomCardClientImpl
-import com.backbase.cards_journey.domain.CustomCardUseCaseImpl
+import com.backbase.api.data.CustomCardClient
+import com.backbase.api.domain.CustomCardUseCase
+import com.backbase.cards_journey.impl.domain.CustomCardUseCaseImpl
 import com.squareup.moshi.Moshi
 import org.koin.dsl.module
 import java.net.URI
@@ -29,14 +28,14 @@ private val moshi = Moshi.Builder()
 fun cardModule(context: Context) = module {
 
     val backbase = Backbase.requireInstance()
-    single { backbase.getClient(CustomCardClientImpl::class.java) }
+    single { backbase.getClient(com.backbase.cards_journey.impl.data.CustomCardClientImpl::class.java) }
     factory<CustomCardUseCase> {
         CustomCardUseCaseImpl(
             customCardClient = get()
         )
     }
     factory<CustomCardClient> {
-        CustomCardClientImpl(
+        com.backbase.cards_journey.impl.data.CustomCardClientImpl(
             context = context,
             parser = MoshiResponseBodyParser(moshi),
             serverUri = URI(serverUrl + CARD_MANAGER_ENDPOINT),
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/mvi/BaseViewModel.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/BaseViewModel.kt
similarity index 88%
rename from card-journey/src/main/java/com/backbase/cards_journey/mvi/BaseViewModel.kt
rename to card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/BaseViewModel.kt
index 9fe43338..ad69fb89 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/mvi/BaseViewModel.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/BaseViewModel.kt
@@ -1,4 +1,4 @@
-package com.backbase.cards_journey.mvi
+package com.backbase.cards_journey.impl.mvi
 
 import androidx.annotation.VisibleForTesting
 import androidx.lifecycle.ViewModel
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
 
-abstract class BaseViewModel<State : UiState, Effect : UiEffect, Event : UiEvent> : ViewModel() {
+abstract class BaseViewModel<State : com.backbase.cards_journey.impl.mvi.UiState, Effect : com.backbase.cards_journey.impl.mvi.UiEffect, Event : UiEvent> : ViewModel() {
 
     protected val currentState: State
         get() = _state.value
diff --git a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiEffect.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiEffect.kt
new file mode 100644
index 00000000..535c0b13
--- /dev/null
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiEffect.kt
@@ -0,0 +1,3 @@
+package com.backbase.cards_journey.impl.mvi
+
+open class UiEffect
diff --git a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiEvent.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiEvent.kt
new file mode 100644
index 00000000..4db1f9e4
--- /dev/null
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiEvent.kt
@@ -0,0 +1,3 @@
+package com.backbase.cards_journey.impl.mvi
+
+open class UiEvent
diff --git a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiState.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiState.kt
new file mode 100644
index 00000000..3eb5bbe2
--- /dev/null
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiState.kt
@@ -0,0 +1,3 @@
+package com.backbase.cards_journey.impl.mvi
+
+open class UiState
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/details/CardDetailsFragment.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/details/CardDetailsFragment.kt
similarity index 92%
rename from card-journey/src/main/java/com/backbase/cards_journey/ui/details/CardDetailsFragment.kt
rename to card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/details/CardDetailsFragment.kt
index fe7e45b1..f4ebc29a 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/ui/details/CardDetailsFragment.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/details/CardDetailsFragment.kt
@@ -1,4 +1,4 @@
-package com.backbase.cards_journey.ui.details
+package com.backbase.cards_journey.impl.ui.details
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -13,9 +13,9 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.backbase.android.client.cardsclient2.model.CardItem
-import com.backbase.cards_journey.databinding.FragmentCardDetailsBinding
-import com.backbase.cards_journey.journeyScopedViewModel
-import com.backbase.cards_journey.utils.getMaskedText
+import com.backbase.cards_journey.impl.databinding.FragmentCardDetailsBinding
+import com.backbase.cards_journey.impl.journeyScopedViewModel
+import com.backbase.cards_journey.impl.utils.getMaskedText
 import kotlinx.coroutines.launch
 import org.koin.core.parameter.parametersOf
 
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/details/CardDetailsScreenContract.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/details/CardDetailsScreenContract.kt
similarity index 66%
rename from card-journey/src/main/java/com/backbase/cards_journey/ui/details/CardDetailsScreenContract.kt
rename to card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/details/CardDetailsScreenContract.kt
index 73bfe4e3..e5006639 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/ui/details/CardDetailsScreenContract.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/details/CardDetailsScreenContract.kt
@@ -1,9 +1,9 @@
-package com.backbase.cards_journey.ui.details
+package com.backbase.cards_journey.impl.ui.details
 
 import com.backbase.android.client.cardsclient2.model.CardItem
-import com.backbase.cards_journey.mvi.UiEffect
-import com.backbase.cards_journey.mvi.UiEvent
-import com.backbase.cards_journey.mvi.UiState
+import com.backbase.cards_journey.impl.mvi.UiEffect
+import com.backbase.cards_journey.impl.mvi.UiEvent
+import com.backbase.cards_journey.impl.mvi.UiState
 
 
 data class CardDetailsScreenViewState(
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/details/CardDetailsViewModel.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/details/CardDetailsViewModel.kt
similarity index 77%
rename from card-journey/src/main/java/com/backbase/cards_journey/ui/details/CardDetailsViewModel.kt
rename to card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/details/CardDetailsViewModel.kt
index 46735507..e847a3e6 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/ui/details/CardDetailsViewModel.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/details/CardDetailsViewModel.kt
@@ -1,11 +1,11 @@
-package com.backbase.cards_journey.ui.details
+package com.backbase.cards_journey.impl.ui.details
 
 import androidx.lifecycle.viewModelScope
-import com.backbase.card_use_case.domain.CustomCardUseCase
-import com.backbase.cards_journey.mvi.BaseViewModel
+import com.backbase.api.domain.CustomCardUseCase
+import com.backbase.cards_journey.impl.mvi.BaseViewModel
 import kotlinx.coroutines.launch
 
-class CardDetailsViewModel(val cardId: String, val usecase: CustomCardUseCase) :
+class CardDetailsViewModel(val cardId: String, private val useCase: CustomCardUseCase) :
     BaseViewModel<CardDetailsScreenViewState, CardDetailsScreenEffect, CardDetailsScreenEvent>() {
     override fun handleEvent(event: CardDetailsScreenEvent) {
         when (event) {
@@ -22,7 +22,7 @@ class CardDetailsViewModel(val cardId: String, val usecase: CustomCardUseCase) :
             copy(isLoading = true)
         }
         viewModelScope.launch {
-            usecase.getCardDetails(cardId).fold(
+            useCase.getCardDetails(cardId).fold(
                 onSuccess = { result ->
                     setState {
                         copy(
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListAdapter.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListAdapter.kt
similarity index 90%
rename from card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListAdapter.kt
rename to card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListAdapter.kt
index d2ce0652..ae03f3fb 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListAdapter.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListAdapter.kt
@@ -1,11 +1,11 @@
-package com.backbase.cards_journey.ui.list
+package com.backbase.cards_journey.impl.ui.list
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import com.backbase.android.client.cardsclient2.model.CardItem
-import com.backbase.cards_journey.databinding.InflateCardBinding
+import com.backbase.cards_journey.impl.databinding.InflateCardBinding
 
 class CardListAdapter(val onclick: (CardItem) -> Unit) :
     ListAdapter<CardItem, CardViewHolder>(BillsDiffCallBack()) {
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListFragment.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListFragment.kt
similarity index 78%
rename from card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListFragment.kt
rename to card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListFragment.kt
index 67e0830b..c03d7847 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListFragment.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListFragment.kt
@@ -1,4 +1,4 @@
-package com.backbase.cards_journey.ui.list
+package com.backbase.cards_journey.impl.ui.list
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -12,10 +12,9 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.fragment.findNavController
 import androidx.viewpager2.widget.ViewPager2
 import com.backbase.android.client.cardsclient2.model.CardItem
-import com.backbase.cards_journey.CardExitNavigationAction
-import com.backbase.cards_journey.R
-import com.backbase.cards_journey.databinding.FragmentCardListBinding
-import com.backbase.cards_journey.journeyScopedViewModel
+import com.backbase.cards_journey.impl.CardExitNavigationAction
+import com.backbase.cards_journey.impl.databinding.FragmentCardListBinding
+import com.backbase.cards_journey.impl.journeyScopedViewModel
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
 
@@ -44,7 +43,7 @@ class CardListFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        viewModel.sendEvent(CardListScreenEvent.GetCardList)
+        viewModel.sendEvent(com.backbase.cards_journey.impl.ui.list.CardListScreenEvent.GetCardList)
 
         cardsAdapter = CardListAdapter(::onclick)
         binding.pager.apply {
@@ -82,19 +81,11 @@ class CardListFragment : Fragment() {
             repeatOnLifecycle(Lifecycle.State.STARTED) {
                 viewModel.effect.collect { effect ->
                     when (effect) {
-                        CardListScreenEffect.HandleErrorResponse -> binding.error.isVisible = true
+                        CardListScreenEffect.HandleErrorResponse -> binding.error.isVisible =
+                            true
                     }
                 }
             }
         }
     }
-
-    private fun adjustViewPager(viewPager: ViewPager2) {
-        val pageTranslationX = resources.getDimension(R.dimen.margin_200)
-        val pageTransformer = ViewPager2.PageTransformer { page: View, position: Float ->
-            page.translationX = -pageTranslationX * position
-        }
-        viewPager.setPageTransformer(pageTransformer)
-    }
-
 }
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListScreenContract.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListScreenContract.kt
similarity index 57%
rename from card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListScreenContract.kt
rename to card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListScreenContract.kt
index 57e19e47..4d524305 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListScreenContract.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListScreenContract.kt
@@ -1,17 +1,15 @@
-package com.backbase.cards_journey.ui.list
+package com.backbase.cards_journey.impl.ui.list
 
 import com.backbase.android.client.cardsclient2.model.CardItem
-import com.backbase.cards_journey.mvi.UiEffect
-import com.backbase.cards_journey.mvi.UiEvent
-import com.backbase.cards_journey.mvi.UiState
+import com.backbase.cards_journey.impl.mvi.UiEvent
 
 
 data class CardListScreenViewState(
     val isLoading: Boolean,
     val cards: List<CardItem>? = null
-) : UiState()
+) : com.backbase.cards_journey.impl.mvi.UiState()
 
-sealed class CardListScreenEffect : UiEffect() {
+sealed class CardListScreenEffect : com.backbase.cards_journey.impl.mvi.UiEffect() {
     data object HandleErrorResponse : CardListScreenEffect()
 }
 
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListViewModel.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListViewModel.kt
similarity index 80%
rename from card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListViewModel.kt
rename to card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListViewModel.kt
index bcf011cd..a0c9e5a8 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardListViewModel.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListViewModel.kt
@@ -1,12 +1,11 @@
-package com.backbase.cards_journey.ui.list
+package com.backbase.cards_journey.impl.ui.list
 
 import androidx.lifecycle.viewModelScope
-import com.backbase.android.core.utils.BBLogger
-import com.backbase.card_use_case.domain.CustomCardUseCase
-import com.backbase.cards_journey.mvi.BaseViewModel
+import com.backbase.api.domain.CustomCardUseCase
+import com.backbase.cards_journey.impl.mvi.BaseViewModel
 import kotlinx.coroutines.launch
 
-class CardListViewModel(val useCase: CustomCardUseCase) :
+class CardListViewModel(private val useCase: CustomCardUseCase) :
     BaseViewModel<CardListScreenViewState, CardListScreenEffect, CardListScreenEvent>() {
     override fun handleEvent(event: CardListScreenEvent) {
         when (event) {
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardViewHolder.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardViewHolder.kt
similarity index 74%
rename from card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardViewHolder.kt
rename to card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardViewHolder.kt
index 508551cd..5e2318ce 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/ui/list/CardViewHolder.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardViewHolder.kt
@@ -1,9 +1,9 @@
-package com.backbase.cards_journey.ui.list
+package com.backbase.cards_journey.impl.ui.list
 
 import androidx.recyclerview.widget.RecyclerView
 import com.backbase.android.client.cardsclient2.model.CardItem
-import com.backbase.cards_journey.databinding.InflateCardBinding
-import com.backbase.cards_journey.utils.getMaskedText
+import com.backbase.cards_journey.impl.databinding.InflateCardBinding
+import com.backbase.cards_journey.impl.utils.getMaskedText
 
 class CardViewHolder(private val binding: InflateCardBinding) :
     RecyclerView.ViewHolder(binding.root) {
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/utils/AppUtils.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/utils/AppUtils.kt
similarity index 87%
rename from card-journey/src/main/java/com/backbase/cards_journey/utils/AppUtils.kt
rename to card-journey/impl/src/main/java/com/backbase/cards_journey/impl/utils/AppUtils.kt
index 3856843f..3b0d17e9 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/utils/AppUtils.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/utils/AppUtils.kt
@@ -1,4 +1,4 @@
-package com.backbase.cards_journey.utils
+package com.backbase.cards_journey.impl.utils
 
 import com.backbase.android.client.cardsclient2.model.CardItem
 
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/utils/BBDbsClient.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/utils/BBDbsClient.kt
similarity index 95%
rename from card-journey/src/main/java/com/backbase/cards_journey/utils/BBDbsClient.kt
rename to card-journey/impl/src/main/java/com/backbase/cards_journey/impl/utils/BBDbsClient.kt
index 05b61b12..996afd8b 100644
--- a/card-journey/src/main/java/com/backbase/cards_journey/utils/BBDbsClient.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/utils/BBDbsClient.kt
@@ -1,4 +1,4 @@
-package com.backbase.cards_journey.utils
+package com.backbase.cards_journey.impl.utils
 
 import android.content.Context
 import com.backbase.android.Backbase
diff --git a/card-journey/src/main/res/drawable/card_gradient.xml b/card-journey/impl/src/main/res/drawable/card_gradient.xml
similarity index 100%
rename from card-journey/src/main/res/drawable/card_gradient.xml
rename to card-journey/impl/src/main/res/drawable/card_gradient.xml
diff --git a/card-journey/src/main/res/drawable/ic_back.xml b/card-journey/impl/src/main/res/drawable/ic_back.xml
similarity index 100%
rename from card-journey/src/main/res/drawable/ic_back.xml
rename to card-journey/impl/src/main/res/drawable/ic_back.xml
diff --git a/card-journey/src/main/res/drawable/ic_backbase.xml b/card-journey/impl/src/main/res/drawable/ic_backbase.xml
similarity index 100%
rename from card-journey/src/main/res/drawable/ic_backbase.xml
rename to card-journey/impl/src/main/res/drawable/ic_backbase.xml
diff --git a/card-journey/src/main/res/drawable/ic_mada_logo.xml b/card-journey/impl/src/main/res/drawable/ic_mada_logo.xml
similarity index 100%
rename from card-journey/src/main/res/drawable/ic_mada_logo.xml
rename to card-journey/impl/src/main/res/drawable/ic_mada_logo.xml
diff --git a/card-journey/src/main/res/drawable/ic_mc_logo.xml b/card-journey/impl/src/main/res/drawable/ic_mc_logo.xml
similarity index 100%
rename from card-journey/src/main/res/drawable/ic_mc_logo.xml
rename to card-journey/impl/src/main/res/drawable/ic_mc_logo.xml
diff --git a/card-journey/src/main/res/layout/fragment_card_details.xml b/card-journey/impl/src/main/res/layout/fragment_card_details.xml
similarity index 100%
rename from card-journey/src/main/res/layout/fragment_card_details.xml
rename to card-journey/impl/src/main/res/layout/fragment_card_details.xml
diff --git a/card-journey/src/main/res/layout/fragment_card_list.xml b/card-journey/impl/src/main/res/layout/fragment_card_list.xml
similarity index 100%
rename from card-journey/src/main/res/layout/fragment_card_list.xml
rename to card-journey/impl/src/main/res/layout/fragment_card_list.xml
diff --git a/card-journey/src/main/res/layout/fragment_cards_journey.xml b/card-journey/impl/src/main/res/layout/fragment_cards_journey.xml
similarity index 100%
rename from card-journey/src/main/res/layout/fragment_cards_journey.xml
rename to card-journey/impl/src/main/res/layout/fragment_cards_journey.xml
diff --git a/card-journey/src/main/res/layout/inflate_card.xml b/card-journey/impl/src/main/res/layout/inflate_card.xml
similarity index 100%
rename from card-journey/src/main/res/layout/inflate_card.xml
rename to card-journey/impl/src/main/res/layout/inflate_card.xml
diff --git a/card-journey/src/main/res/navigation/cards_navigation.xml b/card-journey/impl/src/main/res/navigation/cards_navigation.xml
similarity index 79%
rename from card-journey/src/main/res/navigation/cards_navigation.xml
rename to card-journey/impl/src/main/res/navigation/cards_navigation.xml
index b80f70ff..7fbb7c16 100644
--- a/card-journey/src/main/res/navigation/cards_navigation.xml
+++ b/card-journey/impl/src/main/res/navigation/cards_navigation.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/cardListFragment"
-        android:name="com.backbase.cards_journey.ui.list.CardListFragment"
+        android:name="com.backbase.cards_journey.impl.ui.list.CardListFragment"
         android:label="fragment_card_list"
         tools:layout="@layout/fragment_card_list">
         <action
@@ -16,9 +16,9 @@
     </fragment>
     <fragment
         android:id="@+id/cardDetailsFragment"
-        android:name="com.backbase.cards_journey.ui.details.CardDetailsFragment"
+        android:name="com.backbase.cards_journey.impl.ui.details.CardDetailsFragment"
         android:label="CardDetailsFragment"
-        tools:layout="@layout/fragment_card_details" >
+        tools:layout="@layout/fragment_card_details">
         <argument
             android:name="cardId"
             app:argType="string" />
diff --git a/card-journey/src/main/res/values/dimens.xml b/card-journey/impl/src/main/res/values/dimens.xml
similarity index 100%
rename from card-journey/src/main/res/values/dimens.xml
rename to card-journey/impl/src/main/res/values/dimens.xml
diff --git a/card-journey/src/main/res/values/strings.xml b/card-journey/impl/src/main/res/values/strings.xml
similarity index 100%
rename from card-journey/src/main/res/values/strings.xml
rename to card-journey/impl/src/main/res/values/strings.xml
diff --git a/card-journey/src/main/res/values/styles.xml b/card-journey/impl/src/main/res/values/styles.xml
similarity index 100%
rename from card-journey/src/main/res/values/styles.xml
rename to card-journey/impl/src/main/res/values/styles.xml
diff --git a/card-journey/src/test/java/com/backbase/cards_journey/ExampleUnitTest.kt b/card-journey/impl/src/test/java/com/backbase/cards_journey/impl/ExampleUnitTest.kt
similarity index 88%
rename from card-journey/src/test/java/com/backbase/cards_journey/ExampleUnitTest.kt
rename to card-journey/impl/src/test/java/com/backbase/cards_journey/impl/ExampleUnitTest.kt
index d7ea4430..f78b86a9 100644
--- a/card-journey/src/test/java/com/backbase/cards_journey/ExampleUnitTest.kt
+++ b/card-journey/impl/src/test/java/com/backbase/cards_journey/impl/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.backbase.cards_journey
+package com.backbase.cards_journey.impl
 
 import org.junit.Test
 
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyModule.kt b/card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyModule.kt
deleted file mode 100644
index d5f780cf..00000000
--- a/card-journey/src/main/java/com/backbase/cards_journey/CardsJourneyModule.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.backbase.cards_journey
-
-import com.backbase.cards_journey.ui.list.CardListViewModel
-import org.koin.androidx.viewmodel.dsl.viewModel
-import org.koin.dsl.module
-
-val cardsJourneyModule = module {
-    scope<CardsJourneyScope> {
-    }
-}
\ No newline at end of file
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/mvi/UiEffect.kt b/card-journey/src/main/java/com/backbase/cards_journey/mvi/UiEffect.kt
deleted file mode 100644
index 6847a9c7..00000000
--- a/card-journey/src/main/java/com/backbase/cards_journey/mvi/UiEffect.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.backbase.cards_journey.mvi
-
-open class UiEffect
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/mvi/UiEvent.kt b/card-journey/src/main/java/com/backbase/cards_journey/mvi/UiEvent.kt
deleted file mode 100644
index 930fb4df..00000000
--- a/card-journey/src/main/java/com/backbase/cards_journey/mvi/UiEvent.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.backbase.cards_journey.mvi
-
-open class UiEvent
diff --git a/card-journey/src/main/java/com/backbase/cards_journey/mvi/UiState.kt b/card-journey/src/main/java/com/backbase/cards_journey/mvi/UiState.kt
deleted file mode 100644
index 80aab0a9..00000000
--- a/card-journey/src/main/java/com/backbase/cards_journey/mvi/UiState.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.backbase.cards_journey.mvi
-
-open class UiState
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f09be14e..e0e8178e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -27,5 +27,5 @@ include(":app")
 include(":accounts-journey")
 include(":accounts-use-case")
 include(":fake-accounts-use-case")
-include(":card-journey")
-include(":card-use-case")
+include(":card-journey:impl")
+include(":card-journey:api")

From 02261aeec604fe20692be740b83a1004a44f994f Mon Sep 17 00:00:00 2001
From: BhargaviYamanuri <bhargavi@backbase.com>
Date: Fri, 2 Feb 2024 20:37:18 +0530
Subject: [PATCH 10/15] feat:removed unused code

---
 .../backbase/cards_journey/impl/ui/list/CardListFragment.kt    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListFragment.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListFragment.kt
index c03d7847..6bbe7293 100644
--- a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListFragment.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListFragment.kt
@@ -43,13 +43,12 @@ class CardListFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        viewModel.sendEvent(com.backbase.cards_journey.impl.ui.list.CardListScreenEvent.GetCardList)
+        viewModel.sendEvent(CardListScreenEvent.GetCardList)
 
         cardsAdapter = CardListAdapter(::onclick)
         binding.pager.apply {
             orientation = ViewPager2.ORIENTATION_HORIZONTAL
             offscreenPageLimit = 2
-//            adjustViewPager(this)
             adapter = cardsAdapter
         }
         binding.toolbar.setNavigationOnClickListener {

From 19ff3e3a5251e9a6a8eb23ec4b71708cbf853391 Mon Sep 17 00:00:00 2001
From: Subhash Kumar Vatturi <subhash@backbase.com>
Date: Mon, 5 Feb 2024 19:54:29 +0530
Subject: [PATCH 11/15] feat:add core ui module and routers

---
 .../accountlist/ui/AccountListFragment.kt     |  6 ++---
 ...dNavigationAction.kt => AccountsRouter.kt} |  4 ++--
 .../koin/NavigationModule.kt                  | 14 +++++------
 card-journey/impl/build.gradle.kts            |  1 +
 ...ExitNavigationAction.kt => CardsRouter.kt} |  2 +-
 .../cards_journey/impl/mvi/UiEffect.kt        |  3 ---
 .../cards_journey/impl/mvi/UiEvent.kt         |  3 ---
 .../cards_journey/impl/mvi/UiState.kt         |  3 ---
 .../ui/details/CardDetailsScreenContract.kt   |  6 ++---
 .../impl/ui/details/CardDetailsViewModel.kt   |  2 +-
 .../impl/ui/list/CardListFragment.kt          |  4 ++--
 .../impl/ui/list/CardListScreenContract.kt    |  8 ++++---
 .../impl/ui/list/CardListViewModel.kt         |  2 +-
 core-ui/.gitignore                            |  1 +
 core-ui/build.gradle.kts                      | 12 ++++++++++
 .../core_ui/ExampleInstrumentedTest.kt        | 24 +++++++++++++++++++
 .../core_ui/mvi}/mvi/BaseViewModel.kt         |  4 ++--
 .../com/backbase/core_ui/mvi/mvi/UiEffect.kt  |  3 +++
 .../com/backbase/core_ui/mvi/mvi/UiEvent.kt   |  3 +++
 .../com/backbase/core_ui/mvi/mvi/UiState.kt   |  3 +++
 settings.gradle.kts                           |  1 +
 21 files changed, 75 insertions(+), 34 deletions(-)
 rename accounts-journey/src/main/kotlin/com/backbase/accounts_journey/router/{CardNavigationAction.kt => AccountsRouter.kt} (50%)
 rename card-journey/impl/src/main/java/com/backbase/cards_journey/impl/{CardExitNavigationAction.kt => CardsRouter.kt} (60%)
 delete mode 100644 card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiEffect.kt
 delete mode 100644 card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiEvent.kt
 delete mode 100644 card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiState.kt
 create mode 100644 core-ui/.gitignore
 create mode 100644 core-ui/build.gradle.kts
 create mode 100644 core-ui/src/androidTest/java/com/backbase/core_ui/ExampleInstrumentedTest.kt
 rename {card-journey/impl/src/main/java/com/backbase/cards_journey/impl => core-ui/src/main/java/com/backbase/core_ui/mvi}/mvi/BaseViewModel.kt (88%)
 create mode 100644 core-ui/src/main/java/com/backbase/core_ui/mvi/mvi/UiEffect.kt
 create mode 100644 core-ui/src/main/java/com/backbase/core_ui/mvi/mvi/UiEvent.kt
 create mode 100644 core-ui/src/main/java/com/backbase/core_ui/mvi/mvi/UiState.kt

diff --git a/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/presentation/accountlist/ui/AccountListFragment.kt b/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/presentation/accountlist/ui/AccountListFragment.kt
index 26d4c006..cae0e1d2 100644
--- a/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/presentation/accountlist/ui/AccountListFragment.kt
+++ b/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/presentation/accountlist/ui/AccountListFragment.kt
@@ -14,7 +14,7 @@ import com.backbase.accounts_journey.R
 import com.backbase.accounts_journey.configuration.AccountsJourneyConfiguration
 import com.backbase.accounts_journey.configuration.accountlist.AccountListScreenConfiguration
 import com.backbase.accounts_journey.databinding.FragmentAccountListBinding
-import com.backbase.accounts_journey.router.CardNavigationAction
+import com.backbase.accounts_journey.router.AccountsRouter
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.koin.android.ext.android.inject
@@ -40,7 +40,7 @@ class AccountListFragment : Fragment() {
     private val accountListAdapter: AccountListAdapter = AccountListAdapter(
         onClick = { itemClicked(it) }
     )
-    private val cardNavigationAction: CardNavigationAction by inject()
+    private val cardNavigationAction: AccountsRouter by inject()
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -78,7 +78,7 @@ class AccountListFragment : Fragment() {
 
         //Remove this button and its action later
         binding.btnCards.setOnClickListener {
-            cardNavigationAction.navigateToCards(findNavController())
+            cardNavigationAction.exit(findNavController())
         }
     }
 
diff --git a/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/router/CardNavigationAction.kt b/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/router/AccountsRouter.kt
similarity index 50%
rename from accounts-journey/src/main/kotlin/com/backbase/accounts_journey/router/CardNavigationAction.kt
rename to accounts-journey/src/main/kotlin/com/backbase/accounts_journey/router/AccountsRouter.kt
index 6d79df81..9d829aca 100644
--- a/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/router/CardNavigationAction.kt
+++ b/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/router/AccountsRouter.kt
@@ -2,7 +2,7 @@ package com.backbase.accounts_journey.router
 
 import androidx.navigation.NavController
 
-interface CardNavigationAction {
+interface AccountsRouter {
 
-    fun navigateToCards(navController: NavController)
+    fun exit(navController: NavController)
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/backbase/golden_sample_app/koin/NavigationModule.kt b/app/src/main/kotlin/com/backbase/golden_sample_app/koin/NavigationModule.kt
index 6c3e67b3..ab41b04c 100644
--- a/app/src/main/kotlin/com/backbase/golden_sample_app/koin/NavigationModule.kt
+++ b/app/src/main/kotlin/com/backbase/golden_sample_app/koin/NavigationModule.kt
@@ -1,24 +1,24 @@
 package com.backbase.golden_sample_app.koin
 
 import androidx.navigation.NavController
-import com.backbase.accounts_journey.router.CardNavigationAction
-import com.backbase.cards_journey.impl.CardExitNavigationAction
+import com.backbase.accounts_journey.router.AccountsRouter
+import com.backbase.cards_journey.impl.CardsRouter
 import com.backbase.golden_sample_app.R
 import com.backbase.golden_sample_app.router.AppRouting
 import org.koin.dsl.module
 
 val navigationModule = module {
-    single<CardNavigationAction> {
-        object : CardNavigationAction {
-            override fun navigateToCards(navController: NavController) {
+    single<AccountsRouter> {
+        object : AccountsRouter {
+            override fun exit(navController: NavController) {
                 navController.navigate(
                     R.id.action_global_cardsJourney,
                 )
             }
         }
     }
-    factory<CardExitNavigationAction> {
-        object : CardExitNavigationAction {
+    factory<CardsRouter> {
+        object : CardsRouter {
             override fun exit() {
                 get<AppRouting>().getNavController()?.popBackStack()
             }
diff --git a/card-journey/impl/build.gradle.kts b/card-journey/impl/build.gradle.kts
index 8212d794..b6e3fd86 100644
--- a/card-journey/impl/build.gradle.kts
+++ b/card-journey/impl/build.gradle.kts
@@ -15,4 +15,5 @@ dependencies {
     implementation(libs.bundles.navigation)
     implementation(backbase.bundles.card.client.common)
     implementation(project(":card-journey:api"))
+    implementation(project(":core-ui"))
 }
\ No newline at end of file
diff --git a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/CardExitNavigationAction.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/CardsRouter.kt
similarity index 60%
rename from card-journey/impl/src/main/java/com/backbase/cards_journey/impl/CardExitNavigationAction.kt
rename to card-journey/impl/src/main/java/com/backbase/cards_journey/impl/CardsRouter.kt
index a043b250..e65ff098 100644
--- a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/CardExitNavigationAction.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/CardsRouter.kt
@@ -1,5 +1,5 @@
 package com.backbase.cards_journey.impl
 
-interface CardExitNavigationAction {
+interface CardsRouter {
     fun exit()
 }
\ No newline at end of file
diff --git a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiEffect.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiEffect.kt
deleted file mode 100644
index 535c0b13..00000000
--- a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiEffect.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.backbase.cards_journey.impl.mvi
-
-open class UiEffect
diff --git a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiEvent.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiEvent.kt
deleted file mode 100644
index 4db1f9e4..00000000
--- a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiEvent.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.backbase.cards_journey.impl.mvi
-
-open class UiEvent
diff --git a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiState.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiState.kt
deleted file mode 100644
index 3eb5bbe2..00000000
--- a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/UiState.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.backbase.cards_journey.impl.mvi
-
-open class UiState
diff --git a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/details/CardDetailsScreenContract.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/details/CardDetailsScreenContract.kt
index e5006639..5b309fa1 100644
--- a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/details/CardDetailsScreenContract.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/details/CardDetailsScreenContract.kt
@@ -1,9 +1,9 @@
 package com.backbase.cards_journey.impl.ui.details
 
 import com.backbase.android.client.cardsclient2.model.CardItem
-import com.backbase.cards_journey.impl.mvi.UiEffect
-import com.backbase.cards_journey.impl.mvi.UiEvent
-import com.backbase.cards_journey.impl.mvi.UiState
+import com.backbase.core_ui.mvi.mvi.UiEffect
+import com.backbase.core_ui.mvi.mvi.UiEvent
+import com.backbase.core_ui.mvi.mvi.UiState
 
 
 data class CardDetailsScreenViewState(
diff --git a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/details/CardDetailsViewModel.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/details/CardDetailsViewModel.kt
index e847a3e6..3318f2b7 100644
--- a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/details/CardDetailsViewModel.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/details/CardDetailsViewModel.kt
@@ -2,7 +2,7 @@ package com.backbase.cards_journey.impl.ui.details
 
 import androidx.lifecycle.viewModelScope
 import com.backbase.api.domain.CustomCardUseCase
-import com.backbase.cards_journey.impl.mvi.BaseViewModel
+import com.backbase.core_ui.mvi.mvi.BaseViewModel
 import kotlinx.coroutines.launch
 
 class CardDetailsViewModel(val cardId: String, private val useCase: CustomCardUseCase) :
diff --git a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListFragment.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListFragment.kt
index 6bbe7293..28826381 100644
--- a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListFragment.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListFragment.kt
@@ -12,7 +12,7 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.fragment.findNavController
 import androidx.viewpager2.widget.ViewPager2
 import com.backbase.android.client.cardsclient2.model.CardItem
-import com.backbase.cards_journey.impl.CardExitNavigationAction
+import com.backbase.cards_journey.impl.CardsRouter
 import com.backbase.cards_journey.impl.databinding.FragmentCardListBinding
 import com.backbase.cards_journey.impl.journeyScopedViewModel
 import kotlinx.coroutines.launch
@@ -22,7 +22,7 @@ import org.koin.android.ext.android.inject
 class CardListFragment : Fragment() {
 
     private val viewModel by journeyScopedViewModel<CardListViewModel>()
-    private val rounter by inject<CardExitNavigationAction>()
+    private val rounter by inject<CardsRouter>()
 
     private var _binding: FragmentCardListBinding? = null
     private val binding get() = _binding!!
diff --git a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListScreenContract.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListScreenContract.kt
index 4d524305..8777d0d8 100644
--- a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListScreenContract.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListScreenContract.kt
@@ -1,15 +1,17 @@
 package com.backbase.cards_journey.impl.ui.list
 
 import com.backbase.android.client.cardsclient2.model.CardItem
-import com.backbase.cards_journey.impl.mvi.UiEvent
+import com.backbase.core_ui.mvi.mvi.UiEffect
+import com.backbase.core_ui.mvi.mvi.UiEvent
+import com.backbase.core_ui.mvi.mvi.UiState
 
 
 data class CardListScreenViewState(
     val isLoading: Boolean,
     val cards: List<CardItem>? = null
-) : com.backbase.cards_journey.impl.mvi.UiState()
+) : UiState()
 
-sealed class CardListScreenEffect : com.backbase.cards_journey.impl.mvi.UiEffect() {
+sealed class CardListScreenEffect : UiEffect() {
     data object HandleErrorResponse : CardListScreenEffect()
 }
 
diff --git a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListViewModel.kt b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListViewModel.kt
index a0c9e5a8..9a8ba6f2 100644
--- a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListViewModel.kt
+++ b/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/ui/list/CardListViewModel.kt
@@ -2,7 +2,7 @@ package com.backbase.cards_journey.impl.ui.list
 
 import androidx.lifecycle.viewModelScope
 import com.backbase.api.domain.CustomCardUseCase
-import com.backbase.cards_journey.impl.mvi.BaseViewModel
+import com.backbase.core_ui.mvi.mvi.BaseViewModel
 import kotlinx.coroutines.launch
 
 class CardListViewModel(private val useCase: CustomCardUseCase) :
diff --git a/core-ui/.gitignore b/core-ui/.gitignore
new file mode 100644
index 00000000..42afabfd
--- /dev/null
+++ b/core-ui/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core-ui/build.gradle.kts b/core-ui/build.gradle.kts
new file mode 100644
index 00000000..6400a21e
--- /dev/null
+++ b/core-ui/build.gradle.kts
@@ -0,0 +1,12 @@
+plugins {
+    id(backbase.plugins.base.android.library.module.get().pluginId)
+    id(backbase.plugins.configured.detekt.get().pluginId)
+}
+
+android {
+    namespace = "com.backbase.core_ui"
+}
+
+dependencies {
+    implementation(libs.bundles.android.core)
+}
diff --git a/core-ui/src/androidTest/java/com/backbase/core_ui/ExampleInstrumentedTest.kt b/core-ui/src/androidTest/java/com/backbase/core_ui/ExampleInstrumentedTest.kt
new file mode 100644
index 00000000..0f4e1794
--- /dev/null
+++ b/core-ui/src/androidTest/java/com/backbase/core_ui/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.backbase.core_ui
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.backbase.core_ui.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/BaseViewModel.kt b/core-ui/src/main/java/com/backbase/core_ui/mvi/mvi/BaseViewModel.kt
similarity index 88%
rename from card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/BaseViewModel.kt
rename to core-ui/src/main/java/com/backbase/core_ui/mvi/mvi/BaseViewModel.kt
index ad69fb89..bbd33660 100644
--- a/card-journey/impl/src/main/java/com/backbase/cards_journey/impl/mvi/BaseViewModel.kt
+++ b/core-ui/src/main/java/com/backbase/core_ui/mvi/mvi/BaseViewModel.kt
@@ -1,4 +1,4 @@
-package com.backbase.cards_journey.impl.mvi
+package com.backbase.core_ui.mvi.mvi
 
 import androidx.annotation.VisibleForTesting
 import androidx.lifecycle.ViewModel
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
 
-abstract class BaseViewModel<State : com.backbase.cards_journey.impl.mvi.UiState, Effect : com.backbase.cards_journey.impl.mvi.UiEffect, Event : UiEvent> : ViewModel() {
+abstract class BaseViewModel<State : UiState, Effect : UiEffect, Event : UiEvent> : ViewModel() {
 
     protected val currentState: State
         get() = _state.value
diff --git a/core-ui/src/main/java/com/backbase/core_ui/mvi/mvi/UiEffect.kt b/core-ui/src/main/java/com/backbase/core_ui/mvi/mvi/UiEffect.kt
new file mode 100644
index 00000000..8cf4d41d
--- /dev/null
+++ b/core-ui/src/main/java/com/backbase/core_ui/mvi/mvi/UiEffect.kt
@@ -0,0 +1,3 @@
+package com.backbase.core_ui.mvi.mvi
+
+open class UiEffect
diff --git a/core-ui/src/main/java/com/backbase/core_ui/mvi/mvi/UiEvent.kt b/core-ui/src/main/java/com/backbase/core_ui/mvi/mvi/UiEvent.kt
new file mode 100644
index 00000000..95fa8e01
--- /dev/null
+++ b/core-ui/src/main/java/com/backbase/core_ui/mvi/mvi/UiEvent.kt
@@ -0,0 +1,3 @@
+package com.backbase.core_ui.mvi.mvi
+
+open class UiEvent
diff --git a/core-ui/src/main/java/com/backbase/core_ui/mvi/mvi/UiState.kt b/core-ui/src/main/java/com/backbase/core_ui/mvi/mvi/UiState.kt
new file mode 100644
index 00000000..c84f8f62
--- /dev/null
+++ b/core-ui/src/main/java/com/backbase/core_ui/mvi/mvi/UiState.kt
@@ -0,0 +1,3 @@
+package com.backbase.core_ui.mvi.mvi
+
+open class UiState
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e0e8178e..16695190 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -29,3 +29,4 @@ include(":accounts-use-case")
 include(":fake-accounts-use-case")
 include(":card-journey:impl")
 include(":card-journey:api")
+include(":core-ui")

From 3786ffd71baf1251afe6ec1762c058837bf1b3c8 Mon Sep 17 00:00:00 2001
From: BhargaviYamanuri <bhargavi@backbase.com>
Date: Tue, 8 Oct 2024 11:43:29 +0530
Subject: [PATCH 12/15] feat:code merge changes

---
 app/build.gradle.kts                                         | 5 ++---
 .../kotlin/com/backbase/golden_sample_app/MainApplication.kt | 1 -
 card-journey/api/build.gradle.kts                            | 1 +
 card-journey/impl/build.gradle.kts                           | 5 +++--
 gradle/backbase.versions.toml                                | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9bd24acc..31569ba2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -66,6 +66,8 @@ android {
 dependencies {
     implementation(projects.accountsJourney)
     implementation(projects.accountsUseCase)
+    implementation(projects.cardJourney.impl)
+    implementation(projects.cardJourney.api)
 
 
     implementation(platform(libs.kotlin.bom))
@@ -85,7 +87,4 @@ dependencies {
     implementation(backbase.bundles.journeys)
     implementation(backbase.bundles.use.cases)
 
-
-    implementation(project(":card-journey:impl"))
-    implementation(project(":card-journey:api"))
 }
diff --git a/app/src/main/kotlin/com/backbase/golden_sample_app/MainApplication.kt b/app/src/main/kotlin/com/backbase/golden_sample_app/MainApplication.kt
index de758335..7bbe80a2 100644
--- a/app/src/main/kotlin/com/backbase/golden_sample_app/MainApplication.kt
+++ b/app/src/main/kotlin/com/backbase/golden_sample_app/MainApplication.kt
@@ -119,7 +119,6 @@ class MainApplication : Application() {
                 WorkspacesJourney.create(),
                 accountsModule,
                 AccountsJourney.create(configuration = setupAccountsJourneyConfiguration()),
-                observabilityModule,
                 cardModule(this@MainApplication),
                 cardsJourneyModule
             )
diff --git a/card-journey/api/build.gradle.kts b/card-journey/api/build.gradle.kts
index 886fb4e2..98c7e127 100644
--- a/card-journey/api/build.gradle.kts
+++ b/card-journey/api/build.gradle.kts
@@ -12,5 +12,6 @@ android {
 dependencies {
 
     // Backbase libraries
+    implementation(backbase.bom)
     implementation(backbase.bundles.card.client.common)
 }
\ No newline at end of file
diff --git a/card-journey/impl/build.gradle.kts b/card-journey/impl/build.gradle.kts
index b6e3fd86..7942e1c8 100644
--- a/card-journey/impl/build.gradle.kts
+++ b/card-journey/impl/build.gradle.kts
@@ -11,9 +11,10 @@ android {
 
 dependencies {
     // Backbase libraries
+    implementation(backbase.bom)
     implementation(backbase.bundles.common)
     implementation(libs.bundles.navigation)
     implementation(backbase.bundles.card.client.common)
-    implementation(project(":card-journey:api"))
-    implementation(project(":core-ui"))
+    implementation(projects.cardJourney.api)
+    implementation(projects.coreUi)
 }
\ No newline at end of file
diff --git a/gradle/backbase.versions.toml b/gradle/backbase.versions.toml
index eb909c55..21acaa5c 100644
--- a/gradle/backbase.versions.toml
+++ b/gradle/backbase.versions.toml
@@ -32,7 +32,7 @@ bom = { module = "com.backbase.android.platform:bom", version.ref = "bom" }
 business-journey-common = { group = "com.backbase.android.business.journey", name = "journey-common", version = "" }
 
 ## C
-clients-common-coroutines = { group = "com.backbase.android.clients", name = "clients-common-coroutines", version.ref = "clients-common-coroutines" }
+clients-common-coroutines = { group = "com.backbase.android.clients", name = "clients-common-coroutines", version = "" }
 cards-client = { group = "com.backbase.android.clients", name = "gen-cards-client-2", version.ref = "cards-client" }
 clients-common = { group = "com.backbase.android.clients", name = "clients-common", version.ref = "clients-common" }
 common-utils = { group = "com.backbase.android.common", name = "common-utils", version.ref = "common-utils" }

From d2846af0ea909043b5ec80a55154ecf11abe7d15 Mon Sep 17 00:00:00 2001
From: Ka Wing <kawing@backbase.com>
Date: Tue, 29 Oct 2024 16:37:06 +0100
Subject: [PATCH 13/15] Update BOM to 2024.09.01-LTS, API Sandbox 2024.09-LTS,
 Android 35

---
 app/src/main/AndroidManifest.xml         | 2 +-
 app/src/main/assets/backbase/config.json | 4 ++--
 buildSrc/src/main/kotlin/Version.kt      | 2 +-
 gradle/backbase.versions.toml            | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 98b3198b..b7354758 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:replace="android:fullBackupContent,android:theme"
-        tools:targetApi="34">
+        tools:targetApi="35">
         <activity
             android:name=".presentation.MainActivity"
             android:exported="true">
diff --git a/app/src/main/assets/backbase/config.json b/app/src/main/assets/backbase/config.json
index e0744b88..80c8f1b2 100644
--- a/app/src/main/assets/backbase/config.json
+++ b/app/src/main/assets/backbase/config.json
@@ -3,12 +3,12 @@
     "debugEnable": true
   },
   "backbase": {
-    "serverURL": "https://app.stg.sdbxaz.azure.backbaseservices.com",
+    "serverURL": "https://app.prd.sdbxaz.azure.backbaseservices.com",
     "localModelPath": "$(contextRoot)/model.json",
     "experience": "",
     "version": "6.1.5",
     "identity": {
-      "baseURL": "https://identity.stg.sdbxaz.azure.backbaseservices.com",
+      "baseURL": "https://identity.prd.sdbxaz.azure.backbaseservices.com",
       "realm": "customer",
       "clientId": "mobile-client",
       "applicationKey": "retail"
diff --git a/buildSrc/src/main/kotlin/Version.kt b/buildSrc/src/main/kotlin/Version.kt
index aed2fae2..eadca0e8 100644
--- a/buildSrc/src/main/kotlin/Version.kt
+++ b/buildSrc/src/main/kotlin/Version.kt
@@ -1,5 +1,5 @@
 object Version {
-    const val compileSdk = 34
+    const val compileSdk = 35
     const val minSdk = 26
     const val versionCode = 1
     const val versionName = "1.0.0"
diff --git a/gradle/backbase.versions.toml b/gradle/backbase.versions.toml
index 9c4c5352..72f07939 100644
--- a/gradle/backbase.versions.toml
+++ b/gradle/backbase.versions.toml
@@ -1,10 +1,10 @@
 [versions]
 ## A
 access-control-client-2-entitlements-use-case = "6.0.0"
-authentication-journey = "7.1.0"
+authentication-journey = "7.2.0"
 
 ## B
-bom = "2024.07.01"
+bom = "2024.09.01"
 
 ## F
 feature-filter-use-case = "6.0.0"

From de06c0a64556b9870d46af6a625b3c0f5c4dd16d Mon Sep 17 00:00:00 2001
From: Ka Wing <kawing@backbase.com>
Date: Tue, 29 Oct 2024 17:25:06 +0100
Subject: [PATCH 14/15] update catalog

ran detekt
---
 CATALOG.md                                            | 11 +++++++++--
 .../golden_sample_app/presentation/MainActivity.kt    |  1 -
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CATALOG.md b/CATALOG.md
index 632992e7..70f6cdc4 100644
--- a/CATALOG.md
+++ b/CATALOG.md
@@ -17,19 +17,26 @@ The minimal sample that includes all the required Backbase SDKs to get started t
 \
 LTS 24.03
 
+## [sample/devs/extending-a-journey](https://github.com/Backbase/golden-sample-app-android/tree/sample/devs/extending-a-journey)
+This example explains how to extend a journey.
+\
+**Status**: Maintained
+\
+LTS 24.09
+
 ## [sample/devs/O11Y](https://github.com/Backbase/golden-sample-app-android/tree/sample/devs/O11Y)
 An implementation of Backbase Observability that makes it easy to add 3rd party tracking libraries to your project.
 \
 **Status**: Maintained
 \
-LTS 24.03
+LTS 24.09
 
 ## [sample/devs/open-telemetry](https://github.com/Backbase/golden-sample-app-android/tree/sample/devs/open-telemetry)
 An implementation of Backbase OpenTelemetry Connector to track screen views and user actions.
 \
 **Status**: Maintained
 \
-LTS 24.03
+LTS 24.09
 
 ## [sample/devs/multi-theming](https://github.com/Backbase/golden-sample-app-android/tree/sample/devs/multi-theming)
 This example explains how to use multiple themes in an application.
diff --git a/app/src/main/kotlin/com/backbase/golden_sample_app/presentation/MainActivity.kt b/app/src/main/kotlin/com/backbase/golden_sample_app/presentation/MainActivity.kt
index f4be237f..da443091 100644
--- a/app/src/main/kotlin/com/backbase/golden_sample_app/presentation/MainActivity.kt
+++ b/app/src/main/kotlin/com/backbase/golden_sample_app/presentation/MainActivity.kt
@@ -16,7 +16,6 @@ import com.backbase.golden_sample_app.R
 import com.backbase.golden_sample_app.databinding.ActivityMainBinding
 import com.backbase.golden_sample_app.menu.moreMenuModule
 import com.backbase.golden_sample_app.presentation.bottom.setupBottomBar
-import com.backbase.golden_sample_app.presentation.header.updateStatusBarColor
 import com.backbase.golden_sample_app.router.AppRouting
 import com.backbase.golden_sample_app.session.sessionModule
 import kotlinx.coroutines.flow.map

From 54ed3da10a2a06a43007b71679e8f30c690234d0 Mon Sep 17 00:00:00 2001
From: Ka Wing <kawing@backbase.com>
Date: Tue, 19 Nov 2024 13:55:19 +0100
Subject: [PATCH 15/15] Fixed edge to edge on Accounts details.

---
 .../accountdetail/ui/AccountDetailFragment.kt |  4 ++-
 .../presentation/utils/UiUtils.kt             | 25 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 accounts-journey/src/main/kotlin/com/backbase/accounts_journey/presentation/utils/UiUtils.kt

diff --git a/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/presentation/accountdetail/ui/AccountDetailFragment.kt b/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/presentation/accountdetail/ui/AccountDetailFragment.kt
index f986024c..fab2e6c0 100644
--- a/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/presentation/accountdetail/ui/AccountDetailFragment.kt
+++ b/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/presentation/accountdetail/ui/AccountDetailFragment.kt
@@ -10,8 +10,8 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
-import com.backbase.accounts_journey.R
 import com.backbase.accounts_journey.databinding.FragmentAccountDetailBinding
+import com.backbase.accounts_journey.presentation.utils.UiUtils
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.koin.android.ext.android.inject
@@ -37,6 +37,8 @@ class AccountDetailFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         _binding = FragmentAccountDetailBinding.inflate(inflater, container, false)
+        UiUtils.applyWindowInsets(binding.contentMain)
+        UiUtils.applyWindowInsets(binding.toolbar)
         return binding.root
     }
 
diff --git a/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/presentation/utils/UiUtils.kt b/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/presentation/utils/UiUtils.kt
new file mode 100644
index 00000000..6c5ecfa1
--- /dev/null
+++ b/accounts-journey/src/main/kotlin/com/backbase/accounts_journey/presentation/utils/UiUtils.kt
@@ -0,0 +1,25 @@
+package com.backbase.accounts_journey.presentation.utils
+
+import android.view.View
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
+
+object UiUtils {
+
+    fun applyWindowInsets(view: View,) {
+        ViewCompat.setOnApplyWindowInsetsListener(view) { v, insets ->
+            val bars = insets.getInsets(
+                WindowInsetsCompat.Type.systemBars()
+                    or WindowInsetsCompat.Type.displayCutout()
+            )
+            v.updatePadding(
+                left = bars.left,
+                top = bars.top,
+                right = bars.right,
+                bottom = bars.bottom,
+            )
+            WindowInsetsCompat.CONSUMED
+        }
+    }
+}