🚀 upgrade

.github/workflows/Release.yml

@@ -64,7 +64,7 @@ jobs:
             flutter_version: '2.10.3'
           - target: ios
             host: macos-latest
-            flutter_version: '3.3.8'
+            flutter_version: '3.7.0'
           - target: ios
             host: macos-latest
             flutter_version: '2.10.5'
@@ -79,13 +79,13 @@ jobs:
             flutter_version: '2.10.5'
           - target: android-arm32
             host: ubuntu-20.04
-            flutter_version: '3.3.8'
+            flutter_version: '3.7.0'
           - target: android-arm64
             host: ubuntu-20.04
-            flutter_version: '3.3.8'
+            flutter_version: '3.7.0'
           - target: android-x86_64
             host: ubuntu-20.04
-            flutter_version: '3.3.8'
+            flutter_version: '3.7.0'
 
     runs-on: ${{ matrix.config.host }}
 
@@ -244,13 +244,15 @@ jobs:
         run: |
           sed -i "s/another_xlider: 1.0.1+2/another_xlider: ^1.0.1+2/g" pubspec.yaml
           sed -i "s/flutter_styled_toast: 2.0.0/flutter_styled_toast: ^2.0.0/g" pubspec.yaml
+          sed -i "s/modal_bottom_sheet: ^3.0.0-pre/modal_bottom_sheet: 2.0.1/g" pubspec.yaml
 
       - name: Upgrade deps version (iOS)
         if: steps.check_asset.outputs.skip_build != 'true' && matrix.config.host == 'macos-latest' && startsWith(matrix.config.flutter_version, '3')
         run: |
           brew install gnu-sed
           gsed -i "s/another_xlider: 1.0.1+2/another_xlider: ^1.0.1+2/g" pubspec.yaml
           gsed -i "s/flutter_styled_toast: 2.0.0/flutter_styled_toast: ^2.0.0/g" pubspec.yaml
+          gsed -i "s/modal_bottom_sheet: ^3.0.0-pre/modal_bottom_sheet: 2.0.1/g" pubspec.yaml
 
       - name: Install go mobile (mobile)
         if: steps.check_asset.outputs.skip_build != 'true' && ( matrix.config.target == 'ios' || matrix.config.target == 'android-arm64' || matrix.config.target == 'android-arm32' || matrix.config.target == 'android-x86_64' )
@@ -295,7 +297,7 @@ jobs:
       - name: Add application-identifier (ios)
         if: steps.check_asset.outputs.skip_build != 'true' && matrix.config.target == 'ios'
         run: |
-          /usr/libexec/PlistBuddy -c 'Add :application-identifier string niuhuan.wax' ios/Runner/Info.plist
+          /usr/libexec/PlistBuddy -c 'Add :application-identifier string opensource.wax' ios/Runner/Info.plist
 
       - name: Build (ios)
         if: steps.check_asset.outputs.skip_build != 'true' && matrix.config.target == 'ios'

android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion flutter.compileSdkVersion
+    compileSdkVersion 33 // flutter.compileSdkVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -43,7 +43,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "niuhuan.wax"
+        applicationId "opensource.wax"
         minSdkVersion 19 // flutter.minSdkVersion
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()

android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="niuhuan.wax">
+    package="opensource.wax">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

android/app/src/main/AndroidManifest.xml

@@ -1,12 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="niuhuan.wax">
+    package="opensource.wax">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_INTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_INTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
 
     <queries>
@@ -21,7 +20,7 @@
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
-            android:name=".MainActivity"
+            android:name="opensource.wax.MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"

android/app/src/main/kotlin/niuhuan/wax/MainActivity.kt → android/app/src/main/kotlin/opensource/wax/MainActivity.kt

@@ -1,4 +1,4 @@
-package niuhuan.wax
+package opensource.wax
 
 import android.content.ContentValues
 import android.content.DialogInterface

android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="niuhuan.wax">
+    package="opensource.wax">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

ci/version.code.txt

@@ -1 +1 @@
-v1.1.8
+v1.1.9

ci/version.info.txt

@@ -1,13 +1,10 @@
+v1.1.9
+- [x] 🚀升级渲染引擎
+- [x] 🚀必须注册登录
+- [x] 🚀回收一些系统管理权限, 免除一些系统报警
+
 v1.1.8
 
 - [x] 🚀升级渲染引擎
 - [x] 🐛修复一些图片显示红叉
 - [x] 🚀增加分流
-
-v1.1.7
-
-- [x] 🚀修复删除收藏在一些列表模式下不显示
-
-v1.1.6
-
-- [x] 🚀登录后可收藏漫画

ios/Podfile.lock

@@ -21,7 +21,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
-  url_launcher_ios: ae1517e5e344f5544fb090b079e11f399dfbe4d2
+  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
 
 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
 

ios/Runner.xcodeproj/project.pbxproj

@@ -371,7 +371,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = niuhuan.wax;
+				PRODUCT_BUNDLE_IDENTIFIER = opensource.wax;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = wax;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -504,7 +504,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = niuhuan.wax;
+				PRODUCT_BUNDLE_IDENTIFIER = opensource.wax;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = wax;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -531,7 +531,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = niuhuan.wax;
+				PRODUCT_BUNDLE_IDENTIFIER = opensource.wax;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = wax;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

ios/Runner/Info.plist

@@ -2,12 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>LSApplicationCategoryType</key>
-	<string>public.app-category.entertainment</string>
-	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>Save images</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>Usage images</string>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
 	<key>CFBundleDevelopmentRegion</key>
@@ -30,8 +24,16 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.entertainment</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>Save images</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>Usage images</string>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -51,7 +53,5 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
 </dict>
 </plist>

lib/basic/commons.dart

@@ -11,7 +11,6 @@ import 'package:permission_handler/permission_handler.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:wax/basic/methods.dart';
 
-
 final RouteObserver<ModalRoute<void>> routeObserver =
     RouteObserver<ModalRoute<void>>();
 
@@ -84,14 +83,14 @@ Future<T?> chooseMapDialog<T>(
 }
 
 /// 显示一个toast
-void defaultToast(BuildContext context, String title) {
+void defaultToast(BuildContext context, String title, {duration = 4}) {
   showToast(
     title,
     context: context,
     position: StyledToastPosition.center,
     animation: StyledToastAnimation.scale,
     reverseAnimation: StyledToastAnimation.fade,
-    duration: const Duration(seconds: 4),
+    duration: Duration(seconds: duration),
     animDuration: const Duration(seconds: 1),
     curve: Curves.elasticOut,
     reverseCurve: Curves.linear,

lib/configs/host.dart

@@ -49,3 +49,18 @@ Future chooseHost(BuildContext context) async {
     }
   }
 }
+
+Widget hostSetting() {
+  return StatefulBuilder(
+    builder: (BuildContext context, void Function(void Function()) setState) {
+      return ListTile(
+        title: const Text("分流"),
+        subtitle: Text("${_hostMap[host]} (登录注册不上试试换分流)"),
+        onTap: () async {
+          await chooseHost(context);
+          setState(() {});
+        },
+      );
+    },
+  );
+}

lib/configs/login_state.dart

@@ -209,6 +209,13 @@ class _RegisterDialogState extends State<_RegisterDialog> {
                   icon: const Icon(Icons.arrow_back),
                 ),
                 Expanded(child: Container()),
+                 Text(
+                  "若看不到按钮请往下翻",
+                  style: TextStyle(
+                    color: Colors.grey.shade800,
+                  ),
+                ),
+                Container(width: 10),
               ],
             ),
             ListTile(