Merge remote-tracking branch 'upstream/master'

Author: Jack

README.md

@@ -10,6 +10,13 @@ const DARK_COLOR = Color(0xFFBDBDBD);
 const BOTTOM_COLORS = [MAIN_COLOR, DARK_COLOR];
 const YELLOW = Color(0xfffbed96);
 const BLUE = Color(0xffabecd6);
+const BLUE_DEEP = Color(0xffA8CBFD);
+const BLUE_LIGHT = Color(0xffAED3EA);
 const PURPLE = Color(0xffccc3fc);
-const LIGHT_RED = Color(0xffffc2a1);
-const RED = Color(0xffffb1bb);
+const SIGNUP_LIGHT_RED = Color(0xffffc2a1);
+const SIGNUP_RED = Color(0xffffb1bb);
+const RED = Color(0xffF2A7B3);
+const GREEN = Color(0xffc7e5b4);
+const RED_LIGHT = Color(0xffFFC3A0);
+const TEXT_BLACK = Color(0xFF353535);
+const TEXT_BLACK_LIGHT = Color(0xFF34323D);

android/app/src/main/res/mipmap-hdpi/ic_launcher.png

@@ -12,7 +12,7 @@ const LinearGradient SIGNUP_CARD_BACKGROUND = LinearGradient(
   begin: FractionalOffset.centerLeft,
   end: FractionalOffset.centerRight,
   // Add one stop for each color. Stops should increase from 0 to 1
-  stops: [0.1, 1.0], colors: [LIGHT_RED, RED],
+  stops: [0.1, 1.0], colors: [SIGNUP_LIGHT_RED, SIGNUP_RED],
 );
 
 const LinearGradient SIGNUP_CIRCLE_BUTTON_BACKGROUND = LinearGradient(

android/app/src/main/res/mipmap-mdpi/ic_launcher.png

@@ -23,17 +23,17 @@ class ImagePath {
 class MainImagePath {
   static const String image_path = "assets/images/main";
   static const String image_app = "$image_path/ic_launcher.png";
-  static const String image_header = "$image_path/main_background.png";
-  static const String image_sign_up = "$image_path/main_background.png";
-  static const String image_walk_through = "$image_path/main_background.png";
-  static const String image_navigation = "$image_path/main_background.png";
-  static const String image_profile = "$image_path/main_background.png";
-  static const String image_feed = "$image_path/main_background.png";
-  static const String image_chat = "$image_path/main_background.png";
-  static const String image_shopping = "$image_path/main_background.png";
-  static const String image_statistic = "$image_path/main_background.png";
-  static const String image_media = "$image_path/main_background.png";
-  static const String image_camera = "$image_path/main_background.png";
+  static const String image_header = "$image_path/pic04.png";
+  static const String image_sign_up = "$image_path/pic03.png";
+  static const String image_walk_through = "$image_path/pic01.png";
+  static const String image_navigation = "$image_path/pic05.png";
+  static const String image_profile = "$image_path/pic06.png";
+  static const String image_feed = "$image_path/pic02.png";
+  static const String image_chat = "$image_path/pic08.png";
+  static const String image_shopping = "$image_path/pic09.png";
+  static const String image_statistic = "$image_path/pic10.png";
+  static const String image_media = "$image_path/pic11.png";
+  static const String image_camera = "$image_path/pic01.png";
 }
 
 class SignUpImagePath {

android/app/src/main/res/mipmap-xhdpi/ic_launcher.png

@@ -49,6 +49,16 @@ const FEED_PAGES = [
   "Feed page 01",
   "Feed page 02",
   "Feed page 03",
+  "Feed page 04",
+  "Feed page 05",
+  "Feed page 06",
+  "Feed page 07",
+  "Feed page 08",
+  "Feed page 09",
+  "Feed page 10",
+  "Feed page 11",
+  "Feed page 12",
+  "Feed page 13",
 
   /// fixme you could add by your group one name fit one page.
 ];
@@ -63,6 +73,22 @@ const SHOPPING_PAGES = [
   "Shopping page 01",
   "Shopping page 02",
   "Shopping page 03",
+  "Shopping page 04",
+  "Shopping page 05",
+  "Shopping page 06",
+  "Shopping page 07",
+  "Shopping page 08",
+  "Shopping page 09",
+  "Shopping page 10",
+  "Shopping page 11",
+  "Shopping page 12",
+  "Shopping page 13",
+  "Shopping page 14",
+  "Shopping page 15",
+  "Shopping page 16",
+  "Shopping page 17",
+  "Shopping page 18",
+  "Shopping page 19",
 
   /// fixme you could add by your group one name fit one page.
 ];

android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png

@@ -0,0 +1,13 @@
+import 'package:flutter/material.dart';
+
+const SHADOW = [
+  BoxShadow(
+    color: Colors.black12,
+    blurRadius: 20.0,
+    spreadRadius: 5.0,
+    offset: Offset(
+      10.0, // horizontal, move right 10
+      10.0, // vertical, move down 10
+    ),
+  )
+];

android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png

@@ -7,7 +7,7 @@
 
 class StringConst {
   //strings
-  static const String APP_NAME = "Flutter UI Nice";
+  static const String APP_NAME = "flutter-ui-nice";
   static const String CREATE_BY = "Created By Volunteer";
   static const String DEVELOPER = "Volunteer";
   static const String PROFESSION = "Flutter Developer";

assets/images/main/ic_launcher.png

@@ -1,34 +1,27 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_ui_nice/page/navigation/navigation1/coordinator.dart';
 import 'package:flutter_ui_nice/page/page_const.dart';
-import 'package:flutter_ui_nice/page/signup/SignPageEight.dart';
-import 'package:flutter_ui_nice/page/signup/SignPageFive.dart';
-import 'package:flutter_ui_nice/page/signup/SignPageFour.dart';
-import 'package:flutter_ui_nice/page/signup/SignPageThree.dart';
-import 'package:flutter_ui_nice/page/signup/SignPageEleven.dart';
-import 'package:flutter_ui_nice/page/signup/SignPageSeven.dart';
-import 'package:flutter_ui_nice/page/signup/SignPageSix.dart';
-import 'package:flutter_ui_nice/page/signup/SignPageNine.dart';
-import 'package:flutter_ui_nice/page/signup/SingPageTen.dart';
 
 import 'const/string_const.dart';
 import 'const/color_const.dart';
 import 'const/page_str_const.dart';
 import "page/page_const.dart";
+import 'package:flutter/services.dart';
 
 void main() => runApp(MyApp());
 
 class MyApp extends StatelessWidget {
   // This widget is the root of your application.
   @override
   Widget build(BuildContext context) {
+    SystemChrome.setEnabledSystemUIOverlays([]);
     return MaterialApp(
       title: StringConst.APP_NAME,
       debugShowCheckedModeBanner: false,
       theme: ThemeData(
-        primaryColor: MAIN_COLOR,
-        accentColor: MAIN_COLOR,
-        fontFamily: "Montserrat",
-      ),
+          primaryColor: BLUE,
+          accentColor: TEXT_BLACK_LIGHT,
+          fontFamily: 'Montserrat'),
       home: HomePage(),
       routes: {
         SIGN_UP_PAGES[0]: (context) => SignPageOne(),
@@ -42,6 +35,25 @@ class MyApp extends StatelessWidget {
         SIGN_UP_PAGES[8]: (context) => SignPageNine(),
         SIGN_UP_PAGES[9]: (context) => SignPageTeen(),
         SIGN_UP_PAGES[10]: (context) => SignPageEleven(),
+
+        //PROFILE pages
+        PROFILE_PAGES[0]: (context) => ProfilePageOne(),
+
+        ///FEED group page
+        FEED_PAGES[0]: (context) => FeedPageOne(),
+        FEED_PAGES[1]: (context) => FeedPageTwo(),
+        FEED_PAGES[0]: (context) => FeedPageOne(),
+        FEED_PAGES[3]: (context) => FeedPageFour(),
+        FEED_PAGES[0]: (context) => FeedPageOne(),
+        FEED_PAGES[0]: (context) => FeedPageOne(),
+        FEED_PAGES[9]: (context) => FeedPageTen(),
+        FEED_PAGES[10]: (context) => FeedPageEleven(),
+        FEED_PAGES[11]: (context) => FeedPageTwelve(),
+        FEED_PAGES[12]: (context) => FeedPageThirteen(),
+        SHOPPING_PAGES[17]: (context) => ShopPageEighteen(),
+        SHOPPING_PAGES[18]: (context) => ShopPageNineteen(),
+
+        NAVIGATION_PAGES[0]: (context) => NavigationOneCoordinator(),
         //FIXME there are other pages to jump with 'page_str_const.dart',there should be make by manager
       },
       onUnknownRoute: (setting) =>