Skip to content

F
feelver
Commit 23705804 by Mobile : Art
Options

update ui

parent 218ffcf6
Showing with 99 additions and 250 deletions
lib/ui/payment/mycart.dart
...@@ -12,6 +12,7 @@ class _MyCartState extends State<MyCart> { ...@@ -12,6 +12,7 @@ class _MyCartState extends State<MyCart> {
bool checkBoxValue = false; bool checkBoxValue = false;
int a = 1; int a = 1;
int b = 1; int b = 1;
List<int> _counter = List();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
...@@ -161,15 +162,14 @@ class _MyCartState extends State<MyCart> { ...@@ -161,15 +162,14 @@ class _MyCartState extends State<MyCart> {
return Column( return Column(
children: <Widget>[ children: <Widget>[
header(), header(),
// SizedBox(
// height: SizeConfig.getHeight(10),
// ),
_getlist(), _getlist(),
], ],
); );
} }
_getlist() { _getlist() {
int _itemCount = 0;
return Expanded( return Expanded(
child: Container( child: Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
...@@ -178,20 +178,23 @@ class _MyCartState extends State<MyCart> { ...@@ -178,20 +178,23 @@ class _MyCartState extends State<MyCart> {
right: SizeConfig.getPadding(16), right: SizeConfig.getPadding(16),
bottom: SizeConfig.getPadding(16), bottom: SizeConfig.getPadding(16),
), ),
// child: presenter.shopModel == null
// ? Container()
// :
child: ListView.builder( child: ListView.builder(
itemCount: 3, itemCount: 1,
itemBuilder: (context, i) { itemBuilder: (context, i) {
return list1(); return InkWell(
},), onTap: () {
print(i);
},
child: list1(),
);
},
),
), ),
); );
} }
Widget list1() { Widget list1() {
return Card( return Card(
elevation: 5, elevation: 5,
child: Container( child: Container(
...@@ -360,7 +363,7 @@ class _MyCartState extends State<MyCart> { ...@@ -360,7 +363,7 @@ class _MyCartState extends State<MyCart> {
), ),
Positioned( Positioned(
top: SizeConfig.getPadding(50), top: SizeConfig.getPadding(50),
left: SizeConfig.getPadding(MediaQuery.of(context).size.width / 3.5), left: SizeConfig.getPadding(MediaQuery.of(context).size.width / 3.3),
child: Container( child: Container(
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
child: Image.asset( child: Image.asset(
......
lib/ui/payment/payment_detail.dart
...@@ -194,18 +194,16 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -194,18 +194,16 @@ class _PaymentdetailState extends State<Paymentdetail> {
} }
Widget header() { Widget header() {
return Container( return Stack(
child: Stack(
children: <Widget>[ children: <Widget>[
Container( Container(
color: Color.fromRGBO(69, 85, 79, 1), color: Color.fromRGBO(69, 85, 79, 1),
height: SizeConfig.getHeight(200), height: SizeConfig.getHeight(150),
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
), ),
Positioned( Positioned(
top: SizeConfig.getPadding(50), top: SizeConfig.getPadding(50),
left: left: SizeConfig.getPadding(MediaQuery.of(context).size.width / 3.2),
SizeConfig.getPadding(MediaQuery.of(context).size.width / 3.5),
child: Container( child: Container(
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
child: Image.asset( child: Image.asset(
...@@ -215,61 +213,22 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -215,61 +213,22 @@ class _PaymentdetailState extends State<Paymentdetail> {
), ),
), ),
Positioned( Positioned(
top: SizeConfig.getPadding(77), top: SizeConfig.getPadding(70),
left: SizeConfig.getPadding(16), left: SizeConfig.getPadding(16),
child: Container( child: Container(
child: GestureDetector( child: GestureDetector(
onTap: () { onTap: () {
showDialog( Navigator.pop(context);
context: context,
builder: (BuildContext context) {
return NavDrawer();
}, },
); child: Icon(
}, Icons.keyboard_arrow_left,
child: Image.asset( color: Colors.white,
'assets/images/ic_menu.png', size: SizeConfig.getFontSize(40),
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
...@@ -43,9 +43,8 @@ class _PaymentState extends State<Payment> { ...@@ -43,9 +43,8 @@ class _PaymentState extends State<Payment> {
), ),
), ),
Container( Container(
height: SizeConfig.getHeight(40), height: SizeConfig.getHeight(40),
width: SizeConfig.getWidth(200), width: SizeConfig.getWidth(180),
color: Colors.white, color: Colors.white,
child: TextField( child: TextField(
decoration: InputDecoration( decoration: InputDecoration(
...@@ -94,7 +93,6 @@ class _PaymentState extends State<Payment> { ...@@ -94,7 +93,6 @@ class _PaymentState extends State<Payment> {
], ],
), ),
), ),
Container( Container(
padding: EdgeInsets.only( padding: EdgeInsets.only(
right: SizeConfig.getPadding(10), right: SizeConfig.getPadding(10),
...@@ -141,135 +139,69 @@ class _PaymentState extends State<Payment> { ...@@ -141,135 +139,69 @@ class _PaymentState extends State<Payment> {
return Column( return Column(
children: <Widget>[ children: <Widget>[
header(), header(),
containt(), Container(
],
);
}
Widget containt() {
return Expanded(
child: SingleChildScrollView(
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: SizeConfig.getPadding(10), left: SizeConfig.getPadding(24), top: SizeConfig.getPadding(24)),
right: SizeConfig.getPadding(10), alignment: Alignment.topLeft,
top: SizeConfig.getPadding(8), child: Text(
bottom: SizeConfig.getPadding(8),
),
child: Container(
// color: Colors.yellow,
alignment: FractionalOffset.topLeft,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
'เเพ็คเกจที่คุณเลือก', 'เเพ็คเกจที่คุณเลือก',
style: TextStyle( style: TextStyle(
fontSize: SizeConfig.getFontSize(18),
fontWeight: FontWeight.bold),
),
SizedBox(
height: SizeConfig.getHeight(20),
),
list1(),
Divider(
color: Colors.black, color: Colors.black,
height: SizeConfig.getHeight(40), fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w700,
), ),
list2(),
Divider(
color: Colors.black,
height: SizeConfig.getHeight(40),
), ),
payment(),
],
), ),
// SizedBox(
// // height: SizeConfig.getHeight(20),
// ),
_getlist(),
],
);
}
_getlist() {
return Expanded(
child: Container(
margin: EdgeInsets.only(
top: SizeConfig.getPadding(0),
left: SizeConfig.getPadding(16),
right: SizeConfig.getPadding(16),
bottom: SizeConfig.getPadding(16),
),
// child: presenter.shopModel == null
// ? Container()
// :
child: ListView.builder(
itemCount: 3,
itemBuilder: (context, i) {
return list1();
},
), ),
), ),
); );
} }
Widget list1() { Widget list1() {
return Container( return Card(
// color: Colors.red, elevation: 5,
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Image.asset(
'assets/images/demo_img.png',
height: SizeConfig.getPadding(90),
width: SizeConfig.getPadding(80),
fit: BoxFit.cover,
),
Expanded(
child: Container( child: Container(
// color: Colors.yellow,
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: SizeConfig.getPadding(8), left: SizeConfig.getPadding(8),
top: SizeConfig.getPadding(8),
bottom: SizeConfig.getPadding(16),
), ),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text(
'Ivory Relax and Spa',
style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold,
color: Colors.black,
),
),
SizedBox(
height: SizeConfig.getHeight(10),
),
Text(
'นวดแผนไทย',
style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
color: Colors.black,
),
),
SizedBox( SizedBox(
height: SizeConfig.getHeight(12), height: SizeConfig.getHeight(16),
),
Container(
// color: Colors.orangeAccent,
child: Row(
children: <Widget>[
Text(
'฿1,200.00',
style: TextStyle(
fontSize: SizeConfig.getFontSize(20),
color: Color(0xFFFD2956),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold,
),
),
Spacer(),
Text(
'X1',
style: TextStyle(
color: Color(0xFF9D9D9D),
fontSize: SizeConfig.getFontSize(20),
),
),
],
),
),
],
), ),
),
),
],
),
);
}
Widget list2() {
return Container( Row(
// color: Colors.red,
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/demo_img.png', 'assets/images/demo_img.png',
...@@ -279,7 +211,7 @@ class _PaymentState extends State<Payment> { ...@@ -279,7 +211,7 @@ class _PaymentState extends State<Payment> {
), ),
Expanded( Expanded(
child: Container( child: Container(
// color: Colors.yellow, // color: Colors.green,
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: SizeConfig.getPadding(8), left: SizeConfig.getPadding(8),
), ),
...@@ -287,51 +219,49 @@ class _PaymentState extends State<Payment> { ...@@ -287,51 +219,49 @@ class _PaymentState extends State<Payment> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( Text(
'Sunshine Spa & Massage', 'Ivory Relax and Spa',
style: TextStyle( style: TextStyle(
color: Colors.black,
fontSize: SizeConfig.getFontSize(16), fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold, fontWeight: FontWeight.w700),
color: Colors.black,
),
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(10), height: SizeConfig.getHeight(12),
), ),
Text( Text(
'Footology', 'นวดแผนไทย',
style: TextStyle( style: TextStyle(
color: Colors.black,
fontSize: SizeConfig.getFontSize(16), fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
color: Colors.black, fontWeight: FontWeight.w500),
),
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(12), height: SizeConfig.getHeight(15),
), ),
Container( Row(
// color: Colors.orangeAccent,
child: Row(
children: <Widget>[ children: <Widget>[
Text( Text(
'฿1,000.00', '฿1,200.00',
style: TextStyle( style: TextStyle(
fontSize: SizeConfig.getFontSize(20), fontSize: SizeConfig.getFontSize(20),
color: Color(0xFFFD2956), color: Color(0xFFFD2956),
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold, fontWeight: FontWeight.w700,
), ),
), ),
Spacer(), Spacer(),
Text( Container(padding: EdgeInsets.only(right: SizeConfig.getPadding(16)),
'X1', child: Text(
'x1',
style: TextStyle( style: TextStyle(
color: Color(0xFF9D9D9D), color: Color(0xFF9D9D9D),
fontSize: SizeConfig.getFontSize(20), fontSize: SizeConfig.getFontSize(20),
), ),
), ),
],
), ),
],
), ),
], ],
), ),
...@@ -339,6 +269,13 @@ class _PaymentState extends State<Payment> { ...@@ -339,6 +269,13 @@ class _PaymentState extends State<Payment> {
), ),
], ],
), ),
// Divider(
// color: Colors.black,
// height: 40,
// ),
],
),
),
); );
} }
...@@ -437,18 +374,16 @@ class _PaymentState extends State<Payment> { ...@@ -437,18 +374,16 @@ class _PaymentState extends State<Payment> {
} }
Widget header() { Widget header() {
return Container( return Stack(
child: Stack(
children: <Widget>[ children: <Widget>[
Container( Container(
color: Color.fromRGBO(69, 85, 79, 1), color: Color.fromRGBO(69, 85, 79, 1),
height: SizeConfig.getHeight(200), height: SizeConfig.getHeight(150),
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
), ),
Positioned( Positioned(
top: SizeConfig.getPadding(50), top: SizeConfig.getPadding(50),
left: left: SizeConfig.getPadding(MediaQuery.of(context).size.width / 3.3),
SizeConfig.getPadding(MediaQuery.of(context).size.width / 3.5),
child: Container( child: Container(
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
child: Image.asset( child: Image.asset(
...@@ -458,61 +393,22 @@ class _PaymentState extends State<Payment> { ...@@ -458,61 +393,22 @@ class _PaymentState extends State<Payment> {
), ),
), ),
Positioned( Positioned(
top: SizeConfig.getPadding(77), top: SizeConfig.getPadding(70),
left: SizeConfig.getPadding(16), left: SizeConfig.getPadding(16),
child: Container( child: Container(
child: GestureDetector( child: GestureDetector(
onTap: () { onTap: () {
showDialog( Navigator.pop(context);
context: context,
builder: (BuildContext context) {
return NavDrawer();
},
);
}, },
child: Image.asset( child: Icon(
'assets/images/ic_menu.png', Icons.keyboard_arrow_left,
height: SizeConfig.getWidth(24), color: Colors.white,
width: SizeConfig.getWidth(30), size: SizeConfig.getFontSize(40),
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/shop/shop_list_detail.dart
...@@ -78,7 +78,7 @@ class _ShopListDetailState extends State<ShopListDetail> { ...@@ -78,7 +78,7 @@ class _ShopListDetailState extends State<ShopListDetail> {
Positioned( Positioned(
top: SizeConfig.getPadding(50), top: SizeConfig.getPadding(50),
left: SizeConfig.getPadding( left: SizeConfig.getPadding(
MediaQuery.of(context).size.width / 3.5), MediaQuery.of(context).size.width / 3.3),
child: Container( child: Container(
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
child: Image.asset( child: Image.asset(
......
pubspec.lock
...@@ -92,13 +92,6 @@ packages: ...@@ -92,13 +92,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "5.2.1" version: "5.2.1"
firebase_crashlytics:
dependency: "direct main"
description:
name: firebase_crashlytics
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.4+1"
flutter: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
......
pubspec.yaml
...@@ -37,9 +37,7 @@ dependencies: ...@@ -37,9 +37,7 @@ dependencies:
date_format: ^1.0.8 date_format: ^1.0.8
flutter_datetime_picker: ^1.4.0 flutter_datetime_picker: ^1.4.0
carousel_slider: ^2.2.1 carousel_slider: ^2.2.1
firebase_crashlytics: ^0.1.4+1 # firebase_crashlytics: ^0.1.4+1
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
......
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