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

lib/ui/login/login.dart

@@ -76,6 +76,7 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
           ),
           SizedBox(height: SizeConfig.getWidth(30)),
           _formLogin(),
+          _phoneLogin(),
         ],
       ),
     );
@@ -191,6 +192,116 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
     );
   }
 
+  Widget _phoneLogin() {
+    return Container(
+      child: Form(
+        child: Column(
+          children: <Widget>[
+            Container(
+              alignment: Alignment.topLeft,
+              padding: EdgeInsets.only(left: SizeConfig.getPadding(30)),
+              child: Text(
+                'เบอร์โทร',
+                style: TextStyle(
+                    color: Colors.black,
+                    fontSize: SizeConfig.getFontSize(20),
+                    fontFamily: "SF_Pro_Text",
+                    fontWeight: FontWeight.w500),
+              ),
+            ),
+            Padding(
+              padding: EdgeInsets.symmetric(
+                vertical: SizeConfig.getPadding(8.0),
+                horizontal: SizeConfig.getPadding(24),
+              ),
+              child: Card(
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(
+                    SizeConfig.getPadding(50.0),
+                  ),
+                ),
+                child: TextFormField(
+//                  controller: loginBloc.emailCtrl,
+//                  validator: loginBloc.validateField,
+                  decoration: InputDecoration(
+                    contentPadding: EdgeInsets.symmetric(
+                      vertical: SizeConfig.getPadding(20),
+                      horizontal: SizeConfig.getPadding(16),
+                    ),
+//                    hintText:
+//                    allTranslations.text(key2: 'email', key: 'login') +
+//                        ' / ' +
+//                        allTranslations.text(
+//                            key2: 'tel_number', key: 'register'),
+                    border: OutlineInputBorder(borderSide: BorderSide.none),
+                  ),
+                ),
+              ),
+            ),
+            Container(
+              alignment: Alignment.topLeft,
+              padding: EdgeInsets.only(left: SizeConfig.getPadding(30)),
+              child: Text(
+                'รหัสผ่าน',
+                style: TextStyle(
+                    color: Colors.black,
+                    fontSize: SizeConfig.getFontSize(20),
+                    fontFamily: "SF_Pro_Text",
+                    fontWeight: FontWeight.w500),
+              ),
+            ),
+            Padding(
+              padding: EdgeInsets.symmetric(
+                  vertical: SizeConfig.getPadding(8.0),
+                  horizontal: SizeConfig.getPadding(24)),
+              child: Card(
+                shape: RoundedRectangleBorder(
+                  borderRadius:
+                  BorderRadius.circular(SizeConfig.getPadding(50.0)),
+                ),
+                child: TextFormField(
+//                  controller: loginBloc.passCtrl,
+//                  validator: loginBloc.validateField,
+                  decoration: InputDecoration(
+                    contentPadding: EdgeInsets.symmetric(
+                      vertical: SizeConfig.getPadding(20),
+                      horizontal: SizeConfig.getPadding(16),
+                    ),
+//                    hintText:
+//                    allTranslations.text(key2: 'password', key: 'login'),
+                    border: OutlineInputBorder(borderSide: BorderSide.none),
+                  ),
+                  obscureText: true,
+                ),
+              ),
+            ),
+            SizedBox(
+              height: SizeConfig.getWidth(24),
+            ),
+            Container(
+              alignment: Alignment.topRight,
+              padding: EdgeInsets.only(right: SizeConfig.getPadding(30)),
+              child: Text(
+                'ลืมรหัสผ่าน',
+                style: TextStyle(
+                    color: Color.fromRGBO(106, 179, 170, 1),
+                    fontSize: SizeConfig.getFontSize(13),
+                    fontFamily: "SF_Pro_Text",
+                    fontWeight: FontWeight.w600),
+              ),
+            ),
+            _submitLoginButton(),
+            _policyText(),
+            SizedBox(
+              height: SizeConfig.getWidth(20),
+            ),
+            _facebookLoginButton(),
+          ],
+        ),
+      ),
+    );
+  }
+
   _submitLoginButton() {
     return Padding(
       padding: EdgeInsets.symmetric(