常守达 / 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 { @@ -429,17 +429,14 @@ class _DeleteAccountBottomSheet extends StatelessWidget {
429 Center( 429 Center(
430 child: Padding( 430 child: Padding(
431 padding: const EdgeInsets.symmetric(horizontal: 54), 431 padding: const EdgeInsets.symmetric(horizontal: 54),
432 - child: FittedBox(  
433 - fit: BoxFit.scaleDown,  
434 - child: Text(  
435 - context.l10n.areYouSureYouWantToDeleteYourAccount,  
436 - style: TextStyle( 432 + child: Text(
  433 + context.l10n.areYouSureYouWantToDeleteYourAccount,
  434 + textAlign: TextAlign.center,
  435 + style: TextStyle(
437 color: context.colors.textPrimary, 436 color: context.colors.textPrimary,
438 fontSize: 16, 437 fontSize: 16,
439 fontWeight: FontWeight.w600, 438 fontWeight: FontWeight.w600,
440 - height: 1.2,  
441 - ),  
442 - ), 439 + height: 1.2),
443 ), 440 ),
444 ), 441 ),
445 ), 442 ),
@@ -97,47 +97,52 @@ class AddSecurityEmailView extends GetView<AddSecurityEmailController> { @@ -97,47 +97,52 @@ class AddSecurityEmailView extends GetView<AddSecurityEmailController> {
97 ), 97 ),
98 ), 98 ),
99 const SizedBox(height: 32), 99 const SizedBox(height: 32),
100 - TextField(  
101 - controller: c.emailController,  
102 - keyboardType: TextInputType.emailAddress,  
103 - autofillHints: const [AutofillHints.email],  
104 - // onSubmitted: (_) =>  
105 - // c.sendVerificationEmail(isChangeEmail: isChangeEmail),  
106 - style: TextStyle(  
107 - color: colors.textPrimary,  
108 - fontSize: 16,  
109 - fontWeight: FontWeight.w400,  
110 - ),  
111 - decoration: InputDecoration(  
112 - hintText: l10n.securityEmailHint,  
113 - hintStyle: const TextStyle(  
114 - color: Color(0xFFD9D9D9),  
115 - fontSize: 16,  
116 - ),  
117 - filled: true,  
118 - fillColor: Colors.white,  
119 - contentPadding: const EdgeInsets.symmetric(  
120 - horizontal: 20,  
121 - ),  
122 - border: _inputBorder(),  
123 - enabledBorder: _inputBorder(),  
124 - focusedBorder: _inputBorder(  
125 - color: colors.primary,  
126 - ),  
127 - suffixIcon: Obx(() {  
128 - return c.emailInput.value.isNotEmpty  
129 - ? GestureDetector(  
130 - onTap: c.emailController.clear,  
131 - child: Icon(  
132 - Icons.cancel,  
133 - color: context.colors.textTertiary,  
134 - size: 18,  
135 - ),  
136 - )  
137 - : SizedBox();  
138 - }),  
139 - ),  
140 - ), 100 + Obx(() => TextField(
  101 + controller: c.emailController,
  102 + keyboardType: TextInputType.emailAddress,
  103 + autofillHints: const [AutofillHints.email],
  104 + // onSubmitted: (_) =>
  105 + // c.sendVerificationEmail(isChangeEmail: isChangeEmail),
  106 + style: TextStyle(
  107 + color: colors.textPrimary,
  108 + fontSize: 16,
  109 + fontWeight: FontWeight.w400,
  110 + ),
  111 + decoration: InputDecoration(
  112 + hintText: l10n.securityEmailHint,
  113 + hintStyle: const TextStyle(
  114 + color: Color(0xFFD9D9D9),
  115 + fontSize: 16,
  116 + ),
  117 + filled: true,
  118 + fillColor: Colors.white,
  119 + contentPadding: const EdgeInsets.symmetric(
  120 + horizontal: 20,
  121 + ),
  122 + border: _inputBorder(),
  123 + enabledBorder: _inputBorder(),
  124 + focusedBorder: OutlineInputBorder(
  125 + borderRadius: BorderRadius.circular(27),
  126 + borderSide: BorderSide(
  127 + color: (controller.showError ||
  128 + (controller.emailInput.value.isNotEmpty &&
  129 + controller.isEmailExist.value))
  130 + ? context.colors.warning
  131 + : context.colors.primary,
  132 + width: 1,
  133 + ),
  134 + ),
  135 + suffixIcon: c.emailInput.value.isNotEmpty
  136 + ? GestureDetector(
  137 + onTap: c.emailController.clear,
  138 + child: Icon(
  139 + Icons.cancel,
  140 + color: context.colors.textTertiary,
  141 + size: 18,
  142 + ),
  143 + )
  144 + : SizedBox()),
  145 + )),
