Skip to content

fix: disable text scaling inside WidgetSpan #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 27, 2024
Merged

fix: disable text scaling inside WidgetSpan #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9ab157
fix: use Text.rich for labels in profiles
poppingmoon Jun 27, 2024
0ca78bd
fix: disable text scaling inside WidgetSpan
poppingmoon Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions lib/view/page/about_aria_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ class AboutAriaPage extends HookConsumerWidget {
child: Text(
'Miria',
style: TextStyle(color: colors.link),
textScaler: TextScaler.noScaling,
),
),
),
Expand All @@ -95,6 +96,7 @@ class AboutAriaPage extends HookConsumerWidget {
child: Text(
'Misskey',
style: TextStyle(color: colors.link),
textScaler: TextScaler.noScaling,
),
),
),
Expand All @@ -117,6 +119,7 @@ class AboutAriaPage extends HookConsumerWidget {
child: Text(
'@[email protected]',
style: TextStyle(color: colors.mention),
textScaler: TextScaler.noScaling,
),
),
),
Expand All @@ -140,6 +143,7 @@ class AboutAriaPage extends HookConsumerWidget {
child: Text(
'CC-BY 4.0',
style: TextStyle(color: colors.link),
textScaler: TextScaler.noScaling,
),
),
),
Expand Down
2 changes: 2 additions & 0 deletions lib/view/page/gallery/gallery_post_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ class GalleryPostPage extends ConsumerWidget {
child: TimeWidget(
time: post.createdAt,
detailed: true,
textScaler: TextScaler.noScaling,
),
),
],
Expand All @@ -246,6 +247,7 @@ class GalleryPostPage extends ConsumerWidget {
child: TimeWidget(
time: post.updatedAt,
detailed: true,
textScaler: TextScaler.noScaling,
),
),
],
Expand Down
2 changes: 2 additions & 0 deletions lib/view/page/page/page_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,7 @@ class PagePage extends ConsumerWidget {
child: TimeWidget(
time: page.createdAt,
detailed: true,
textScaler: TextScaler.noScaling,
),
),
],
Expand Down Expand Up @@ -409,6 +410,7 @@ class PagePage extends ConsumerWidget {
child: TimeWidget(
time: page.updatedAt,
detailed: true,
textScaler: TextScaler.noScaling,
),
),
],
Expand Down
2 changes: 2 additions & 0 deletions lib/view/page/play/play_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ class PlayPage extends HookConsumerWidget {
child: TimeWidget(
time: play.createdAt,
detailed: true,
textScaler: TextScaler.noScaling,
),
),
],
Expand All @@ -187,6 +188,7 @@ class PlayPage extends HookConsumerWidget {
child: TimeWidget(
time: play.updatedAt,
detailed: true,
textScaler: TextScaler.noScaling,
),
),
],
Expand Down
1 change: 1 addition & 0 deletions lib/view/page/settings/languages_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ class LanguagesPage extends ConsumerWidget {
],
),
textAlign: TextAlign.center,
textScaler: TextScaler.noScaling,
),
),
),
Expand Down
32 changes: 18 additions & 14 deletions lib/view/page/user/user_home.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,22 +451,24 @@ class _UserHome extends ConsumerWidget {
children: [
Padding(
padding: const EdgeInsets.all(4.0),
child: Center(
child: Row(
mainAxisSize: MainAxisSize.min,
child: Text.rich(
TextSpan(
children: [
const Padding(
padding: EdgeInsets.only(right: 2.0),
const WidgetSpan(
child: Icon(Icons.cake),
),
Text(
t.misskey.birthday,
const WidgetSpan(
child: SizedBox(width: 2.0),
),
TextSpan(
text: t.misskey.birthday,
style: const TextStyle(
fontWeight: FontWeight.bold,
),
),
],
),
textAlign: TextAlign.center,
),
),
Padding(
Expand All @@ -481,22 +483,24 @@ class _UserHome extends ConsumerWidget {
children: [
Padding(
padding: const EdgeInsets.all(4.0),
child: Center(
child: Row(
mainAxisSize: MainAxisSize.min,
child: Text.rich(
TextSpan(
children: [
const Padding(
padding: EdgeInsets.only(right: 2.0),
const WidgetSpan(
child: Icon(Icons.calendar_today),
),
Text(
t.misskey.registeredDate,
const WidgetSpan(
child: SizedBox(width: 2.0),
),
TextSpan(
text: t.misskey.registeredDate,
style: const TextStyle(
fontWeight: FontWeight.bold,
),
),
],
),
textAlign: TextAlign.center,
),
),
Padding(
Expand Down
10 changes: 6 additions & 4 deletions lib/view/widget/bot_badge.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import 'package:flutter/material.dart';

class BotBadge extends StatelessWidget {
const BotBadge({super.key});
const BotBadge({super.key, this.textScaler});

final TextScaler? textScaler;

@override
Widget build(BuildContext context) {
Expand All @@ -13,9 +15,9 @@ class BotBadge extends StatelessWidget {
Border.all(color: Theme.of(context).colorScheme.outlineVariant),
borderRadius: BorderRadius.circular(4.0),
),
child: const Padding(
padding: EdgeInsets.symmetric(horizontal: 4.0),
child: Text('bot'),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 4.0),
child: Text('bot', textScaler: textScaler),
),
),
);
Expand Down
1 change: 1 addition & 0 deletions lib/view/widget/note_detailed_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,7 @@ class NoteDetailedWidget extends HookConsumerWidget {
color: colors.renote,
fontStyle: FontStyle.italic,
),
textScaler: TextScaler.noScaling,
),
),
),
Expand Down
4 changes: 3 additions & 1 deletion lib/view/widget/note_header.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ class NoteHeader extends HookConsumerWidget {
color: style.color?.withOpacity(0.8),
fontSizeFactor: 0.8,
),
child: const BotBadge(),
child: const BotBadge(
textScaler: TextScaler.noScaling,
),
),
),
),
Expand Down
1 change: 1 addition & 0 deletions lib/view/widget/sub_note_content.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ class SubNoteContent extends HookConsumerWidget {
color: colors.renote,
fontStyle: FontStyle.italic,
),
textScaler: TextScaler.noScaling,
),
),
),
Expand Down