Merge branch 'main' into build-ios

README.md

@@ -53,7 +53,8 @@ flutter --version
 注：Framework revision XXXXXX可能会不一致，但后续时间应该是一致的
 <br/>
 Android相关版本：
-> gradle: 7.6.3
+> JDK: 21.0.4
+> gradle: 8.10.2
 > kotlin: 1.9.22
 > minSdk: 21
 > targetSdk: 34

android/app/build.gradle

@@ -37,23 +37,24 @@ android {
     compileSdkVersion 34
 
     namespace 'com.orz12.PiliPalaX'
-    ndkVersion flutter.ndkVersion
+    // ndkVersion flutter.ndkVersion
+    ndkVersion = "27.0.12077973"
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
+        encoding = "UTF-8"
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '21'
     }
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.orz12.PiliPalaX"
         // 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.
@@ -95,6 +96,8 @@ flutter {
 }
 
 dependencies {
+    implementation 'androidx.annotation:annotation:1.9.0'
+    implementation 'org.conscrypt:conscrypt-android:2.5.2'
 }
 
 ext.abiCodes = ["x86_64": 1, "armeabi-v7a": 2, "arm64-v8a": 3]

android/app/proguard-rules.pro

@@ -0,0 +1,3 @@
+-dontwarn com.android.org.conscrypt.SSLParametersImpl
+-dontwarn javax.annotation.Nullable
+-dontwarn org.apache.harmony.xnet.provider.jsse.SSLParametersImpl

android/app/src/main/kotlin/com/orz12/PiliPalaX/MainActivity.kt

@@ -3,26 +3,34 @@ package com.orz12.PiliPalaX
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 //import io.flutter.plugin.common.MethodChannel
-import com.ryanheise.audioservice.AudioServiceActivity
+//import com.ryanheise.audioservice.AudioServiceActivity
+import com.ryanheise.audioservice.AudioServicePlugin
 import android.os.Build
 import android.os.Bundle
-import android.view.WindowManager.LayoutParams
+//import android.view.WindowManager.LayoutParams
+import fl.pip.FlPiPActivity
+import android.content.Context
+import androidx.annotation.NonNull
 
-class MainActivity : AudioServiceActivity() {
+//class AudioServiceActivity : FlPiPActivity() {
+class MainActivity : FlPiPActivity() {
 //    private lateinit var methodChannel: MethodChannel
 
+    override fun provideFlutterEngine(context: Context): FlutterEngine {
+        return AudioServicePlugin.getFlutterEngine(context)
+    }
 //    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
 //        super.configureFlutterEngine(flutterEngine)
 //        methodChannel = MethodChannel(flutterEngine!!.getDartExecutor()!!.getBinaryMessenger(), CHANNEL)
 //    }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            window.attributes.layoutInDisplayCutoutMode =
-                LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
-        }
-    }
+//    override fun onCreate(savedInstanceState: Bundle?) {
+//        super.onCreate(savedInstanceState)
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+//            window.attributes.layoutInDisplayCutoutMode =
+//                LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+//        }
+//    }
 
 //    override fun onUserLeaveHint() {
 //        super.onUserLeaveHint()

android/build.gradle

@@ -33,6 +33,22 @@ subprojects {
                 }
             }
         }
+        if (project.hasProperty('android')) {
+            project.android {
+                if (namespace == null) {
+                    project.logger.error(
+                        "Warning: 'namespace' is not specified in Flutter plugin: "
+                            + project.name
+                            + ". Defaulting to the package name "
+                            + project.group
+                            + " of the plugin.\nSee "
+                            + "https://d.android.com/r/tools/upgrade-assistant/set-namespace"
+                            + "for information about setting the namespace."
+                    )
+                    namespace project.group
+                }
+            }
+        }
     }
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Mon Oct 14 04:55:29 CST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

android/settings.gradle

@@ -25,8 +25,9 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.2.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.22" apply false
+    id "com.android.application" version "8.7.0" apply false
+//    id "com.android.library" version "8.7.0" apply false
+    id "org.jetbrains.kotlin.android" version "2.0.20" apply false
 }
 
 include ":app"

ios/Runner/AppDelegate.swift

@@ -1,13 +1,18 @@
+import fl_pip
 import UIKit
 import Flutter
 
