merge the group 01 and change the image path

Author: nb312

assets/images/main/ic_launcher.png

@@ -13,9 +13,10 @@ const BLUE = Color(0xffabecd6);
 const BLUE_DEEP = Color(0xffA8CBFD);
 const BLUE_LIGHT = Color(0xffAED3EA);
 const PURPLE = Color(0xffccc3fc);
+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);
-const LIGHT_RED = Color(0xffffc2a1);

assets/images/main/main_background.png

@@ -11,14 +11,15 @@ const LinearGradient SIGNUP_CARD_BACKGROUND = LinearGradient(
   tileMode: TileMode.clamp,
   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(
   tileMode: TileMode.clamp,
   begin: FractionalOffset.centerLeft,
   end: FractionalOffset.centerRight,
   // Add one stop for each color. Stops should increase from 0 to 1
-  stops: [0.4, 1], colors: [Colors.black, Colors.black54],
+  stops: [0.4, 1],
+  colors: [Colors.black, Colors.black54],
 );

images/camera/ic_launcher.png

@@ -1,15 +1,6 @@
 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';
@@ -28,44 +19,44 @@ class MyApp extends StatelessWidget {
       title: StringConst.APP_NAME,
       debugShowCheckedModeBanner: false,
       theme: ThemeData(
-        primaryColor: MAIN_COLOR,
-        accentColor: MAIN_COLOR,
+        primaryColor: BLUE_DEEP,
+        accentColor: YELLOW,
         fontFamily: "Montserrat",
       ),
       home: HomePage(),
-      routes
-          :
-      {
-      SIGN_UP_PAGES[0]: (context) => SignPageOne(),
-      SIGN_UP_PAGES[1]: (context) => SignPageTwo(),
-      //PROFILE pages
-      PROFILE_PAGES[0]: (context) => ProfilePageOne(),
+      routes: {
+        //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(),
+        SIGN_UP_PAGES[0]: (context) => SignPageOne(),
+        SIGN_UP_PAGES[1]: (context) => SignPageTwo(),
+        SIGN_UP_PAGES[2]: (context) => SignPageThree(),
+        SIGN_UP_PAGES[3]: (context) => SignPageFour(),
+        SIGN_UP_PAGES[4]: (context) => SignPageFive(),
+        SIGN_UP_PAGES[5]: (context) => SignPageSix(),
+        SIGN_UP_PAGES[6]: (context) => SignPageSeven(),
+        SIGN_UP_PAGES[7]: (context) => SignPageEight(),
+        SIGN_UP_PAGES[8]: (context) => SignPageNine(),
+        SIGN_UP_PAGES[9]: (context) => SignPageTeen(),
+        SIGN_UP_PAGES[10]: (context) => SignPageEleven(),
 
-      NAVIGATION_PAGES[0]: (context) => NavigationOneCoordinator(),
-      SIGN_UP_PAGES[2]: (context) => SignPageThree(),
-      SIGN_UP_PAGES[3]: (context) => SignPageFour(),
-      SIGN_UP_PAGES[4]: (context) => SignPageFive(),
-      SIGN_UP_PAGES[5]: (context) => SignPageSix(),
-      SIGN_UP_PAGES[6]: (context) => SignPageSeven(),
-      SIGN_UP_PAGES[7]: (context) => SignPageEight(),
-      SIGN_UP_PAGES[8]: (context) => SignPageNine(),
-      SIGN_UP_PAGES[9]: (context) => SignPageTeen(),
-      SIGN_UP_PAGES[10]: (context) => SignPageEleven(),
-      //FIXME there are other pages to jump with 'page_str_const.dart',there should be make by manager
+        ///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) =>
           MaterialPageRoute(builder: (context) => EmptyPage()),

images/chat/ic_launcher.png

@@ -21,7 +21,7 @@ const TEXT_SMALL_2_SIZE = 22.0;
 const TEXT_SMALL_3_SIZE = 24.0;
 
 class FeedImage {
-  static const IMAGE_PATH = "images/feed";
+  static const IMAGE_PATH = "assets/images/feed";
   static const more_circle = "$IMAGE_PATH/feed_more.png";
   static const search_circle = "$IMAGE_PATH/feed_search.png";
   static const white_back = "$IMAGE_PATH/white_background.png";

images/feed/city.png

@@ -7,7 +7,17 @@ export "home_page.dart";
 export "empty_page.dart";
 export 'signup/SignPageOne.dart';
 export 'signup/SignPageTwo.dart';
-
+export 'signup/SignPageFour.dart';
+export 'signup/SignPageEleven.dart';
+export 'signup/SignPageEight.dart';
+export 'signup/SignPageFive.dart';
+export 'signup/SignPageFour.dart';
+export 'signup/SignPageThree.dart';
+export 'signup/SignPageEleven.dart';
+export 'signup/SignPageSeven.dart';
+export 'signup/SignPageSix.dart';
+export 'signup/SignPageNine.dart';
+export 'signup/SingPageTen.dart';
 
 //PROFILE pages
 export 'profile/ProfilePageOne.dart';

images/feed/feed11-city1.png

@@ -34,7 +34,7 @@ const TEXT_SIZE_M = 26.0;
 const TEXT_SIZE_S = 24.0;
 
 class ProfileImages {
-  static const IMAGE_PATH = "images/profile";
+  static const IMAGE_PATH = "assets/images/profile";
   static const arrow_left = "$IMAGE_PATH/profile_arrow_left.png";
   static const avatar = "$IMAGE_PATH/profile_avatar.png";
   static const follow = "$IMAGE_PATH/profile_follow.png";

images/feed/feed11-city2.png

@@ -36,9 +36,9 @@ class _ShopEighteenState extends State<ShopPageEighteen> {
     GREEN,
   ];
   List<String> imageurl = <String>[
-    "images/shopping/paypal.png",
-    "images/shopping/visa.png",
-    "images/shopping/apple_pay.png"
+    "assets/images/shopping/paypal.png",
+    "assets/images/shopping/visa.png",
+    "assets/images/shopping/apple_pay.png"
   ];
 
   Widget floatingTextFieldWidget(name, topmargin) {

images/feed/feed11-header.png

@@ -114,7 +114,7 @@ class _ShopNineteenState extends State<ShopPageNineteen> {
                             Opacity(
                               opacity: 0.5,
                               child: Image.asset(
-                                "images/shopping/background.jpg",
+                                "assets/images/shopping/background.jpg",
                                 fit: BoxFit.cover,
                               ),
                             ),

images/feed/feed12_header.png

@@ -4,10 +4,9 @@ import 'package:flutter_ui_nice/const/color_const.dart';
 const LinearGradient SIGNUP_SIX_GOOGLEP_BG = LinearGradient(
   begin: FractionalOffset.centerLeft,
   end: FractionalOffset.centerRight,
-// Add one stop for each color. Stops should increase from 0 to 1
   stops: [0.2, 0.8],
   colors: [
-    LIGHT_RED,
+    SIGNUP_LIGHT_RED,
     Color(0xFFf194a2),
   ],
 );