fix: make ui compatible with big font size

Signed-off-by: phuoc <[email protected]>
bitmark-inc · Sep 16, 2024 · 64f7a6b · 64f7a6b
1 parent 984e2cc
commit 64f7a6b
Show file tree

Hide file tree

Showing 21 changed files with 142 additions and 93 deletions.
diff --git a/lib/screen/account/recovery_phrase_page.dart b/lib/screen/account/recovery_phrase_page.dart
@@ -141,6 +141,7 @@ class _RecoveryPhrasePageState extends State<RecoveryPhrasePage> {
                                 borderRadius: BorderRadius.circular(5),
                               ),
                               child: RichText(
+                                textScaler: MediaQuery.textScalerOf(context),
                                 text: TextSpan(
                                   children: <TextSpan>[
                                     TextSpan(
@@ -243,7 +244,8 @@ class _RecoveryPhrasePageState extends State<RecoveryPhrasePage> {
 
   Widget _getBackUpState(BuildContext context) {
     final theme = Theme.of(context);
-    final customLinkStyle = theme.textTheme.ppMori400Black14.copyWith(
+    final commonStyle = theme.textTheme.ppMori400Black14;
+    final customLinkStyle = commonStyle.copyWith(
       decoration: TextDecoration.underline,
       decorationColor: AppColor.primaryBlack,
     );
@@ -255,19 +257,20 @@ class _RecoveryPhrasePageState extends State<RecoveryPhrasePage> {
       children: [
         Text(
           'SRP_is_crucial'.tr(),
-          style: theme.textTheme.ppMori400Black14,
+          style: commonStyle,
         ),
         const SizedBox(height: 12),
         Text(
           'as_a_non_custodial_wallet'.tr(),
-          style: theme.textTheme.ppMori400Black14,
+          style: commonStyle,
         ),
         const SizedBox(height: 12),
         Text('remember_if_you_lose_your_SRP'.tr(),
             style: theme.textTheme.ppMori700Black14),
         const SizedBox(height: 12),
         if (_isBackUpAvailable == true) ...[
           RichText(
+            textScaler: MediaQuery.textScalerOf(context),
             text: TextSpan(
               style: theme.textTheme.ppMori400Black14,
               children: <TextSpan>[
@@ -308,9 +311,10 @@ class _RecoveryPhrasePageState extends State<RecoveryPhrasePage> {
           ),
         ] else ...[
           RichText(
+            textScaler: MediaQuery.textScalerOf(context),
             text: TextSpan(
               style: theme.textTheme.ppMori400Black14,
-              children: <TextSpan>[
+              children: [
                 if (Platform.isIOS)
                   TextSpan(
                     text: 'icloud_keychain'.tr(),

diff --git a/lib/screen/bug_bounty_page.dart b/lib/screen/bug_bounty_page.dart
@@ -59,29 +59,30 @@ class BugBountyPage extends StatelessWidget {
               Text('Scope'.tr(), style: theme.textTheme.ppMori700Black24),
               const SizedBox(height: 32),
               RichText(
+                  textScaler: MediaQuery.textScalerOf(context),
                   text: TextSpan(
                       style: theme.textTheme.ppMori400Black16,
                       children: <TextSpan>[
-                    TextSpan(
-                      text: 'only_accept_new_bug'.tr(),
-                    ),
-                    TextSpan(
-                      recognizer: TapGestureRecognizer()
-                        ..onTap = () => unawaited(launchUrl(
-                              Uri.parse(KNOWN_BUGS_LINK),
-                              mode: LaunchMode.externalApplication,
-                            )),
-                      text: 'known_bugs'.tr(),
-                      style: ResponsiveLayout.isMobile
-                          ? theme.textTheme.linkStyle16.copyWith(
-                              fontWeight: FontWeight.normal,
-                              fontFamily: AppTheme.ppMori)
-                          : theme.textTheme.linkStyle16,
-                    ),
-                    TextSpan(
-                      text: 'not_reward_yet'.tr(),
-                    ),
-                  ])),
+                        TextSpan(
+                          text: 'only_accept_new_bug'.tr(),
+                        ),
+                        TextSpan(
+                          recognizer: TapGestureRecognizer()
+                            ..onTap = () => unawaited(launchUrl(
+                                  Uri.parse(KNOWN_BUGS_LINK),
+                                  mode: LaunchMode.externalApplication,
+                                )),
+                          text: 'known_bugs'.tr(),
+                          style: ResponsiveLayout.isMobile
+                              ? theme.textTheme.linkStyle16.copyWith(
+                                  fontWeight: FontWeight.normal,
+                                  fontFamily: AppTheme.ppMori)
+                              : theme.textTheme.linkStyle16,
+                        ),
+                        TextSpan(
+                          text: 'not_reward_yet'.tr(),
+                        ),
+                      ])),
               const SizedBox(height: 32),
               Text('rewards'.tr(), style: theme.textTheme.ppMori700Black24),
               const SizedBox(height: 32),
@@ -121,6 +122,7 @@ class BugBountyPage extends StatelessWidget {
                           ),
                           Expanded(
                             child: RichText(
+                              textScaler: MediaQuery.textScalerOf(context),
                               text: TextSpan(
                                 style: theme.textTheme.ppMori400Black14,
                                 children: <TextSpan>[

diff --git a/lib/screen/connection/connection_details_page.dart b/lib/screen/connection/connection_details_page.dart
@@ -171,6 +171,7 @@ class ConnectionDetailsPage extends StatelessWidget {
               ),
               const SizedBox(height: 40),
               RichText(
+                textScaler: MediaQuery.textScalerOf(context),
                 text: TextSpan(
                   style: theme.primaryTextTheme.ppMori400White14,
                   children: <TextSpan>[

diff --git a/lib/screen/feralfile_home/artwork_view.dart b/lib/screen/feralfile_home/artwork_view.dart
@@ -271,7 +271,7 @@ class _SeriesViewState extends State<SeriesView> {
               if (series.exhibition != null) ...[
                 const SizedBox(height: 12),
                 RichText(
-                  overflow: TextOverflow.ellipsis,
+                  textScaler: MediaQuery.textScalerOf(context),
                   text: TextSpan(
                     style: defaultStyle.copyWith(color: AppColor.auQuickSilver),
                     children: [

diff --git a/lib/screen/feralfile_home/list_exhibition_view.dart b/lib/screen/feralfile_home/list_exhibition_view.dart
@@ -309,6 +309,7 @@ class _ListExhibitionViewState extends State<ListExhibitionView> {
                         if (exhibition.isSoloExhibition &&
                             exhibition.artists != null) ...[
                           RichText(
+                            textScaler: MediaQuery.textScalerOf(context),
                             text: TextSpan(
                               style: subTitleStyle.copyWith(
                                   decorationColor: AppColor.disabledColor),
@@ -332,6 +333,7 @@ class _ListExhibitionViewState extends State<ListExhibitionView> {
                         ],
                         if (exhibition.curator != null)
                           RichText(
+                            textScaler: MediaQuery.textScalerOf(context),
                             text: TextSpan(
                               style: subTitleStyle.copyWith(
                                   decorationColor: AppColor.disabledColor),

diff --git a/lib/screen/interactive_postcard/leaderboard/postcard_leaderboard_view.dart b/lib/screen/interactive_postcard/leaderboard/postcard_leaderboard_view.dart
@@ -191,6 +191,7 @@ class _PostcardLeaderboardViewState extends State<PostcardLeaderboardView> {
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       RichText(
+                        textScaler: MediaQuery.textScalerOf(context),
                         text: TextSpan(
                           style: theme.textTheme.moMASans400Black12
                               .copyWith(fontSize: 18),

diff --git a/lib/screen/interactive_postcard/postcard_explain.dart b/lib/screen/interactive_postcard/postcard_explain.dart
@@ -232,6 +232,7 @@ class _PostcardExplainState extends State<PostcardExplain> {
               ),
               const SizedBox(height: 40),
               Text.rich(
+                textScaler: MediaQuery.textScalerOf(context),
                 TextSpan(
                   style: termsConditionsStyle,
                   children: <TextSpan>[

diff --git a/lib/screen/new_onboarding_page.dart b/lib/screen/new_onboarding_page.dart
@@ -87,48 +87,56 @@ class _NewOnboardingPageState extends State<NewOnboardingPage> {
     bool subDescFixedSized = true,
   }) {
     final theme = Theme.of(context);
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 15),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Container(
-                height: 59,
-              ),
-              Text(
-                title,
-                style: theme.textTheme.ppMori700Black36.copyWith(
-                  color: AppColor.white,
-                ),
-              ),
-              Container(
-                height: 30,
-              ),
-              Text(
-                desc,
-                style: theme.textTheme.ppMori700White18.copyWith(
-                  fontWeight: FontWeight.w400,
-                ),
-              ),
-            ],
+    final commonHeader = Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 15),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Container(
+            height: 59,
           ),
-        ),
-        if (subDescFixedSized) ...[
-          const Spacer(),
+          Text(
+            title,
+            style: theme.textTheme.ppMori700Black36.copyWith(
+              color: AppColor.white,
+            ),
+          ),
+          Container(
+            height: 30,
+          ),
+          Text(
+            desc,
+            style: theme.textTheme.ppMori700White18.copyWith(
+              fontWeight: FontWeight.w400,
+            ),
+          ),
+        ],
+      ),
+    );
+    if (subDescFixedSized) {
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Expanded(child: SingleChildScrollView(child: commonHeader)),
           SizedBox(
             height: 514,
             child: subDesc,
           )
-        ] else ...[
-          Expanded(
-            child: subDesc,
-          )
         ],
-      ],
-    );
+      );
+    } else {
+      return SingleChildScrollView(
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            commonHeader,
+            const SizedBox(height: 30),
+            subDesc,
+            const SizedBox(height: 40),
+          ],
+        ),
+      );
+    }
   }
 
   Widget _onboardingItemVideo(BuildContext context,
@@ -200,6 +208,7 @@ class _NewOnboardingPageState extends State<NewOnboardingPage> {
                   context,
                   title: 'membership'.tr(),
                   desc: 'membership_desc'.tr(),
+                  subDescFixedSized: false,
                   subDesc: Column(
                     children: [
                       if (!isSubscribed)

diff --git a/lib/screen/onboarding/import_address/import_seeds.dart b/lib/screen/onboarding/import_address/import_seeds.dart
@@ -106,6 +106,7 @@ class _ImportSeedsPageState extends State<ImportSeedsPage> {
                       ),
                       const SizedBox(height: 20),
                       RichText(
+                        textScaler: MediaQuery.textScalerOf(context),
                         text: TextSpan(
                           children: <TextSpan>[
                             TextSpan(

diff --git a/lib/screen/playlists/edit_playlist/edit_playlist.dart b/lib/screen/playlists/edit_playlist/edit_playlist.dart
@@ -448,6 +448,7 @@ class _EditPlaylistScreenState extends State<EditPlaylistScreen> {
             tr('remove_from_list'),
             '',
             descriptionWidget: RichText(
+              textScaler: MediaQuery.textScalerOf(context),
               text: TextSpan(
                 children: [
                   TextSpan(

diff --git a/lib/screen/scan_qr/scan_qr_page.dart b/lib/screen/scan_qr/scan_qr_page.dart
@@ -494,10 +494,12 @@ class QRScanViewState extends State<QRScanView>
     }
     return Padding(
         padding: const EdgeInsets.symmetric(horizontal: 44),
-        child: SplittedBanner(
-            headerWidget: _instructionHeader(context),
-            bodyWidget:
-                _instructionBody(context, widget.scannerItem.instructions)));
+        child: SingleChildScrollView(
+          child: SplittedBanner(
+              headerWidget: _instructionHeader(context),
+              bodyWidget:
+                  _instructionBody(context, widget.scannerItem.instructions)),
+        ));
   }
 
   Widget _instructionHeader(BuildContext context) {
@@ -508,20 +510,23 @@ class QRScanViewState extends State<QRScanView>
           'assets/images/icon_scan.svg',
         ),
         const SizedBox(width: 20),
-        RichText(
-          text: TextSpan(
-            text: 'scan_qr_code'.tr(),
-            children: [
-              TextSpan(
-                text: ' ',
-                style: theme.textTheme.ppMori400Grey14,
-              ),
-              TextSpan(
-                text: 'in_order_to'.tr(),
-                style: theme.textTheme.ppMori400Grey14,
-              ),
-            ],
-            style: theme.textTheme.ppMori400White14,
+        Expanded(
+          child: RichText(
+            textScaler: MediaQuery.textScalerOf(context),
+            text: TextSpan(
+              text: 'scan_qr_code'.tr(),
+              children: [
+                TextSpan(
+                  text: ' ',
+                  style: theme.textTheme.ppMori400Grey14,
+                ),
+                TextSpan(
+                  text: 'in_order_to'.tr(),
+                  style: theme.textTheme.ppMori400Grey14,
+                ),
+              ],
+              style: theme.textTheme.ppMori400White14,
+            ),
           ),
         ),
       ],
@@ -539,18 +544,20 @@ class QRScanViewState extends State<QRScanView>
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
-                  Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Text(
-                        instruction.name,
-                        style: theme.textTheme.ppMori700White14,
-                      ),
-                      Text(
-                        instruction.detail,
-                        style: theme.textTheme.ppMori400Grey14,
-                      )
-                    ],
+                  Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          instruction.name,
+                          style: theme.textTheme.ppMori700White14,
+                        ),
+                        Text(
+                          instruction.detail,
+                          style: theme.textTheme.ppMori400Grey14,
+                        )
+                      ],
+                    ),
                   ),
                   instruction.icon ?? const SizedBox(),
                 ],
@@ -591,6 +598,7 @@ class QRScanViewState extends State<QRScanView>
         injector<DeeplinkService>().handleDeeplink(
           code,
           delay: const Duration(seconds: 1),
+          // ignore: avoid_annotating_with_dynamic
           onFinished: (dynamic object) {
             if (mounted) {
               setState(() {

diff --git a/lib/screen/settings/connection/accounts_view.dart b/lib/screen/settings/connection/accounts_view.dart
@@ -329,6 +329,7 @@ class _AccountsViewState extends State<AccountsView> {
                     ),
                     const SizedBox(height: 40),
                     RichText(
+                      textScaler: MediaQuery.textScalerOf(context),
                       text: TextSpan(
                         style: theme.primaryTextTheme.ppMori400White14,
                         children: <TextSpan>[

diff --git a/lib/screen/settings/crypto/send/send_crypto_page.dart b/lib/screen/settings/crypto/send/send_crypto_page.dart
@@ -190,6 +190,8 @@ class _SendCryptoPageState extends State<SendCryptoPage> {
                                   if (state.maxAllow != null) ...[
                                     GestureDetector(
                                       child: RichText(
+                                        textScaler:
+                                            MediaQuery.textScalerOf(context),
                                         text: TextSpan(children: [
                                           TextSpan(
                                               text: 'max'.tr(),

diff --git a/lib/screen/settings/crypto/send_artwork/send_artwork_page.dart b/lib/screen/settings/crypto/send_artwork/send_artwork_page.dart
@@ -622,6 +622,7 @@ class _SendArtworkPageState extends State<SendArtworkPage> {
                 ),
                 const SizedBox(height: 8),
                 RichText(
+                  textScaler: MediaQuery.textScalerOf(context),
                   text: TextSpan(
                     style: theme.textTheme.ppMori400White14,
                     children: [