fix swipe gesture

Author: kidozh

lib/app/MainApp.dart

@@ -221,7 +221,16 @@ class MyApp extends StatelessWidget {
             }
         }
 
-        final materialThemeDataLight = ThemeData.from(
+        // final materialThemeDataLight = ThemeData(
+        //   colorScheme: ColorScheme.fromSeed(
+        //     seedColor: themeColorEntity.themeColor,
+        //     dynamicSchemeVariant: themeColorEntity.dynamicSchemeVariant,
+        //     brightness: Brightness.light,
+        //   )
+        //     //surface: Colors.white,
+        // );
+
+        final materialThemeDataLight = ThemeData(
           colorScheme: ColorScheme.fromSeed(
             seedColor: themeColorEntity.themeColor,
             dynamicSchemeVariant: themeColorEntity.dynamicSchemeVariant,
@@ -230,9 +239,15 @@ class MyApp extends StatelessWidget {
           ).harmonized(),
           useMaterial3: themeColorEntity.useMaterial3,
           textTheme: typography.black.useSystemChineseFont(Brightness.light),
+          pageTransitionsTheme: Platform.isIOS?PageTransitionsTheme(
+              builders: {
+                TargetPlatform.android: CupertinoPageTransitionsBuilder(),
+                TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),
+              }
+          ): null
         );
 
-        final materialThemeDataDark = ThemeData.from(
+        final materialThemeDataDark = ThemeData(
           colorScheme: ColorScheme.fromSeed(
             seedColor: themeColorEntity.themeColor,
             dynamicSchemeVariant: themeColorEntity.dynamicSchemeVariant,
@@ -241,6 +256,12 @@ class MyApp extends StatelessWidget {
           ).harmonized(),
           useMaterial3: themeColorEntity.useMaterial3,
           textTheme: typography.white.useSystemChineseFont(Brightness.dark),
+            pageTransitionsTheme: Platform.isIOS?PageTransitionsTheme(
+                builders: {
+                  TargetPlatform.android: CupertinoPageTransitionsBuilder(),
+                  TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),
+                }
+            ): null
         );
         const darkDefaultCupertinoTheme =
             CupertinoThemeData(brightness: Brightness.dark);

lib/page/SubscribeChannelPage.dart

@@ -223,15 +223,18 @@ class SubscribeChannelState extends State<SubscribeChannelStatefulWidget> {
                                 if (index ==
                                     subscribeChannelResult.channelList.length - 1 &&
                                     isSubmitting == true)
-                                  PlatformCircularProgressIndicator(),
+                                  Container(
+                                    padding: EdgeInsets.all(8),
+                                    child: PlatformCircularProgressIndicator()
+                                  ),
                               ],
                             );
                           });
                     } else {
                       // no channel
                       return Center(
                         child: Padding(
-                          padding: EdgeInsets.symmetric(vertical: 64, horizontal: 32),
+                          padding: EdgeInsets.symmetric(vertical: 64, horizontal: 16),
                           child: Column(
                               mainAxisSize: MainAxisSize.max,
                               mainAxisAlignment: MainAxisAlignment.center,

lib/screen/LoadingScreen.dart

@@ -11,8 +11,20 @@ class LoadingScreen extends StatelessWidget{
   @override
   Widget build(BuildContext context) {
 
-    return Container(
-      child: PlatformCircularProgressIndicator(),
+    return Center(
+      child: Column(
+        mainAxisSize: MainAxisSize.max,
+        mainAxisAlignment: MainAxisAlignment.center,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          SizedBox(
+            width: 32,
+            height: 32,
+            child: PlatformCircularProgressIndicator(),
+          ),
+
+        ],
+      ),
     );
   }
 

pubspec.yaml

@@ -75,7 +75,9 @@ dependencies:
   # flutter_apns: ^1.6.0
   scroll_to_index: any
   easy_refresh: ^3.0.2+2
-  open_filex: ^4.0.1
+  open_filex:
+    git:
+      url: https://github.com/mufassalhussain/open_filex
   flutter_polls: ^0.1.0
   push: ^3.3.3
   google_mobile_ads: ^5.1.0