Merge branch 'dev'

.gitignore

@@ -68,3 +68,4 @@
 !**/ios/**/default.pbxuser
 !**/ios/**/default.perspectivev3
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+android/key.properties

android/app/build.gradle

@@ -65,6 +65,7 @@ android {
            signingConfig signingConfigs.release
            minifyEnabled false
            useProguard false
+           proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }
 }

android/app/proguard-rules.pro

@@ -0,0 +1,7 @@
+## Flutter wrapper
+-keep class io.flutter.app.** { *; }
+-keep class io.flutter.plugin.**  { *; }
+-keep class io.flutter.util.**  { *; }
+-keep class io.flutter.view.**  { *; }
+-keep class io.flutter.**  { *; }
+-keep class io.flutter.plugins.**  { *; }

lib/pages/about_page.dart

@@ -90,7 +90,8 @@ class _MyAboutPageState extends State<MyAboutPage> {
                                   shape: BoxShape.circle,
                                   image: DecorationImage(
                                       image: AssetImage(
-                                          'assets/images/urmil-vector.png')))),
+                                          'assets/images/profile/urmil-vector'
+                                              '.png')))),
                           SizedBox(
                             height: 15.0,
                           ),

lib/pages/gradients_page.dart

@@ -9,12 +9,12 @@ import 'package:flutter/material.dart';
 import 'package:gradient_widgets/gradient_widgets.dart';
 
 List<String> swipingCardImages = [
-  'assets/images/album6.jpg',
-  'assets/images/album5.jpg',
-  'assets/images/album4.jpg',
-  'assets/images/album3.jpg',
-  'assets/images/album2.jpg',
-  'assets/images/album1.jpg',
+  'assets/images/music/album6.jpg',
+  'assets/images/music/album5.jpg',
+  'assets/images/music/album4.jpg',
+  'assets/images/music/album3.jpg',
+  'assets/images/music/album2.jpg',
+  'assets/images/music/album1.jpg',
 ];
 
 List<String> swipingCardTitles = [
@@ -42,17 +42,17 @@ final parallaxCardItemsList = <ParallaxCardItem>[
   ParallaxCardItem(
     title: 'Blurryface',
     body: 'Twenty One Pilots',
-    imagePath: 'assets/images/album8.jpg',
+    imagePath: 'assets/images/music/album8.jpg',
   ),
   ParallaxCardItem(
     title: 'Free Spirit',
     body: 'Khalid',
-    imagePath: 'assets/images/album7.jpg',
+    imagePath: 'assets/images/music/album7.jpg',
   ),
   ParallaxCardItem(
     title: 'Overexposed',
     body: 'Maroon 5',
-    imagePath: 'assets/images/album9.jpg',
+    imagePath: 'assets/images/music/album9.jpg',
   ),
 ];
 

lib/widgets/bottom_sheet.dart

@@ -130,7 +130,7 @@ class _SexyBottomSheetState extends State<SexyBottomSheet>
         child: ClipRRect(
           borderRadius: BorderRadius.all(Radius.circular(15.0)),
           child: Image.asset(
-            'assets/images/icon-nobg.png',
+            'assets/images/icon/icon-nobg.png',
             fit: BoxFit.cover,
             alignment: Alignment(lerp(0, 0), 0),
           ),
@@ -238,10 +238,10 @@ class ExpandedSheetItem extends StatelessWidget {
 }
 
 final List<SheetItem> items = [
-  SheetItem('assets/images/material1.gif', 'Material 1'),
-  SheetItem('assets/images/material2.gif', 'Material 2'),
-  SheetItem('assets/images/material3.gif', 'Material 3'),
-  SheetItem('assets/images/material4.gif', 'Material 4'),
+  SheetItem('assets/images/icon/icon-nobg.png', 'Icon 1'),
+  SheetItem('assets/images/icon/icon-nobg.png', 'Icon 2'),
+  SheetItem('assets/images/icon/icon-nobg.png', 'Icon 3'),
+  SheetItem('assets/images/icon/icon-nobg.png', 'Icon 4'),
 ];
 
 class SheetItem {

pubspec.yaml

@@ -1,6 +1,6 @@
 name: dashboard_reborn
 description: A very sexy Flutter template app
-version: 1.0.0+1
+version: 1.0.1+2
 
 environment:
   sdk: ">=2.1.0 <3.0.0"
@@ -23,14 +23,16 @@ dev_dependencies:
 flutter_icons:
   android: "launcher_icon"
   ios: true
-  image_path_android: "assets/images/icon-nobg.png"
-  image_path_ios: "assets/images/icon-bg.png"
+  image_path_android: "assets/images/icon/icon-nobg.png"
+  image_path_ios: "assets/images/icon/icon-bg.png"
 
 flutter:
   uses-material-design: true
 
   assets:
-     - assets/images/
+     - assets/images/icon/
+     - assets/images/music/
+     - assets/images/profile/
 
   fonts:
     - family: Rubik