Skip to content

Commit 139b392

Browse files
nathansdevnathansdev
committed
Fix: payment page alignment issues fixed
1 parent d3a43ea commit 139b392

11 files changed

+156
-135
lines changed

‎lib/login/contact_us_form.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ class ContactUsForm extends StatelessWidget {
8282
left: 24,
8383
top: 80,
8484
child: ButtonRoundWithShadow(
85+
size: 48,
8586
iconPath: "assets/icons/close.svg",
8687
borderColor: black,
8788
shadowColor: black,

‎lib/login/login_form_one.dart‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,17 @@ import 'login_text.dart';
1313
class LoginFormTypeOne extends StatelessWidget {
1414
@override
1515
Widget build(BuildContext context) {
16-
return Material(
17-
child: Stack(
16+
return Scaffold(
17+
body: Stack(
1818
children: [
1919
Container(
2020
color: white,
2121
padding: EdgeInsets.symmetric(horizontal: 24),
2222
child: Column(
2323
children: <Widget>[
24-
SizedBox(
25-
height: 56,
26-
),
2724
Expanded(
2825
flex: 1,
29-
child: Row(
30-
children: <Widget>[],
31-
),
26+
child: Container(),
3227
),
3328
Expanded(
3429
flex: 1,
@@ -91,17 +86,14 @@ class LoginFormTypeOne extends StatelessWidget {
9186
],
9287
),
9388
),
94-
Expanded(
95-
flex: 1,
96-
child: Container(),
97-
)
9889
],
9990
),
10091
),
10192
Positioned(
10293
left: 24,
10394
top: 80,
10495
child: ButtonRoundWithShadow(
96+
size: 48,
10597
iconPath: "assets/icons/close.svg",
10698
borderColor: black,
10799
shadowColor: black,

‎lib/login/login_form_two.dart‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,10 @@ class LoginFormTypeTwo extends StatelessWidget {
2020
padding: EdgeInsets.symmetric(horizontal: 24),
2121
child: Column(
2222
children: <Widget>[
23-
SizedBox(
24-
height: 56,
25-
),
2623
Expanded(
2724
flex: 1,
28-
child: Row(
29-
children: <Widget>[],
25+
child: SizedBox(
26+
height: 56,
3027
),
3128
),
3229
Expanded(
@@ -83,17 +80,13 @@ class LoginFormTypeTwo extends StatelessWidget {
8380
],
8481
),
8582
),
86-
Expanded(
87-
flex: 1,
88-
child: Container(),
89-
)
9083
],
9184
),
9285
),
9386
Positioned(
9487
left: 24,
9588
top: 80,
96-
child: ButtonRoundWithShadow(
89+
child: ButtonRoundWithShadow(size: 48,
9790
iconPath: "assets/icons/close.svg",
9891
borderColor: black,
9992
shadowColor: black,

‎lib/login/login_form_type_four.dart‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import 'login_input_password_text.dart';
1010
class LoginFormTypeFour extends StatelessWidget {
1111
@override
1212
Widget build(BuildContext context) {
13-
return Material(
14-
child: Stack(alignment: Alignment.bottomCenter, children: <Widget>[
13+
return Scaffold(
14+
body: Stack(alignment: Alignment.bottomCenter, children: <Widget>[
1515
Container(
1616
color: flamingo,
1717
alignment: Alignment.center,
@@ -106,6 +106,7 @@ class LoginFormTypeFour extends StatelessWidget {
106106
Padding(
107107
padding: EdgeInsets.symmetric(horizontal: 24),
108108
child: ButtonPlainWithIcon(
109+
size: 48,
109110
color: wood_smoke,
110111
textColor: white,
111112
iconPath: "assets/icons/arrow_next.svg",

‎lib/login/login_form_type_three.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class LoginFormTypeThree extends StatelessWidget {
4545
left: 24,
4646
top: 56,
4747
child: ButtonRoundWithShadow(
48+
size: 48,
4849
iconPath: "assets/icons/close.svg",
4950
borderColor: black,
5051
shadowColor: black,

‎lib/login/signup_form_one.dart‎

Lines changed: 69 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -15,85 +15,81 @@ class SignInFormTypeOne extends StatelessWidget {
1515
return Scaffold(
1616
body: Stack(
1717
children: [
18-
Container(
19-
color: white,
20-
padding: EdgeInsets.symmetric(horizontal: 24),
21-
child: Column(
22-
children: <Widget>[
23-
Expanded(
24-
flex: 1,
25-
child: Row(
26-
children: <Widget>[],
27-
),
18+
Column(
19+
children: <Widget>[
20+
Expanded(
21+
flex: 1,
22+
child: Container(),
23+
),
24+
Expanded(
25+
flex: 5,
26+
child: ListView(
27+
padding: EdgeInsets.all(24),
28+
children: <Widget>[
29+
LoginText(
30+
text: "Sign up",
31+
alignment: Alignment.centerLeft,
32+
),
33+
SizedBox(
34+
height: 12,
35+
),
36+
Text(
37+
"You have chance to create new account if you really want to.",
38+
textAlign: TextAlign.start,
39+
style: TextStyle(
40+
fontSize: 21,
41+
color: trout,
42+
fontWeight: FontWeight.w500),
43+
),
44+
SizedBox(
45+
height: 24,
46+
),
47+
LoginEmailText(
48+
text: "Full Name",
49+
iconPath: "assets/icons/user.svg",
50+
),
51+
SizedBox(
52+
height: 24,
53+
),
54+
LoginEmailText(
55+
text: "Email address",
56+
iconPath: "assets/icons/mail.svg",
57+
),
58+
SizedBox(
59+
height: 24,
60+
),
61+
LoginPasswordText(
62+
text: "..........",
63+
iconPath: "assets/icons/lock.svg",
64+
),
65+
SizedBox(
66+
height: 40,
67+
),
68+
ButtonPlainWithShadow(
69+
text: "Sign up",
70+
shadowColor: wood_smoke,
71+
borderColor: wood_smoke,
72+
callback: () {},
73+
color: lightening_yellow,
74+
),
75+
SizedBox(
76+
height: 40,
77+
),
78+
CustomRichText(
79+
alignment: Alignment.centerLeft,
80+
text_one: "You are new? ",
81+
text_second: "Create new",
82+
)
83+
],
2884
),
29-
Expanded(
30-
flex: 5,
31-
child: ListView(
32-
children: <Widget>[
33-
LoginText(
34-
text: "Sign up",
35-
alignment: Alignment.centerLeft,
36-
),
37-
SizedBox(
38-
height: 12,
39-
),
40-
Text(
41-
"You have chance to create new account if you really want to.",
42-
textAlign: TextAlign.start,
43-
style: TextStyle(
44-
fontSize: 21,
45-
color: trout,
46-
fontWeight: FontWeight.w500),
47-
),
48-
SizedBox(
49-
height: 24,
50-
),
51-
LoginEmailText(
52-
text: "Full Name",
53-
iconPath: "assets/icons/user.svg",
54-
),
55-
SizedBox(
56-
height: 24,
57-
),
58-
LoginEmailText(
59-
text: "Email address",
60-
iconPath: "assets/icons/mail.svg",
61-
),
62-
SizedBox(
63-
height: 24,
64-
),
65-
LoginPasswordText(
66-
text: "..........",
67-
iconPath: "assets/icons/lock.svg",
68-
),
69-
SizedBox(
70-
height: 40,
71-
),
72-
ButtonPlainWithShadow(
73-
text: "Sign up",
74-
shadowColor: wood_smoke,
75-
borderColor: wood_smoke,
76-
callback: () {},
77-
color: lightening_yellow,
78-
),
79-
SizedBox(
80-
height: 40,
81-
),
82-
CustomRichText(
83-
alignment: Alignment.centerLeft,
84-
text_one: "You are new? ",
85-
text_second: "Create new",
86-
)
87-
],
88-
),
89-
),
90-
],
91-
),
85+
),
86+
],
9287
),
9388
Positioned(
9489
left: 24,
9590
top: 80,
9691
child: ButtonRoundWithShadow(
92+
size: 48,
9793
iconPath: "assets/icons/close.svg",
9894
borderColor: black,
9995
shadowColor: black,

‎lib/login/verification_type.dart‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,13 @@ class VerificationType extends StatelessWidget {
1414
Column(
1515
children: <Widget>[
1616
Expanded(
17-
flex: 3,
17+
flex: 1,
18+
child: Container(
19+
color: lightening_yellow,
20+
),
21+
),
22+
Expanded(
23+
flex: 2,
1824
child: Container(
1925
color: lightening_yellow,
2026
alignment: Alignment.bottomCenter,
@@ -272,7 +278,8 @@ class VerificationType extends StatelessWidget {
272278
child: Row(
273279
children: <Widget>[
274280
ButtonRoundWithShadow(
275-
iconPath: "assets/icons/arrow_forward.svg",
281+
size: 48,
282+
iconPath: "assets/icons/arrow_back.svg",
276283
borderColor: black,
277284
shadowColor: black,
278285
color: white,

‎lib/main.dart‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,31 @@ class _MyHomePageState extends State<MyHomePage> {
170170
},
171171
),
172172
),
173+
/* Container(
174+
child: ListTile(
175+
contentPadding: EdgeInsets.all(20),
176+
trailing: Icon(Icons.navigate_next),
177+
title: Text("Dialogs, Filters, Toasts"),
178+
onTap: () {
179+
Navigator.pushNamed(context, "/empty_state");
180+
},
181+
),
182+
),
183+
Container(
184+
child: ListTile(
185+
contentPadding: EdgeInsets.all(20),
186+
trailing: Icon(Icons.navigate_next),
187+
title: Text("Profile"),
188+
onTap: () {
189+
Navigator.pushNamed(context, "/empty_state");
190+
},
191+
),
192+
),
173193
Container(
174194
child: ListTile(
175195
contentPadding: EdgeInsets.all(20),
176196
trailing: Icon(Icons.navigate_next),
177-
title: Text("Onboarding"),
197+
title: Text("Menus"),
178198
onTap: () {
179199
Navigator.pushNamed(context, "/empty_state");
180200
},
@@ -187,7 +207,7 @@ class _MyHomePageState extends State<MyHomePage> {
187207
onTap: () {
188208
Navigator.pushNamed(context, "/empty_state");
189209
},
190-
)
210+
)*/
191211
],
192212
),
193213
),

‎lib/payment/payment_card.dart‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,17 @@ class PaymentCard extends StatelessWidget {
5252
shape: RoundedRectangleBorder(
5353
borderRadius: BorderRadius.all(Radius.circular(8)))),
5454
),
55-
Text(
56-
card.number,
57-
style: TextStyle(
58-
color: white, fontWeight: FontWeight.w800, fontSize: 21),
55+
Expanded(
56+
flex: 1,
57+
child: Text(
58+
card.number,
59+
overflow: TextOverflow.ellipsis,
60+
maxLines: 1,
61+
style: TextStyle(
62+
color: white,
63+
fontWeight: FontWeight.w800,
64+
fontSize: 21),
65+
),
5966
),
6067
],
6168
),
@@ -72,6 +79,8 @@ class PaymentCard extends StatelessWidget {
7279
),
7380
Text(
7481
card.user_name,
82+
overflow: TextOverflow.ellipsis,
83+
maxLines: 1,
7584
style: TextStyle(
7685
color: white,
7786
fontWeight: FontWeight.w800,

‎lib/payment/payment_card_item_big.dart‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ class PaymentCartItemBig extends StatelessWidget {
5454
padding: const EdgeInsets.symmetric(vertical: 24.0),
5555
child: Text(
5656
"You don’t think you should give some dollar to use our service.",
57+
textAlign: TextAlign.center,
5758
style: TextStyle(color: white, fontSize: 17),
5859
),
5960
),
@@ -66,9 +67,6 @@ class PaymentCartItemBig extends StatelessWidget {
6667
textColor: type.buttonTextColor,
6768
borderColor: type.buttonColor,
6869
),
69-
SizedBox(
70-
height: 12,
71-
)
7270
],
7371
),
7472
);

0 commit comments

Comments
 (0)