Skip to content

Commit

Permalink
fix: fix wrong version mapping, add f-droid build script
Browse files Browse the repository at this point in the history
  • Loading branch information
astubenbord committed Oct 24, 2023
1 parent 03d8cb5 commit cf5b81d
Show file tree
Hide file tree
Showing 14 changed files with 30 additions and 38 deletions.
1 change: 1 addition & 0 deletions android/fastlane/metadata/android/de-DE/changelogs/55.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Hinzufügen von Build-Skript für F-Droid
1 change: 1 addition & 0 deletions android/fastlane/metadata/android/en-US/changelogs/55.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Add build script for F-Droid
16 changes: 0 additions & 16 deletions assets/images/bmc-logo.svg

This file was deleted.

Binary file removed assets/images/documents_headache.png
Binary file not shown.
1 change: 0 additions & 1 deletion assets/images/empty-state.svg

This file was deleted.

Binary file removed assets/images/empty_inbox.png
Binary file not shown.
Binary file removed assets/images/organize_documents.png
Binary file not shown.
Binary file removed assets/images/secure_documents.png
Binary file not shown.
Binary file removed assets/images/splash.png
Binary file not shown.
Binary file removed assets/images/success.png
Binary file not shown.
3 changes: 2 additions & 1 deletion lib/features/changelogs/view/changelog_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ class ChangelogDialog extends StatelessWidget {
}

const _versionNumbers = {
"54": "3.0.7",
"55": "3.1.1",
"54": "3.1.0",
"53": "3.0.6",
"52": "3.0.5",
"51": "3.0.4",
Expand Down
20 changes: 1 addition & 19 deletions lib/features/login/view/login_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,14 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hive_flutter/adapters.dart';
import 'package:paperless_api/paperless_api.dart';
import 'package:paperless_mobile/core/database/hive/hive_config.dart';
import 'package:paperless_mobile/core/database/hive/hive_extensions.dart';
import 'package:paperless_mobile/core/database/tables/global_settings.dart';
import 'package:paperless_mobile/core/model/info_message_exception.dart';
import 'package:paperless_mobile/features/app_intro/application_intro_slideshow.dart';
import 'package:paperless_mobile/features/login/cubit/authentication_cubit.dart';
import 'package:paperless_mobile/features/login/model/client_certificate.dart';
import 'package:paperless_mobile/features/login/model/login_form_credentials.dart';
import 'package:paperless_mobile/features/login/view/add_account_page.dart';
import 'package:paperless_mobile/generated/l10n/app_localizations.dart';
import 'package:paperless_mobile/helpers/message_helpers.dart';
import 'package:paperless_mobile/routes/typed/shells/authenticated_route.dart';
import 'package:paperless_mobile/routes/typed/top_level/login_route.dart';

class LoginPage extends StatelessWidget {
Expand Down Expand Up @@ -68,21 +64,7 @@ class LoginPage extends StatelessWidget {
serverUrl: serverUrl,
clientCertificate: clientCertificate,
);
// Show onboarding after first login!
final globalSettings =
Hive.box<GlobalSettings>(HiveBoxes.globalSettings).getValue()!;
if (globalSettings.showOnboarding) {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => const ApplicationIntroSlideshow(),
fullscreenDialog: true,
),
).then((value) {
globalSettings.showOnboarding = false;
globalSettings.save();
});
}

// DocumentsRoute().go(context);
} on PaperlessApiException catch (error, stackTrace) {
showErrorMessage(context, error, stackTrace);
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 3.1.0+54
version: 3.1.1+55

environment:
sdk: ">=3.0.0 <4.0.0"
Expand Down
24 changes: 24 additions & 0 deletions scripts/install_dependencies_fdroid.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/usr/bin/env bash
set -Eeuo pipefail

__script_dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )

readonly __script_dir

pushd "$__script_dir/../"

pushd packages/paperless_api
$$flutter$$/bin/flutter packages pub get
$$flutter$$/bin/dart run build_runner build --delete-conflicting-outputs
popd

pushd packages/mock_server
$$flutter$$/bin/flutter packages pub get
popd

$$flutter$$/bin/flutter packages pub get
$$flutter$$/bin/flutter gen-l10n
$$flutter$$/bin/dart run build_runner build --delete-conflicting-outputs

popd

0 comments on commit cf5b81d

Please sign in to comment.