Skip to content

F
feelver
Commit 44deca23 by Mobile : Garn (Flutter)
Options

Merge branch 'develop' of https://gitlab.2fellows.com/art/feelver into develop

parents 8482aedb a70a6bcf
Showing with 257 additions and 178 deletions
lib/ui/payment/payment_detail.dart
...@@ -19,82 +19,14 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -19,82 +19,14 @@ class _PaymentdetailState extends State<Paymentdetail> {
_setupView() { _setupView() {
return Column( return Column(
children: <Widget>[ children: <Widget>[
Stack( header(),
children: <Widget>[ containt(),
Container(
color: Color.fromRGBO(69, 85, 79, 1),
height: SizeConfig.getHeight(200),
width: MediaQuery.of(context).size.width,
),
Positioned(
top: SizeConfig.getPadding(50),
left: SizeConfig.getPadding(
MediaQuery.of(context).size.width / 3.5),
child: Container(
alignment: Alignment.topCenter,
child: Image.asset(
'assets/images/feelver_banner.png',
width: MediaQuery.of(context).size.width / 2.5,
),
),
),
Positioned(
top: SizeConfig.getPadding(77),
left: SizeConfig.getPadding(16),
child: Container(
child: GestureDetector(
onTap: () {
showDialog(
context: context,
builder: (BuildContext context) {
return NavDrawer();
},
);
},
child: Image.asset(
'assets/images/ic_menu.png',
height: SizeConfig.getWidth(24),
width: SizeConfig.getWidth(30),
fit: BoxFit.cover,
),
),
),
),
Positioned(
top: SizeConfig.getPadding(77),
right: SizeConfig.getPadding(60),
child: Container(
child: Image.asset(
'assets/images/ic_noti.png',
height: SizeConfig.getWidth(30),
width: SizeConfig.getWidth(30),
fit: BoxFit.cover,
),
),
),
Positioned(
top: SizeConfig.getPadding(77),
right: SizeConfig.getPadding(20),
child: InkWell(
// onTap: () {
// Navigator.push(
// context,
// MaterialPageRoute(builder: (context) => LoginPage()),
// );
// },
child: Container(
child: Image.asset(
'assets/images/ic_userimg.png',
height: SizeConfig.getWidth(30),
width: SizeConfig.getWidth(30),
fit: BoxFit.cover,
),
),
),
),
], ],
), );
Expanded( }
Widget containt() {
return Expanded(
child: SingleChildScrollView( child: SingleChildScrollView(
child: Padding( child: Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
...@@ -126,6 +58,20 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -126,6 +58,20 @@ class _PaymentdetailState extends State<Paymentdetail> {
indent: 10, indent: 10,
endIndent: 20, endIndent: 20,
), ),
list1(),
list2(),
],
),
),
),
),
);
}
Widget list1() {
return Container(
child: Column(
children: <Widget>[
Row( Row(
children: <Widget>[ children: <Widget>[
Text( Text(
...@@ -151,8 +97,7 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -151,8 +97,7 @@ class _PaymentdetailState extends State<Paymentdetail> {
SizedBox( SizedBox(
height: SizeConfig.getHeight(15), height: SizeConfig.getHeight(15),
), ),
Container( Row(
child: Row(
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/no-image.png', 'assets/images/no-image.png',
...@@ -218,15 +163,47 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -218,15 +163,47 @@ class _PaymentdetailState extends State<Paymentdetail> {
) )
], ],
), ),
),
Divider( Divider(
color: Colors.black, color: Colors.black,
height: 40, height: 40,
indent: 10, indent: 10,
endIndent: 20, endIndent: 20,
), ),
Container( ],
child: Row( ),
);
}
Widget list2() {
return Container(
child: Column(
children: <Widget>[
Row(
children: <Widget>[
Text(
'Order : 9S284-11506',
style: TextStyle(
color: Colors.black,
fontSize: SizeConfig.getFontSize(16),
fontWeight: FontWeight.bold,
),
),
SizedBox(
width: SizeConfig.getWidth(60),
),
Text(
'23.02.2020 08:57',
style: TextStyle(
color: Colors.black,
fontSize: SizeConfig.getFontSize(16),
),
),
],
),
SizedBox(
height: SizeConfig.getHeight(15),
),
Row(
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/no-image.png', 'assets/images/no-image.png',
...@@ -241,7 +218,7 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -241,7 +218,7 @@ class _PaymentdetailState extends State<Paymentdetail> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( Text(
'Ivory Relax and Spa', 'Sunshine Spa & Massage',
style: TextStyle( style: TextStyle(
fontSize: SizeConfig.getFontSize(16), fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
...@@ -253,7 +230,7 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -253,7 +230,7 @@ class _PaymentdetailState extends State<Paymentdetail> {
height: SizeConfig.getHeight(12), height: SizeConfig.getHeight(12),
), ),
Text( Text(
'นวดแผนไทย', 'Footology',
style: TextStyle( style: TextStyle(
fontSize: SizeConfig.getFontSize(16), fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
...@@ -292,7 +269,6 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -292,7 +269,6 @@ class _PaymentdetailState extends State<Paymentdetail> {
) )
], ],
), ),
),
Divider( Divider(
color: Colors.black, color: Colors.black,
height: 40, height: 40,
...@@ -301,11 +277,86 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -301,11 +277,86 @@ class _PaymentdetailState extends State<Paymentdetail> {
), ),
], ],
), ),
);
}
Widget header() {
return Container(
child: Stack(
children: <Widget>[
Container(
color: Color.fromRGBO(69, 85, 79, 1),
height: SizeConfig.getHeight(200),
width: MediaQuery.of(context).size.width,
),
Positioned(
top: SizeConfig.getPadding(50),
left:
SizeConfig.getPadding(MediaQuery.of(context).size.width / 3.5),
child: Container(
alignment: Alignment.topCenter,
child: Image.asset(
'assets/images/feelver_banner.png',
width: MediaQuery.of(context).size.width / 2.5,
),
),
),
Positioned(
top: SizeConfig.getPadding(77),
left: SizeConfig.getPadding(16),
child: Container(
child: GestureDetector(
onTap: () {
showDialog(
context: context,
builder: (BuildContext context) {
return NavDrawer();
},
);
},
child: Image.asset(
'assets/images/ic_menu.png',
height: SizeConfig.getWidth(24),
width: SizeConfig.getWidth(30),
fit: BoxFit.cover,
),
),
),
),
Positioned(
top: SizeConfig.getPadding(77),
right: SizeConfig.getPadding(60),
child: Container(
child: Image.asset(
'assets/images/ic_noti.png',
height: SizeConfig.getWidth(30),
width: SizeConfig.getWidth(30),
fit: BoxFit.cover,
),
),
),
Positioned(
top: SizeConfig.getPadding(77),
right: SizeConfig.getPadding(20),
child: InkWell(
// onTap: () {
// Navigator.push(
// context,
// MaterialPageRoute(builder: (context) => LoginPage()),
// );
// },
child: Container(
child: Image.asset(
'assets/images/ic_userimg.png',
height: SizeConfig.getWidth(30),
width: SizeConfig.getWidth(30),
fit: BoxFit.cover,
), ),
), ),
), ),
), ),
], ],
),
); );
} }
} }
lib/ui/payment/payment_page.dart
...@@ -11,8 +11,6 @@ class Payment extends StatefulWidget { ...@@ -11,8 +11,6 @@ class Payment extends StatefulWidget {
} }
class _PaymentState extends State<Payment> { class _PaymentState extends State<Payment> {
int a = 1;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
SizeConfig(context); SizeConfig(context);
...@@ -20,7 +18,7 @@ class _PaymentState extends State<Payment> { ...@@ -20,7 +18,7 @@ class _PaymentState extends State<Payment> {
body: _setupView(), body: _setupView(),
bottomNavigationBar: Container( bottomNavigationBar: Container(
color: Color.fromRGBO(69, 85, 79, 1), color: Color.fromRGBO(69, 85, 79, 1),
height: SizeConfig.getWidth(170), height: SizeConfig.getWidth(150),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Container( Container(
...@@ -141,82 +139,14 @@ class _PaymentState extends State<Payment> { ...@@ -141,82 +139,14 @@ class _PaymentState extends State<Payment> {
_setupView() { _setupView() {
return Column( return Column(
children: <Widget>[ children: <Widget>[
Stack( header(),
children: <Widget>[ containt(),
Container(
color: Color.fromRGBO(69, 85, 79, 1),
height: SizeConfig.getHeight(200),
width: MediaQuery.of(context).size.width,
),
Positioned(
top: SizeConfig.getPadding(50),
left: SizeConfig.getPadding(
MediaQuery.of(context).size.width / 3.5),
child: Container(
alignment: Alignment.topCenter,
child: Image.asset(
'assets/images/feelver_banner.png',
width: MediaQuery.of(context).size.width / 2.5,
),
),
),
Positioned(
top: SizeConfig.getPadding(77),
left: SizeConfig.getPadding(16),
child: Container(
child: GestureDetector(
onTap: () {
showDialog(
context: context,
builder: (BuildContext context) {
return NavDrawer();
},
);
},
child: Image.asset(
'assets/images/ic_menu.png',
height: SizeConfig.getWidth(24),
width: SizeConfig.getWidth(30),
fit: BoxFit.cover,
),
),
),
),
Positioned(
top: SizeConfig.getPadding(77),
right: SizeConfig.getPadding(60),
child: Container(
child: Image.asset(
'assets/images/ic_noti.png',
height: SizeConfig.getWidth(30),
width: SizeConfig.getWidth(30),
fit: BoxFit.cover,
),
),
),
Positioned(
top: SizeConfig.getPadding(77),
right: SizeConfig.getPadding(20),
child: InkWell(
// onTap: () {
// Navigator.push(
// context,
// MaterialPageRoute(builder: (context) => LoginPage()),
// );
// },
child: Container(
child: Image.asset(
'assets/images/ic_userimg.png',
height: SizeConfig.getWidth(30),
width: SizeConfig.getWidth(30),
fit: BoxFit.cover,
),
),
),
),
], ],
), );
Expanded( }
Widget containt() {
return Expanded(
child: SingleChildScrollView( child: SingleChildScrollView(
child: Padding( child: Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
...@@ -239,8 +169,33 @@ class _PaymentState extends State<Payment> { ...@@ -239,8 +169,33 @@ class _PaymentState extends State<Payment> {
SizedBox( SizedBox(
height: SizeConfig.getHeight(15), height: SizeConfig.getHeight(15),
), ),
Container( list1(),
Divider(
color: Colors.black,
height: 40,
indent: 8,
endIndent: 20,
),
list2(),
Divider(
color: Colors.black,
height: 40,
indent: 8,
endIndent: 20,
),
list3(),
],
),
),
),
),
);
}
Widget list1() {
return Container(
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/no-image.png', 'assets/images/no-image.png',
...@@ -306,14 +261,11 @@ class _PaymentState extends State<Payment> { ...@@ -306,14 +261,11 @@ class _PaymentState extends State<Payment> {
) )
], ],
), ),
), );
Divider( }
color: Colors.black,
height: 40, Widget list2() {
indent: 8, return Container(
endIndent: 20,
),
Container(
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
...@@ -380,18 +332,19 @@ class _PaymentState extends State<Payment> { ...@@ -380,18 +332,19 @@ class _PaymentState extends State<Payment> {
) )
], ],
), ),
), );
Divider( }
color: Colors.black,
height: 40, Widget list3() {
indent: 8, return Container(
endIndent: 20, child: Column(
), crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text( Text(
'ช่องทางการชำระเงิน', 'ช่องทางการชำระเงิน',
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: SizeConfig.getFontSize(16), fontSize: SizeConfig.getFontSize(18),
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
...@@ -466,11 +419,86 @@ class _PaymentState extends State<Payment> { ...@@ -466,11 +419,86 @@ class _PaymentState extends State<Payment> {
), ),
], ],
), ),
);
}
Widget header() {
return Container(
child: Stack(
children: <Widget>[
Container(
color: Color.fromRGBO(69, 85, 79, 1),
height: SizeConfig.getHeight(200),
width: MediaQuery.of(context).size.width,
),
Positioned(
top: SizeConfig.getPadding(50),
left:
SizeConfig.getPadding(MediaQuery.of(context).size.width / 3.5),
child: Container(
alignment: Alignment.topCenter,
child: Image.asset(
'assets/images/feelver_banner.png',
width: MediaQuery.of(context).size.width / 2.5,
),
),
),
Positioned(
top: SizeConfig.getPadding(77),
left: SizeConfig.getPadding(16),
child: Container(
child: GestureDetector(
onTap: () {
showDialog(
context: context,
builder: (BuildContext context) {
return NavDrawer();
},
);
},
child: Image.asset(
'assets/images/ic_menu.png',
height: SizeConfig.getWidth(24),
width: SizeConfig.getWidth(30),
fit: BoxFit.cover,
),
),
),
),
Positioned(
top: SizeConfig.getPadding(77),
right: SizeConfig.getPadding(60),
child: Container(
child: Image.asset(
'assets/images/ic_noti.png',
height: SizeConfig.getWidth(30),
width: SizeConfig.getWidth(30),
fit: BoxFit.cover,
),
),
),
Positioned(
top: SizeConfig.getPadding(77),
right: SizeConfig.getPadding(20),
child: InkWell(
// onTap: () {
// Navigator.push(
// context,
// MaterialPageRoute(builder: (context) => LoginPage()),
// );
// },
child: Container(
child: Image.asset(
'assets/images/ic_userimg.png',
height: SizeConfig.getWidth(30),
width: SizeConfig.getWidth(30),
fit: BoxFit.cover,
), ),
), ),
), ),
), ),
], ],
),
); );
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment