Commit 99ad2318 by art

up

parents 9aec92a7 04853921
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: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';
...@@ -26,9 +17,10 @@ class MyApp extends StatelessWidget { ...@@ -26,9 +17,10 @@ class MyApp extends StatelessWidget {
// home: AccountSettingPage(), // home: AccountSettingPage(),
// home: OtherMenuPage(), // home: OtherMenuPage(),
home: MainShop(), //home: ShopNearbyPlacesPage(),
// home: service_tab(), // home: service_tab(),
// home: SplashScreenPage(),
home: SplashScreenPage(),
); );
} }
} }
...@@ -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,15 +54,12 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -55,15 +54,12 @@ 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(),
], ],
), ),
), ),
),
), ),
); );
} }
...@@ -82,9 +78,13 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -82,9 +78,13 @@ class _PaymentdetailState extends State<Paymentdetail> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
<<<<<<< HEAD
SizedBox( SizedBox(
width: SizeConfig.getWidth(45), width: SizeConfig.getWidth(45),
), ),
=======
Spacer(),
>>>>>>> 04853921d96720bb30f1d860c2eeda0a17fa7f23
Text( Text(
'23.02.2020 08:57', '23.02.2020 08:57',
style: TextStyle( style: TextStyle(
...@@ -100,74 +100,71 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -100,74 +100,71 @@ 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(
child: Column( // color: Colors.green,
crossAxisAlignment: CrossAxisAlignment.start, padding: EdgeInsets.only(left: SizeConfig.getPadding(8),),
children: <Widget>[ child: Column(
Text( crossAxisAlignment: CrossAxisAlignment.start,
'Ivory Relax and Spa', children: <Widget>[
style: TextStyle( Text(
fontSize: SizeConfig.getFontSize(16), 'Ivory Relax and Spa',
fontFamily: "SF_Pro_Text", style: TextStyle(
fontWeight: FontWeight.bold, fontSize: SizeConfig.getFontSize(16),
color: Colors.black, fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold,
color: Colors.black,
),
), ),
), SizedBox(
SizedBox( height: SizeConfig.getHeight(12),
height: SizeConfig.getHeight(12),
),
Text(
'นวดแผนไทย',
style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
color: Colors.black,
), ),
), Text(
SizedBox( 'นวดแผนไทย',
height: SizeConfig.getHeight(15), style: TextStyle(
), fontSize: SizeConfig.getFontSize(16),
Row( fontFamily: "SF_Pro_Text",
children: <Widget>[ color: Colors.black,
Text(
'฿1,200.00',
style: TextStyle(
fontSize: SizeConfig.getFontSize(20),
color: Color(0xFFFD2956),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold,
),
),
SizedBox(
width: SizeConfig.getWidth(120),
), ),
Text( ),
'X1', SizedBox(
style: TextStyle( height: SizeConfig.getHeight(15),
color: Color(0xFF9D9D9D), ),
fontSize: SizeConfig.getFontSize(20), 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),
),
),
],
),
],
),
), ),
), ),
)
], ],
), ),
Divider( Divider(
color: Colors.black, color: Colors.black,
height: 40, height: 40,
indent: 10,
endIndent: 20,
), ),
], ],
), ),
...@@ -188,9 +185,13 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -188,9 +185,13 @@ class _PaymentdetailState extends State<Paymentdetail> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
<<<<<<< HEAD
SizedBox( SizedBox(
width: SizeConfig.getWidth(45), width: SizeConfig.getWidth(45),
), ),
=======
Spacer(),
>>>>>>> 04853921d96720bb30f1d860c2eeda0a17fa7f23
Text( Text(
'23.02.2020 08:57', '23.02.2020 08:57',
style: TextStyle( style: TextStyle(
...@@ -206,14 +207,15 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -206,14 +207,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 +253,7 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -251,9 +253,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 +266,19 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -266,20 +266,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(
......
...@@ -7,6 +7,7 @@ class ShopNearbyPlacesPage extends StatefulWidget { ...@@ -7,6 +7,7 @@ class ShopNearbyPlacesPage extends StatefulWidget {
@override @override
_ShopNearbyPlacesPageState createState() => _ShopNearbyPlacesPageState(); _ShopNearbyPlacesPageState createState() => _ShopNearbyPlacesPageState();
} }
final List<String> entries = <String>['A', 'B', 'C'];
class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage> { class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage> {
@override @override
...@@ -25,6 +26,7 @@ class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage> { ...@@ -25,6 +26,7 @@ class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage> {
top: SizeConfig.getPadding(15), top: SizeConfig.getPadding(15),
bottom: SizeConfig.getPadding(10), bottom: SizeConfig.getPadding(10),
left: SizeConfig.getPadding(24), left: SizeConfig.getPadding(24),
right: SizeConfig.getPadding(24)
), ),
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
...@@ -36,9 +38,7 @@ class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage> { ...@@ -36,9 +38,7 @@ class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage> {
fontSize: SizeConfig.getFontSize(14), fontSize: SizeConfig.getFontSize(14),
), ),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(175),
),
Text( Text(
'ดูทั้งหมด', 'ดูทั้งหมด',
style: TextStyle( style: TextStyle(
......
...@@ -890,4 +890,5 @@ class _ShopListDetailState extends State<ShopListDetail> { ...@@ -890,4 +890,5 @@ class _ShopListDetailState extends State<ShopListDetail> {
], ],
), ),
); );
}} }
\ No newline at end of file }
import 'package:feelverapp/ui/nearme/near_me_detail.dart'; import 'package:feelverapp/ui/shop/shop.dart';
import 'package:feelverapp/ui/shop/shop_Nearby_places.dart'; import 'package:feelverapp/ui/shop/shop_Nearby_places.dart';
import 'package:feelverapp/ui/shop/shop_reviews.dart'; import 'package:feelverapp/ui/shop/shop_reviews.dart';
import 'package:feelverapp/ui/shop/shop_service.dart'; import 'package:feelverapp/ui/shop/shop_service.dart';
import 'package:feelverapp/util/SizeConfig.dart'; import 'package:feelverapp/util/SizeConfig.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'dart:math';
class MainShop extends StatefulWidget { class MainShop extends StatefulWidget {
MainShop({Key key, this.title}) : super(key: key);
final String title;
@override @override
_MainShopState createState() => new _MainShopState(); _MainShopState createState() => _MainShopState();
} }
final List<String> entries = <String>['A', 'B', 'C']; class _MainShopState extends State<MainShop> with SingleTickerProviderStateMixin /*<-- This is for the controllers*/ {
TabController _controller; // To control switching tabs
ScrollController _scrollViewController; // To control scrolling
class _MainShopState extends State<MainShop> List<String> items = [];
with SingleTickerProviderStateMixin { List<Color> colors = [Colors.red, Colors.green, Colors.yellow, Colors.purple, Colors.blue, Colors.amber, Colors.cyan, Colors.pink];
TabController _controller; Random random = new Random();
Color getRandomColor() {
return colors.elementAt(random.nextInt(colors.length));
}
@override
void initState() { void initState() {
// TODO: implement initState
super.initState(); super.initState();
_controller = new TabController(length: 4, vsync: this); _controller = new TabController(length: 4, vsync: this);
_controller.addListener(_handleTabSelection); _controller.addListener(_handleTabSelection);
_scrollViewController =ScrollController();
}
void _handleTabSelection() {
setState(() {});
} }
@override @override
void dispose() { void dispose() {
// TODO: implement dispose
_controller.dispose();
super.dispose(); super.dispose();
_controller.dispose();
_scrollViewController.dispose();
} }
void _handleTabSelection() {
setState(() {
});
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
SizeConfig(context); SizeConfig(context);
return new Scaffold( // Init the items
appBar: new AppBar( for (var i = 0; i < 100; i++) {
items.add('Item $i');
}
return Scaffold(
// backgroundColor: Colors.transparent,
body: NestedScrollView(
controller: _scrollViewController,
headerSliverBuilder: (BuildContext context, bool boxIsScrolled) {
return <Widget>[
SliverAppBar(
backgroundColor: Color.fromRGBO(106, 179, 170, 1),
leading: IconButton( leading: IconButton(
icon: Icon(Icons.arrow_back_ios, color: Colors.white), icon: Icon(Icons.arrow_back_ios, color: Colors.white),
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pop(),
), ),
backgroundColor: Color.fromRGBO(106, 179, 170, 1), title: Center(child:Text("Thai Body Balance",style:TextStyle(
title: new Text( color:Colors.white,
'Thai Body Balance', fontSize: 25)),),
style: TextStyle(color: Colors.white, fontSize: 25), floating: true,
), pinned: false,
elevation: 0, snap: true,
), bottom: new TabBar(
body: new ListView(
children: <Widget>[ indicatorColor:Colors.transparent,
// new Card(
// child: new ListTile(
// title: const Text('Some information'),
// ),
// ),
new Container(
padding: const EdgeInsets.only(bottom: 25, top: 15),
decoration: new BoxDecoration(
color: Color.fromRGBO(106, 179, 170, 1),
),
child: new TabBar(
indicatorColor: Colors.transparent,
controller: _controller, controller: _controller,
tabs: [ tabs: [
new Tab( new Tab(
...@@ -132,21 +144,20 @@ class _MainShopState extends State<MainShop> ...@@ -132,21 +144,20 @@ class _MainShopState extends State<MainShop>
)) ))
], ],
), ),
), ),
];
},
new Container( body: new Container(
height: double.maxFinite, height: double.maxFinite,
child: new TabBarView( child: new TabBarView(
controller: _controller, controller: _controller,
children: <Widget>[ children: <Widget>[
Container( Container(
color: Colors.deepPurpleAccent, child:Shop()
height: 50,
// child: getlist(), // child: getlist(),
//width: 20, //width: 20,
), ),
Column( Column(
children: <Widget>[ children: <Widget>[
Container( Container(
...@@ -245,11 +256,13 @@ class _MainShopState extends State<MainShop> ...@@ -245,11 +256,13 @@ class _MainShopState extends State<MainShop>
], ],
), ),
), ),
Container( Expanded(
// color: Colors.blue, child: Container(
height: double.maxFinite, // color: Colors.blue,
child: ShopServicePage(), // height: double.maxFinite,
), child: ShopServicePage(),
),
),
], ],
), ),
// child: getlist(), // child: getlist(),
...@@ -262,17 +275,17 @@ class _MainShopState extends State<MainShop> ...@@ -262,17 +275,17 @@ class _MainShopState extends State<MainShop>
//width: 20, //width: 20,
), ),
// //
Container( Container(
// width: double.maxFinite, // width: double.maxFinite,
// color: Colors.yellow, // color: Colors.yellow,
// child: setupView(), // child: setupView(),
child: ShopNearbyPlacesPage(), child: ShopNearbyPlacesPage(),
), ),
], ],
), ),
), ),
],
), ),
); );
} }
} }
\ No newline at end of file
...@@ -7,42 +7,42 @@ packages: ...@@ -7,42 +7,42 @@ packages:
name: archive name: archive
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.13" version: "2.0.11"
args: args:
dependency: transitive dependency: transitive
description: description:
name: args name: args
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.6.0" version: "1.5.2"
async: async:
dependency: transitive dependency: transitive
description: description:
name: async name: async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.4.1" version: "2.4.0"
boolean_selector: boolean_selector:
dependency: transitive dependency: transitive
description: description:
name: boolean_selector name: boolean_selector
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.0" version: "1.0.5"
charcode: charcode:
dependency: transitive dependency: transitive
description: description:
name: charcode name: charcode
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.3" version: "1.1.2"
collection: collection:
dependency: transitive dependency: transitive
description: description:
name: collection name: collection
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.14.12" version: "1.14.11"
convert: convert:
dependency: transitive dependency: transitive
description: description:
...@@ -56,7 +56,7 @@ packages: ...@@ -56,7 +56,7 @@ packages:
name: crypto name: crypto
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.4" version: "2.1.3"
cupertino_icons: cupertino_icons:
dependency: "direct main" dependency: "direct main"
description: description:
...@@ -87,7 +87,7 @@ packages: ...@@ -87,7 +87,7 @@ packages:
name: image name: image
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.12" version: "2.1.4"
matcher: matcher:
dependency: transitive dependency: transitive
description: description:
...@@ -109,6 +109,13 @@ packages: ...@@ -109,6 +109,13 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.6.4" version: "1.6.4"
pedantic:
dependency: transitive
description:
name: pedantic
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0+1"
petitparser: petitparser:
dependency: transitive dependency: transitive
description: description:
...@@ -122,7 +129,7 @@ packages: ...@@ -122,7 +129,7 @@ packages:
name: quiver name: quiver
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.3" version: "2.0.5"
sky_engine: sky_engine:
dependency: transitive dependency: transitive
description: flutter description: flutter
...@@ -134,7 +141,7 @@ packages: ...@@ -134,7 +141,7 @@ packages:
name: source_span name: source_span
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.7.0" version: "1.5.5"
stack_trace: stack_trace:
dependency: transitive dependency: transitive
description: description:
...@@ -169,7 +176,7 @@ packages: ...@@ -169,7 +176,7 @@ packages:
name: test_api name: test_api
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.15" version: "0.2.11"
typed_data: typed_data:
dependency: transitive dependency: transitive
description: description:
...@@ -190,6 +197,6 @@ packages: ...@@ -190,6 +197,6 @@ packages:
name: xml name: xml
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.6.1" version: "3.5.0"
sdks: sdks:
dart: ">=2.6.0 <3.0.0" dart: ">=2.6.0 <3.0.0"
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