129 - demo app redesign

.github/workflows/test.yaml

@@ -10,10 +10,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        api-level: [19, 28]
+        api-level: [21, 29]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
       - name: Set up environment
         uses: actions/setup-java@v4
         with:
@@ -26,7 +31,7 @@ jobs:
         id: avd-cache
         with:
           path: |
-            ~.android/avd/*
+            ~/.android/avd/*
             ~/.android/adb*
           key: avd-${{ matrix.api-level }}
       - name: Create AVD and generate snapshot for caching
@@ -47,4 +52,4 @@ jobs:
           force-avd-creation: false
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
-          script: ./gradlew connectedCheck
+          script: adb uninstall com.enioka.scanner.sdk.mock.test; adb uninstall com.enioka.scanner.service; ./gradlew connectedCheck --stacktrace

demoscannerapp/build.gradle

@@ -8,14 +8,21 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-
+        vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            debuggable false
+            applicationIdSuffix ".release"
+        }
+        debug {
+            debuggable true
+            applicationIdSuffix ".debug"
         }
     }
     lint {
@@ -63,6 +70,7 @@ dependencies {
     //noinspection GradleCompatible
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.android.support.constraint:constraint-layout:2.0.4'
+    implementation 'com.google.android.material:material:1.12.0'
 
     // Useless test stuff
     testImplementation 'junit:junit:4.12'

demoscannerapp/src/main/AndroidManifest.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -9,16 +11,16 @@
         android:supportsRtl="true"
         android:hardwareAccelerated="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity" />
-        <activity android:name=".ScannerTesterActivity" />
+        <activity android:name=".MainActivity"
+            android:configChanges="orientation|screenSize" />
         <activity android:name=".SettingsActivity" />
-        <activity android:name=".WelcomeActivity">
+        <activity android:name=".WelcomeActivity"
+            android:exported="true"
+            android:configChanges="orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 </manifest>