* chore: Nicer invite selection view
* chore: Do not request thousands of users on invite page
* build(deps): bump rexml from 3.3.6 to 3.3.9 in /ios
Bumps [rexml](https://github.com/ruby/rexml) from 3.3.6 to 3.3.9.
- [Release notes](https://github.com/ruby/rexml/releases)
- [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/rexml/compare/v3.3.6...v3.3.9)
---
updated-dependencies:
- dependency-name: rexml
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
* design: Highlight emoji only messages
* chore: Follow up emoji only messages
* Translated using Weblate (Galician)
Currently translated at 100.0% (672 of 672 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/
* Translated using Weblate (Russian)
Currently translated at 99.7% (670 of 672 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/
* design: New login design
* chore: Improve spaces design
* chore: Improve spaces design
* chore: Improved UX for creating groups and spaces
* Translated using Weblate (German)
Currently translated at 100.0% (672 of 672 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/
* feat: Better wallpapers with blur and opacity sliders and improved styles page
* chore: Follow up wallpaper configs
* chore: Add max length to state messages
* chore: Follow up wallpaper design
* feat: Open account manage url when using MAS
* chore: follow up wellknown fetch
* Translated using Weblate (Arabic)
Currently translated at 100.0% (674 of 674 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ar/
* Translated using Weblate (Estonian)
Currently translated at 100.0% (674 of 674 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/
* Translated using Weblate (Chinese (Simplified Han script))
Currently translated at 100.0% (674 of 674 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/
* Translated using Weblate (Indonesian)
Currently translated at 100.0% (674 of 674 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/id/
* Translated using Weblate (Finnish)
Currently translated at 79.0% (533 of 674 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/fi/
* Translated using Weblate (Latvian)
Currently translated at 100.0% (674 of 674 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/
* build: Add links to snapcraft.yaml file
* chore: Nicer empty page
* chore: Polish chat bubble colors
* chore: Follow up chat bubble design
* refactor: Remove unnecessary builder widget
* chore: Design adjustments
* chore: Follow up design
* refactor: Display two lines on new messages
* chore: Design follow up
* Translated using Weblate (Arabic)
Currently translated at 100.0% (678 of 678 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ar/
* Translated using Weblate (German)
Currently translated at 100.0% (678 of 678 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/
* Translated using Weblate (Estonian)
Currently translated at 99.7% (676 of 678 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/
* Translated using Weblate (Basque)
Currently translated at 100.0% (678 of 678 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/
* Translated using Weblate (Ukrainian)
Currently translated at 100.0% (678 of 678 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/
* Translated using Weblate (Chinese (Simplified Han script))
Currently translated at 100.0% (678 of 678 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/
* chore: Follow up message bubbles
* chore: Follow up design
* chore: Follow up design
* chore: Follow up colors
* chore: Follow up homeserverpicker UX
* chore: Design follow up
* feat: Add about server page
* chore: Follow up update snackbar
* chore: Polish login design
* chore: Follow up login page
* chore: Follow up homeserver picker
* chore: Follow up appbar shadow
* refactor: Performance boost for avatar widget
* Revert "refactor: Performance boost for avatar widget"
This reverts commit 58577bb9e8.
* Translated using Weblate (Estonian)
Currently translated at 100.0% (678 of 678 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/
* Translated using Weblate (Ukrainian)
Currently translated at 100.0% (678 of 678 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/
* Translated using Weblate (Latvian)
Currently translated at 100.0% (678 of 678 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (687 of 687 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ar/
* Translated using Weblate (Estonian)
Currently translated at 100.0% (687 of 687 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/
* Translated using Weblate (Basque)
Currently translated at 100.0% (687 of 687 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/
* Translated using Weblate (Galician)
Currently translated at 100.0% (687 of 687 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/
* Translated using Weblate (Chinese (Simplified Han script))
Currently translated at 100.0% (687 of 687 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/
* Translated using Weblate (Indonesian)
Currently translated at 100.0% (687 of 687 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/id/
* Translated using Weblate (Latvian)
Currently translated at 100.0% (687 of 687 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/
* Translated using Weblate (Ukrainian)
Currently translated at 100.0% (687 of 687 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/
* Translated using Weblate (Korean)
Currently translated at 100.0% (687 of 687 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ko/
* chore: Follow up homeserver input field
* refactor: Move to upstream geolocator
* chore: Follow up send file dialog
* Translated using Weblate (Spanish)
Currently translated at 74.6% (513 of 687 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/es/
* refactor: Migrate to newer keyboard shortcuts package
* refactor: Remove keyboard shortcuts
This package right now
makes the web app
nearly unusable as it
throws multiple errors on
every key press. The
package seems to be
unmaintained. I tried
two other packages
and none of them worked.
* build: Update matrix dart sdk to 0.35.0
* chore: Better FluffyChat Logo for PWA
* build: (deps): bump samuelmeuli/action-snapcraft from 2 to 3
Bumps [samuelmeuli/action-snapcraft](https://github.com/samuelmeuli/action-snapcraft) from 2 to 3.
- [Release notes](https://github.com/samuelmeuli/action-snapcraft/releases)
- [Commits](https://github.com/samuelmeuli/action-snapcraft/compare/v2...v3)
---
updated-dependencies:
- dependency-name: samuelmeuli/action-snapcraft
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
* chore: Follow up send file dialog
* feat: Add markdown context actions for text input
* build: Update flutter to 3.24.5
* build: Remove snapcraft build workaround
* chore: Better error message when join room failed
* chore: Follow up join room
* chore: Make error dialog show full error
* chore: Follow up loading dialog
* chore: Follow up loading dialog
* build: Snapcraft from local build file
* chore: Follow up build snap
* chore: Follow up snapcraft in ci
* build: Revert build snapcraft changes
* build: Try downgrading flutter web auth
* chore: add hint in pubspec.yaml regarding flutter_web_auth_2
* Translated using Weblate (Estonian)
Currently translated at 100.0% (688 of 688 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/
* Translated using Weblate (Galician)
Currently translated at 100.0% (688 of 688 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/
* Translated using Weblate (Chinese (Simplified Han script))
Currently translated at 100.0% (688 of 688 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/
* Translated using Weblate (Indonesian)
Currently translated at 100.0% (688 of 688 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/id/
* Translated using Weblate (Irish)
Currently translated at 100.0% (688 of 688 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ga/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (688 of 688 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ar/
* Translated using Weblate (Basque)
Currently translated at 100.0% (688 of 688 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/
* Translated using Weblate (Ukrainian)
Currently translated at 100.0% (688 of 688 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/
* Translated using Weblate (Latvian)
Currently translated at 100.0% (688 of 688 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/
* Translated using Weblate (Italian)
Currently translated at 100.0% (688 of 688 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/it/
* Translated using Weblate (Estonian)
Currently translated at 100.0% (694 of 694 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/
* Translated using Weblate (Chinese (Simplified Han script))
Currently translated at 100.0% (694 of 694 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (694 of 694 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ar/
* Translated using Weblate (Basque)
Currently translated at 100.0% (694 of 694 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/
* Translated using Weblate (Irish)
Currently translated at 100.0% (694 of 694 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ga/
* Translated using Weblate (Indonesian)
Currently translated at 100.0% (694 of 694 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/id/
* Translated using Weblate (Latvian)
Currently translated at 100.0% (694 of 694 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (695 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ar/
* Translated using Weblate (Estonian)
Currently translated at 100.0% (695 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/
* Translated using Weblate (Chinese (Simplified Han script))
Currently translated at 100.0% (695 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/
* Translated using Weblate (Irish)
Currently translated at 99.8% (694 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ga/
* Translated using Weblate (German)
Currently translated at 99.5% (692 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/
* fix: dont use thumbnails for emoticons
* chore: Improve presence performance
* Translated using Weblate (Basque)
Currently translated at 100.0% (695 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/
* Translated using Weblate (Galician)
Currently translated at 100.0% (695 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/
* Translated using Weblate (Italian)
Currently translated at 100.0% (695 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/it/
* Translated using Weblate (Irish)
Currently translated at 100.0% (695 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ga/
* Translated using Weblate (Russian)
Currently translated at 100.0% (695 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/
* Translated using Weblate (Ukrainian)
Currently translated at 100.0% (695 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/
* Translated using Weblate (Catalan)
Currently translated at 95.1% (661 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ca/
* build: Bump version
* chore: Follow up send file dialog for images
* chore: Follow up send multiple images
* build: Add android build workaround for new flutter version
* build: Use file selector to save files
* chore: Follow up save file on desktop
* chore: Adjust default linux window height
* refactor: Update to new receive sharing intent package
* fluffychat merge
* fluffychat merge
* fluffychat merge
* fix android build
* fluffychat merge
* fluffychat merge
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Krille <c.kussowski@famedly.com>
Co-authored-by: Krille-chan <christian-kussowski@posteo.de>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: josé m <correoxm@disroot.org>
Co-authored-by: v1s7 <v1s7@users.noreply.hosted.weblate.org>
Co-authored-by: Christian <christian-pauly@posteo.de>
Co-authored-by: Rex_sa <rex.sa@pm.me>
Co-authored-by: Priit Jõerüüt <hwlate@joeruut.com>
Co-authored-by: 大王叫我来巡山 <hamburger2048@users.noreply.hosted.weblate.org>
Co-authored-by: Linerly <linerly@proton.me>
Co-authored-by: Edgars Andersons <Edgars+Weblate@gaitenis.id.lv>
Co-authored-by: xabirequejo <xabi.rn@gmail.com>
Co-authored-by: Bezruchenko Simon <worcposj44@gmail.com>
Co-authored-by: Ihor Hordiichuk <igor_ck@outlook.com>
Co-authored-by: Bruno Roh <kane.roh429@gmail.com>
Co-authored-by: Kimby <kimisaes@naver.com>
Co-authored-by: Aindriú Mac Giolla Eoin <aindriu80@gmail.com>
Co-authored-by: Angelo Schirinzi <muten619@hotmail.it>
Co-authored-by: Marek Vospěl <marek@vospel.cz>
Co-authored-by: Александр (Alexandr1995) <stupino19951406@gmail.com>
770 lines
36 KiB
Dart
770 lines
36 KiB
Dart
import 'package:fluffychat/config/themes.dart';
|
|
import 'package:fluffychat/pages/chat/chat.dart';
|
|
import 'package:fluffychat/pages/chat/events/room_creation_state_event.dart';
|
|
import 'package:fluffychat/pangea/enum/use_type.dart';
|
|
import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart';
|
|
import 'package:fluffychat/pangea/utils/any_state_holder.dart';
|
|
import 'package:fluffychat/pangea/widgets/chat/message_buttons.dart';
|
|
import 'package:fluffychat/pangea/widgets/chat/message_selection_overlay.dart';
|
|
import 'package:fluffychat/pangea/widgets/pressable_button.dart';
|
|
import 'package:fluffychat/utils/date_time_extension.dart';
|
|
import 'package:fluffychat/utils/string_color.dart';
|
|
import 'package:fluffychat/widgets/avatar.dart';
|
|
import 'package:fluffychat/widgets/matrix.dart';
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter_gen/gen_l10n/l10n.dart';
|
|
import 'package:matrix/matrix.dart';
|
|
import 'package:swipe_to_action/swipe_to_action.dart';
|
|
|
|
import '../../../config/app_config.dart';
|
|
import 'message_content.dart';
|
|
import 'message_reactions.dart';
|
|
import 'reply_content.dart';
|
|
import 'state_message.dart';
|
|
import 'verification_request_content.dart';
|
|
|
|
class Message extends StatelessWidget {
|
|
final Event event;
|
|
final Event? nextEvent;
|
|
final Event? previousEvent;
|
|
final bool displayReadMarker;
|
|
final void Function(Event) onSelect;
|
|
final void Function(Event) onAvatarTab;
|
|
final void Function(Event) onInfoTab;
|
|
final void Function(String) scrollToEventId;
|
|
final void Function() onSwipe;
|
|
final bool longPressSelect;
|
|
final bool selected;
|
|
final Timeline timeline;
|
|
final bool highlightMarker;
|
|
final bool animateIn;
|
|
final void Function()? resetAnimateIn;
|
|
final bool wallpaperMode;
|
|
// #Pangea
|
|
final bool immersionMode;
|
|
final ChatController controller;
|
|
final MessageOverlayController? overlayController;
|
|
final bool isButton;
|
|
// Pangea#
|
|
|
|
const Message(
|
|
this.event, {
|
|
this.nextEvent,
|
|
this.previousEvent,
|
|
this.displayReadMarker = false,
|
|
this.longPressSelect = false,
|
|
required this.onSelect,
|
|
required this.onInfoTab,
|
|
required this.onAvatarTab,
|
|
required this.scrollToEventId,
|
|
required this.onSwipe,
|
|
this.selected = false,
|
|
required this.timeline,
|
|
this.highlightMarker = false,
|
|
this.animateIn = false,
|
|
this.resetAnimateIn,
|
|
this.wallpaperMode = false,
|
|
// #Pangea
|
|
required this.immersionMode,
|
|
required this.controller,
|
|
this.overlayController,
|
|
this.isButton = false,
|
|
// Pangea#
|
|
super.key,
|
|
});
|
|
|
|
// #Pangea
|
|
void showToolbar(PangeaMessageEvent? pangeaMessageEvent) {
|
|
// if overlayController is not null, the message is already in overlay mode
|
|
if (pangeaMessageEvent != null && overlayController == null) {
|
|
controller.showToolbar(
|
|
event,
|
|
pangeaMessageEvent: pangeaMessageEvent,
|
|
nextEvent: nextEvent,
|
|
prevEvent: previousEvent,
|
|
);
|
|
}
|
|
}
|
|
// Pangea#
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
// #Pangea
|
|
PangeaMessageEvent? pangeaMessageEvent;
|
|
if (event.type == EventTypes.Message) {
|
|
pangeaMessageEvent = PangeaMessageEvent(
|
|
event: event,
|
|
timeline: timeline,
|
|
ownMessage: event.senderId == Matrix.of(context).client.userID,
|
|
);
|
|
}
|
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
|
if (controller.pangeaEditingEvent?.eventId == event.eventId) {
|
|
pangeaMessageEvent?.updateLatestEdit();
|
|
controller.clearEditingEvent();
|
|
}
|
|
});
|
|
// Pangea#
|
|
final theme = Theme.of(context);
|
|
|
|
if (!{
|
|
EventTypes.Message,
|
|
EventTypes.Sticker,
|
|
EventTypes.Encrypted,
|
|
EventTypes.CallInvite,
|
|
}.contains(event.type)) {
|
|
if (event.type.startsWith('m.call.')) {
|
|
return const SizedBox.shrink();
|
|
}
|
|
if (event.type == EventTypes.RoomCreate) {
|
|
return RoomCreationStateEvent(event: event);
|
|
}
|
|
return StateMessage(event);
|
|
}
|
|
|
|
if (event.type == EventTypes.Message &&
|
|
event.messageType == EventTypes.KeyVerificationRequest) {
|
|
return VerificationRequestContent(event: event, timeline: timeline);
|
|
}
|
|
|
|
final client = Matrix.of(context).client;
|
|
final ownMessage = event.senderId == client.userID;
|
|
final alignment = ownMessage ? Alignment.topRight : Alignment.topLeft;
|
|
|
|
var color = theme.colorScheme.surfaceContainerHigh;
|
|
final displayTime = event.type == EventTypes.RoomCreate ||
|
|
nextEvent == null ||
|
|
!event.originServerTs.sameEnvironment(nextEvent!.originServerTs);
|
|
final nextEventSameSender = nextEvent != null &&
|
|
{
|
|
EventTypes.Message,
|
|
EventTypes.Sticker,
|
|
EventTypes.Encrypted,
|
|
}.contains(nextEvent!.type) &&
|
|
nextEvent!.senderId == event.senderId &&
|
|
!displayTime;
|
|
|
|
final previousEventSameSender = previousEvent != null &&
|
|
{
|
|
EventTypes.Message,
|
|
EventTypes.Sticker,
|
|
EventTypes.Encrypted,
|
|
}.contains(previousEvent!.type) &&
|
|
previousEvent!.senderId == event.senderId &&
|
|
previousEvent!.originServerTs.sameEnvironment(event.originServerTs);
|
|
|
|
final textColor =
|
|
ownMessage ? theme.colorScheme.onPrimary : theme.colorScheme.onSurface;
|
|
final rowMainAxisAlignment =
|
|
ownMessage ? MainAxisAlignment.end : MainAxisAlignment.start;
|
|
|
|
final displayEvent = event.getDisplayEvent(timeline);
|
|
const hardCorner = Radius.circular(4);
|
|
const roundedCorner = Radius.circular(AppConfig.borderRadius);
|
|
final borderRadius = BorderRadius.only(
|
|
topLeft: !ownMessage && nextEventSameSender ? hardCorner : roundedCorner,
|
|
topRight: ownMessage && nextEventSameSender ? hardCorner : roundedCorner,
|
|
bottomLeft:
|
|
!ownMessage && previousEventSameSender ? hardCorner : roundedCorner,
|
|
bottomRight:
|
|
ownMessage && previousEventSameSender ? hardCorner : roundedCorner,
|
|
);
|
|
final noBubble = ({
|
|
MessageTypes.Video,
|
|
MessageTypes.Image,
|
|
MessageTypes.Sticker,
|
|
}.contains(event.messageType) &&
|
|
!event.redacted) ||
|
|
(event.messageType == MessageTypes.Text &&
|
|
event.relationshipType == null &&
|
|
event.onlyEmotes &&
|
|
event.numberEmotes > 0 &&
|
|
event.numberEmotes <= 3);
|
|
final noPadding = {
|
|
MessageTypes.File,
|
|
MessageTypes.Audio,
|
|
}.contains(event.messageType);
|
|
|
|
if (ownMessage) {
|
|
color = displayEvent.status.isError
|
|
? Colors.redAccent
|
|
: theme.colorScheme.primary;
|
|
}
|
|
|
|
final resetAnimateIn = this.resetAnimateIn;
|
|
var animateIn = this.animateIn;
|
|
|
|
final row = StatefulBuilder(
|
|
builder: (context, setState) {
|
|
if (animateIn && resetAnimateIn != null) {
|
|
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
|
|
animateIn = false;
|
|
// #Pangea
|
|
if (context.mounted) {
|
|
// Pangea#
|
|
setState(resetAnimateIn);
|
|
}
|
|
});
|
|
}
|
|
return AnimatedSize(
|
|
duration: FluffyThemes.animationDuration,
|
|
curve: FluffyThemes.animationCurve,
|
|
clipBehavior: Clip.none,
|
|
alignment: ownMessage ? Alignment.bottomRight : Alignment.bottomLeft,
|
|
child: animateIn
|
|
? const SizedBox(height: 0, width: double.infinity)
|
|
: Stack(
|
|
children: [
|
|
Positioned(
|
|
top: 0,
|
|
bottom: 0,
|
|
left: 0,
|
|
right: 0,
|
|
child: InkWell(
|
|
// #Pangea
|
|
onTap: () => overlayController == null
|
|
? showToolbar(pangeaMessageEvent)
|
|
: controller.clearSelectedEvents(),
|
|
onLongPress: () => overlayController == null
|
|
? showToolbar(pangeaMessageEvent)
|
|
: controller.clearSelectedEvents(),
|
|
// onTap: () => onSelect(event),
|
|
// onLongPress: () => onSelect(event),
|
|
// Pangea#
|
|
borderRadius:
|
|
BorderRadius.circular(AppConfig.borderRadius / 2),
|
|
child: Material(
|
|
borderRadius:
|
|
BorderRadius.circular(AppConfig.borderRadius / 2),
|
|
color: selected
|
|
? theme.colorScheme.secondaryContainer
|
|
.withAlpha(100)
|
|
: highlightMarker
|
|
? theme.colorScheme.tertiaryContainer
|
|
.withAlpha(100)
|
|
: Colors.transparent,
|
|
),
|
|
),
|
|
),
|
|
Row(
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
mainAxisAlignment: rowMainAxisAlignment,
|
|
children: [
|
|
// #Pangea
|
|
// if (longPressSelect)
|
|
// SizedBox(
|
|
// height: 32,
|
|
// width: Avatar.defaultSize,
|
|
// child: Checkbox.adaptive(
|
|
// value: selected,
|
|
// shape: const CircleBorder(),
|
|
// onChanged: (_) => onSelect(event),
|
|
// ),
|
|
// )
|
|
// else if (nextEventSameSender || ownMessage)
|
|
if (nextEventSameSender ||
|
|
ownMessage ||
|
|
overlayController != null)
|
|
// Pangea#
|
|
SizedBox(
|
|
width: Avatar.defaultSize,
|
|
child: Center(
|
|
child: SizedBox(
|
|
width: 16,
|
|
height: 16,
|
|
child: event.status == EventStatus.error
|
|
? const Icon(Icons.error, color: Colors.red)
|
|
: event.fileSendingStatus != null
|
|
? const CircularProgressIndicator
|
|
.adaptive(
|
|
strokeWidth: 1,
|
|
)
|
|
: null,
|
|
),
|
|
),
|
|
)
|
|
else
|
|
FutureBuilder<User?>(
|
|
future: event.fetchSenderUser(),
|
|
builder: (context, snapshot) {
|
|
final user = snapshot.data ??
|
|
event.senderFromMemoryOrFallback;
|
|
return Avatar(
|
|
mxContent: user.avatarUrl,
|
|
name: user.calcDisplayname(),
|
|
presenceUserId: user.stateKey,
|
|
presenceBackgroundColor:
|
|
wallpaperMode ? Colors.transparent : null,
|
|
onTap: () => onAvatarTab(event),
|
|
);
|
|
},
|
|
),
|
|
Expanded(
|
|
child: Column(
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
// #Pangea
|
|
// if (!nextEventSameSender)
|
|
if (!nextEventSameSender &&
|
|
overlayController == null)
|
|
// Pangea#
|
|
Padding(
|
|
padding: const EdgeInsets.only(
|
|
left: 8.0,
|
|
bottom: 4,
|
|
),
|
|
child: ownMessage || event.room.isDirectChat
|
|
? const SizedBox(height: 12)
|
|
: FutureBuilder<User?>(
|
|
future: event.fetchSenderUser(),
|
|
builder: (context, snapshot) {
|
|
final displayname = snapshot.data
|
|
?.calcDisplayname() ??
|
|
event.senderFromMemoryOrFallback
|
|
.calcDisplayname();
|
|
return Text(
|
|
displayname,
|
|
style: TextStyle(
|
|
fontSize: 11,
|
|
fontWeight: FontWeight.bold,
|
|
color: (theme.brightness ==
|
|
Brightness.light
|
|
? displayname.color
|
|
: displayname
|
|
.lightColorText),
|
|
shadows: !wallpaperMode
|
|
? null
|
|
: [
|
|
const Shadow(
|
|
offset: Offset(
|
|
0.0,
|
|
0.0,
|
|
),
|
|
blurRadius: 3,
|
|
color: Colors.black,
|
|
),
|
|
],
|
|
),
|
|
maxLines: 1,
|
|
overflow: TextOverflow.ellipsis,
|
|
);
|
|
},
|
|
),
|
|
),
|
|
Container(
|
|
alignment: alignment,
|
|
padding: const EdgeInsets.only(left: 8),
|
|
child: GestureDetector(
|
|
// #Pangea
|
|
onTap: () => showToolbar(pangeaMessageEvent),
|
|
onLongPress: () =>
|
|
showToolbar(pangeaMessageEvent),
|
|
// onLongPress: longPressSelect
|
|
// ? null
|
|
// : () {
|
|
// HapticFeedback.heavyImpact();
|
|
// onSelect(event);
|
|
// },
|
|
// Pangea#
|
|
child: AnimatedOpacity(
|
|
opacity: animateIn
|
|
? 0
|
|
: event.messageType ==
|
|
MessageTypes.BadEncrypted ||
|
|
event.status.isSending
|
|
? 0.5
|
|
: 1,
|
|
duration: FluffyThemes.animationDuration,
|
|
curve: FluffyThemes.animationCurve,
|
|
child:
|
|
// #Pangea
|
|
PressableButton(
|
|
triggerAnimation: controller
|
|
.showToolbarStream.stream
|
|
.where(
|
|
(eventID) => eventID == event.eventId,
|
|
),
|
|
depressed: !isButton,
|
|
borderRadius: borderRadius,
|
|
onPressed: () {
|
|
showToolbar(pangeaMessageEvent);
|
|
},
|
|
color: color,
|
|
child:
|
|
// Pangea#
|
|
Container(
|
|
decoration: BoxDecoration(
|
|
color: noBubble
|
|
? Colors.transparent
|
|
: color,
|
|
borderRadius: borderRadius,
|
|
),
|
|
clipBehavior: Clip.antiAlias,
|
|
// #Pangea
|
|
child: CompositedTransformTarget(
|
|
link: overlayController != null
|
|
? LayerLinkAndKey('overlay_msg')
|
|
.link
|
|
: MatrixState.pAnyState
|
|
.layerLinkAndKey(
|
|
event.eventId,
|
|
)
|
|
.link,
|
|
child: Container(
|
|
key: overlayController != null
|
|
? LayerLinkAndKey('overlay_msg')
|
|
.key
|
|
: MatrixState.pAnyState
|
|
.layerLinkAndKey(
|
|
event.eventId,
|
|
)
|
|
.key,
|
|
// Pangea#
|
|
decoration: BoxDecoration(
|
|
borderRadius:
|
|
BorderRadius.circular(
|
|
AppConfig.borderRadius,
|
|
),
|
|
),
|
|
padding: noBubble || noPadding
|
|
? EdgeInsets.zero
|
|
: const EdgeInsets.symmetric(
|
|
horizontal: 16,
|
|
vertical: 8,
|
|
),
|
|
constraints: const BoxConstraints(
|
|
maxWidth:
|
|
FluffyThemes.columnWidth *
|
|
1.5,
|
|
),
|
|
child: Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
crossAxisAlignment:
|
|
CrossAxisAlignment.start,
|
|
children: <Widget>[
|
|
if (event.relationshipType ==
|
|
RelationshipTypes.reply)
|
|
FutureBuilder<Event?>(
|
|
future: event.getReplyEvent(
|
|
timeline,
|
|
),
|
|
builder: (
|
|
BuildContext context,
|
|
snapshot,
|
|
) {
|
|
final replyEvent =
|
|
snapshot.hasData
|
|
? snapshot.data!
|
|
: Event(
|
|
eventId: event
|
|
.relationshipEventId!,
|
|
content: {
|
|
'msgtype':
|
|
'm.text',
|
|
'body':
|
|
'...',
|
|
},
|
|
senderId: event
|
|
.senderId,
|
|
type:
|
|
'm.room.message',
|
|
room: event
|
|
.room,
|
|
status:
|
|
EventStatus
|
|
.sent,
|
|
originServerTs:
|
|
DateTime
|
|
.now(),
|
|
);
|
|
return Padding(
|
|
padding:
|
|
const EdgeInsets
|
|
.only(
|
|
bottom: 4.0,
|
|
),
|
|
child: InkWell(
|
|
borderRadius:
|
|
ReplyContent
|
|
.borderRadius,
|
|
onTap: () =>
|
|
scrollToEventId(
|
|
replyEvent.eventId,
|
|
),
|
|
child: AbsorbPointer(
|
|
child: ReplyContent(
|
|
replyEvent,
|
|
ownMessage:
|
|
ownMessage,
|
|
timeline:
|
|
timeline,
|
|
),
|
|
),
|
|
),
|
|
);
|
|
},
|
|
),
|
|
MessageContent(
|
|
displayEvent,
|
|
textColor: textColor,
|
|
onInfoTab: onInfoTab,
|
|
borderRadius: borderRadius,
|
|
// #Pangea
|
|
pangeaMessageEvent:
|
|
pangeaMessageEvent,
|
|
immersionMode: immersionMode,
|
|
overlayController:
|
|
overlayController,
|
|
controller: controller,
|
|
nextEvent: nextEvent,
|
|
prevEvent: previousEvent,
|
|
// Pangea#
|
|
),
|
|
if (event.hasAggregatedEvents(
|
|
timeline,
|
|
RelationshipTypes
|
|
.edit,
|
|
)
|
|
// #Pangea
|
|
||
|
|
(pangeaMessageEvent
|
|
?.showUseType ??
|
|
false)
|
|
// Pangea#
|
|
)
|
|
Padding(
|
|
padding:
|
|
const EdgeInsets.only(
|
|
top: 4.0,
|
|
),
|
|
child: Row(
|
|
mainAxisSize:
|
|
MainAxisSize.min,
|
|
children: [
|
|
// #Pangea
|
|
if (pangeaMessageEvent
|
|
?.showUseType ??
|
|
false) ...[
|
|
pangeaMessageEvent!
|
|
.msgUseType
|
|
.iconView(
|
|
context,
|
|
textColor
|
|
.withAlpha(164),
|
|
),
|
|
const SizedBox(
|
|
width: 4,
|
|
),
|
|
],
|
|
if (event
|
|
.hasAggregatedEvents(
|
|
timeline,
|
|
RelationshipTypes
|
|
.edit,
|
|
)) ...[
|
|
// Pangea#
|
|
Icon(
|
|
Icons.edit_outlined,
|
|
color: textColor
|
|
.withAlpha(164),
|
|
size: 14,
|
|
),
|
|
Text(
|
|
' - ${displayEvent.originServerTs.localizedTimeShort(context)}',
|
|
style: TextStyle(
|
|
color: textColor
|
|
.withAlpha(
|
|
164,
|
|
),
|
|
fontSize: 12,
|
|
),
|
|
),
|
|
],
|
|
],
|
|
),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
],
|
|
),
|
|
],
|
|
),
|
|
);
|
|
},
|
|
);
|
|
Widget container;
|
|
final showReceiptsRow =
|
|
event.hasAggregatedEvents(timeline, RelationshipTypes.reaction);
|
|
// #Pangea
|
|
// if (showReceiptsRow || displayTime || selected || displayReadMarker) {
|
|
if (overlayController == null &&
|
|
(showReceiptsRow ||
|
|
displayTime ||
|
|
displayReadMarker ||
|
|
(pangeaMessageEvent?.showMessageButtons ?? false))) {
|
|
// Pangea#
|
|
container = Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
crossAxisAlignment:
|
|
ownMessage ? CrossAxisAlignment.end : CrossAxisAlignment.start,
|
|
children: <Widget>[
|
|
if (displayTime || selected)
|
|
Padding(
|
|
padding: displayTime
|
|
? const EdgeInsets.symmetric(vertical: 8.0)
|
|
: EdgeInsets.zero,
|
|
child: Center(
|
|
child: Padding(
|
|
padding: const EdgeInsets.only(top: 4.0),
|
|
child: Material(
|
|
borderRadius:
|
|
BorderRadius.circular(AppConfig.borderRadius * 2),
|
|
color: theme.colorScheme.surface.withAlpha(128),
|
|
child: Padding(
|
|
padding: const EdgeInsets.symmetric(
|
|
horizontal: 8.0,
|
|
vertical: 2.0,
|
|
),
|
|
child: Text(
|
|
event.originServerTs.localizedTime(context),
|
|
style: TextStyle(
|
|
fontSize: 12 * AppConfig.fontSizeFactor,
|
|
fontWeight: FontWeight.bold,
|
|
color: theme.colorScheme.secondary,
|
|
),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
row,
|
|
AnimatedSize(
|
|
duration: FluffyThemes.animationDuration,
|
|
curve: FluffyThemes.animationCurve,
|
|
// #Pangea
|
|
child: overlayController != null ||
|
|
(!showReceiptsRow &&
|
|
!(pangeaMessageEvent?.showMessageButtons ?? false))
|
|
// child: !showReceiptsRow
|
|
// Pangea#
|
|
? const SizedBox.shrink()
|
|
: Padding(
|
|
padding: EdgeInsets.only(
|
|
top: 4.0,
|
|
left: (ownMessage ? 0 : Avatar.defaultSize) + 12.0,
|
|
right: ownMessage ? 0 : 12.0,
|
|
),
|
|
// #Pangea
|
|
child: Row(
|
|
mainAxisAlignment: ownMessage
|
|
? MainAxisAlignment.end
|
|
: MainAxisAlignment.start,
|
|
children: [
|
|
if (pangeaMessageEvent?.showMessageButtons ?? false)
|
|
MessageButtons(
|
|
event: event,
|
|
controller: controller,
|
|
pangeaMessageEvent: pangeaMessageEvent!,
|
|
nextEvent: nextEvent,
|
|
prevEvent: previousEvent,
|
|
),
|
|
MessageReactions(event, timeline),
|
|
],
|
|
),
|
|
// child: MessageReactions(event, timeline),
|
|
// Pangea#
|
|
),
|
|
),
|
|
if (displayReadMarker)
|
|
Row(
|
|
children: [
|
|
Expanded(
|
|
child:
|
|
Divider(color: theme.colorScheme.surfaceContainerHighest),
|
|
),
|
|
Container(
|
|
margin: const EdgeInsets.symmetric(
|
|
horizontal: 4,
|
|
vertical: 16.0,
|
|
),
|
|
padding: const EdgeInsets.symmetric(
|
|
horizontal: 8,
|
|
vertical: 2,
|
|
),
|
|
decoration: BoxDecoration(
|
|
borderRadius:
|
|
BorderRadius.circular(AppConfig.borderRadius / 3),
|
|
color: theme.colorScheme.surface.withAlpha(128),
|
|
),
|
|
child: Text(
|
|
L10n.of(context).readUpToHere,
|
|
style: TextStyle(
|
|
fontSize: 12 * AppConfig.fontSizeFactor,
|
|
),
|
|
),
|
|
),
|
|
Expanded(
|
|
child:
|
|
Divider(color: theme.colorScheme.surfaceContainerHighest),
|
|
),
|
|
],
|
|
),
|
|
],
|
|
);
|
|
} else {
|
|
container = row;
|
|
}
|
|
|
|
// #Pangea
|
|
container = Material(type: MaterialType.transparency, child: container);
|
|
// Pangea#
|
|
|
|
return Center(
|
|
child: Swipeable(
|
|
key: ValueKey(event.eventId),
|
|
background: const Padding(
|
|
padding: EdgeInsets.symmetric(horizontal: 12.0),
|
|
child: Center(
|
|
child: Icon(Icons.check_outlined),
|
|
),
|
|
),
|
|
direction: AppConfig.swipeRightToLeftToReply
|
|
? SwipeDirection.endToStart
|
|
: SwipeDirection.startToEnd,
|
|
onSwipe: (_) => onSwipe(),
|
|
child: Container(
|
|
constraints: const BoxConstraints(
|
|
maxWidth: FluffyThemes.columnWidth * 2.5,
|
|
),
|
|
padding: EdgeInsets.only(
|
|
left: 8.0,
|
|
right: 8.0,
|
|
top: nextEventSameSender ? 1.0 : 4.0,
|
|
bottom:
|
|
// #Pangea
|
|
overlayController != null
|
|
? 0
|
|
:
|
|
// Pangea#
|
|
previousEventSameSender
|
|
? 1.0
|
|
: 4.0,
|
|
),
|
|
child: container,
|
|
),
|
|
),
|
|
);
|
|
}
|
|
}
|