Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<activity
android:name=".MainActivity"
android:exported="true"
android:largeHeap="true"
android:launchMode="singleTask"
android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
Expand Down
26 changes: 22 additions & 4 deletions lib/features/composer/presentation/composer_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import 'package:dio/dio.dart';
import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:file_picker/file_picker.dart';
import 'package:filesize/filesize.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:get/get.dart';
Expand Down Expand Up @@ -618,6 +617,9 @@ class ComposerController extends BaseController

void onCreatedMobileEditorAction(BuildContext context, HtmlEditorApi editorApi, String? content) {
richTextMobileTabletController?.htmlEditorApi = editorApi;
richTextMobileTabletController?.onInitWebViewLifecycleManager(
editorApi.webViewController,
);
richTextMobileTabletController?.richTextController.onCreateHTMLEditor(
editorApi,
onEnterKeyDown: _onEnterKeyDown,
Expand Down Expand Up @@ -1181,14 +1183,18 @@ class ComposerController extends BaseController
.build();
}

void openFilePickerByType(BuildContext context, FileType fileType) async {
if (!kIsWeb) {
void openFilePickerByType(BuildContext context, FileType fileType) {
if (PlatformInfo.isMobile) {
popBack();
richTextMobileTabletController?.webViewLifecycleManager?.pause();
}
consumeState(_localFilePickerInteractor.execute(fileType: fileType));
}

void _handlePickFileFailure(LocalFilePickerFailure failure) {
if (PlatformInfo.isMobile) {
richTextMobileTabletController?.webViewLifecycleManager?.resume();
}
if (currentOverlayContext != null && currentContext != null && failure.exception is! PickFileCanceledException) {
appToast.showToastErrorMessage(
currentOverlayContext!,
Expand All @@ -1197,6 +1203,9 @@ class ComposerController extends BaseController
}

void _handlePickImageFailure(LocalImagePickerFailure failure) {
if (PlatformInfo.isMobile) {
richTextMobileTabletController?.webViewLifecycleManager?.resume();
}
if (currentOverlayContext != null && currentContext != null && failure.exception is! PickFileCanceledException) {
appToast.showToastErrorMessage(
currentOverlayContext!,
Expand All @@ -1205,13 +1214,19 @@ class ComposerController extends BaseController
}

void _handlePickFileSuccess(LocalFilePickerSuccess success) {
if (PlatformInfo.isMobile) {
richTextMobileTabletController?.webViewLifecycleManager?.resume();
}
uploadController.validateTotalSizeAttachmentsBeforeUpload(
totalSizePreparedFiles: success.pickedFiles.totalSize,
onValidationSuccess: () => uploadAttachmentsAction(pickedFiles: success.pickedFiles)
);
}

void _handlePickImageSuccess(LocalImagePickerSuccess success) {
if (PlatformInfo.isMobile) {
richTextMobileTabletController?.webViewLifecycleManager?.resume();
}
uploadController.validateTotalSizeInlineAttachmentsBeforeUpload(
totalSizePreparedFiles: success.fileInfo.fileSize,
onValidationSuccess: () => uploadAttachmentsAction(pickedFiles: [success.fileInfo.withInline()])
Expand Down Expand Up @@ -1739,7 +1754,7 @@ class ComposerController extends BaseController
}
}

void insertImage(BuildContext context, double maxWith) async {
void insertImage(BuildContext context, double maxWith) {
clearFocus(context);

if (responsiveUtils.isMobile(context)) {
Expand All @@ -1748,6 +1763,9 @@ class ComposerController extends BaseController
maxWithEditor = maxWith - 70;
}

if (PlatformInfo.isMobile) {
richTextMobileTabletController?.webViewLifecycleManager?.pause();
}
consumeState(_localImagePickerInteractor.execute());
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
import 'dart:io';

import 'package:core/utils/app_logger.dart';
import 'package:core/utils/html/html_utils.dart';
import 'package:core/utils/platform_info.dart';
import 'package:file_picker/file_picker.dart';
import 'package:flutter/cupertino.dart';
import 'package:get/get.dart';
import 'package:rich_text_composer/rich_text_composer.dart';
import 'package:tmail_ui_user/features/composer/presentation/controller/web_view_lifecycle_manager.dart';
import 'package:tmail_ui_user/features/composer/presentation/model/header_style_type.dart';
import 'package:tmail_ui_user/features/composer/presentation/model/inline_image.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';

class RichTextMobileTabletController extends GetxController {
HtmlEditorApi? htmlEditorApi;
WebViewLifecycleManager? webViewLifecycleManager;

final RichTextController richTextController = RichTextController();

Expand Down Expand Up @@ -72,9 +73,14 @@ class RichTextMobileTabletController extends GetxController {
}
}

void onInitWebViewLifecycleManager(InAppWebViewController? controller) {
webViewLifecycleManager = WebViewLifecycleManager(controller);
}

@override
void onClose() {
richTextController.dispose();
webViewLifecycleManager = null;
htmlEditorApi = null;
super.onClose();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import 'package:core/utils/app_logger.dart';
import 'package:rich_text_composer/rich_text_composer.dart';

class WebViewLifecycleManager {
final InAppWebViewController? controller;

WebViewLifecycleManager(this.controller);

Future<void> pause() async {
if (controller == null) return;
try {
await controller!.pauseTimers();
await controller!.pause();
} catch (e) {
logError('$runtimeType::pause:[WebViewLifecycleManager] pause error: $e');
}
}

Future<void> resume() async {
if (controller == null) return;
try {
await controller!.resume();
await controller!.resumeTimers();
} catch (e) {
logError('$runtimeType::resume:[WebViewLifecycleManager] resume error: $e');
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@

import 'dart:io';

import 'package:core/presentation/state/failure.dart';
import 'package:core/presentation/state/success.dart';
import 'package:core/utils/app_logger.dart';
import 'package:core/utils/platform_info.dart';
import 'package:dartz/dartz.dart';
import 'package:file_picker/file_picker.dart';
Expand All @@ -14,6 +17,7 @@ class LocalFilePickerInteractor {

Stream<Either<Failure, Success>> execute({FileType fileType = FileType.any}) async* {
try {
log('$runtimeType::execute:Memory info: ${(ProcessInfo.currentRss / (1024 * 1024)).toStringAsFixed(2)} MB');
yield Right<Failure, Success>(LocalFilePickerLoading());

final filesResult = await FilePicker.platform.pickFiles(
Expand Down
Loading