141 SizedBox( 146 SizedBox(
142 height: 88, 147 height: 88,
143 child: Column( 148 child: Column(
@@ -603,7 +608,7 @@ class SetSecurityEmailPasswordView extends GetView<AddSecurityEmailController> { @@ -603,7 +608,7 @@ class SetSecurityEmailPasswordView extends GetView<AddSecurityEmailController> {
603 ? context.colors.primary 608 ? context.colors.primary
604 : c.hasClickSetAPassword.value 609 : c.hasClickSetAPassword.value
605 ? context.colors.warning 610 ? context.colors.warning
606 - : context.colors.textTertiary, 611 + : context.colors.primary,
607 width: 1, 612 width: 1,
608 ), 613 ),
609 ), 614 ),
@@ -723,7 +728,7 @@ class SetSecurityEmailPasswordView extends GetView<AddSecurityEmailController> { @@ -723,7 +728,7 @@ class SetSecurityEmailPasswordView extends GetView<AddSecurityEmailController> {
723 ? context.colors.primary 728 ? context.colors.primary
724 : c.hasClickSetAConfirmPassword.value 729 : c.hasClickSetAConfirmPassword.value
725 ? context.colors.warning 730 ? context.colors.warning
726 - : context.colors.textTertiary, 731 + : context.colors.primary,
727 width: 1, 732 width: 1,
728 ), 733 ),
729 ), 734 ),
@@ -913,7 +918,7 @@ class VerifyEmailPwdView extends GetView<AddSecurityEmailController> { @@ -913,7 +918,7 @@ class VerifyEmailPwdView extends GetView<AddSecurityEmailController> {
913 ? context.colors.primary 918 ? context.colors.primary
914 : c.hasClickVerifyPassword.value 919 : c.hasClickVerifyPassword.value
915 ? context.colors.warning 920 ? context.colors.warning
916 - : context.colors.textTertiary, 921 + : context.colors.primary,
917 width: 1, 922 width: 1,
918 ), 923 ),
919 ), 924 ),
@@ -1232,7 +1237,7 @@ class ReSetSecurityEmailPasswordView @@ -1232,7 +1237,7 @@ class ReSetSecurityEmailPasswordView
1232 ? context.colors.primary 1237 ? context.colors.primary
1233 : c.hasPostUpdatePassword.value 1238 : c.hasPostUpdatePassword.value
1234 ? context.colors.warning 1239 ? context.colors.warning
1235 - : context.colors.textTertiary, 1240 + : context.colors.primary,
1236 width: 1, 1241 width: 1,
1237 ), 1242 ),
1238 ), 1243 ),
@@ -1363,7 +1368,7 @@ class ReSetSecurityEmailPasswordView @@ -1363,7 +1368,7 @@ class ReSetSecurityEmailPasswordView
1363 : c.hasPostUpdateConfirmPassword 1368 : c.hasPostUpdateConfirmPassword
1364 .value 1369 .value
1365 ? context.colors.warning 1370 ? context.colors.warning
1366 - : context.colors.textTertiary, 1371 + : context.colors.primary,
1367 width: 1, 1372 width: 1,
1368 ), 1373 ),
1369 ), 1374 ),
@@ -1655,7 +1660,7 @@ class ForgotEmailVerificationView extends GetView<AddSecurityEmailController> { @@ -1655,7 +1660,7 @@ class ForgotEmailVerificationView extends GetView<AddSecurityEmailController> {
1655 .hasClickForgotSubmitNewPassword 1660 .hasClickForgotSubmitNewPassword
1656 .value 1661 .value
1657 ? context.colors.warning 1662 ? context.colors.warning
1658 - : context.colors.textTertiary, 1663 + : context.colors.primary,
1659 width: 1, 1664 width: 1,
1660 ), 1665 ),
1661 ), 1666 ),