diff --git a/app/lib/pages/gesture_editor.dart b/app/lib/pages/gesture_editor.dart index 18194e9..a5c5d2e 100644 --- a/app/lib/pages/gesture_editor.dart +++ b/app/lib/pages/gesture_editor.dart @@ -605,13 +605,11 @@ Widget _buildCommandCellsEditing(BuildContext context) { ('${LocaleKeys.built_in_commands}.$e').tr(), textScaleFactor: .8, ), - value: ('${LocaleKeys.built_in_commands}.$e').tr(), + value: e, ), ) .toList(), - value: - ('${LocaleKeys.built_in_commands}.${(builtInCommands.contains(gesture.command) ? gesture.command : builtInCommands.first)!}') - .tr(), + value: (builtInCommands.contains(gesture.command) ? gesture.command : builtInCommands.first)!, onChanged: (value) => context.read().setProps( command: value, editMode: true, diff --git a/app/lib/widgets/dde_markdown_field.dart b/app/lib/widgets/dde_markdown_field.dart index c001c2d..3092c6b 100644 --- a/app/lib/widgets/dde_markdown_field.dart +++ b/app/lib/widgets/dde_markdown_field.dart @@ -60,71 +60,74 @@ class _DMarkdownFieldState extends State { ? context.watch().activeColor ?? Color(0xff565656) : Color(0xff565656)), ), - child: isPreview - ? GestureDetector( - onTap: widget.readOnly - ? null - : () { - setState(() { - _previewText = null; - }); + 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: 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(), - ); - }, - widgetImage: (imageUrl) => CachedNetworkImage( - imageUrl: imageUrl, - placeholder: (context, url) => const SizedBox( - width: double.infinity, - height: 300, - child: Center(child: CircularProgressIndicator()), + 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), ), - 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 5778dc3..353dc07 100644 --- a/app/lib/widgets/market.dart +++ b/app/lib/widgets/market.dart @@ -237,19 +237,22 @@ class _MarketWidgetState extends State { ), child: Padding( padding: const EdgeInsets.only(left: 8), - 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()), + 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), ), - errorWidget: (context, url, error) => const Icon(Icons.error), + onTapLink: H.launchURL, + onCodeCopied: () {}, ), - onTapLink: H.launchURL, - onCodeCopied: () {}, ), ), ), diff --git a/app/lib/widgets/me.dart b/app/lib/widgets/me.dart index cdd9321..74af295 100644 --- a/app/lib/widgets/me.dart +++ b/app/lib/widgets/me.dart @@ -242,19 +242,22 @@ class _MeWidgetState extends State { ), child: Padding( padding: const EdgeInsets.only(left: 8), - 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()), + 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), ), - errorWidget: (context, url, error) => const Icon(Icons.error), + onCodeCopied: () {}, ), - onCodeCopied: () {}, ), ), ),