Skip to content

F
feelver
Commit 62b11248 by Mobile : Jetrin Phuekkaew (N'new)
Options

no message

parent 4dee3d82
Showing with 54 additions and 52 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,14 +20,12 @@ class MyApp extends StatelessWidget {
primarySwatch: Colors.blue,
),
// home: AccountSettingPage(),
<<<<<<< HEAD
home: MainShop(),
=======
// home: OtherMenuPage(),
home: MainShop(),
//home: ShopNearbyPlacesPage(),
// home: service_tab(),
>>>>>>> facc6447c0f3c38afad557fe3ab0af7590a20bff
// 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
......@@ -17,7 +17,6 @@ class _MainShopState extends State<MainShop>
with SingleTickerProviderStateMixin {
TabController _controller;
void initState() {
// TODO: implement initState
super.initState();
......@@ -33,15 +32,14 @@ class _MainShopState extends State<MainShop>
}
void _handleTabSelection() {
setState(() {
});
setState(() {});
}
@override
Widget build(BuildContext context) {
SizeConfig(context);
return new Scaffold(
appBar: new AppBar(
leading: IconButton(
icon: Icon(Icons.arrow_back_ios, color: Colors.white),
......@@ -134,7 +132,6 @@ class _MainShopState extends State<MainShop>
),
),
new Container(
height: double.maxFinite,
child: new TabBarView(
......@@ -146,7 +143,7 @@ class _MainShopState extends State<MainShop>
// child: getlist(),
//width: 20,
),
Column(
children: <Widget>[
Container(
......@@ -262,12 +259,12 @@ class _MainShopState extends State<MainShop>
//width: 20,
),
//
Container(
Container(
// width: double.maxFinite,
// color: Colors.yellow,
// child: setupView(),
child: ShopNearbyPlacesPage(),
),
child: ShopNearbyPlacesPage(),
),
],
),
),
......
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),
),
......
lib/ui/shop/shop_service.dart
......@@ -14,7 +14,6 @@ class _ShopServicePageState extends State<ShopServicePage> {
double rate4 = 0;
double rate5 = 0;
@override
Widget build(BuildContext context) {
SizeConfig(context);
......@@ -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> {
),
);
}
}
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