diff --git a/lib/view/dialog/post_confirmation_dialog.dart b/lib/view/dialog/post_confirmation_dialog.dart index 652d8db29..e8f78413e 100644 --- a/lib/view/dialog/post_confirmation_dialog.dart +++ b/lib/view/dialog/post_confirmation_dialog.dart @@ -85,13 +85,19 @@ class PostConfirmationDialog extends ConsumerWidget { ), ), if (request.isRenote) - NoteWidget(account: account, noteId: request.renoteId!) + NoteWidget( + account: account, + noteId: request.renoteId!, + showFooter: false, + backgroundColor: Colors.transparent, + ) else NoteWidget( account: account, noteId: '', note: note.copyWith(files: files), showFooter: false, + backgroundColor: Colors.transparent, ), Align( alignment: Alignment.centerRight, diff --git a/lib/view/widget/note_widget.dart b/lib/view/widget/note_widget.dart index 8bfd50047..d6562db9d 100644 --- a/lib/view/widget/note_widget.dart +++ b/lib/view/widget/note_widget.dart @@ -54,6 +54,7 @@ class NoteWidget extends HookConsumerWidget { this.tapAction, this.doubleTapAction, this.longPressAction, + this.backgroundColor, }); final Account account; @@ -68,6 +69,7 @@ class NoteWidget extends HookConsumerWidget { final NoteActionType? tapAction; final NoteActionType? doubleTapAction; final NoteActionType? longPressAction; + final Color? backgroundColor; @override Widget build(BuildContext context, WidgetRef ref) { @@ -203,17 +205,18 @@ class NoteWidget extends HookConsumerWidget { isRenote && (isMyRenote || isMyNote || appearNote.myReaction != null), ); - final backgroundColor = ref.watch( - generalSettingsNotifierProvider.select( - (settings) => switch (note.visibility) { - NoteVisibility.public => settings.publicNoteBackgroundColor, - NoteVisibility.home => settings.homeNoteBackgroundColor, - NoteVisibility.followers => settings.followersNoteBackgroundColor, - NoteVisibility.specified => settings.specifiedNoteBackgroundColor, - null => null, - }, - ), - ); + final backgroundColor = this.backgroundColor ?? + ref.watch( + generalSettingsNotifierProvider.select( + (settings) => switch (note.visibility) { + NoteVisibility.public => settings.publicNoteBackgroundColor, + NoteVisibility.home => settings.homeNoteBackgroundColor, + NoteVisibility.followers => settings.followersNoteBackgroundColor, + NoteVisibility.specified => settings.specifiedNoteBackgroundColor, + null => null, + }, + ), + ); final colors = ref.watch(misskeyColorsProvider(Theme.of(context).brightness)); final style = DefaultTextStyle.of(context).style;