login screen

assets/svg/logo.svg

@@ -0,0 +1,9 @@
+<svg width="62" height="69" viewBox="0 0 62 69" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.973389 1.48006C7.96633 9.58079 30.3991 37.1371 39.6769 68.2938C43.4157 68.5015 47.1545 67.5322 50.7548 65.4551L61.4173 59.293C41.1309 19.8279 10.9435 4.24954 1.66576 0.233795C1.45805 0.649217 1.25034 1.06464 0.973389 1.48006Z" fill="url(#paint0_linear)"/>
+<defs>
+<linearGradient id="paint0_linear" x1="48.14" y1="52.5269" x2="-10.7115" y2="10.6385" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2BBD85"/>
+<stop offset="1" stop-color="#016A5F"/>
+</linearGradient>
+</defs>
+</svg>

lib/app.dart

@@ -49,9 +49,9 @@ class _AppViewState extends State<AppView> {
       theme: ThemeData(
         backgroundColor: Colors.white,
         brightness: Brightness.light,
-        primaryColor: COLOR_CONST.DEFAULT,
-        accentColor: COLOR_CONST.DEFAULT,
-        hoverColor: COLOR_CONST.GREEN,
+        primaryColor: AppColors.DEFAULT,
+        accentColor: AppColors.DEFAULT,
+        hoverColor: AppColors.GREEN,
         fontFamily: 'Roboto',
       ),
       navigatorKey: _navigatorKey,

lib/presentation/custom_widgets/widget_media_picker.dart

@@ -65,7 +65,7 @@ class _WidgetMediaPickerState extends State<WidgetMediaPicker> {
                                       opacity: 1,
                                     ));
                           },
-                          color: COLOR_CONST.DEFAULT,
+                          color: AppColors.DEFAULT,
                           shape: RoundedRectangleBorder(
                             borderRadius: new BorderRadius.circular(7.0),
                           ),
@@ -81,7 +81,7 @@ class _WidgetMediaPickerState extends State<WidgetMediaPicker> {
                                   button_add_media,
                                   style: TextStyle(
                                       fontWeight: FontWeight.bold,
-                                      color: COLOR_CONST.WHITE),
+                                      color: AppColors.WHITE),
                                 )
                               ],
                             ),

lib/presentation/custom_widgets/widget_search.dart

