Skip to content

F
feelver
Commit 46b9e6d4 by art
Options

update

parent 69ad30bf
Showing with 25 additions and 20 deletions
lib/main.dart
import 'package:feelverapp/ui/account_setting/account_setting_page.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_reviews/my_reviews_page.dart';
import 'package:feelverapp/ui/my_service/my_service_tab.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/notification/notification_page.dart';
import 'package:feelverapp/ui/other_menu/other_menu_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:feelverapp/ui/shop/shop_main.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'ui/splashscreen/splash_screen_page.dart'; import 'ui/splashscreen/splash_screen_page.dart';
...@@ -19,7 +24,7 @@ class MyApp extends StatelessWidget { ...@@ -19,7 +24,7 @@ class MyApp extends StatelessWidget {
primarySwatch: Colors.blue, primarySwatch: Colors.blue,
), ),
// home: AccountSettingPage(), // home: AccountSettingPage(),
home: OtherMenuPage(), home: MyOrderStatus(),
// home: service_tab(), // home: service_tab(),
// home: SplashScreenPage(), // home: SplashScreenPage(),
); );
......
lib/ui/my_reviews/my_reviews_page.dart
...@@ -93,7 +93,7 @@ class _MyReviewsPageState extends State<MyReviewsPage> { ...@@ -93,7 +93,7 @@ class _MyReviewsPageState extends State<MyReviewsPage> {
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Container( Container(
height: SizeConfig.getHeight(100), height: SizeConfig.getHeight(130),
// color: Colors.red, // color: Colors.red,
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
......
lib/ui/my_service/service_ticket.dart
...@@ -43,7 +43,7 @@ class _ServiceTicketPageState extends State<ServiceTicketPage> { ...@@ -43,7 +43,7 @@ class _ServiceTicketPageState extends State<ServiceTicketPage> {
child: Container( child: Container(
margin: EdgeInsets.only(left: 15), margin: EdgeInsets.only(left: 15),
// color: Colors.yellow, // color: Colors.yellow,
height: SizeConfig.getHeight(200), height: SizeConfig.getHeight(250),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
......
lib/ui/payment/mycart.dart
...@@ -20,7 +20,7 @@ class _MyCartState extends State<MyCart> { ...@@ -20,7 +20,7 @@ class _MyCartState extends State<MyCart> {
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(150), height: SizeConfig.getWidth(180),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Container( Container(
...@@ -43,7 +43,7 @@ class _MyCartState extends State<MyCart> { ...@@ -43,7 +43,7 @@ class _MyCartState extends State<MyCart> {
), ),
Container( Container(
height: 40, height: 40,
width: 200, width: SizeConfig.getWidth(180),
color: Colors.white, color: Colors.white,
child: TextField( child: TextField(
decoration: InputDecoration( decoration: InputDecoration(
...@@ -116,7 +116,7 @@ class _MyCartState extends State<MyCart> { ...@@ -116,7 +116,7 @@ class _MyCartState extends State<MyCart> {
), ),
Container( Container(
child: Padding( child: Padding(
padding: const EdgeInsets.only(left: 25), padding: const EdgeInsets.only(left: 10),
child: RaisedButton( child: RaisedButton(
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(25.0),
...@@ -265,7 +265,7 @@ class _MyCartState extends State<MyCart> { ...@@ -265,7 +265,7 @@ class _MyCartState extends State<MyCart> {
), ),
), ),
SizedBox( SizedBox(
width: SizeConfig.getWidth(90), width: SizeConfig.getWidth(60),
), ),
Icon( Icon(
Icons.local_offer, Icons.local_offer,
...@@ -335,7 +335,7 @@ class _MyCartState extends State<MyCart> { ...@@ -335,7 +335,7 @@ class _MyCartState extends State<MyCart> {
), ),
), ),
SizedBox( SizedBox(
width: SizeConfig.getWidth(80), width: SizeConfig.getWidth(60),
), ),
Text( Text(
'฿1,200.00', '฿1,200.00',
...@@ -426,7 +426,7 @@ class _MyCartState extends State<MyCart> { ...@@ -426,7 +426,7 @@ class _MyCartState extends State<MyCart> {
), ),
), ),
SizedBox( SizedBox(
width: SizeConfig.getWidth(90), width: SizeConfig.getWidth(60),
), ),
Icon( Icon(
Icons.local_offer, Icons.local_offer,
...@@ -496,7 +496,7 @@ class _MyCartState extends State<MyCart> { ...@@ -496,7 +496,7 @@ class _MyCartState extends State<MyCart> {
), ),
), ),
SizedBox( SizedBox(
width: SizeConfig.getWidth(80), width: SizeConfig.getWidth(60),
), ),
Text( Text(
'฿1,000.00', '฿1,000.00',
......
lib/ui/payment/payment_detail.dart
...@@ -83,7 +83,7 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -83,7 +83,7 @@ class _PaymentdetailState extends State<Paymentdetail> {
), ),
), ),
SizedBox( SizedBox(
width: SizeConfig.getWidth(60), width: SizeConfig.getWidth(45),
), ),
Text( Text(
'23.02.2020 08:57', '23.02.2020 08:57',
...@@ -189,7 +189,7 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -189,7 +189,7 @@ class _PaymentdetailState extends State<Paymentdetail> {
), ),
), ),
SizedBox( SizedBox(
width: SizeConfig.getWidth(60), width: SizeConfig.getWidth(45),
), ),
Text( Text(
'23.02.2020 08:57', '23.02.2020 08:57',
......
lib/ui/payment/payment_page.dart
...@@ -18,7 +18,7 @@ class _PaymentState extends State<Payment> { ...@@ -18,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(150), height: SizeConfig.getWidth(180),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Container( Container(
...@@ -41,7 +41,7 @@ class _PaymentState extends State<Payment> { ...@@ -41,7 +41,7 @@ class _PaymentState extends State<Payment> {
), ),
Container( Container(
height: 40, height: 40,
width: 200, width: SizeConfig.getWidth(170),
color: Colors.white, color: Colors.white,
child: TextField( child: TextField(
decoration: InputDecoration( decoration: InputDecoration(
...@@ -95,9 +95,9 @@ class _PaymentState extends State<Payment> { ...@@ -95,9 +95,9 @@ class _PaymentState extends State<Payment> {
), ),
), ),
), ),
Container( Container(width: SizeConfig.getWidth(100),height: SizeConfig.getHeight(45),
child: Padding( child: Padding(
padding: const EdgeInsets.only(left: 25), padding: const EdgeInsets.only(left:10),
child: RaisedButton( child: RaisedButton(
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(25.0),
...@@ -111,10 +111,10 @@ class _PaymentState extends State<Payment> { ...@@ -111,10 +111,10 @@ class _PaymentState extends State<Payment> {
); );
}, },
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 35, left: 0,
right: 35, right: 0,
top: 15, top: 5,
bottom: 15, bottom: 0,
), ),
color: Color(0xFFEEAFB7), color: Color(0xFFEEAFB7),
child: Text( 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