-@UIApplicationMain
-@objc class AppDelegate: FlutterAppDelegate {
+@main
+@objc class AppDelegate: FlFlutterAppDelegate {
   override func application(
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
     GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
+
+  override func registerPlugin(_ registry: FlutterPluginRegistry) {
+    GeneratedPluginRegistrant.register(with: registry)
+  }
 }

ios/Runner/Info.plist

@@ -103,19 +103,20 @@
 			</dict>
 		</array>
 		<key>NSAppTransportSecurity</key>
-        <dict>
-            <key>NSAllowsArbitraryLoads</key>
-            <true/>
-        </dict>
-        <key>NSBonjourServices</key>
-        <array>
-            <string>_dartobservatory._tcp</string>
-        </array>
+		<dict>
+			<key>NSAllowsArbitraryLoads</key>
+			<true/>
+		</dict>
+		<key>NSBonjourServices</key>
+		<array>
+			<string>_dartVmService._tcp</string>
+		</array>
 		<key>UIBackgroundModes</key>
 		<array>
 			<string>audio</string>
-            <string>processing</string>
-            <string>remote-notification</string>
+			<string>fetch</string>
+			<string>processing</string>
+			<string>remote-notification</string>
 		</array>
 		<key>UIStatusBarHidden</key>
 		<false/>

lib/common/skeleton/skeleton.dart

@@ -13,8 +13,8 @@ class Skeleton extends StatelessWidget {
     var shimmerGradient = LinearGradient(
       colors: [
         Colors.transparent,
-        Theme.of(context).colorScheme.background.withAlpha(10),
-        Theme.of(context).colorScheme.background.withAlpha(10),
+        Theme.of(context).colorScheme.surface.withAlpha(10),
+        Theme.of(context).colorScheme.surface.withAlpha(10),
         Colors.transparent,
       ],
       stops: const [

lib/common/skeleton/video_card_v.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'skeleton.dart';
 
 class VideoCardVSkeleton extends StatelessWidget {
-  const VideoCardVSkeleton({Key? key}) : super(key: key);
+  const VideoCardVSkeleton({super.key});
 
   @override
   Widget build(BuildContext context) {

lib/common/skeleton/video_reply.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'skeleton.dart';
 
 class VideoReplySkeleton extends StatelessWidget {
-  const VideoReplySkeleton({Key? key}) : super(key: key);
+  const VideoReplySkeleton({super.key});
 
   @override
   Widget build(BuildContext context) {

lib/common/widgets/animated_dialog.dart

@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
 
 class AnimatedDialog extends StatefulWidget {
-  const AnimatedDialog({Key? key, required this.child, this.closeFn})
-      : super(key: key);
+  const AnimatedDialog({super.key, required this.child, this.closeFn});
 
   final Widget child;
   final Function? closeFn;

lib/common/widgets/appbar.dart

@@ -5,8 +5,8 @@ class AppBarWidget extends StatelessWidget implements PreferredSizeWidget {
     required this.child,
     required this.controller,
     required this.visible,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   final PreferredSizeWidget child;
   final AnimationController controller;

lib/common/widgets/audio_video_progress_bar.dart

@@ -74,7 +74,7 @@ class ProgressBar extends LeafRenderObjectWidget {
   /// When a user drags the thumb to a new location you can be notified
   /// by the [onSeek] callback so that you can update your audio/video player.
   const ProgressBar({
-    Key? key,
+    super.key,
     required this.progress,
     required this.total,
     this.buffered,
@@ -96,7 +96,7 @@ class ProgressBar extends LeafRenderObjectWidget {
     this.timeLabelType,
     this.timeLabelTextStyle,
     this.timeLabelPadding = 0.0,
-  }) : super(key: key);
+  });
 
   /// The elapsed playing time of the media.
   ///
@@ -274,7 +274,7 @@ class ProgressBar extends LeafRenderObjectWidget {
       thumbRadius: thumbRadius,
       thumbColor: thumbColor ?? primaryColor,
       thumbGlowColor:
-      thumbGlowColor ?? (thumbColor ?? primaryColor).withAlpha(80),
+          thumbGlowColor ?? (thumbColor ?? primaryColor).withAlpha(80),
       thumbGlowRadius: thumbGlowRadius,
       thumbCanPaintOutsideBar: thumbCanPaintOutsideBar,
       timeLabelLocation: timeLabelLocation ?? TimeLabelLocation.below,
@@ -958,7 +958,7 @@ class _RenderProgressBar extends RenderBox {
 
     // progress bar
     final barDy =
-    (isLabelBelow) ? 0.0 : _leftLabelSize.height + _timeLabelPadding;
+        (isLabelBelow) ? 0.0 : _leftLabelSize.height + _timeLabelPadding;
     _drawProgressBar(canvas, Offset(0, barDy), Size(barWidth, barHeight));
   }
 
@@ -1042,9 +1042,9 @@ class _RenderProgressBar extends RenderBox {
 
   void _drawBar(
       {required Canvas canvas,
-        required Size availableSize,
-        required double widthProportion,
-        required Color color}) {
+      required Size availableSize,
+      required double widthProportion,
+      required Color color}) {
     final strokeCap = (_barCapShape == BarCapShape.round)
         ? StrokeCap.round
         : StrokeCap.square;
@@ -1085,7 +1085,7 @@ class _RenderProgressBar extends RenderBox {
 
   String _getTimeString(Duration time) {
     final minutes =
-    time.inMinutes.remainder(Duration.minutesPerHour).toString();
+        time.inMinutes.remainder(Duration.minutesPerHour).toString();
     final seconds = time.inSeconds
         .remainder(Duration.secondsPerMinute)
         .toString()
@@ -1101,7 +1101,7 @@ class _RenderProgressBar extends RenderBox {
 
     // description
     config.textDirection = TextDirection.ltr;
-    config.label = '进度条';//'Progress bar';
+    config.label = '进度条'; //'Progress bar';
     config.value = '${(_thumbValue * 100).round()}%';
 
     // increase action

lib/common/widgets/content_container.dart

@@ -7,12 +7,11 @@ class ContentContainer extends StatelessWidget {
   final Clip? childClipBehavior;
 
   const ContentContainer(
-      {Key? key,
+      {super.key,
       this.contentWidget,
       this.bottomWidget,
       this.isScrollable = true,
-      this.childClipBehavior})
-      : super(key: key);
+      this.childClipBehavior});
 
   @override
   Widget build(BuildContext context) {

lib/common/widgets/html_render.dart

@@ -1,8 +1,5 @@
-import 'dart:ffi';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
-import 'package:get/get.dart';
 import '../../utils/storage.dart';
 import 'network_img_layer.dart';
 

lib/common/widgets/http_error.dart

@@ -34,7 +34,7 @@ class HttpError extends StatelessWidget {
                 fn!();
               },
               style: ButtonStyle(
-                backgroundColor: MaterialStateProperty.resolveWith((states) {
+                backgroundColor: WidgetStateProperty.resolveWith((states) {
                   return Theme.of(context).colorScheme.primary.withAlpha(20);
                 }),
               ),

lib/common/widgets/live_card.dart

@@ -8,9 +8,9 @@ class LiveCard extends StatelessWidget {
   final dynamic liveItem;
 
   const LiveCard({
-    Key? key,
+    super.key,
     required this.liveItem,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -77,7 +77,7 @@ class LiveCard extends StatelessWidget {
 class LiveContent extends StatelessWidget {
   // ignore: prefer_typing_uninitialized_variables
   final liveItem;
-  const LiveContent({Key? key, required this.liveItem}) : super(key: key);
+  const LiveContent({super.key, required this.liveItem});
   @override
   Widget build(BuildContext context) {
     return Padding(

lib/common/widgets/network_img_layer.dart

@@ -1,6 +1,5 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 import 'package:hive/hive.dart';
 import 'package:PiliPalaX/utils/extension.dart';
 import 'package:PiliPalaX/utils/global_data.dart';

lib/common/widgets/overlay_pop.dart

@@ -14,12 +14,12 @@ class OverlayPop extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final double imgWidth = min(Get.height,Get.width) - 8 * 2;
+    final double imgWidth = min(Get.height, Get.width) - 8 * 2;
     return Container(
       margin: const EdgeInsets.symmetric(horizontal: 8),
       width: imgWidth,
       decoration: BoxDecoration(
-        color: Theme.of(context).colorScheme.background,
+        color: Theme.of(context).colorScheme.surface,
         borderRadius: BorderRadius.circular(10.0),
       ),
       child: Column(
@@ -47,7 +47,7 @@ class OverlayPop extends StatelessWidget {
                   child: IconButton(
                     tooltip: '关闭',
                     style: ButtonStyle(
-                      padding: MaterialStateProperty.all(EdgeInsets.zero),
+                      padding: WidgetStateProperty.all(EdgeInsets.zero),
                     ),
                     onPressed: () => closeFn!(),
                     icon: const Icon(