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

# Conflicts:
#	lib/ui/login/login.dart

lib/main.dart

 
+
 import 'package:feelverapp/ui/login/login.dart';
 import 'package:feelverapp/ui/shop/shop_main.dart';
+
 import 'package:flutter/material.dart';
-import 'ui/splashscreen/splash_screen_page.dart';
+
 
 void main() => runApp(MyApp());
 
@@ -15,13 +17,8 @@ class MyApp extends StatelessWidget {
       theme: ThemeData(
         primarySwatch: Colors.blue,
       ),
-//      home: AccountSettingPage(),
-
-//      home: OtherMenuPage(),
-    //home: ShopNearbyPlacesPage(),
-//      home: service_tab(),
-
-    home: SplashScreenPage(),
+      home: MainShop(),
+//    home: SplashScreenPage(),
     );
   }
 }

lib/ui/login/login.dart

@@ -64,7 +64,7 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
             ),
           ),
           SizedBox(
-            height: SizeConfig.getWidth(24),
+            height: SizeConfig.getHeight(24),
           ),
           TabBar(
             indicatorColor: Color.fromRGBO(106, 179, 170, 1),
@@ -84,11 +84,14 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
               Tab(
                 child: Text(
                   'เบอร์โทร',
-                  style: TextStyle(fontSize: SizeConfig.getFontSize(16)),
+                  style: TextStyle(
+                    fontSize: SizeConfig.getFontSize(16),
+                  ),
                 ),
               ),
             ],
           ),
