Added fastlane, updated instructions on generating files

2025-12-09 00:07:49 -06:00 · 2022-11-10 17:33:19 +01:00
parent 51540a53e0
commit 0469191635
14 changed files with 339 additions and 25 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,9 @@
 *.iws
 .idea/

+# Android related files
+android/key.properties
+
 # The .vscode folder contains launch configuration and tasks you configure in
 # VS Code which you may wish to be included in version control, so this line
 # is commented out by default.
--- a/README.md
+++ b/README.md
@@ -69,13 +69,13 @@ To get a local copy up and running follow these simple steps.
 * Install the Flutter SDK (https://docs.flutter.dev/get-started/install)
 * Install an IDE of your choice (e.g. VSCode with the Dart/Flutter extensions)

-### Installation
+### Install dependencies and generate files

 1. Clone the repo
   ```sh
   git clone https://github.com/astubenbord/paperless-mobile.git
   ```
-2. Install the dependencies (should be done automatically by your IDE) and generate localization files
+2. Install the dependencies
   ```sh
   flutter pub get
   ```
@@ -83,6 +83,12 @@ To get a local copy up and running follow these simple steps.
   ```sh
   flutter packages pub run build_runner build --delete-conflicting-outputs
   ```
+4. Generate the localization files
+   ```sh
+   flutter pub run intl_utils:generate
+   ```
+
+  

 <!-- ROADMAP -->
 ## Roadmap
--- a/android/Gemfile
+++ b/android/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "fastlane"
--- a/android/Gemfile.lock
+++ b/android/Gemfile.lock
@@ -0,0 +1,218 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.5)
+      rexml
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    artifactory (3.0.15)
+    atomos (0.1.3)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.656.0)
+    aws-sdk-core (3.166.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.59.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.117.1)
+      aws-sdk-core (~> 3, >= 3.165.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.5.2)
+      aws-eventstream (~> 1, >= 1.0.2)
+    babosa (1.0.4)
+    claide (1.1.0)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    declarative (0.0.20)
+    digest-crc (0.6.4)
+      rake (>= 12.0.0, < 14.0.0)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.8.1)
+    emoji_regex (3.2.3)
+    excon (0.93.1)
+    faraday (1.10.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
+      http-cookie (~> 1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
+    fastimage (2.2.6)
+    fastlane (2.210.1)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.8, < 3.0.0)
+      artifactory (~> 3.0)
+      aws-sdk-s3 (~> 1.0)
+      babosa (>= 1.0.3, < 2.0.0)
+      bundler (>= 1.12.0, < 3.0.0)
+      colored
+      commander (~> 4.6)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 4.0)
+      excon (>= 0.71.0, < 1.0.0)
+      faraday (~> 1.0)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 1.0)
+      fastimage (>= 2.1.0, < 3.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.3)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
+      json (< 3.0.0)
+      jwt (>= 2.1.0, < 3)
+      mini_magick (>= 4.9.4, < 5.0.0)
+      multipart-post (~> 2.0.0)
+      naturally (~> 2.2)
+      optparse (~> 0.1.1)
+      plist (>= 3.1.0, < 4.0.0)
+      rubyzip (>= 2.0.0, < 3.0.0)
+      security (= 0.1.3)
+      simctl (~> 1.6.3)
+      terminal-notifier (>= 2.0.0, < 3.0.0)
+      terminal-table (>= 1.4.5, < 2.0.0)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
+      xcpretty (~> 0.3.0)
+      xcpretty-travis-formatter (>= 0.0.3)
+    gh_inspector (1.1.3)
+    google-apis-androidpublisher_v3 (0.30.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-core (0.9.1)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+      webrick
+    google-apis-iamcredentials_v1 (0.16.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-playcustomapp_v1 (0.12.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-storage_v1 (0.19.0)
+      google-apis-core (>= 0.9.0, < 2.a)
+    google-cloud-core (1.6.0)
+      google-cloud-env (~> 1.0)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.3.0)
+    google-cloud-storage (1.44.0)
+      addressable (~> 2.8)
+      digest-crc (~> 0.4)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.19.0)
+      google-cloud-core (~> 1.6)
+      googleauth (>= 0.16.2, < 2.a)
+      mini_mime (~> 1.0)
+    googleauth (1.3.0)
+      faraday (>= 0.17.3, < 3.a)
+      jwt (>= 1.4, < 3.0)
+      memoist (~> 0.16)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (>= 0.16, < 2.a)
+    highline (2.0.3)
+    http-cookie (1.0.5)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    jmespath (1.6.1)
+    json (2.6.2)
+    jwt (2.5.0)
+    memoist (0.16.2)
+    mini_magick (4.11.0)
+    mini_mime (1.1.2)
+    multi_json (1.15.0)
+    multipart-post (2.0.0)
+    nanaimo (0.3.0)
+    naturally (2.2.1)
+    optparse (0.1.1)
+    os (1.1.4)
+    plist (3.6.0)
+    public_suffix (5.0.0)
+    rake (13.0.6)
+    representable (3.2.0)
+      declarative (< 0.1.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rexml (3.2.5)
+    rouge (2.0.7)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
+    security (0.1.3)
+    signet (0.17.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simctl (1.6.8)
+      CFPropertyList
+      naturally
+    terminal-notifier (2.0.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    trailblazer-option (0.1.2)
+    tty-cursor (0.7.1)
+    tty-screen (0.8.1)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
+    uber (0.1.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8.2-x64-mingw-ucrt)
+    unicode-display_width (1.8.0)
+    webrick (1.7.0)
+    word_wrap (1.0.0)
+    xcodeproj (1.22.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+    xcpretty-travis-formatter (1.0.1)
+      xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+  x64-mingw-ucrt
+
+DEPENDENCIES
+  fastlane
+
+BUNDLED WITH
+   2.3.7
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -25,6 +25,12 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 android {
    compileSdkVersion 33

@@ -42,7 +48,6 @@ android {
    }

    defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
        applicationId "de.astubenbord.paperless_mobile"
        minSdkVersion 21
        targetSdkVersion flutter.targetSdkVersion
@@ -50,13 +55,20 @@ android {
        versionName flutterVersionName
    }

-    buildTypes {
-        release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
-        }
-    }
+   signingConfigs {
+       release {
+           keyAlias keystoreProperties['keyAlias']
+           keyPassword keystoreProperties['keyPassword']
+           storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+           storePassword keystoreProperties['storePassword']
+       }
+   }
+   buildTypes {
+       release {
+           signingConfig signingConfigs.release
+       }
+   }
+
 }

 flutter {
--- a/android/fastlane/Appfile
+++ b/android/fastlane/Appfile
@@ -0,0 +1,2 @@
+json_key_file("~\paperless-mobile-play-store-credentials.json")
+package_name("de.astubenbord.paperless_mobile")
--- a/android/fastlane/Fastfile
+++ b/android/fastlane/Fastfile
@@ -0,0 +1,38 @@
+# This file contains the fastlane.tools configuration
+# You can find the documentation at https://docs.fastlane.tools
+#
+# For a list of all available actions, check out
+#
+#     https://docs.fastlane.tools/actions
+#
+# For a list of all available plugins, check out
+#
+#     https://docs.fastlane.tools/plugins/available-plugins
+#
+
+# Uncomment the line if you want fastlane to automatically update itself
+# update_fastlane
+
+default_platform(:android)
+
+platform :android do
+  desc "Runs all the tests"
+  lane :test do
+    gradle(task: "test")
+  end
+
+  desc "Submit a new Beta Build to Crashlytics Beta"
+  lane :beta do
+    gradle(task: "clean assembleRelease")
+    crashlytics
+  
+    # sh "your_script.sh"
+    # You can also use other beta testing services here
+  end
+
+  desc "Deploy a new version to the Google Play"
+  lane :deploy do
+    gradle(task: "clean assembleRelease")
+    upload_to_play_store
+  end
+end
--- a/lib/features/documents/view/widgets/selection/add_saved_view_page.dart
+++ b/lib/features/documents/view/widgets/selection/add_saved_view_page.dart
@@ -47,7 +47,7 @@ class _AddSavedViewPageState extends State<AddSavedViewPage> {
            children: [
              FormBuilderTextField(
                name: fkName,
-                validator: FormBuilderValidators.required(), //TODO: INTL
+                validator: FormBuilderValidators.required(),
                decoration: InputDecoration(
                  label: Text(S.of(context).savedViewNameLabel),
                ),
--- a/lib/features/labels/view/pages/edit_label_page.dart
+++ b/lib/features/labels/view/pages/edit_label_page.dart
@@ -2,15 +2,12 @@ import 'dart:async';

 import 'package:flutter/material.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
-import 'package:paperless_mobile/core/logic/error_code_localization_mapper.dart';
-import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:form_builder_validators/form_builder_validators.dart';
 import 'package:paperless_mobile/core/type/types.dart';
 import 'package:paperless_mobile/extensions/flutter_extensions.dart';
 import 'package:paperless_mobile/features/labels/document_type/model/matching_algorithm.dart';
 import 'package:paperless_mobile/features/labels/model/label.model.dart';
 import 'package:paperless_mobile/generated/l10n.dart';
-import 'package:paperless_mobile/util.dart';
-import 'package:form_builder_validators/form_builder_validators.dart';

 class EditLabelPage<T extends Label> extends StatefulWidget {
  final T label;
@@ -45,7 +42,7 @@ class _EditLabelPageState<T extends Label> extends State<EditLabelPage<T>> {
        title: Text(S.of(context).genericActionEditLabel),
        actions: [
          IconButton(
-            onPressed: () => widget.onDelete(widget.label),
+            onPressed: _onDelete,
            icon: const Icon(Icons.delete),
          ),
        ],
@@ -108,6 +105,34 @@ class _EditLabelPageState<T extends Label> extends State<EditLabelPage<T>> {
    );
  }

+  void _onDelete() {
+    if ((widget.label.documentCount ?? 0) > 0) {
+      showDialog(
+        context: context,
+        builder: (context) => AlertDialog(
+          title: Text(S.of(context).editLabelPageConfirmDeletionDialogTitle),
+          content: Text(
+            S.of(context).editLabelPageDeletionDialogText,
+          ),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.pop(context),
+              child: Text(S.of(context).genericActionCancelLabel),
+            ),
+            TextButton(
+                onPressed: () {
+                  Navigator.pop(context);
+                  widget.onDelete(widget.label);
+                },
+                child: Text(S.of(context).genericActionDeleteLabel)),
+          ],
+        ),
+      );
+    } else {
+      widget.onDelete(widget.label);
+    }
+  }
+
  void _onSubmit() async {
    if (_formKey.currentState?.saveAndValidate() ?? false) {
      try {
--- a/lib/l10n/intl_de.arb
+++ b/lib/l10n/intl_de.arb
@@ -179,5 +179,7 @@
  "labelsPageTagsEmptyStateDescriptionText": "Es wurden noch keine Tags angelegt.",
  "labelsPageStoragePathEmptyStateAddNewLabel": "Erstelle neuen Speicherpfad",
  "labelsPageStoragePathEmptyStateDescriptionText": "Es wurden noch keine Speicherpfade angelegt.",
-  "referencedDocumentsReadOnlyHintText": "Dies ist eine schreibgeschützte Ansicht! Dokumente können nicht bearbeitet oder entfernt werden."
+  "referencedDocumentsReadOnlyHintText": "Dies ist eine schreibgeschützte Ansicht! Dokumente können nicht bearbeitet oder entfernt werden.",
+  "editLabelPageConfirmDeletionDialogTitle": "Löschen bestätigen",
+  "editLabelPageDeletionDialogText": "Dieser Kennzeichner wird von Dokumenten referenziert. Durch das Löschen dieses Kennzeichners werden alle Referenzen entfernt. Fortfahren?"
 }
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@@ -76,7 +76,7 @@
  "errorMessageScanRemoveFailed": "An error occurred removing the scans.",
  "errorMessageInvalidClientCertificateConfiguration": "Invalid certificate or missing passphrase, please try again",
  "errorMessageDocumentLoadFailed": "Could not load documents, please try again.",
-  "documentsPageSelectionBulkDeleteDialogTitle": "Confirm Deletion",
+  "documentsPageSelectionBulkDeleteDialogTitle": "Confirm deletion",
  "documentsPageSelectionBulkDeleteDialogWarningTextOne": "Are you sure you want to delete the following document?",
  "documentsPageSelectionBulkDeleteDialogWarningTextMany": "Are you sure you want to delete the following documents?",
  "documentsPageSelectionBulkDeleteDialogContinueText": "This action is irreversible. Do you wish to proceed anyway?",
@@ -180,5 +180,7 @@
  "labelsPageTagsEmptyStateDescriptionText": "You don't seem to have any tags set up.",
  "labelsPageStoragePathEmptyStateAddNewLabel": "Add new storage path",
  "labelsPageStoragePathEmptyStateDescriptionText": "You don't seem to have any storage paths set up.",
-  "referencedDocumentsReadOnlyHintText": "This is a read-only view! You cannot edit or remove documents."
+  "referencedDocumentsReadOnlyHintText": "This is a read-only view! You cannot edit or remove documents.",
+  "editLabelPageConfirmDeletionDialogTitle": "Confirm deletion",
+  "editLabelPageDeletionDialogText": "This label contains references to other documents. By deleting this label, all references will be removed. Continue?"
 }
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -104,9 +104,9 @@ class _MyAppState extends State<MyApp> {
                languageCode: settings.preferredLocaleSubtag),
            localizationsDelegates: const [
              S.delegate,
-              FormBuilderLocalizations.delegate,
              GlobalMaterialLocalizations.delegate,
              GlobalWidgetsLocalizations.delegate,
+              FormBuilderLocalizations.delegate,
              GlobalCupertinoLocalizations.delegate,
            ],
            home: const AuthenticationWrapper(),
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -717,6 +717,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "0.17.0"
+  intl_utils:
+    dependency: "direct dev"
+    description:
+      name: intl_utils
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.7.0"
  introduction_screen:
    dependency: "direct main"
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -84,11 +84,7 @@ dev_dependencies:
  mockito: ^5.3.2
  bloc_test: ^9.1.0
  dependency_validator: ^3.0.0
-  # The "flutter_lints" package below contains a set of recommended lints to
-  # encourage good coding practices. The lint set provided by the package is
-  # activated in the `analysis_options.yaml` file located at the root of your
-  # package. See that file for information about deactivating specific lint
-  # rules and activating additional ones.
+  intl_utils: ^2.7.0
  flutter_lints: ^1.0.0

 # For information on the generic Dart part of this file, see the