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 390 additions and 291 deletions
lib/ui/favorite/favorite.dart
......@@ -65,82 +65,14 @@ class _FavoriteState extends State<Favorite> {
_setupView() {
return Column(
children: <Widget>[
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,
),
),
),
),
header(),
containt(),
],
),
Expanded(
);
}
Widget containt() {
return Expanded(
child: SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.only(
......@@ -154,8 +86,21 @@ class _FavoriteState extends State<Favorite> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
child: Row(
list1(),
list2(),
],
),
),
),
),
);
}
Widget list1() {
return Container(
child: Column(
children: <Widget>[
Row(
children: <Widget>[
Image.asset(
'assets/images/no-image.png',
......@@ -221,15 +166,17 @@ class _FavoriteState extends State<Favorite> {
),
),
SizedBox(
width: SizeConfig.getWidth(110),
width: SizeConfig.getWidth(95),
),
Icon(
Icons.local_offer,
color: Color(0xFFEEAFB7),
),
Text(
'฿1,599.00',
style: TextStyle(
decoration:
TextDecoration.lineThrough,
fontSize:
SizeConfig.getFontSize(16),
decoration: TextDecoration.lineThrough,
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
color: Color(0xFFEEAFB7),
),
......@@ -245,18 +192,15 @@ class _FavoriteState extends State<Favorite> {
children: <Widget>[
Container(
child: Padding(
padding:
const EdgeInsets.only(left: 10),
padding: const EdgeInsets.only(left: 10),
child: Row(
children: <Widget>[
SizedBox(
width: SizeConfig.getPadding(20),
height:
SizeConfig.getPadding(20),
height: SizeConfig.getPadding(20),
child: RaisedButton(
child: Text('-'),
padding:
EdgeInsets.only(right: 0),
padding: EdgeInsets.only(right: 0),
onPressed: () {
setState(() {
a = a - 1;
......@@ -270,20 +214,16 @@ class _FavoriteState extends State<Favorite> {
child: Text(
'$a',
style: TextStyle(
fontSize:
SizeConfig.getFontSize(
12),
fontSize: SizeConfig.getFontSize(12),
),
),
),
SizedBox(
width: SizeConfig.getPadding(20),
height:
SizeConfig.getPadding(20),
height: SizeConfig.getPadding(20),
child: RaisedButton(
child: Text('+'),
padding:
EdgeInsets.only(right: 0),
padding: EdgeInsets.only(right: 0),
onPressed: () {
setState(() {
a = a + 1;
......@@ -315,15 +255,22 @@ class _FavoriteState extends State<Favorite> {
),
],
),
),
Divider(
color: Colors.black,
height: 20,
height: 40,
indent: 8,
endIndent: 20,
),
Container(
child: Row(
],
),
);
}
Widget list2() {
return Container(
child: Column(
children: <Widget>[
Row(
children: <Widget>[
Image.asset(
'assets/images/no-image.png',
......@@ -339,7 +286,7 @@ class _FavoriteState extends State<Favorite> {
Row(
children: <Widget>[
Text(
'Ivory Relax and Spa',
'Sunshine Spa & Massage',
style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
......@@ -348,7 +295,7 @@ class _FavoriteState extends State<Favorite> {
),
),
SizedBox(
width: SizeConfig.getWidth(60),
width: SizeConfig.getWidth(20),
),
Checkbox(
checkColor: Color(0xFFEEAFB7),
......@@ -389,15 +336,17 @@ class _FavoriteState extends State<Favorite> {
),
),
SizedBox(
width: SizeConfig.getWidth(110),
width: SizeConfig.getWidth(95),
),
Icon(
Icons.local_offer,
color: Color(0xFFEEAFB7),
),
Text(
'฿1,599.00',
style: TextStyle(
decoration:
TextDecoration.lineThrough,
fontSize:
SizeConfig.getFontSize(16),
decoration: TextDecoration.lineThrough,
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
color: Color(0xFFEEAFB7),
),
......@@ -413,8 +362,7 @@ class _FavoriteState extends State<Favorite> {
children: <Widget>[
Container(
child: Padding(
padding:
const EdgeInsets.only(left: 10),
padding: const EdgeInsets.only(left: 10),
child: Row(
children: <Widget>[
SizedBox(
......@@ -422,8 +370,7 @@ class _FavoriteState extends State<Favorite> {
height: SizeConfig.getPadding(20),
child: RaisedButton(
child: Text('-'),
padding:
EdgeInsets.only(right: 0),
padding: EdgeInsets.only(right: 0),
onPressed: () {
setState(() {
b = b - 1;
......@@ -441,8 +388,7 @@ class _FavoriteState extends State<Favorite> {
height: SizeConfig.getPadding(20),
child: RaisedButton(
child: Text('+'),
padding:
EdgeInsets.only(right: 0),
padding: EdgeInsets.only(right: 0),
onPressed: () {
setState(() {
b = b + 1;
......@@ -474,7 +420,6 @@ class _FavoriteState extends State<Favorite> {
),
],
),
),
Divider(
color: Colors.black,
height: 40,
......@@ -483,11 +428,86 @@ class _FavoriteState extends State<Favorite> {
),
],
),
);
}
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_detail.dart
......@@ -19,82 +19,14 @@ class _PaymentdetailState extends State<Paymentdetail> {
_setupView() {
return Column(
children: <Widget>[
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,
),
),
),
),
header(),
containt(),
],
),
Expanded(
);
}
Widget containt() {
return Expanded(
child: SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.only(
......@@ -126,6 +58,20 @@ class _PaymentdetailState extends State<Paymentdetail> {
indent: 10,
endIndent: 20,
),
list1(),
list2(),
],
),
),
),
),
);
}
Widget list1() {
return Container(
child: Column(
children: <Widget>[
Row(
children: <Widget>[
Text(
......@@ -151,8 +97,7 @@ class _PaymentdetailState extends State<Paymentdetail> {
SizedBox(
height: SizeConfig.getHeight(15),
),
Container(
child: Row(
Row(
children: <Widget>[
Image.asset(
'assets/images/no-image.png',
......@@ -218,15 +163,47 @@ class _PaymentdetailState extends State<Paymentdetail> {
)
],
),
),
Divider(
color: Colors.black,
height: 40,
indent: 10,
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>[
Image.asset(
'assets/images/no-image.png',
......@@ -241,7 +218,7 @@ class _PaymentdetailState extends State<Paymentdetail> {
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
'Ivory Relax and Spa',
'Sunshine Spa & Massage',
style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
......@@ -253,7 +230,7 @@ class _PaymentdetailState extends State<Paymentdetail> {
height: SizeConfig.getHeight(12),
),
Text(
'นวดแผนไทย',
'Footology',
style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
......@@ -292,7 +269,6 @@ class _PaymentdetailState extends State<Paymentdetail> {
)
],
),
),
Divider(
color: Colors.black,
height: 40,
......@@ -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 {
}
class _PaymentState extends State<Payment> {
int a = 1;
@override
Widget build(BuildContext context) {
SizeConfig(context);
......@@ -20,7 +18,7 @@ class _PaymentState extends State<Payment> {
body: _setupView(),
bottomNavigationBar: Container(
color: Color.fromRGBO(69, 85, 79, 1),
height: SizeConfig.getWidth(170),
height: SizeConfig.getWidth(150),
child: Column(
children: <Widget>[
Container(
......@@ -141,82 +139,14 @@ class _PaymentState extends State<Payment> {
_setupView() {
return Column(
children: <Widget>[
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,
),
),
),
),
header(),
containt(),
],
),
Expanded(
);
}
Widget containt() {
return Expanded(
child: SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.only(
......@@ -239,8 +169,33 @@ class _PaymentState extends State<Payment> {
SizedBox(
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(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Image.asset(
'assets/images/no-image.png',
......@@ -306,14 +261,11 @@ class _PaymentState extends State<Payment> {
)
],
),
),
Divider(
color: Colors.black,
height: 40,
indent: 8,
endIndent: 20,
),
Container(
);
}
Widget list2() {
return Container(
child: Row(
children: <Widget>[
Image.asset(
......@@ -380,18 +332,19 @@ class _PaymentState extends State<Payment> {
)
],
),
),
Divider(
color: Colors.black,
height: 40,
indent: 8,
endIndent: 20,
),
);
}
Widget list3() {
return Container(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
'ช่องทางการชำระเงิน',
style: TextStyle(
color: Colors.black,
fontSize: SizeConfig.getFontSize(16),
fontSize: SizeConfig.getFontSize(18),
fontWeight: FontWeight.bold,
),
),
......@@ -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