Merge branch 'dev'

android/app/build.gradle

@@ -25,6 +25,12 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+   keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 android {
     compileSdkVersion 28
 
@@ -37,7 +43,6 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "tech.urmilshroff.dashboard_reborn"
         minSdkVersion 24
         targetSdkVersion 28
@@ -46,13 +51,22 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
-    buildTypes {
-        release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
-        }
-    }
+   signingConfigs {
+       release {
+           keyAlias keystoreProperties['keyAlias']
+           keyPassword keystoreProperties['keyPassword']
+           storeFile file(keystoreProperties['storeFile'])
+           storePassword keystoreProperties['storePassword']
+       }
+   }
+
+   buildTypes {
+       release {
+           signingConfig signingConfigs.release
+           minifyEnabled false
+           useProguard false
+       }
+   }
 }
 
 flutter {

android/app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     <application
         android:name="io.flutter.app.FlutterApplication"
         android:label="Dashboard Reborn"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/launcher_icon">
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"

android/key.properties

@@ -0,0 +1,4 @@
+storePassword=android
+keyPassword=android
+keyAlias=key
+storeFile=/Users/urmilshroff/Development/Apps/Projects/key.jks

ios/Runner.xcodeproj/project.pbxproj

@@ -142,7 +142,6 @@
 				35AD68BC4A8033499CB150F7 /* Pods-Runner.release.xcconfig */,
 				F88F9FA8797DE2A0D72D6DAD /* Pods-Runner.profile.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -397,6 +396,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = tech.urmilshroff.dashboardReborn;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 4.0;
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Profile;
@@ -529,6 +529,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = On;
 				SWIFT_VERSION = 4.0;
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -557,6 +558,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_SWIFT3_OBJC_INFERENCE = On;
 				SWIFT_VERSION = 4.0;
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;

lib/main.dart

@@ -1,19 +1,16 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:dashboard_reborn/pages/home_page.dart';
-import 'package:dynamic_theme/dynamic_theme.dart';
-import 'package:dashboard_reborn/utils/colors.dart';
-import 'package:dashboard_reborn/utils/functions.dart';
-import 'package:dashboard_reborn/utils/textstyles.dart';
-import 'package:dashboard_reborn/widgets/tile.dart';
 import 'package:dashboard_reborn/pages/note_page.dart';
+import 'package:dashboard_reborn/utils/colors.dart';
+import 'package:dynamic_theme/dynamic_theme.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
 
 void main() => runApp(MyApp());
 
 class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return DynamicTheme(
+        //for dark mode/light mode
         defaultBrightness: Brightness.dark,
         data: (brightness) => ThemeData(
               primaryColor: MyColors.primaryColor,

lib/pages/about_page.dart

@@ -1,14 +1,11 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:dashboard_reborn/main.dart';
 import 'package:dashboard_reborn/utils/colors.dart';
 import 'package:dashboard_reborn/utils/functions.dart';
 import 'package:dashboard_reborn/utils/textstyles.dart';
 import 'package:dashboard_reborn/widgets/tile.dart';
-import 'package:dynamic_theme/dynamic_theme.dart';
 import 'package:eva_icons_flutter/eva_icons_flutter.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
-import 'package:url_launcher/url_launcher.dart';
 
 class MyAboutPage extends StatefulWidget {
   @override
@@ -34,7 +31,8 @@ class _MyAboutPageState extends State<MyAboutPage> {
         'the Flutter community. \n\nPlease see the '
         'README.md file in the repository below for '
         'more details.',
-  ];
+  ]; //the text in the tile
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(

lib/pages/gradients_page.dart

@@ -1,17 +1,11 @@
-import 'dart:math';
-import 'package:flutter/material.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:dashboard_reborn/main.dart';
 import 'package:dashboard_reborn/utils/colors.dart';
 import 'package:dashboard_reborn/utils/functions.dart';
-import 'package:dashboard_reborn/utils/textstyles.dart';
-import 'package:dashboard_reborn/widgets/tile.dart';
-import 'package:dynamic_theme/dynamic_theme.dart';
-import 'package:eva_icons_flutter/eva_icons_flutter.dart';
-import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
-import 'package:dashboard_reborn/widgets/swiping_cards.dart';
-import 'package:dashboard_reborn/widgets/parallax_cards.dart';
 import 'package:dashboard_reborn/utils/page_transformer.dart';
+import 'package:dashboard_reborn/widgets/parallax_cards.dart';
+import 'package:dashboard_reborn/widgets/swiping_cards.dart';
+import 'package:eva_icons_flutter/eva_icons_flutter.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
 import 'package:gradient_widgets/gradient_widgets.dart';
 
 List<String> swipingCardImages = [
@@ -93,6 +87,7 @@ class _MyGradientsPageState extends State<MyGradientsPage> {
       body: Container(
         decoration: BoxDecoration(
             gradient: LinearGradient(
+                //gradient colors change according to set theme
                 colors: isThemeCurrentlyDark(context)
                     ? [GradientColors.darkStart, GradientColors.darkEnd]
                     : [GradientColors.lightStart, GradientColors.lightEnd],
@@ -126,7 +121,8 @@ class _MyGradientsPageState extends State<MyGradientsPage> {
                       shaderRect: Rect.fromLTWH(0.0, 0.0, 50.0, 50.0),
                       gradient: isThemeCurrentlyDark(context)
                           ? Gradients.coldLinear
-                          : Gradients.haze,
+                          : Gradients
+                              .haze, //gradient colors change according to set theme
                       style: TextStyle(
                         fontFamily: 'Rubik',
                         fontWeight: FontWeight.w600,

lib/pages/home_page.dart

@@ -1,16 +1,15 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:dashboard_reborn/main.dart';
+import 'package:dashboard_reborn/pages/about_page.dart';
+import 'package:dashboard_reborn/pages/gradients_page.dart';
+import 'package:dashboard_reborn/pages/material_page.dart';
 import 'package:dashboard_reborn/utils/colors.dart';
 import 'package:dashboard_reborn/utils/functions.dart';
-import 'package:dashboard_reborn/utils/textstyles.dart';
 import 'package:dashboard_reborn/widgets/tile.dart';
 import 'package:dynamic_theme/dynamic_theme.dart';
 import 'package:eva_icons_flutter/eva_icons_flutter.dart';
-import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
-import 'package:dashboard_reborn/pages/gradients_page.dart';
-import 'package:dashboard_reborn/pages/material_page.dart';
-import 'package:dashboard_reborn/pages/about_page.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+//this page is based on https://github.com/Ivaskuu/dashboard
 
 class MyHomePage extends StatefulWidget {
   @override
@@ -35,7 +34,7 @@ class _MyHomePageState extends State<MyHomePage> {
     List<Color> splashColors = [
       invertColorsMaterial(context),
       MaterialColors.blue,
-      invertColorsStrong(context),
+      MyColors.accentColor,
     ]; //splash color of the individual tile, mapped to index values
 
     return Scaffold(
@@ -69,7 +68,8 @@ class _MyHomePageState extends State<MyHomePage> {
                 childAspectRatio: 2.5,
                 children: List.generate(itemNames.length, (index) {
                   return Hero(
-                    tag: 'tile$index',
+                    tag: 'tile$index', //using a different hero widget tag for
+                    // each page mapped to the page's index value
                     child: buildTile(
                       context,
                       tileColors[index],
@@ -102,7 +102,7 @@ class _MyHomePageState extends State<MyHomePage> {
                             return null;
                           }
                         }));
-                      },
+                      }, //opens appropriate page
                     ),
                   );
                 }),
@@ -114,8 +114,14 @@ class _MyHomePageState extends State<MyHomePage> {
       floatingActionButton: FloatingActionButton(
         heroTag: 'fab',
         child: isThemeCurrentlyDark(context)
-            ? Icon(EvaIcons.sun, size: 30.0,) //show sun icon
-            : Icon(EvaIcons.moon, size: 26.0,), //show moon icon,
+            ? Icon(
+                EvaIcons.sun,
+                size: 30.0,
+              ) //show sun icon when in dark mode
+            : Icon(
+                EvaIcons.moon,
+                size: 26.0,
+              ), //show moon icon when in light mode
         tooltip: isThemeCurrentlyDark(context)
             ? 'Switch to light mode'
             : 'Switch to dark mode',

lib/pages/material_page.dart

@@ -1,14 +1,10 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:dashboard_reborn/main.dart';
 import 'package:dashboard_reborn/utils/colors.dart';
 import 'package:dashboard_reborn/utils/functions.dart';
-import 'package:dashboard_reborn/utils/textstyles.dart';
+import 'package:dashboard_reborn/widgets/bottom_sheet.dart';
 import 'package:dashboard_reborn/widgets/tile.dart';
-import 'package:dynamic_theme/dynamic_theme.dart';
 import 'package:eva_icons_flutter/eva_icons_flutter.dart';
-import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
-import 'package:dashboard_reborn/widgets/bottom_sheet.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
 
 class MyMaterialPage extends StatefulWidget {
   @override
@@ -30,13 +26,14 @@ class _MyMaterialPageState extends State<MyMaterialPage> {
     ]; //color of the individual tile, mapped to index values
 
     List<Color> splashColors = [
-      MaterialColors.red,
+      MyColors.accentColor,
       null,
       null,
     ]; //splash color of the individual tile, mapped to index values
 
     return Scaffold(
-      backgroundColor: invertColorsMaterial(context),
+      backgroundColor: invertColorsMaterial(context), //color changes
+      // according to currently set theme
       body: Container(
         child: Stack(children: <Widget>[
           Column(
@@ -119,7 +116,7 @@ class _MyMaterialPageState extends State<MyMaterialPage> {
               ),
             ],
           ),
-          SexyBottomSheet(),
+          SexyBottomSheet(), //the awesome sliding up bottom sheet
         ]),
       ),
     );

lib/pages/note_page.dart

@@ -1,15 +1,11 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:dashboard_reborn/main.dart';
+import 'package:dashboard_reborn/pages/home_page.dart';
 import 'package:dashboard_reborn/utils/colors.dart';
 import 'package:dashboard_reborn/utils/functions.dart';
 import 'package:dashboard_reborn/utils/textstyles.dart';
 import 'package:dashboard_reborn/widgets/tile.dart';
-import 'package:dynamic_theme/dynamic_theme.dart';
 import 'package:eva_icons_flutter/eva_icons_flutter.dart';
-import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
-import 'package:dashboard_reborn/pages/home_page.dart';
-import 'package:dashboard_reborn/pages/about_page.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
 
 class MyNotePage extends StatefulWidget {
   @override
@@ -21,11 +17,11 @@ class _MyNotePageState extends State<MyNotePage> {
     'Note: this app does nothing.',
     'Yep, you read that right! It\'s only meant to serve as a UI template for'
         ' Flutter developers to use in their own apps.\n\nThe '
-        'entire source code is freely available on GitHub, and you have the '
-        'liberty to do whatever you want with it.\n\nEnjoy, and don\'t forget'
-        ' to star the project on GitHub. It really helps me out!\n\n- '
-        'Urmil Shroff',
-  ];
+        'entire source code is freely available on GitHub, and you can tweak '
+        'it and use it as per your liking.\n\nEnjoy, and don\'t forget'
+        ' to star the project on GitHub. It really helps me out!\n\n- Urmil '
+        'Shroff',
+  ]; //the text in the tile
 
   @override
   Widget build(BuildContext context) {
@@ -58,6 +54,7 @@ class _MyNotePageState extends State<MyNotePage> {
                 childAspectRatio: 0.8,
                 children: List.generate(1, (index) {
                   return Hero(
+                    //hero widget renders a smooth animation
                     tag: 'tile2',
                     child: buildTile(
                       context,

lib/utils/colors.dart

@@ -1,8 +1,5 @@
-import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
-import 'package:dashboard_reborn/utils/functions.dart';
-import 'package:dashboard_reborn/utils/textstyles.dart';
-import 'package:dashboard_reborn/widgets/tile.dart';
+import 'package:flutter/material.dart';
 
 class MyColors {
   static const primaryColor = Color(0xff212121);
@@ -14,7 +11,7 @@ class MyColors {
   static const heart = Color(0xfff50057);
   static const twitter = Color(0xff00b0ff);
   static const github = Color(0xff212121);
-}
+} //main app colors
 
 class MaterialColors {
   static const red = Color(0xffd50000);
@@ -25,16 +22,16 @@ class MaterialColors {
   static const pink = Color(0xffc51162);
   static const orange = Color(0xffff6d00);
   static const teal = Color(0xff00bfa5);
-}
+} //colors used in the material page
 
 class GradientColors {
   static const lightStart = Color(0xffdd2c00);
   static const lightEnd = Color(0xffffa000);
   static const darkStart = Color(0xff304ffe);
   static const darkEnd = Color(0xff00bcd4);
-}
+} //colors used in the gradients page
 
 class ShadowColors {
   static const shadowLight = Color(0x80718792);
   static const shadowDark = Color(0x801c313a);
-}
+} //colors used for tile shadows