常守达 / doublefeel_flutter · Commits

Go to a project

Commit c2c66c50d871da2eae3d7d5a1485c50e645e40b3

Authored by 常守达
1 parent 67be8736
build: skipped

fix(login): UI修复

Inline Side-by-side
Showing 2 changed files with 57 additions and 55 deletions
... ... @@ -429,17 +429,14 @@ class _DeleteAccountBottomSheet extends StatelessWidget {
Center(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 54),
child: FittedBox(
fit: BoxFit.scaleDown,
child: Text(
context.l10n.areYouSureYouWantToDeleteYourAccount,
style: TextStyle(
child: Text(
context.l10n.areYouSureYouWantToDeleteYourAccount,
textAlign: TextAlign.center,
style: TextStyle(
color: context.colors.textPrimary,
fontSize: 16,
fontWeight: FontWeight.w600,
height: 1.2,
),
),
height: 1.2),
),
),
),
... ...
... ... @@ -97,47 +97,52 @@ class AddSecurityEmailView extends GetView<AddSecurityEmailController> {
),
),
const SizedBox(height: 32),
TextField(
controller: c.emailController,
keyboardType: TextInputType.emailAddress,
autofillHints: const [AutofillHints.email],
// onSubmitted: (_) =>
// c.sendVerificationEmail(isChangeEmail: isChangeEmail),
style: TextStyle(
color: colors.textPrimary,
fontSize: 16,
fontWeight: FontWeight.w400,
),
decoration: InputDecoration(
hintText: l10n.securityEmailHint,
hintStyle: const TextStyle(
color: Color(0xFFD9D9D9),
fontSize: 16,
),
filled: true,
fillColor: Colors.white,
contentPadding: const EdgeInsets.symmetric(
horizontal: 20,
),
border: _inputBorder(),
enabledBorder: _inputBorder(),
focusedBorder: _inputBorder(
color: colors.primary,
),
suffixIcon: Obx(() {
return c.emailInput.value.isNotEmpty
? GestureDetector(
onTap: c.emailController.clear,
child: Icon(
Icons.cancel,
color: context.colors.textTertiary,
size: 18,
),
)
: SizedBox();
}),
),
),
Obx(() => TextField(
controller: c.emailController,
keyboardType: TextInputType.emailAddress,
autofillHints: const [AutofillHints.email],
// onSubmitted: (_) =>
// c.sendVerificationEmail(isChangeEmail: isChangeEmail),
style: TextStyle(
color: colors.textPrimary,
fontSize: 16,
fontWeight: FontWeight.w400,
),
decoration: InputDecoration(
hintText: l10n.securityEmailHint,
hintStyle: const TextStyle(
color: Color(0xFFD9D9D9),
fontSize: 16,
),
filled: true,
fillColor: Colors.white,
contentPadding: const EdgeInsets.symmetric(
horizontal: 20,
),
border: _inputBorder(),
enabledBorder: _inputBorder(),
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(27),
borderSide: BorderSide(
color: (controller.showError ||
(controller.emailInput.value.isNotEmpty &&
controller.isEmailExist.value))
? context.colors.warning
: context.colors.primary,
width: 1,
),
),
suffixIcon: c.emailInput.value.isNotEmpty
? GestureDetector(
onTap: c.emailController.clear,
child: Icon(
Icons.cancel,
color: context.colors.textTertiary,
size: 18,
),
)
: SizedBox()),
)),
SizedBox(
height: 88,
child: Column(
... ... @@ -603,7 +608,7 @@ class SetSecurityEmailPasswordView extends GetView<AddSecurityEmailController> {
? context.colors.primary
: c.hasClickSetAPassword.value
? context.colors.warning
: context.colors.textTertiary,
: context.colors.primary,
width: 1,
),
),
... ... @@ -723,7 +728,7 @@ class SetSecurityEmailPasswordView extends GetView<AddSecurityEmailController> {
? context.colors.primary
: c.hasClickSetAConfirmPassword.value
? context.colors.warning
: context.colors.textTertiary,
: context.colors.primary,
width: 1,
),
),
... ... @@ -913,7 +918,7 @@ class VerifyEmailPwdView extends GetView<AddSecurityEmailController> {
? context.colors.primary
: c.hasClickVerifyPassword.value
? context.colors.warning
: context.colors.textTertiary,
: context.colors.primary,
width: 1,
),
),
... ... @@ -1232,7 +1237,7 @@ class ReSetSecurityEmailPasswordView
? context.colors.primary
: c.hasPostUpdatePassword.value
? context.colors.warning
: context.colors.textTertiary,
: context.colors.primary,
width: 1,
),
),
... ... @@ -1363,7 +1368,7 @@ class ReSetSecurityEmailPasswordView
: c.hasPostUpdateConfirmPassword
.value
? context.colors.warning
: context.colors.textTertiary,
: context.colors.primary,
width: 1,
),
),
... ... @@ -1655,7 +1660,7 @@ class ForgotEmailVerificationView extends GetView<AddSecurityEmailController> {
.hasClickForgotSubmitNewPassword
.value
? context.colors.warning
: context.colors.textTertiary,
: context.colors.primary,
width: 1,
),
),
... ...