Sync all use PlatformInfo to check platform while runtime

(cherry picked from commit 514fec1f2f4f1ff8a584bf8db7bf3a5537a3e9f8)
This commit is contained in:
dab246
2023-06-15 14:26:04 +07:00
committed by Dat H. Pham
parent 3d019d644a
commit 96145aae7a
88 changed files with 298 additions and 309 deletions
@@ -3,7 +3,7 @@ import 'package:core/presentation/utils/keyboard_utils.dart';
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/build_utils.dart';
import 'package:core/utils/platform_info.dart';
import 'package:flutter/cupertino.dart';
import 'package:get/get_core/get_core.dart';
import 'package:get/get_instance/get_instance.dart';
@@ -168,7 +168,7 @@ class IdentityCreatorController extends BaseController {
if (identity?.signatureAsString.isNotEmpty == true) {
updateContentHtmlEditor(arguments?.identity?.signatureAsString ?? '');
if (BuildUtils.isWeb) {
if (PlatformInfo.isWeb) {
signatureHtmlEditorController.setText(arguments?.identity?.signatureAsString ?? '');
}
}
@@ -296,7 +296,7 @@ class IdentityCreatorController extends BaseController {
}
Future<String?> _getSignatureHtmlText() async {
if (BuildUtils.isWeb) {
if (PlatformInfo.isWeb) {
return signatureHtmlEditorController.getText();
} else {
return keyboardRichTextController.htmlEditorApi?.getText();
@@ -318,7 +318,7 @@ class IdentityCreatorController extends BaseController {
return;
}
final signatureHtmlText = BuildUtils.isWeb
final signatureHtmlText = PlatformInfo.isWeb
? contentHtmlEditor
: await _getSignatureHtmlText();
final bccAddress = bccOfIdentity.value != null && bccOfIdentity.value != noneEmailAddress
@@ -349,7 +349,7 @@ class IdentityCreatorController extends BaseController {
isDefaultIdentity: isDefaultIdentity.value
);
if (BuildUtils.isWeb) {
if (PlatformInfo.isWeb) {
onCreatedIdentityCallback?.call(identityRequest);
} else {
popBack(result: identityRequest);
@@ -360,7 +360,7 @@ class IdentityCreatorController extends BaseController {
identityRequest: newIdentity.toIdentityRequest(),
isDefaultIdentity: isDefaultIdentity.value);
if (BuildUtils.isWeb) {
if (PlatformInfo.isWeb) {
onCreatedIdentityCallback?.call(identityRequest);
} else {
popBack(result: identityRequest);
@@ -426,7 +426,7 @@ class IdentityCreatorController extends BaseController {
}
void clearFocusEditor(BuildContext context) {
if (!BuildUtils.isWeb) {
if (PlatformInfo.isMobile) {
keyboardRichTextController.htmlEditorApi?.unfocus();
KeyboardUtils.hideSystemKeyboardMobile();
}
@@ -434,7 +434,7 @@ class IdentityCreatorController extends BaseController {
}
void closeView(BuildContext context) {
if (BuildUtils.isWeb) {
if (PlatformInfo.isWeb) {
onDismissIdentityCreator?.call();
} else {
popBack();
@@ -9,7 +9,7 @@ import 'package:core/presentation/utils/style_utils.dart';
import 'package:core/presentation/views/button/icon_button_web.dart';
import 'package:core/presentation/views/responsive/responsive_widget.dart';
import 'package:core/utils/app_logger.dart';
import 'package:core/utils/build_utils.dart';
import 'package:core/utils/platform_info.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart';
@@ -63,7 +63,7 @@ class IdentityCreatorView extends GetWidget<IdentityCreatorController> {
borderOnForeground: false,
color: Colors.transparent,
child: SafeArea(
top: !BuildUtils.isWeb,
top: PlatformInfo.isMobile,
bottom: false,
left: false,
right: false,
@@ -211,7 +211,7 @@ class IdentityCreatorView extends GetWidget<IdentityCreatorController> {
controller.errorNameIdentity.value,
AppLocalizations.of(context).required,
editingController: controller.inputNameIdentityController,
focusNode: BuildUtils.isWeb ? null : controller.inputNameIdentityFocusNode,
focusNode: PlatformInfo.isWeb ? null : controller.inputNameIdentityFocusNode,
isMandatory: true,
onChangeInputNameAction: (value) => controller.updateNameIdentity(context, value)
)),
@@ -243,7 +243,7 @@ class IdentityCreatorView extends GetWidget<IdentityCreatorController> {
AppLocalizations.of(context).bcc_to,
controller.errorBccIdentity.value,
controller.inputBccIdentityController,
focusNode: BuildUtils.isWeb ? null : controller.inputBccIdentityFocusNode,
focusNode: PlatformInfo.isWeb ? null : controller.inputBccIdentityFocusNode,
onSelectedSuggestionAction: (newEmailAddress) {
controller.inputBccIdentityController?.text = newEmailAddress?.email ?? '';
controller.updateBccOfIdentity(newEmailAddress);
@@ -287,7 +287,7 @@ class IdentityCreatorView extends GetWidget<IdentityCreatorController> {
child: Column(children: [
_buildHeaderView(context),
Expanded(
child: BuildUtils.isWeb
child: PlatformInfo.isWeb
? PointerInterceptor(child: bodyCreatorView)
: KeyboardRichText(
keyBroadToolbar: RichTextKeyboardToolBar(
@@ -343,13 +343,13 @@ class IdentityCreatorView extends GetWidget<IdentityCreatorController> {
}
Widget _buildSignatureHtmlTemplate(BuildContext context) {
final htmlEditor = BuildUtils.isWeb
final htmlEditor = PlatformInfo.isWeb
? _buildHtmlEditorWeb(context, controller.contentHtmlEditor ?? '')
: _buildHtmlEditor(context, initialContent: controller.contentHtmlEditor ?? '');
return Column(
children: [
if(BuildUtils.isWeb)
if(PlatformInfo.isWeb)
ToolbarRichTextWebBuilder(
richTextWebController: controller.richTextWebController,
padding: const EdgeInsets.only(top: 22, bottom: 8.0, left: 24, right: 12)),