From 5e3bb17c2d72451e40dcbc010c910f041fff3873 Mon Sep 17 00:00:00 2001 From: anfe <448468458@qq.com> Date: Sat, 4 May 2024 09:57:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=B0=83=E6=95=B4=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=A1=86=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../starLock_forgetPassword_xhj_page.dart | 18 ++---- .../login/login/starLock_login_xhj_page.dart | 2 - .../register/starLock_register_xhj_page.dart | 16 ++--- star_lock/lib/tools/tf_loginInput.dart | 62 ++++++++++++++++++- 4 files changed, 69 insertions(+), 29 deletions(-) diff --git a/star_lock/lib/login/forgetPassword/starLock_forgetPassword_xhj_page.dart b/star_lock/lib/login/forgetPassword/starLock_forgetPassword_xhj_page.dart index 013aa9c2..20cfe753 100644 --- a/star_lock/lib/login/forgetPassword/starLock_forgetPassword_xhj_page.dart +++ b/star_lock/lib/login/forgetPassword/starLock_forgetPassword_xhj_page.dart @@ -83,11 +83,9 @@ class _StarLockForgetPasswordPageState logic.checkNext(state.phoneController); }, leftWidget: Padding( - padding: EdgeInsets.only( - top: 30.w, bottom: 20.w, right: 20.w, left: 5.w), + padding: EdgeInsets.only(top: 30.w, bottom: 20.w, left: 5.w), ), - label: - TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr, + label: TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr, keyboardType: TextInputType.number, inputFormatters: [ LengthLimitingTextInputFormatter(30), @@ -99,8 +97,7 @@ class _StarLockForgetPasswordPageState }, isPwd: true, leftWidget: Padding( - padding: EdgeInsets.only( - top: 30.w, bottom: 20.w, right: 20.w, left: 5.w), + padding: EdgeInsets.only(top: 30.w, bottom: 20.w, left: 5.w), ), label: "${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}", @@ -119,8 +116,7 @@ class _StarLockForgetPasswordPageState }, isPwd: true, leftWidget: Padding( - padding: EdgeInsets.only( - top: 30.w, bottom: 20.w, right: 20.w, left: 5.w), + padding: EdgeInsets.only(top: 30.w, bottom: 20.w, left: 5.w), ), label: "${TranslationLoader.lanKeys!.sure!.tr}${TranslationLoader.lanKeys!.password!.tr}", @@ -135,9 +131,7 @@ class _StarLockForgetPasswordPageState onchangeAction: (v) { logic.checkNext(state.codeController); }, - leftWidget: Padding( - padding: EdgeInsets.only(right: 10.w, left: 5.w), - ), + leftWidget: SizedBox(), hintText: "${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.verificationCode!.tr}", inputFormatters: [ @@ -147,7 +141,7 @@ class _StarLockForgetPasswordPageState Obx(() => GestureDetector( onTap: (state.phoneStrIsOK.value && state.canResend.value) ? () async { - var result = await Navigator.pushNamed( + var result = await Navigator.pushNamed( context, Routers.safetyVerificationPage, arguments: { "countryCode": state.countryCode.value, diff --git a/star_lock/lib/login/login/starLock_login_xhj_page.dart b/star_lock/lib/login/login/starLock_login_xhj_page.dart index 14f7b99a..57b4bf3d 100644 --- a/star_lock/lib/login/login/starLock_login_xhj_page.dart +++ b/star_lock/lib/login/login/starLock_login_xhj_page.dart @@ -88,7 +88,6 @@ class _StarLockLoginPageState extends State { padding: EdgeInsets.only( top: 30.w, bottom: 20.w, - right: 20.w, ), ), rightSlot: IconButton( @@ -110,7 +109,6 @@ class _StarLockLoginPageState extends State { padding: EdgeInsets.only( top: 30.w, bottom: 20.w, - right: 20.w, ), ), label: diff --git a/star_lock/lib/login/register/starLock_register_xhj_page.dart b/star_lock/lib/login/register/starLock_register_xhj_page.dart index c636f2c5..2fa429a5 100644 --- a/star_lock/lib/login/register/starLock_register_xhj_page.dart +++ b/star_lock/lib/login/register/starLock_register_xhj_page.dart @@ -140,9 +140,7 @@ class _StarLockRegisterPageState extends State { onchangeAction: (v) { logic.checkNext(state.phoneOrEmailController); }, - leftWidget: Padding( - padding: EdgeInsets.only(right: 10.w, left: 5.w), - ), + leftWidget: SizedBox(), label: "${TranslationLoader.lanKeys!.pleaseEnter!.tr}${state.isIphoneType.value ? "手机号".tr : TranslationLoader.lanKeys!.email!.tr}", keyboardType: TextInputType.number, @@ -155,9 +153,7 @@ class _StarLockRegisterPageState extends State { logic.checkNext(state.pwdController); }, isPwd: true, - leftWidget: Padding( - padding: EdgeInsets.only(right: 10.w, left: 5.w), - ), + leftWidget: SizedBox(), label: "${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}", inputFormatters: [ @@ -174,9 +170,7 @@ class _StarLockRegisterPageState extends State { logic.checkNext(state.sureController); }, isPwd: true, - leftWidget: Padding( - padding: EdgeInsets.only(right: 10.w, left: 5.w), - ), + leftWidget: SizedBox(), label: "${TranslationLoader.lanKeys!.sure!.tr}${TranslationLoader.lanKeys!.password!.tr}", inputFormatters: [ @@ -190,9 +184,7 @@ class _StarLockRegisterPageState extends State { onchangeAction: (v) { logic.checkNext(state.codeController); }, - leftWidget: Padding( - padding: EdgeInsets.only(right: 10.w, left: 5.w), - ), + leftWidget: SizedBox(), label: "${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.verificationCode!.tr}", inputFormatters: [ diff --git a/star_lock/lib/tools/tf_loginInput.dart b/star_lock/lib/tools/tf_loginInput.dart index 123f2814..a454ecb0 100644 --- a/star_lock/lib/tools/tf_loginInput.dart +++ b/star_lock/lib/tools/tf_loginInput.dart @@ -3,7 +3,9 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; import 'package:star_lock/app_settings/app_colors.dart'; +import 'package:star_lock/flavors.dart'; /* * 登录注册页面 input @@ -55,8 +57,12 @@ class LoginInput extends StatefulWidget { class _LoginInputState extends State { @override Widget build(BuildContext context) { + return GetPlatform.isAndroid ? androidView() : iosView(); + } + + Widget androidView() { bool isPwd = widget.isPwd ?? false; - String pwd = (widget.controller?.text ?? '').replaceAll(RegExp(r'.'), '*'); + String pwd = (widget.controller?.text ?? '').replaceAll(RegExp(r'.'), '●'); return Container( decoration: BoxDecoration( border: Border(bottom: BorderSide(width: 0.5.h, color: Colors.grey)), @@ -64,7 +70,7 @@ class _LoginInputState extends State { child: Row( children: [ widget.isHaveLeftWidget == true - ? widget.leftWidget ?? SizedBox() + ? widget.leftWidget ?? const SizedBox() : SizedBox( width: 20.w, height: 40.w, @@ -117,7 +123,9 @@ class _LoginInputState extends State { ), if (isPwd) Padding( - padding: EdgeInsets.only(top: 30.h), + padding: EdgeInsets.only( + top: + F.sw(defaultCall: () => 27.h, xhjCall: () => 39.h)), child: Text( pwd, style: TextStyle( @@ -135,4 +143,52 @@ class _LoginInputState extends State { ), ); } + + Widget iosView() { + return Column( + children: [ + TextField( + //输入框一行 + maxLines: 1, + controller: widget.controller, + focusNode: widget.focusNode, + onChanged: widget.onchangeAction, + onTap: widget.onTapAction, + autofocus: false, + inputFormatters: widget.inputFormatters, + textInputAction: TextInputAction.next, + decoration: InputDecoration( + //输入里面输入文字内边距设置 + contentPadding: const EdgeInsets.only( + top: 8.0, left: -10.0, right: -10.0, bottom: 8.0), + labelText: widget.label, + labelStyle: + TextStyle(fontSize: 22.sp, color: AppColors.darkGrayTextColor), + hintStyle: TextStyle(fontSize: 22.sp), + hintText: widget.hintText, + //不需要输入框下划线 + border: InputBorder.none, + suffixIcon: (widget.isSuffixIcon ?? false) + ? IconButton( + icon: const Icon(Icons.clear), + onPressed: widget.controller!.clear, + ) + : null, + //左边图标设置 + icon: widget.isHaveLeftWidget == true + ? widget.leftWidget + : SizedBox( + width: 20.w, + height: 40.w, + ), + ), + obscureText: widget.isPwd ?? false, + ), + Container( + height: 0.5.h, + color: Colors.grey, + ), + ], + ); + } }