setup create_addiction page anim, change checkboxes to switches

onur-yildiz · Mar 28, 2021 · 527b431 · 527b431
1 parent a330749
commit 527b431
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/lib/screens/create_addiction_screen.dart b/lib/screens/create_addiction_screen.dart
@@ -139,9 +139,25 @@ class _AddictionCardState extends State<AddictionCard>
       final newAddiction =
           await Provider.of<AddictionsProvider>(context, listen: false)
               .createAddiction(addictionData);
-      Navigator.of(context).popAndPushNamed(
-        AddictionItemScreen.routeName,
-        arguments: AddictionItemScreenArgs(newAddiction),
+      Navigator.of(context).pushReplacement(
+        PageRouteBuilder(
+          transitionDuration: Duration(milliseconds: 250),
+          reverseTransitionDuration: Duration(milliseconds: 250),
+          pageBuilder: (_, __, ___) => AddictionItemScreen(),
+          settings: RouteSettings(
+            arguments: AddictionItemScreenArgs(newAddiction),
+          ),
+          transitionsBuilder: (context, animation, secondaryAnimation, child) {
+            var begin = 0.0;
+            var end = 1.0;
+            var tween = Tween(begin: begin, end: end);
+
+            return FadeTransition(
+              opacity: animation.drive(tween),
+              child: child,
+            );
+          },
+        ),
       );
     }
   }

diff --git a/lib/widgets/settings_view.dart b/lib/widgets/settings_view.dart
@@ -38,6 +38,7 @@ class _SettingsViewState extends State<SettingsView> {
   @override
   Widget build(BuildContext context) {
     final local = AppLocalizations.of(context);
+    final isDark = MediaQuery.of(context).platformBrightness == Brightness.dark;
 
     return Drawer(
       child: LayoutBuilder(
@@ -79,7 +80,7 @@ class _SettingsViewState extends State<SettingsView> {
                               ),
                             ),
                           ),
-                          CheckboxListTile(
+                          SwitchListTile(
                             contentPadding: const EdgeInsets.symmetric(
                                 vertical: 24, horizontal: 8),
                             title: Text(
@@ -106,7 +107,7 @@ class _SettingsViewState extends State<SettingsView> {
                             height: 0,
                             thickness: 1,
                           ),
-                          CheckboxListTile(
+                          SwitchListTile(
                             contentPadding: const EdgeInsets.symmetric(
                                 vertical: 24, horizontal: 8),
                             title: Text(