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.

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

Jump to bottom

TextFormField separator removal #170

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

TextFormField separator removal #170

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76ae8d5
TextFormField separator removal
RohanSengupta326 Oct 13, 2022
716db1d
1. UI changes in auth_screen.dart 2. removed debug.keystore 3. revert…
RohanSengupta326 Oct 18, 2022
dfbe879
Merge branch 'CCExtractor:main' into rohan
RohanSengupta326 Oct 18, 2022
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
Binary file added debug.keystore
View file
Open in desktop
Binary file not shown.
61 changes: 56 additions & 5 deletions lib/views/auth_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ class _AuthScreenState extends State<AuthScreen>
padding: EdgeInsets.symmetric(
horizontal: 10, vertical: 10.0),
child: TextFormField(
cursorColor: hintColor,
autovalidateMode: model.loginValidate,
focusNode: model.emailLogin,
controller: model.loginEmailController,
Expand All @@ -228,7 +229,17 @@ class _AuthScreenState extends State<AuthScreen>
keyboardType: TextInputType.emailAddress,
style: TextStyle(fontSize: 16.0, color: Colors.black),
decoration: InputDecoration(
border: InputBorder.none,
enabledBorder: UnderlineInputBorder(
borderSide: BorderSide(
color: hintColor,
),
),
focusedBorder: UnderlineInputBorder(
borderSide: BorderSide(
color: hintColor,
),
),
focusColor: hintColor,
icon: Icon(
Icons.mail_outline,
color: Colors.black,
Expand All @@ -240,12 +251,12 @@ class _AuthScreenState extends State<AuthScreen>
),
),
),
separator(),
Container(
height: 13.h,
padding: EdgeInsets.symmetric(
horizontal: 10, vertical: 10.0),
child: TextFormField(
cursorColor: hintColor,
autovalidateMode: model.loginValidate,
focusNode: model.passwordLogin,
controller: model.loginPasswordController,
Expand All @@ -254,7 +265,16 @@ class _AuthScreenState extends State<AuthScreen>
Validator.validatePassword(value),
style: TextStyle(fontSize: 16.0, color: Colors.black),
decoration: InputDecoration(
border: InputBorder.none,
enabledBorder: UnderlineInputBorder(
borderSide: BorderSide(
color: hintColor,
),
),
focusedBorder: UnderlineInputBorder(
borderSide: BorderSide(
color: hintColor,
),
),
icon: Icon(
Icons.lock,
size: 24.0,
Expand Down Expand Up @@ -334,6 +354,7 @@ class _AuthScreenState extends State<AuthScreen>
padding: EdgeInsets.symmetric(
horizontal: 10, vertical: 10.0),
child: TextFormField(
cursorColor: hintColor,
autovalidateMode: model.signupValidate,
validator: (value) => Validator.validateName(value),
focusNode: model.name,
Expand All @@ -343,6 +364,16 @@ class _AuthScreenState extends State<AuthScreen>
textCapitalization: TextCapitalization.words,
style: TextStyle(fontSize: 18.0, color: Colors.black),
decoration: InputDecoration(
enabledBorder: UnderlineInputBorder(
borderSide: BorderSide(
color: hintColor,
),
),
focusedBorder: UnderlineInputBorder(
borderSide: BorderSide(
color: hintColor,
),
),
border: InputBorder.none,
icon: Icon(
Icons.account_box,
Expand All @@ -355,12 +386,12 @@ class _AuthScreenState extends State<AuthScreen>
),
),
),
separator(),
Container(
height: 13.h,
padding: EdgeInsets.symmetric(
horizontal: 10, vertical: 10.0),
child: TextFormField(
cursorColor: hintColor,
autovalidateMode: model.signupValidate,
validator: (value) => Validator.validateEmail(value),
focusNode: model.email,
Expand All @@ -369,6 +400,16 @@ class _AuthScreenState extends State<AuthScreen>
keyboardType: TextInputType.emailAddress,
style: TextStyle(fontSize: 16.0, color: Colors.black),
decoration: InputDecoration(
enabledBorder: UnderlineInputBorder(
borderSide: BorderSide(
color: hintColor,
),
),
focusedBorder: UnderlineInputBorder(
borderSide: BorderSide(
color: hintColor,
),
),
border: InputBorder.none,
icon: Icon(
Icons.mail,
Expand All @@ -381,12 +422,12 @@ class _AuthScreenState extends State<AuthScreen>
),
),
),
separator(),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think separator widget is being used anywhere now, can you please remove the widget (wherever it is declared) too

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure.

Container(
height: 13.h,
padding: EdgeInsets.symmetric(
horizontal: 10, vertical: 10.0),
child: TextFormField(
cursorColor: hintColor,
autovalidateMode: model.signupValidate,
focusNode: model.password,
textInputAction: TextInputAction.done,
Expand All @@ -396,6 +437,16 @@ class _AuthScreenState extends State<AuthScreen>
obscureText: model.obscureTextSignup,
style: TextStyle(fontSize: 16.0, color: Colors.black),
decoration: InputDecoration(
enabledBorder: UnderlineInputBorder(
borderSide: BorderSide(
color: hintColor,
),
),
focusedBorder: UnderlineInputBorder(
borderSide: BorderSide(
color: hintColor,
),
),
border: InputBorder.none,
icon: Icon(
Icons.lock,
Expand Down
35 changes: 14 additions & 21 deletions pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.8.2"
version: "2.9.0"
boolean_selector:
dependency: transitive
description:
Expand Down Expand Up @@ -105,14 +105,7 @@ packages:
name: characters
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.1"
version: "1.2.1"
checked_yaml:
dependency: transitive
description:
Expand All @@ -126,7 +119,7 @@ packages:
name: clock
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "1.1.1"
code_builder:
dependency: transitive
description:
Expand Down Expand Up @@ -252,7 +245,7 @@ packages:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "1.3.1"
ffi:
dependency: transitive
description:
Expand Down Expand Up @@ -647,21 +640,21 @@ packages:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.11"
version: "0.12.12"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.4"
version: "0.1.5"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.7.0"
version: "1.8.0"
mime:
dependency: transitive
description:
Expand Down Expand Up @@ -724,7 +717,7 @@ packages:
name: path
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.1"
version: "1.8.2"
path_provider:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1023,7 +1016,7 @@ packages:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.2"
version: "1.9.0"
stack_trace:
dependency: transitive
description:
Expand Down Expand Up @@ -1051,35 +1044,35 @@ packages:
name: string_scanner
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "1.1.1"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.2.1"
test:
dependency: "direct dev"
description:
name: test
url: "https://pub.dartlang.org"
source: hosted
version: "1.21.1"
version: "1.21.4"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.9"
version: "0.4.12"
test_core:
dependency: transitive
description:
name: test_core
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.13"
version: "0.4.16"
timezone:
dependency: transitive
description:
Expand Down