fix: show acct by ltr

poppingmoon · Feb 4, 2025 · 33f59cd · 33f59cd
1 parent f25b545
commit 33f59cd
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 14 deletions.
diff --git a/lib/view/page/drive_page.dart b/lib/view/page/drive_page.dart
@@ -1,5 +1,6 @@
 import 'package:collection/collection.dart';
 import 'package:file_picker/file_picker.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:go_router/go_router.dart';
@@ -135,7 +136,9 @@ class DrivePage extends HookConsumerWidget {
                     context.push('/settings/accounts/$account/drive'),
                 child: Text(
                   '${t.misskey.inUse}: '
-                  '${prettyBytes(stats.usage)} / ${prettyBytes(stats.capacity)}',
+                  '${Unicode.LRI}'
+                  '${prettyBytes(stats.usage)} / ${prettyBytes(stats.capacity)}'
+                  '${Unicode.PDI}',
                 ),
               ),
             if (!selectFiles && !selectFolder)

diff --git a/lib/view/page/settings/settings_page.dart b/lib/view/page/settings/settings_page.dart
@@ -66,7 +66,13 @@ class SettingsPage extends HookConsumerWidget {
                                     user: TextSpan(text: account.username),
                                   ),
                                 ),
-                          subtitle: Text(account.toString()),
+                          subtitle: Align(
+                            alignment: AlignmentDirectional.centerStart,
+                            child: Text(
+                              account.toString(),
+                              textDirection: TextDirection.ltr,
+                            ),
+                          ),
                           onTap: () =>
                               context.push('/settings/accounts/$account'),
                         );

diff --git a/lib/view/page/settings/tabs_page.dart b/lib/view/page/settings/tabs_page.dart
@@ -47,7 +47,13 @@ class TabsPage extends HookConsumerWidget {
                         title: tabSettings.name != null
                             ? Text(tabSettings.name ?? '')
                             : TabTypeWidget(tabType: tabSettings.tabType),
-                        subtitle: Text(tabSettings.account.toString()),
+                        subtitle: Align(
+                          alignment: AlignmentDirectional.centerStart,
+                          child: Text(
+                            tabSettings.account.toString(),
+                            textDirection: TextDirection.ltr,
+                          ),
+                        ),
                         trailing: const Icon(Icons.drag_handle),
                         onTap: () =>
                             context.push('/settings/tab/${tabSettings.id}'),

diff --git a/lib/view/widget/account_preview.dart b/lib/view/widget/account_preview.dart
@@ -32,7 +32,10 @@ class AccountPreview extends ConsumerWidget {
       title: i != null
           ? UsernameWidget(account: account, user: i)
           : Text(account.username ?? t.aria.guest),
-      subtitle: Text(account.toString()),
+      subtitle: Align(
+        alignment: AlignmentDirectional.centerStart,
+        child: Text(account.toString(), textDirection: TextDirection.ltr),
+      ),
       trailing: trailing,
       onTap: onTap,
     );

diff --git a/lib/view/widget/acct_widget.dart b/lib/view/widget/acct_widget.dart
@@ -36,6 +36,7 @@ class AcctWidget extends StatelessWidget {
       ),
       maxLines: 1,
       overflow: TextOverflow.ellipsis,
+      textDirection: TextDirection.ltr,
     );
   }
 }
diff --git a/lib/view/widget/note_header.dart b/lib/view/widget/note_header.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -70,6 +71,7 @@ class NoteHeader extends HookConsumerWidget {
                       ),
                     ),
                   const WidgetSpan(child: SizedBox(width: 4.0)),
+                  const TextSpan(text: Unicode.LRI),
                   TextSpan(text: '@${note.user.username}'),
                   if (note.user case User(:final host?))
                     TextSpan(
@@ -78,6 +80,7 @@ class NoteHeader extends HookConsumerWidget {
                         color: style.color?.withValues(alpha: 0.5),
                       ),
                     ),
+                  const TextSpan(text: Unicode.PDI),
                   for (final role in note.user.badgeRoles)
                     if (role case UserBadgeRole(:final iconUrl?))
                       WidgetSpan(

diff --git a/lib/view/widget/timeline_drawer.dart b/lib/view/widget/timeline_drawer.dart
@@ -102,9 +102,13 @@ class TimelineDrawer extends HookConsumerWidget {
             title: i != null
                 ? UsernameWidget(account: account, user: i)
                 : Text(account.username ?? ''),
-            subtitle: Text(
-              account.toString(),
-              style: Theme.of(context).textTheme.bodySmall,
+            subtitle: Align(
+              alignment: AlignmentDirectional.centerStart,
+              child: Text(
+                account.toString(),
+                style: Theme.of(context).textTheme.bodySmall,
+                textDirection: TextDirection.ltr,
+              ),
             ),
             initiallyExpanded: account == currentAccount,
             controller: expansionTileControllers[index],

diff --git a/lib/view/widget/timeline_header.dart b/lib/view/widget/timeline_header.dart
@@ -1,7 +1,8 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:intl/intl.dart';
+import 'package:intl/intl.dart' hide TextDirection;
 import 'package:tinycolor2/tinycolor2.dart';
 
 import '../../i18n/strings.g.dart';
@@ -119,6 +120,7 @@ class TimelineHeader extends HookConsumerWidget {
               ),
               if (oneLine) ...[
                 const WidgetSpan(child: SizedBox(width: 8.0)),
+                const TextSpan(text: Unicode.LRI),
                 TextSpan(
                   text: tabSettings.account.toString(),
                   style: DefaultTextStyle.of(context).style.apply(
@@ -128,17 +130,22 @@ class TimelineHeader extends HookConsumerWidget {
                             .withValues(alpha: 0.85),
                       ),
                 ),
+                const TextSpan(text: Unicode.PDI),
               ],
             ],
           ),
           overflow: TextOverflow.ellipsis,
           maxLines: oneLine ? 1 : null,
         ),
         subtitle: !oneLine
-            ? Text(
-                tabSettings.account.toString(),
-                overflow: TextOverflow.ellipsis,
-                maxLines: 1,
+            ? Align(
+                alignment: AlignmentDirectional.centerStart,
+                child: Text(
+                  tabSettings.account.toString(),
+                  overflow: TextOverflow.ellipsis,
+                  maxLines: 1,
+                  textDirection: TextDirection.ltr,
+                ),
               )
             : null,
         onExpansionChanged: (value) {

diff --git a/lib/view/widget/user_info.dart b/lib/view/widget/user_info.dart
@@ -66,7 +66,10 @@ class UserInfo extends ConsumerWidget {
                                 style: style.apply(fontSizeFactor: 1.35),
                               ),
                             ),
-                            subtitle: AcctWidget(account: account, user: user),
+                            subtitle: Align(
+                              alignment: AlignmentDirectional.centerStart,
+                              child: AcctWidget(account: account, user: user),
+                            ),
                           ),
                         ),
                       ],

diff --git a/lib/view/widget/user_preview.dart b/lib/view/widget/user_preview.dart
@@ -32,7 +32,10 @@ class UserPreview extends StatelessWidget {
         alignment: AlignmentDirectional.centerStart,
         child: UsernameWidget(account: account, user: user),
       ),
-      subtitle: AcctWidget(account: account, user: user),
+      subtitle: Align(
+        alignment: AlignmentDirectional.centerStart,
+        child: AcctWidget(account: account, user: user),
+      ),
       trailing: trailing,
       onTap: onTap,
       onLongPress: onLongPress,