Skip to content

F
feelver
Commit 85b4b8fa by art
Options

update

parent 11909f6d
Showing with 53 additions and 35 deletions
lib/main.dart
import 'package:feelverapp/ui/nearme/near_me_list.dart';
import 'package:feelverapp/ui/shop/shop_main.dart'; import 'package:feelverapp/ui/shop/shop_main.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'ui/splashscreen/splash_screen_page.dart';
void main() => runApp(MyApp()); void main() => runApp(MyApp());
...@@ -14,13 +16,8 @@ class MyApp extends StatelessWidget { ...@@ -14,13 +16,8 @@ class MyApp extends StatelessWidget {
theme: ThemeData( theme: ThemeData(
primarySwatch: Colors.blue, primarySwatch: Colors.blue,
), ),
// home: AccountSettingPage(), home: MainShop(),
// home: SplashScreenPage(),
// home: OtherMenuPage(),
//home: ShopNearbyPlacesPage(),
// home: service_tab(),
home: SplashScreenPage(),
); );
} }
} }
lib/ui/login/login.dart
...@@ -45,7 +45,7 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin { ...@@ -45,7 +45,7 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
), ),
), ),
SizedBox( SizedBox(
height: SizeConfig.getWidth(24), height: SizeConfig.getHeight(24),
), ),
TabBar( TabBar(
indicatorColor: Color.fromRGBO(106, 179, 170, 1), indicatorColor: Color.fromRGBO(106, 179, 170, 1),
...@@ -65,12 +65,16 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin { ...@@ -65,12 +65,16 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
Tab( Tab(
child: Text( child: Text(
'เบอร์โทร', 'เบอร์โทร',
style: TextStyle(fontSize: SizeConfig.getFontSize(16)), style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
),
), ),
), ),
], ],
), ),
SizedBox(height: SizeConfig.getWidth(30)), SizedBox(
height: SizeConfig.getHeight(30),
),
_formLogin(), _formLogin(),
], ],
), ),
...@@ -84,7 +88,9 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin { ...@@ -84,7 +88,9 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
children: <Widget>[ children: <Widget>[
Container( Container(
alignment: Alignment.topLeft, alignment: Alignment.topLeft,
padding: EdgeInsets.only(left: SizeConfig.getPadding(30)), padding: EdgeInsets.only(
left: SizeConfig.getPadding(30),
),
child: Text( child: Text(
'อีเมล์', 'อีเมล์',
style: TextStyle( style: TextStyle(
...@@ -125,7 +131,9 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin { ...@@ -125,7 +131,9 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
), ),
Container( Container(
alignment: Alignment.topLeft, alignment: Alignment.topLeft,
padding: EdgeInsets.only(left: SizeConfig.getPadding(30)), padding: EdgeInsets.only(
left: SizeConfig.getPadding(30),
),
child: Text( child: Text(
'รหัสผ่าน', 'รหัสผ่าน',
style: TextStyle( style: TextStyle(
...@@ -141,8 +149,9 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin { ...@@ -141,8 +149,9 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
horizontal: SizeConfig.getPadding(24)), horizontal: SizeConfig.getPadding(24)),
child: Card( child: Card(
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: borderRadius: BorderRadius.circular(
BorderRadius.circular(SizeConfig.getPadding(50.0)), SizeConfig.getPadding(50.0),
),
), ),
child: TextFormField( child: TextFormField(
// controller: loginBloc.passCtrl, // controller: loginBloc.passCtrl,
...@@ -161,11 +170,13 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin { ...@@ -161,11 +170,13 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
), ),
), ),
SizedBox( SizedBox(
height: SizeConfig.getWidth(24), height: SizeConfig.getHeight(24),
), ),
Container( Container(
alignment: Alignment.topRight, alignment: Alignment.topRight,
padding: EdgeInsets.only(right: SizeConfig.getPadding(30)), padding: EdgeInsets.only(
right: SizeConfig.getPadding(30),
),
child: Text( child: Text(
'ลืมรหัสผ่าน', 'ลืมรหัสผ่าน',
style: TextStyle( style: TextStyle(
...@@ -178,7 +189,7 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin { ...@@ -178,7 +189,7 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
_submitLoginButton(), _submitLoginButton(),
_policyText(), _policyText(),
SizedBox( SizedBox(
height: SizeConfig.getWidth(20), height: SizeConfig.getHeight(20),
), ),
_facebookLoginButton(), _facebookLoginButton(),
], ],
...@@ -193,15 +204,19 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin { ...@@ -193,15 +204,19 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
vertical: SizeConfig.getPadding(20.0), vertical: SizeConfig.getPadding(20.0),
horizontal: SizeConfig.getPadding(32)), horizontal: SizeConfig.getPadding(32)),
child: Container( child: Container(
height: SizeConfig.getWidth(55), height: SizeConfig.getHeight(55),
child: CupertinoButton( child: CupertinoButton(
color: Color.fromRGBO(106, 179, 170, 1), color: Color.fromRGBO(106, 179, 170, 1),
padding: EdgeInsets.all(0), padding: EdgeInsets.all(0),
borderRadius: BorderRadius.all(Radius.circular(50)), borderRadius: BorderRadius.all(
Radius.circular(50),
),
onPressed: () { onPressed: () {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => HomePage()), MaterialPageRoute(
builder: (context) => HomePage(),
),
); );
// if (loginBloc.formKey.currentState.validate()) { // if (loginBloc.formKey.currentState.validate()) {
// loginBloc.getLogin(); // loginBloc.getLogin();
...@@ -222,13 +237,16 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin { ...@@ -222,13 +237,16 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
return Padding( return Padding(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
vertical: SizeConfig.getPadding(16.0), vertical: SizeConfig.getPadding(16.0),
horizontal: SizeConfig.getPadding(32)), horizontal: SizeConfig.getPadding(32),
),
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(SizeConfig.getPadding(50)), borderRadius: BorderRadius.circular(
SizeConfig.getPadding(50),
),
color: Color(0xff3b5998), color: Color(0xff3b5998),
), ),
height: SizeConfig.getWidth(55), height: SizeConfig.getHeight(55),
child: CupertinoButton( child: CupertinoButton(
color: Color(0xff3b5998), color: Color(0xff3b5998),
padding: EdgeInsets.all(0), padding: EdgeInsets.all(0),
...@@ -239,7 +257,8 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin { ...@@ -239,7 +257,8 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: SizeConfig.getPadding(8.0)), horizontal: SizeConfig.getPadding(8.0),
),
child: ImageIcon( child: ImageIcon(
AssetImage('assets/images/facebook-icon.png'), AssetImage('assets/images/facebook-icon.png'),
size: 20, size: 20,
...@@ -247,7 +266,9 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin { ...@@ -247,7 +266,9 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
), ),
Text( Text(
'Login with Facebook', 'Login with Facebook',
style: TextStyle(fontSize: SizeConfig.getFontSize(12)), style: TextStyle(
fontSize: SizeConfig.getFontSize(12),
),
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
], ],
......
lib/ui/shop/shop.dart
...@@ -251,7 +251,7 @@ class _ShopState extends State<Shop> { ...@@ -251,7 +251,7 @@ class _ShopState extends State<Shop> {
children: <Widget>[ children: <Widget>[
Container( Container(
color: Color.fromRGBO(69, 85, 79, 1), color: Color.fromRGBO(69, 85, 79, 1),
height: SizeConfig.getHeight(270), height: SizeConfig.getHeight(350),
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
), ),
...@@ -261,7 +261,7 @@ class _ShopState extends State<Shop> { ...@@ -261,7 +261,7 @@ class _ShopState extends State<Shop> {
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
child: Image.network( child: Image.network(
'https://image.freepik.com/free-photo/girl-massage-spa-salon_110955-422.jpg', '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, width: MediaQuery.of(context).size.width,
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
...@@ -269,14 +269,14 @@ class _ShopState extends State<Shop> { ...@@ -269,14 +269,14 @@ class _ShopState extends State<Shop> {
),Positioned( ),Positioned(
top: SizeConfig.getPadding(0), top: SizeConfig.getPadding(0),
child: Container( child: Container(
height: SizeConfig.getHeight(300), height: SizeConfig.getHeight(350),
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
color: Colors.deepOrangeAccent.withOpacity(0.4) color: Colors.deepOrangeAccent.withOpacity(0.4)
), ),
), ),
Positioned( Positioned(
top: SizeConfig.getPadding(150), top: SizeConfig.getPadding(170),
right: SizeConfig.getPadding(40), right: SizeConfig.getPadding(40),
child: Container( child: Container(
child: Text( child: Text(
...@@ -286,8 +286,8 @@ class _ShopState extends State<Shop> { ...@@ -286,8 +286,8 @@ class _ShopState extends State<Shop> {
), ),
), ),
Positioned( Positioned(
top: SizeConfig.getPadding(150), top: SizeConfig.getPadding(172),
left: SizeConfig.getPadding(20), left: SizeConfig.getPadding(10),
child: InkWell( child: InkWell(
// onTap: () { // onTap: () {
// Navigator.push( // Navigator.push(
...@@ -306,8 +306,8 @@ class _ShopState extends State<Shop> { ...@@ -306,8 +306,8 @@ class _ShopState extends State<Shop> {
), ),
), ),
Positioned( Positioned(
top: SizeConfig.getPadding(200), top: SizeConfig.getPadding(220),
left: SizeConfig.getPadding(100), left: SizeConfig.getPadding(90),
child: Container( child: Container(
padding: EdgeInsets.only(left: 5), padding: EdgeInsets.only(left: 5),
child: Row( child: Row(
...@@ -316,7 +316,7 @@ class _ShopState extends State<Shop> { ...@@ -316,7 +316,7 @@ class _ShopState extends State<Shop> {
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
width: 90.0, width: 90.0,
height: 30.0, height: 35.0,
child: FlatButton( child: FlatButton(
color: Color.fromRGBO(106, 179, 170, 1), color: Color.fromRGBO(106, 179, 170, 1),
textColor: Colors.white, textColor: Colors.white,
......
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