Feat/sync upstream 2.1.3.1

.vscode/build_env.dart

@@ -26,7 +26,7 @@ Future<void> _updatePubspecVersion(int versionCode) async {
 
 void main() async {
   // 手动指定 versionName
-  const versionName = '2.1.2.3-ohos-2';
+  const versionName = '2.1.3.1-ohos';
 
   // 通过 git 命令获取 hash 和 code
   final versionCode = await _getGitCommitCount();

analysis_options.yaml

@@ -12,6 +12,7 @@ include: package:flutter_lints/flutter.yaml
 analyzer:
   exclude:
     - lib/grpc/bilibili/**
+    - lib/**/*.g.dart
     - android/**
     - ios/**
     - linux/**

android/app/src/main/AndroidManifest.xml

@@ -212,7 +212,7 @@
             android:permission="android.permission.MANAGE_DOCUMENTS"
             android:enabled="false"
             android:exported="true"
-            android:authorities="com.example.piliplus.MTDataFilesProvider"
+            android:authorities="${applicationId}.MTDataFilesProvider"
             android:grantUriPermissions="true">
             <intent-filter>
                 <action android:name="android.content.action.DOCUMENTS_PROVIDER" />

ios/Runner/Info.plist

@@ -139,5 +139,7 @@
 			<string>_upnp._tcp</string>
 			<string>_http._tcp</string>
 		</array>
+		<key>ITSAppUsesNonExemptEncryption</key>
+		<false/>
 	</dict>
 </plist>

lib/common/widgets/dialog/dialog.dart

@@ -18,9 +18,7 @@ Future<bool> showConfirmDialog({
               onPressed: Get.back,
               child: Text(
                 '取消',
-                style: TextStyle(
-                  color: Theme.of(context).colorScheme.outline,
-                ),
+                style: TextStyle(color: ColorScheme.of(context).outline),
               ),
             ),
             TextButton(
@@ -36,32 +34,32 @@ Future<bool> showConfirmDialog({
       false;
 }
 
+Widget _statusItem({
+  required bool enabled,
+  required String text,
+  required VoidCallback onTap,
+}) {
+  return ListTile(
+    dense: true,
+    enabled: enabled,
+    title: Padding(
+      padding: const EdgeInsets.only(left: 10),
+      child: Text(
+        '标记为 $text',
+        style: const TextStyle(fontSize: 14),
+      ),
+    ),
+    trailing: !enabled ? const Icon(size: 22, Icons.check) : null,
+    onTap: onTap,
+  );
+}
+
 void showPgcFollowDialog({
   required BuildContext context,
   required String type,
   required int followStatus,
   required ValueChanged<int> onUpdateStatus,
 }) {
-  Widget statusItem({
-    required bool enabled,
-    required String text,
-    required VoidCallback onTap,
-  }) {
-    return ListTile(
-      dense: true,
-      enabled: enabled,
-      title: Padding(
-        padding: const EdgeInsets.only(left: 10),
-        child: Text(
-          '标记为 $text',
-          style: const TextStyle(fontSize: 14),
-        ),
-      ),
-      trailing: !enabled ? const Icon(size: 22, Icons.check) : null,
-      onTap: onTap,
-    );
-  }
-
   showDialog(
     context: context,
     builder: (context) => SimpleDialog(
@@ -73,7 +71,7 @@ void showPgcFollowDialog({
           (followStatus: 2, title: '在看'),
           (followStatus: 1, title: '想看'),
         ].map(
-          (item) => statusItem(
+          (item) => _statusItem(
             enabled: followStatus != item.followStatus,
             text: item.title,
             onTap: () {