From 1e7ba319a50a87f8a30ae7e3e0429195dc50d6e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ms=20Thu=E1=BB=B7?= Date: Mon, 24 Oct 2022 17:41:44 +0700 Subject: [PATCH] TF-1068 implement presentation layer save recent login & get all username --- .../base/widget/recent_item_tile_widget.dart | 4 ++ .../login/presentation/base_login_view.dart | 51 ++++++++++++++----- .../login/presentation/login_controller.dart | 37 +++++++++++++- .../widgets/login_text_input_builder.dart | 6 +++ 4 files changed, 84 insertions(+), 14 deletions(-) diff --git a/lib/features/base/widget/recent_item_tile_widget.dart b/lib/features/base/widget/recent_item_tile_widget.dart index 03cc0ac1a..1000e252b 100644 --- a/lib/features/base/widget/recent_item_tile_widget.dart +++ b/lib/features/base/widget/recent_item_tile_widget.dart @@ -3,6 +3,7 @@ import 'package:core/presentation/resources/image_paths.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:tmail_ui_user/features/login/domain/model/recent_login_url.dart'; +import 'package:tmail_ui_user/features/login/domain/model/recent_login_username.dart'; class RecentItemTileWidget extends StatelessWidget { @@ -40,6 +41,9 @@ class RecentItemTileWidget extends StatelessWidget { if (item is RecentLoginUrl) { return item.url; } + if(item is RecentLoginUsername) { + return item.username; + } return ''; } } \ No newline at end of file diff --git a/lib/features/login/presentation/base_login_view.dart b/lib/features/login/presentation/base_login_view.dart index 159d23ab3..63eb65296 100644 --- a/lib/features/login/presentation/base_login_view.dart +++ b/lib/features/login/presentation/base_login_view.dart @@ -2,9 +2,11 @@ import 'package:core/presentation/extensions/color_extension.dart'; import 'package:core/presentation/resources/image_paths.dart'; import 'package:core/presentation/utils/responsive_utils.dart'; import 'package:core/presentation/views/text/text_builder.dart'; -import 'package:core/presentation/views/text/text_field_builder.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_typeahead/flutter_typeahead.dart'; import 'package:get/get.dart'; +import 'package:tmail_ui_user/features/base/widget/recent_item_tile_widget.dart'; +import 'package:tmail_ui_user/features/login/domain/model/recent_login_username.dart'; import 'package:tmail_ui_user/features/login/domain/state/get_oidc_configuration_state.dart'; import 'package:tmail_ui_user/features/login/domain/state/get_token_oidc_state.dart'; import 'package:tmail_ui_user/features/login/presentation/login_controller.dart'; @@ -21,6 +23,8 @@ abstract class BaseLoginView extends GetWidget { final responsiveUtils = Get.find(); final imagePaths = Get.find(); + final FocusNode passFocusNode = FocusNode(); + Widget buildLoginMessage(BuildContext context, LoginState loginState) { return Padding( padding: const EdgeInsets.only(top: 11, bottom: 36, left: 58, right: 58), @@ -106,17 +110,37 @@ abstract class BaseLoginView extends GetWidget { Widget buildUserNameInput(BuildContext context) { return Padding( - padding: const EdgeInsets.only(bottom: 16, right: 24, left: 24), - child: Container( - child: (TextFieldBuilder()..key(const Key('login_username_input')) - ..onChange((value) => loginController.setUserNameText(value)) - ..textInputAction(TextInputAction.next) - ..keyboardType(TextInputType.emailAddress) - ..textDecoration((LoginInputDecorationBuilder() - ..setLabelText(AppLocalizations.of(context).email) - ..setHintText(AppLocalizations.of(context).email)) - .build())) - .build())); + padding: const EdgeInsets.only(bottom: 24, right: 24, left: 24), + child: TypeAheadFormField( + key: const Key('login_username_input'), + textFieldConfiguration: TextFieldConfiguration( + controller: loginController.usernameInputController, + onChanged: (value) => loginController.setUserNameText(value), + textInputAction: TextInputAction.next, + keyboardType: TextInputType.emailAddress, + decoration: (LoginInputDecorationBuilder() + ..setLabelText(AppLocalizations.of(context).email) + ..setHintText(AppLocalizations.of(context).email)) + .build(), + ), + debounceDuration: const Duration(milliseconds: 300), + suggestionsCallback: (pattern) async { + return await loginController.getAllRecentLoginUsernameAction(pattern); + }, + itemBuilder: (context, loginUsername) => + RecentItemTileWidget(loginUsername, imagePath: imagePaths), + onSuggestionSelected: (recentUsername) { + loginController.setUsername(recentUsername.username); + passFocusNode.requestFocus(); + }, + suggestionsBoxDecoration: const SuggestionsBoxDecoration( + borderRadius: BorderRadius.all(Radius.circular(14))), + noItemsFoundBuilder: (context) => const SizedBox(), + hideOnEmpty: true, + hideOnError: true, + hideOnLoading: true, + ) + ); } Widget buildPasswordInput(BuildContext context) { @@ -130,7 +154,8 @@ abstract class BaseLoginView extends GetWidget { ..obscureText(true) ..onChange((value) => loginController.setPasswordText(value)) ..textInputAction(TextInputAction.done) - ..hintText(AppLocalizations.of(context).password)) + ..hintText(AppLocalizations.of(context).password) + ..setFocusNode(passFocusNode)) .build())); } diff --git a/lib/features/login/presentation/login_controller.dart b/lib/features/login/presentation/login_controller.dart index 2c9fcb794..96ef9ea98 100644 --- a/lib/features/login/presentation/login_controller.dart +++ b/lib/features/login/presentation/login_controller.dart @@ -7,10 +7,12 @@ import 'package:model/model.dart'; import 'package:tmail_ui_user/features/base/base_controller.dart'; import 'package:tmail_ui_user/features/login/data/network/config/authorization_interceptors.dart'; import 'package:tmail_ui_user/features/login/domain/model/recent_login_url.dart'; +import 'package:tmail_ui_user/features/login/domain/model/recent_login_username.dart'; import 'package:tmail_ui_user/features/login/domain/state/authenticate_oidc_on_browser_state.dart'; import 'package:tmail_ui_user/features/login/domain/state/authentication_user_state.dart'; import 'package:tmail_ui_user/features/login/domain/state/check_oidc_is_available_state.dart'; import 'package:tmail_ui_user/features/login/domain/state/get_all_recent_login_url_latest_state.dart'; +import 'package:tmail_ui_user/features/login/domain/state/get_all_recent_login_username_state.dart'; import 'package:tmail_ui_user/features/login/domain/state/get_authentication_info_state.dart'; import 'package:tmail_ui_user/features/login/domain/state/get_oidc_configuration_state.dart'; import 'package:tmail_ui_user/features/login/domain/state/get_stored_oidc_configuration_state.dart'; @@ -19,11 +21,13 @@ import 'package:tmail_ui_user/features/login/domain/usecases/authenticate_oidc_o import 'package:tmail_ui_user/features/login/domain/usecases/authentication_user_interactor.dart'; import 'package:tmail_ui_user/features/login/domain/usecases/check_oidc_is_available_interactor.dart'; import 'package:tmail_ui_user/features/login/domain/usecases/get_all_recent_login_url_on_mobile_interactor.dart'; +import 'package:tmail_ui_user/features/login/domain/usecases/get_all_recent_login_username_on_mobile_interactor.dart'; import 'package:tmail_ui_user/features/login/domain/usecases/get_authentication_info_interactor.dart'; import 'package:tmail_ui_user/features/login/domain/usecases/get_oidc_configuration_interactor.dart'; import 'package:tmail_ui_user/features/login/domain/usecases/get_stored_oidc_configuration_interactor.dart'; import 'package:tmail_ui_user/features/login/domain/usecases/get_token_oidc_interactor.dart'; import 'package:tmail_ui_user/features/login/domain/usecases/save_login_url_on_mobile_interactor.dart'; +import 'package:tmail_ui_user/features/login/domain/usecases/save_login_username_on_mobile_interactor.dart'; import 'package:tmail_ui_user/features/login/presentation/login_form_type.dart'; import 'package:tmail_ui_user/features/login/presentation/model/login_arguments.dart'; import 'package:tmail_ui_user/features/login/presentation/state/login_state.dart'; @@ -46,9 +50,11 @@ class LoginController extends BaseController { final GetStoredOidcConfigurationInteractor _getStoredOidcConfigurationInteractor; final SaveLoginUrlOnMobileInteractor _saveLoginUrlOnMobileInteractor; final GetAllRecentLoginUrlOnMobileInteractor _getAllRecentLoginUrlOnMobileInteractor; - + final SaveLoginUsernameOnMobileInteractor _saveLoginUsernameOnMobileInteractor; + final GetAllRecentLoginUsernameOnMobileInteractor _getAllRecentLoginUsernameOnMobileInteractor; final TextEditingController urlInputController = TextEditingController(); + final TextEditingController usernameInputController = TextEditingController(); final NetworkConnectionController networkConnectionController = Get.find(); LoginController( @@ -64,6 +70,8 @@ class LoginController extends BaseController { this._getStoredOidcConfigurationInteractor, this._saveLoginUrlOnMobileInteractor, this._getAllRecentLoginUrlOnMobileInteractor, + this._saveLoginUsernameOnMobileInteractor, + this._getAllRecentLoginUsernameOnMobileInteractor, ); var loginState = LoginState(Right(LoginInitAction())).obs; @@ -170,6 +178,7 @@ class LoginController extends BaseController { } void handleLoginPressed() { + _saveRecentLoginUsername(); log('LoginController::handleLoginPressed(): ${loginFormType.value}'); if (loginFormType.value == LoginFormType.ssoForm) { _getOIDCConfiguration(); @@ -355,6 +364,32 @@ class LoginController extends BaseController { )); } + void setUsername(String username) { + log('LoginController::formatUsername(): $username'); + usernameInputController.text = username; + setUserNameText(usernameInputController.text); + } + + void _saveRecentLoginUsername() { + if(BuildUtils.isWeb || _userNameText == null || _userNameText!.isEmpty || !_userNameText!.isEmail) { + return ; + } + final recentLoginUsername = RecentLoginUsername.now(_userNameText!); + log('LoginController::_saveRecentLoginUsername(): $recentLoginUsername'); + consumeState(_saveLoginUsernameOnMobileInteractor.execute(recentLoginUsername)); + } + + Future> getAllRecentLoginUsernameAction(String pattern) async { + return await _getAllRecentLoginUsernameOnMobileInteractor + .execute(pattern: pattern) + .then((result) => result.fold( + (failure) => [], + (success) => success is GetAllRecentLoginUsernameLatestSuccess + ? success.listRecentLoginUsername + : [] + )); + } + @override void onClose() { urlInputController.clear(); diff --git a/lib/features/login/presentation/widgets/login_text_input_builder.dart b/lib/features/login/presentation/widgets/login_text_input_builder.dart index a722d9aa3..514e12465 100644 --- a/lib/features/login/presentation/widgets/login_text_input_builder.dart +++ b/lib/features/login/presentation/widgets/login_text_input_builder.dart @@ -24,6 +24,7 @@ class LoginTextInputBuilder { TextEditingController? _textEditingController; bool? _passwordInput; OnSubmitted? _onSubmitted; + FocusNode? _focusNode; final BuildContext context; final ImagePaths imagePaths; @@ -100,6 +101,10 @@ class LoginTextInputBuilder { _onSubmitted = onSubmitted; } + void setFocusNode(FocusNode? focusNode) { + _focusNode = focusNode; + } + Widget build() { return StatefulBuilder(builder: (BuildContext context, StateSetter setState) { return Wrap( @@ -119,6 +124,7 @@ class LoginTextInputBuilder { controller: _textEditingController, cursorColor: AppColor.primaryColor, style: const TextStyle(color: AppColor.loginTextFieldHintColor, fontSize: 16, fontWeight: FontWeight.normal), + focusNode: _focusNode, decoration: (LoginInputDecorationBuilder() ..setHintText(_hintText) ..setPrefixText(_prefixText)