From 9b521c88021d8f03e48fcc9350b282dfee59109a Mon Sep 17 00:00:00 2001 From: dab246 Date: Tue, 26 Mar 2024 10:59:00 +0700 Subject: [PATCH] TF-2735 Fix Gesture back for user in composer on mobile --- .../presentation/view/mobile/mobile_container_view.dart | 8 +++++++- .../presentation/view/mobile/tablet_container_view.dart | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/features/composer/presentation/view/mobile/mobile_container_view.dart b/lib/features/composer/presentation/view/mobile/mobile_container_view.dart index 08d60bb2e..6854dbeec 100644 --- a/lib/features/composer/presentation/view/mobile/mobile_container_view.dart +++ b/lib/features/composer/presentation/view/mobile/mobile_container_view.dart @@ -1,4 +1,5 @@ import 'package:core/presentation/utils/responsive_utils.dart'; +import 'package:core/utils/app_logger.dart'; import 'package:flutter/material.dart'; import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; import 'package:get/get.dart'; @@ -35,7 +36,12 @@ class MobileContainerView extends StatelessWidget { @override Widget build(BuildContext context) { return PopScope( - onPopInvoked: (didPop) => !didPop ? onCloseViewAction : null, + onPopInvoked: (didPop) { + log('MobileContainerView::build:onPopInvoked: didPop = $didPop'); + if (!didPop) { + onCloseViewAction.call(); + } + }, canPop: false, child: GestureDetector( onTap: onClearFocusAction, diff --git a/lib/features/composer/presentation/view/mobile/tablet_container_view.dart b/lib/features/composer/presentation/view/mobile/tablet_container_view.dart index d09961713..2274ab08e 100644 --- a/lib/features/composer/presentation/view/mobile/tablet_container_view.dart +++ b/lib/features/composer/presentation/view/mobile/tablet_container_view.dart @@ -1,4 +1,5 @@ import 'package:core/presentation/utils/responsive_utils.dart'; +import 'package:core/utils/app_logger.dart'; import 'package:flutter/material.dart'; import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; import 'package:get/get.dart'; @@ -32,7 +33,12 @@ class TabletContainerView extends StatelessWidget { @override Widget build(BuildContext context) { return PopScope( - onPopInvoked: (didPop) => !didPop ? onCloseViewAction : null, + onPopInvoked: (didPop) { + log('TabletContainerView::build:onPopInvoked: didPop = $didPop'); + if (!didPop) { + onCloseViewAction.call(); + } + }, canPop: false, child: GestureDetector( onTap: onClearFocusAction,