常守达 / doublefeel_flutter · Commits

Go to a project

Commit 7d19d6c92e532362b0e4e72ec169c5745d33eeb8

Authored by 常守达
1 parent 9daa25e6
build: skipped

fix(app): UI修复

Inline Side-by-side
Showing 2 changed files with 17 additions and 11 deletions
@@ -104,9 +104,9 @@ class LoginView extends GetView<LoginController> { @@ -104,9 +104,9 @@ class LoginView extends GetView<LoginController> {
104 height: 42, 104 height: 42,
105 ), 105 ),
106 SizedBox(height: 8), 106 SizedBox(height: 8),
107 - Padding(  
108 - padding: EdgeInsets.symmetric(  
109 - horizontal: region == AppRegion.china ? 0 : 40), 107 + SizedBox(
  108 + // width: region == AppRegion.china ? 242 :
  109 + width: 242,
110 child: Text( 110 child: Text(
111 l10n.loginSlogan, 111 l10n.loginSlogan,
112 textAlign: TextAlign.center, 112 textAlign: TextAlign.center,
@@ -115,7 +115,8 @@ class LoginView extends GetView<LoginController> { @@ -115,7 +115,8 @@ class LoginView extends GetView<LoginController> {
115 fontSize: 12, 115 fontSize: 12,
116 fontWeight: FontWeight.w400, 116 fontWeight: FontWeight.w400,
117 height: 1.50, 117 height: 1.50,
118 - letterSpacing: region == AppRegion.china ? 6 : 1, 118 + letterSpacing:
  119 + region == AppRegion.china ? 6 : 1.2,
119 ), 120 ),
120 ), 121 ),
121 ), 122 ),
@@ -630,15 +630,20 @@ class _NotificationPermissionPage extends StatelessWidget { @@ -630,15 +630,20 @@ class _NotificationPermissionPage extends StatelessWidget {
630 child: Column( 630 child: Column(
631 children: [ 631 children: [
632 OnboardingTitleText( 632 OnboardingTitleText(
633 - '${l10n.onboardingNotificationTitle}\n${l10n.onboardingNotificationSubtitle}', 633 + l10n.onboardingNotificationSubtitle.isNotEmpty
  634 + ? '${l10n.onboardingNotificationTitle}\n${l10n.onboardingNotificationSubtitle}'
  635 + : l10n.onboardingNotificationTitle,
634 maxWidth: 320, 636 maxWidth: 320,
635 ), 637 ),
636 - const SizedBox(height: 8),  
637 - Padding(  
638 - padding: const EdgeInsets.symmetric(horizontal: 8),  
639 - child: OnboardingBodyText(  
640 - l10n.onboardingNotificationBody,  
641 - fontSize: 14, 638 + const SizedBox(height: 12),
  639 + SizedBox(
  640 + width: l10n.onboardingNotificationSubtitle.isNotEmpty ? 327 : 280,
  641 + child: Padding(
  642 + padding: const EdgeInsets.symmetric(horizontal: 8),
  643 + child: OnboardingBodyText(
  644 + l10n.onboardingNotificationBody,
  645 + fontSize: 14,
  646 + ),
642 ), 647 ),
643 ), 648 ),
644 const SizedBox(height: 20), 649 const SizedBox(height: 20),