Merge branch 'master' into master

VaibhavCodeClub · Jun 2, 2024 · c7abc5b · c7abc5b
2 parents ab70c8d + 9ba1e1d
commit c7abc5b
Show file tree

Hide file tree

Showing 34 changed files with 1,810 additions and 4,376 deletions.
diff --git a/assets/explore/drawing_board.svg b/assets/explore/drawing_board.svg
diff --git a/assets/images/flowers/daisy.svg b/assets/images/flowers/daisy.svg
diff --git a/assets/images/flowers/dandelion.svg b/assets/images/flowers/dandelion.svg
diff --git a/assets/images/flowers/flower-icon.svg b/assets/images/flowers/flower-icon.svg
diff --git a/assets/images/flowers/hibiscus.svg b/assets/images/flowers/hibiscus.svg
diff --git a/assets/images/flowers/jasmine.svg b/assets/images/flowers/jasmine.svg
diff --git a/assets/images/flowers/lavender.svg b/assets/images/flowers/lavender.svg
diff --git a/assets/images/flowers/lily.svg b/assets/images/flowers/lily.svg
diff --git a/assets/images/flowers/lotus.svg b/assets/images/flowers/lotus.svg
diff --git a/assets/images/flowers/marigold.svg b/assets/images/flowers/marigold.svg
diff --git a/assets/images/flowers/rose.svg b/assets/images/flowers/rose.svg
diff --git a/assets/images/flowers/sunflower.svg b/assets/images/flowers/sunflower.svg
diff --git a/assets/images/flowers/tulip.svg b/assets/images/flowers/tulip.svg
diff --git a/lib/landing_page.dart b/lib/landing_page.dart
@@ -22,6 +22,7 @@ class _LandingPageState extends State<LandingPage> {
           padding: const EdgeInsets.all(20),
           child: Column(
             children: [
+
               Center(
                 child: Container(
                   width: width,
@@ -38,12 +39,14 @@ class _LandingPageState extends State<LandingPage> {
                 child: SizedBox(
                   child: DefaultTextStyle(
                     style: TextStyle(
+
                       fontSize: width / 19,
                     ),
                     child: AnimatedTextKit(
                       animatedTexts: [
                         ColorizeAnimatedText(
                           'Learn',
+
                           textStyle: TextStyle(
                               fontSize: width / 12,
                               fontWeight: FontWeight.w900),
@@ -66,6 +69,7 @@ class _LandingPageState extends State<LandingPage> {
                   child: Text(
                     "Learning Made Easy",
                     style: TextStyle(
+
                         fontWeight: FontWeight.w400, fontSize: width / 18),
                   ),
                 ),
@@ -86,7 +90,7 @@ class _LandingPageState extends State<LandingPage> {
                     onPressed: () {
                       Navigator.popAndPushNamed(
                         context,
-                        AllRoutesConstant.mainhome,
+                        AllRoutesConstant.mainhomeRoute,
                       );
                     },
                     child: Text(

diff --git a/lib/main.dart b/lib/main.dart
@@ -3,13 +3,20 @@ import 'package:adaptive_theme/adaptive_theme.dart';
 import 'package:learn/landing_page.dart';
 import 'package:learn/splash_screen.dart';
 import 'package:learn/utils/route/routes.dart';
+import 'package:learn/theme_provider.dart';
+import 'package:provider/provider.dart';
 
 DateTime? currentBackPressTime;
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   final savedThemeMode = await AdaptiveTheme.getThemeMode();
-  runApp(MyApp(savedThemeMode: savedThemeMode));
+  runApp(
+    ChangeNotifierProvider(
+      create: (context) => ThemeProvider(),
+      child: MyApp(savedThemeMode: savedThemeMode),
+    ),
+  );
 }
 
 class MyApp extends StatelessWidget {
@@ -19,12 +26,18 @@ class MyApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return const MaterialApp(
-      debugShowCheckedModeBanner: false,
-      title: 'Learn',
-      themeMode: ThemeMode.system,
-      home: SplashScreen(),
-      onGenerateRoute: Routers.generateRoute,
+    return Consumer<ThemeProvider>(
+      builder: (context, themeProvider, child) {
+        return MaterialApp(
+          debugShowCheckedModeBanner: false,
+          title: 'Learn',
+          theme: ThemeData.light(),
+          darkTheme: ThemeData.dark(),
+          themeMode: themeProvider.themeMode,
+          home: SplashScreen(),
+          onGenerateRoute: Routers.generateRoute,
+        );
+      },
     );
   }
-}
+}