Commit 91eb10ce by Mobile : Art

update

parents 9fc19fb6 f97a4ff7
...@@ -34,12 +34,14 @@ class MyApp extends StatelessWidget { ...@@ -34,12 +34,14 @@ class MyApp extends StatelessWidget {
), ),
home: SplashScreenPage() home: SplashScreenPage()
//home: EditProfile(), //home: EditProfile(),
); );
......
...@@ -61,7 +61,21 @@ class _FavoriteState extends State<Favorite> { ...@@ -61,7 +61,21 @@ class _FavoriteState extends State<Favorite> {
), ),
child: Container( child: Container(
child: presenter.favoriteModel == null child: presenter.favoriteModel == null
? Container() ? Container(
child: Center(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
SizedBox(
child: CircularProgressIndicator( valueColor: new AlwaysStoppedAnimation<Color>(
Color.fromRGBO(69, 85, 79, 1),
),),
height: 30.0,
width: 30.0,
),]
))
)
: ListView.builder( : ListView.builder(
itemCount: presenter.favoriteModel.wishListItem.length, itemCount: presenter.favoriteModel.wishListItem.length,
itemBuilder: (context, i) { itemBuilder: (context, i) {
......
import 'package:feelverapp/model/favorite/delete_favorite_Model.dart'; import 'package:feelverapp/model/favorite/delete_favorite_Model.dart';
import 'package:feelverapp/model/favorite/favorite_Model.dart'; import 'package:feelverapp/model/favorite/favorite_Model.dart';
import 'package:feelverapp/service/Loading.dart';
import 'package:feelverapp/service/api.dart'; import 'package:feelverapp/service/api.dart';
import 'package:feelverapp/service/base_presenter.dart'; import 'package:feelverapp/service/base_presenter.dart';
import 'package:feelverapp/ui/favorite/favorite.dart'; import 'package:feelverapp/ui/favorite/favorite.dart';
...@@ -14,16 +15,16 @@ class FavoritePresenter extends BasePresenter<Favorite> { ...@@ -14,16 +15,16 @@ class FavoritePresenter extends BasePresenter<Favorite> {
FavoritePresenter(State<Favorite> state) : super(state); FavoritePresenter(State<Favorite> state) : super(state);
Favoriteitem() async { Favoriteitem() async {
var _id = await AccountUtil.getID(); var _id = await AccountUtil.getID();
print(_id);
print("555555555555");
_api = Api<FavoriteModel>(); _api = Api<FavoriteModel>();
var res = await _api.favorite({ var res = await _api.favorite({
"customer_id": _id, "customer_id": _id,
}); });
if (res.fail == null) { if (res.fail == null) {
setState(() { setState(() {
favoriteModel = res.success; favoriteModel = res.success;
...@@ -34,11 +35,13 @@ class FavoritePresenter extends BasePresenter<Favorite> { ...@@ -34,11 +35,13 @@ class FavoritePresenter extends BasePresenter<Favorite> {
} }
Deletefavoriteitem(String id) async { Deletefavoriteitem(String id) async {
LoadingView(state.context).show();
_api = Api<DeletefavoriteModel>(); _api = Api<DeletefavoriteModel>();
var res = await _api.deletefavorite({ var res = await _api.deletefavorite({
"id": id, "id": id,
}); });
LoadingView(state.context).hide();
if (res.fail == null) { if (res.fail == null) {
setState(() { setState(() {
deletefavoriteModel = res.success; deletefavoriteModel = res.success;
......
...@@ -70,6 +70,8 @@ class _ReviewShopPageState extends State<ReviewShopPage> { ...@@ -70,6 +70,8 @@ class _ReviewShopPageState extends State<ReviewShopPage> {
print(presenter.reviewShopModel.result[0].comment[i].infoCustomer.name); print(presenter.reviewShopModel.result[0].comment[i].infoCustomer.name);
return list( return list(
presenter.reviewShopModel.result[0].comment[i].infoCustomer.name, presenter.reviewShopModel.result[0].comment[i].infoCustomer.name,
presenter.reviewShopModel.result[0].comment[i].infoCustomer.image,
presenter.reviewShopModel.result[0].comment[i].commentContent,
); );
}), }),
), ),
...@@ -248,7 +250,7 @@ class _ReviewShopPageState extends State<ReviewShopPage> { ...@@ -248,7 +250,7 @@ class _ReviewShopPageState extends State<ReviewShopPage> {
); );
} }
Widget list(String name) { Widget list(String name,String image,String content) {
return Card( return Card(
child: Container( child: Container(
// color: Colors.deepPurpleAccent, // color: Colors.deepPurpleAccent,
...@@ -264,12 +266,16 @@ class _ReviewShopPageState extends State<ReviewShopPage> { ...@@ -264,12 +266,16 @@ class _ReviewShopPageState extends State<ReviewShopPage> {
children: <Widget>[ children: <Widget>[
ClipRRect( ClipRRect(
borderRadius: BorderRadius.circular(50), borderRadius: BorderRadius.circular(50),
child: Image.asset( child: presenter.reviewShopModel == null ? Image.asset(
'assets/images/ic_userimg.png', 'assets/images/ic_userimg.png',
width: 55.0, width: 55.0,
height: 55.0, height: 55.0,
fit: BoxFit.cover, fit: BoxFit.cover,
), ) : Image.network(
"https://backend.feelver.com/"+image,
width: 55.0,
height: 55.0,
fit: BoxFit.cover,)
), ),
SizedBox( SizedBox(
width: SizeConfig.getWidth(10), width: SizeConfig.getWidth(10),
...@@ -331,7 +337,7 @@ class _ReviewShopPageState extends State<ReviewShopPage> { ...@@ -331,7 +337,7 @@ class _ReviewShopPageState extends State<ReviewShopPage> {
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
top: 10, bottom: 10, left: 2, right: 2), top: 10, bottom: 10, left: 2, right: 2),
child: Text( child: Text(
'การบริการและบรรยากาศดีมาก มีห้องอาบน้ำพร้อมผ้าเช็ดตัว สบู่ ครีมสระผม พนักงานดูแลเอาใจใส่ และคอยแนะนำตลอดจนถึง therapist มีความเป็นมืออาชีพให้ความผ่อนคลายแก่ลูกค้า', content,
style: TextStyle( style: TextStyle(
fontSize: SizeConfig.getFontSize(12), fontSize: SizeConfig.getFontSize(12),
), ),
......
...@@ -92,6 +92,13 @@ packages: ...@@ -92,6 +92,13 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "5.2.1" version: "5.2.1"
firebase_crashlytics:
dependency: "direct main"
description:
name: firebase_crashlytics
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.4+1"
flutter: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
......
...@@ -37,6 +37,7 @@ dependencies: ...@@ -37,6 +37,7 @@ dependencies:
date_format: ^1.0.8 date_format: ^1.0.8
flutter_datetime_picker: ^1.4.0 flutter_datetime_picker: ^1.4.0
carousel_slider: ^2.2.1 carousel_slider: ^2.2.1
firebase_crashlytics: ^0.1.4+1
......
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