Skip to content

F
feelver
Commit 9125eb7e by Mobile : Ball (Apprentice)
Options

update

parent 2bec8595
Showing with 62 additions and 40 deletions
lib/ui/payment/payment_detail.dart
...@@ -28,12 +28,11 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -28,12 +28,11 @@ class _PaymentdetailState extends State<Paymentdetail> {
Widget containt() { Widget containt() {
return Expanded( return Expanded(
child: SingleChildScrollView( child: SingleChildScrollView(
child: Padding( padding: EdgeInsets.only(
padding: const EdgeInsets.only( left: SizeConfig.getPadding(10),
left: 10, right: SizeConfig.getPadding(10),
right: 10, top: SizeConfig.getPadding(8),
top: 8, bottom: SizeConfig.getPadding(8),
bottom: 8,
), ),
child: Container( child: Container(
alignment: FractionalOffset.topLeft, alignment: FractionalOffset.topLeft,
...@@ -55,8 +54,6 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -55,8 +54,6 @@ class _PaymentdetailState extends State<Paymentdetail> {
Divider( Divider(
color: Colors.black, color: Colors.black,
height: 40, height: 40,
indent: 10,
endIndent: 20,
), ),
list1(), list1(),
list2(), list2(),
...@@ -64,7 +61,6 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -64,7 +61,6 @@ class _PaymentdetailState extends State<Paymentdetail> {
), ),
), ),
), ),
),
); );
} }
...@@ -82,9 +78,7 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -82,9 +78,7 @@ class _PaymentdetailState extends State<Paymentdetail> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(60),
),
Text( Text(
'23.02.2020 08:57', '23.02.2020 08:57',
style: TextStyle( style: TextStyle(
...@@ -100,14 +94,15 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -100,14 +94,15 @@ class _PaymentdetailState extends State<Paymentdetail> {
Row( Row(
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/no-image.png', 'assets/images/demo_img.png',
height: SizeConfig.getPadding(80), height: SizeConfig.getPadding(90),
width: SizeConfig.getPadding(80), width: SizeConfig.getPadding(80),
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
Padding( Expanded(
padding: const EdgeInsets.only(left: 8),
child: Container( child: Container(
// color: Colors.green,
padding: EdgeInsets.only(left: SizeConfig.getPadding(8),),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
...@@ -145,9 +140,7 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -145,9 +140,7 @@ class _PaymentdetailState extends State<Paymentdetail> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(120),
),
Text( Text(
'X1', 'X1',
style: TextStyle( style: TextStyle(
...@@ -160,14 +153,12 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -160,14 +153,12 @@ class _PaymentdetailState extends State<Paymentdetail> {
], ],
), ),
), ),
) ),
], ],
), ),
Divider( Divider(
color: Colors.black, color: Colors.black,
height: 40, height: 40,
indent: 10,
endIndent: 20,
), ),
], ],
), ),
...@@ -188,9 +179,7 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -188,9 +179,7 @@ class _PaymentdetailState extends State<Paymentdetail> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(60),
),
Text( Text(
'23.02.2020 08:57', '23.02.2020 08:57',
style: TextStyle( style: TextStyle(
...@@ -206,14 +195,15 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -206,14 +195,15 @@ class _PaymentdetailState extends State<Paymentdetail> {
Row( Row(
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/no-image.png', 'assets/images/demo_img.png',
height: SizeConfig.getPadding(80), height: SizeConfig.getPadding(90),
width: SizeConfig.getPadding(80), width: SizeConfig.getPadding(80),
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
Padding( Expanded(
padding: const EdgeInsets.only(left: 8),
child: Container( child: Container(
// color: Colors.green,
padding: EdgeInsets.only(left: SizeConfig.getPadding(8),),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
...@@ -251,9 +241,7 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -251,9 +241,7 @@ class _PaymentdetailState extends State<Paymentdetail> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(120),
),
Text( Text(
'X1', 'X1',
style: TextStyle( style: TextStyle(
...@@ -266,20 +254,19 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -266,20 +254,19 @@ class _PaymentdetailState extends State<Paymentdetail> {
], ],
), ),
), ),
) ),
], ],
), ),
Divider( Divider(
color: Colors.black, color: Colors.black,
height: 40, height: 40,
indent: 10,
endIndent: 20,
), ),
], ],
), ),
); );
} }
Widget header() { Widget header() {
return Container( return Container(
child: Stack( child: Stack(
......
lib/ui/shop/shop_service.dart
...@@ -35,7 +35,7 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -35,7 +35,7 @@ class _ShopServicePageState extends State<ShopServicePage> {
margin: EdgeInsets.only( margin: EdgeInsets.only(
right: SizeConfig.getPadding(16), right: SizeConfig.getPadding(16),
left: SizeConfig.getPadding(16), left: SizeConfig.getPadding(16),
top: SizeConfig.getPadding(20), top: SizeConfig.getPadding(10),
bottom: SizeConfig.getPadding(10)), bottom: SizeConfig.getPadding(10)),
child: Container( child: Container(
margin: EdgeInsets.only(right: 15, left: 15, bottom: 20, top: 20), margin: EdgeInsets.only(right: 15, left: 15, bottom: 20, top: 20),
...@@ -171,6 +171,10 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -171,6 +171,10 @@ class _ShopServicePageState extends State<ShopServicePage> {
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
Container(
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate1, rate: rate1,
...@@ -188,6 +192,9 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -188,6 +192,9 @@ class _ShopServicePageState extends State<ShopServicePage> {
], ],
), ),
), ),
],
),
),
), ),
], ],
), ),
...@@ -202,7 +209,7 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -202,7 +209,7 @@ class _ShopServicePageState extends State<ShopServicePage> {
margin: EdgeInsets.only( margin: EdgeInsets.only(
right: SizeConfig.getPadding(16), right: SizeConfig.getPadding(16),
left: SizeConfig.getPadding(16), left: SizeConfig.getPadding(16),
top: SizeConfig.getPadding(20), top: SizeConfig.getPadding(10),
bottom: SizeConfig.getPadding(10)), bottom: SizeConfig.getPadding(10)),
child: Container( child: Container(
margin: EdgeInsets.only(right: 15, left: 15, bottom: 20, top: 20), margin: EdgeInsets.only(right: 15, left: 15, bottom: 20, top: 20),
...@@ -338,6 +345,10 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -338,6 +345,10 @@ class _ShopServicePageState extends State<ShopServicePage> {
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
Container(
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate2, rate: rate2,
...@@ -355,6 +366,9 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -355,6 +366,9 @@ class _ShopServicePageState extends State<ShopServicePage> {
], ],
), ),
), ),
],
),
),
), ),
], ],
), ),
...@@ -369,7 +383,7 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -369,7 +383,7 @@ class _ShopServicePageState extends State<ShopServicePage> {
margin: EdgeInsets.only( margin: EdgeInsets.only(
right: SizeConfig.getPadding(16), right: SizeConfig.getPadding(16),
left: SizeConfig.getPadding(16), left: SizeConfig.getPadding(16),
top: SizeConfig.getPadding(20), top: SizeConfig.getPadding(10),
bottom: SizeConfig.getPadding(10)), bottom: SizeConfig.getPadding(10)),
child: Container( child: Container(
margin: EdgeInsets.only(right: 15, left: 15, bottom: 20, top: 20), margin: EdgeInsets.only(right: 15, left: 15, bottom: 20, top: 20),
...@@ -505,6 +519,10 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -505,6 +519,10 @@ class _ShopServicePageState extends State<ShopServicePage> {
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
Container(
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate3, rate: rate3,
...@@ -522,6 +540,9 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -522,6 +540,9 @@ class _ShopServicePageState extends State<ShopServicePage> {
], ],
), ),
), ),
],
),
),
), ),
], ],
), ),
...@@ -536,7 +557,7 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -536,7 +557,7 @@ class _ShopServicePageState extends State<ShopServicePage> {
margin: EdgeInsets.only( margin: EdgeInsets.only(
right: SizeConfig.getPadding(16), right: SizeConfig.getPadding(16),
left: SizeConfig.getPadding(16), left: SizeConfig.getPadding(16),
top: SizeConfig.getPadding(20), top: SizeConfig.getPadding(10),
bottom: SizeConfig.getPadding(10)), bottom: SizeConfig.getPadding(10)),
child: Container( child: Container(
margin: EdgeInsets.only(right: 15, left: 15, bottom: 20, top: 20), margin: EdgeInsets.only(right: 15, left: 15, bottom: 20, top: 20),
...@@ -672,6 +693,10 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -672,6 +693,10 @@ class _ShopServicePageState extends State<ShopServicePage> {
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
Container(
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate4, rate: rate4,
...@@ -689,6 +714,9 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -689,6 +714,9 @@ class _ShopServicePageState extends State<ShopServicePage> {
], ],
), ),
), ),
],
),
),
), ),
], ],
), ),
...@@ -703,7 +731,7 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -703,7 +731,7 @@ class _ShopServicePageState extends State<ShopServicePage> {
margin: EdgeInsets.only( margin: EdgeInsets.only(
right: SizeConfig.getPadding(16), right: SizeConfig.getPadding(16),
left: SizeConfig.getPadding(16), left: SizeConfig.getPadding(16),
top: SizeConfig.getPadding(20), top: SizeConfig.getPadding(10),
bottom: SizeConfig.getPadding(10)), bottom: SizeConfig.getPadding(10)),
child: Container( child: Container(
margin: EdgeInsets.only(right: 15, left: 15, bottom: 20, top: 20), margin: EdgeInsets.only(right: 15, left: 15, bottom: 20, top: 20),
...@@ -839,6 +867,10 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -839,6 +867,10 @@ class _ShopServicePageState extends State<ShopServicePage> {
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
Container(
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate5, rate: rate5,
...@@ -856,6 +888,9 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -856,6 +888,9 @@ class _ShopServicePageState extends State<ShopServicePage> {
], ],
), ),
), ),
],
),
),
), ),
], ],
), ),
......
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