Skip to content

Commit

Permalink
🚨 theme
Browse files Browse the repository at this point in the history
  • Loading branch information
ChunhThanhDe committed Apr 17, 2024
1 parent 82ca635 commit 6314e55
Show file tree
Hide file tree
Showing 17 changed files with 40 additions and 37 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

<a href="https://www.buymeacoffee.com/chunhthanhde" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" style="height: 41px !important;width: 174px !important;box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;-webkit-box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;" ></a>

Expand Down
10 changes: 7 additions & 3 deletions lib/utils/app_colors.dart
Original file line number Diff line number Diff line change
@@ -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);
8 changes: 4 additions & 4 deletions lib/views/mobile/account/account_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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: () {},
)
Expand Down Expand Up @@ -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: () {},
),
Expand Down Expand Up @@ -308,11 +308,11 @@ class _PastOrdersListItemView extends StatelessWidget {
children: <Widget>[
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: () {},
),
Expand Down
2 changes: 1 addition & 1 deletion lib/views/mobile/cart/cart_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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: () {},
),
Expand Down
2 changes: 1 addition & 1 deletion lib/views/mobile/home_bottom_navigation_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class _HomeBottomNavigationScreenState extends State<HomeBottomNavigationScreen>
height: 50.0,
child: BottomNavigationBar(
type: BottomNavigationBarType.fixed,
selectedItemColor: darkOrange,
selectedItemColor: darkGreen,
unselectedItemColor: Colors.grey,
currentIndex: selectedIndex,
selectedLabelStyle: labelTextStyle,
Expand Down
2 changes: 1 addition & 1 deletion lib/views/mobile/menu/best_in_safety_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
6 changes: 3 additions & 3 deletions lib/views/mobile/menu/food_groceries_availability_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class FoodGroceriesAvailabilityView extends StatelessWidget {
child: Container(
width: 10.0,
height: 140.0,
color: menuOrange,
color: menuGreen,
),
),
UIHelper.horizontalSpaceMedium(),
Expand Down Expand Up @@ -73,7 +73,7 @@ class FoodGroceriesAvailabilityView extends StatelessWidget {
},
child: Container(
height: 170.0,
color: menuOrange,
color: menuGreen,
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
Expand Down Expand Up @@ -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: <Widget>[
Text(
Expand Down
2 changes: 1 addition & 1 deletion lib/views/mobile/menu/genie/genie_grocery_card_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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>[
BoxShadow(
color: Colors.grey,
Expand Down
2 changes: 1 addition & 1 deletion lib/views/mobile/menu/genie/genie_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion lib/views/mobile/menu/genie/genie_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions lib/views/mobile/menu/meat/meat_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -202,7 +202,7 @@ class _CardView extends StatelessWidget {
style: Theme.of(context)
.textTheme
.titleLarge!
.copyWith(color: darkOrange),
.copyWith(color: darkGreen),
),
onPressed: () {},
)
Expand Down
10 changes: 5 additions & 5 deletions lib/views/mobile/menu/menu_safety_banner_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ class MenuSafetyBannerView extends StatelessWidget {
children: <Widget>[
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,
),
Expand All @@ -37,7 +37,7 @@ class MenuSafetyBannerView extends StatelessWidget {
UIHelper.horizontalSpaceExtraSmall(),
const Icon(
Icons.arrow_downward,
color: menuOrange,
color: menuGreen,
),
],
),
Expand All @@ -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(
Expand Down Expand Up @@ -90,7 +90,7 @@ class MenuSafetyBannerView extends StatelessWidget {
style: Theme.of(context)
.textTheme
.titleLarge!
.copyWith(color: darkOrange),
.copyWith(color: darkGreen),
),
onPressed: () {},
)
Expand Down
2 changes: 1 addition & 1 deletion lib/views/mobile/menu/menu_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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
? () {}
: () {
Expand Down
2 changes: 1 addition & 1 deletion lib/views/mobile/menu/top_offer_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions lib/views/mobile/search/search_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ class _SearchScreenState extends State<SearchScreen>
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,
Expand Down
8 changes: 4 additions & 4 deletions lib/views/tab_desktop/cart_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down Expand Up @@ -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(
Expand All @@ -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,
),
),
Expand All @@ -260,7 +260,7 @@ class _Checkout extends StatelessWidget {
label: const Text('Checkout'),
style: ElevatedButton.styleFrom(
foregroundColor: Colors.white,
backgroundColor: menuOrange,
backgroundColor: menuGreen,
),
),
)
Expand Down
10 changes: 5 additions & 5 deletions lib/views/tab_desktop/menu_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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),
),
Expand Down Expand Up @@ -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: () {},
)
Expand All @@ -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,
),
),
],
Expand Down

0 comments on commit 6314e55

Please sign in to comment.