From 6314e5545ae414c1c8679d959681a4bd73f94c33 Mon Sep 17 00:00:00 2001 From: ChunhThanhDe Date: Wed, 17 Apr 2024 15:51:00 +0700 Subject: [PATCH] :rotating_light: theme --- README.md | 1 - lib/utils/app_colors.dart | 10 +++++++--- lib/views/mobile/account/account_screen.dart | 8 ++++---- lib/views/mobile/cart/cart_screen.dart | 2 +- lib/views/mobile/home_bottom_navigation_screen.dart | 2 +- lib/views/mobile/menu/best_in_safety_view.dart | 2 +- .../mobile/menu/food_groceries_availability_view.dart | 6 +++--- .../mobile/menu/genie/genie_grocery_card_view.dart | 2 +- lib/views/mobile/menu/genie/genie_screen.dart | 2 +- lib/views/mobile/menu/genie/genie_view.dart | 2 +- lib/views/mobile/menu/meat/meat_screen.dart | 4 ++-- lib/views/mobile/menu/menu_safety_banner_view.dart | 10 +++++----- lib/views/mobile/menu/menu_screen.dart | 2 +- lib/views/mobile/menu/top_offer_view.dart | 2 +- lib/views/mobile/search/search_screen.dart | 4 ++-- lib/views/tab_desktop/cart_view.dart | 8 ++++---- lib/views/tab_desktop/menu_view.dart | 10 +++++----- 17 files changed, 40 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index 111352f..7a5da25 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,6 @@ projects. ![GitHub stars](https://img.shields.io/github/stars/chunhthanhde/Food-Restaurant-UI?style=social) ![GitHub forks](https://img.shields.io/github/forks/chunhthanhde/Food-Restaurant-UI?style=social) ![GitHub watchers](https://img.shields.io/github/watchers/chunhthanhde/Food-Restaurant-UI?style=social) -![LinkedIn Follow](https://img.shields.io/LinkedIn/follow/chunhthanhde?label=Follow&style=social) Buy Me A Coffee diff --git a/lib/utils/app_colors.dart b/lib/utils/app_colors.dart index b9eea08..331c930 100644 --- a/lib/utils/app_colors.dart +++ b/lib/utils/app_colors.dart @@ -1,5 +1,9 @@ import 'package:flutter/material.dart'; -const Color appColor = Colors.orange; -const darkOrange = Color(0xffD84315); -const menuOrange = Color(0xffE75100); +// const Color appColor = Colors.orange; +// const darkGreen = Color(0xffD84315); +// const menuGreen = Color(0xffE75100); + +const Color appColor = Color(0xFF61770E); +const darkGreen = Color(0xFF1B5E20); +const menuGreen = Color(0xFF2E7D32); diff --git a/lib/views/mobile/account/account_screen.dart b/lib/views/mobile/account/account_screen.dart index f6d604b..3e9eb32 100644 --- a/lib/views/mobile/account/account_screen.dart +++ b/lib/views/mobile/account/account_screen.dart @@ -77,7 +77,7 @@ class _AppBar extends StatelessWidget { InkWell( child: Text( 'EDIT', - style: Theme.of(context).textTheme.titleLarge!.copyWith(fontSize: 17.0, color: darkOrange), + style: Theme.of(context).textTheme.titleLarge!.copyWith(fontSize: 17.0, color: darkGreen), ), onTap: () {}, ) @@ -198,7 +198,7 @@ class _PastOrderListView extends StatelessWidget { TextButton( child: Text( 'VIEW MORE ORDERS', - style: Theme.of(context).textTheme.titleSmall!.copyWith(color: darkOrange), + style: Theme.of(context).textTheme.titleSmall!.copyWith(color: darkGreen), ), onPressed: () {}, ), @@ -308,11 +308,11 @@ class _PastOrdersListItemView extends StatelessWidget { children: [ OutlinedButton( style: OutlinedButton.styleFrom( - side: const BorderSide(width: 1.5, color: darkOrange), + side: const BorderSide(width: 1.5, color: darkGreen), ), child: Text( 'REORDER', - style: Theme.of(context).textTheme.titleSmall!.copyWith(color: darkOrange), + style: Theme.of(context).textTheme.titleSmall!.copyWith(color: darkGreen), ), onPressed: () {}, ), diff --git a/lib/views/mobile/cart/cart_screen.dart b/lib/views/mobile/cart/cart_screen.dart index fc4cbdf..7ac58ae 100644 --- a/lib/views/mobile/cart/cart_screen.dart +++ b/lib/views/mobile/cart/cart_screen.dart @@ -326,7 +326,7 @@ class _AddressPaymentView extends StatelessWidget { InkWell( child: Text( 'ADD ADDRESS', - style: Theme.of(context).textTheme.titleSmall!.copyWith(color: darkOrange), + style: Theme.of(context).textTheme.titleSmall!.copyWith(color: darkGreen), ), onTap: () {}, ), diff --git a/lib/views/mobile/home_bottom_navigation_screen.dart b/lib/views/mobile/home_bottom_navigation_screen.dart index b901c02..512f12e 100644 --- a/lib/views/mobile/home_bottom_navigation_screen.dart +++ b/lib/views/mobile/home_bottom_navigation_screen.dart @@ -33,7 +33,7 @@ class _HomeBottomNavigationScreenState extends State height: 50.0, child: BottomNavigationBar( type: BottomNavigationBarType.fixed, - selectedItemColor: darkOrange, + selectedItemColor: darkGreen, unselectedItemColor: Colors.grey, currentIndex: selectedIndex, selectedLabelStyle: labelTextStyle, diff --git a/lib/views/mobile/menu/best_in_safety_view.dart b/lib/views/mobile/menu/best_in_safety_view.dart index 2ab183c..d7ae002 100644 --- a/lib/views/mobile/menu/best_in_safety_view.dart +++ b/lib/views/mobile/menu/best_in_safety_view.dart @@ -44,7 +44,7 @@ class BestInSafetyViews extends StatelessWidget { ClipOval( child: Container( alignment: Alignment.center, - color: menuOrange, + color: menuGreen, height: 25.0, width: 25.0, child: const Icon( diff --git a/lib/views/mobile/menu/food_groceries_availability_view.dart b/lib/views/mobile/menu/food_groceries_availability_view.dart index d65a04c..e5745ad 100644 --- a/lib/views/mobile/menu/food_groceries_availability_view.dart +++ b/lib/views/mobile/menu/food_groceries_availability_view.dart @@ -30,7 +30,7 @@ class FoodGroceriesAvailabilityView extends StatelessWidget { child: Container( width: 10.0, height: 140.0, - color: menuOrange, + color: menuGreen, ), ), UIHelper.horizontalSpaceMedium(), @@ -73,7 +73,7 @@ class FoodGroceriesAvailabilityView extends StatelessWidget { }, child: Container( height: 170.0, - color: menuOrange, + color: menuGreen, child: Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ @@ -110,7 +110,7 @@ class FoodGroceriesAvailabilityView extends StatelessWidget { Container( height: 45.0, padding: const EdgeInsets.symmetric(horizontal: 10.0), - color: darkOrange, + color: darkGreen, child: Row( children: [ Text( diff --git a/lib/views/mobile/menu/genie/genie_grocery_card_view.dart b/lib/views/mobile/menu/genie/genie_grocery_card_view.dart index 4525169..c0ed4f7 100644 --- a/lib/views/mobile/menu/genie/genie_grocery_card_view.dart +++ b/lib/views/mobile/menu/genie/genie_grocery_card_view.dart @@ -30,7 +30,7 @@ class GenieGroceryCardView extends StatelessWidget { padding: const EdgeInsets.only(top: 8.0), height: 120.0, decoration: const BoxDecoration( - color: menuOrange, + color: menuGreen, boxShadow: [ BoxShadow( color: Colors.grey, diff --git a/lib/views/mobile/menu/genie/genie_screen.dart b/lib/views/mobile/menu/genie/genie_screen.dart index 3da7d80..657f37c 100644 --- a/lib/views/mobile/menu/genie/genie_screen.dart +++ b/lib/views/mobile/menu/genie/genie_screen.dart @@ -178,7 +178,7 @@ class _HeaderView extends StatelessWidget { height: 50.0, width: double.infinity, child: ElevatedButton( - style: ElevatedButton.styleFrom(backgroundColor: darkOrange), + style: ElevatedButton.styleFrom(backgroundColor: darkGreen), child: Text( buttonTitle, style: Theme.of(context).textTheme.titleSmall!.copyWith(color: Colors.white, fontSize: 14.0), diff --git a/lib/views/mobile/menu/genie/genie_view.dart b/lib/views/mobile/menu/genie/genie_view.dart index ab673a8..8299250 100644 --- a/lib/views/mobile/menu/genie/genie_view.dart +++ b/lib/views/mobile/menu/genie/genie_view.dart @@ -124,7 +124,7 @@ class _GenieCardView extends StatelessWidget { ClipOval( child: Container( alignment: Alignment.center, - color: menuOrange, + color: menuGreen, height: 25.0, width: 25.0, child: const Icon( diff --git a/lib/views/mobile/menu/meat/meat_screen.dart b/lib/views/mobile/menu/meat/meat_screen.dart index 368cc94..442d744 100644 --- a/lib/views/mobile/menu/meat/meat_screen.dart +++ b/lib/views/mobile/menu/meat/meat_screen.dart @@ -167,7 +167,7 @@ class _CardView extends StatelessWidget { padding: const EdgeInsets.all(10.0), decoration: BoxDecoration( color: Colors.orange[100], - border: Border.all(color: menuOrange, width: 2.0), + border: Border.all(color: menuGreen, width: 2.0), borderRadius: BorderRadius.circular(10.0), ), child: Row( @@ -202,7 +202,7 @@ class _CardView extends StatelessWidget { style: Theme.of(context) .textTheme .titleLarge! - .copyWith(color: darkOrange), + .copyWith(color: darkGreen), ), onPressed: () {}, ) diff --git a/lib/views/mobile/menu/menu_safety_banner_view.dart b/lib/views/mobile/menu/menu_safety_banner_view.dart index 2c90614..c356246 100644 --- a/lib/views/mobile/menu/menu_safety_banner_view.dart +++ b/lib/views/mobile/menu/menu_safety_banner_view.dart @@ -21,14 +21,14 @@ class MenuSafetyBannerView extends StatelessWidget { children: [ const Icon( Icons.arrow_downward, - color: menuOrange, + color: menuGreen, ), UIHelper.horizontalSpaceExtraSmall(), Flexible( child: Text( "SWIGGY's KEY MEASURES TO ENSURE SAFETY", style: Theme.of(context).textTheme.titleSmall!.copyWith( - color: menuOrange, + color: menuGreen, fontSize: 15.0, fontWeight: FontWeight.w700, ), @@ -37,7 +37,7 @@ class MenuSafetyBannerView extends StatelessWidget { UIHelper.horizontalSpaceExtraSmall(), const Icon( Icons.arrow_downward, - color: menuOrange, + color: menuGreen, ), ], ), @@ -54,7 +54,7 @@ class MenuSafetyBannerView extends StatelessWidget { width: cardWidth, decoration: BoxDecoration( color: Colors.orange[100], - border: Border.all(color: menuOrange, width: 2.0), + border: Border.all(color: menuGreen, width: 2.0), borderRadius: BorderRadius.circular(10.0), ), child: Row( @@ -90,7 +90,7 @@ class MenuSafetyBannerView extends StatelessWidget { style: Theme.of(context) .textTheme .titleLarge! - .copyWith(color: darkOrange), + .copyWith(color: darkGreen), ), onPressed: () {}, ) diff --git a/lib/views/mobile/menu/menu_screen.dart b/lib/views/mobile/menu/menu_screen.dart index c3a8e4c..7be2e8d 100644 --- a/lib/views/mobile/menu/menu_screen.dart +++ b/lib/views/mobile/menu/menu_screen.dart @@ -131,7 +131,7 @@ class SeeAllRestaurantBtn extends StatelessWidget { height: 50.0, width: double.infinity, child: ElevatedButton( - style: ElevatedButton.styleFrom(backgroundColor: darkOrange), + style: ElevatedButton.styleFrom(backgroundColor: darkGreen), onPressed: isTabletDesktop ? () {} : () { diff --git a/lib/views/mobile/menu/top_offer_view.dart b/lib/views/mobile/menu/top_offer_view.dart index 6642e0a..ff36928 100644 --- a/lib/views/mobile/menu/top_offer_view.dart +++ b/lib/views/mobile/menu/top_offer_view.dart @@ -46,7 +46,7 @@ class TopOffersViews extends StatelessWidget { ClipOval( child: Container( alignment: Alignment.center, - color: menuOrange, + color: menuGreen, height: 25.0, width: 25.0, child: const Icon( diff --git a/lib/views/mobile/search/search_screen.dart b/lib/views/mobile/search/search_screen.dart index acac85e..c806348 100644 --- a/lib/views/mobile/search/search_screen.dart +++ b/lib/views/mobile/search/search_screen.dart @@ -73,11 +73,11 @@ class _SearchScreenState extends State unselectedLabelColor: Colors.grey, labelColor: Colors.black, controller: _tabController, - indicatorColor: darkOrange, + indicatorColor: darkGreen, labelStyle: Theme.of(context) .textTheme .titleSmall! - .copyWith(fontSize: 18.0, color: darkOrange), + .copyWith(fontSize: 18.0, color: darkGreen), unselectedLabelStyle: Theme.of(context).textTheme.titleSmall!.copyWith( fontSize: 18.0, diff --git a/lib/views/tab_desktop/cart_view.dart b/lib/views/tab_desktop/cart_view.dart index 86ec419..46e739b 100644 --- a/lib/views/tab_desktop/cart_view.dart +++ b/lib/views/tab_desktop/cart_view.dart @@ -114,7 +114,7 @@ class _MyOrdersList extends StatelessWidget { children: [ Text('Order Menu', style: Theme.of(context).textTheme.titleLarge), const Spacer(), - Text('See all', style: Theme.of(context).textTheme.titleMedium!.copyWith(color: menuOrange)), + Text('See all', style: Theme.of(context).textTheme.titleMedium!.copyWith(color: menuGreen)), ], ), UIHelper.verticalSpaceSmall(), @@ -221,7 +221,7 @@ class _Checkout extends StatelessWidget { margin: const EdgeInsets.symmetric(vertical: 15.0), padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 10.0), decoration: BoxDecoration( - border: Border.all(color: menuOrange), + border: Border.all(color: menuGreen), color: Colors.deepOrange[50], ), child: Row( @@ -236,7 +236,7 @@ class _Checkout extends StatelessWidget { label: const Text('Add Coupon'), style: ElevatedButton.styleFrom( foregroundColor: Colors.white, - backgroundColor: menuOrange, + backgroundColor: menuGreen, elevation: 0.0, ), ), @@ -260,7 +260,7 @@ class _Checkout extends StatelessWidget { label: const Text('Checkout'), style: ElevatedButton.styleFrom( foregroundColor: Colors.white, - backgroundColor: menuOrange, + backgroundColor: menuGreen, ), ), ) diff --git a/lib/views/tab_desktop/menu_view.dart b/lib/views/tab_desktop/menu_view.dart index 76564ba..c19ccac 100644 --- a/lib/views/tab_desktop/menu_view.dart +++ b/lib/views/tab_desktop/menu_view.dart @@ -47,8 +47,8 @@ class MenuView extends StatelessWidget { label: const Text('Logout'), onPressed: () {}, style: ElevatedButton.styleFrom( - foregroundColor: menuOrange, - side: const BorderSide(width: 2.0, color: menuOrange), + foregroundColor: menuGreen, + side: const BorderSide(width: 2.0, color: menuGreen), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(32.0), ), @@ -103,7 +103,7 @@ class __MenuItemState extends State<_MenuItem> { padding: isTab ? const EdgeInsets.symmetric(vertical: 10.0) : const EdgeInsets.only(left: 15.0, top: 10.0, right: 25.0, bottom: 10.0), child: isTab ? IconButton( - icon: Icon(widget.menu.icon, color: isHovered ? menuOrange : Colors.black), + icon: Icon(widget.menu.icon, color: isHovered ? menuGreen : Colors.black), iconSize: 30.0, onPressed: () {}, ) @@ -112,12 +112,12 @@ class __MenuItemState extends State<_MenuItem> { mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center, children: [ - Icon(widget.menu.icon, color: isHovered ? menuOrange : Colors.black, size: 30.0), + Icon(widget.menu.icon, color: isHovered ? menuGreen : Colors.black, size: 30.0), UIHelper.horizontalSpaceMedium(), Text( widget.menu.title, style: Theme.of(context).textTheme.titleLarge!.copyWith( - color: isHovered ? menuOrange : Colors.black, + color: isHovered ? menuGreen : Colors.black, ), ), ],