Merge branch 'master' into create-a-pkpass

.github/ISSUE_TEMPLATE/app_bug_report.yaml

@@ -0,0 +1,47 @@
+name: 🐞 Bug Report
+description: Describe the problem
+labels: ["bug", "package: app"]
+body:
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: Which version of the App do you use?
+      placeholder: 1.2.3 ← should look like this
+    validations:
+      required: true
+
+  - type: textarea
+    id: repro
+    attributes:
+      label: Steps to Reproduce
+      description: How can we see what you're seeing? Specific is terrific.
+      placeholder: |-
+        1. foo
+        2. bar
+        3. baz
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected Result
+    validations:
+      required: true
+
+  - type: textarea
+    id: actual
+    attributes:
+      label: Actual Result
+      description: Logs? Screenshots? Yes, please.
+    validations:
+      required: true
+
+  - type: textarea
+    id: passkit_file
+    attributes:
+      label: Upload ".pkpass" or ".pkpasses" file
+      description: If possible & relevant, please attach the non-working file. Change the file extension to zip and drop it into this field.
+    validations:
+      required: false

.github/workflows/build_app.yaml

@@ -31,28 +31,22 @@ jobs:
     - uses: subosito/flutter-action@v2
       with:
         channel: 'stable'
-        flutter-version-file: app/pubspec.yaml # path to pubspec.yaml
-    # write key.properties
-    #- run: echo "$KEY_PROPERTIES" > android/key.properties
-    #  env:
-    #    KEY_PROPERTIES: ${{ secrets.key_properties }}
-    # write key.keystore
-    #- run: mkdir android/key
-    #- run: echo "$KEY_KEYSTORE" | base64 --decode > android/key/key.keystore
-    #  env:
-    #    KEY_KEYSTORE: ${{ secrets.key_keystore }}
+        flutter-version-file: app/pubspec.yaml
     - run: flutter pub get
     - run: flutter analyze .
-    #- run: flutter build apk --build-number $GITHUB_RUN_NUMBER
-    - run: flutter build apk --build-number ${{ inputs.buildNumber }} --build-name ${{ inputs.versionName }}
-    - name: Create Release
-      id: create_release
-      uses: softprops/action-gh-release@v2
+    - name: Decode Keystore
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        ENCODED_KEYSTORE: ${{ secrets.KEYSTORE_BASE64 }}
+        DECODED_KEYSTORE_PATH: android/app/keystore.jks
+      run: |
+        echo $ENCODED_KEYSTORE > keystore_base64.txt
+        base64 -d keystore_base64.txt > $DECODED_KEYSTORE_PATH
+    #- run: flutter build apk --build-number $GITHUB_RUN_NUMBER
+    - run: flutter build aab --build-number ${{ inputs.buildNumber }} --build-name ${{ inputs.versionName }}
+    - name: Upload to Google Play
+      uses: r0adkll/upload-google-play@v1
       with:
-        name: App Release ${{ inputs.versionName }}-${{ inputs.buildNumber }}
-        tag_name: app-${{ inputs.buildNumber }}
-        draft: false
-        prerelease: true
-        files: ./app/build/app/outputs/apk/release/app-release.apk
+        serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
+        packageName: dev.uekoetter.passkit
+        releaseFiles: app/build/app/outputs/bundle/release/app-release.aab
+        track: production

app/analysis_options.yaml

@@ -23,3 +23,5 @@ analyzer:
     missing_required_param: error
     missing_return: error
     todo: ignore
+  exclude:
+    - '**/*.g.dart'

app/android/app/build.gradle

@@ -46,11 +46,20 @@ android {
     defaultConfig {
         applicationId "dev.uekoetter.passkit"
         minSdkVersion flutter.minSdkVersion
-        targetSdkVersion flutter.targetSdkVersion
+        targetSdkVersion 35 //flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
 
+    signingConfigs {
+        release {
+            storeFile file("keystore.jks")
+            storePassword System.getenv("KEYSTORE_PASSWORD")
+            keyAlias "cards_keystore"
+            keyPassword System.getenv("KEY_PASSWORD")
+        }
+    }
+
     buildTypes {
         release {
             signingConfig signingConfigs.debug

app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@mipmap/ic_launcher_background"/>
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
+</adaptive-icon>

app/lib/db/database.dart

@@ -1,6 +1,14 @@
-import 'package:app/db/db.dart';
+import 'dart:async';
+import 'dart:typed_data';
+import 'package:floor/floor.dart';
+import 'package:sqflite/sqflite.dart' as sqflite;
 
-late final AppDatabase database;
-void initDb() {
-  database = AppDatabase();
+import 'pass_entry_dao.dart';
+import 'pass_entry.dart';
+
+part 'database.g.dart';
+
+@Database(version: 1, entities: [PassEntry])
+abstract class AppDatabase extends FloorDatabase {
+  PassEntryDao get passEntryDao;
 }

app/lib/db/db.dart

@@ -1,35 +1,7 @@
-import 'dart:io';
+import 'package:app/db/database.dart';
 
-import 'package:drift/drift.dart';
-import 'package:drift/native.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:path/path.dart' as p;
+late final AppDatabase db;
 
-part 'db.g.dart';
-
-class Pass extends Table {
-  TextColumn get id => text()();
-  BlobColumn get binaryPass => blob()();
-
-  @override
-  Set<Column> get primaryKey => {id};
-}
-
-@DriftDatabase(tables: [Pass])
-class AppDatabase extends _$AppDatabase {
-  AppDatabase() : super(_openConnection());
-
-  @override
-  int get schemaVersion => 1;
-}
-
-LazyDatabase _openConnection() {
-  // the LazyDatabase util lets us find the right location for the file async.
-  return LazyDatabase(() async {
-    // put the database file, called db.sqlite here, into the documents folder
-    // for your app.
-    final dbFolder = await getApplicationDocumentsDirectory();
-    final file = File(p.join(dbFolder.path, 'db.sqlite'));
-    return NativeDatabase.createInBackground(file);
-  });
+Future<void> initDb() async {
+  db = await $FloorAppDatabase.databaseBuilder('app_database.db').build();
 }