Skip to content

F
feelver
Commit 22f9b54e by Mobile : Ball (Apprentice)
Options

no message

parent 43f467db
Showing with 139 additions and 111 deletions
lib/main.dart
......@@ -32,7 +32,7 @@ class MyApp extends StatelessWidget {
),
home: SplashScreenPage()
home: ReviewShopPage()
//home: EditProfile(),
......
lib/service/api.dart
......@@ -44,7 +44,7 @@ class Api<T> {
}else{
_fail = FailModel.fromJson(json.decode(response.body));
}
result = new Response(_model, _fail);
result = new Response<T>(_model, _fail);
});
return result;
}
......
lib/ui/favorite/favorite.dart
......@@ -9,10 +9,9 @@ class Favorite extends StatefulWidget {
_FavoriteState createState() => _FavoriteState();
}
class _FavoriteState extends State<Favorite> with TickerProviderStateMixin {
class _FavoriteState extends State<Favorite> {
bool checkBoxValue = false;
FavoritePresenter presenter;
@override
......@@ -36,7 +35,6 @@ class _FavoriteState extends State<Favorite> with TickerProviderStateMixin {
bottomNavigationBar: Container(
color: Color.fromRGBO(69, 85, 79, 1),
height: SizeConfig.getHeight(100),
),
);
}
......@@ -60,17 +58,21 @@ class _FavoriteState extends State<Favorite> with TickerProviderStateMixin {
bottom: 10,
),
child: Container(
child: ListView.builder(
itemCount: 5,
child: presenter.favoriteModel == null
? Container()
: ListView.builder(
itemCount: presenter.favoriteModel.wishListItem.length,
itemBuilder: (context, i) {
return list();
return list(i);
}),
),
),
);
}
Widget list() {
Widget list(int index) {
return Container(
// color: Colors.red,
margin: EdgeInsets.only(bottom: 15),
......@@ -81,22 +83,19 @@ class _FavoriteState extends State<Favorite> with TickerProviderStateMixin {
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Padding(
padding: const EdgeInsets.only(left: 10),
child: presenter.favoriteModel == null
? Image.asset(
'assets/images/demo_img.png',
width: SizeConfig.getWidth(110),
height: SizeConfig.getHeight(150),
fit: BoxFit.fitWidth,
)
: Image.network(
presenter.favoriteModel.wishListItem[0].product
.cover,
width: SizeConfig.getWidth(110),
height: SizeConfig.getHeight(150),
fit: BoxFit.fitWidth,
)),
presenter.favoriteModel == null
? Image.asset(
'assets/images/demo_img.png',
width: SizeConfig.getWidth(110),
height: SizeConfig.getHeight(150),
fit: BoxFit.fitWidth,
)
: Image.network(
presenter.favoriteModel.wishListItem[index].product.cover,
width: SizeConfig.getWidth(110),
height: SizeConfig.getHeight(150),
fit: BoxFit.fitWidth,
),
Expanded(
child: Container(
padding: EdgeInsets.only(
......@@ -111,7 +110,7 @@ class _FavoriteState extends State<Favorite> with TickerProviderStateMixin {
child: Row(
children: <Widget>[
Text(
'Ivory Relax and Spa',
presenter.favoriteModel.wishListItem[index].product.name,
style: TextStyle(
color: Colors.black,
fontSize: SizeConfig.getFontSize(15)),
......@@ -132,7 +131,7 @@ class _FavoriteState extends State<Favorite> with TickerProviderStateMixin {
child: Text('นวดเเผนไทย',
style: TextStyle(
color: Colors.black,
)),
),),
),
SizedBox(
height: SizeConfig.getHeight(5),
......@@ -149,14 +148,14 @@ class _FavoriteState extends State<Favorite> with TickerProviderStateMixin {
SizedBox(
width: SizeConfig.getWidth(5),
),
Text('90 นาที'),
Text(presenter.favoriteModel.wishListItem[index].product.duration),
Spacer(),
Icon(
Icons.local_offer,
color: Color(0xFFEEAFB7),
),
Text(
'฿1,599.00',
"฿" + presenter.favoriteModel.wishListItem[index].product.specialPrice,
style: TextStyle(
decoration: TextDecoration.lineThrough,
fontSize: SizeConfig.getFontSize(16),
......@@ -176,7 +175,7 @@ class _FavoriteState extends State<Favorite> with TickerProviderStateMixin {
children: <Widget>[
Spacer(),
Text(
'฿1,200.00',
"฿" + presenter.favoriteModel.wishListItem[index].product.price,
style: TextStyle(
fontSize: SizeConfig.getFontSize(20),
color: Color(0xFFFD2956),
......@@ -193,12 +192,14 @@ class _FavoriteState extends State<Favorite> with TickerProviderStateMixin {
),
],
),
],
),
),
);
}
Widget header() {
return Container(
child: Stack(
......
lib/ui/review_shop/review_shop_page.dart
......@@ -36,47 +36,39 @@ class _ReviewShopPageState extends State<ReviewShopPage> {
child: Column(
children: <Widget>[
texttop(),
star(),
containt(),
],
),
);
}
Widget texttop(){
return Container(
margin: EdgeInsets.only(
right: SizeConfig.getPadding(16),
left: SizeConfig.getPadding(16),
top: SizeConfig.getPadding(5),
bottom: SizeConfig.getPadding(10)),
child: Row(
children: <Widget>[
Text(
'รีวิว(จากผู้ใช้บริการจริง)',
style: TextStyle(
color: Color(0xFF6AB3AA),
fontSize: SizeConfig.getFontSize(14),
),
),
Spacer(),
],
),
Widget containt() {
return Expanded(
child: Container(
child: ListView.builder(
itemCount: 3,
itemBuilder: (context, i) {
return list();
}),
),
);
}
Widget containt(){
return Card(
Widget star() {
return Container(
// color: Colors.blue,
margin: EdgeInsets.only(
right: SizeConfig.getPadding(16),
left: SizeConfig.getPadding(16),
top: SizeConfig.getPadding(20),
top: SizeConfig.getPadding(10),
bottom: SizeConfig.getPadding(10)),
child: Container(
margin: EdgeInsets.only(
// color: Colors.red,
padding: EdgeInsets.only(
right: SizeConfig.getPadding(15),
left: SizeConfig.getPadding(15),
bottom: SizeConfig.getPadding(20),
top: SizeConfig.getPadding(20),
top: SizeConfig.getPadding(10),
),
// color: Colors.blueGrey,
child: Column(
......@@ -229,9 +221,25 @@ class _ReviewShopPageState extends State<ReviewShopPage> {
Divider(
color: Color(0xFF606060),
),
Container(
color: Colors.deepPurpleAccent,
child: Row(
],
),
),
);
}
Widget list() {
return Card(
child: Container(
// color: Colors.deepPurpleAccent,
margin: EdgeInsets.only(
right: SizeConfig.getPadding(20),
left: SizeConfig.getPadding(20),
top: SizeConfig.getPadding(10),
bottom: SizeConfig.getPadding(10),
),
child: Column(
children: <Widget>[
Row(
children: <Widget>[
ClipRRect(
borderRadius: BorderRadius.circular(50),
......@@ -247,7 +255,7 @@ class _ReviewShopPageState extends State<ReviewShopPage> {
),
Expanded(
child: Container(
color: Colors.green,
// color: Colors.green,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
......@@ -295,70 +303,89 @@ class _ReviewShopPageState extends State<ReviewShopPage> {
),
],
),
),
Container(
color: Colors.blue,
child: Column(
children: <Widget>[
Padding(
padding: const EdgeInsets.only(
top: 10, bottom: 10, left: 2, right: 2),
child: Text(
'การบริการและบรรยากาศดีมาก มีห้องอาบน้ำพร้อมผ้าเช็ดตัว สบู่ ครีมสระผม พนักงานดูแลเอาใจใส่ และคอยแนะนำตลอดจนถึง therapist มีความเป็นมืออาชีพให้ความผ่อนคลายแก่ลูกค้า',
style: TextStyle(
fontSize: SizeConfig.getFontSize(12),
),
),
),
Row(
children: <Widget>[
RaisedButton(
color: Color(0xFF3694A3),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(20),
),
onPressed: () {},
child: Text(
"บริการดีมาก",
style: TextStyle(
color: Colors.white,
),
Container(
// color: Colors.blue,
child: Column(
children: <Widget>[
Padding(
padding: const EdgeInsets.only(
top: 10, bottom: 10, left: 2, right: 2),
child: Text(
'การบริการและบรรยากาศดีมาก มีห้องอาบน้ำพร้อมผ้าเช็ดตัว สบู่ ครีมสระผม พนักงานดูแลเอาใจใส่ และคอยแนะนำตลอดจนถึง therapist มีความเป็นมืออาชีพให้ความผ่อนคลายแก่ลูกค้า',
style: TextStyle(
fontSize: SizeConfig.getFontSize(12),
),
),
SizedBox(
width: SizeConfig.getWidth(14),
),
RaisedButton(
color: Color(0xFF3694A3),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(20),
),
onPressed: () {},
child: Padding(
padding: const EdgeInsets.only(
right: 10,
left: 10,
),
Row(
children: <Widget>[
RaisedButton(
color: Color(0xFF3694A3),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(20),
),
onPressed: () {},
child: Text(
"คุ้มค่าดี",
"บริการดีมาก",
style: TextStyle(
color: Colors.white,
),
),
),
),
],
),
SizedBox(
height: SizeConfig.getHeight(10),
),
],
SizedBox(
width: SizeConfig.getWidth(14),
),
RaisedButton(
color: Color(0xFF3694A3),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(20),
),
onPressed: () {},
child: Padding(
padding: const EdgeInsets.only(
right: 10,
left: 10,
),
child: Text(
"คุ้มค่าดี",
style: TextStyle(
color: Colors.white,
),
),
),
),
],
),
SizedBox(
height: SizeConfig.getHeight(10),
),
],
),
),
],
)),
);
}
Widget texttop() {
return Container(
margin: EdgeInsets.only(
right: SizeConfig.getPadding(16),
left: SizeConfig.getPadding(16),
top: SizeConfig.getPadding(15),
bottom: SizeConfig.getPadding(5)),
child: Row(
children: <Widget>[
Text(
'รีวิว(จากผู้ใช้บริการจริง)',
style: TextStyle(
color: Color(0xFF6AB3AA),
fontSize: SizeConfig.getFontSize(14),
),
],
),
),
Spacer(),
],
),
);
}
}
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