From 13cedf86f1303dda29493ab1c482125d27f621a2 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Wed, 28 Sep 2022 02:03:02 +0300 Subject: [PATCH 1/4] [DE mobile] For Bug 58655 --- .../mobile/src/controller/Toolbar.jsx | 40 ++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/apps/documenteditor/mobile/src/controller/Toolbar.jsx b/apps/documenteditor/mobile/src/controller/Toolbar.jsx index 69056e834..e863f8922 100644 --- a/apps/documenteditor/mobile/src/controller/Toolbar.jsx +++ b/apps/documenteditor/mobile/src/controller/Toolbar.jsx @@ -3,7 +3,6 @@ import { inject, observer } from 'mobx-react'; import { f7 } from 'framework7-react'; import { useTranslation } from 'react-i18next'; import ToolbarView from "../view/Toolbar"; -import {storeAppOptions} from "../store/appOptions"; import {LocalStorage} from "../../../../common/mobile/utils/LocalStorage"; const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'storeFocusObjects', 'storeToolbarSettings','storeDocumentInfo')(observer(props => { @@ -33,12 +32,23 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'sto const docExt = docInfo.dataDoc ? docInfo.dataDoc.fileType : ''; const docTitle = docInfo.dataDoc ? docInfo.dataDoc.title : ''; + const sensitivity = 20; + let touchStartY = 0; + let touchEndY = 0; + useEffect(() => { + const sdk = document.querySelector('#editor_sdk'); + Common.Gateway.on('init', loadConfig); Common.Notifications.on('toolbar:activatecontrols', activateControls); Common.Notifications.on('toolbar:deactivateeditcontrols', deactivateEditControls); Common.Notifications.on('goback', goBack); + if(isViewer) { + sdk.addEventListener('touchstart', handleTouchStart); + sdk.addEventListener('touchend', handleTouchEnd); + } + if (isDisconnected) { f7.popover.close(); f7.sheet.close(); @@ -49,9 +59,37 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'sto Common.Notifications.off('toolbar:activatecontrols', activateControls); Common.Notifications.off('toolbar:deactivateeditcontrols', deactivateEditControls); Common.Notifications.off('goback', goBack); + + if(isViewer) { + sdk.removeEventListener('touchstart', handleTouchStart); + sdk.removeEventListener('touchend', handleTouchEnd); + } } }); + // Touch handlers + + const checkDirection = () => { + const diff = touchStartY - touchEndY; + + if(Math.abs(diff) > sensitivity) { + if(diff > 0) { + // f7.navbar.show('.main-navbar'); + } else { + // f7.navbar.hide('.main-navbar'); + } + } + }; + + const handleTouchStart = e => { + touchStartY = e.changedTouches[0].screenY; + }; + + const handleTouchEnd = e => { + touchEndY = e.changedTouches[0].screenY; + checkDirection(); + }; + // Back button const [isShowBack, setShowBack] = useState(appOptions.canBackToFolder); const loadConfig = (data) => { From 198df57eaf6ae5c142cc4abb11e19047f2564998 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Thu, 6 Oct 2022 17:03:02 +0500 Subject: [PATCH 2/4] [DE mobile] Fix Bug 58321 --- apps/documenteditor/mobile/locale/en.json | 3 ++- apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index a3b63960d..ff7c2716e 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -400,7 +400,8 @@ "textAmountOfLevels": "Amount of Levels", "textRecommended": "Recommended", "textRequired": "Required", - "textChangeShape": "Change Shape" + "textChangeShape": "Change Shape", + "textCustomStyle": "Custom Style" }, "Error": { "convertationTimeoutText": "Conversion timeout exceeded.", diff --git a/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx b/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx index f8511a6a2..fa360438b 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx @@ -201,7 +201,7 @@ const EditParagraph = props => { {t('Edit.textParagraphStyle')} - Date: Thu, 6 Oct 2022 17:03:49 +0500 Subject: [PATCH 3/4] [DE PE SSE mobile] Fix Bug 59272 --- apps/common/mobile/resources/less/common-ios.less | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less index da10ab1a5..dc3f735bc 100644 --- a/apps/common/mobile/resources/less/common-ios.less +++ b/apps/common/mobile/resources/less/common-ios.less @@ -552,6 +552,15 @@ .toggle-icon { background: transparent; } + + // Edit Comment Popup + + .edit-comment-popup { + .navbar .title { + line-height: normal; + } + } + } From eb6bc50a01e90cd396bbcc92afb0e350c7d20672 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Thu, 6 Oct 2022 17:04:20 +0500 Subject: [PATCH 4/4] [DE PE SSE mobile] Fix Bug 59230 --- apps/common/mobile/lib/component/ThemeColorPalette.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/common/mobile/lib/component/ThemeColorPalette.jsx b/apps/common/mobile/lib/component/ThemeColorPalette.jsx index 3c53ff558..9a1325622 100644 --- a/apps/common/mobile/lib/component/ThemeColorPalette.jsx +++ b/apps/common/mobile/lib/component/ThemeColorPalette.jsx @@ -61,15 +61,15 @@ const CustomColors = ({ options, customColors, isTypeColors, onColorClick, curCo return (
- {colors && colors.length > 0 && colors.map((color, index) => { - return( + {colors && colors.length > 0 ? colors.map((color, index) => { + return ( {onColorClick(color)}} > ) - })} + }) : null} {emptyItems.length > 0 && emptyItems}
)