Add new 'wallet' module.

Signed-off-by: David Zeuthen <[email protected]>

README.md

@@ -91,6 +91,10 @@ reachable on the left side bar of the Android Studio, or by selecting: _View ->
 Inside the `Build Variants` panel, at the `appholder` row, the desired flavor can be chosen. Once a
 flavor is selected, by running the app it will install it on the target device/emulator.
 
+The `wallet` module is a rewrite of the `appholder` reference application
+with an eye towards a production-quality and easily rebrandable identity
+wallet application.
+
 ## ISO 18013-7 Reader Website
 
 The `wwwverifier` module contains the source code for a website acting as an

gradle.properties

@@ -15,3 +15,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+# Workaround until we can upgrade to a newer Android Gradle Plugin
+android.suppressUnsupportedCompileSdk=34

gradle/libs.versions.toml

@@ -34,6 +34,9 @@
     espresso-core = "3.5.1"
     junit-jupiter = "5.10.0"
     truth = "1.1.5"
+    junit = "4.13.2"
+    lifecycle-runtime-ktx = "2.6.2"
+    navigation-compose = "2.7.6"
 
 [libraries]
     androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "core-ktx" }
@@ -85,6 +88,12 @@
     junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit-jupiter" }
     kotlinx-coroutine-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines-version" }
     truth = { module = "com.google.truth:truth", version.ref = "truth" }
+    junit = { group = "junit", name = "junit", version.ref = "junit" }
+    lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle-runtime-ktx" }
+    ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
+    ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
+    ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
+    androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation-compose" }
 
 [bundles]
     androidx-core = ["androidx-core-ktx", "androidx-appcompat", "androidx-material", "androidx-contraint-layout", "androidx-fragment-ktx", "androidx-legacy-v4", "androidx-preference-ktx", "androidx-work"]

secure-area-test-app/build.gradle

@@ -37,7 +37,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.4.6'
+        kotlinCompilerExtensionVersion libs.versions.kotlin.compiler.extension.get()
     }
     packagingOptions {
         resources {

settings.gradle

@@ -24,5 +24,6 @@ dependencyResolutionManagement {
         }
     }
 }
-include ':appholder', ':appverifier', ':identity', ':identity-android', ':secure-area-test-app', ':wwwverifier'
+include ':appholder', ':appverifier', ':identity', ':identity-android', ':secure-area-test-app', ':wwwverifier', ':wallet'
 rootProject.name = 'Identity Credential'
+

wallet/.gitignore

@@ -0,0 +1 @@
+/build

wallet/build.gradle

@@ -0,0 +1,71 @@
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+}
+
+android {
+    namespace 'com.android.identity_credential.wallet'
+    compileSdk 34
+
+    defaultConfig {
+        applicationId "com.android.identity_credential.wallet"
+        minSdk 27
+        targetSdk 34
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables {
+            useSupportLibrary true
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = '11'
+    }
+    buildFeatures {
+        compose true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion libs.versions.kotlin.compiler.extension.get()
+    }
+    packagingOptions {
+        resources {
+            excludes += '/META-INF/{AL2.0,LGPL2.1}'
+        }
+    }
+}
+
+dependencies {
+    implementation project(':identity')
+    implementation project(':identity-android')
+
+    implementation libs.cbor
+    implementation libs.androidx.core.ktx
+    implementation libs.lifecycle.runtime.ktx
+    implementation libs.androidx.activity.compose
+    implementation platform(libs.compose.bom)
+    implementation libs.compose.ui
+    implementation libs.ui.graphics
+    implementation libs.compose.ui.tooling
+    implementation libs.compose.material
+    implementation libs.bundles.bouncy.castle
+    implementation libs.androidx.navigation.compose
+    testImplementation libs.junit
+    androidTestImplementation libs.androidx.test.ext.junit
+    androidTestImplementation libs.androidx.test.espresso
+    androidTestImplementation platform(libs.compose.bom)
+    androidTestImplementation libs.ui.test.junit4
+    debugImplementation libs.compose.icons
+    debugImplementation libs.ui.test.manifest
+}

wallet/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

wallet/src/androidTest/java/com/android/identity_credential/wallet/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package com.android.identity_credential.wallet
+
+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.android.identity_credential.wallet", appContext.packageName)
+    }
+}

wallet/src/main/AndroidManifest.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:name=".WalletApplication"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.IdentityCredential">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.IdentityCredential">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>