merge main and update matrix dart SDK

pull/1384/head
ggurdin 1 year ago
commit f15acbd872
No known key found for this signature in database
GPG Key ID: A01CB41737CBB478

@ -1600,10 +1600,6 @@ class ChatController extends State<ChatPageWithRoom>
PangeaMessageEvent pangeaMessageEvent, {
MessageMode? mode,
}) {
// select the message
onSelectMessage(pangeaMessageEvent.event);
HapticFeedback.mediumImpact();
// Close keyboard, if open
if (inputFocus.hasFocus && PlatformInfos.isMobile) {
inputFocus.unfocus();
@ -1636,12 +1632,16 @@ class ChatController extends State<ChatPageWithRoom>
context: context,
child: overlayEntry,
transformTargetId: "",
backgroundColor: const Color.fromRGBO(0, 0, 0, 1).withAlpha(200),
backgroundColor: const Color.fromRGBO(0, 0, 0, 1).withAlpha(100),
closePrevOverlay:
MatrixState.pangeaController.subscriptionController.isSubscribed,
position: OverlayPositionEnum.centered,
onDismiss: clearSelectedEvents,
);
// select the message
onSelectMessage(pangeaMessageEvent.event);
HapticFeedback.mediumImpact();
}
// Pangea#

@ -315,8 +315,6 @@ class Message extends StatelessWidget {
child: GestureDetector(
// #Pangea
onTap: () => showToolbar(pangeaMessageEvent),
onDoubleTap: () =>
showToolbar(pangeaMessageEvent),
onLongPress: () =>
showToolbar(pangeaMessageEvent),
// onLongPress: longPressSelect
@ -599,7 +597,10 @@ class Message extends StatelessWidget {
controller: controller,
pangeaMessageEvent: pangeaMessageEvent!,
),
MessageReactions(event, timeline),
// #Pangea
if (!isOverlay)
// Pangea#
MessageReactions(event, timeline),
],
),
// child: MessageReactions(event, timeline),

@ -26,8 +26,10 @@ class ChatListHeader extends StatelessWidget implements PreferredSizeWidget {
pinned:
FluffyThemes.isColumnMode(context) || selectMode != SelectMode.normal,
scrolledUnderElevation: selectMode == SelectMode.normal ? 0 : null,
backgroundColor:
selectMode == SelectMode.normal ? Colors.transparent : null,
// #Pangea
// backgroundColor:
// selectMode == SelectMode.normal ? Colors.transparent : null,
// Pangea#
automaticallyImplyLeading: false,
leading: selectMode == SelectMode.normal
? null

@ -128,7 +128,7 @@ class UserToolSettings {
this.interactiveGrammar = true,
this.immersionMode = false,
this.definitions = true,
this.autoIGC = false,
this.autoIGC = true,
});
factory UserToolSettings.fromJson(Map<String, dynamic> json) =>
@ -139,7 +139,7 @@ class UserToolSettings {
json[ToolSetting.interactiveGrammar.toString()] ?? true,
immersionMode: json[ToolSetting.immersionMode.toString()] ?? false,
definitions: json[ToolSetting.definitions.toString()] ?? true,
autoIGC: json[ToolSetting.autoIGC.toString()] ?? false,
autoIGC: json[ToolSetting.autoIGC.toString()] ?? true,
);
Map<String, dynamic> toJson() {
@ -174,7 +174,7 @@ class UserToolSettings {
true,
autoIGC: (accountData[ToolSetting.autoIGC.toString()]
?.content[ToolSetting.autoIGC.toString()] as bool?) ??
false,
true,
);
}
}

@ -305,6 +305,11 @@ class ToolbarSelectionArea extends StatelessWidget {
controller.showToolbar(pangeaMessageEvent!);
}
},
onLongPress: () {
if (pangeaMessageEvent != null && !isOverlay) {
controller.showToolbar(pangeaMessageEvent!);
}
},
child: child,
),
);

@ -1434,10 +1434,10 @@ packages:
description:
path: "."
ref: main
resolved-ref: "7c1349800b651edc451f2173388f26024a438bda"
resolved-ref: "3b77012ba93d6ff8f98dfdff00663aabeddf077e"
url: "https://github.com/pangeachat/matrix-dart-sdk.git"
source: git
version: "0.31.0"
version: "0.32.4"
meta:
dependency: transitive
description:

Loading…
Cancel
Save