bfix: fix textfield cursor when typed fast

aman-singh7 · aman-singh7 · commit 5cb798d4a429 · 2022-07-12T01:20:00.000+05:30
Signed-off-by: Aman &lt;aman2@me.iitr.ac.in&gt;
diff --git a/lib/presentation/components/inputs/form_input.dart b/lib/presentation/components/inputs/form_input.dart
@@ -18,6 +18,8 @@ class FormInput extends StatelessWidget {
     this.maxLines = 1,
     this.obscureText = false,
     this.onChanged,
+    this.onSubmitted,
+    this.onEditingComplete,
     this.prefix,
     Key? key,
   })  : assert(
@@ -34,10 +36,12 @@ class FormInput extends StatelessWidget {
   final String title;
   final String? errorText;
   final Function(String)? onChanged;
+  final Function(String)? onSubmitted;
   final TextInputAction action;
   final TextInputType? keyboard;
   final TextEditingController? controller;
   final Widget? prefix;
+  final Function()? onEditingComplete;
 
   @override
   Widget build(BuildContext context) {
@@ -65,6 +69,8 @@ class FormInput extends StatelessWidget {
           controller: enabled ? controller : null,
           prefix: prefix,
           errorText: errorText,
+          onEditingComplete: onEditingComplete,
+          onSubmitted: onSubmitted,
         ),
       ],
     );
diff --git a/lib/presentation/components/inputs/text_input.dart b/lib/presentation/components/inputs/text_input.dart
@@ -23,6 +23,7 @@ class TextInput extends StatelessWidget {
     this.fillColor,
     this.border,
     this.onSubmitted,
+    this.onEditingComplete,
     this.prefixIconConstraints,
     this.validator,
     Key? key,
@@ -49,6 +50,7 @@ class TextInput extends StatelessWidget {
   final InputBorder? border;
   final BoxConstraints? prefixIconConstraints;
   final String? Function(String?)? validator;
+  final Function()? onEditingComplete;
 
   @override
   Widget build(BuildContext context) {
@@ -83,6 +85,7 @@ class TextInput extends StatelessWidget {
       onChanged: onChanged,
       style: AppStyles.h6.copyWith(color: AppColors.grey3),
       textInputAction: action,
+      onEditingComplete: onEditingComplete,
       onFieldSubmitted: onSubmitted,
     );
   }
diff --git a/lib/presentation/contests/widgets/contest_card.dart b/lib/presentation/contests/widgets/contest_card.dart
@@ -290,12 +290,12 @@ extension on Ongoing {
   String get platformName => PlatformUtil.getName(platform);
   String get icon => PlatformUtil.getIcon(platform);
   String get time =>
-      'Ends on ${DateFormat('dd, MMMM yyyy hh:mm a').format(endTime)}';
+      'Ends on ${DateFormat('dd MMMM, yyyy hh:mm a').format(endTime)}';
 }
 
 extension on Upcoming {
   String get platformName => PlatformUtil.getName(platform);
   String get icon => PlatformUtil.getIcon(platform);
   String get time =>
-      'Starts on ${DateFormat('dd, MMMM yyyy hh:mm a').format(startTime)}';
+      'Starts on ${DateFormat('dd MMMM, yyyy hh:mm a').format(startTime)}';
 }
diff --git a/lib/presentation/signup/bloc/sign_up_bloc.dart b/lib/presentation/signup/bloc/sign_up_bloc.dart
@@ -71,6 +71,7 @@ class SignUpBloc extends Bloc<SignUpEvent, SignUpState> {
   Future<void> _initialize(Initialize event, Emitter<SignUpState> emit) async {
     // initialize controllers
     final newState = state.copyWith(
+      status: const Status(),
       emailController: TextEditingController(),
       instituteController: TextEditingController(),
       nameController: TextEditingController(),
@@ -188,8 +189,6 @@ class SignUpBloc extends Bloc<SignUpEvent, SignUpState> {
 
   void _updatePassword(PasswordInput event, Emitter<SignUpState> emit) {
     emit(state.copyWith(
-      isPasswordFocused: true,
-      isUsernameFocused: false,
       passwordController: state.passwordController?.updateWith(event.value),
     ));
   }
@@ -199,8 +198,6 @@ class SignUpBloc extends Bloc<SignUpEvent, SignUpState> {
     Emitter<SignUpState> emit,
   ) async {
     emit(state.copyWith(
-      isUsernameFocused: true,
-      isPasswordFocused: false,
       usernameController: state.usernameController?.updateWith(event.value),
     ));
     if (event.value.length >= 3) {
@@ -228,7 +225,8 @@ extension on TextEditingController {
     final controller = TextEditingController(text: value);
     // ignore: cascade_invocations
     controller.selection = TextSelection.fromPosition(
-      TextPosition(offset: selection.baseOffset),
+      TextPosition(offset: value.length),
+      // TextPosition(offset: selection.baseOffset),
     );
     return controller;
   }
diff --git a/lib/presentation/signup/bloc/sign_up_state.dart b/lib/presentation/signup/bloc/sign_up_state.dart
@@ -14,12 +14,6 @@ class SignUpState with _$SignUpState {
     /// Whether the name field is in focus.
     @Default(false) bool isNameFocused,
 
-    /// Whether the password field is in focus.
-    @Default(false) bool isPasswordFocused,
-
-    /// Whether the username field is in focus.
-    @Default(false) bool isUsernameFocused,
-
     /// Whether the username entered is unique.
     @Default(true) bool isUsernameUnique,
 
@@ -55,7 +49,7 @@ class SignUpState with _$SignUpState {
     @Default({}) Map<String, TextEditingController?> handleControllers,
 
     /// State of the screen.
-    @Default(Status()) Status status,
+    @Default(Status.loading()) Status status,
   }) = _SignUpState;
 
   const SignUpState._();
diff --git a/lib/presentation/signup/signup_screen.dart b/lib/presentation/signup/signup_screen.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
+import '../../domain/models/status.dart';
 import 'bloc/sign_up_bloc.dart';
 import 'widgets/signup_widgets.dart';
 
@@ -16,15 +17,18 @@ class SignUpScreen extends StatelessWidget {
       create: (_) => SignUpBloc()..add(const Initialize()),
       child: SnackBarWrapper(
         child: ScrollAndNavWrapper(
-          child: BlocSelector<SignUpBloc, SignUpState, int>(
-            selector: (state) => state.pageIndex,
-            builder: (context, pageIndex) {
+          child: BlocBuilder<SignUpBloc, SignUpState>(
+            builder: (context, state) {
+              if (state.status is Loading) {
+                return Container();
+              }
+
               return Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: <Widget>[
                   const PopButton(),
                   SizedBox(height: 25.r),
-                  signUpPages[pageIndex](),
+                  signUpPages[state.pageIndex](),
                   SizedBox(height: 25.r),
                 ],
               );
diff --git a/lib/presentation/signup/widgets/pop_button.dart b/lib/presentation/signup/widgets/pop_button.dart
@@ -15,7 +15,7 @@ class PopButton extends StatelessWidget {
         } else {
           return GestureDetector(
             onTap: () => context.read<SignUpBloc>().add(const Back()),
-            child: SvgPicture.asset(
+            child: svg.SvgPicture.asset(
               AppAssets.arrowBackward,
               width: 16.r,
             ),
diff --git a/lib/presentation/signup/widgets/signup_pages.dart b/lib/presentation/signup/widgets/signup_pages.dart
@@ -2,6 +2,8 @@ part of 'signup_widgets.dart';
 
 Widget _pageOne() {
   return BlocBuilder<SignUpBloc, SignUpState>(
+    buildWhen: (previous, current) =>
+        previous.isEmailUnique ^ current.isEmailUnique,
     builder: (context, state) {
       return Column(
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -27,46 +29,55 @@ Widget _pageOne() {
             'Institute (optional)',
             style: AppStyles.h4.copyWith(fontWeight: FontWeight.w900),
           ),
+          _buildInstituteInput(),
           SizedBox(height: 8.r),
-          TypeAheadFormField<String>(
-            onSuggestionSelected: (value) =>
-                context.read<SignUpBloc>().add(InstituteInput(value)),
-            itemBuilder: (context, suggestion) =>
-                ListTile(title: Text(suggestion)),
-            textFieldConfiguration: TextFieldConfiguration(
-              onChanged: (value) =>
-                  context.read<SignUpBloc>().add(InstituteInput(value)),
-              controller: state.instituteController,
-              decoration: InputDecoration(
-                hintText: 'Enter the name of your institute',
-                hintStyle: AppStyles.h6,
-                border: OutlineInputBorder(
-                  borderRadius: BorderRadius.circular(2.r),
-                  borderSide: const BorderSide(color: AppColors.primary),
-                ),
-                focusedBorder: const OutlineInputBorder(
-                  borderSide: BorderSide(
-                    color: AppColors.primary,
-                    width: 1.5,
-                  ),
-                ),
+        ],
+      );
+    },
+  );
+}
+
+Widget _buildInstituteInput() {
+  return BlocSelector<SignUpBloc, SignUpState, TextEditingController?>(
+    selector: (state) => state.instituteController,
+    builder: (context, controller) {
+      return TypeAheadFormField<String>(
+        onSuggestionSelected: (value) =>
+            context.read<SignUpBloc>().add(InstituteInput(value)),
+        itemBuilder: (context, suggestion) => ListTile(title: Text(suggestion)),
+        textFieldConfiguration: TextFieldConfiguration(
+          onSubmitted: (value) =>
+              context.read<SignUpBloc>().add(InstituteInput(value)),
+          controller: controller,
+          decoration: InputDecoration(
+            hintText: 'Enter the name of your institute',
+            hintStyle: AppStyles.h6,
+            border: OutlineInputBorder(
+              borderRadius: BorderRadius.circular(2.r),
+              borderSide: const BorderSide(color: AppColors.primary),
+            ),
+            focusedBorder: const OutlineInputBorder(
+              borderSide: BorderSide(
+                color: AppColors.primary,
+                width: 1.5,
               ),
             ),
-            suggestionsCallback: (pattern) {
-              pattern = pattern.toLowerCase();
-              return SignUpBloc.institutes.where(
-                (element) => element.toLowerCase().contains(pattern),
-              );
-            },
           ),
-        ],
+        ),
+        suggestionsCallback: (pattern) {
+          pattern = pattern.toLowerCase();
+          return SignUpBloc.institutes.where(
+            (element) => element.toLowerCase().contains(pattern),
+          );
+        },
       );
     },
   );
 }
 
 Widget _pageTwo() {
   return BlocBuilder<SignUpBloc, SignUpState>(
+    buildWhen: (previous, current) => false,
     builder: (context, state) {
       return Column(
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -199,7 +210,7 @@ Widget _pageThree() {
                         border: Border.all(color: AppColors.grey1),
                         borderRadius: BorderRadius.circular(90.r),
                       ),
-                      child: SvgPicture.asset(
+                      child: svg.SvgPicture.asset(
                         AppAssets.defaultUserIcon,
                         fit: BoxFit.fill,
                       ),
@@ -245,6 +256,8 @@ Widget _pageThree() {
 
 Widget _pageFour() {
   return BlocBuilder<SignUpBloc, SignUpState>(
+    buildWhen: (previous, current) =>
+        previous.obscurePassword ^ current.obscurePassword,
     builder: (context, state) {
       return Column(
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -266,50 +279,38 @@ Widget _pageFour() {
                 horizontal: 8.r,
                 vertical: 10.r,
               ),
-              child: SvgPicture.asset(
-                AppAssets.person,
-                color: state.isUsernameFocused
-                    ? AppColors.primary
-                    : AppColors.grey1,
+              child: const ImageIcon(
+                Svg(AppAssets.person),
               ),
             ),
           ),
           SizedBox(height: 34.r),
-          Stack(
-            alignment: Alignment.centerRight,
-            children: <Widget>[
-              TextInput(
-                action: TextInputAction.done,
-                hint: 'Password',
-                keyboard: TextInputType.visiblePassword,
-                obscureText: state.obscurePassword,
-                controller: state.passwordController,
-                onChanged: (value) =>
-                    context.read<SignUpBloc>().add(PasswordInput(value)),
-                prefix: Padding(
-                  padding: EdgeInsets.symmetric(
-                    horizontal: 8.r,
-                    vertical: 10.r,
-                  ),
-                  child: SvgPicture.asset(
-                    AppAssets.lock,
-                    color: (state.isPasswordFocused)
-                        ? AppColors.primary
-                        : AppColors.grey1,
-                  ),
-                ),
+          TextInput(
+            action: TextInputAction.done,
+            hint: 'Password',
+            keyboard: TextInputType.visiblePassword,
+            obscureText: state.obscurePassword,
+            controller: state.passwordController,
+            onChanged: (value) =>
+                context.read<SignUpBloc>().add(PasswordInput(value)),
+            prefix: Padding(
+              padding: EdgeInsets.symmetric(
+                horizontal: 8.r,
+                vertical: 10.r,
               ),
-              IconButton(
-                icon: SvgPicture.asset(
-                  (state.obscurePassword) ? AppAssets.eyeOff : AppAssets.eyeOn,
-                  color: state.isPasswordFocused
-                      ? AppColors.primary
-                      : AppColors.grey1,
+              child: const ImageIcon(
+                Svg(AppAssets.lock),
+              ),
+            ),
+            suffix: IconButton(
+              icon: ImageIcon(
+                Svg(
+                  state.obscurePassword ? AppAssets.eyeOff : AppAssets.eyeOn,
                 ),
-                onPressed: () =>
-                    context.read<SignUpBloc>().add(const ToggleObscure()),
               ),
-            ],
+              onPressed: () =>
+                  context.read<SignUpBloc>().add(const ToggleObscure()),
+            ),
           ),
         ],
       );
diff --git a/lib/presentation/signup/widgets/signup_widgets.dart b/lib/presentation/signup/widgets/signup_widgets.dart
@@ -3,7 +3,8 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:flutter_svg/flutter_svg.dart';
+import 'package:flutter_svg/flutter_svg.dart' as svg;
+import 'package:flutter_svg_provider/flutter_svg_provider.dart';
 import 'package:flutter_typeahead/flutter_typeahead.dart';
 import 'package:get/get.dart';
 

Original file line number	Diff line number	Diff line change
`@@ -290,12 +290,12 @@ extension on Ongoing {`
`290`	`290`	`String get platformName => PlatformUtil.getName(platform);`
`291`	`291`	`String get icon => PlatformUtil.getIcon(platform);`
`292`	`292`	`String get time =>`
`293`		`- 'Ends on ${DateFormat('dd, MMMM yyyy hh:mm a').format(endTime)}';`
	`293`	`+ 'Ends on ${DateFormat('dd MMMM, yyyy hh:mm a').format(endTime)}';`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`extension on Upcoming {`
`297`	`297`	`String get platformName => PlatformUtil.getName(platform);`
`298`	`298`	`String get icon => PlatformUtil.getIcon(platform);`
`299`	`299`	`String get time =>`
`300`		`- 'Starts on ${DateFormat('dd, MMMM yyyy hh:mm a').format(startTime)}';`
	`300`	`+ 'Starts on ${DateFormat('dd MMMM, yyyy hh:mm a').format(startTime)}';`
`301`	`301`	`}`