Skip to content

F
feelver
Commit 46b9e6d4 by art
Options

update

parent 69ad30bf
Showing with 115 additions and 101 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/notification/notification_page.dart
...@@ -12,13 +12,10 @@ class NotificationPage extends StatefulWidget { ...@@ -12,13 +12,10 @@ class NotificationPage extends StatefulWidget {
} }
class _NotificationPageState extends State<NotificationPage> { class _NotificationPageState extends State<NotificationPage> {
double rate=0; double rate = 0;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
SizeConfig(context); SizeConfig(context);
return Scaffold( return Scaffold(
body: _setupView(), body: _setupView(),
...@@ -30,13 +27,14 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -30,13 +27,14 @@ class _NotificationPageState extends State<NotificationPage> {
children: <Widget>[ children: <Widget>[
containt(), containt(),
header(), header(),
myAppBar(title: "การแจ้งเตือน",), myAppBar(
title: "การแจ้งเตือน",
),
], ],
); );
} }
Widget containt() {
Widget containt(){
return Container( return Container(
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
...@@ -47,7 +45,9 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -47,7 +45,9 @@ class _NotificationPageState extends State<NotificationPage> {
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
SizedBox(height: SizeConfig.getHeight(65),), SizedBox(
height: SizeConfig.getHeight(65),
),
Card1(), Card1(),
Card1(), Card1(),
], ],
...@@ -59,11 +59,14 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -59,11 +59,14 @@ class _NotificationPageState extends State<NotificationPage> {
); );
} }
Widget LogoutButton() {
Widget LogoutButton(){
return Container( return Container(
// color: Colors.red, // 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), height: SizeConfig.getHeight(40),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
...@@ -74,29 +77,36 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -74,29 +77,36 @@ class _NotificationPageState extends State<NotificationPage> {
SizedBox( SizedBox(
width: 10, width: 10,
), ),
Text("ออกจากระบบ",style: TextStyle( Text(
"ออกจากระบบ",
style: TextStyle(
color: Color(0xffEEAFB7), color: Color(0xffEEAFB7),
fontSize: SizeConfig.getFontSize(16), fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),), fontWeight: FontWeight.w500),
],), ),
],
),
); );
} }
Widget Card1() {
Widget Card1(){
return Card( return Card(
clipBehavior: Clip.antiAlias, 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( child: Container(
margin: EdgeInsets.only(right: 0,left: 10), margin: EdgeInsets.only(right: 0, left: 10),
// color: Colors.yellow, // color: Colors.yellow,
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
flex: 9, flex: 9,
child: Container( child: Container(
height: SizeConfig.getHeight(200), height: SizeConfig.getHeight(220),
// color: Colors.red, // color: Colors.red,
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
...@@ -105,7 +115,8 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -105,7 +115,8 @@ class _NotificationPageState extends State<NotificationPage> {
child: Container( child: Container(
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
// color: Colors.blue, // color: Colors.blue,
child: Image.asset("assets/images/icon_feelver_voucher.png"), child: Image.asset(
"assets/images/icon_feelver_voucher.png"),
), ),
), ),
Expanded( Expanded(
...@@ -115,30 +126,30 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -115,30 +126,30 @@ class _NotificationPageState extends State<NotificationPage> {
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text("50%",style: TextStyle( Text(
"50%",
style: TextStyle(
color: Color(0xff6AB3AA), color: Color(0xff6AB3AA),
fontSize: SizeConfig.getFontSize(45), fontSize: SizeConfig.getFontSize(45),
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontStyle: FontStyle.italic fontStyle: FontStyle.italic),
),), ),
Text(
Text("OFF",style: TextStyle( "OFF",
style: TextStyle(
color: Color(0xff6AB3AA), color: Color(0xff6AB3AA),
fontSize: SizeConfig.getFontSize(40), fontSize: SizeConfig.getFontSize(40),
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontStyle: FontStyle.italic fontStyle: FontStyle.italic),
),), ),
], ],
), ),
), ),
), ),
], ],
), ),
), ),
), ),
Expanded( Expanded(
...@@ -146,7 +157,7 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -146,7 +157,7 @@ class _NotificationPageState extends State<NotificationPage> {
child: Stack( child: Stack(
children: <Widget>[ children: <Widget>[
Container( Container(
height: SizeConfig.getHeight(200), height: SizeConfig.getHeight(210),
width: double.infinity, width: double.infinity,
color: Colors.green, color: Colors.green,
child: Image.asset( child: Image.asset(
...@@ -154,16 +165,17 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -154,16 +165,17 @@ class _NotificationPageState extends State<NotificationPage> {
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
), ),
Container( Container(
padding: EdgeInsets.only(top: 15,bottom: 15,left: 10,right: 10), padding: EdgeInsets.only(
height: SizeConfig.getHeight(200), top: 15, bottom: 15, left: 10, right: 10),
height: SizeConfig.getHeight(210),
width: double.infinity, width: double.infinity,
color: Color(0xddEEAFB7), color: Color(0xddEEAFB7),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text("Voucher Thai Body Balance", Text(
"Voucher Thai Body Balance",
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: SizeConfig.getFontSize(14), fontSize: SizeConfig.getFontSize(14),
...@@ -174,7 +186,8 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -174,7 +186,8 @@ class _NotificationPageState extends State<NotificationPage> {
SizedBox( SizedBox(
height: 5, height: 5,
), ),
Text("03/16/2019 12:43", Text(
"03/16/2019 12:43",
style: TextStyle( style: TextStyle(
color: Color(0xff6AB3AA), color: Color(0xff6AB3AA),
fontSize: SizeConfig.getFontSize(12), fontSize: SizeConfig.getFontSize(12),
...@@ -182,12 +195,11 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -182,12 +195,11 @@ class _NotificationPageState extends State<NotificationPage> {
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
), ),
SizedBox( SizedBox(
height: 10, height: 10,
), ),
Text(
Text("จะหมดในอีก 10 วัน อย่าลืมใช้นะคะ", "จะหมดในอีก 10 วัน อย่าลืมใช้นะคะ",
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: SizeConfig.getFontSize(14), fontSize: SizeConfig.getFontSize(14),
...@@ -195,19 +207,16 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -195,19 +207,16 @@ class _NotificationPageState extends State<NotificationPage> {
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
), ),
SizedBox( SizedBox(
height: 25, height: 25,
), ),
], ],
), ),
), ),
Container( Container(
height: SizeConfig.getHeight(200), height: SizeConfig.getHeight(240),
padding: EdgeInsets.only(top: 15,bottom: 15,left: 10,right: 10), padding: EdgeInsets.only(
top: 50, bottom: 15, left: 10, right: 10),
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
width: double.infinity, width: double.infinity,
// color: Colors.green, // color: Colors.green,
...@@ -226,30 +235,21 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -226,30 +235,21 @@ class _NotificationPageState extends State<NotificationPage> {
fontWeight: FontWeight.w500), fontWeight: FontWeight.w500),
), ),
color: Color(0xffE8A6B4), color: Color(0xffE8A6B4),
onPressed: () { onPressed: () {}),
}
),
], ],
), ),
), ),
], ],
), ),
), ),
], ],
), ),
), ),
); );
} }
Widget buttonBar() {
Widget buttonBar(){
return Container( return Container(
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
...@@ -260,19 +260,23 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -260,19 +260,23 @@ class _NotificationPageState extends State<NotificationPage> {
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[ children: <Widget>[
Image.asset("assets/images/icon_menu1_gray.png", Image.asset(
"assets/images/icon_menu1_gray.png",
width: SizeConfig.getWidth(20), width: SizeConfig.getWidth(20),
height: SizeConfig.getHeight(30), height: SizeConfig.getHeight(30),
fit: BoxFit.cover,), fit: BoxFit.cover,
),
SizedBox( SizedBox(
height: SizeConfig.getHeight(8), height: SizeConfig.getHeight(8),
), ),
Text("การจองของฉัน", Text(
"การจองของฉัน",
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: SizeConfig.getFontSize(12), fontSize: SizeConfig.getFontSize(12),
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),) fontWeight: FontWeight.w500),
)
], ],
), ),
), ),
...@@ -285,19 +289,23 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -285,19 +289,23 @@ class _NotificationPageState extends State<NotificationPage> {
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[ children: <Widget>[
Image.asset("assets/images/icon_menu2_gray.png", Image.asset(
"assets/images/icon_menu2_gray.png",
width: SizeConfig.getWidth(20), width: SizeConfig.getWidth(20),
height: SizeConfig.getHeight(30), height: SizeConfig.getHeight(30),
fit: BoxFit.cover,), fit: BoxFit.cover,
),
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
Text("ประวัติการใช้บริการ", Text(
"ประวัติการใช้บริการ",
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: SizeConfig.getFontSize(12), fontSize: SizeConfig.getFontSize(12),
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),) fontWeight: FontWeight.w500),
)
], ],
), ),
), ),
...@@ -310,19 +318,23 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -310,19 +318,23 @@ class _NotificationPageState extends State<NotificationPage> {
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[ children: <Widget>[
Image.asset("assets/images/icon_menu3_gray.png", Image.asset(
"assets/images/icon_menu3_gray.png",
width: SizeConfig.getWidth(20), width: SizeConfig.getWidth(20),
height: SizeConfig.getHeight(30), height: SizeConfig.getHeight(30),
fit: BoxFit.cover,), fit: BoxFit.cover,
),
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
Text("การแจ้งเตือน", Text(
"การแจ้งเตือน",
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: SizeConfig.getFontSize(12), fontSize: SizeConfig.getFontSize(12),
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),) fontWeight: FontWeight.w500),
)
], ],
), ),
), ),
...@@ -332,13 +344,12 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -332,13 +344,12 @@ class _NotificationPageState extends State<NotificationPage> {
); );
} }
Widget header(){ Widget header() {
return Container( return Container(
height: SizeConfig.getHeight(210), height: SizeConfig.getHeight(210),
// color: Colors.amber, // color: Colors.amber,
child: Stack( child: Stack(
children: <Widget>[ children: <Widget>[
Column( Column(
children: <Widget>[ children: <Widget>[
Container( Container(
...@@ -351,10 +362,10 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -351,10 +362,10 @@ class _NotificationPageState extends State<NotificationPage> {
Container( Container(
width: 85, width: 85,
height: 85, height: 85,
margin: EdgeInsets.only(left: SizeConfig.getPadding(16),bottom: 10), margin: EdgeInsets.only(
left: SizeConfig.getPadding(16), bottom: 10),
//color: Colors.brown, //color: Colors.brown,
), ),
Expanded( Expanded(
child: Container( child: Container(
alignment: Alignment.bottomLeft, alignment: Alignment.bottomLeft,
...@@ -366,15 +377,17 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -366,15 +377,17 @@ class _NotificationPageState extends State<NotificationPage> {
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text("Rataya Pratumkan",style: TextStyle( Text(
"Rataya Pratumkan",
style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: SizeConfig.getFontSize(18), fontSize: SizeConfig.getFontSize(18),
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),), fontWeight: FontWeight.w500),
),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
...@@ -387,7 +400,6 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -387,7 +400,6 @@ class _NotificationPageState extends State<NotificationPage> {
) )
], ],
), ),
Column( Column(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[ children: <Widget>[
...@@ -397,7 +409,8 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -397,7 +409,8 @@ class _NotificationPageState extends State<NotificationPage> {
Container( Container(
width: 85, width: 85,
height: 85, height: 85,
margin: EdgeInsets.only(left: SizeConfig.getPadding(16),bottom: 10), margin: EdgeInsets.only(
left: SizeConfig.getPadding(16), bottom: 10),
//color: Colors.brown, //color: Colors.brown,
child: ClipRRect( child: ClipRRect(
borderRadius: BorderRadius.circular(50), borderRadius: BorderRadius.circular(50),
...@@ -411,12 +424,8 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -411,12 +424,8 @@ class _NotificationPageState extends State<NotificationPage> {
), ),
], ],
), ),
], ],
), ),
], ],
), ),
); );
......
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