@@ -52,7 +52,7 @@ class _SearchWidgetState extends State<SearchWidget> {
                     textInputAction: TextInputAction.done,
                     controller: _searchController,
                     onChanged: (String txt) {},
-                    cursorColor: COLOR_CONST.GRAY1,
+                    cursorColor: AppColors.GRAY1,
                     decoration: InputDecoration(
                       border: InputBorder.none,
                       hintText: 'Tìm kiếm ...',

lib/presentation/screens/actions/dung/widget_dung_supply.dart

@@ -349,7 +349,7 @@ class _WidgetDungSupplyState extends State<WidgetDungSupply> {
                 : SizedBox(),
             _.isEdit
                 ? FlatButton(
-                    color: COLOR_CONST.DEFAULT,
+                    color: AppColors.DEFAULT,
                     shape: RoundedRectangleBorder(
                         borderRadius: new BorderRadius.circular(8.0)),
                     onPressed: () {
@@ -408,7 +408,7 @@ class _WidgetDungSupplyState extends State<WidgetDungSupply> {
                       style: TextStyle(color: Colors.white),
                     ))
                 : FlatButton(
-                    color: COLOR_CONST.DEFAULT,
+                    color: AppColors.DEFAULT,
                     shape: RoundedRectangleBorder(
                         borderRadius: new BorderRadius.circular(8.0)),
                     onPressed: () {
@@ -479,7 +479,7 @@ class _WidgetDungSupplyState extends State<WidgetDungSupply> {
             shape: BoxShape.rectangle,
             borderRadius: BorderRadius.circular(10),
             color: Colors.white,
-            border: Border.all(color: COLOR_CONST.DEFAULT)),
+            border: Border.all(color: AppColors.DEFAULT)),
         child: Form(
           key: _formSupplyKey,
           child: Column(

lib/presentation/screens/actions/harvest_process/widget_harvest_process_supply.dart

@@ -351,7 +351,7 @@ class _WidgetHarvestProcessSupplyState
                 : SizedBox(),
             _.isEdit
                 ? FlatButton(
-                    color: COLOR_CONST.DEFAULT,
+                    color: AppColors.DEFAULT,
                     shape: RoundedRectangleBorder(
                         borderRadius: new BorderRadius.circular(8.0)),
                     onPressed: () {
@@ -410,7 +410,7 @@ class _WidgetHarvestProcessSupplyState
                       style: TextStyle(color: Colors.white),
                     ))
                 : FlatButton(
-                    color: COLOR_CONST.DEFAULT,
+                    color: AppColors.DEFAULT,
                     shape: RoundedRectangleBorder(
                         borderRadius: new BorderRadius.circular(8.0)),
                     onPressed: () {
@@ -480,7 +480,7 @@ class _WidgetHarvestProcessSupplyState
             shape: BoxShape.rectangle,
             borderRadius: BorderRadius.circular(10),
             color: Colors.white,
-            border: Border.all(color: COLOR_CONST.DEFAULT)),
+            border: Border.all(color: AppColors.DEFAULT)),
         child: Form(
           key: _formSupplyKey,
           child: Column(

lib/presentation/screens/actions/nursery/sc_edit_action_nursery.dart

@@ -256,7 +256,7 @@ class _EditActionNurseryState extends State<EditActionNurseryScreen> {
                 shape: BoxShape.rectangle,
                 borderRadius: BorderRadius.circular(10),
                 color: Colors.white,
-                border: Border.all(color: COLOR_CONST.DEFAULT)),
+                border: Border.all(color: AppColors.DEFAULT)),
             child: Form(
               child: Column(
                 children: [
@@ -294,7 +294,7 @@ class _EditActionNurseryState extends State<EditActionNurseryScreen> {
                                       .add(Reset());
                                 }),
                         FlatButton(
-                            color: COLOR_CONST.DEFAULT,
+                            color: AppColors.DEFAULT,
                             shape: RoundedRectangleBorder(
                                 borderRadius: new BorderRadius.circular(8.0)),
                             onPressed: () {

lib/presentation/screens/actions/plant/widget_plant_supply.dart

@@ -255,7 +255,7 @@ class _WidgetPlantSupplyState extends State<WidgetPlantSupply> {
                 : SizedBox(),
             _.isEdit
                 ? FlatButton(
-                    color: COLOR_CONST.DEFAULT,
+                    color: AppColors.DEFAULT,
                     shape: RoundedRectangleBorder(
                         borderRadius: new BorderRadius.circular(8.0)),
                     onPressed: () {
@@ -287,7 +287,7 @@ class _WidgetPlantSupplyState extends State<WidgetPlantSupply> {
                       style: TextStyle(color: Colors.white),
                     ))
                 : FlatButton(
-                    color: COLOR_CONST.DEFAULT,
+                    color: AppColors.DEFAULT,
                     shape: RoundedRectangleBorder(
                         borderRadius: new BorderRadius.circular(8.0)),
                     onPressed: () {
@@ -330,7 +330,7 @@ class _WidgetPlantSupplyState extends State<WidgetPlantSupply> {
             shape: BoxShape.rectangle,
             borderRadius: BorderRadius.circular(10),
             color: Colors.white,
-            border: Border.all(color: COLOR_CONST.DEFAULT)),
+            border: Border.all(color: AppColors.DEFAULT)),
         child: Column(
           children: [
             Container(

lib/presentation/screens/actions/spraying/widget_spraying_supply.dart

@@ -349,7 +349,7 @@ class _WidgetSprayingSupplyState extends State<WidgetSprayingSupply> {
                 : SizedBox(),
             _.isEdit
                 ? FlatButton(
-                    color: COLOR_CONST.DEFAULT,
+                    color: AppColors.DEFAULT,
                     shape: RoundedRectangleBorder(
                         borderRadius: new BorderRadius.circular(8.0)),
                     onPressed: () {
@@ -408,7 +408,7 @@ class _WidgetSprayingSupplyState extends State<WidgetSprayingSupply> {
                       style: TextStyle(color: Colors.white),
                     ))
                 : FlatButton(
-                    color: COLOR_CONST.DEFAULT,
+                    color: AppColors.DEFAULT,
                     shape: RoundedRectangleBorder(
                         borderRadius: new BorderRadius.circular(8.0)),
                     onPressed: () {
@@ -480,7 +480,7 @@ class _WidgetSprayingSupplyState extends State<WidgetSprayingSupply> {
               shape: BoxShape.rectangle,
               borderRadius: BorderRadius.circular(10),
               color: Colors.white,
-              border: Border.all(color: COLOR_CONST.DEFAULT)),
+              border: Border.all(color: AppColors.DEFAULT)),
           child: Column(
             children: [
               _btnSelectSubstrates(),

lib/presentation/screens/forgot_password/sc_forgot_password.dart

@@ -68,14 +68,13 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> {
           }
           _validateInputs();
         },
-        color: COLOR_CONST.DEFAULT,
+        color: AppColors.DEFAULT,
         shape: RoundedRectangleBorder(
           borderRadius: new BorderRadius.circular(7.0),
         ),
         child: Text(
           'Gửi'.toUpperCase(),
-          style:
-              TextStyle(fontWeight: FontWeight.bold, color: COLOR_CONST.WHITE),
+          style: TextStyle(fontWeight: FontWeight.bold, color: AppColors.WHITE),
         ),
       ),
     );

lib/presentation/screens/location_unit/widget_search.dart

@@ -57,7 +57,7 @@ class _WidgetSearchLocationState extends State<WidgetSearchLocation> {
                     textInputAction: TextInputAction.done,
                     controller: _searchController,
                     onChanged: (String txt) {},
-                    cursorColor: COLOR_CONST.GRAY1,
+                    cursorColor: AppColors.GRAY1,
                     decoration: InputDecoration(
                       border: InputBorder.none,
                       hintText: 'Tìm kiếm ...',

lib/presentation/screens/login/view/login_form.dart

@@ -59,11 +59,10 @@ class _FogotPasswordButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Align(
-        alignment: Alignment.centerRight,
+        alignment: Alignment.center,
         child: FlatButton(
-            child: Text(
-              'Quên mật khẩu ?',
-            ),
+            child: Text('Quên mật khẩu',
+                style: TextStyle(color: AppColors.BLUE, fontSize: 16)),
             onPressed: () {
               Navigator.of(context).push(
                   MaterialPageRoute(builder: (_) => ForgotPasswordScreen()));
@@ -82,11 +81,7 @@ class _UsernameInput extends StatelessWidget {
       builder: (context, state) {
         return Container(
             height: 50,
-            padding: EdgeInsets.symmetric(horizontal: 17),
-            decoration: BoxDecoration(
-                shape: BoxShape.rectangle,
-                borderRadius: BorderRadius.circular(10),
-                color: COLOR_CONST.GRAY7),
+            padding: EdgeInsets.symmetric(horizontal: 8),
             child: Center(
               child: TextFormField(
                 focusNode: usernameFocus,
@@ -108,7 +103,7 @@ class _UsernameInput extends StatelessWidget {
                 keyboardType: TextInputType.text,
                 obscureText: false,
                 textAlign: TextAlign.left,
-                decoration: InputDecoration.collapsed(
+                decoration: InputDecoration(
                   hintText: 'Tài khoản',
                 ),
               ),
@@ -128,11 +123,7 @@ class _PasswordInput extends StatelessWidget {
       builder: (context, state) {
         return Container(
             height: 50,
-            padding: EdgeInsets.symmetric(horizontal: 17),
-            decoration: BoxDecoration(
-                shape: BoxShape.rectangle,
-                borderRadius: BorderRadius.circular(10),
-                color: COLOR_CONST.GRAY7),
+            padding: EdgeInsets.symmetric(horizontal: 8),
             child: Center(
               child: TextFormField(
                 focusNode: passwordFocus,
@@ -155,7 +146,7 @@ class _PasswordInput extends StatelessWidget {
                 keyboardType: TextInputType.text,
                 obscureText: true,
                 textAlign: TextAlign.left,
-                decoration: InputDecoration.collapsed(
+                decoration: InputDecoration(
                   hintText: 'Mật khẩu',
                 ),
               ),
@@ -181,16 +172,16 @@ class _LoginButton extends StatelessWidget {
               }
             },
             color: state.status.isValidated
-                ? COLOR_CONST.DEFAULT
-                : COLOR_CONST.GRAY1_50,
+                ? AppColors.DEFAULT
+                : AppColors.GRAY1_50,
             shape: RoundedRectangleBorder(
               borderRadius: new BorderRadius.circular(7.0),
             ),
-            child: Text(
-              'Đăng nhập'.toUpperCase(),
-              style: TextStyle(
-                  fontWeight: FontWeight.bold, color: COLOR_CONST.WHITE),
-            ),
+            child: Text('Đăng nhập'.toUpperCase(),
+                style: TextStyle(
+                    fontWeight: FontWeight.bold,
+                    color: AppColors.WHITE,
+                    fontSize: 18)),
           ),
         );
       },

lib/presentation/screens/login/view/widget_top_welcome.dart

@@ -1,5 +1,8 @@
+import 'package:farm_tpf/utils/const_assets.dart';
 import 'package:farm_tpf/utils/const_color.dart';
+import 'package:farm_tpf/utils/const_icons.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 
 class WidgetTopWelcome extends StatelessWidget {
   @override
@@ -10,10 +13,8 @@ class WidgetTopWelcome extends StatelessWidget {
           height: 80,
         ),
         SizedBox(
-          width: 172,
-          child: FlutterLogo(
-            size: 140,
-          ),
+          width: 180,
+          child: Image.asset(AppAssets.logoWithSlogan),
         ),
         SizedBox(
           height: 80,

lib/presentation/screens/plot/sc_plot.dart

@@ -242,10 +242,10 @@ class ItemInfinityWidget extends StatelessWidget {
     switch (item.status) {
       case "STATUS_ARE_ACTIVE":
         backgroundColor = Colors.white;
-        textColor = COLOR_CONST.DEFAULT;
+        textColor = AppColors.DEFAULT;
         break;
       case "STATUS_FINISHED":
-        backgroundColor = COLOR_CONST.DEFAULT;
+        backgroundColor = AppColors.DEFAULT;
         textColor = Colors.white;
         break;
       default:

lib/presentation/screens/plot/widget_search.dart

@@ -53,7 +53,7 @@ class _WidgetSearchState extends State<WidgetSearch> {
                     textInputAction: TextInputAction.done,
                     controller: _searchController,
                     onChanged: (String txt) {},
-                    cursorColor: COLOR_CONST.GRAY1,
+                    cursorColor: AppColors.GRAY1,
                     decoration: InputDecoration(
                       border: InputBorder.none,
                       hintText: 'Tìm kiếm ...',

lib/presentation/screens/plot_detail/sc_plot_action.dart

@@ -137,11 +137,11 @@ class _PlotActionScreenState extends State<PlotActionScreen> {
               child: Container(
                 margin: EdgeInsets.all(2.5),
                 decoration: BoxDecoration(
-                  color: COLOR_CONST.WHITE,
+                  color: AppColors.WHITE,
                   borderRadius: BorderRadius.all(Radius.circular(4.0)),
                   boxShadow: <BoxShadow>[
                     BoxShadow(
-                        color: COLOR_CONST.GRAY1.withOpacity(0.2),
+                        color: AppColors.GRAY1.withOpacity(0.2),
                         offset: Offset(1.1, 1.1),
                         blurRadius: 4.0),
                   ],
@@ -154,7 +154,7 @@ class _PlotActionScreenState extends State<PlotActionScreen> {
                       style: TextStyle(
                         fontWeight: FontWeight.w400,
                         fontSize: 11,
-                        color: COLOR_CONST.BLACK2,
+                        color: AppColors.BLACK2,
                       ),
                     )),
               ));
@@ -287,12 +287,12 @@ class _InfinityViewState extends State<InfinityView> {
                       child: Container(
                         alignment: Alignment.center,
                         decoration: BoxDecoration(
-                          color: COLOR_CONST.WHITE_50,
+                          color: AppColors.WHITE_50,
                           border: Border(
                               top: BorderSide(
-                                  width: 0.5, color: COLOR_CONST.DEFAULT),
+                                  width: 0.5, color: AppColors.DEFAULT),
                               bottom: BorderSide(
-                                  width: 0.5, color: COLOR_CONST.DEFAULT)),
+                                  width: 0.5, color: AppColors.DEFAULT)),
                         ),
                         child: Container(
                           child: Row(

lib/presentation/screens/plot_detail/sc_plot_detail.dart

@@ -25,7 +25,7 @@ class _PlotDetailScreenState extends State<PlotDetailScreen> {
   @override
   Widget build(BuildContext context) {
     return Container(
-        color: COLOR_CONST.ITEM_BG,
+        color: AppColors.ITEM_BG,
         child: SafeArea(
             top: false,
             bottom: true,
@@ -47,7 +47,7 @@ class _PlotDetailScreenState extends State<PlotDetailScreen> {
                 initialIndex: widget.initialIndex,
                 length: 2,
                 child: new Scaffold(
-                  backgroundColor: COLOR_CONST.ITEM_BG,
+                  backgroundColor: AppColors.ITEM_BG,
                   body: TabBarView(
                     children: [
                       PlotParameterScreen(
@@ -69,11 +69,11 @@ class _PlotDetailScreenState extends State<PlotDetailScreen> {
                         text: "Canh tác",
                       ),
                     ],
-                    labelColor: COLOR_CONST.DEFAULT,
-                    unselectedLabelColor: COLOR_CONST.GRAY1_70,
+                    labelColor: AppColors.DEFAULT,
+                    unselectedLabelColor: AppColors.GRAY1_70,
                     indicatorSize: TabBarIndicatorSize.label,
                     indicator: RoundedRectIndicator(
-                        color: COLOR_CONST.DEFAULT,
+                        color: AppColors.DEFAULT,
                         radius: 2,
                         padding: 22,
                         weight: 3.0),

lib/presentation/screens/plot_detail/sc_plot_information.dart

@@ -240,7 +240,7 @@ class _PlotInformationScreenState extends State<PlotInformationScreen> {
             GestureType.onPanUpdateDownDirection,
           ],
           child: Container(
-              color: COLOR_CONST.ITEM_BG,
+              color: AppColors.ITEM_BG,
               child: SafeArea(
                   top: false,
                   bottom: true,

lib/presentation/screens/profile/sc_change_password.dart

@@ -103,14 +103,13 @@ class _ChangePasswordScreenState extends State<ChangePasswordScreen> {
           }
           _validateInputs();
         },
-        color: COLOR_CONST.DEFAULT,
+        color: AppColors.DEFAULT,
         shape: RoundedRectangleBorder(
           borderRadius: new BorderRadius.circular(7.0),
         ),
         child: Text(
           'Cập nhật'.toUpperCase(),
-          style:
-              TextStyle(fontWeight: FontWeight.bold, color: COLOR_CONST.WHITE),
+          style: TextStyle(fontWeight: FontWeight.bold, color: AppColors.WHITE),
         ),
       ),
     );

lib/presentation/screens/profile/sc_update_profile.dart

@@ -388,7 +388,7 @@ class _UpdateProfileScreenState extends State<UpdateProfileScreen> {
         alignment: Alignment.centerRight,
         child: Text(
             "version:${_packageInfo.version}.${_packageInfo.buildNumber}",
-            style: TextStyle(color: COLOR_CONST.GRAY1_70)));
+            style: TextStyle(color: AppColors.GRAY1_70)));
   }
 
   @override

lib/presentation/screens/resources/widget_search.dart

@@ -55,7 +55,7 @@ class _WidgetSearchState extends State<WidgetSearch> {
                     textInputAction: TextInputAction.done,
                     controller: _searchController,
                     onChanged: (String txt) {},
-                    cursorColor: COLOR_CONST.GRAY1,
+                    cursorColor: AppColors.GRAY1,
                     decoration: InputDecoration(
                       border: InputBorder.none,
                       hintText: 'Tìm kiếm ...',

lib/presentation/screens/slide_menu/drawer_user_controller.dart

@@ -104,7 +104,7 @@ class _DrawerUserControllerState extends State<DrawerUserController>
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      backgroundColor: COLOR_CONST.WHITE,
+      backgroundColor: AppColors.WHITE,
       body: SingleChildScrollView(
         controller: scrollController,
         scrollDirection: Axis.horizontal,
@@ -148,9 +148,9 @@ class _DrawerUserControllerState extends State<DrawerUserController>
                 //full-screen Width with widget.screenView
                 child: Container(
                   decoration: BoxDecoration(
-                    color: COLOR_CONST.WHITE,
+                    color: AppColors.WHITE,
                     boxShadow: <BoxShadow>[
-                      BoxShadow(color: COLOR_CONST.GRAY1, blurRadius: 24),
+                      BoxShadow(color: AppColors.GRAY1, blurRadius: 24),
                     ],
                   ),
                   child: Stack(

lib/presentation/screens/slide_menu/home_drawer.dart

@@ -98,7 +98,7 @@ class _HomeDrawerState extends State<HomeDrawer> {
                             decoration: BoxDecoration(
                               borderRadius: BorderRadius.circular(120),
                               border: Border.all(
-                                  width: 0.35, color: COLOR_CONST.DEFAULT),
+                                  width: 0.35, color: AppColors.DEFAULT),
                             ),
                             child: ClipRRect(
                               borderRadius:
@@ -118,7 +118,7 @@ class _HomeDrawerState extends State<HomeDrawer> {
                       '${Get.find<UpdateFullName>().fullName ?? ''}',
                       style: TextStyle(
                         fontWeight: FontWeight.w600,
-                        color: COLOR_CONST.GRAY1,
+                        color: AppColors.GRAY1,
                         fontSize: 18,
                       ),
                     ),
@@ -132,7 +132,7 @@ class _HomeDrawerState extends State<HomeDrawer> {
           ),
           Divider(
             height: 1,
-            color: COLOR_CONST.GRAY1,
+            color: AppColors.GRAY1,
           ),
           Expanded(
             child: ListView.builder(
@@ -146,7 +146,7 @@ class _HomeDrawerState extends State<HomeDrawer> {
           ),
           Divider(
             height: 1,
-            color: COLOR_CONST.GRAY1,
+            color: AppColors.GRAY1,
           ),
           Column(
             children: <Widget>[
@@ -252,13 +252,13 @@ class _HomeDrawerState extends State<HomeDrawer> {
                           height: 24,
                           child: Image.asset(listData.imageName,
                               color: currentDrawerIndex == listData.index
-                                  ? COLOR_CONST.DEFAULT
-                                  : COLOR_CONST.BLACK),
+                                  ? AppColors.DEFAULT
+                                  : AppColors.BLACK),
                         )
                       : Icon(listData.icon.icon,
                           color: widget.screenIndex == listData.index
-                              ? COLOR_CONST.DEFAULT
-                              : COLOR_CONST.BLACK),
+                              ? AppColors.DEFAULT
+                              : AppColors.BLACK),
                   const Padding(
                     padding: EdgeInsets.all(4.0),
                   ),
@@ -268,8 +268,8 @@ class _HomeDrawerState extends State<HomeDrawer> {
                       fontWeight: FontWeight.w500,
                       fontSize: 16,
                       color: widget.screenIndex == listData.index
-                          ? COLOR_CONST.DEFAULT
-                          : COLOR_CONST.BLACK,
+                          ? AppColors.DEFAULT
+                          : AppColors.BLACK,
                     ),
                     textAlign: TextAlign.left,
                   ),
@@ -295,7 +295,7 @@ class _HomeDrawerState extends State<HomeDrawer> {
                                 MediaQuery.of(context).size.width * 0.75 - 64,
                             height: 46,
                             decoration: BoxDecoration(
-                              color: COLOR_CONST.DEFAULT.withOpacity(0.2),
+                              color: AppColors.DEFAULT.withOpacity(0.2),
                               borderRadius: new BorderRadius.only(
                                 topLeft: Radius.circular(0),
                                 topRight: Radius.circular(28),

lib/presentation/screens/slide_menu/navigation_home_screen.dart

@@ -30,12 +30,12 @@ class _NavigationHomeScreenState extends State<NavigationHomeScreen> {
   @override
   Widget build(BuildContext context) {
     return Container(
-      color: COLOR_CONST.DEFAULT,
+      color: AppColors.DEFAULT,
       child: SafeArea(
         top: false,
         bottom: false,
         child: Scaffold(
-          backgroundColor: COLOR_CONST.WHITE,
+          backgroundColor: AppColors.WHITE,
           body: DrawerUserController(
             screenIndex: drawerIndex,
             drawerWidth: MediaQuery.of(context).size.width * 0.75,

lib/utils/const_assets.dart

@@ -0,0 +1,5 @@
+class AppAssets {
+  static const baseAssets = 'assets/png/';
+  static const logo = baseAssets + 'logo.png';
+  static const logoWithSlogan = baseAssets + 'logoWithSlogan.png';
+}

lib/utils/const_color.dart

@@ -1,7 +1,9 @@
 import 'hex_color.dart';
 
-class COLOR_CONST {
-  static final HexColor DEFAULT = new HexColor("#2EC492");
+class AppColors {
+  static final HexColor DEFAULT = new HexColor("##61AE46");
+  static final HexColor BLUE = new HexColor("#2F80ED");
+
   static final HexColor DEFAULT_5 = new HexColor("#0DE81667");
   static final HexColor RED = new HexColor("#F93F3E");
   static final HexColor RED2 = new HexColor("#D05045");
@@ -25,7 +27,7 @@ class COLOR_CONST {
   static final HexColor GRAY6 = new HexColor("#707070");
   static final HexColor GRAY7 = new HexColor("#DDDDDD");
   static final HexColor ITEM_BG = new HexColor("#F3F6F8");
-  static final HexColor BLUE = new HexColor("#222539");
+
   static final HexColor BLUE_SKY = new HexColor("#00BFFF");
   static final HexColor DIVIDER = new HexColor("#33000000");
   static final HexColor TRANS = new HexColor("00000000");

lib/utils/const_icons.dart

@@ -0,0 +1,5 @@
+class AppIcons {
+  static const baseAssets = 'assets/svg/';
+  static const appLogo = baseAssets + 'logo.svg';
+  static const appLogoWithSlogan = baseAssets + 'logoWithSlogan.svg';
+}

pubspec.lock

@@ -349,6 +349,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.8"
+  flutter_svg:
+    dependency: "direct main"
+    description:
+      name: flutter_svg
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.19.1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -541,6 +548,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.0-nullsafety.1"
+  path_drawing:
+    dependency: transitive
+    description:
+      name: path_drawing
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.1+1"
+  path_parsing:
+    dependency: transitive
+    description:
+      name: path_parsing
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.4"
   path_provider:
     dependency: "direct main"
     description:
@@ -583,6 +604,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.9.0"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.1.0"
   platform:
     dependency: transitive
     description:
@@ -889,6 +917,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.0"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.5.1"
   yaml:
     dependency: transitive
     description:

pubspec.yaml

@@ -2,7 +2,7 @@ name: farm_tpf
 description: A new Flutter project.
 
 publish_to: 'none'
-version: 0.13.0+1
+version: 0.14.0+1
 
 environment:
   sdk: ">=2.7.0 <3.0.0"
@@ -48,6 +48,7 @@ dependencies:
 
   mime: ^0.9.7
   flutter_image_compress: ^0.7.0
+  flutter_svg: ^0.19.1
 
 dev_dependencies:
   flutter_test:
@@ -60,4 +61,7 @@ dev_dependencies:
   json_serializable: any
   
 flutter:
-  uses-material-design: true
+  uses-material-design: true
+  assets:
+    - assets/svg/
+    - assets/png/