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

# Conflicts:
#	lib/ui/shop/shop_list_detail.dart

lib/main.dart

@@ -33,7 +33,7 @@ class MyApp extends StatelessWidget {
       ),
 
 
- home: HomePage()
+ home: SplashScreenPage()
 
 
 

lib/ui/home/home_presenter.dart

@@ -92,7 +92,7 @@ class HomePresenter extends BasePresenter<HomePage> {
       setState(() {
         getmodel = res.success;
       });
-      // print("Hii" + getmodel.result[0].name);
+      print("Hii" + getmodel.result[0].name);
     } else {
       Alert(
           style: AlertStyle(

lib/ui/shop/shop_list_detail.dart

@@ -16,7 +16,7 @@ class ShopListDetail extends StatefulWidget {
 }
 
 class _ShopListDetailState extends State<ShopListDetail> {
-
+   bool fav=false;
   ShoplistdetailPresenter presenter;
 
   @override
@@ -137,12 +137,41 @@ class _ShopListDetailState extends State<ShopListDetail> {
        Positioned(
                   right: SizeConfig.getPadding(16),
                   top: SizeConfig.getPadding(16),
-                  child: ImageIcon(
+                  child: InkResponse(
+                    highlightShape: BoxShape.circle,
+                        highlightColor: Color(0xFFDD175F),
+                        focusColor:Color(0xFFDD175F),
+                    splashColor: Color(0xFFDD175F),
+  onTap: () {   
+    print("add fav");
+    
+    
+    setState(() {
+     fav?fav=false:fav=true;
+    });
+    showDialog(
+                      context: context,
+                      builder: (context) {
+                        Future.delayed(Duration(seconds: 1), () {
+                          Navigator.of(context).pop(true);
+                        });
+                        return AlertDialog(
+                         content:ImageIcon(
                     AssetImage('assets/images/ic_fav_list.png'),
-                    color: Colors.white,
+                    color:fav?Color(0xFFDD175F): Colors.grey,
+                    size: SizeConfig.getFontSize(30),
+                  ) ,
+                          title:Center(child: Text('บันทึกสำเร็จ')),
+                        );
+                      });
+     
+  },
+  child:ImageIcon(
+                    AssetImage('assets/images/ic_fav_list.png'),
+                    color:fav?Color(0xFFDD175F): Colors.white,
                     size: SizeConfig.getFontSize(30),
                   ),
-                ),
+                ),),
                 Positioned(
                   left: SizeConfig.getPadding(16),
                   top: SizeConfig.getPadding(165),
@@ -417,6 +446,10 @@ class _ShopListDetailState extends State<ShopListDetail> {
            minWidth:MediaQuery.of(context).size.width - 50,
   height: 55,
 
+
+
+       
+
         color: Color(0xff3694A3),
           child: