Skip to content

Commit 6cb52a3

Browse files
ShiftHackZShiftHackZ
authored
WooApp Theming / Coloring / Redesigns (#4)
* Coloring Patch 1 * Cart toolbar fix * Coloring Patch 2 * Coloring Patch 3 * Coloring Patch 4 * Coloring Patch 5 * Coloring Patch 6
1 parent 7d165fe commit 6cb52a3

59 files changed

Lines changed: 2741 additions & 1747 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎assets/translations/uk.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
"create_order_country": "Країна",
123123
"create_order_state": "Область",
124124
"create_order_city": "Місто",
125-
"create_order_post": "Поштовый індекс",
125+
"create_order_post": "Поштовий індекс",
126126
"create_order_address_1": "Адреса",
127127
"create_order_address_2": "Інформація",
128128
"create_order_terms": "Я ознайовився й повністю погоджуюся з правилами магазину, умовами використання додатку.",

‎lib/config/colors.dart‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎lib/config/theme.dart‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
import 'package:flutter/material.dart';
2+
3+
/// Contains WooApp material color palette configuration.
4+
///
5+
/// Generated by: https://m3.material.io/theme-builder#/custom
6+
/// Input primary color: #005d99
7+
class WooAppTheme {
8+
static const Color colorCommonBackground = Color(0xFFfdfcff);
9+
static const Color colorCommonText = Color(0xFF1a1c1e);
10+
11+
static const Color colorCommonSectionBackground = Color(0xccd6e4f7);
12+
static const Color colorCommonSectionForeground = Color(0xFF0f1d2a);
13+
14+
static const Color colorShimmerBackground = Color(0x59d6e4f7);
15+
static const Color colorShimmerForeground = Color(0xFF241432);
16+
17+
static const Color colorToolbarBackground = Color(0xFF0062a0);
18+
static const Color colorToolbarForeground = Color(0xFFd0e4ff);
19+
20+
static const Color colorPrimaryBackground = Color(0xFF0062a0);
21+
static const Color colorPrimaryForeground = Color(0xFFFFFFFF);
22+
23+
static const Color colorSecondaryBackground = Color(0xFFdfe3eb);
24+
static const Color colorSecondaryForeground = Color(0xFF526070);
25+
26+
static const Color colorDangerActionBackground = Color(0xFFffb4ab);
27+
static const Color colorDangerActionForeground = Color(0xFF690005);
28+
29+
static const Color colorFeaturedSearchBackground = Color(0xba2982b9);
30+
static const Color colorFeaturedSearchBorder = Color(0x40d0e4ff);//Color(0x808BC0EA);
31+
32+
static const Color colorBottomBarIconNonActive = Color(0x996a5779);
33+
static const Color colorBottomBarIconActive = Color(0xff241432);
34+
// static const Color colorBottomBarBackground = Color(0xFFfdfcff);
35+
static const Color colorBottomBarBackground = Color(0xffededf1);
36+
37+
static const Color colorRatingActive = Color(0xFFDC810B);
38+
static const Color colorRatingNonActive = Color(0x99526070);
39+
static const Color colorRatingText = Color(0xFF241432);
40+
41+
static const Color colorCardProductBackground = Color(0xffedf4ff);
42+
static const Color colorCardProductText = Color(0xFF001d35);
43+
44+
static const Color colorProductStatusBgInStock = Color(0xFFFFFFFF);
45+
static const Color colorProductStatusTextInStock = Colors.lightGreen;
46+
47+
static const Color colorProductStatusBgOutOfStock = Color(0xFFFFFFFF);
48+
static const Color colorProductStatusTextOutOfStock = Colors.redAccent;
49+
50+
static const Color colorProductStatusBgBackOrder = Color(0xFF5A4D0D);
51+
static const Color colorProductStatusTextBackOrder = Colors.amberAccent;
52+
53+
static const Color colorProductStatusBgDefault = Color(0xFFFFF3F3);
54+
static const Color colorProductStatusTextDefault = Colors.redAccent;
55+
56+
static const Color colorCardOrderBackground = colorCardProductBackground;
57+
static const Color colorCardOrderForeground = colorCardProductText;
58+
59+
static const Color colorCreateOrderHeaderText = colorCommonSectionForeground;
60+
static const Color colorCardCreateOrderBackground = colorCommonSectionBackground;
61+
static const Color colorCardCreateOrderText = Color(0xFF565D88);
62+
63+
static const Color colorPrice = Color(0xFF1a1c1e);
64+
static const Color colorPriceSale = Color(0xFFba1a1a);
65+
66+
static const Color colorAuthBackground = Color(0xff0062a0);
67+
static const Color colorAuthHeaderText = Color(0xFFdfe3eb);
68+
static const Color colorAuthActionText = Color(0xFFf1daff);
69+
static const Color colorAuthActionBackground = Color(0xFF1a1c1e);
70+
static const Color colorAuthFieldText = Color(0xFFd0e4ff);
71+
static const Color colorAuthNotValidFieldText = Color(0xFFba1a1a);
72+
}

‎lib/extensions/extensions_context.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:flutter/material.dart';
2+
import 'package:wooapp/config/theme.dart';
23
import 'package:wooapp/widget/widget_bottom_sheet_builder.dart';
34

45
void hideKeyboard(BuildContext context) {
@@ -22,7 +23,7 @@ void showBottomOptions(BuildContext context, Widget child) {
2223
),
2324
context: context,
2425
isScrollControlled: true,
25-
backgroundColor: Colors.white,
26+
backgroundColor: WooAppTheme.colorCommonBackground,
2627
builder: (context) => Column(
2728
mainAxisSize: MainAxisSize.min,
2829
children: [

‎lib/extensions/extensions_widget.dart‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import 'package:flutter/widgets.dart';
22
import 'package:shimmer_animation/shimmer_animation.dart';
3+
import 'package:wooapp/config/theme.dart';
34

45
Widget shimmer() => Shimmer(
56
duration: Duration(seconds: 1),
67
enabled: true,
78
direction: ShimmerDirection.fromLTRB(),
8-
child: Container(color: Color(0x11000000))
9+
color: WooAppTheme.colorShimmerForeground,
10+
child: Container(color: WooAppTheme.colorShimmerBackground)
911
);

‎lib/main.dart‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'package:easy_localization/easy_localization.dart';
22
import 'package:flutter/material.dart';
33
import 'package:hive_flutter/hive_flutter.dart';
44
import 'package:flutter_dotenv/flutter_dotenv.dart';
5+
import 'package:wooapp/config/theme.dart';
56
import 'package:wooapp/config/translations.dart';
67
import 'package:wooapp/database/entity/filter.dart';
78
import 'package:wooapp/database/entity/filter_value.dart';
@@ -56,16 +57,16 @@ class _WooShopAppState extends State<WooShopApp> {
5657

5758
@override
5859
Widget build(BuildContext context) => MaterialApp(
59-
title: tr('app_name'),
60-
localizationsDelegates: context.localizationDelegates,
61-
supportedLocales: context.supportedLocales,
62-
locale: context.locale,
63-
debugShowCheckedModeBanner: false,
64-
home: FutureBuilder(
65-
future: dependencyFuture,
66-
builder: (context, snapshot) => SplashScreen(),
67-
),
68-
);
60+
title: tr('app_name'),
61+
localizationsDelegates: context.localizationDelegates,
62+
supportedLocales: context.supportedLocales,
63+
locale: context.locale,
64+
debugShowCheckedModeBanner: false,
65+
home: FutureBuilder(
66+
future: dependencyFuture,
67+
builder: (context, snapshot) => SplashScreen(),
68+
),
69+
);
6970

7071
void initHive() => Hive
7172
..initFlutter()

‎lib/model/product.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class Product {
2323
List<ProductAttribute> attributes;
2424

2525
bool get isVariable => type == 'variable';
26+
bool get hasDescription => description.isNotEmpty;
2627

2728
Product.fromJson(Map<String, dynamic> json)
2829
: id = json['id'],

0 commit comments

Comments
 (0)