Skip to content

Commit 55ca7a0

Browse files
nathansdevnathansdev
committed
shopping screens ui issues fixed
1 parent 139b392 commit 55ca7a0

10 files changed

+93
-83
lines changed

‎lib/blog/blog_card_type_three.dart‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class BlogCardTypeThree extends StatelessWidget {
120120
mainAxisAlignment: MainAxisAlignment.spaceBetween,
121121
children: <Widget>[
122122
Expanded(
123-
flex: 1,
123+
flex: 2,
124124
child: Row(
125125
children: <Widget>[
126126
Expanded(
@@ -142,9 +142,6 @@ class BlogCardTypeThree extends StatelessWidget {
142142
],
143143
),
144144
),
145-
SizedBox(
146-
width: 20,
147-
),
148145
Expanded(
149146
flex: 1,
150147
child: Row(

‎lib/blog/blog_detail_page.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class _BlogDetailPageState extends State<BlogDetailPage> {
2323
height: MediaQuery.of(context).size.height,
2424
alignment: Alignment.topCenter,
2525
child: CustomAppBar(
26-
height: 150 - statusBarHeight,
26+
height: kToolbarHeight + statusBarHeight + statusBarHeight,
2727
child: Column(
2828
mainAxisAlignment: MainAxisAlignment.end,
2929
children: [

‎lib/custom_widgets/button_plain.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ class ButtonPlain extends StatelessWidget {
3333
textColor: textColor,
3434
child: Text(
3535
text,
36+
maxLines: 1,
3637
style: TextStyle(
3738
fontSize: textSize != null ? textSize : 12,
3839
fontWeight: FontWeight.w800),

‎lib/custom_widgets/chips_filter_widget.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ class _ChipsFilterWidgetState extends State<ChipsFilterWidget> {
2626
@override
2727
Widget build(BuildContext context) {
2828
return Padding(
29-
padding: const EdgeInsets.only(right: 16.0, top: 16.0),
29+
padding: const EdgeInsets.only(left: 12.0),
3030
child: Wrap(
31+
alignment: WrapAlignment.start,
3132
spacing: 12,
3233
runSpacing: 12,
3334
children: List<Widget>.generate(

‎lib/custom_widgets/pager_image_view.dart‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class _PagerImageViewState extends State<PagerImageView> {
5353
return Column(
5454
children: <Widget>[
5555
Container(
56-
height: 310,
56+
height: 300,
5757
padding: EdgeInsets.symmetric(horizontal: 16),
5858
child: PageView.builder(
5959
physics: ClampingScrollPhysics(),
@@ -67,26 +67,23 @@ class _PagerImageViewState extends State<PagerImageView> {
6767
controller: _pageController,
6868
),
6969
),
70-
Padding(
71-
padding: const EdgeInsets.all(24.0),
72-
child: Row(
73-
mainAxisAlignment: MainAxisAlignment.center,
74-
children: <Widget>[
75-
for (int i = 0; i < _cards.length; i++)
76-
if (i == currentPageValue) ...[
77-
CircleDotWidget(
78-
isActive: true,
79-
color: white,
80-
borderColor: white,
81-
)
82-
] else
83-
CircleDotWidget(
84-
isActive: false,
85-
color: flamingo,
86-
borderColor: wood_smoke,
87-
),
88-
],
89-
),
70+
Row(
71+
mainAxisAlignment: MainAxisAlignment.center,
72+
children: <Widget>[
73+
for (int i = 0; i < _cards.length; i++)
74+
if (i == currentPageValue) ...[
75+
CircleDotWidget(
76+
isActive: true,
77+
color: white,
78+
borderColor: white,
79+
)
80+
] else
81+
CircleDotWidget(
82+
isActive: false,
83+
color: flamingo,
84+
borderColor: wood_smoke,
85+
),
86+
],
9087
),
9188
],
9289
);

‎lib/shopping/shop_grid_item.dart‎

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -14,52 +14,51 @@ class ShopGridItemWidget extends StatelessWidget {
1414
Widget build(BuildContext context) {
1515
return GestureDetector(
1616
onTap: onTap,
17-
child: Container(
18-
child: Column(
19-
mainAxisSize: MainAxisSize.min,
20-
children: <Widget>[
21-
Container(
22-
width: MediaQuery.of(context).size.width,
23-
decoration: ShapeDecoration(
24-
color: shopItem.bgColor,
25-
shape: RoundedRectangleBorder(
26-
borderRadius: BorderRadius.all(Radius.circular(16)),
27-
side: BorderSide(color: wood_smoke, width: 2))),
28-
child: SvgPicture.asset(
29-
shopItem.image,
30-
width: 155,
31-
height: 170,
32-
),
17+
child: Column(
18+
mainAxisSize: MainAxisSize.min,
19+
children: <Widget>[
20+
Container(
21+
width: MediaQuery.of(context).size.width,
22+
decoration: ShapeDecoration(
23+
color: shopItem.bgColor,
24+
shape: RoundedRectangleBorder(
25+
borderRadius: BorderRadius.all(Radius.circular(16)),
26+
side: BorderSide(color: wood_smoke, width: 2))),
27+
child: SvgPicture.asset(
28+
shopItem.image,
29+
width: 155,
30+
height: 170,
3331
),
34-
SizedBox(
35-
height: 2,
32+
),
33+
SizedBox(
34+
height: 2,
35+
),
36+
Container(
37+
alignment: Alignment.centerLeft,
38+
child: Text(
39+
shopItem.name,
40+
maxLines: 2,
41+
textAlign: TextAlign.start,
42+
overflow: TextOverflow.ellipsis,
43+
style: TextStyle(
44+
color: wood_smoke, fontSize: 17, fontWeight: FontWeight.bold),
3645
),
37-
Container(
38-
alignment: Alignment.centerLeft,
39-
child: Text(
40-
shopItem.name,
41-
maxLines: 2,
42-
textAlign: TextAlign.start,
43-
style: TextStyle(
44-
color: wood_smoke,
45-
fontSize: 17,
46-
fontWeight: FontWeight.bold),
47-
),
46+
),
47+
SizedBox(
48+
height: 2,
49+
),
50+
Container(
51+
alignment: Alignment.centerLeft,
52+
child: Text(
53+
"\$" + shopItem.price,
54+
textAlign: TextAlign.start,
55+
overflow: TextOverflow.ellipsis,
56+
maxLines: 1,
57+
style: TextStyle(
58+
color: trout, fontSize: 18, fontWeight: FontWeight.w800),
4859
),
49-
SizedBox(
50-
height: 2,
51-
),
52-
Container(
53-
alignment: Alignment.centerLeft,
54-
child: Text(
55-
"\$" + shopItem.price,
56-
textAlign: TextAlign.start,
57-
style: TextStyle(
58-
color: trout, fontSize: 18, fontWeight: FontWeight.w800),
59-
),
60-
),
61-
],
62-
),
60+
),
61+
],
6362
),
6463
);
6564
}

‎lib/shopping/shopping_card_pager.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ class _ShoppingCardPagerState extends State<ShoppingCardPager> {
1919
categoryBig: CategoryBig(
2020
bgColor: lightening_yellow,
2121
startColor: lightening_yellow,
22-
name: "Summer Collection",
22+
name: "Summer \nCollection",
2323
image: "assets/images/shopping/peep_glass.svg"),
2424
),
2525
ShoppingCardPagerItem(
2626
categoryBig: CategoryBig(
2727
bgColor: lightening_yellow,
2828
startColor: lightening_yellow,
29-
name: "Tee Shirts",
29+
name: "Tee \nShirts",
3030
image: "assets/images/shopping/peep_glass.svg"),
3131
),
3232
ShoppingCardPagerItem(
3333
categoryBig: CategoryBig(
3434
bgColor: lightening_yellow,
3535
startColor: lightening_yellow,
36-
name: "Formal Pants",
36+
name: "Formal \nPants",
3737
image: "assets/images/shopping/peep_glass.svg"),
3838
)
3939
];

‎lib/shopping/shopping_card_pager_item.dart‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ShoppingCardPagerItem extends StatelessWidget {
2222
child: Row(
2323
children: <Widget>[
2424
Expanded(
25-
flex: 2,
25+
flex: 4,
2626
child: Column(
2727
mainAxisAlignment: MainAxisAlignment.spaceBetween,
2828
crossAxisAlignment: CrossAxisAlignment.start,
@@ -31,6 +31,8 @@ class ShoppingCardPagerItem extends StatelessWidget {
3131
padding: const EdgeInsets.only(left: 24.0, top: 24),
3232
child: Text(
3333
categoryBig.name,
34+
maxLines: 2,
35+
overflow: TextOverflow.ellipsis,
3436
style: TextStyle(
3537
color: wood_smoke,
3638
fontSize: 22,
@@ -53,10 +55,13 @@ class ShoppingCardPagerItem extends StatelessWidget {
5355
],
5456
),
5557
),
56-
SvgPicture.asset(
57-
categoryBig.image,
58-
width: 210,
59-
height: 230,
58+
Expanded(
59+
flex: 4,
60+
child: SvgPicture.asset(
61+
categoryBig.image,
62+
width: 210,
63+
height: 230,
64+
),
6065
),
6166
],
6267
),

‎lib/shopping/shopping_list_page_type_one.dart‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ class _ShoppingListPageOneState extends State<ShoppingListPageOne> {
2323
_filters.add("Small");
2424
_filters.add("Medium");
2525
_filters.add("Shirt");
26+
_filters.add("Shirt");
27+
_filters.add("Shirt");
2628
_filters.add("Tee");
2729
_items.add(ShopItem(
2830
image: "assets/images/shopping/coat_fur.svg",
@@ -122,8 +124,11 @@ class _ShoppingListPageOneState extends State<ShoppingListPageOne> {
122124
body: SingleChildScrollView(
123125
child: Column(
124126
children: [
125-
ChipsFilterWidget(
126-
filters: _filters,
127+
Padding(
128+
padding: const EdgeInsets.only(top: 12.0),
129+
child: ChipsFilterWidget(
130+
filters: _filters,
131+
),
127132
),
128133
ListView.builder(
129134
shrinkWrap: true,

‎lib/shopping/shopping_list_page_type_two.dart‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ class _ShoppingListPageTwoState extends State<ShoppingListPageTwo> {
117117
child: Text(
118118
" Summer \n Collection",
119119
textAlign: TextAlign.start,
120+
maxLines: 2,
121+
overflow: TextOverflow.ellipsis,
120122
style: TextStyle(
121123
color: white,
122124
fontSize: 36,
@@ -125,15 +127,18 @@ class _ShoppingListPageTwoState extends State<ShoppingListPageTwo> {
125127
),
126128
],
127129
),
128-
ChipsFilterWidget(
129-
filters: _filters,
130+
Padding(
131+
padding: const EdgeInsets.only(top: 12.0),
132+
child: ChipsFilterWidget(
133+
filters: _filters,
134+
),
130135
),
131136
GridView.builder(
132137
padding: EdgeInsets.all(24),
133138
gridDelegate: new SliverGridDelegateWithFixedCrossAxisCount(
134139
crossAxisCount: 2,
135140
crossAxisSpacing: 16,
136-
childAspectRatio: (1 / 1.5),
141+
childAspectRatio: (1 / 1.7),
137142
),
138143
controller: new ScrollController(keepScrollOffset: false),
139144
shrinkWrap: true,

0 commit comments

Comments
 (0)