mukodo cucc

filcnaplo_mobile_ui/lib/common/profile_image/profile_button.dart

@@ -3,7 +3,7 @@ import 'package:filcnaplo_mobile_ui/common/profile_image/profile_image.dart';
 import 'package:filcnaplo_mobile_ui/screens/settings/settings_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:sliding_sheet/sliding_sheet.dart';
+import 'package:wtf_sliding_sheet/wtf_sliding_sheet.dart';
 
 class ProfileButton extends StatelessWidget {
   const ProfileButton({Key? key, required this.child}) : super(key: key);
@@ -12,10 +12,13 @@ class ProfileButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final bool pMode = Provider.of<SettingsProvider>(context, listen: false).presentationMode;
+    final bool pMode =
+        Provider.of<SettingsProvider>(context, listen: false).presentationMode;
 
     return ProfileImage(
-      backgroundColor: !pMode ? child.backgroundColor : Theme.of(context).colorScheme.secondary,
+      backgroundColor: !pMode
+          ? child.backgroundColor
+          : Theme.of(context).colorScheme.secondary,
       heroTag: child.heroTag,
       key: child.key,
       name: !pMode ? child.name : "Béla",

filcnaplo_mobile_ui/lib/common/sliding_bottom_sheet.dart

@@ -1,42 +1,46 @@
 import 'package:flutter/material.dart';
-import 'package:sliding_sheet/sliding_sheet.dart' as ss;
+import 'package:wtf_sliding_sheet/wtf_sliding_sheet.dart' as ss;
 
-void showSlidingBottomSheet({required Widget child, required BuildContext context}) => ss.showSlidingBottomSheet(context,
-    useRootNavigator: true,
-    builder: (context) => ss.SlidingSheetDialog(
-          cornerRadius: 16,
-          cornerRadiusOnFullscreen: 0,
-          avoidStatusBar: true,
-          color: Theme.of(context).colorScheme.background,
-          duration: const Duration(milliseconds: 400),
-          snapSpec: const ss.SnapSpec(
-            snap: true,
-            snappings: [0.5, 1.0],
-            positioning: ss.SnapPositioning.relativeToAvailableSpace,
-          ),
-          headerBuilder: (context, state) {
-            return Material(
+void showSlidingBottomSheet(
+        {required Widget child, required BuildContext context}) =>
+    ss.showSlidingBottomSheet(context,
+        useRootNavigator: true,
+        builder: (context) => ss.SlidingSheetDialog(
+              cornerRadius: 16,
+              cornerRadiusOnFullscreen: 0,
+              avoidStatusBar: true,
               color: Theme.of(context).colorScheme.background,
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Container(
-                    decoration: BoxDecoration(
-                      color: Colors.grey,
-                      borderRadius: BorderRadius.circular(12.0),
-                    ),
-                    height: 4.0,
-                    width: 60.0,
-                    margin: const EdgeInsets.all(12.0),
-                  ),
-                ],
+              duration: const Duration(milliseconds: 400),
+              snapSpec: const ss.SnapSpec(
+                snap: true,
+                snappings: [0.5, 1.0],
+                positioning: ss.SnapPositioning.relativeToAvailableSpace,
               ),
-            );
-          },
-          builder: (context, state) {
-            return Material(
-              color: Theme.of(context).colorScheme.background,
-              child: Padding(padding: const EdgeInsets.fromLTRB(12.0, 0, 12.0, 8.0), child: child),
-            );
-          },
-        ));
+              headerBuilder: (context, state) {
+                return Material(
+                  color: Theme.of(context).colorScheme.background,
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Container(
+                        decoration: BoxDecoration(
+                          color: Colors.grey,
+                          borderRadius: BorderRadius.circular(12.0),
+                        ),
+                        height: 4.0,
+                        width: 60.0,
+                        margin: const EdgeInsets.all(12.0),
+                      ),
+                    ],
+                  ),
+                );
+              },
+              builder: (context, state) {
+                return Material(
+                  color: Theme.of(context).colorScheme.background,
+                  child: Padding(
+                      padding: const EdgeInsets.fromLTRB(12.0, 0, 12.0, 8.0),
+                      child: child),
+                );
+              },
+            ));

filcnaplo_mobile_ui/lib/screens/navigation/navigation_screen.dart

@@ -21,19 +21,21 @@ import 'package:filcnaplo_mobile_ui/common/screens.i18n.dart';
 import 'package:filcnaplo/api/providers/news_provider.dart';
 import 'package:filcnaplo/api/providers/sync.dart';
 import 'package:home_widget/home_widget.dart';
