tweak

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

android/app/build.gradle.kts

@@ -30,6 +30,12 @@ android {
         versionName = flutter.versionName
     }
 
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging = true
+        }
+    }
+
     val keyProperties = Properties().also {
         val properties = rootProject.file("key.properties")
         if (properties.exists())
@@ -51,12 +57,12 @@ android {
         all {
             signingConfig = config ?: signingConfigs["debug"]
         }
-        release {
+//        release {
-            proguardFiles(
+//            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
+//                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+//                "proguard-rules.pro"
-            )
+//            )
-        }
+//        }
         debug {
             applicationIdSuffix = ".debug"
         }

android/app/src/debug/res/values/string.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">PiliPlus debug</string>
+</resources>

android/app/src/main/AndroidManifest.xml

@@ -36,11 +36,11 @@
     </queries>
 
     <application
-        android:label="PiliPlus"
+        android:label="@string/app_name"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         xmlns:tools="http://schemas.android.com/tools"
-        android:enableOnBackInvokedCallback="true"
+        android:enableOnBackInvokedCallback="false"
         android:allowBackup="false"
         android:fullBackupContent="false"
         tools:replace="android:allowBackup">

android/app/src/main/res/values-v35/styles.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <style name="Ucrop.CropTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="Ucrop.CropTheme" parent="Theme.AppCompat.Light.NoActionBar">
-      <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+        <item name="android:windowLightStatusBar">true</item>
-  </style>
+        <item name="android:fitsSystemWindows">true</item>
+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+    </style>
 </resources>

android/app/src/main/res/values/string.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">PiliPlus</string>
+</resources>

lib/pages/common/slide/common_collapse_slide_page.dart

@@ -1,3 +1,5 @@
+import 'dart:io' show Platform;
+
 import 'package:PiliPlus/pages/common/slide/common_slide_page.dart';
 import 'package:flutter/material.dart';
 
@@ -16,24 +18,27 @@ abstract class CommonCollapseSlidePageState<T extends CommonCollapseSlidePage>
   }
 
   void init() {
-    WidgetsBinding.instance.addPostFrameCallback((_) {
+    if (Platform.isAndroid) {
-      isInit = false;
+      WidgetsBinding.instance.addPostFrameCallback((_) {
-    });
+        isInit = false;
+      });
+    }
   }
 
   @override
   Widget build(BuildContext context) {
-    Widget child = super.build(context);
+    if (Platform.isAndroid) {
-    if (isInit) {
       return Stack(
+        clipBehavior: Clip.none,
         children: [
-          const CustomScrollView(
+          if (isInit)
-            physics: NeverScrollableScrollPhysics(),
+            const CustomScrollView(
-          ),
+              physics: NeverScrollableScrollPhysics(),
-          child,
+            ),
+          super.build(context),
         ],
       );
     }
-    return child;
+    return super.build(context);
   }
 }

lib/pages/dynamics/widgets/vote.dart

@@ -62,7 +62,6 @@ class _VotePanelState extends State<VotePanel> {
       ),
       Flexible(
         child: ListView.builder(
-          key: const PageStorageKey('vote_opions'),
           shrinkWrap: true,
           itemCount: _voteInfo.options.length,
           itemBuilder: (context, index) => _buildOptions(index),

lib/pages/episode_panel/view.dart

@@ -261,7 +261,6 @@ class _EpisodePanelState extends CommonCollapseSlidePageState<EpisodePanel> {
     final isCurrTab = tabIndex == widget.initialTabIndex;
     return KeepAliveWrapper(
       builder: (context) => ScrollablePositionedList.separated(
-        key: PageStorageKey(tabIndex),
         padding: EdgeInsets.only(
           top: 7,
           bottom: MediaQuery.paddingOf(context).bottom + 80,

lib/pages/pgc_review/child/view.dart

@@ -56,7 +56,6 @@ class _PgcReviewChildPageState extends State<PgcReviewChildPage>
     return refreshIndicator(
       onRefresh: _controller.onRefresh,
       child: CustomScrollView(
-        key: PageStorageKey(_tag),
         controller: _controller.scrollController,
         physics: const AlwaysScrollableScrollPhysics(),
         slivers: [

lib/pages/video/ai_conclusion/view.dart

@@ -61,7 +61,6 @@ class _AiDetailState extends CommonCollapseSlidePageState<AiConclusionPanel> {
   @override
   Widget buildList(ThemeData theme) {
     return CustomScrollView(
-      key: const PageStorageKey('ai_detail'),
       controller: _controller,
       physics: const AlwaysScrollableScrollPhysics(),
       slivers: [

lib/pages/video/introduction/pgc/widgets/intro_detail.dart

@@ -99,7 +99,6 @@ class _IntroDetailState extends CommonCollapseSlidePageState<PgcIntroPanel> {
     );
     return SelectionArea(
       child: ListView(
-        key: const PageStorageKey('pgc_intro'),
         controller: _controller,
         physics: const AlwaysScrollableScrollPhysics(),
         padding: EdgeInsets.only(

lib/pages/video/introduction/ugc/widgets/page.dart

@@ -136,7 +136,6 @@ class _PagesPanelState extends State<PagesPanel> {
         SizedBox(
           height: 35,
           child: ListView.builder(
-            key: PageStorageKey(hashCode),
             controller: _scrollController,
             scrollDirection: Axis.horizontal,
             itemCount: pages.length,

lib/pages/video/medialist/view.dart

@@ -122,7 +122,6 @@ class _MediaListPanelState
     () {
       final showDelBtn = widget.onDelete != null && widget.mediaList.length > 1;
       return ScrollablePositionedList.separated(
-        key: const PageStorageKey('medialist'),
         itemScrollController: _controller,
         physics: const AlwaysScrollableScrollPhysics(),
         itemCount: widget.mediaList.length,

lib/pages/video/post_panel/view.dart

@@ -112,7 +112,6 @@ class _PostPanelState extends CommonCollapseSlidePageState<PostPanel> {
       clipBehavior: Clip.none,
       children: [
         SingleChildScrollView(
-          key: const PageStorageKey('segment_list'),
           controller: _controller,
           physics: const AlwaysScrollableScrollPhysics(),
           padding: EdgeInsets.only(bottom: 88 + bottom),

lib/pages/video/view_point/view.dart

@@ -96,7 +96,6 @@ class _ViewPointsPageState
   @override
   Widget buildList(ThemeData theme) {
     return ListView.builder(
-      key: const PageStorageKey('viewpoint'),
       controller: _controller,
       physics: const AlwaysScrollableScrollPhysics(),
       padding: EdgeInsets.only(