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

Fix overlay not closing in some situations

Browse source
This commit is contained in:
Kelrap 2024-07-29 09:50:37 -04:00
parent a09e5a0d8a
commit 0c37d88ef2
5 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pages/chat/chat.dart
View file

@ -1080,6 +1080,9 @@ class ChatController extends State<ChatPageWithRoom>
void forwardEventsAction() async {
if (selectedEvents.length == 1) {
// #Pangea
MatrixState.pAnyState.closeOverlay();
// Pangea#
Matrix.of(context).shareContent =
selectedEvents.first.getDisplayEvent(timeline!).content;
} else {
@ -1111,6 +1114,7 @@ class ChatController extends State<ChatPageWithRoom>
replyEvent = replyTo ?? selectedEvents.first;
selectedEvents.clear();
});
MatrixState.pAnyState.closeOverlay();
inputFocus.requestFocus();
}

9
lib/pages/image_viewer/image_viewer.dart
View file

@ -1,11 +1,10 @@
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/pages/image_viewer/image_viewer_view.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/widgets/matrix.dart';
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:matrix/matrix.dart';
import '../../utils/matrix_sdk_extensions/event_extension.dart';
class ImageViewer extends StatefulWidget {

2
lib/pangea/widgets/chat/message_toolbar.dart
View file

@ -126,7 +126,7 @@ class ToolbarDisplayController {
transformTargetId: targetId,
targetAnchor: Alignment.center,
followerAnchor: Alignment.center,
backgroundColor: const Color.fromRGBO(0, 0, 0, 1).withAlpha(100),
backgroundColor: const Color.fromRGBO(0, 0, 0, 1).withAlpha(200),
closePrevOverlay:
MatrixState.pangeaController.subscriptionController.isSubscribed,
targetScreen: true,

2
lib/pangea/widgets/chat/overlay_footer.dart
View file

@ -47,7 +47,7 @@ class OverlayFooter extends StatelessWidget {
ReplyDisplay(controller),
ChatInputRow(controller),
SizedBox(
height: (FluffyThemes.isColumnMode(context) ? 16.0 : 8.0),
height: (FluffyThemes.isColumnMode(context) ? 18.0 : 10.0),
),
],
),

1
lib/pangea/widgets/chat/overlay_header.dart
View file

@ -20,6 +20,7 @@ class OverlayHeader extends StatelessWidget {
final Event selectedEvent = controller.selectedEvents.single;
return AppBar(
backgroundColor: Theme.of(context).colorScheme.surfaceContainerHighest,
actionsIconTheme: IconThemeData(
color: Theme.of(context).colorScheme.primary,
),