From 140b6beac30f2858e3973b162687cb131df96570 Mon Sep 17 00:00:00 2001
From: Kaushik Gupta <146950347+Kaushikgupta469@users.noreply.github.com>
Date: Mon, 3 Nov 2025 23:26:12 +0530
Subject: [PATCH] INJIMOB-3471: Renamed SampleAppVCIclient to
 SampleCredentialWallet and updated all package references (#2115)

Signed-off-by: Kaushik Gupta <kausgpt97@gmail.com>
---
 .../app/src/main/res/values/themes.xml        |   5 ----
 .../SampleCredentialWallet}/.gitignore        |   0
 .../.kotlin/errors/errors-1759144131490.log   |   0
 .../SampleCredentialWallet}/app/.gitignore    |   0
 .../app/build.gradle.kts                      |   4 ++--
 .../app/proguard-rules.pro                    |   0
 .../ExampleInstrumentedTest.kt                |   4 ++--
 .../app/src/main/AndroidManifest.xml          |   6 ++---
 .../samplecredentialwallet}/MainActivity.kt   |   8 +++----
 .../navigation/AppNavHost.kt                  |  18 +++++++-------
 .../ui/auth/AuthWebViewScreen.kt              |   6 ++---
 .../ui/credential/CredentialDownloadScreen.kt |  22 +++++++++---------
 .../ui/credential/CredentialListScreen.kt     |  10 ++++----
 .../ui/home/HomeScreen.kt                     |  10 ++++----
 .../ui/issuer/IssuerDetailScreen.kt           |   4 ++--
 .../ui/issuer/IssuerListScreen.kt             |   4 ++--
 .../ui/splash/SplashScreen.kt                 |   2 +-
 .../samplecredentialwallet}/ui/theme/Color.kt |   2 +-
 .../samplecredentialwallet}/ui/theme/Theme.kt |   4 ++--
 .../samplecredentialwallet}/ui/theme/Type.kt  |   2 +-
 .../utils/AuthCodeHolder.kt                   |   2 +-
 .../utils/Constants.kt                        |   2 +-
 .../utils/CredentialStore.kt                  |   7 ++++--
 .../utils/CredentialVerifier.kt               |   2 +-
 .../utils/PixelPassModule.kt                  |   2 +-
 .../utils/SecureKeyStoreManager.kt            |   2 +-
 .../viewmodel/CredentialViewModel.kt          |   4 ++--
 .../main/res/drawable/agro_vertias_logo.png   | Bin
 .../res/drawable/ic_launcher_background.xml   |   0
 .../res/drawable/ic_launcher_foreground.xml   |   0
 .../main/res/drawable/stay_protected_logo.png | Bin
 .../app/src/main/res/drawable/tan_logo.png    | Bin
 .../src/main/res/drawable/veridonia_logo.png  | Bin
 .../app/src/main/res/layout/activity_main.xml |   0
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   0
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   0
 .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin
 .../res/mipmap-hdpi/ic_launcher_round.webp    | Bin
 .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin
 .../res/mipmap-mdpi/ic_launcher_round.webp    | Bin
 .../main/res/mipmap-xhdpi/ic_launcher.webp    | Bin
 .../res/mipmap-xhdpi/ic_launcher_round.webp   | Bin
 .../main/res/mipmap-xxhdpi/ic_launcher.webp   | Bin
 .../res/mipmap-xxhdpi/ic_launcher_round.webp  | Bin
 .../main/res/mipmap-xxxhdpi/ic_launcher.webp  | Bin
 .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin
 .../app/src/main/res/values/colors.xml        |   0
 .../app/src/main/res/values/strings.xml       |   0
 .../app/src/main/res/values/themes.xml        |   5 ++++
 .../app/src/main/res/xml/backup_rules.xml     |   0
 .../main/res/xml/data_extraction_rules.xml    |   0
 .../ExampleUnitTest.kt                        |   2 +-
 .../SampleCredentialWallet}/build.gradle.kts  |   0
 .../SampleCredentialWallet}/gradle.properties |   0
 .../gradle/libs.versions.toml                 |   0
 .../gradle/wrapper/gradle-wrapper.jar         | Bin
 .../gradle/wrapper/gradle-wrapper.properties  |   0
 .../SampleCredentialWallet}/gradlew           |   0
 .../SampleCredentialWallet}/gradlew.bat       |   0
 .../settings.gradle.kts                       |   2 +-
 60 files changed, 72 insertions(+), 69 deletions(-)
 delete mode 100644 SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/values/themes.xml
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/.gitignore (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/.kotlin/errors/errors-1759144131490.log (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/.gitignore (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/build.gradle.kts (97%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/proguard-rules.pro (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient/app/src/androidTest/java/com/example/sampleappvciclient => SampleCredentialWallet/SampleCredentialWallet/app/src/androidTest/java/com/example/samplecredentialwallet}/ExampleInstrumentedTest.kt (81%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/AndroidManifest.xml (91%)
 rename {SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient => SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet}/MainActivity.kt (92%)
 rename {SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient => SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet}/navigation/AppNavHost.kt (90%)
 rename {SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient => SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet}/ui/auth/AuthWebViewScreen.kt (97%)
 rename {SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient => SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet}/ui/credential/CredentialDownloadScreen.kt (97%)
 rename {SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient => SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet}/ui/credential/CredentialListScreen.kt (97%)
 rename {SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient => SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet}/ui/home/HomeScreen.kt (97%)
 rename {SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient => SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet}/ui/issuer/IssuerDetailScreen.kt (91%)
 rename {SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient => SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet}/ui/issuer/IssuerListScreen.kt (98%)
 rename {SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient => SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet}/ui/splash/SplashScreen.kt (95%)
 rename {SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient => SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet}/ui/theme/Color.kt (94%)
 rename {SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient => SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet}/ui/theme/Theme.kt (96%)
 rename {SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient => SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet}/ui/theme/Type.kt (94%)
 rename {SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient => SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet}/utils/AuthCodeHolder.kt (96%)
 rename {SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient => SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet}/utils/Constants.kt (81%)
 rename {SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient => SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet}/utils/CredentialStore.kt (51%)
 rename {SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient => SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet}/utils/CredentialVerifier.kt (98%)
 rename {SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient => SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet}/utils/PixelPassModule.kt (90%)
 rename {SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient => SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet}/utils/SecureKeyStoreManager.kt (99%)
 rename {SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient => SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet}/viewmodel/CredentialViewModel.kt (87%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/drawable/agro_vertias_logo.png (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/drawable/ic_launcher_background.xml (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/drawable/ic_launcher_foreground.xml (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/drawable/stay_protected_logo.png (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/drawable/tan_logo.png (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/drawable/veridonia_logo.png (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/layout/activity_main.xml (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/mipmap-hdpi/ic_launcher.webp (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/mipmap-mdpi/ic_launcher.webp (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/mipmap-xhdpi/ic_launcher.webp (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/values/colors.xml (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/values/strings.xml (100%)
 create mode 100644 SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/values/themes.xml
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/xml/backup_rules.xml (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/app/src/main/res/xml/data_extraction_rules.xml (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient/app/src/test/java/com/example/sampleappvciclient => SampleCredentialWallet/SampleCredentialWallet/app/src/test/java/com/example/samplecredentialwallet}/ExampleUnitTest.kt (87%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/build.gradle.kts (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/gradle.properties (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/gradle/libs.versions.toml (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/gradle/wrapper/gradle-wrapper.jar (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/gradle/wrapper/gradle-wrapper.properties (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/gradlew (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/gradlew.bat (100%)
 rename {SampleAppVCIclient/SampleAppVCIClient => SampleCredentialWallet/SampleCredentialWallet}/settings.gradle.kts (93%)

diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/values/themes.xml b/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/values/themes.xml
deleted file mode 100644
index 34d2db72..00000000
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/values/themes.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Theme.SampleAppVCIClient" parent="android:Theme.Material.Light.NoActionBar" />
-</resources>
\ No newline at end of file
diff --git a/SampleAppVCIclient/SampleAppVCIClient/.gitignore b/SampleCredentialWallet/SampleCredentialWallet/.gitignore
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/.gitignore
rename to SampleCredentialWallet/SampleCredentialWallet/.gitignore
diff --git a/SampleAppVCIclient/SampleAppVCIClient/.kotlin/errors/errors-1759144131490.log b/SampleCredentialWallet/SampleCredentialWallet/.kotlin/errors/errors-1759144131490.log
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/.kotlin/errors/errors-1759144131490.log
rename to SampleCredentialWallet/SampleCredentialWallet/.kotlin/errors/errors-1759144131490.log
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/.gitignore b/SampleCredentialWallet/SampleCredentialWallet/app/.gitignore
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/.gitignore
rename to SampleCredentialWallet/SampleCredentialWallet/app/.gitignore
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/build.gradle.kts b/SampleCredentialWallet/SampleCredentialWallet/app/build.gradle.kts
similarity index 97%
rename from SampleAppVCIclient/SampleAppVCIClient/app/build.gradle.kts
rename to SampleCredentialWallet/SampleCredentialWallet/app/build.gradle.kts
index 0e4f6ccd..87249a11 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/build.gradle.kts
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/build.gradle.kts
@@ -5,11 +5,11 @@ plugins {
 }
 
 android {
-    namespace = "com.example.sampleappvciclient"
+    namespace = "com.example.samplecredentialwallet"
     compileSdk = 35
 
     defaultConfig {
-        applicationId = "com.example.sampleappvciclient"
+        applicationId = "com.example.samplecredentialwallet"
         minSdk = 26
         targetSdk = 35
         versionCode = 1
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/proguard-rules.pro b/SampleCredentialWallet/SampleCredentialWallet/app/proguard-rules.pro
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/proguard-rules.pro
rename to SampleCredentialWallet/SampleCredentialWallet/app/proguard-rules.pro
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/androidTest/java/com/example/sampleappvciclient/ExampleInstrumentedTest.kt b/SampleCredentialWallet/SampleCredentialWallet/app/src/androidTest/java/com/example/samplecredentialwallet/ExampleInstrumentedTest.kt
similarity index 81%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/androidTest/java/com/example/sampleappvciclient/ExampleInstrumentedTest.kt
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/androidTest/java/com/example/samplecredentialwallet/ExampleInstrumentedTest.kt
index 01b06398..68d5243f 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/androidTest/java/com/example/sampleappvciclient/ExampleInstrumentedTest.kt
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/androidTest/java/com/example/samplecredentialwallet/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.example.sampleappvciclient
+package com.example.samplecredentialwallet
 
 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.example.sampleappvciclient", appContext.packageName)
+        assertEquals("com.example.samplecredentialwallet", appContext.packageName)
     }
 }
\ No newline at end of file
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/AndroidManifest.xml b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/AndroidManifest.xml
similarity index 91%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/AndroidManifest.xml
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/AndroidManifest.xml
index d820fbe3..02c3bf58 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/AndroidManifest.xml
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/AndroidManifest.xml
@@ -22,14 +22,14 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.SampleAppVCIClient"
+        android:theme="@style/Theme.SampleCredentialWallet"
         tools:targetApi="31">
 
         <activity
-            android:name="com.example.sampleappvciclient.MainActivity"
+            android:name="com.example.samplecredentialwallet.MainActivity"
             android:exported="true"
             android:label="@string/app_name"
-            android:theme="@style/Theme.SampleAppVCIClient"
+            android:theme="@style/Theme.SampleCredentialWallet"
             android:launchMode="singleTop">
 
             <!-- Launcher -->
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/MainActivity.kt b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/MainActivity.kt
similarity index 92%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/MainActivity.kt
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/MainActivity.kt
index 557e919b..52c7c83b 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/MainActivity.kt
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.example.sampleappvciclient
+package com.example.samplecredentialwallet
 
 import android.content.Intent
 import android.net.Uri
@@ -11,9 +11,9 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
-import com.example.sampleappvciclient.navigation.AppNavHost
-import com.example.sampleappvciclient.utils.SecureKeystoreManager
-import com.example.sampleappvciclient.utils.AuthCodeHolder
+import com.example.samplecredentialwallet.navigation.AppNavHost
+import com.example.samplecredentialwallet.utils.SecureKeystoreManager
+import com.example.samplecredentialwallet.utils.AuthCodeHolder
 import kotlinx.coroutines.launch
 
 class MainActivity : ComponentActivity() {
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/navigation/AppNavHost.kt b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/navigation/AppNavHost.kt
similarity index 90%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/navigation/AppNavHost.kt
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/navigation/AppNavHost.kt
index 04e31f54..a2de75f8 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/navigation/AppNavHost.kt
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/navigation/AppNavHost.kt
@@ -1,4 +1,4 @@
-package com.example.sampleappvciclient.navigation
+package com.example.samplecredentialwallet.navigation
 
 import android.net.Uri
 import android.util.Log
@@ -7,14 +7,14 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.navArgument
-import com.example.sampleappvciclient.ui.credential.CredentialDownloadScreen
-import com.example.sampleappvciclient.ui.credential.CredentialListScreen
-import com.example.sampleappvciclient.ui.home.HomeScreen
-import com.example.sampleappvciclient.ui.issuer.IssuerListScreen
-import com.example.sampleappvciclient.ui.issuer.IssuerDetailScreen
-import com.example.sampleappvciclient.ui.auth.AuthWebViewScreen
-import com.example.sampleappvciclient.ui.splash.SplashScreen
-import com.example.sampleappvciclient.utils.Constants
+import com.example.samplecredentialwallet.ui.credential.CredentialDownloadScreen
+import com.example.samplecredentialwallet.ui.credential.CredentialListScreen
+import com.example.samplecredentialwallet.ui.home.HomeScreen
+import com.example.samplecredentialwallet.ui.issuer.IssuerListScreen
+import com.example.samplecredentialwallet.ui.issuer.IssuerDetailScreen
+import com.example.samplecredentialwallet.ui.auth.AuthWebViewScreen
+import com.example.samplecredentialwallet.ui.splash.SplashScreen
+import com.example.samplecredentialwallet.utils.Constants
 
 sealed class Screen(val route: String) {
     object Splash : Screen("splash")
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/auth/AuthWebViewScreen.kt b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/auth/AuthWebViewScreen.kt
similarity index 97%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/auth/AuthWebViewScreen.kt
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/auth/AuthWebViewScreen.kt
index 140bb17f..4949f18d 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/auth/AuthWebViewScreen.kt
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/auth/AuthWebViewScreen.kt
@@ -1,4 +1,4 @@
-package com.example.sampleappvciclient.ui.auth
+package com.example.samplecredentialwallet.ui.auth
 
 import android.annotation.SuppressLint
 import android.graphics.Bitmap
@@ -17,8 +17,8 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.navigation.NavController
-import com.example.sampleappvciclient.navigation.Screen
-import com.example.sampleappvciclient.utils.AuthCodeHolder
+import com.example.samplecredentialwallet.navigation.Screen
+import com.example.samplecredentialwallet.utils.AuthCodeHolder
 
 @SuppressLint("SetJavaScriptEnabled")
 @Composable
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/credential/CredentialDownloadScreen.kt b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/credential/CredentialDownloadScreen.kt
similarity index 97%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/credential/CredentialDownloadScreen.kt
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/credential/CredentialDownloadScreen.kt
index a43ddfa7..eef7f302 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/credential/CredentialDownloadScreen.kt
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/credential/CredentialDownloadScreen.kt
@@ -1,4 +1,4 @@
-package com.example.sampleappvciclient.ui.credential
+package com.example.samplecredentialwallet.ui.credential
 
 import android.util.Log
 import androidx.compose.foundation.background
@@ -17,12 +17,12 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
-import com.example.sampleappvciclient.navigation.Screen
-import com.example.sampleappvciclient.utils.AuthCodeHolder
-import com.example.sampleappvciclient.utils.Constants
-import com.example.sampleappvciclient.utils.CredentialStore
-import com.example.sampleappvciclient.utils.CredentialVerifier
-import com.example.sampleappvciclient.utils.SecureKeystoreManager
+import com.example.samplecredentialwallet.navigation.Screen
+import com.example.samplecredentialwallet.utils.AuthCodeHolder
+import com.example.samplecredentialwallet.utils.Constants
+import com.example.samplecredentialwallet.utils.CredentialStore
+import com.example.samplecredentialwallet.utils.CredentialVerifier
+import com.example.samplecredentialwallet.utils.SecureKeystoreManager
 import com.nimbusds.jose.JOSEObjectType
 import com.nimbusds.jose.JWSAlgorithm
 import com.nimbusds.jose.JWSHeader
@@ -121,7 +121,7 @@ fun CredentialDownloadScreen(
                                 loadingMessage.value = "Starting credential download..."
                             }
 
-                        withTimeout(30000L) { 
+                        withTimeout(600000L) { 
                             
                             val credential = client.requestCredentialFromTrustedIssuer(
                                 credentialIssuer = Constants.credentialIssuerHost.toString(),
@@ -324,7 +324,7 @@ fun CredentialDownloadScreen(
             modifier = Modifier.fillMaxWidth(),
             enabled = !isLoading.value,
             colors = ButtonDefaults.buttonColors(
-                containerColor = com.example.sampleappvciclient.ui.theme.InjiOrange
+                containerColor = com.example.samplecredentialwallet.ui.theme.InjiOrange
             )
         ) {
             if (isLoading.value) {
@@ -360,7 +360,7 @@ fun CredentialDownloadScreen(
                     ) {
                         CircularProgressIndicator(
                             modifier = Modifier.size(48.dp),
-                            color = com.example.sampleappvciclient.ui.theme.InjiOrange
+                            color = com.example.samplecredentialwallet.ui.theme.InjiOrange
                         )
                         Spacer(modifier = Modifier.height(16.dp))
                         Text(
@@ -444,7 +444,7 @@ fun CredentialDownloadScreen(
                             },
                             modifier = Modifier.fillMaxWidth(),
                             colors = ButtonDefaults.buttonColors(
-                                containerColor = com.example.sampleappvciclient.ui.theme.InjiOrange
+                                containerColor = com.example.samplecredentialwallet.ui.theme.InjiOrange
                             )
                         ) {
                             Text("Try again", fontSize = 16.sp)
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/credential/CredentialListScreen.kt b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/credential/CredentialListScreen.kt
similarity index 97%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/credential/CredentialListScreen.kt
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/credential/CredentialListScreen.kt
index 48749d1b..1ebed2d7 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/credential/CredentialListScreen.kt
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/credential/CredentialListScreen.kt
@@ -1,4 +1,4 @@
-package com.example.sampleappvciclient.ui.credential
+package com.example.samplecredentialwallet.ui.credential
 
 import android.graphics.BitmapFactory
 import android.util.Base64
@@ -22,7 +22,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
-import com.example.sampleappvciclient.utils.CredentialStore
+import com.example.samplecredentialwallet.utils.CredentialStore
 import org.json.JSONArray
 import org.json.JSONObject
 
@@ -139,7 +139,7 @@ fun CredentialCard(
             modifier = Modifier
                 .fillMaxWidth(),
             colors = CardDefaults.cardColors(
-                containerColor = com.example.sampleappvciclient.ui.theme.CardBlue
+                containerColor = com.example.samplecredentialwallet.ui.theme.CardBlue
             ),
             elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
         ) {
@@ -233,7 +233,7 @@ fun CredentialCard(
                 onClick = { /* Handle activation */ },
                 modifier = Modifier.fillMaxWidth(),
                 colors = ButtonDefaults.buttonColors(
-                    containerColor = com.example.sampleappvciclient.ui.theme.InjiOrange
+                    containerColor = com.example.samplecredentialwallet.ui.theme.InjiOrange
                 )
             ) {
                 Text("Activate", fontSize = 16.sp)
@@ -248,7 +248,7 @@ fun CredentialCard(
             onClick = { showRaw = !showRaw },
             modifier = Modifier.fillMaxWidth(),
             colors = ButtonDefaults.outlinedButtonColors(
-                contentColor = com.example.sampleappvciclient.ui.theme.InjiPurple
+                contentColor = com.example.samplecredentialwallet.ui.theme.InjiPurple
             )
         ) {
             Icon(
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/home/HomeScreen.kt b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/home/HomeScreen.kt
similarity index 97%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/home/HomeScreen.kt
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/home/HomeScreen.kt
index b91c86b6..5f7f52c7 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/home/HomeScreen.kt
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/home/HomeScreen.kt
@@ -1,4 +1,4 @@
-package com.example.sampleappvciclient.ui.home
+package com.example.samplecredentialwallet.ui.home
 
 import android.graphics.BitmapFactory
 import android.util.Base64
@@ -27,10 +27,10 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.example.sampleappvciclient.R
-import com.example.sampleappvciclient.ui.theme.CardBlue
-import com.example.sampleappvciclient.ui.theme.InjiOrange
-import com.example.sampleappvciclient.utils.CredentialStore
+import com.example.samplecredentialwallet.R
+import com.example.samplecredentialwallet.ui.theme.CardBlue
+import com.example.samplecredentialwallet.ui.theme.InjiOrange
+import com.example.samplecredentialwallet.utils.CredentialStore
 import org.json.JSONArray
 import org.json.JSONObject
 
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/issuer/IssuerDetailScreen.kt b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/issuer/IssuerDetailScreen.kt
similarity index 91%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/issuer/IssuerDetailScreen.kt
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/issuer/IssuerDetailScreen.kt
index d8b47f68..36f45092 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/issuer/IssuerDetailScreen.kt
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/issuer/IssuerDetailScreen.kt
@@ -1,4 +1,4 @@
-package com.example.sampleappvciclient.ui.issuer
+package com.example.samplecredentialwallet.ui.issuer
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material3.*
@@ -7,7 +7,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
-import com.example.sampleappvciclient.viewmodel.CredentialViewModel
+import com.example.samplecredentialwallet.viewmodel.CredentialViewModel
 
 @Composable
 fun IssuerDetailScreen(
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/issuer/IssuerListScreen.kt b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/issuer/IssuerListScreen.kt
similarity index 98%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/issuer/IssuerListScreen.kt
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/issuer/IssuerListScreen.kt
index d4f8a7d3..aaa76268 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/issuer/IssuerListScreen.kt
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/issuer/IssuerListScreen.kt
@@ -1,4 +1,4 @@
-package com.example.sampleappvciclient.ui.issuer
+package com.example.samplecredentialwallet.ui.issuer
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
@@ -22,7 +22,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.example.sampleappvciclient.R
+import com.example.samplecredentialwallet.R
 
 data class Issuer(
     val id: String,
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/splash/SplashScreen.kt b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/splash/SplashScreen.kt
similarity index 95%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/splash/SplashScreen.kt
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/splash/SplashScreen.kt
index 37b226e7..af92cead 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/splash/SplashScreen.kt
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/splash/SplashScreen.kt
@@ -1,4 +1,4 @@
-package com.example.sampleappvciclient.ui.splash
+package com.example.samplecredentialwallet.ui.splash
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/theme/Color.kt b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/theme/Color.kt
similarity index 94%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/theme/Color.kt
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/theme/Color.kt
index fbc07e09..9b23300b 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/theme/Color.kt
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/theme/Color.kt
@@ -1,4 +1,4 @@
-package com.example.sampleappvciclient.ui.theme
+package com.example.samplecredentialwallet.ui.theme
 
 import androidx.compose.ui.graphics.Color
 
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/theme/Theme.kt b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/theme/Theme.kt
similarity index 96%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/theme/Theme.kt
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/theme/Theme.kt
index 157ffa23..ce6ebb02 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/theme/Theme.kt
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/theme/Theme.kt
@@ -1,4 +1,4 @@
-package com.example.sampleappvciclient.ui.theme
+package com.example.samplecredentialwallet.ui.theme
 
 import android.app.Activity
 import android.os.Build
@@ -43,7 +43,7 @@ private val LightColorScheme = lightColorScheme(
 )
 
 @Composable
-fun SampleAppVCIClientTheme(
+fun SampleCredentialWalletTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
     dynamicColor: Boolean = false,
     content: @Composable () -> Unit
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/theme/Type.kt b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/theme/Type.kt
similarity index 94%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/theme/Type.kt
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/theme/Type.kt
index 43fcbd7e..fcf6523d 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/ui/theme/Type.kt
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/ui/theme/Type.kt
@@ -1,4 +1,4 @@
-package com.example.sampleappvciclient.ui.theme
+package com.example.samplecredentialwallet.ui.theme
 
 import androidx.compose.material3.Typography
 import androidx.compose.ui.text.TextStyle
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/utils/AuthCodeHolder.kt b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/utils/AuthCodeHolder.kt
similarity index 96%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/utils/AuthCodeHolder.kt
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/utils/AuthCodeHolder.kt
index 2d17d1b9..62d4ea3d 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/utils/AuthCodeHolder.kt
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/utils/AuthCodeHolder.kt
@@ -1,4 +1,4 @@
-package com.example.sampleappvciclient.utils
+package com.example.samplecredentialwallet.utils
 
 import android.util.Log
 import kotlinx.coroutines.CompletableDeferred
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/utils/Constants.kt b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/utils/Constants.kt
similarity index 81%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/utils/Constants.kt
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/utils/Constants.kt
index 415714ed..771d8c10 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/utils/Constants.kt
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/utils/Constants.kt
@@ -1,4 +1,4 @@
-package com.example.sampleappvciclient.utils
+package com.example.samplecredentialwallet.utils
 
 object Constants {
     var credentialIssuerHost: String? = null
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/utils/CredentialStore.kt b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/utils/CredentialStore.kt
similarity index 51%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/utils/CredentialStore.kt
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/utils/CredentialStore.kt
index bebd9445..8ea68a15 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/utils/CredentialStore.kt
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/utils/CredentialStore.kt
@@ -1,7 +1,10 @@
-package com.example.sampleappvciclient.utils
+package com.example.samplecredentialwallet.utils
+
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.snapshots.SnapshotStateList
 
 object CredentialStore {
-    private val credentials = mutableListOf<String>()
+    val credentials: SnapshotStateList<String> = mutableStateListOf()
 
     fun addCredential(credentialJson: String) {
         credentials.add(credentialJson)
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/utils/CredentialVerifier.kt b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/utils/CredentialVerifier.kt
similarity index 98%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/utils/CredentialVerifier.kt
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/utils/CredentialVerifier.kt
index 5f8aab8a..2623c919 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/utils/CredentialVerifier.kt
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/utils/CredentialVerifier.kt
@@ -1,4 +1,4 @@
-package  com.example.sampleappvciclient.utils
+package  com.example.samplecredentialwallet.utils
 
 import android.util.Log
 import io.mosip.vercred.vcverifier.CredentialsVerifier
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/utils/PixelPassModule.kt b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/utils/PixelPassModule.kt
similarity index 90%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/utils/PixelPassModule.kt
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/utils/PixelPassModule.kt
index 32d6d766..7215333e 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/utils/PixelPassModule.kt
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/utils/PixelPassModule.kt
@@ -1,4 +1,4 @@
-package com.example.sampleappvciclient.utils
+package com.example.samplecredentialwallet.utils
 
 
 import io.mosip.pixelpass.PixelPass
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/utils/SecureKeyStoreManager.kt b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/utils/SecureKeyStoreManager.kt
similarity index 99%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/utils/SecureKeyStoreManager.kt
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/utils/SecureKeyStoreManager.kt
index 83b527e5..7bb85d7f 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/utils/SecureKeyStoreManager.kt
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/utils/SecureKeyStoreManager.kt
@@ -1,4 +1,4 @@
-package com.example.sampleappvciclient.utils
+package com.example.samplecredentialwallet.utils
 
 
 import android.content.Context
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/viewmodel/CredentialViewModel.kt b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/viewmodel/CredentialViewModel.kt
similarity index 87%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/viewmodel/CredentialViewModel.kt
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/viewmodel/CredentialViewModel.kt
index b27cf24e..ef787329 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/java/com/example/sampleappvciclient/viewmodel/CredentialViewModel.kt
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/java/com/example/samplecredentialwallet/viewmodel/CredentialViewModel.kt
@@ -1,7 +1,7 @@
-package com.example.sampleappvciclient.viewmodel
+package com.example.samplecredentialwallet.viewmodel
 
 import androidx.lifecycle.ViewModel
-import com.example.sampleappvciclient.utils.Constants
+import com.example.samplecredentialwallet.utils.Constants
 
 class CredentialViewModel : ViewModel() {
 
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/drawable/agro_vertias_logo.png b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/drawable/agro_vertias_logo.png
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/drawable/agro_vertias_logo.png
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/drawable/agro_vertias_logo.png
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/drawable/ic_launcher_background.xml b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/drawable/ic_launcher_background.xml
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/drawable/ic_launcher_foreground.xml b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/drawable/ic_launcher_foreground.xml
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/drawable/stay_protected_logo.png b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/drawable/stay_protected_logo.png
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/drawable/stay_protected_logo.png
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/drawable/stay_protected_logo.png
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/drawable/tan_logo.png b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/drawable/tan_logo.png
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/drawable/tan_logo.png
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/drawable/tan_logo.png
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/drawable/veridonia_logo.png b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/drawable/veridonia_logo.png
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/drawable/veridonia_logo.png
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/drawable/veridonia_logo.png
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/layout/activity_main.xml b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/layout/activity_main.xml
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/layout/activity_main.xml
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/layout/activity_main.xml
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-hdpi/ic_launcher.webp
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-hdpi/ic_launcher.webp
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-hdpi/ic_launcher.webp
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-mdpi/ic_launcher.webp
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-mdpi/ic_launcher.webp
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-mdpi/ic_launcher.webp
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/values/colors.xml b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/values/colors.xml
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/values/colors.xml
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/values/colors.xml
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/values/strings.xml b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/values/strings.xml
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/values/strings.xml
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/values/strings.xml
diff --git a/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/values/themes.xml b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/values/themes.xml
new file mode 100644
index 00000000..4d2a5e9a
--- /dev/null
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/values/themes.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.SampleCredentialWallet" parent="android:Theme.Material.Light.NoActionBar" />
+</resources>
\ No newline at end of file
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/xml/backup_rules.xml b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/xml/backup_rules.xml
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/xml/backup_rules.xml
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/xml/backup_rules.xml
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/xml/data_extraction_rules.xml b/SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/xml/data_extraction_rules.xml
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/main/res/xml/data_extraction_rules.xml
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/main/res/xml/data_extraction_rules.xml
diff --git a/SampleAppVCIclient/SampleAppVCIClient/app/src/test/java/com/example/sampleappvciclient/ExampleUnitTest.kt b/SampleCredentialWallet/SampleCredentialWallet/app/src/test/java/com/example/samplecredentialwallet/ExampleUnitTest.kt
similarity index 87%
rename from SampleAppVCIclient/SampleAppVCIClient/app/src/test/java/com/example/sampleappvciclient/ExampleUnitTest.kt
rename to SampleCredentialWallet/SampleCredentialWallet/app/src/test/java/com/example/samplecredentialwallet/ExampleUnitTest.kt
index 84ed3054..fb025122 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/app/src/test/java/com/example/sampleappvciclient/ExampleUnitTest.kt
+++ b/SampleCredentialWallet/SampleCredentialWallet/app/src/test/java/com/example/samplecredentialwallet/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.example.sampleappvciclient
+package com.example.samplecredentialwallet
 
 import org.junit.Test
 
diff --git a/SampleAppVCIclient/SampleAppVCIClient/build.gradle.kts b/SampleCredentialWallet/SampleCredentialWallet/build.gradle.kts
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/build.gradle.kts
rename to SampleCredentialWallet/SampleCredentialWallet/build.gradle.kts
diff --git a/SampleAppVCIclient/SampleAppVCIClient/gradle.properties b/SampleCredentialWallet/SampleCredentialWallet/gradle.properties
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/gradle.properties
rename to SampleCredentialWallet/SampleCredentialWallet/gradle.properties
diff --git a/SampleAppVCIclient/SampleAppVCIClient/gradle/libs.versions.toml b/SampleCredentialWallet/SampleCredentialWallet/gradle/libs.versions.toml
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/gradle/libs.versions.toml
rename to SampleCredentialWallet/SampleCredentialWallet/gradle/libs.versions.toml
diff --git a/SampleAppVCIclient/SampleAppVCIClient/gradle/wrapper/gradle-wrapper.jar b/SampleCredentialWallet/SampleCredentialWallet/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/gradle/wrapper/gradle-wrapper.jar
rename to SampleCredentialWallet/SampleCredentialWallet/gradle/wrapper/gradle-wrapper.jar
diff --git a/SampleAppVCIclient/SampleAppVCIClient/gradle/wrapper/gradle-wrapper.properties b/SampleCredentialWallet/SampleCredentialWallet/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/gradle/wrapper/gradle-wrapper.properties
rename to SampleCredentialWallet/SampleCredentialWallet/gradle/wrapper/gradle-wrapper.properties
diff --git a/SampleAppVCIclient/SampleAppVCIClient/gradlew b/SampleCredentialWallet/SampleCredentialWallet/gradlew
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/gradlew
rename to SampleCredentialWallet/SampleCredentialWallet/gradlew
diff --git a/SampleAppVCIclient/SampleAppVCIClient/gradlew.bat b/SampleCredentialWallet/SampleCredentialWallet/gradlew.bat
similarity index 100%
rename from SampleAppVCIclient/SampleAppVCIClient/gradlew.bat
rename to SampleCredentialWallet/SampleCredentialWallet/gradlew.bat
diff --git a/SampleAppVCIclient/SampleAppVCIClient/settings.gradle.kts b/SampleCredentialWallet/SampleCredentialWallet/settings.gradle.kts
similarity index 93%
rename from SampleAppVCIclient/SampleAppVCIClient/settings.gradle.kts
rename to SampleCredentialWallet/SampleCredentialWallet/settings.gradle.kts
index 534f5403..abd4cb07 100644
--- a/SampleAppVCIclient/SampleAppVCIClient/settings.gradle.kts
+++ b/SampleCredentialWallet/SampleCredentialWallet/settings.gradle.kts
@@ -23,5 +23,5 @@ dependencyResolutionManagement {
 }
 
 
-rootProject.name = "SampleAppVCIClient"
+rootProject.name = "SampleCredentialWallet"
 include(":app")