2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

design: Adjust some colors in inputbar

Browse source
This commit is contained in:
krille-chan 2024-04-01 10:32:11 +02:00
commit f42509f710
No known key found for this signature in database
5 changed files with 35 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pages/chat/chat_emoji_picker.dart
View file

@ -42,9 +42,8 @@ class ChatEmojiPicker extends StatelessWidget {
onBackspacePressed: controller.emojiPickerBackspace, onBackspacePressed: controller.emojiPickerBackspace,
config: Config( config: Config(
backspaceColor: theme.colorScheme.primary, backspaceColor: theme.colorScheme.primary,
bgColor: theme.brightness == Brightness.light bgColor:
? Colors.white Theme.of(context).colorScheme.onInverseSurface,
: Colors.black,
iconColor: iconColor:
theme.colorScheme.primary.withOpacity(0.5), theme.colorScheme.primary.withOpacity(0.5),
iconColorSelected: theme.colorScheme.primary, iconColorSelected: theme.colorScheme.primary,

11
lib/pages/chat/events/reply_content.dart
View file

@ -10,12 +10,14 @@ class ReplyContent extends StatelessWidget {
final Event replyEvent; final Event replyEvent;
final bool ownMessage; final bool ownMessage;
final Timeline? timeline; final Timeline? timeline;
final Color? backgroundColor;
const ReplyContent( const ReplyContent(
this.replyEvent, { this.replyEvent, {
this.ownMessage = false, this.ownMessage = false,
super.key, super.key,
this.timeline, this.timeline,
this.backgroundColor,
}); });
static const BorderRadius borderRadius = BorderRadius.only( static const BorderRadius borderRadius = BorderRadius.only(
@ -34,10 +36,11 @@ class ReplyContent extends StatelessWidget {
: Theme.of(context).colorScheme.primary; : Theme.of(context).colorScheme.primary;
return Material( return Material(
color: Theme.of(context) color: backgroundColor ??
.colorScheme Theme.of(context)
.background .colorScheme
.withOpacity(ownMessage ? 0.2 : 0.33), .background
.withOpacity(ownMessage ? 0.2 : 0.33),
borderRadius: borderRadius, borderRadius: borderRadius,
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,

4
lib/pages/chat/reactions_picker.dart
View file

@ -60,7 +60,7 @@ class ReactionsPicker extends StatelessWidget {
Expanded( Expanded(
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).secondaryHeaderColor, color: Theme.of(context).colorScheme.onInverseSurface,
borderRadius: const BorderRadius.only( borderRadius: const BorderRadius.only(
bottomRight: Radius.circular(AppConfig.borderRadius), bottomRight: Radius.circular(AppConfig.borderRadius),
), ),
@ -92,7 +92,7 @@ class ReactionsPicker extends StatelessWidget {
width: 36, width: 36,
height: 56, height: 56,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).secondaryHeaderColor, color: Theme.of(context).colorScheme.onInverseSurface,
shape: BoxShape.circle, shape: BoxShape.circle,
), ),
child: const Icon(Icons.add_outlined), child: const Icon(Icons.add_outlined),

45
lib/pages/chat/reply_display.dart
View file

@ -21,29 +21,28 @@ class ReplyDisplay extends StatelessWidget {
? 56 ? 56
: 0, : 0,
clipBehavior: Clip.hardEdge, clipBehavior: Clip.hardEdge,
decoration: const BoxDecoration(), decoration: BoxDecoration(
child: Material( color: Theme.of(context).colorScheme.onInverseSurface,
color: Theme.of(context).secondaryHeaderColor, ),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
IconButton( IconButton(
tooltip: L10n.of(context)!.close, tooltip: L10n.of(context)!.close,
icon: const Icon(Icons.close), icon: const Icon(Icons.close),
onPressed: controller.cancelReplyEventAction, onPressed: controller.cancelReplyEventAction,
), ),
Expanded( Expanded(
child: controller.replyEvent != null child: controller.replyEvent != null
? ReplyContent( ? ReplyContent(
controller.replyEvent!, controller.replyEvent!,
timeline: controller.timeline!, timeline: controller.timeline!,
) backgroundColor: Colors.transparent,
: _EditContent( )
controller.editEvent : _EditContent(
?.getDisplayEvent(controller.timeline!), controller.editEvent?.getDisplayEvent(controller.timeline!),
), ),
), ),
], ],
),
), ),
); );
} }

3
lib/pages/chat/sticker_picker_dialog.dart
View file

@ -100,6 +100,7 @@ class StickerPickerDialogState extends State<StickerPickerDialog> {
}; };
return Scaffold( return Scaffold(
backgroundColor: Theme.of(context).colorScheme.onInverseSurface,
body: SizedBox( body: SizedBox(
width: double.maxFinite, width: double.maxFinite,
child: CustomScrollView( child: CustomScrollView(
@ -108,7 +109,7 @@ class StickerPickerDialogState extends State<StickerPickerDialog> {
floating: true, floating: true,
pinned: true, pinned: true,
automaticallyImplyLeading: false, automaticallyImplyLeading: false,
backgroundColor: Theme.of(context).dialogBackgroundColor, backgroundColor: Colors.transparent,
title: SizedBox( title: SizedBox(
height: 42, height: 42,
child: TextField( child: TextField(