Merge pull request #13 from aliahmad79/master

Author: atiqsamtia

lib/main.dart

@@ -19,6 +19,7 @@ class MyApp extends StatelessWidget {
         final themeChanger = Provider.of<ThemeChanger>(context);
         return MaterialApp(
           title: TITLE,
+          debugShowCheckedModeBanner: false,
           themeMode: themeChanger.getTheme,
           darkTheme: Style.get(true),
           theme: Style.get(false),

lib/tabs/home_tab.dart

@@ -55,7 +55,7 @@ class ListHeading extends StatelessWidget {
               Navigator.push(context, MaterialPageRoute(builder: (context) => SingleCategory(category)));
             },
             child: Container(
-              decoration: BoxDecoration(borderRadius: BorderRadius.circular(8.0), color: Theme.of(context).textSelectionColor),
+              decoration: BoxDecoration(borderRadius: BorderRadius.circular(8.0), color: Theme.of(context).colorScheme.secondary),
               padding: EdgeInsets.symmetric(horizontal: 10.0, vertical: 6.0),
               child: Text('Show All'),
             ),

lib/theme.dart

@@ -5,23 +5,27 @@ class Style {
     Color backgroundColor = isDark ? Colors.black : Colors.white;
     Color foregroundColor = isDark ? Colors.white : Colors.black;
     return ThemeData(
-      brightness: isDark ? Brightness.dark : Brightness.light,
+      // brightness: isDark ? Brightness.dark : Brightness.light,
       backgroundColor: backgroundColor,
       canvasColor: backgroundColor,
-      textSelectionColor: isDark ? Colors.white12 : Colors.grey.shade300,
       primaryColor: Color(0xFF249991),
-      accentColor: Color(0xFF249991),
       appBarTheme: AppBarTheme(
-          textTheme: TextTheme(
+          color: backgroundColor,
+          foregroundColor: foregroundColor,
+          elevation: 0,
+          iconTheme: IconThemeData(color: foregroundColor), toolbarTextStyle: TextTheme(
             titleMedium: TextStyle(
               color: foregroundColor,
               fontSize: 24.0,
               fontWeight: FontWeight.bold,
             ),
-          ),
-          color: backgroundColor,
-          elevation: 0,
-          iconTheme: IconThemeData(color: foregroundColor)),
+          ).bodyText2, titleTextStyle: TextTheme(
+            titleMedium: TextStyle(
+              color: foregroundColor,
+              fontSize: 24.0,
+              fontWeight: FontWeight.bold,
+            ),
+          ).headline6),
       textTheme: TextTheme(
         bodyText1: TextStyle(color: foregroundColor, fontWeight: FontWeight.bold),
         bodyText2: TextStyle(
@@ -31,6 +35,9 @@ class Style {
           fontFamily: 'Roboto',
         ),
       ),
+      colorScheme: ColorScheme.fromSwatch()
+          .copyWith(secondary: Color(0xFF249991), brightness: isDark ? Brightness.dark : Brightness.light),
+      textSelectionTheme: TextSelectionThemeData(selectionColor: isDark ? Colors.white12 : Colors.grey.shade300),
     );
   }
 }

pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.8.2"
+    version: "2.9.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -42,14 +42,7 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.1"
+    version: "1.2.1"
   chewie:
     dependency: transitive
     description:
@@ -70,7 +63,7 @@ packages:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   collection:
     dependency: transitive
     description:
@@ -105,7 +98,7 @@ packages:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   ffi:
     dependency: transitive
     description:
@@ -218,21 +211,21 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.11"
+    version: "0.12.12"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.4"
+    version: "0.1.5"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   nested:
     dependency: transitive
     description:
@@ -260,7 +253,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
   path_drawing:
     dependency: transitive
     description:
@@ -391,7 +384,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.2"
+    version: "1.9.0"
   sqflite:
     dependency: transitive
     description:
@@ -426,7 +419,7 @@ packages:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   synchronized:
     dependency: transitive
     description:
@@ -440,14 +433,14 @@ packages:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.9"
+    version: "0.4.12"
   tuple:
     dependency: transitive
     description: