Merge branch 'main' into learning-analytics-summary
This commit is contained in:
commit
25b0e09123
4 changed files with 17 additions and 11 deletions
|
|
@ -1605,10 +1605,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();
|
||||
|
|
@ -1641,12 +1637,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#
|
||||
|
||||
|
|
|
|||
|
|
@ -319,8 +319,6 @@ class Message extends StatelessWidget {
|
|||
child: GestureDetector(
|
||||
// #Pangea
|
||||
onTap: () => showToolbar(pangeaMessageEvent),
|
||||
onDoubleTap: () =>
|
||||
showToolbar(pangeaMessageEvent),
|
||||
onLongPress: () =>
|
||||
showToolbar(pangeaMessageEvent),
|
||||
// onLongPress: longPressSelect
|
||||
|
|
@ -605,7 +603,10 @@ class Message extends StatelessWidget {
|
|||
controller: controller,
|
||||
pangeaMessageEvent: pangeaMessageEvent!,
|
||||
),
|
||||
MessageReactions(event, timeline),
|
||||
// #Pangea
|
||||
if (!isOverlay)
|
||||
// Pangea#
|
||||
MessageReactions(event, timeline),
|
||||
],
|
||||
),
|
||||
// child: MessageReactions(event, timeline),
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
),
|
||||
);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue