Fixes

EsinShadrach · Apr 24, 2024 · 9f85693 · 9f85693
1 parent 663e973
commit 9f85693
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 64 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -5,6 +5,7 @@ import "package:flutter_playground/providers/color_provider.dart";
 import "package:flutter_playground/routes.dart";
 import "package:flutter_playground/screens/change_color_scheme.dart";
 import "package:provider/provider.dart";
+import 'package:lucide_icons/lucide_icons.dart';
 
 void main() {
   runApp(
@@ -29,6 +30,13 @@ class MyApp extends StatelessWidget {
         title: "Flutter Demo",
         routes: routes(),
         debugShowCheckedModeBanner: false,
+        builder: (context, child) {
+          return Scaffold(
+            body: SafeArea(
+              child: child!,
+            ),
+          );
+        },
         onUnknownRoute: (settings) {
           return MaterialPageRoute(
             builder: (context) => const Scaffold(

diff --git a/lib/screens/change_color_scheme.dart b/lib/screens/change_color_scheme.dart
@@ -1,4 +1,3 @@
-
 import "package:flutter/material.dart";
 import "package:flutter/services.dart";
 import "package:flutter_playground/extensions.dart";
@@ -20,76 +19,75 @@ class UpdateColorSchemeScreen extends StatelessWidget {
       appBar: AppBar(
         title: const Text("Update ColorScheme"),
       ),
-      body: SafeArea(
-        child: Padding(
-          padding: const EdgeInsets.all(8.0),
-          child: Column(
-            children: [
-              Expanded(
-                child: ListView.separated(
-                  separatorBuilder: (context, index) =>
-                      const SizedBox(height: 10),
-                  itemCount: Colors.primaries.length + 1,
-                  itemBuilder: (context, index) => index == 0
-                      ? Consumer<ColorProvider>(
-                          builder: (context, value, child) =>
-                              SwitchListTile.adaptive(
-                            value: value.isLightMode,
-                            title: const Text("Toggle Brightness"),
-                            inactiveTrackColor:
-                                context.colorScheme.primary.withOpacity(0.2),
-                            activeTrackColor: context.colorScheme.primary,
-                            thumbIcon: MaterialStatePropertyAll(
-                              value.isLightMode
-                                  ? const Icon(Icons.sunny)
-                                  : Icon(
-                                      Icons.dark_mode_rounded,
-                                      color: context.colorScheme.onBackground,
-                                    ),
-                            ),
-                            onChanged: (isOn) => value.toggleBrightness(isOn),
+      body: Padding(
+        padding: const EdgeInsets.all(8.0),
+        child: Column(
+          children: [
+            Expanded(
+              child: ListView.separated(
+                separatorBuilder: (context, index) =>
+                    const SizedBox(height: 10),
+                itemCount: Colors.primaries.length + 1,
+                itemBuilder: (context, index) => index == 0
+                    ? Consumer<ColorProvider>(
+                        builder: (context, value, child) =>
+                            SwitchListTile.adaptive(
+                          value: value.isLightMode,
+                          title: const Text("Toggle Brightness"),
+                          inactiveTrackColor:
+                              context.colorScheme.primary.withOpacity(0.2),
+                          activeTrackColor: context.colorScheme.primary,
+                          thumbIcon: MaterialStatePropertyAll(
+                            value.isLightMode
+                                ? const Icon(Icons.sunny)
+                                : Icon(
+                                    Icons.dark_mode_rounded,
+                                    color: context.colorScheme.onBackground,
+                                  ),
                           ),
-                        )
-                      : Consumer<ColorProvider>(
-                          builder: (context, value, child) => ListTile(
-                            onTap: () {
-                              value.updateFn(Colors.primaries[index - 1]);
-                            },
-                            tileColor: Colors.primaries[index - 1],
-                            shape: const ContinuousRectangleBorder(
-                              borderRadius: BorderRadius.all(
-                                Radius.circular(20),
-                              ),
+                          onChanged: (isOn) => value.toggleBrightness(isOn),
+                        ),
+                      )
+                    : Consumer<ColorProvider>(
+                        builder: (context, value, child) => ListTile(
+                          onTap: () {
+                            value.updateFn(Colors.primaries[index - 1]);
+                          },
+                          tileColor: Colors.primaries[index - 1],
+                          shape: const ContinuousRectangleBorder(
+                            borderRadius: BorderRadius.all(
+                              Radius.circular(20),
                             ),
-                            title: Padding(
-                              padding: const EdgeInsets.all(8.0),
-                              // child: Text("Color Scheme"),
-                              child: Text(
-                                grabColor(
-                                    Colors.primaries[index - 1].toString()),
+                          ),
+                          title: Padding(
+                            padding: const EdgeInsets.all(8.0),
+                            // child: Text("Color Scheme"),
+                            child: Text(
+                              grabColor(
+                                Colors.primaries[index - 1].toString(),
                               ),
                             ),
-                            trailing: IconButton(
-                              onPressed: () async {
-                                var colorVal = grabColor(
-                                  Colors.primaries[index - 1].toString(),
-                                );
+                          ),
+                          trailing: IconButton(
+                            onPressed: () async {
+                              var colorVal = grabColor(
+                                Colors.primaries[index - 1].toString(),
+                              );
 
-                                ClipboardData data = ClipboardData(
-                                  text: colorVal,
-                                );
-                                await Clipboard.setData(data);
-                              },
-                              tooltip: "Copy Color",
-                              icon: const Icon(Icons.copy_rounded),
-                            ),
-                            contentPadding: EdgeInsets.zero,
+                              ClipboardData data = ClipboardData(
+                                text: colorVal,
+                              );
+                              await Clipboard.setData(data);
+                            },
+                            tooltip: "Copy Color",
+                            icon: const Icon(Icons.copy_rounded),
                           ),
+                          contentPadding: EdgeInsets.zero,
                         ),
-                ),
+                      ),
               ),
-            ],
-          ),
+            ),
+          ],
         ),
       ),
     );

diff --git a/pubspec.lock b/pubspec.lock
@@ -107,6 +107,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
+  lucide_icons:
+    dependency: "direct main"
+    description:
+      name: lucide_icons
+      sha256: ad24d0fd65707e48add30bebada7d90bff2a1bba0a72d6e9b19d44246b0e83c4
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.257.0"
   matcher:
     dependency: transitive
     description:
@@ -226,4 +234,4 @@ packages:
     version: "13.0.0"
 sdks:
   dart: ">=3.2.5 <4.0.0"
-  flutter: ">=1.16.0"
+  flutter: ">=1.17.0"
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -12,6 +12,7 @@ dependencies:
 
   cupertino_icons: ^1.0.2
   provider: ^6.1.2
+  lucide_icons: ^0.257.0
 
 dev_dependencies:
   flutter_test: