Skip to content
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.

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

chore: revise the signup with phone number screen to match the design #170

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion lib/l10n/arb/app_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"@signInPasswordFieldLabel": {
"description": "This is the label displayed on the sign in screen for the Password field"
},
"signInPhoneNumberFieldLabel": "Phone Number",
"signInPhoneNumberFieldLabel": "Phone number",
"@signInPhoneNumberFieldLabel": {
"description": "This is the label displayed on the sign in screen for the Phone number field"
},
Expand Down
3 changes: 3 additions & 0 deletions lib/sign_in/view/widgets/phone_number_input.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ class PhoneNumberInput extends StatelessWidget {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
height: cts.maxHeight * .045,
),
Text(
l10n.signInPhoneNumberFieldLabel,
style: style.titleSmall,
Expand Down
149 changes: 73 additions & 76 deletions lib/sign_up/view/signup_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -212,95 +212,92 @@ class _SignUpBodyState extends State<SignUpBody>
],
),
),
SingleChildScrollView(
child: Column(
mainAxisAlignment:
MainAxisAlignment.center,
children: [
SizedBox(
height: box.maxHeight * .12,
),
PhoneNumberInput(
key: Key('IntlPhoneInput'),
l10n: l10n,
cts: box,
),
],
),

PhoneNumberInput(
key: Key('IntlPhoneInput'),
l10n: l10n,
cts: box,
),
],
),
),
),
FpbButton(
label: l10n.signInSignUpLabel,
onTap: () {},
),
Padding(
padding: EdgeInsets.symmetric(
vertical: box.maxHeight * 0.012,
),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
Expanded(
child: Column(
mainAxisSize: MainAxisSize.max,
children: [
Expanded(
child: Divider(
key: Key('Divider'),
color:
theme.colorScheme.outlineVariant,
)),
Padding(
padding: EdgeInsets.symmetric(
horizontal: box.maxHeight * .015,
),
child: Text(
key: Key('OrSignUpWith'),
l10n.signUpOrSignupWithText,
),
),
Expanded(
child: Divider(
key: Key('Divider'),
color:
theme.colorScheme.outlineVariant,
))
],
FpbButton(
label: l10n.signInSignUpLabel,
onTap: () {},
),
),
AlternativeAuth(box: box),
Padding(
padding: EdgeInsets.only(
top: box.maxHeight * 0.001,
bottom: box.maxHeight * 0.0001,
Padding(
padding: EdgeInsets.symmetric(
vertical: box.maxHeight * 0.012,
),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
children: [
Expanded(
child: Divider(
key: Key('Divider'),
color:
theme.colorScheme.outlineVariant,
)),
Padding(
padding: EdgeInsets.symmetric(
horizontal: box.maxHeight * .015,
),
child: Text(
key: Key('OrSignUpWith'),
l10n.signUpOrSignupWithText,
),
),
Expanded(
child: Divider(
key: Key('Divider'),
color:
theme.colorScheme.outlineVariant,
))
],
),
),
child: Row(
mainAxisAlignment:
MainAxisAlignment.center,
children: [
Text(
l10n.signUpAlreadyAMemberText,
key: Key('AlreadyAMember'),
style: style.titleSmall?.copyWith(
color: theme.colorScheme.secondary,
fontWeight: FontWeight.w400,
AlternativeAuth(box: box),
Padding(
padding: EdgeInsets.only(
top: box.maxHeight * 0.001,
bottom: box.maxHeight * 0.0001,
),
child: Row(
mainAxisAlignment:
MainAxisAlignment.center,
children: [
Text(
l10n.signUpAlreadyAMemberText,
key: Key('AlreadyAMember'),
style: style.titleSmall?.copyWith(
color: theme.colorScheme.secondary,
fontWeight: FontWeight.w400,
),
),
),
TextButton(
onPressed: () {
context.router.pop();
},
child: Text(
l10n.signInLogInTitle,
style: style.titleMedium?.copyWith(
color: theme.colorScheme.primary,
fontWeight: FontWeight.bold,
TextButton(
onPressed: () {
context.router.pop();
},
child: Text(
l10n.signInLogInTitle,
style: style.titleMedium?.copyWith(
color: theme.colorScheme.primary,
fontWeight: FontWeight.bold,
),
),
),
),
],
],
),
),
],),
),
tabController.index == 1 ? SizedBox(height: box.maxHeight * 0.15 ,) : SizedBox(),
],
).card(
height:
Expand Down