Skip to content

F
feelver
Commit 23705804 by Mobile : Art
Options

update ui

parent 218ffcf6
Showing with 194 additions and 345 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( _getlist(),
// height: SizeConfig.getHeight(10),
// ),
_getlist(),
], ],
); );
} }
_getlist() { _getlist() {
int _itemCount = 0;
return Expanded( return Expanded(
child: Container( child: Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
...@@ -178,28 +178,31 @@ class _MyCartState extends State<MyCart> { ...@@ -178,28 +178,31 @@ 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 child: ListView.builder(
// ? Container() itemCount: 1,
// : itemBuilder: (context, i) {
child: ListView.builder( return InkWell(
itemCount: 3, onTap: () {
itemBuilder: (context, i) { print(i);
return list1(); },
},), child: list1(),
);
},
),
), ),
); );
} }
Widget list1() { Widget list1() {
return Card( return Card(
elevation: 5, elevation: 5,
child: Container( child: Container(
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: SizeConfig.getPadding(8), left: SizeConfig.getPadding(8),
top: SizeConfig.getPadding(8), top: SizeConfig.getPadding(8),
bottom: SizeConfig.getPadding(16), bottom: SizeConfig.getPadding(16),
), ),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
...@@ -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,82 +194,41 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -194,82 +194,41 @@ 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(150),
height: SizeConfig.getHeight(200), width: MediaQuery.of(context).size.width,
width: MediaQuery.of(context).size.width, ),
), Positioned(
Positioned( top: SizeConfig.getPadding(50),
top: SizeConfig.getPadding(50), left: SizeConfig.getPadding(MediaQuery.of(context).size.width / 3.2),
left: child: Container(
SizeConfig.getPadding(MediaQuery.of(context).size.width / 3.5), alignment: Alignment.topCenter,
child: Container( child: Image.asset(
alignment: Alignment.topCenter, 'assets/images/feelver_banner.png',
child: Image.asset( width: MediaQuery.of(context).size.width / 2.5,
'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), Positioned(
right: SizeConfig.getPadding(20), top: SizeConfig.getPadding(70),
child: InkWell( left: SizeConfig.getPadding(16),
// onTap: () { child: Container(
// Navigator.push( child: GestureDetector(
// context, onTap: () {
// MaterialPageRoute(builder: (context) => LoginPage()), Navigator.pop(context);
// ); },
// }, child: Icon(
child: Container( Icons.keyboard_arrow_left,
child: Image.asset( color: Colors.white,
'assets/images/ic_userimg.png', size: SizeConfig.getFontSize(40),
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,203 +139,142 @@ class _PaymentState extends State<Payment> { ...@@ -141,203 +139,142 @@ class _PaymentState extends State<Payment> {
return Column( return Column(
children: <Widget>[ children: <Widget>[
header(), header(),
containt(), Container(
padding: EdgeInsets.only(
left: SizeConfig.getPadding(24), top: SizeConfig.getPadding(24)),
alignment: Alignment.topLeft,
child: Text(
'เเพ็คเกจที่คุณเลือก',
style: TextStyle(
color: Colors.black,
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w700,
),
),
),
// SizedBox(
// // height: SizeConfig.getHeight(20),
// ),
_getlist(),
], ],
); );
} }
Widget containt() {
_getlist() {
return Expanded( return Expanded(
child: SingleChildScrollView( child: Container(
padding: EdgeInsets.only( margin: EdgeInsets.only(
left: SizeConfig.getPadding(10), top: SizeConfig.getPadding(0),
right: SizeConfig.getPadding(10), left: SizeConfig.getPadding(16),
top: SizeConfig.getPadding(8), right: SizeConfig.getPadding(16),
bottom: SizeConfig.getPadding(8), bottom: SizeConfig.getPadding(16),
), ),
child: Container( // child: presenter.shopModel == null
// color: Colors.yellow, // ? Container()
alignment: FractionalOffset.topLeft, // :
child: Column( child: ListView.builder(
crossAxisAlignment: CrossAxisAlignment.start, itemCount: 3,
children: <Widget>[ itemBuilder: (context, i) {
Text( return list1();
'เเพ็คเกจที่คุณเลือก', },
style: TextStyle(
fontSize: SizeConfig.getFontSize(18),
fontWeight: FontWeight.bold),
),
SizedBox(
height: SizeConfig.getHeight(20),
),
list1(),
Divider(
color: Colors.black,
height: SizeConfig.getHeight(40),
),
list2(),
Divider(
color: Colors.black,
height: SizeConfig.getHeight(40),
),
payment(),
],
),
), ),
), ),
); );
} }
Widget list1() { Widget list1() {
return Container( return Card(
// color: Colors.red, elevation: 5,
child: Row( child: Container(
crossAxisAlignment: CrossAxisAlignment.start, padding: EdgeInsets.only(
children: <Widget>[ left: SizeConfig.getPadding(8),
Image.asset( top: SizeConfig.getPadding(8),
'assets/images/demo_img.png', bottom: SizeConfig.getPadding(16),
height: SizeConfig.getPadding(90), ),
width: SizeConfig.getPadding(80), child: Column(
fit: BoxFit.cover, children: <Widget>[
),
Expanded( SizedBox(
child: Container( height: SizeConfig.getHeight(16),
// color: Colors.yellow,
padding: EdgeInsets.only(
left: SizeConfig.getPadding(8),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
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(
height: SizeConfig.getHeight(12),
),
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, children: <Widget>[
child: Row( Image.asset(
crossAxisAlignment: CrossAxisAlignment.start, 'assets/images/demo_img.png',
children: <Widget>[ height: SizeConfig.getPadding(90),
Image.asset( width: SizeConfig.getPadding(80),
'assets/images/demo_img.png', fit: BoxFit.cover,
height: SizeConfig.getPadding(90), ),
width: SizeConfig.getPadding(80), Expanded(
fit: BoxFit.cover, child: Container(
), // color: Colors.green,
Expanded( padding: EdgeInsets.only(
child: Container( left: SizeConfig.getPadding(8),
// color: Colors.yellow,
padding: EdgeInsets.only(
left: SizeConfig.getPadding(8),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
'Sunshine Spa & Massage',
style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold,
color: Colors.black,
),
),
SizedBox(
height: SizeConfig.getHeight(10),
),
Text(
'Footology',
style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
color: Colors.black,
), ),
), child: Column(
SizedBox( crossAxisAlignment: CrossAxisAlignment.start,
height: SizeConfig.getHeight(12),
),
Container(
// color: Colors.orangeAccent,
child: Row(
children: <Widget>[ children: <Widget>[
Text( Text(
'฿1,000.00', 'Ivory Relax and Spa',
style: TextStyle( style: TextStyle(
fontSize: SizeConfig.getFontSize(20), color: Colors.black,
color: Color(0xFFFD2956), fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold, fontWeight: FontWeight.w700),
), ),
SizedBox(
height: SizeConfig.getHeight(12),
), ),
Spacer(),
Text( Text(
'X1', 'นวดแผนไทย',
style: TextStyle( style: TextStyle(
color: Color(0xFF9D9D9D), color: Colors.black,
fontSize: SizeConfig.getFontSize(20), fontSize: SizeConfig.getFontSize(16),
), fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
SizedBox(
height: SizeConfig.getHeight(15),
),
Row(
children: <Widget>[
Text(
'฿1,200.00',
style: TextStyle(
fontSize: SizeConfig.getFontSize(20),
color: Color(0xFFFD2956),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w700,
),
),
Spacer(),
Container(padding: EdgeInsets.only(right: SizeConfig.getPadding(16)),
child: Text(
'x1',
style: TextStyle(
color: Color(0xFF9D9D9D),
fontSize: SizeConfig.getFontSize(20),
),
),
),
],
), ),
], ],
), ),
), ),
], ),
), ],
), ),
), // Divider(
], // color: Colors.black,
// height: 40,
// ),
],
),
), ),
); );
} }
...@@ -437,82 +374,41 @@ class _PaymentState extends State<Payment> { ...@@ -437,82 +374,41 @@ 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(150),
height: SizeConfig.getHeight(200), width: MediaQuery.of(context).size.width,
width: MediaQuery.of(context).size.width, ),
), Positioned(
Positioned( top: SizeConfig.getPadding(50),
top: SizeConfig.getPadding(50), left: SizeConfig.getPadding(MediaQuery.of(context).size.width / 3.3),
left: child: Container(
SizeConfig.getPadding(MediaQuery.of(context).size.width / 3.5), alignment: Alignment.topCenter,
child: Container( child: Image.asset(
alignment: Alignment.topCenter, 'assets/images/feelver_banner.png',
child: Image.asset( width: MediaQuery.of(context).size.width / 2.5,
'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), Positioned(
right: SizeConfig.getPadding(20), top: SizeConfig.getPadding(70),
child: InkWell( left: SizeConfig.getPadding(16),
// onTap: () { child: Container(
// Navigator.push( child: GestureDetector(
// context, onTap: () {
// MaterialPageRoute(builder: (context) => LoginPage()), Navigator.pop(context);
// ); },
// }, child: Icon(
child: Container( Icons.keyboard_arrow_left,
child: Image.asset( color: Colors.white,
'assets/images/ic_userimg.png', size: SizeConfig.getFontSize(40),
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