Skip to content

F
feelver
Commit 5001f9c4 by Mobile : Ball (Apprentice)
Options

Merge branch 'develop' of https://gitlab.2fellows.com/art/feelver into develop

parents 6f0cd9b4 08ee19a7
Showing with 140 additions and 112 deletions
lib/main.dart
......@@ -3,6 +3,7 @@ import 'package:feelverapp/ui/my_reviews/my_reviews_page.dart';
import 'package:feelverapp/ui/my_service/my_service_tab.dart';
import 'package:feelverapp/ui/notification/notification_page.dart';
import 'package:feelverapp/ui/other_menu/other_menu_page.dart';
import 'package:feelverapp/ui/shop/shop_Nearby_places.dart';
import 'package:feelverapp/ui/shop/shop_main.dart';
import 'package:flutter/material.dart';
import 'ui/splashscreen/splash_screen_page.dart';
......@@ -19,10 +20,12 @@ class MyApp extends StatelessWidget {
primarySwatch: Colors.blue,
),
// home: AccountSettingPage(),
// home: OtherMenuPage(),
home: MainShop(),
//home: ShopNearbyPlacesPage(),
// home: service_tab(),
// home: SplashScreenPage(),
home: MainShop(),
);
}
}
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
......
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_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: Text("Thai Body Balance"),
floating: true,
pinned: false,
snap: true,
bottom: new TabBar(
indicatorColor:Colors.transparent,
controller: _controller,
tabs: [
new Tab(
......@@ -132,10 +141,10 @@ class _MainShopState extends State<MainShop>
))
],
),
),
new Container(
),
];
},
body: new Container(
height: double.maxFinite,
child: new TabBarView(
controller: _controller,
......@@ -146,7 +155,7 @@ class _MainShopState extends State<MainShop>
// child: getlist(),
//width: 20,
),
Column(
children: <Widget>[
Container(
......@@ -245,11 +254,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 +273,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
lib/ui/shop/shop_reviews.dart
......@@ -14,12 +14,14 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
Widget build(BuildContext context) {
SizeConfig(context);
return Container(
child: ListView(
child: ListView(
children: <Widget>[
Column(
children: <Widget>[
Texttop(),
Card1(),
],
),
],
......@@ -34,7 +36,7 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
left: SizeConfig.getPadding(16),
top: SizeConfig.getPadding(20),
bottom: SizeConfig.getPadding(10)),
child: Row(
child: SingleChildScrollView(child: Row(
children: <Widget>[
Text(
'รีวิว(จากผู้ใช้บริการจริง)',
......@@ -43,9 +45,7 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
fontSize: SizeConfig.getFontSize(14),
),
),
SizedBox(
width: SizeConfig.getWidth(145),
),
Spacer(),
Text(
'ดูทั้งหมด',
style: TextStyle(
......@@ -54,12 +54,12 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
),
),
],
),
),),
);
}
Widget Card1() {
return Card(
return Card(
margin: EdgeInsets.only(
right: SizeConfig.getPadding(16),
left: SizeConfig.getPadding(16),
......@@ -245,7 +245,8 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row(
SingleChildScrollView(child: Row(
children: <Widget>[
Text(
'Rattaya Pratumkan',
......@@ -253,12 +254,14 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
fontSize: SizeConfig.getFontSize(20),
color: Colors.black),
),
SizedBox(
width: SizeConfig.getWidth(60),
),
Icon(Icons.more_vert),
],
SizedBox(
width: SizeConfig.getWidth(35),
),
Container(
child: Icon(Icons.more_vert),)
],
),),
SizedBox(
height: SizeConfig.getHeight(5),
),
......@@ -415,7 +418,7 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
color: Colors.black),
),
SizedBox(
width: SizeConfig.getWidth(60),
width: SizeConfig.getWidth(35),
),
Icon(Icons.more_vert),
],
......@@ -576,7 +579,7 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
color: Colors.black),
),
SizedBox(
width: SizeConfig.getWidth(60),
width: SizeConfig.getWidth(35),
),
Icon(Icons.more_vert),
],
......
lib/ui/shop/shop_service.dart
......@@ -14,12 +14,11 @@ class _ShopServicePageState extends State<ShopServicePage> {
double rate4 = 0;
double rate5 = 0;
@override
Widget build(BuildContext context) {
SizeConfig(context);
return Container(
child: ListView(
return Container(
child: ListView(
children: <Widget>[
Card1(),
Card2(),
......@@ -63,7 +62,6 @@ class _ShopServicePageState extends State<ShopServicePage> {
// color: Colors.yellow,
height: SizeConfig.getHeight(250),
child: Column(
children: <Widget>[
Container(
padding: EdgeInsets.all(10),
......@@ -170,12 +168,14 @@ class _ShopServicePageState extends State<ShopServicePage> {
),
],
),
SizedBox(height: SizeConfig.getHeight(5),),
SizedBox(
height: SizeConfig.getHeight(5),
),
RatingStar(
isRating: true,
rate: rate1,
starSize: 20,
onChangeRate: (i){
onChangeRate: (i) {
setState(() {
rate1 = i;
print(i);
......@@ -185,7 +185,6 @@ class _ShopServicePageState extends State<ShopServicePage> {
],
),
),
],
),
),
......@@ -197,6 +196,7 @@ class _ShopServicePageState extends State<ShopServicePage> {
),
);
}
Widget Card2() {
return Card(
margin: EdgeInsets.only(
......@@ -229,7 +229,6 @@ class _ShopServicePageState extends State<ShopServicePage> {
// color: Colors.yellow,
height: SizeConfig.getHeight(250),
child: Column(
children: <Widget>[
Container(
padding: EdgeInsets.all(10),
......@@ -336,12 +335,14 @@ class _ShopServicePageState extends State<ShopServicePage> {
),
],
),
SizedBox(height: SizeConfig.getHeight(5),),
SizedBox(
height: SizeConfig.getHeight(5),
),
RatingStar(
isRating: true,
rate: rate2,
starSize: 20,
onChangeRate: (i){
onChangeRate: (i) {
setState(() {
rate2 = i;
print(i);
......@@ -351,7 +352,6 @@ class _ShopServicePageState extends State<ShopServicePage> {
],
),
),
],
),
),
......@@ -363,6 +363,7 @@ class _ShopServicePageState extends State<ShopServicePage> {
),
);
}
Widget Card3() {
return Card(
margin: EdgeInsets.only(
......@@ -395,7 +396,6 @@ class _ShopServicePageState extends State<ShopServicePage> {
// color: Colors.yellow,
height: SizeConfig.getHeight(250),
child: Column(
children: <Widget>[
Container(
padding: EdgeInsets.all(10),
......@@ -502,12 +502,14 @@ class _ShopServicePageState extends State<ShopServicePage> {
),
],
),
SizedBox(height: SizeConfig.getHeight(5),),
SizedBox(
height: SizeConfig.getHeight(5),
),
RatingStar(
isRating: true,
rate: rate3,
starSize: 20,
onChangeRate: (i){
onChangeRate: (i) {
setState(() {
rate3 = i;
print(i);
......@@ -517,7 +519,6 @@ class _ShopServicePageState extends State<ShopServicePage> {
],
),
),
],
),
),
......@@ -529,6 +530,7 @@ class _ShopServicePageState extends State<ShopServicePage> {
),
);
}
Widget Card4() {
return Card(
margin: EdgeInsets.only(
......@@ -561,7 +563,6 @@ class _ShopServicePageState extends State<ShopServicePage> {
// color: Colors.yellow,
height: SizeConfig.getHeight(250),
child: Column(
children: <Widget>[
Container(
padding: EdgeInsets.all(10),
......@@ -668,12 +669,14 @@ class _ShopServicePageState extends State<ShopServicePage> {
),
],
),
SizedBox(height: SizeConfig.getHeight(5),),
SizedBox(
height: SizeConfig.getHeight(5),
),
RatingStar(
isRating: true,
rate: rate4,
starSize: 20,
onChangeRate: (i){
onChangeRate: (i) {
setState(() {
rate4 = i;
print(i);
......@@ -683,7 +686,6 @@ class _ShopServicePageState extends State<ShopServicePage> {
],
),
),
],
),
),
......@@ -695,6 +697,7 @@ class _ShopServicePageState extends State<ShopServicePage> {
),
);
}
Widget Card5() {
return Card(
margin: EdgeInsets.only(
......@@ -727,7 +730,6 @@ class _ShopServicePageState extends State<ShopServicePage> {
// color: Colors.yellow,
height: SizeConfig.getHeight(250),
child: Column(
children: <Widget>[
Container(
padding: EdgeInsets.all(10),
......@@ -834,12 +836,14 @@ class _ShopServicePageState extends State<ShopServicePage> {
),
],
),
SizedBox(height: SizeConfig.getHeight(5),),
SizedBox(
height: SizeConfig.getHeight(5),
),
RatingStar(
isRating: true,
rate: rate5,
starSize: 20,
onChangeRate: (i){
onChangeRate: (i) {
setState(() {
rate5 = i;
print(i);
......@@ -849,7 +853,6 @@ class _ShopServicePageState extends State<ShopServicePage> {
],
),
),
],
),
),
......@@ -861,5 +864,4 @@ class _ShopServicePageState extends State<ShopServicePage> {
),
);
}
}
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