Merge pull request #121 from hiranj-kotak/master

solved issue #120 and #136
VaibhavCodeClub · May 25, 2024 · e5bd3e3 · e5bd3e3
2 parents d5be0d7 + 4e0b676
commit e5bd3e3
Show file tree

Hide file tree

Showing 13 changed files with 227 additions and 382 deletions.
diff --git a/assets/images/quiz.jpg b/assets/images/quiz.jpg
diff --git a/lib/main.dart b/lib/main.dart
@@ -7,7 +7,7 @@ import 'package:learn/pages/modules/atoz.dart';
 import 'package:learn/pages/modules/birds.dart';
 import 'package:learn/pages/modules/animals.dart';
 import 'package:learn/pages/fruits.dart';
-import 'package:learn/pages/explore/explore.dart';
+import 'package:learn/pages/explore.dart';
 import 'package:learn/pages/favorite.dart';
 import 'package:learn/pages/modules/occupation.dart';
 import 'package:learn/pages/modules/parts.dart';
@@ -72,8 +72,8 @@ class MyApp extends StatelessWidget {
                 AllRoutes.flowerRoute: (context) => const FlowerPage(),
                 AllRoutes.exploreRoute: (context) => const ExplorePage(),
                 AllRoutes.favoriteRoute: (context) => const FavoritePage(),
-                AllRoutes.quizRoute: (context) => QuizPage(),
-                AllRoutes.seasonRoute: (context) => SeasonsPage(),
+                AllRoutes.quizRoute: (context) => const QuizPage(),
+                AllRoutes.seasonRoute: (context) => const SeasonsPage(),
                 AllRoutes.occupationRoute: (context) => OccupationPage(),
                 AllRoutes.fruitRoute: (context) => FruitsPage(),
               },

diff --git a/lib/pages/about.dart b/lib/pages/about.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: deprecated_member_use
+
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:learn/utils/constants.dart';

diff --git a/lib/pages/explore.dart b/lib/pages/explore.dart
@@ -1,7 +1,5 @@
 import 'dart:ui';
-
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:learn/utils/constants.dart';
 
 // Explore Page
@@ -112,39 +110,39 @@ class ExplorePage extends StatelessWidget {
             childCount: AppConstants.modules.length,
           ),
         ),
-        GestureDetector(
-          onTap: () {
-            Navigator.pushNamed(context, '/quiz');
-          },
-          child: Container(
-            margin: const EdgeInsets.all(5.0),
-            padding: const EdgeInsets.all(8.0),
-            decoration: BoxDecoration(
-              border: Border.all(color: Colors.black, width: 1.0),
-              borderRadius: BorderRadius.circular(8.0),
-              color: Colors.blueAccent,
-            ),
-            child: Row(
-              children: [
-                SizedBox(
-                  width: 50,
-                  height: 50,
-                  child: SvgPicture.asset('assets/explore/notebook.svg'),
-                ),
-                const SizedBox(width: 28.0),
-                const Text(
-                  'Quiz',
-                  style: TextStyle(
-                    fontWeight: FontWeight.bold,
-                    fontSize: 30.0,
-                    fontFamily: 'Comic',
-                    color: Colors.white,
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
+        // GestureDetector(
+        //   onTap: () {
+        //     Navigator.pushNamed(context, '/quiz');
+        //   },
+        //   child: Container(
+        //     margin: const EdgeInsets.all(5.0),
+        //     padding: const EdgeInsets.all(8.0),
+        //     decoration: BoxDecoration(
+        //       border: Border.all(color: Colors.black, width: 1.0),
+        //       borderRadius: BorderRadius.circular(8.0),
+        //       color: Colors.blueAccent,
+        //     ),
+        //     child: Row(
+        //       children: [
+        //         SizedBox(
+        //           width: 50,
+        //           height: 50,
+        //           child: SvgPicture.asset('assets/explore/notebook.svg'),
+        //         ),
+        //         const SizedBox(width: 28.0),
+        //         const Text(
+        //           'Quiz',
+        //           style: TextStyle(
+        //             fontWeight: FontWeight.bold,
+        //             fontSize: 30.0,
+        //             fontFamily: 'Comic',
+        //             color: Colors.white,
+        //           ),
+        //         ),
+        //       ],
+        //     ),
+        //   ),
+        // ),
       ],
     ));
   }

diff --git a/lib/pages/explore/quiz.dart b/lib/pages/explore/quiz.dart
@@ -1,5 +1,6 @@
+// ignore_for_file: library_private_types_in_public_api
+
 import 'package:flutter/material.dart';
-import 'dart:math';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:learn/utils/constants.dart';
 

diff --git a/lib/pages/favorite.dart b/lib/pages/favorite.dart
@@ -5,12 +5,12 @@ class FavoritePage extends StatelessWidget {
 
   // Favorite Page
   // All the favorited modules by the user will be placed here
-  // TODO: Implement the Favorite Page
+  // todo: Implement the Favorite Page
 
   @override
   Widget build(BuildContext context) {
-    return Center(
+    return const Center(
       child: Text("Favorited Items here"),
     );
   }
-}
+}