Merge pull request #9 from PicGo/dev

hackycy · web-flow · commit bd719688c387 · 2020-11-16T12:08:20.000+08:00
pr：merge dev
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ jobs:
           channel: 'stable' # or: 'dev' or 'beta'
       - run: flutter pub get
       - run: flutter test
-      - run: flutter build apk --release
+      - run: flutter build apk --release --no-tree-shake-icons
       - uses: actions/upload-artifact@v2
         with:
           path: build/app/outputs/apk/release/*.apk
diff --git a/docs/version.json b/docs/version.json
@@ -4,7 +4,7 @@
     "versionCode": "16"
   },
   "Android": {
-    "versionName": "1.8.0",
-    "versionCode": "16"
+    "versionName": "1.9.0",
+    "versionCode": "20"
   }
 }
diff --git a/ios/Podfile b/ios/Podfile
@@ -37,5 +37,10 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
+    # target.build_configurations.each do |config|
+    #   if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 8.0
+    #     config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '8.0'
+    #    end
+    # end
   end
 end
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -20,9 +20,9 @@ PODS:
     - Flutter
   - shared_preferences (0.0.1):
     - Flutter
-  - sqflite (0.0.1):
+  - sqflite (0.0.2):
     - Flutter
-    - FMDB (~> 2.7.2)
+    - FMDB (>= 2.7.5)
   - SwiftProtobuf (1.9.0)
   - url_launcher (0.0.1):
     - Flutter
@@ -70,18 +70,18 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   barcode_scan: a5c27959edfafaa0c771905bad0b29d6d39e4479
   Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
-  flutter_local_notifications: 9e4738ce2471c5af910d961a6b7eadcf57c50186
+  flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   image_picker: 9c3312491f862b28d21ecd8fdf0ee14e601b3f09
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
   package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
   path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
   permission_handler: eac8e15b4a1a3fba55b761d19f3f4e6b005d15b6
   shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
-  sqflite: 4001a31ff81d210346b500c55b17f4d6c7589dd0
+  sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
   SwiftProtobuf: ecbec1be9036d15655f6b3443a1c4ea693c97932
   url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
 
-PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
+PODFILE CHECKSUM: 08e41981fcdc78ff11c898bc59c6c49635c114b3
 
 COCOAPODS: 1.9.1
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -348,7 +348,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -437,7 +437,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -487,7 +487,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
diff --git a/lib/main.dart b/lib/main.dart
@@ -28,7 +28,7 @@ Future<void> main() async {
 
 class App extends StatefulWidget {
   App() {
-    final router = new Router();
+    final router = new FluroRouter();
     Routes.configureRoutes(router);
     Application.router = router;
   }
diff --git a/lib/routers/application.dart b/lib/routers/application.dart
@@ -9,7 +9,7 @@ class Application {
   /// 通过Application设计环境变量
   static ENV env = ENV.DEV;
 
-  static Router router;
+  static FluroRouter router;
 
   /// 所有获取配置的唯一入口
   Map<String, String> get config {
diff --git a/lib/routers/routers.dart b/lib/routers/routers.dart
@@ -44,7 +44,7 @@ class Routes {
   static const String settingPbUpyun = '/setting/pb/upyun';
   // -----------------------------------
 
-  static void configureRoutes(Router router) {
+  static void configureRoutes(FluroRouter router) {
     router.notFoundHandler = notfoundHandler;
     router.define(root, handler: appHandler);
     router.define(notfound, handler: notfoundHandler);
diff --git a/lib/utils/local_notification.dart b/lib/utils/local_notification.dart
@@ -34,7 +34,7 @@ class LocalNotificationUtil {
         requestSoundPermission: false,
         onDidReceiveLocalNotification: null);
     var initializationSettings = InitializationSettings(
-        initializationSettingsAndroid, initializationSettingsIOS);
+        android: initializationSettingsAndroid, iOS: initializationSettingsIOS, macOS: new MacOSInitializationSettings());
     await _flutterLocalNotificationsPlugin.initialize(initializationSettings,
         onSelectNotification: (String payload) async {
       if (payload != null) {
@@ -84,17 +84,22 @@ class LocalNotificationUtil {
   static AndroidNotificationDetails uploadAndroidChannel() {
     return AndroidNotificationDetails(
         AndroidChannelId.upload_channel, '上传通知', '上传通知提示',
-        importance: Importance.Max, priority: Priority.High, ticker: 'ticker');
+        importance: Importance.max, priority: Priority.high, ticker: 'ticker');
   }
 
   /// 默认IOS
   static IOSNotificationDetails normalIOSNotificationDetails() {
     return IOSNotificationDetails();
   }
 
+  /// 默认MacOS
+  static MacOSNotificationDetails normalMacOSNotificationDetails() {
+    return MacOSNotificationDetails();
+  }
+
   static NotificationDetails createNotificationDetails(
-      AndroidNotificationDetails android, IOSNotificationDetails iOS) {
-    return NotificationDetails(android, iOS);
+      AndroidNotificationDetails android, IOSNotificationDetails iOS, MacOSNotificationDetails macOS) {
+    return NotificationDetails(android: android, iOS: iOS, macOS: macOS);
   }
 }
 
diff --git a/lib/views/home.dart b/lib/views/home.dart
@@ -37,11 +37,11 @@ class _MainTabsPageState extends State<AppPage> {
         items: <BottomNavigationBarItem>[
           BottomNavigationBarItem(
             icon: Icon(IconData(0xe621, fontFamily: 'iconfont')),
-            title: Text('相册')
+            label:'相册'
           ),
           BottomNavigationBarItem(
             icon: Icon(IconData(0xe634, fontFamily: 'iconfont')),
-            title: Text('设置')
+            label: '设置'
           ),
         ],
       ),
diff --git a/lib/views/manage_page/github_page/github_repo_page.dart b/lib/views/manage_page/github_page/github_repo_page.dart
@@ -1,14 +1,12 @@
 import 'package:fluro/fluro.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_picgo/components/loading.dart';
 import 'package:flutter_picgo/components/manage_item.dart';
 import 'package:flutter_picgo/model/github_content.dart';
 import 'package:flutter_picgo/routers/application.dart';
 import 'package:flutter_picgo/routers/routers.dart';
 import 'package:flutter_picgo/views/manage_page/base_loading_page_state.dart';
 import 'package:flutter_picgo/views/manage_page/github_page/github_repo_page_presenter.dart';
 import 'package:path/path.dart' as pathlib;
-import 'package:flutter/services.dart';
 import 'package:toast/toast.dart';
 import 'package:url_launcher/url_launcher.dart';
 
diff --git a/lib/views/manage_page/smms_page/smms_repo_page.dart b/lib/views/manage_page/smms_page/smms_repo_page.dart
@@ -10,6 +10,8 @@ class SMMSRepoPage extends StatefulWidget {
   _SMMSRepoPageState createState() => _SMMSRepoPageState();
 }
 
+enum SortBy { timeup, timedown, sizeup, sizedown }
+
 class _SMMSRepoPageState extends BaseLoadingPageState<SMMSRepoPage>
     implements SMMSRepoPageContract {
   String errorMsg;
@@ -30,6 +32,32 @@ class _SMMSRepoPageState extends BaseLoadingPageState<SMMSRepoPage>
   AppBar get appBar => AppBar(
         title: Text('图床仓库'),
         centerTitle: true,
+        actions: [
+          PopupMenuButton<SortBy>(
+            onSelected: (result) {
+              sortItem(result);
+            },
+            icon: Icon(Icons.more_vert),
+            itemBuilder: (BuildContext context) => <PopupMenuEntry<SortBy>>[
+              const PopupMenuItem<SortBy>(
+                value: SortBy.timeup,
+                child: Text('时间升序'),
+              ),
+              const PopupMenuItem<SortBy>(
+                value: SortBy.timedown,
+                child: Text('时间降序'),
+              ),
+              const PopupMenuItem<SortBy>(
+                value: SortBy.sizeup,
+                child: Text('大小升序'),
+              ),
+              const PopupMenuItem<SortBy>(
+                value: SortBy.sizedown,
+                child: Text('大小降序'),
+              ),
+            ],
+          )
+        ],
       );
 
   @override
@@ -39,6 +67,53 @@ class _SMMSRepoPageState extends BaseLoadingPageState<SMMSRepoPage>
     );
   }
 
+  sortItem(SortBy s) {
+    if (this.contents != null && this.contents.length > 1) {
+      switch (s) {
+        case SortBy.timeup:
+          setState(() {
+            this.contents.sort((a, b) {
+              return a.createdAt.compareTo(b.createdAt);
+            });
+          });
+          break;
+        case SortBy.timedown:
+          setState(() {
+            this.contents.sort((a, b) {
+              if (a.createdAt < b.createdAt) {
+                return 1;
+              } else if (a.createdAt > b.createdAt) {
+                return -1;
+              } else {
+                return 0;
+              }
+            });
+          });
+          break;
+        case SortBy.sizeup:
+          setState(() {
+            this.contents.sort((a, b) {
+              return a.size.compareTo(b.size);
+            });
+          });
+          break;
+        case SortBy.sizedown:
+          setState(() {
+            this.contents.sort((a, b) {
+              if (a.size < b.size) {
+                return 1;
+              } else if (a.size > b.size) {
+                return -1;
+              } else {
+                return 0;
+              }
+            });
+          });
+          break;
+      }
+    }
+  }
+
   @override
   Widget buildError() {
     return Center(
diff --git a/lib/views/setting_page/setting_page.dart b/lib/views/setting_page/setting_page.dart
@@ -87,6 +87,13 @@ class _SettingPageState extends State<SettingPage> {
             },
             trailing: Icon(Icons.arrow_right),
           ),
+          ListTile(
+            title: Text('建议或报告问题'),
+            onTap: () {
+              launch('https://github.com/PicGo/flutter-picgo/issues');
+            },
+            trailing: Icon(Icons.arrow_right),
+          ),
         ],
       ),
     );
diff --git a/lib/views/upload_page/upload_page.dart b/lib/views/upload_page/upload_page.dart
@@ -343,6 +343,8 @@ class _UploadPageState extends State<UploadPage>
         body,
         LocalNotificationUtil.createNotificationDetails(
             LocalNotificationUtil.uploadAndroidChannel(),
-            LocalNotificationUtil.normalIOSNotificationDetails()));
+            LocalNotificationUtil.normalIOSNotificationDetails(),
+            LocalNotificationUtil.normalMacOSNotificationDetails()
+            ));
   }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -15,31 +15,31 @@ 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: 1.9.0+20
+version: 1.9.0+21
 
 environment:
   sdk: ">=2.7.0 <3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  shared_preferences: ^0.5.7+3
+  shared_preferences: ^0.5.12+4
   dio: ^3.0.9
   package_info: ^0.4.1
-  sqflite: ^1.3.0
-  fluro: ^1.6.3
+  sqflite: ^1.3.2+1
+  fluro: ^1.7.7
   event_bus: ^1.1.1
   toast: ^0.1.5
   image_picker: ^0.6.7+2
   json_serializable: ^3.3.0
   cached_network_image: ^2.2.0+1
-  url_launcher: ^5.4.9
+  url_launcher: ^5.7.10
   permission_handler: ^5.0.1
   barcode_scan: ^3.0.1
   provider: ^4.1.3
   crypto: ^2.1.4
-  flutter_local_notifications: ^1.4.4+1
-  pull_to_refresh: ^1.6.0
+  flutter_local_notifications: ^3.0.1+4
+  pull_to_refresh: ^1.6.2
   characters: ^1.0.0
 
 
diff --git a/test/api/tcyun_api_test.dart b/test/api/tcyun_api_test.dart
@@ -1,7 +1,5 @@
-import 'dart:convert';
 import 'dart:io';
 
-import 'package:dio/dio.dart';
 import 'package:flutter_picgo/api/tcyun_api.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:path/path.dart' as path;

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"versionCode": "16"`
`5`	`5`	`},`
`6`	`6`	`"Android": {`
`7`		`- "versionName": "1.8.0",`
`8`		`- "versionCode": "16"`
	`7`	`+ "versionName": "1.9.0",`
	`8`	`+ "versionCode": "20"`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ Future<void> main() async {`
`28`	`28`
`29`	`29`	`class App extends StatefulWidget {`
`30`	`30`	`App() {`
`31`		`- final router = new Router();`
	`31`	`+ final router = new FluroRouter();`
`32`	`32`	`Routes.configureRoutes(router);`
`33`	`33`	`Application.router = router;`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -343,6 +343,8 @@ class _UploadPageState extends State<UploadPage>`
`343`	`343`	`body,`
`344`	`344`	`LocalNotificationUtil.createNotificationDetails(`
`345`	`345`	`LocalNotificationUtil.uploadAndroidChannel(),`
`346`		`- LocalNotificationUtil.normalIOSNotificationDetails()));`
	`346`	`+ LocalNotificationUtil.normalIOSNotificationDetails(),`
	`347`	`+ LocalNotificationUtil.normalMacOSNotificationDetails()`
	`348`	`+ ));`
`347`	`349`	`}`
`348`	`350`	`}`