ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fluffychat merge

Browse source
This commit is contained in:
ggurdin 2025-07-08 09:37:55 -04:00
commit 2f857f8703
No known key found for this signature in database
GPG key ID: A01CB41737CBB478
3 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pages/chat/chat_app_bar_title.dart
View file

@ -23,7 +23,7 @@ class ChatAppBarTitle extends StatelessWidget {
return Text(
controller.selectedEvents.length.toString(),
style: TextStyle(
color: Theme.of(context).colorScheme.tertiary,
color: Theme.of(context).colorScheme.onTertiaryContainer,
),
);
}

7
lib/pages/chat/chat_input_row.dart
View file

@ -37,6 +37,10 @@ class ChatInputRow extends StatelessWidget {
);
}
final selectedTextButtonStyle = TextButton.styleFrom(
foregroundColor: theme.colorScheme.onTertiaryContainer,
);
return Row(
crossAxisAlignment: CrossAxisAlignment.end,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -63,6 +67,7 @@ class ChatInputRow extends StatelessWidget {
SizedBox(
height: height,
child: TextButton(
style: selectedTextButtonStyle,
onPressed: controller.forwardEventsAction,
child: Row(
children: <Widget>[
@ -80,6 +85,7 @@ class ChatInputRow extends StatelessWidget {
? SizedBox(
height: height,
child: TextButton(
style: selectedTextButtonStyle,
onPressed: controller.replyAction,
child: Row(
children: <Widget>[
@ -92,6 +98,7 @@ class ChatInputRow extends StatelessWidget {
: SizedBox(
height: height,
child: TextButton(
style: selectedTextButtonStyle,
onPressed: controller.sendAgainAction,
child: Row(
children: <Widget>[

20
lib/pages/chat/chat_view.dart
View file

@ -3,6 +3,7 @@ import 'dart:ui' as ui;
import 'package:flutter/material.dart';
import 'package:badges/badges.dart';
import 'package:desktop_drop/desktop_drop.dart';
import 'package:go_router/go_router.dart';
import 'package:matrix/matrix.dart';
@ -193,15 +194,18 @@ class ChatView extends StatelessWidget {
actionsIconTheme: IconThemeData(
color: controller.selectedEvents.isEmpty
? null
: theme.colorScheme.tertiary,
: theme.colorScheme.onTertiaryContainer,
),
backgroundColor: controller.selectedEvents.isEmpty
? null
: theme.colorScheme.tertiaryContainer,
automaticallyImplyLeading: false,
leading: controller.selectMode
? IconButton(
icon: const Icon(Icons.close),
onPressed: controller.clearSelectedEvents,
tooltip: L10n.of(context).close,
color: theme.colorScheme.tertiary,
color: theme.colorScheme.onTertiaryContainer,
)
: FluffyThemes.isColumnMode(context)
? null
@ -297,12 +301,12 @@ class ChatView extends StatelessWidget {
),
),
SafeArea(
child:
// #Pangea
Stack(
// #Pangea
// child: Column(
child: Stack(
children: [
// Pangea#
Column(
// Pangea#
children: <Widget>[
Expanded(
child: GestureDetector(
@ -335,7 +339,9 @@ class ChatView extends StatelessWidget {
alignment: Alignment.center,
child: Material(
clipBehavior: Clip.hardEdge,
color: theme.colorScheme.surfaceContainerHigh,
color: controller.selectedEvents.isNotEmpty
? theme.colorScheme.tertiaryContainer
: theme.colorScheme.surfaceContainerHigh,
borderRadius: const BorderRadius.all(
Radius.circular(24),
),