-import 'package:sliding_sheet/sliding_sheet.dart';
+import 'package:wtf_sliding_sheet/wtf_sliding_sheet.dart';
 import 'package:background_fetch/background_fetch.dart';
 
 class NavigationScreen extends StatefulWidget {
   const NavigationScreen({Key? key}) : super(key: key);
 
-  static NavigationScreenState? of(BuildContext context) => context.findAncestorStateOfType<NavigationScreenState>();
+  static NavigationScreenState? of(BuildContext context) =>
+      context.findAncestorStateOfType<NavigationScreenState>();
 
   @override
   NavigationScreenState createState() => NavigationScreenState();
 }
 
-class NavigationScreenState extends State<NavigationScreen> with WidgetsBindingObserver {
+class NavigationScreenState extends State<NavigationScreen>
+    with WidgetsBindingObserver {
   late NavigationRoute selected;
   List<String> initializers = [];
   final _navigatorState = GlobalKey<NavigatorState>();
@@ -65,7 +67,8 @@ class NavigationScreenState extends State<NavigationScreen> with WidgetsBindingO
       Navigator.of(context).popUntil((route) => route.isFirst);
 
       setPage("timetable");
-      _navigatorState.currentState?.pushNamedAndRemoveUntil("timetable", (_) => false);
+      _navigatorState.currentState
+          ?.pushNamedAndRemoveUntil("timetable", (_) => false);
     } else if (uri.scheme == "settings" && uri.authority == "premium") {
       Navigator.of(context).popUntil((route) => route.isFirst);
 
@@ -145,7 +148,8 @@ class NavigationScreenState extends State<NavigationScreen> with WidgetsBindingO
     WidgetsBinding.instance.addObserver(this);
 
     // set client User-Agent
-    Provider.of<KretaClient>(context, listen: false).userAgent = settings.config.userAgent;
+    Provider.of<KretaClient>(context, listen: false).userAgent =
+        settings.config.userAgent;
 
     // Get news
     newsProvider = Provider.of<NewsProvider>(context, listen: false);
@@ -169,8 +173,10 @@ class NavigationScreenState extends State<NavigationScreen> with WidgetsBindingO
   @override
   void didChangePlatformBrightness() {
     if (settings.theme == ThemeMode.system) {
-      Brightness? brightness = WidgetsBinding.instance.window.platformBrightness;
-      Provider.of<ThemeModeObserver>(context, listen: false).changeTheme(brightness == Brightness.light ? ThemeMode.light : ThemeMode.dark);
+      Brightness? brightness =
+          WidgetsBinding.instance.window.platformBrightness;
+      Provider.of<ThemeModeObserver>(context, listen: false).changeTheme(
+          brightness == Brightness.light ? ThemeMode.light : ThemeMode.dark);
     }
     super.didChangePlatformBrightness();
   }
@@ -187,7 +193,8 @@ class NavigationScreenState extends State<NavigationScreen> with WidgetsBindingO
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (newsProvider.show) {
         newsProvider.lock();
-        NewsView.show(newsProvider.news[newsProvider.state], context: context).then((value) => newsProvider.release());
+        NewsView.show(newsProvider.news[newsProvider.state], context: context)
+            .then((value) => newsProvider.release());
       }
     });
 
@@ -223,7 +230,8 @@ class NavigationScreenState extends State<NavigationScreen> with WidgetsBindingO
                   Navigator(
                     key: _navigatorState,
                     initialRoute: selected.name,
-                    onGenerateRoute: (settings) => navigationRouteHandler(settings),
+                    onGenerateRoute: (settings) =>
+                        navigationRouteHandler(settings),
                   ),
                 ],
               ),

filcnaplo_mobile_ui/pubspec.yaml

@@ -28,7 +28,6 @@ dependencies:
   flutter_markdown: ^0.6.5
   animations: ^2.0.1
   animated_list_plus: ^0.5.0
-  sliding_sheet: ^0.5.2
   confetti: ^0.6.0
   live_activities: ^1.0.0
   animated_flip_counter: ^0.2.5
@@ -39,6 +38,7 @@ dependencies:
   dropdown_button2: ^1.8.9
   flutter_svg: ^1.1.6
   background_fetch: ^1.1.5
+  wtf_sliding_sheet: ^1.0.0
   
 dev_dependencies:
   flutter_lints: ^1.0.0