Extract library

app/build.gradle → demo/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 28
     defaultConfig {
-        applicationId "im.status.hardwallet_lite_android"
+        applicationId "im.status.hardwallet_lite_android.demo"
         minSdkVersion 19
         targetSdkVersion 28
         versionCode 1
@@ -21,8 +21,9 @@ android {
 dependencies {
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.madgag.spongycastle:core:1.58.0.0'
-    implementation 'com.madgag.spongycastle:prov:1.58.0.0'
+
+    implementation project(':lib')
+
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

app/src/main/AndroidManifest.xml → demo/src/main/AndroidManifest.xml

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="im.status.hardwallet_lite_android">
-
-    <uses-permission android:name="android.permission.NFC" />
-    <uses-feature android:name="android.hardware.nfc.hce" android:required="true" />
+          package="im.status.hardwallet_lite_android.demo">
 
     <application
             android:allowBackup="true"

app/src/main/java/im/status/hardwallet_lite_android/app/MainActivity.java → demo/src/main/java/im/status/hardwallet_lite_android/app/MainActivity.java

@@ -4,7 +4,7 @@
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
-import im.status.hardwallet_lite_android.R;
+import im.status.hardwallet_lite_android.demo.R;
 import im.status.hardwallet_lite_android.io.APDUResponse;
 import im.status.hardwallet_lite_android.io.CardChannel;
 import im.status.hardwallet_lite_android.io.CardManager;
@@ -30,10 +30,13 @@ protected void onCreate(Bundle savedInstanceState) {
     nfcAdapter = NfcAdapter.getDefaultAdapter(this);
     cardManager = new CardManager();
 
-    cardManager.setOnConnectedListener(new OnCardConnectedListener() {
+    cardManager.setOnCardConnectedListener(new OnCardConnectedListener() {
       @Override
       public void onConnected(CardChannel cardChannel) {
         try {
+
+          Log.i(TAG, "onCardConnected()");
+
           // Applet-specific code
           WalletAppletCommandSet cmdSet = new WalletAppletCommandSet(cardChannel);
 

lib/.gitignore

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

lib/build.gradle

@@ -0,0 +1,26 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 28
+    defaultConfig {
+        minSdkVersion 19
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+    }
+
+    task androidSourcesJar(type: Jar) {
+        from android.sourceSets.main.java.source
+        classifier = 'sources'
+    }
+
+    artifacts {
+        archives androidSourcesJar
+    }
+
+}
+
+dependencies {
+    api 'com.madgag.spongycastle:core:1.58.0.0'
+    api 'com.madgag.spongycastle:prov:1.58.0.0'
+}

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

lib/src/main/AndroidManifest.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="im.status.hardwallet_lite_android">
+
+    <uses-permission android:name="android.permission.NFC" />
+    <uses-feature android:name="android.hardware.nfc.hce" android:required="true" />
+
+</manifest>

app/src/main/java/im/status/hardwallet_lite_android/io/CardManager.java → lib/src/main/java/im/status/hardwallet_lite_android/io/CardManager.java

@@ -64,7 +64,7 @@ private void onCardDisconnected() {
         isoDep = null;
     }
 
-    public void setOnConnectedListener(OnCardConnectedListener onConnectedListener) {
+    public void setOnCardConnectedListener(OnCardConnectedListener onConnectedListener) {
         onCardConnectedListener = onConnectedListener;
     }
 }

settings.gradle

@@ -1 +1,2 @@
-include ':app'
+include ':lib'
+include ':demo'