Skip to content

F
feelver
Commit 99ad2318 by art
Options

up

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