Introduce IC Wallet and IC Purse Flavors for Holder

appholder/build.gradle

@@ -8,10 +8,11 @@ plugins {
 }
 
 android {
+    namespace "com.android.identity.wallet"
     compileSdk libs.versions.compile.sdk.get() as int
 
     defaultConfig {
-        applicationId "com.android.mdl.app"
+        applicationId "com.android.identity.wallet"
         minSdkVersion libs.versions.min.sdk.get() as int
         targetSdkVersion libs.versions.compile.sdk.get() as int
         versionCode 1
@@ -27,6 +28,17 @@ android {
         }
     }
 
+    flavorDimensions.addAll("standard")
+    productFlavors {
+        wallet {
+            dimension "standard"
+        }
+        purse {
+            dimension "standard"
+            applicationIdSuffix ".purse"
+        }
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -46,15 +58,13 @@ android {
         kotlinCompilerExtensionVersion libs.versions.kotlin.compiler.extension.get()
     }
 
-
     testOptions.unitTests.all {
         useJUnitPlatform()
         testLogging {
             events 'passed', 'failed', 'skipped', 'standardOut', 'standardError'
         }
     }
 
-    namespace 'com.android.mdl.app'
     lint {
         lintConfig file('lint.xml')
     }

appholder/src/main/java/com/android/mdl/app/HolderApp.kt → appholder/src/main/java/com/android/identity/wallet/HolderApp.kt

@@ -1,9 +1,9 @@
-package com.android.mdl.app
+package com.android.identity.wallet
 
 import android.app.Application
 import com.android.identity.android.util.AndroidLogPrinter
 import com.android.identity.util.Logger
-import com.android.mdl.app.util.PreferencesHelper
+import com.android.identity.wallet.util.PreferencesHelper
 import com.google.android.material.color.DynamicColors
 
 class HolderApp: Application() {

appholder/src/main/java/com/android/mdl/app/MainActivity.kt → appholder/src/main/java/com/android/identity/wallet/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.android.mdl.app
+package com.android.identity.wallet
 
 import android.app.PendingIntent
 import android.content.Intent
@@ -15,12 +15,12 @@ import androidx.navigation.ui.NavigationUI.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
 import com.android.identity.mdoc.origininfo.OriginInfo
 import com.android.identity.mdoc.origininfo.OriginInfoReferrerUrl
-import com.android.mdl.app.databinding.ActivityMainBinding
-import com.android.mdl.app.util.log
-import com.android.mdl.app.util.logError
-import com.android.mdl.app.util.logInfo
-import com.android.mdl.app.util.logWarning
-import com.android.mdl.app.viewmodel.ShareDocumentViewModel
+import com.android.identity.wallet.databinding.ActivityMainBinding
+import com.android.identity.wallet.util.log
+import com.android.identity.wallet.util.logError
+import com.android.identity.wallet.util.logInfo
+import com.android.identity.wallet.util.logWarning
+import com.android.identity.wallet.viewmodel.ShareDocumentViewModel
 import com.google.android.material.elevation.SurfaceColors
 import java.security.Security
 import org.bouncycastle.jce.provider.BouncyCastleProvider

appholder/src/main/java/com/android/mdl/app/adapter/BindingAdapters.kt → appholder/src/main/java/com/android/identity/wallet/adapter/BindingAdapters.kt

@@ -1,4 +1,4 @@
-package com.android.mdl.app.adapter
+package com.android.identity.wallet.adapter
 
 import android.icu.text.SimpleDateFormat
 import android.widget.TextView

appholder/src/main/java/com/android/mdl/app/adapter/DocumentAdapter.kt → appholder/src/main/java/com/android/identity/wallet/adapter/DocumentAdapter.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-package com.android.mdl.app.adapter
+package com.android.identity.wallet.adapter
 
 
 import android.view.LayoutInflater
@@ -24,10 +24,10 @@ import androidx.navigation.findNavController
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import com.android.mdl.app.R
-import com.android.mdl.app.databinding.ListItemDocumentBinding
-import com.android.mdl.app.document.DocumentInformation
-import com.android.mdl.app.wallet.SelectDocumentFragmentDirections
+import com.android.identity.wallet.R
+import com.android.identity.wallet.databinding.ListItemDocumentBinding
+import com.android.identity.wallet.document.DocumentInformation
+import com.android.identity.wallet.wallet.SelectDocumentFragmentDirections
 
 /**
  * Adapter for the [RecyclerView].

appholder/src/main/java/com/android/mdl/app/authconfirmation/AuthConfirmationFragment.kt → appholder/src/main/java/com/android/identity/wallet/authconfirmation/AuthConfirmationFragment.kt

@@ -1,4 +1,4 @@
-package com.android.mdl.app.authconfirmation
+package com.android.identity.wallet.authconfirmation
 
 import android.content.DialogInterface
 import android.os.Bundle
@@ -22,13 +22,13 @@ import androidx.navigation.fragment.navArgs
 import com.android.identity.android.securearea.AndroidKeystoreSecureArea
 import com.android.identity.securearea.BouncyCastleSecureArea
 import com.android.identity.securearea.SecureArea.ALGORITHM_ES256
-import com.android.mdl.app.R
-import com.android.mdl.app.authprompt.UserAuthPromptBuilder
-import com.android.mdl.app.theme.HolderAppTheme
-import com.android.mdl.app.transfer.AddDocumentToResponseResult
-import com.android.mdl.app.util.DocumentData
-import com.android.mdl.app.util.log
-import com.android.mdl.app.viewmodel.TransferDocumentViewModel
+import com.android.identity.wallet.R
+import com.android.identity.wallet.authprompt.UserAuthPromptBuilder
+import com.android.identity.wallet.theme.HolderAppTheme
+import com.android.identity.wallet.transfer.AddDocumentToResponseResult
+import com.android.identity.wallet.util.DocumentData
+import com.android.identity.wallet.util.log
+import com.android.identity.wallet.viewmodel.TransferDocumentViewModel
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import kotlinx.coroutines.launch
 

appholder/src/main/java/com/android/mdl/app/authconfirmation/ConfirmationSheet.kt → appholder/src/main/java/com/android/identity/wallet/authconfirmation/ConfirmationSheet.kt

@@ -1,4 +1,4 @@
-package com.android.mdl.app.authconfirmation
+package com.android.identity.wallet.authconfirmation
 
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
 import androidx.compose.animation.AnimatedVisibility
@@ -43,9 +43,9 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.android.mdl.app.R
-import com.android.mdl.app.authconfirmation.ConfirmationSheetData.DocumentElement
-import com.android.mdl.app.theme.HolderAppTheme
+import com.android.identity.wallet.R
+import com.android.identity.wallet.authconfirmation.ConfirmationSheetData.DocumentElement
+import com.android.identity.wallet.theme.HolderAppTheme
 
 @Composable
 fun ConfirmationSheet(

appholder/src/main/java/com/android/mdl/app/authconfirmation/ConfirmationSheetData.kt → appholder/src/main/java/com/android/identity/wallet/authconfirmation/ConfirmationSheetData.kt

@@ -1,4 +1,4 @@
-package com.android.mdl.app.authconfirmation
+package com.android.identity.wallet.authconfirmation
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable

appholder/src/main/java/com/android/mdl/app/authconfirmation/PassphraseAuthResult.kt → appholder/src/main/java/com/android/identity/wallet/authconfirmation/PassphraseAuthResult.kt

@@ -1,4 +1,4 @@
-package com.android.mdl.app.authconfirmation
+package com.android.identity.wallet.authconfirmation
 
 sealed class PassphraseAuthResult {
     object Idle: PassphraseAuthResult()

appholder/src/main/java/com/android/mdl/app/authconfirmation/PassphrasePrompt.kt → appholder/src/main/java/com/android/identity/wallet/authconfirmation/PassphrasePrompt.kt

@@ -1,4 +1,4 @@
-package com.android.mdl.app.authconfirmation
+package com.android.identity.wallet.authconfirmation
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -32,9 +32,9 @@ import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
-import com.android.mdl.app.R
-import com.android.mdl.app.composables.PreviewLightDark
-import com.android.mdl.app.theme.HolderAppTheme
+import com.android.identity.wallet.R
+import com.android.identity.wallet.composables.PreviewLightDark
+import com.android.identity.wallet.theme.HolderAppTheme
 
 class PassphrasePrompt : DialogFragment() {
 

appholder/src/main/java/com/android/mdl/app/authconfirmation/PassphrasePromptViewModel.kt → appholder/src/main/java/com/android/identity/wallet/authconfirmation/PassphrasePromptViewModel.kt

@@ -1,4 +1,4 @@
-package com.android.mdl.app.authconfirmation
+package com.android.identity.wallet.authconfirmation
 
 import androidx.lifecycle.ViewModel
 import kotlinx.coroutines.flow.MutableStateFlow

appholder/src/main/java/com/android/mdl/app/authconfirmation/RequestedDocumentData.kt → appholder/src/main/java/com/android/identity/wallet/authconfirmation/RequestedDocumentData.kt

@@ -1,4 +1,4 @@
-package com.android.mdl.app.authconfirmation
+package com.android.identity.wallet.authconfirmation
 
 import com.android.identity.mdoc.request.DeviceRequestParser
 

appholder/src/main/java/com/android/mdl/app/authconfirmation/RequestedElement.kt → appholder/src/main/java/com/android/identity/wallet/authconfirmation/RequestedElement.kt

@@ -1,4 +1,4 @@
-package com.android.mdl.app.authconfirmation
+package com.android.identity.wallet.authconfirmation
 
 data class RequestedElement(
     val namespace: String,

appholder/src/main/java/com/android/mdl/app/authconfirmation/SignedDocumentData.kt → appholder/src/main/java/com/android/identity/wallet/authconfirmation/SignedDocumentData.kt

@@ -1,4 +1,4 @@
-package com.android.mdl.app.authconfirmation
+package com.android.identity.wallet.authconfirmation
 
 class SignedDocumentData(
     private val signedElements: List<RequestedElement>,

appholder/src/main/java/com/android/mdl/app/authconfirmation/SignedElementsCollection.kt → appholder/src/main/java/com/android/identity/wallet/authconfirmation/SignedElementsCollection.kt

@@ -1,4 +1,4 @@
-package com.android.mdl.app.authconfirmation
+package com.android.identity.wallet.authconfirmation
 
 class SignedElementsCollection {
 

appholder/src/main/java/com/android/mdl/app/authprompt/BiometricUserAuthPrompt.kt → appholder/src/main/java/com/android/identity/wallet/authprompt/BiometricUserAuthPrompt.kt

@@ -1,4 +1,4 @@
-package com.android.mdl.app.authprompt
+package com.android.identity.wallet.authprompt
 
 import androidx.biometric.BiometricPrompt
 

appholder/src/main/java/com/android/mdl/app/authprompt/UserAuthPromptBuilder.kt → appholder/src/main/java/com/android/identity/wallet/authprompt/UserAuthPromptBuilder.kt

@@ -1,4 +1,4 @@
-package com.android.mdl.app.authprompt
+package com.android.identity.wallet.authprompt
 
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG
@@ -7,7 +7,7 @@ import androidx.biometric.BiometricManager.BIOMETRIC_SUCCESS
 import androidx.biometric.BiometricPrompt
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
-import com.android.mdl.app.util.log
+import com.android.identity.wallet.util.log
 
 class UserAuthPromptBuilder private constructor(private val fragment: Fragment) {
 

appholder/src/main/java/com/android/mdl/app/composables/DocumentValues.kt → appholder/src/main/java/com/android/identity/wallet/composables/DocumentValues.kt

@@ -1,14 +1,14 @@
-package com.android.mdl.app.composables
+package com.android.identity.wallet.composables
 
 import androidx.annotation.StringRes
 import androidx.compose.ui.graphics.Brush
-import com.android.mdl.app.R
-import com.android.mdl.app.document.DocumentColor
-import com.android.mdl.app.document.SecureAreaImplementationState
-import com.android.mdl.app.theme.BlueGradient
-import com.android.mdl.app.theme.GreenGradient
-import com.android.mdl.app.theme.RedGradient
-import com.android.mdl.app.theme.YellowGradient
+import com.android.identity.wallet.R
+import com.android.identity.wallet.document.DocumentColor
+import com.android.identity.wallet.document.SecureAreaImplementationState
+import com.android.identity.wallet.theme.BlueGradient
+import com.android.identity.wallet.theme.GreenGradient
+import com.android.identity.wallet.theme.RedGradient
+import com.android.identity.wallet.theme.YellowGradient
 
 @StringRes
 fun keystoreNameFor(implementation: SecureAreaImplementationState): Int {

appholder/src/main/java/com/android/mdl/app/composables/LoadingIndicator.kt → appholder/src/main/java/com/android/identity/wallet/composables/LoadingIndicator.kt

@@ -1,4 +1,4 @@
-package com.android.mdl.app.composables
+package com.android.identity.wallet.composables
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -9,7 +9,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import com.android.mdl.app.theme.HolderAppTheme
+import com.android.identity.wallet.theme.HolderAppTheme
 
 @Composable
 fun LoadingIndicator(

appholder/src/main/java/com/android/mdl/app/composables/Preview.kt → appholder/src/main/java/com/android/identity/wallet/composables/Preview.kt

@@ -1,4 +1,4 @@
-package com.android.mdl.app.composables
+package com.android.identity.wallet.composables
 
 import android.content.res.Configuration
 import androidx.compose.ui.tooling.preview.Preview