+
           SizedBox(height: SizeConfig.getWidth(30)),
            Expanded(
                         child: new Container(
@@ -126,7 +129,9 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
           children: <Widget>[
             Container(
               alignment: Alignment.topLeft,
-              padding: EdgeInsets.only(left: SizeConfig.getPadding(30)),
+              padding: EdgeInsets.only(
+                left: SizeConfig.getPadding(30),
+              ),
               child: Text(
                 'อีเมล์',
                 style: TextStyle(
@@ -167,7 +172,9 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
             ),
             Container(
               alignment: Alignment.topLeft,
-              padding: EdgeInsets.only(left: SizeConfig.getPadding(30)),
+              padding: EdgeInsets.only(
+                left: SizeConfig.getPadding(30),
+              ),
               child: Text(
                 'รหัสผ่าน',
                 style: TextStyle(
@@ -183,8 +190,9 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
                   horizontal: SizeConfig.getPadding(24)),
               child: Card(
                 shape: RoundedRectangleBorder(
-                  borderRadius:
-                      BorderRadius.circular(SizeConfig.getPadding(50.0)),
+                  borderRadius: BorderRadius.circular(
+                    SizeConfig.getPadding(50.0),
+                  ),
                 ),
                 child: TextFormField(
                     controller: presenter.passCtrl,
@@ -314,11 +322,13 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
               ),
             ),
             SizedBox(
-              height: SizeConfig.getWidth(24),
+              height: SizeConfig.getHeight(24),
             ),
             Container(
               alignment: Alignment.topRight,
-              padding: EdgeInsets.only(right: SizeConfig.getPadding(30)),
+              padding: EdgeInsets.only(
+                right: SizeConfig.getPadding(30),
+              ),
               child: Text(
                 'ลืมรหัสผ่าน',
                 style: TextStyle(
@@ -331,7 +341,7 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
             _submitLoginButton(),
             _policyText(),
             SizedBox(
-              height: SizeConfig.getWidth(20),
+              height: SizeConfig.getHeight(20),
             ),
             _facebookLoginButton(),
           ],
@@ -346,12 +356,15 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
           vertical: SizeConfig.getPadding(20.0),
           horizontal: SizeConfig.getPadding(32)),
       child: Container(
-        height: SizeConfig.getWidth(55),
+        height: SizeConfig.getHeight(55),
         child: CupertinoButton(
           color: Color.fromRGBO(106, 179, 170, 1),
           padding: EdgeInsets.all(0),
-          borderRadius: BorderRadius.all(Radius.circular(50)),
+          borderRadius: BorderRadius.all(
+            Radius.circular(50),
+          ),
           onPressed: () {
+
     if (_tabController.index==0){
             presenter.letCheckData();}
             else{
@@ -381,14 +394,17 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
   Widget _facebookLoginButton() {
     return Padding(
       padding: EdgeInsets.symmetric(
-          vertical: SizeConfig.getPadding(16.0),
-          horizontal: SizeConfig.getPadding(32)),
+        vertical: SizeConfig.getPadding(16.0),
+        horizontal: SizeConfig.getPadding(32),
+      ),
       child: Container(
         decoration: BoxDecoration(
-          borderRadius: BorderRadius.circular(SizeConfig.getPadding(50)),
+          borderRadius: BorderRadius.circular(
+            SizeConfig.getPadding(50),
+          ),
           color: Color(0xff3b5998),
         ),
-        height: SizeConfig.getWidth(55),
+        height: SizeConfig.getHeight(55),
         child: CupertinoButton(
           color: Color(0xff3b5998),
           padding: EdgeInsets.all(0),
@@ -399,17 +415,28 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
               children: <Widget>[
                 Padding(
                   padding: EdgeInsets.symmetric(
-                      horizontal: SizeConfig.getPadding(8.0)),
+                    horizontal: SizeConfig.getPadding(8.0),
+                  ),
                   child: ImageIcon(
                     AssetImage('assets/images/facebook-icon.png'),
                     size: 20,
                   ),
                 ),
+<<<<<<< HEAD
                 // Text(
                 //   'Login with Facebook',
                 //   style: TextStyle(fontSize: SizeConfig.getFontSize(12)),
                 //   textAlign: TextAlign.center,
                 // ),
+=======
+                Text(
+                  'Login with Facebook',
+                  style: TextStyle(
+                    fontSize: SizeConfig.getFontSize(12),
+                  ),
+                  textAlign: TextAlign.center,
+                ),
+>>>>>>> bbd6fddd2ff413358ecc7117e9f4496df35def75
               ],
             ),
           ),

lib/ui/shop/shop.dart

@@ -251,7 +251,7 @@ class _ShopState extends State<Shop> {
         children: <Widget>[
           Container(
             color: Color.fromRGBO(69, 85, 79, 1),
-            height: SizeConfig.getHeight(270),
+            height: SizeConfig.getHeight(350),
             width: MediaQuery.of(context).size.width,
             
           ),
@@ -261,7 +261,7 @@ class _ShopState extends State<Shop> {
               alignment: Alignment.topCenter,
               child: Image.network(
                 'https://image.freepik.com/free-photo/girl-massage-spa-salon_110955-422.jpg',
-                height: SizeConfig.getHeight(300),
+                height: SizeConfig.getHeight(350),
                 width: MediaQuery.of(context).size.width,
                 fit: BoxFit.cover,
               ),
@@ -269,14 +269,14 @@ class _ShopState extends State<Shop> {
           ),Positioned(
             top: SizeConfig.getPadding(0),
             child: Container(
-                 height: SizeConfig.getHeight(300),
+                 height: SizeConfig.getHeight(350),
                 width: MediaQuery.of(context).size.width,
               alignment: Alignment.topCenter,
               color: Colors.deepOrangeAccent.withOpacity(0.4)
             ),
           ),
           Positioned(
-            top: SizeConfig.getPadding(150),
+            top: SizeConfig.getPadding(170),
             right: SizeConfig.getPadding(40),
             child: Container(
               child: Text(
@@ -286,8 +286,8 @@ class _ShopState extends State<Shop> {
             ),
           ),
           Positioned(
-            top: SizeConfig.getPadding(150),
-            left: SizeConfig.getPadding(20),
+            top: SizeConfig.getPadding(172),
+            left: SizeConfig.getPadding(10),
             child: InkWell(
 //                onTap: () {
 //                  Navigator.push(
@@ -306,8 +306,8 @@ class _ShopState extends State<Shop> {
             ),
           ),
           Positioned(
-            top: SizeConfig.getPadding(200),
-            left: SizeConfig.getPadding(100),
+            top: SizeConfig.getPadding(220),
+            left: SizeConfig.getPadding(90),
             child: Container(
               padding: EdgeInsets.only(left: 5),
               child: Row(
@@ -316,7 +316,7 @@ class _ShopState extends State<Shop> {
                     children: <Widget>[
                       SizedBox(
                           width: 90.0,
-                          height: 30.0,
+                          height: 35.0,
                           child: FlatButton(
                             color: Color.fromRGBO(106, 179, 170, 1),
                             textColor: Colors.white,