From ed36d2eadfb9173fd8167034a6ef0ae69cfedf00 Mon Sep 17 00:00:00 2001 From: niuhuan Date: Mon, 5 Sep 2022 12:23:53 +0800 Subject: [PATCH] Update --- ios/Flutter/AppFrameworkInfo.plist | 2 +- ios/Podfile | 2 +- ios/Podfile.lock | 4 ++-- lib/screens/AccountScreen.dart | 13 +++++++++++++ lib/screens/InitScreen.dart | 2 ++ lib/screens/SpaceScreen.dart | 22 ++++++++++++++++++++++ 6 files changed, 41 insertions(+), 4 deletions(-) diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist index 8d4492f..9625e10 100644 --- a/ios/Flutter/AppFrameworkInfo.plist +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/ios/Podfile b/ios/Podfile index 1e8c3c9..88359b2 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '9.0' +# platform :ios, '11.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 5050b1d..713754d 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -93,7 +93,7 @@ SPEC CHECKSUMS: DKImagePickerController: b5eb7f7a388e4643264105d648d01f727110fc3d DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95 - Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a + Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 image_cropper: 60c2789d1f1a78c873235d4319ca0c34a69f2d98 image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0 @@ -104,6 +104,6 @@ SPEC CHECKSUMS: uri_to_file: c4726881848febf4806f0a5707bd12903e02b0f0 url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de -PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c +PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 COCOAPODS: 1.11.3 diff --git a/lib/screens/AccountScreen.dart b/lib/screens/AccountScreen.dart index 92621cf..d8ec15d 100644 --- a/lib/screens/AccountScreen.dart +++ b/lib/screens/AccountScreen.dart @@ -8,6 +8,7 @@ import 'package:pikapika/basic/Method.dart'; import 'package:pikapika/basic/config/IsPro.dart'; import 'package:pikapika/basic/config/Themes.dart'; import 'package:pikapika/basic/enum/ErrorTypes.dart'; +import 'package:pikapika/screens/AboutScreen.dart'; import 'package:pikapika/screens/RegisterScreen.dart'; import 'package:pikapika/screens/SettingsScreen.dart'; import 'package:pikapika/screens/components/NetworkSetting.dart'; @@ -94,6 +95,18 @@ class _AccountScreenState extends State { }, icon: const Text('设置'), ), + IconButton( + onPressed: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => const AboutScreen( + ), + ), + ); + }, + icon: const Text('关于'), + ), IconButton( onPressed: () { if (androidNightModeDisplay) { diff --git a/lib/screens/InitScreen.dart b/lib/screens/InitScreen.dart index e58a53c..e2f40e3 100644 --- a/lib/screens/InitScreen.dart +++ b/lib/screens/InitScreen.dart @@ -8,6 +8,7 @@ import 'package:pikapika/basic/config/AndroidSecureFlag.dart'; import 'package:pikapika/basic/config/Authentication.dart'; import 'package:pikapika/basic/config/AutoClean.dart'; import 'package:pikapika/basic/config/AutoFullScreen.dart'; +import 'package:pikapika/basic/config/CategoriesColumnCount.dart'; import 'package:pikapika/basic/config/ChooserRoot.dart'; import 'package:pikapika/basic/config/ContentFailedReloadAction.dart'; import 'package:pikapika/basic/config/DownloadAndExportPath.dart'; @@ -84,6 +85,7 @@ class _InitScreenState extends State { await initShadowCategories(); await initFullScreenUI(); await initIconLoading(); + await initCategoriesColumnCount(); switchFullScreenUI(); await initContentFailedReloadAction(); await initVolumeController(); diff --git a/lib/screens/SpaceScreen.dart b/lib/screens/SpaceScreen.dart index 94d9365..d356d60 100644 --- a/lib/screens/SpaceScreen.dart +++ b/lib/screens/SpaceScreen.dart @@ -150,6 +150,28 @@ class _SpaceScreenState extends State { title: const Text('我的下载'), ), const Divider(), + ListTile( + onTap: () { + Navigator.push( + context, + MaterialPageRoute(builder: (context) => const ProScreen()), + ); + }, + title: const Text('发电'), + ), + const Divider(), + ListTile( + onTap: () { + Navigator.push( + context, + MaterialPageRoute(builder: (context) => const AboutScreen()), + ); + }, + title: Badged( + child: const Text('关于'), + badge: latestVersion() == null ? null : "1", + )), + const Divider(), ], ), );