Matrix/fluffychat
Matrix/fluffychat
1
0
Fork 0
mirror of https://github.com/krille-chan/fluffychat synced 2024-09-10 13:05:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

chore: Design follow up

Browse source
This commit is contained in:
krille-chan 2023-07-22 11:50:00 +02:00
parent c4bc626b09
commit ee6a16604e
No known key found for this signature in database
3 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/pages/chat/events/message.dart
View file

@ -70,9 +70,7 @@ class Message extends StatelessWidget {
final client = Matrix.of(context).client;
final ownMessage = event.senderId == client.userID;
final alignment = ownMessage ? Alignment.topRight : Alignment.topLeft;
var color = Theme.of(context).brightness == Brightness.light
? Colors.white
: Theme.of(context).colorScheme.surfaceVariant;
var color = Theme.of(context).colorScheme.surfaceVariant;
final displayTime = event.type == EventTypes.RoomCreate ||
nextEvent == null ||
!event.originServerTs.sameEnvironment(nextEvent!.originServerTs);
@ -187,15 +185,7 @@ class Message extends StatelessWidget {
padding: const EdgeInsets.only(left: 8),
child: Material(
color: noBubble ? Colors.transparent : color,
shape: RoundedRectangleBorder(
borderRadius: borderRadius,
side: noBubble
? BorderSide.none
: BorderSide(
color: Theme.of(context).dividerTheme.color ??
Theme.of(context).dividerColor,
),
),
borderRadius: borderRadius,
clipBehavior: Clip.antiAlias,
child: InkWell(
onHover: (b) => useMouse = true,
@ -396,6 +386,10 @@ class Message extends StatelessWidget {
container = row;
}
if (event.messageType == MessageTypes.BadEncrypted) {
container = Opacity(opacity: 0.33, child: container);
}
return Swipeable(
key: ValueKey(event.eventId),
background: const Padding(

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

@ -36,7 +36,7 @@ class ReplyContent extends StatelessWidget {
maxLines: 1,
style: TextStyle(
color: ownMessage
? Theme.of(context).colorScheme.onPrimary
? Theme.of(context).colorScheme.onPrimaryContainer
: Theme.of(context).colorScheme.onBackground,
fontSize: fontSize,
),
@ -49,7 +49,7 @@ class ReplyContent extends StatelessWidget {
width: 3,
height: fontSize * 2 + 6,
color: ownMessage
? Theme.of(context).colorScheme.onPrimary
? Theme.of(context).colorScheme.onPrimaryContainer
: Theme.of(context).colorScheme.onBackground,
),
const SizedBox(width: 6),
@ -68,7 +68,7 @@ class ReplyContent extends StatelessWidget {
style: TextStyle(
fontWeight: FontWeight.bold,
color: ownMessage
? Theme.of(context).colorScheme.onPrimary
? Theme.of(context).colorScheme.onPrimaryContainer
: Theme.of(context).colorScheme.onBackground,
fontSize: fontSize,
),

7
lib/pages/settings_style/settings_style_view.dart
View file

@ -147,12 +147,7 @@ class SettingsStyleView extends StatelessWidget {
padding: const EdgeInsets.symmetric(horizontal: 12),
child: Material(
color: Theme.of(context).colorScheme.primaryContainer,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(AppConfig.borderRadius),
side: BorderSide(
color: Theme.of(context).dividerColor,
),
),
borderRadius: BorderRadius.circular(AppConfig.borderRadius),
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: 16 * AppConfig.bubbleSizeFactor,