Merge branch 'develop'

.fvm/fvm_config.json

@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.7.12",
+  "flutterSdkVersion": "3.13.1",
   "flavors": {}
 }

analysis_options.yaml

@@ -1,4 +1,4 @@
-include: package:lint/analysis_options.yaml
+include: package:lint/strict.yaml
 
 linter:
   rules:
@@ -12,7 +12,8 @@ analyzer:
     - '**/*.freezed.dart'
     - '**/*.g.dart'
     - lib/**/*.*.dart
-    - lib/generated/intl/*
+    - lib/generated/*.dart
+    - lib/generated/**/*.dart
     - '**/mocks.mocks.dart'
     - '**/shiori_icons.dart'
   errors:

android/app/build.gradle

@@ -35,6 +35,8 @@ android {
     compileSdkVersion localProperties.getProperty('flutter.compileSdkVersion').toInteger()
 
     compileOptions {
+        // Flag to enable support for the new language APIs
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -55,6 +57,7 @@ android {
 
 
     defaultConfig {
+        multiDexEnabled true
         applicationId "com.miraisoft.shiori"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
@@ -107,4 +110,9 @@ dependencies {
     def appCenterSdkVersion = '4.4.5'
     implementation "com.microsoft.appcenter:appcenter-analytics:${appCenterSdkVersion}"
     implementation "com.microsoft.appcenter:appcenter-crashes:${appCenterSdkVersion}"
+
+    // Required by the notifications plugin
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    implementation 'androidx.window:window:1.0.0'
+    implementation 'androidx.window:window-java:1.0.0'
 }

android/app/proguard-rules.pro

@@ -22,8 +22,6 @@
   @com.google.gson.annotations.SerializedName <fields>;
 }
 
--keepattributes InnerClasses
-
 # Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher.
 -keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
 -keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken

android/build.gradle

@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

ios/Podfile.lock

@@ -1,11 +1,11 @@
 PODS:
-  - AppCenter (5.0.1):
-    - AppCenter/Analytics (= 5.0.1)
-    - AppCenter/Crashes (= 5.0.1)
-  - AppCenter/Analytics (5.0.1):
+  - AppCenter (5.0.3):
+    - AppCenter/Analytics (= 5.0.3)
+    - AppCenter/Crashes (= 5.0.3)
+  - AppCenter/Analytics (5.0.3):
     - AppCenter/Core
-  - AppCenter/Core (5.0.1)
-  - AppCenter/Crashes (5.0.1):
+  - AppCenter/Core (5.0.3)
+  - AppCenter/Crashes (5.0.3):
     - AppCenter/Core
   - device_info_plus (0.0.1):
     - Flutter
@@ -62,27 +62,27 @@ PODS:
   - fluttertoast (0.0.2):
     - Flutter
     - Toast
-  - image_gallery_saver (1.5.0):
+  - image_gallery_saver (2.0.2):
     - Flutter
   - OrderedSet (5.0.0)
   - package_info_plus (0.4.5):
     - Flutter
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - permission_handler_apple (9.0.4):
+  - permission_handler_apple (9.1.1):
     - Flutter
-  - purchases_flutter (4.11.3):
+  - purchases_flutter (5.6.5):
     - Flutter
-    - PurchasesHybridCommon (= 4.14.3)
-  - PurchasesHybridCommon (4.14.3):
-    - RevenueCat (= 4.17.11)
-  - rate_my_app (1.1.3):
+    - PurchasesHybridCommon (= 6.1.2)
+  - PurchasesHybridCommon (6.1.2):
+    - RevenueCat (= 4.25.9)
+  - rate_my_app (2.0.0):
     - Flutter
-  - RevenueCat (4.17.11)
-  - SDWebImage (5.15.2):
-    - SDWebImage/Core (= 5.15.2)
-  - SDWebImage/Core (5.15.2)
+  - RevenueCat (4.25.9)
+  - SDWebImage (5.17.0):
+    - SDWebImage/Core (= 5.17.0)
+  - SDWebImage/Core (5.17.0)
   - share_plus (0.0.1):
     - Flutter
   - shared_preferences_foundation (0.0.1):
@@ -94,7 +94,7 @@ PODS:
   - Toast (4.0.0)
   - url_launcher_ios (0.0.1):
     - Flutter
-  - wakelock (0.0.1):
+  - wakelock_plus (0.0.1):
     - Flutter
 
 DEPENDENCIES:
@@ -110,15 +110,15 @@ DEPENDENCIES:
   - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
   - image_gallery_saver (from `.symlinks/plugins/image_gallery_saver/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
-  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
+  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - purchases_flutter (from `.symlinks/plugins/purchases_flutter/ios`)
   - rate_my_app (from `.symlinks/plugins/rate_my_app/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
-  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
+  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - store_checker (from `.symlinks/plugins/store_checker/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
-  - wakelock (from `.symlinks/plugins/wakelock/ios`)
+  - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
 
 SPEC REPOS:
   trunk:
@@ -156,7 +156,7 @@ EXTERNAL SOURCES:
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
-    :path: ".symlinks/plugins/path_provider_foundation/ios"
+    :path: ".symlinks/plugins/path_provider_foundation/darwin"
   permission_handler_apple:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
   purchases_flutter:
@@ -166,17 +166,17 @@ EXTERNAL SOURCES:
   share_plus:
     :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
-    :path: ".symlinks/plugins/shared_preferences_foundation/ios"
+    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   store_checker:
     :path: ".symlinks/plugins/store_checker/ios"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
-  wakelock:
-    :path: ".symlinks/plugins/wakelock/ios"
+  wakelock_plus:
+    :path: ".symlinks/plugins/wakelock_plus/ios"
 
 SPEC CHECKSUMS:
-  AppCenter: 18153bb6bc4241d14c8cce57466ac1c88136b476
-  device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
+  AppCenter: a4070ec3d4418b5539067a51f57155012e486ebd
+  device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea
   devicelocale: b22617f40038496deffba44747101255cee005b0
   DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
@@ -186,24 +186,24 @@ SPEC CHECKSUMS:
   flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721
   flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
   flutter_native_timezone: 5f05b2de06c9776b4cc70e1839f03de178394d22
-  fluttertoast: eb263d302cc92e04176c053d2385237e9f43fad0
-  image_gallery_saver: 259eab68fb271cfd57d599904f7acdc7832e7ef2
+  fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c
+  image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb
   OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
-  package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
-  path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852
-  permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
-  purchases_flutter: 7c0cd1ed4412ac8c9041200cf7f22806c6c4e714
-  PurchasesHybridCommon: be1e0089c51b4ee7b44914fd7a9ede271f96e4f5
-  rate_my_app: 96f658ddb7f0a8d2f46d54452583f084760aef57
-  RevenueCat: 0431c28e4d492c0c88d6cc5c89a289cd40a8b7ea
-  SDWebImage: 8ab87d4b3e5cc4927bd47f78db6ceb0b94442577
-  share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
-  shared_preferences_foundation: 297b3ebca31b34ec92be11acd7fb0ba932c822ca
+  package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
+  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
+  permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
+  purchases_flutter: 440e09b1d692a20438574da78a45fda193bb80c5
+  PurchasesHybridCommon: b7c4205b6d2479cdd8914084a2b536e5e5b1445f
+  rate_my_app: 80fba94c4885cd31738231b7b1f51c1ad726f5c7
+  RevenueCat: 4160d04575059fc1edbb973981f541b705ddebef
+  SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9
+  share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028
+  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
   store_checker: 359c5051d9ec30ff0a8fa39eb5ec9df021bb745d
   SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
-  url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
-  wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
+  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
+  wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
 
 PODFILE CHECKSUM: a1eaf986c30d5a84309bbcd4434682ef102516a3
 

ios/Runner.xcodeproj/project.pbxproj

@@ -157,7 +157,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -206,6 +206,7 @@
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

lib/application/app_bloc_observer.dart

@@ -11,4 +11,4 @@ class AppBlocObserver extends BlocObserver {
     _logger.error(bloc.runtimeType, 'Bloc error', error, stackTrace);
     super.onError(bloc, error, stackTrace);
   }
-}
+}

lib/application/artifacts/artifacts_bloc.dart

@@ -128,14 +128,12 @@ class ArtifactsBloc extends Bloc<ArtifactsEvent, ArtifactsState> {
         } else {
           data.sort((x, y) => y.name.compareTo(x.name));
         }
-        break;
       case ArtifactFilterType.rarity:
         if (sortDirectionType == SortDirectionType.asc) {
           data.sort((x, y) => x.rarity.compareTo(y.rarity));
         } else {
           data.sort((x, y) => y.rarity.compareTo(x.rarity));
         }
-        break;
       default:
         break;
     }

lib/application/backup_restore/backup_restore_bloc.dart

@@ -62,7 +62,7 @@ class BackupRestoreBloc extends Bloc<BackupRestoreEvent, BackupRestoreState> {
       throw Exception('Invalid state');
     }
     final result = await _backupRestoreService.createBackup(dataTypes);
-    await _telemetryService.backupCreated(result.succeed);
+    await _telemetryService.trackBackupCreated(result.succeed);
     if (!result.succeed) {
       return currentState.copyWith.call(createResult: result);
     }
@@ -93,7 +93,7 @@ class BackupRestoreBloc extends Bloc<BackupRestoreEvent, BackupRestoreState> {
       dataTypes: bk?.dataTypes ?? [],
     );
     if (bk == null) {
-      await _telemetryService.backupRestored(false);
+      await _telemetryService.trackBackupRestored(false);
       return currentState.copyWith.call(restoreResult: result);
     }
 
@@ -102,7 +102,7 @@ class BackupRestoreBloc extends Bloc<BackupRestoreEvent, BackupRestoreState> {
     }
 
     final restored = await _backupRestoreService.restoreBackup(bk, dataTypes);
-    await _telemetryService.backupRestored(restored);
+    await _telemetryService.trackBackupRestored(restored);
 
     if (!restored || !imported) {
       return currentState.copyWith.call(restoreResult: result);