From 76ae8d58e6897c68d4cb18ed15c5c41dcc699ba1 Mon Sep 17 00:00:00 2001 From: Raj Sengupta Date: Thu, 13 Oct 2022 16:09:42 +0530 Subject: [PATCH 1/2] TextFormField separator removal --- debug.keystore | Bin 0 -> 2778 bytes lib/views/auth_screen.dart | 61 ++++++++++++++++++++++++++++++++++--- pubspec.lock | 35 +++++++++------------ 3 files changed, 70 insertions(+), 26 deletions(-) create mode 100644 debug.keystore diff --git a/debug.keystore b/debug.keystore new file mode 100644 index 0000000000000000000000000000000000000000..98c3c349986ed0f5d94eb6215393819a36789bb3 GIT binary patch literal 2778 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 padding: EdgeInsets.symmetric( horizontal: 10, vertical: 10.0), child: TextFormField( + cursorColor: hintColor, autovalidateMode: model.loginValidate, focusNode: model.emailLogin, controller: model.loginEmailController, @@ -228,7 +229,17 @@ class _AuthScreenState extends State 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, @@ -240,12 +251,12 @@ class _AuthScreenState extends State ), ), ), - 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, @@ -254,7 +265,16 @@ class _AuthScreenState extends State 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, @@ -334,6 +354,7 @@ class _AuthScreenState extends State padding: EdgeInsets.symmetric( horizontal: 10, vertical: 10.0), child: TextFormField( + cursorColor: hintColor, autovalidateMode: model.signupValidate, validator: (value) => Validator.validateName(value), focusNode: model.name, @@ -343,6 +364,16 @@ class _AuthScreenState extends State 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, @@ -355,12 +386,12 @@ class _AuthScreenState extends State ), ), ), - 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, @@ -369,6 +400,16 @@ class _AuthScreenState extends State 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, @@ -381,12 +422,12 @@ class _AuthScreenState extends State ), ), ), - separator(), 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, @@ -396,6 +437,16 @@ class _AuthScreenState extends State 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, diff --git a/pubspec.lock b/pubspec.lock index b5fc2c8a..7ea1152c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: From 716db1de8aa82a453a8838ca505dddc6f3f51f08 Mon Sep 17 00:00:00 2001 From: Raj Sengupta Date: Tue, 18 Oct 2022 13:30:21 +0530 Subject: [PATCH 2/2] 1. UI changes in auth_screen.dart 2. removed debug.keystore 3. revert changes in pubspec.lock --- debug.keystore | Bin 2778 -> 0 bytes lib/views/auth_screen.dart | 440 +++++++++++++++++++++---------------- pubspec.lock | 35 +-- 3 files changed, 269 insertions(+), 206 deletions(-) delete mode 100644 debug.keystore diff --git a/debug.keystore b/debug.keystore deleted file mode 100644 index 98c3c349986ed0f5d94eb6215393819a36789bb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2778 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 autovalidateMode: model.loginValidate, child: Container( width: screensize.width - 70, - child: Column( - children: [ - Container( - height: 13.h, - padding: EdgeInsets.symmetric( - horizontal: 10, vertical: 10.0), - child: TextFormField( - cursorColor: hintColor, - autovalidateMode: model.loginValidate, - focusNode: model.emailLogin, - controller: model.loginEmailController, - validator: (value) => - Validator.validateEmail(value.trimRight()), - 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, + child: Container( + margin: EdgeInsets.only(left: 30), + child: Column( + children: [ + Align( + alignment: Alignment.topLeft, + child: FractionallySizedBox( + widthFactor: 0.8, + child: Container( + height: 13.h, + padding: EdgeInsets.symmetric( + horizontal: 10, vertical: 10.0), + child: TextFormField( + cursorColor: hintColor, + autovalidateMode: model.loginValidate, + focusNode: model.emailLogin, + controller: model.loginEmailController, + validator: (value) => + Validator.validateEmail(value.trimRight()), + 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, + ), + ), + focusColor: hintColor, + icon: Icon( + Icons.mail_outline, + color: Colors.black, + size: 24.0, + ), + hintText: "Email Address", + hintStyle: TextStyle( + fontSize: hintsize - 2, color: hintColor), + ), ), ), - focusColor: hintColor, - icon: Icon( - Icons.mail_outline, - color: Colors.black, - size: 24.0, - ), - hintText: "Email Address", - hintStyle: TextStyle( - fontSize: hintsize - 2, color: hintColor), ), ), - ), - 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, - obscureText: model.obscureTextLogin, - validator: (value) => - Validator.validatePassword(value), - style: TextStyle(fontSize: 16.0, color: Colors.black), - decoration: InputDecoration( - enabledBorder: UnderlineInputBorder( - borderSide: BorderSide( - color: hintColor, - ), - ), - focusedBorder: UnderlineInputBorder( - borderSide: BorderSide( - color: hintColor, + Row( + children: [ + Expanded( + child: Align( + alignment: Alignment.topLeft, + child: FractionallySizedBox( + widthFactor: 1, + child: 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, + obscureText: model.obscureTextLogin, + validator: (value) => + Validator.validatePassword(value), + style: TextStyle( + fontSize: 16.0, color: Colors.black), + decoration: InputDecoration( + enabledBorder: UnderlineInputBorder( + borderSide: BorderSide( + color: hintColor, + ), + ), + focusedBorder: UnderlineInputBorder( + borderSide: BorderSide( + color: hintColor, + ), + ), + icon: Icon( + Icons.lock, + size: 24.0, + color: Colors.black, + ), + hintText: "Password", + hintStyle: TextStyle( + fontSize: hintsize - 2, + color: hintColor), + ), + ), + ), + ), ), ), - icon: Icon( - Icons.lock, - size: 24.0, - color: Colors.black, - ), - hintText: "Password", - hintStyle: TextStyle( - fontSize: hintsize - 2, color: hintColor), - suffixIcon: IconButton( - onPressed: () => model.displayPasswordLogin(), - icon: Icon( - model.obscureTextLogin - ? Icons.visibility - : Icons.visibility_off, - size: 20.0, - color: Colors.black, + Container( + margin: EdgeInsets.only(bottom: 33), + child: IconButton( + onPressed: () => model.displayPasswordLogin(), + icon: Icon( + model.obscureTextLogin + ? Icons.visibility + : Icons.visibility_off, + size: 20.0, + color: Colors.black, + ), ), ), - ), + ], ), - ), - ], + ], + ), ), ), ), @@ -348,128 +375,165 @@ class _AuthScreenState extends State child: Container( width: screensize.width - 70, // height: 280.0, - child: Column(children: [ - Container( - height: 13.h, - padding: EdgeInsets.symmetric( - horizontal: 10, vertical: 10.0), - child: TextFormField( - cursorColor: hintColor, - autovalidateMode: model.signupValidate, - validator: (value) => Validator.validateName(value), - focusNode: model.name, - textInputAction: TextInputAction.next, - controller: model.signupNameController, - keyboardType: TextInputType.text, - 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, + child: Container( + margin: EdgeInsets.only(left: 30), + child: Column(children: [ + Align( + alignment: Alignment.topLeft, + child: FractionallySizedBox( + widthFactor: 0.8, + child: Container( + height: 13.h, + padding: EdgeInsets.symmetric( + horizontal: 10, vertical: 10.0), + child: TextFormField( + cursorColor: hintColor, + autovalidateMode: model.signupValidate, + validator: (value) => + Validator.validateName(value), + focusNode: model.name, + textInputAction: TextInputAction.next, + controller: model.signupNameController, + keyboardType: TextInputType.text, + 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, + color: Colors.black, + size: 24, + ), + hintText: "Name", + hintStyle: TextStyle( + fontSize: hintsize - 2, color: hintColor), + ), ), ), - border: InputBorder.none, - icon: Icon( - Icons.account_box, - color: Colors.black, - size: 24, - ), - hintText: "Name", - hintStyle: TextStyle( - fontSize: hintsize - 2, color: hintColor), ), ), - ), - 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, - textInputAction: TextInputAction.next, - controller: model.signupEmailController, - 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, + Align( + alignment: Alignment.topLeft, + child: FractionallySizedBox( + widthFactor: 0.8, + child: 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, + textInputAction: TextInputAction.next, + controller: model.signupEmailController, + 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, + color: Colors.black, + size: 24, + ), + hintText: "Email Address", + hintStyle: TextStyle( + fontSize: hintsize - 2, color: hintColor), + ), ), ), - border: InputBorder.none, - icon: Icon( - Icons.mail, - color: Colors.black, - size: 24, - ), - hintText: "Email Address", - hintStyle: TextStyle( - fontSize: hintsize - 2, color: hintColor), ), ), - ), - 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, - validator: (value) => - Validator.validatePassword(value), - controller: model.signupPasswordController, - 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, + Row( + children: [ + Expanded( + child: Align( + alignment: Alignment.topLeft, + child: FractionallySizedBox( + widthFactor: 1, + child: 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, + validator: (value) => + Validator.validatePassword(value), + controller: + model.signupPasswordController, + 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, + color: Colors.black, + size: 24, + ), + hintText: "Password", + hintStyle: TextStyle( + fontSize: hintsize - 2, + color: hintColor), + ), + ), + ), + ), ), ), - border: InputBorder.none, - icon: Icon( - Icons.lock, - color: Colors.black, - size: 24, - ), - suffixIcon: IconButton( - onPressed: () => model.displayPasswordSignup(), - icon: Icon( - model.obscureTextSignup - ? Icons.visibility - : Icons.visibility_off, - size: 20.0, - color: Colors.black, + Container( + margin: EdgeInsets.only(bottom: 33), + child: IconButton( + onPressed: () => model.displayPasswordSignup(), + icon: Icon( + model.obscureTextSignup + ? Icons.visibility + : Icons.visibility_off, + size: 20.0, + color: Colors.black, + ), ), ), - hintText: "Password", - hintStyle: TextStyle( - fontSize: hintsize - 2, color: hintColor), - ), + ], ), - ), - ])), + ]), + )), ), ), SizedBox( @@ -490,12 +554,4 @@ class _AuthScreenState extends State ), ); } - - Widget separator() { - return Container( - width: 62.w, - height: 0.2.h, - color: Colors.grey[400], - ); - } } diff --git a/pubspec.lock b/pubspec.lock index 7ea1152c..b5fc2c8a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -35,7 +35,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.9.0" + version: "2.8.2" boolean_selector: dependency: transitive description: @@ -105,7 +105,14 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.2.1" + version: "1.2.0" + charcode: + dependency: transitive + description: + name: charcode + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.1" checked_yaml: dependency: transitive description: @@ -119,7 +126,7 @@ packages: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.1" + version: "1.1.0" code_builder: dependency: transitive description: @@ -245,7 +252,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.1" + version: "1.3.0" ffi: dependency: transitive description: @@ -640,21 +647,21 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.12" + version: "0.12.11" material_color_utilities: dependency: transitive description: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.5" + version: "0.1.4" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.7.0" mime: dependency: transitive description: @@ -717,7 +724,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.8.1" path_provider: dependency: "direct main" description: @@ -1016,7 +1023,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.9.0" + version: "1.8.2" stack_trace: dependency: transitive description: @@ -1044,35 +1051,35 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.1" + version: "1.1.0" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.1" + version: "1.2.0" test: dependency: "direct dev" description: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.21.4" + version: "1.21.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.12" + version: "0.4.9" test_core: dependency: transitive description: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.4.16" + version: "0.4.13" timezone: dependency: transitive description: