Skip to content

F
feelver
Commit 46b9e6d4 by art
Options

update

parent 69ad30bf
Showing with 147 additions and 133 deletions
lib/main.dart
import 'package:feelverapp/ui/account_setting/account_setting_page.dart';
import 'package:feelverapp/ui/my_order_status/my_order_status.dart';
import 'package:feelverapp/ui/my_reviews/my_reviews_page.dart';
import 'package:feelverapp/ui/my_service/my_service_tab.dart';
import 'package:feelverapp/ui/my_service/service_paid.dart';
import 'package:feelverapp/ui/my_service/service_success.dart';
import 'package:feelverapp/ui/my_service/service_ticket.dart';
import 'package:feelverapp/ui/notification/notification_page.dart';
import 'package:feelverapp/ui/other_menu/other_menu_page.dart';
import 'package:feelverapp/ui/payment/mycart.dart';
import 'package:feelverapp/ui/shop/shop_main.dart';
import 'package:flutter/material.dart';
import 'ui/splashscreen/splash_screen_page.dart';
......@@ -19,7 +24,7 @@ class MyApp extends StatelessWidget {
primarySwatch: Colors.blue,
),
// home: AccountSettingPage(),
home: OtherMenuPage(),
home: MyOrderStatus(),
// home: service_tab(),
// home: SplashScreenPage(),
);
......
lib/ui/my_reviews/my_reviews_page.dart
......@@ -93,7 +93,7 @@ class _MyReviewsPageState extends State<MyReviewsPage> {
child: Column(
children: <Widget>[
Container(
height: SizeConfig.getHeight(100),
height: SizeConfig.getHeight(130),
// color: Colors.red,
child: Row(
children: <Widget>[
......
lib/ui/my_service/service_ticket.dart
......@@ -43,7 +43,7 @@ class _ServiceTicketPageState extends State<ServiceTicketPage> {
child: Container(
margin: EdgeInsets.only(left: 15),
// color: Colors.yellow,
height: SizeConfig.getHeight(200),
height: SizeConfig.getHeight(250),
child: Column(
children: <Widget>[
Expanded(
......
lib/ui/notification/notification_page.dart
......@@ -12,13 +12,10 @@ class NotificationPage extends StatefulWidget {
}
class _NotificationPageState extends State<NotificationPage> {
double rate=0;
double rate = 0;
@override
Widget build(BuildContext context) {
SizeConfig(context);
return Scaffold(
body: _setupView(),
......@@ -30,14 +27,15 @@ class _NotificationPageState extends State<NotificationPage> {
children: <Widget>[
containt(),
header(),
myAppBar(title: "การแจ้งเตือน",),
myAppBar(
title: "การแจ้งเตือน",
),
],
);
}
Widget containt(){
return Container(
Widget containt() {
return Container(
child: Column(
children: <Widget>[
Container(
......@@ -47,7 +45,9 @@ class _NotificationPageState extends State<NotificationPage> {
child: SingleChildScrollView(
child: Column(
children: <Widget>[
SizedBox(height: SizeConfig.getHeight(65),),
SizedBox(
height: SizeConfig.getHeight(65),
),
Card1(),
Card1(),
],
......@@ -59,11 +59,14 @@ class _NotificationPageState extends State<NotificationPage> {
);
}
Widget LogoutButton(){
Widget LogoutButton() {
return Container(
// color: Colors.red,
margin: EdgeInsets.only(right: SizeConfig.getPadding(16)+10,left: SizeConfig.getPadding(16)+10,top: SizeConfig.getPadding(10),bottom: SizeConfig.getPadding(30)),
margin: EdgeInsets.only(
right: SizeConfig.getPadding(16) + 10,
left: SizeConfig.getPadding(16) + 10,
top: SizeConfig.getPadding(10),
bottom: SizeConfig.getPadding(30)),
height: SizeConfig.getHeight(40),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
......@@ -74,29 +77,36 @@ class _NotificationPageState extends State<NotificationPage> {
SizedBox(
width: 10,
),
Text("ออกจากระบบ",style: TextStyle(
color: Color(0xffEEAFB7),
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),),
],),
Text(
"ออกจากระบบ",
style: TextStyle(
color: Color(0xffEEAFB7),
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
],
),
);
}
Widget Card1(){
Widget Card1() {
return Card(
clipBehavior: Clip.antiAlias,
margin: EdgeInsets.only(right: SizeConfig.getPadding(16),left: SizeConfig.getPadding(16),top: SizeConfig.getPadding(10),bottom: SizeConfig.getPadding(25)),
margin: EdgeInsets.only(
right: SizeConfig.getPadding(16),
left: SizeConfig.getPadding(16),
top: SizeConfig.getPadding(10),
bottom: SizeConfig.getPadding(25)),
child: Container(
margin: EdgeInsets.only(right: 0,left: 10),
margin: EdgeInsets.only(right: 0, left: 10),
// color: Colors.yellow,
child: Row(
children: <Widget>[
Expanded(
flex: 9,
child: Container(
height: SizeConfig.getHeight(200),
height: SizeConfig.getHeight(220),
// color: Colors.red,
child: Column(
children: <Widget>[
......@@ -105,7 +115,8 @@ class _NotificationPageState extends State<NotificationPage> {
child: Container(
alignment: Alignment.bottomCenter,
// color: Colors.blue,
child: Image.asset("assets/images/icon_feelver_voucher.png"),
child: Image.asset(
"assets/images/icon_feelver_voucher.png"),
),
),
Expanded(
......@@ -115,30 +126,30 @@ class _NotificationPageState extends State<NotificationPage> {
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Text("50%",style: TextStyle(
color: Color(0xff6AB3AA),
fontSize: SizeConfig.getFontSize(45),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500,
fontStyle: FontStyle.italic
),),
Text("OFF",style: TextStyle(
color: Color(0xff6AB3AA),
fontSize: SizeConfig.getFontSize(40),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500,
fontStyle: FontStyle.italic
),),
Text(
"50%",
style: TextStyle(
color: Color(0xff6AB3AA),
fontSize: SizeConfig.getFontSize(45),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500,
fontStyle: FontStyle.italic),
),
Text(
"OFF",
style: TextStyle(
color: Color(0xff6AB3AA),
fontSize: SizeConfig.getFontSize(40),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500,
fontStyle: FontStyle.italic),
),
],
),
),
),
],
),
),
),
Expanded(
......@@ -146,7 +157,7 @@ class _NotificationPageState extends State<NotificationPage> {
child: Stack(
children: <Widget>[
Container(
height: SizeConfig.getHeight(200),
height: SizeConfig.getHeight(210),
width: double.infinity,
color: Colors.green,
child: Image.asset(
......@@ -154,27 +165,29 @@ class _NotificationPageState extends State<NotificationPage> {
fit: BoxFit.cover,
),
),
Container(
padding: EdgeInsets.only(top: 15,bottom: 15,left: 10,right: 10),
height: SizeConfig.getHeight(200),
padding: EdgeInsets.only(
top: 15, bottom: 15, left: 10, right: 10),
height: SizeConfig.getHeight(210),
width: double.infinity,
color: Color(0xddEEAFB7),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text("Voucher Thai Body Balance",
style: TextStyle(
color: Colors.white,
fontSize: SizeConfig.getFontSize(14),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500,
),
Text(
"Voucher Thai Body Balance",
style: TextStyle(
color: Colors.white,
fontSize: SizeConfig.getFontSize(14),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500,
),
),
SizedBox(
height: 5,
),
Text("03/16/2019 12:43",
Text(
"03/16/2019 12:43",
style: TextStyle(
color: Color(0xff6AB3AA),
fontSize: SizeConfig.getFontSize(12),
......@@ -182,12 +195,11 @@ class _NotificationPageState extends State<NotificationPage> {
fontWeight: FontWeight.w500,
),
),
SizedBox(
height: 10,
),
Text("จะหมดในอีก 10 วัน อย่าลืมใช้นะคะ",
Text(
"จะหมดในอีก 10 วัน อย่าลืมใช้นะคะ",
style: TextStyle(
color: Colors.white,
fontSize: SizeConfig.getFontSize(14),
......@@ -195,19 +207,16 @@ class _NotificationPageState extends State<NotificationPage> {
fontWeight: FontWeight.w500,
),
),
SizedBox(
height: 25,
),
],
),
),
Container(
height: SizeConfig.getHeight(200),
padding: EdgeInsets.only(top: 15,bottom: 15,left: 10,right: 10),
height: SizeConfig.getHeight(240),
padding: EdgeInsets.only(
top: 50, bottom: 15, left: 10, right: 10),
alignment: Alignment.bottomCenter,
width: double.infinity,
// color: Colors.green,
......@@ -215,41 +224,32 @@ class _NotificationPageState extends State<NotificationPage> {
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
RaisedButton(
shape: new RoundedRectangleBorder(
borderRadius: new BorderRadius.circular(180.0)),
child: Text(
"ดูข้อมูลการสั่งซื้อ",
style: TextStyle(
color: Colors.white,
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
color: Color(0xffE8A6B4),
onPressed: () {
}
),
shape: new RoundedRectangleBorder(
borderRadius: new BorderRadius.circular(180.0)),
child: Text(
"ดูข้อมูลการสั่งซื้อ",
style: TextStyle(
color: Colors.white,
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
color: Color(0xffE8A6B4),
onPressed: () {}),
],
),
),
],
),
),
],
),
),
);
}
Widget buttonBar(){
Widget buttonBar() {
return Container(
child: Row(
children: <Widget>[
Expanded(
......@@ -260,19 +260,23 @@ class _NotificationPageState extends State<NotificationPage> {
child: Column(
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
Image.asset("assets/images/icon_menu1_gray.png",
Image.asset(
"assets/images/icon_menu1_gray.png",
width: SizeConfig.getWidth(20),
height: SizeConfig.getHeight(30),
fit: BoxFit.cover,),
fit: BoxFit.cover,
),
SizedBox(
height: SizeConfig.getHeight(8),
),
Text("การจองของฉัน",
Text(
"การจองของฉัน",
style: TextStyle(
color: Colors.black,
fontSize: SizeConfig.getFontSize(12),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),)
fontWeight: FontWeight.w500),
)
],
),
),
......@@ -285,19 +289,23 @@ class _NotificationPageState extends State<NotificationPage> {
child: Column(
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
Image.asset("assets/images/icon_menu2_gray.png",
Image.asset(
"assets/images/icon_menu2_gray.png",
width: SizeConfig.getWidth(20),
height: SizeConfig.getHeight(30),
fit: BoxFit.cover,),
fit: BoxFit.cover,
),
SizedBox(
height: SizeConfig.getHeight(5),
),
Text("ประวัติการใช้บริการ",
Text(
"ประวัติการใช้บริการ",
style: TextStyle(
color: Colors.black,
fontSize: SizeConfig.getFontSize(12),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),)
fontWeight: FontWeight.w500),
)
],
),
),
......@@ -310,19 +318,23 @@ class _NotificationPageState extends State<NotificationPage> {
child: Column(
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
Image.asset("assets/images/icon_menu3_gray.png",
Image.asset(
"assets/images/icon_menu3_gray.png",
width: SizeConfig.getWidth(20),
height: SizeConfig.getHeight(30),
fit: BoxFit.cover,),
fit: BoxFit.cover,
),
SizedBox(
height: SizeConfig.getHeight(5),
),
Text("การแจ้งเตือน",
Text(
"การแจ้งเตือน",
style: TextStyle(
color: Colors.black,
fontSize: SizeConfig.getFontSize(12),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),)
fontWeight: FontWeight.w500),
)
],
),
),
......@@ -332,13 +344,12 @@ class _NotificationPageState extends State<NotificationPage> {
);
}
Widget header(){
Widget header() {
return Container(
height: SizeConfig.getHeight(210),
// color: Colors.amber,
child: Stack(
children: <Widget>[
Column(
children: <Widget>[
Container(
......@@ -351,10 +362,10 @@ class _NotificationPageState extends State<NotificationPage> {
Container(
width: 85,
height: 85,
margin: EdgeInsets.only(left: SizeConfig.getPadding(16),bottom: 10),
margin: EdgeInsets.only(
left: SizeConfig.getPadding(16), bottom: 10),
//color: Colors.brown,
),
Expanded(
child: Container(
alignment: Alignment.bottomLeft,
......@@ -366,15 +377,17 @@ class _NotificationPageState extends State<NotificationPage> {
mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text("Rataya Pratumkan",style: TextStyle(
color: Colors.white,
fontSize: SizeConfig.getFontSize(18),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),),
Text(
"Rataya Pratumkan",
style: TextStyle(
color: Colors.white,
fontSize: SizeConfig.getFontSize(18),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
SizedBox(
height: 5,
),
SizedBox(
height: 5,
),
......@@ -387,7 +400,6 @@ class _NotificationPageState extends State<NotificationPage> {
)
],
),
Column(
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
......@@ -397,7 +409,8 @@ class _NotificationPageState extends State<NotificationPage> {
Container(
width: 85,
height: 85,
margin: EdgeInsets.only(left: SizeConfig.getPadding(16),bottom: 10),
margin: EdgeInsets.only(
left: SizeConfig.getPadding(16), bottom: 10),
//color: Colors.brown,
child: ClipRRect(
borderRadius: BorderRadius.circular(50),
......@@ -411,12 +424,8 @@ class _NotificationPageState extends State<NotificationPage> {
),
],
),
],
),
],
),
);
......
lib/ui/payment/mycart.dart
......@@ -20,7 +20,7 @@ class _MyCartState extends State<MyCart> {
body: _setupView(),
bottomNavigationBar: Container(
color: Color.fromRGBO(69, 85, 79, 1),
height: SizeConfig.getWidth(150),
height: SizeConfig.getWidth(180),
child: Column(
children: <Widget>[
Container(
......@@ -43,7 +43,7 @@ class _MyCartState extends State<MyCart> {
),
Container(
height: 40,
width: 200,
width: SizeConfig.getWidth(180),
color: Colors.white,
child: TextField(
decoration: InputDecoration(
......@@ -116,7 +116,7 @@ class _MyCartState extends State<MyCart> {
),
Container(
child: Padding(
padding: const EdgeInsets.only(left: 25),
padding: const EdgeInsets.only(left: 10),
child: RaisedButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(25.0),
......@@ -265,7 +265,7 @@ class _MyCartState extends State<MyCart> {
),
),
SizedBox(
width: SizeConfig.getWidth(90),
width: SizeConfig.getWidth(60),
),
Icon(
Icons.local_offer,
......@@ -335,7 +335,7 @@ class _MyCartState extends State<MyCart> {
),
),
SizedBox(
width: SizeConfig.getWidth(80),
width: SizeConfig.getWidth(60),
),
Text(
'฿1,200.00',
......@@ -426,7 +426,7 @@ class _MyCartState extends State<MyCart> {
),
),
SizedBox(
width: SizeConfig.getWidth(90),
width: SizeConfig.getWidth(60),
),
Icon(
Icons.local_offer,
......@@ -496,7 +496,7 @@ class _MyCartState extends State<MyCart> {
),
),
SizedBox(
width: SizeConfig.getWidth(80),
width: SizeConfig.getWidth(60),
),
Text(
'฿1,000.00',
......
lib/ui/payment/payment_detail.dart
......@@ -83,7 +83,7 @@ class _PaymentdetailState extends State<Paymentdetail> {
),
),
SizedBox(
width: SizeConfig.getWidth(60),
width: SizeConfig.getWidth(45),
),
Text(
'23.02.2020 08:57',
......@@ -189,7 +189,7 @@ class _PaymentdetailState extends State<Paymentdetail> {
),
),
SizedBox(
width: SizeConfig.getWidth(60),
width: SizeConfig.getWidth(45),
),
Text(
'23.02.2020 08:57',
......
lib/ui/payment/payment_page.dart
......@@ -18,7 +18,7 @@ class _PaymentState extends State<Payment> {
body: _setupView(),
bottomNavigationBar: Container(
color: Color.fromRGBO(69, 85, 79, 1),
height: SizeConfig.getWidth(150),
height: SizeConfig.getWidth(180),
child: Column(
children: <Widget>[
Container(
......@@ -41,7 +41,7 @@ class _PaymentState extends State<Payment> {
),
Container(
height: 40,
width: 200,
width: SizeConfig.getWidth(170),
color: Colors.white,
child: TextField(
decoration: InputDecoration(
......@@ -95,9 +95,9 @@ class _PaymentState extends State<Payment> {
),
),
),
Container(
Container(width: SizeConfig.getWidth(100),height: SizeConfig.getHeight(45),
child: Padding(
padding: const EdgeInsets.only(left: 25),
padding: const EdgeInsets.only(left:10),
child: RaisedButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(25.0),
......@@ -111,10 +111,10 @@ class _PaymentState extends State<Payment> {
);
},
padding: EdgeInsets.only(
left: 35,
right: 35,
top: 15,
bottom: 15,
left: 0,
right: 0,
top: 5,
bottom: 0,
),
color: Color(0xFFEEAFB7),
child: Text(
......
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