From 7da5790eb27685adf71833114936f6bbdddc52f2 Mon Sep 17 00:00:00 2001 From: debuggerx Date: Tue, 8 Feb 2022 18:04:14 +0800 Subject: [PATCH] fix: font issue on linux. --- app/lib/themes/dark.dart | 5 +- app/lib/themes/light.dart | 5 +- app/lib/widgets/dde_markdown_field.dart | 124 ++++++++++++++++---------------- app/lib/widgets/market.dart | 26 ++++--- app/lib/widgets/me.dart | 26 ++++--- 5 files changed, 91 insertions(+), 95 deletions(-) diff --git a/app/lib/themes/dark.dart b/app/lib/themes/dark.dart index 81b91a0..8f4a8e0 100644 --- a/app/lib/themes/dark.dart +++ b/app/lib/themes/dark.dart @@ -18,11 +18,11 @@ var darkTheme = _darkTheme.copyWith( textTheme: _darkTheme.textTheme.copyWith( headline1: TextStyle( color: Color(0xffc0c6d4), - fontFamilyFallback: kIsWeb ? null : [defaultFontFamily], + fontFamily: kIsWeb ? null : defaultFontFamily, ), bodyText2: TextStyle( color: Color(0xffc0c6d4), - fontFamilyFallback: kIsWeb ? null : [defaultFontFamily], + fontFamily: kIsWeb ? null : defaultFontFamily, ), ), popupMenuTheme: _darkTheme.popupMenuTheme.copyWith( @@ -34,6 +34,7 @@ var darkTheme = _darkTheme.copyWith( tooltipTheme: _darkTheme.tooltipTheme.copyWith( textStyle: TextStyle( color: Colors.grey, + fontFamily: kIsWeb ? null : defaultFontFamily, ), padding: EdgeInsets.symmetric(horizontal: 3, vertical: 2), decoration: BoxDecoration( diff --git a/app/lib/themes/light.dart b/app/lib/themes/light.dart index 1cb8ef5..f8037b9 100644 --- a/app/lib/themes/light.dart +++ b/app/lib/themes/light.dart @@ -18,11 +18,11 @@ var lightTheme = _lightTheme.copyWith( textTheme: _lightTheme.textTheme.copyWith( headline1: TextStyle( color: Color(0xff414d68), - fontFamilyFallback: kIsWeb ? null : [defaultFontFamily], + fontFamily: kIsWeb ? null : defaultFontFamily, ), bodyText2: TextStyle( color: Color(0xff414d68), - fontFamilyFallback: kIsWeb ? null : [defaultFontFamily], + fontFamily: kIsWeb ? null : defaultFontFamily, ), ), popupMenuTheme: _lightTheme.popupMenuTheme.copyWith( @@ -34,6 +34,7 @@ var lightTheme = _lightTheme.copyWith( tooltipTheme: _lightTheme.tooltipTheme.copyWith( textStyle: TextStyle( color: Colors.grey.shade600, + fontFamily: kIsWeb ? null : defaultFontFamily, ), padding: EdgeInsets.symmetric(horizontal: 3, vertical: 2), decoration: BoxDecoration( diff --git a/app/lib/widgets/dde_markdown_field.dart b/app/lib/widgets/dde_markdown_field.dart index 3092c6b..ff53ac2 100644 --- a/app/lib/widgets/dde_markdown_field.dart +++ b/app/lib/widgets/dde_markdown_field.dart @@ -60,74 +60,72 @@ class _DMarkdownFieldState extends State { ? context.watch().activeColor ?? Color(0xff565656) : Color(0xff565656)), ), - child: DefaultTextStyle( - style: context.t.textTheme.bodyText2!, - child: isPreview - ? GestureDetector( - onTap: widget.readOnly - ? null - : () { - setState(() { - _previewText = null; - }); - }, - child: MouseRegion( - cursor: widget.readOnly ? SystemMouseCursors.basic : SystemMouseCursors.text, - child: MdPreview( - text: _previewText ?? '', - padding: EdgeInsets.only(left: 15), - onTapLink: H.launchURL, - onCodeCopied: () { - Notificator.success( - context, - title: LocaleKeys.info_code_copied_titte.tr(), - description: LocaleKeys.info_code_copied_description.tr(), - ); + child: isPreview + ? GestureDetector( + onTap: widget.readOnly + ? null + : () { + setState(() { + _previewText = null; + }); }, - widgetImage: (imageUrl) => CachedNetworkImage( - imageUrl: imageUrl, - placeholder: (context, url) => const SizedBox( - width: double.infinity, - height: 300, - child: Center(child: CircularProgressIndicator()), - ), - errorWidget: (context, url, error) => const Icon(Icons.error), + child: MouseRegion( + cursor: widget.readOnly ? SystemMouseCursors.basic : SystemMouseCursors.text, + child: MdPreview( + text: _previewText ?? '', + padding: EdgeInsets.only(left: 15), + onTapLink: H.launchURL, + textStyle: context.t.textTheme.bodyText2, + onCodeCopied: () { + Notificator.success( + context, + title: LocaleKeys.info_code_copied_titte.tr(), + description: LocaleKeys.info_code_copied_description.tr(), + ); + }, + widgetImage: (imageUrl) => CachedNetworkImage( + imageUrl: imageUrl, + placeholder: (context, url) => const SizedBox( + width: double.infinity, + height: 300, + child: Center(child: CircularProgressIndicator()), ), + errorWidget: (context, url, error) => const Icon(Icons.error), ), ), - ) - : MdEditor( - initText: widget.initText, - hintText: LocaleKeys.md_editor_init_text.tr(), - textFocusNode: _focusNode, - padding: EdgeInsets.symmetric(horizontal: 5), - onComplete: (content) { - if (content == widget.initText) - setState(() { - _previewText = content; - }); - else - widget.onComplete(content); - }, - actionMessages: { - ActionType.done: LocaleKeys.md_editor_done.tr(), - ActionType.undo: LocaleKeys.md_editor_undo.tr(), - ActionType.redo: LocaleKeys.md_editor_redo.tr(), - ActionType.image: LocaleKeys.md_editor_image.tr(), - ActionType.link: LocaleKeys.md_editor_link.tr(), - ActionType.fontBold: LocaleKeys.md_editor_font_bold.tr(), - ActionType.fontItalic: LocaleKeys.md_editor_font_italic.tr(), - ActionType.fontStrikethrough: LocaleKeys.md_editor_font_strikethrough.tr(), - ActionType.textQuote: LocaleKeys.md_editor_text_quote.tr(), - ActionType.list: LocaleKeys.md_editor_list.tr(), - ActionType.h1: LocaleKeys.md_editor_h1.tr(), - ActionType.h2: LocaleKeys.md_editor_h2.tr(), - ActionType.h3: LocaleKeys.md_editor_h3.tr(), - ActionType.h4: LocaleKeys.md_editor_h4.tr(), - ActionType.h5: LocaleKeys.md_editor_h5.tr(), - }, ), - ), + ) + : MdEditor( + initText: widget.initText, + hintText: LocaleKeys.md_editor_init_text.tr(), + textFocusNode: _focusNode, + padding: EdgeInsets.symmetric(horizontal: 5), + onComplete: (content) { + if (content == widget.initText) + setState(() { + _previewText = content; + }); + else + widget.onComplete(content); + }, + actionMessages: { + ActionType.done: LocaleKeys.md_editor_done.tr(), + ActionType.undo: LocaleKeys.md_editor_undo.tr(), + ActionType.redo: LocaleKeys.md_editor_redo.tr(), + ActionType.image: LocaleKeys.md_editor_image.tr(), + ActionType.link: LocaleKeys.md_editor_link.tr(), + ActionType.fontBold: LocaleKeys.md_editor_font_bold.tr(), + ActionType.fontItalic: LocaleKeys.md_editor_font_italic.tr(), + ActionType.fontStrikethrough: LocaleKeys.md_editor_font_strikethrough.tr(), + ActionType.textQuote: LocaleKeys.md_editor_text_quote.tr(), + ActionType.list: LocaleKeys.md_editor_list.tr(), + ActionType.h1: LocaleKeys.md_editor_h1.tr(), + ActionType.h2: LocaleKeys.md_editor_h2.tr(), + ActionType.h3: LocaleKeys.md_editor_h3.tr(), + ActionType.h4: LocaleKeys.md_editor_h4.tr(), + ActionType.h5: LocaleKeys.md_editor_h5.tr(), + }, + ), ); }), ); diff --git a/app/lib/widgets/market.dart b/app/lib/widgets/market.dart index 353dc07..d717881 100644 --- a/app/lib/widgets/market.dart +++ b/app/lib/widgets/market.dart @@ -237,22 +237,20 @@ class _MarketWidgetState extends State { ), child: Padding( padding: const EdgeInsets.only(left: 8), - child: DefaultTextStyle( - style: context.t.textTheme.bodyText2!, - child: MdPreview( - text: _schemes.firstWhereOrNull((e) => e.uuid == _selected)?.description ?? '', - widgetImage: (imageUrl) => CachedNetworkImage( - imageUrl: imageUrl, - placeholder: (context, url) => const SizedBox( - width: double.infinity, - height: 300, - child: Center(child: CircularProgressIndicator()), - ), - errorWidget: (context, url, error) => const Icon(Icons.error), + child: MdPreview( + text: _schemes.firstWhereOrNull((e) => e.uuid == _selected)?.description ?? '', + widgetImage: (imageUrl) => CachedNetworkImage( + imageUrl: imageUrl, + placeholder: (context, url) => const SizedBox( + width: double.infinity, + height: 300, + child: Center(child: CircularProgressIndicator()), ), - onTapLink: H.launchURL, - onCodeCopied: () {}, + errorWidget: (context, url, error) => const Icon(Icons.error), ), + onTapLink: H.launchURL, + textStyle: context.t.textTheme.bodyText2, + onCodeCopied: () {}, ), ), ), diff --git a/app/lib/widgets/me.dart b/app/lib/widgets/me.dart index 74af295..3b77805 100644 --- a/app/lib/widgets/me.dart +++ b/app/lib/widgets/me.dart @@ -242,22 +242,20 @@ class _MeWidgetState extends State { ), child: Padding( padding: const EdgeInsets.only(left: 8), - child: DefaultTextStyle( - style: context.t.textTheme.bodyText2!, - child: MdPreview( - text: _schemes.firstWhereOrNull((e) => e.uuid == _selected)?.description ?? '', - onTapLink: H.launchURL, - widgetImage: (imageUrl) => CachedNetworkImage( - imageUrl: imageUrl, - placeholder: (context, url) => const SizedBox( - width: double.infinity, - height: 300, - child: Center(child: CircularProgressIndicator()), - ), - errorWidget: (context, url, error) => const Icon(Icons.error), + child: MdPreview( + text: _schemes.firstWhereOrNull((e) => e.uuid == _selected)?.description ?? '', + onTapLink: H.launchURL, + textStyle: context.t.textTheme.bodyText2, + widgetImage: (imageUrl) => CachedNetworkImage( + imageUrl: imageUrl, + placeholder: (context, url) => const SizedBox( + width: double.infinity, + height: 300, + child: Center(child: CircularProgressIndicator()), ), - onCodeCopied: () {}, + errorWidget: (context, url, error) => const Icon(Icons.error), ), + onCodeCopied: () {}, ), ), ),