Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions lib/pages/entry_detail_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import 'package:daily_you/models/image.dart';
import 'package:daily_you/providers/entries_provider.dart';
import 'package:daily_you/providers/entry_images_provider.dart';
import 'package:daily_you/time_manager.dart';
import 'package:daily_you/widgets/scaled_markdown.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:daily_you/l10n/generated/app_localizations.dart';
Expand Down Expand Up @@ -249,10 +250,7 @@ class EntryDetails extends StatelessWidget {
child: Padding(
padding: const EdgeInsets.only(
left: 8, top: 4, bottom: 4, right: 8),
child: MarkdownBlock(
config: theme.brightness == Brightness.light
? MarkdownConfig.defaultConfig
: MarkdownConfig.darkConfig,
child: ScaledMarkdown(
data: entry.text,
))),
Padding(
Expand Down
8 changes: 2 additions & 6 deletions lib/widgets/entry_card_widget.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:daily_you/l10n/generated/app_localizations.dart';
import 'package:daily_you/models/image.dart';
import 'package:daily_you/time_manager.dart';
import 'package:daily_you/widgets/scaled_markdown.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:daily_you/models/entry.dart';
Expand Down Expand Up @@ -52,12 +53,7 @@ class EntryCardWidget extends StatelessWidget {
IgnorePointer(
child: SizedBox(
width: double.maxFinite,
child: MarkdownBlock(
config:
theme.brightness == Brightness.light
? MarkdownConfig.defaultConfig
: MarkdownConfig.darkConfig,
data: entry.text),
child: ScaledMarkdown(data: entry.text),
))
]),
)
Expand Down
7 changes: 2 additions & 5 deletions lib/widgets/large_entry_card_widget.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:daily_you/models/image.dart';
import 'package:daily_you/time_manager.dart';
import 'package:daily_you/widgets/scaled_markdown.dart';
import 'package:flutter/material.dart';
import 'package:daily_you/l10n/generated/app_localizations.dart';
import 'package:intl/intl.dart';
Expand Down Expand Up @@ -94,11 +95,7 @@ class LargeEntryCardWidget extends StatelessWidget {
child: Wrap(children: [
IgnorePointer(
child: (entry.text.isNotEmpty)
? MarkdownBlock(
config: theme.brightness == Brightness.light
? MarkdownConfig.defaultConfig
: MarkdownConfig.darkConfig,
data: entry.text)
? ScaledMarkdown(data: entry.text)
: Text(
AppLocalizations.of(context)!.writeSomethingHint,
style: TextStyle(
Expand Down
39 changes: 39 additions & 0 deletions lib/widgets/scaled_markdown.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import 'package:flutter/material.dart';
import 'package:markdown_widget/markdown_widget.dart';

// Fixes duplicate scaling issues with markdown_widget
// See: https://github.com/asjqkkkk/markdown_widget/issues/208
class ScaledMarkdown extends StatelessWidget {
final String data;
const ScaledMarkdown({super.key, required this.data});

@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
return MarkdownBlock(
config: theme.brightness == Brightness.light
? MarkdownConfig.defaultConfig
: MarkdownConfig.darkConfig,
generator: MarkdownGenerator(richTextBuilder: (span) {
return Builder(builder: (context) {
final shouldIgnoreTextScaler =
context.getInheritedWidgetOfExactType<_WithTextScalar>() != null;
final child = Text.rich(span);
return shouldIgnoreTextScaler
? MediaQuery.withNoTextScaling(child: child)
: _WithTextScalar(child: child);
});
}),
data: data,
);
}
}

class _WithTextScalar extends InheritedWidget {
const _WithTextScalar({required super.child});

@override
bool updateShouldNotify(covariant _WithTextScalar oldWidget) {
return false;
}
}
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies:
ref: release
device_info_plus: ^11.2.0
fl_chart: ^0.66.2
markdown_widget: ^2.3.2+3
markdown_widget: ^2.3.2+8

intl: ^0.20.0
share_plus: ^10.1.3
Expand Down