Skip to content

Improvements/login signup #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 24, 2021
Merged

Improvements/login signup #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fea02a
add widgets to the scope of signup state
Grrom Aug 23, 2021
e9ee752
make signUpHere private and move it inside LoginScreenState
Grrom Aug 23, 2021
48a17e5
use MLText instead of Text
Grrom Aug 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions lib/form/ml_form.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:memory_lamp/defaults/ml_text.dart';
import 'package:memory_lamp/helpers/size_mq.dart';
import 'package:memory_lamp/theming/ml_colors.dart';

Expand Down Expand Up @@ -89,18 +90,16 @@ class _MLFormState extends State<MLForm> {
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
MLText(
"I agree with the ",
style: TextStyle(
color: Colors.white,
fontSize: getProportionateScreenWidth(7)),
color: Colors.white,
fontSize: getProportionateScreenWidth(7),
),
Text(
MLText(
"Terms and Conditions",
style: TextStyle(
decoration: TextDecoration.underline,
color: Colors.white,
fontSize: getProportionateScreenWidth(7)),
textDecoration: TextDecoration.underline,
color: Colors.white,
fontSize: getProportionateScreenWidth(7),
),
],
)
Expand All @@ -123,10 +122,10 @@ class _MLFormState extends State<MLForm> {
}),
data: ThemeData(unselectedWidgetColor: Colors.white38),
),
Text(
MLText(
"Remember Me ",
style: TextStyle(
color: Colors.white, fontSize: getProportionateScreenWidth(7)),
color: Colors.white,
fontSize: getProportionateScreenWidth(7),
),
],
);
Expand All @@ -144,8 +143,9 @@ class _MLFormState extends State<MLForm> {
focusedBorder: UnderlineInputBorder(
borderSide: BorderSide(color: Colors.white),
),
enabledBorder:
UnderlineInputBorder(borderSide: BorderSide(color: Colors.white)),
enabledBorder: UnderlineInputBorder(
borderSide: BorderSide(color: Colors.white),
),
);
}
}
Expand Down
19 changes: 7 additions & 12 deletions lib/screens/login.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class _LoginScreenState extends State<LoginScreen> {
),
_loginButton(),
SizedBox(width: SizeMQ.height! * .03),
SignUpHere(),
_signUpHere(context),
],
),
),
Expand All @@ -53,7 +53,7 @@ class _LoginScreenState extends State<LoginScreen> {
children: [
Align(
alignment: Alignment.topLeft,
child: Text(
child: MLText(
"Welcome Back! ",
style: TextStyle(
color: Colors.white,
Expand All @@ -65,33 +65,28 @@ class _LoginScreenState extends State<LoginScreen> {
),
Align(
alignment: Alignment.topLeft,
child: Text(
child: MLText(
'Log in to continue',
style: (TextStyle(
color: Colors.white54,
)),
color: Colors.white54,
),
),
],
);

//LoginButton
MLElevatedButton _loginButton() => MLElevatedButton(
child: Text(
child: MLText(
'Log in',
style: TextStyle(color: MLColors.primary),
color: MLColors.primary,
),
color: Colors.white,
onPressed: () {
print('Login');
},
);
}

//SignUp
class SignUpHere extends StatelessWidget {
@override
Widget build(BuildContext context) {
Row _signUpHere(BuildContext context) {
return Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Expand Down
46 changes: 21 additions & 25 deletions lib/screens/signup.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,46 +32,42 @@ class _SignupScreenState extends State<SignupScreen> {
loadForSignup: true,
),
MLElevatedButton(
color: Colors.white,
child: Text(
'Create Account',
style: TextStyle(color: MLColors.primary),
),
onPressed: () {}),
AlreadyUser(),
color: Colors.white,
child: MLText(
'Create Account',
style: TextStyle(color: MLColors.primary),
),
onPressed: () {},
),
_alreadyUser(context),
],
),
),
),
),
);
}
}

//Message
Column _welcome() => Column(
mainAxisSize: MainAxisSize.max,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Text(
"Hello!",
style: TextStyle(
Column _welcome() => Column(
mainAxisSize: MainAxisSize.max,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
MLText(
"Hello!",
color: Colors.white,
fontSize: getProportionateScreenWidth(14),
fontWeight: FontWeight.bold,
),
),
MLText(
'Create a new Account',
color: Colors.white54,
),
],
);
MLText(
'Create a new Account',
color: Colors.white54,
),
],
);

//SignIn
class AlreadyUser extends StatelessWidget {
@override
Widget build(BuildContext context) {
Row _alreadyUser(BuildContext context) {
return Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Expand Down