From a7255d1dd4d040d79209106dcf16e0d303e81459 Mon Sep 17 00:00:00 2001
From: SergeyEzhin <ezhin@mail.ru>
Date: Tue, 27 Dec 2022 22:55:06 +0400
Subject: [PATCH 1/3] [DE mobile] Fix Bug 60369

---
 apps/documenteditor/mobile/src/view/settings/Navigation.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/documenteditor/mobile/src/view/settings/Navigation.jsx b/apps/documenteditor/mobile/src/view/settings/Navigation.jsx
index ec6226e60..ab0eebcea 100644
--- a/apps/documenteditor/mobile/src/view/settings/Navigation.jsx
+++ b/apps/documenteditor/mobile/src/view/settings/Navigation.jsx
@@ -105,7 +105,7 @@ const NavigationSheet = inject('storeNavigation')(observer(props => {
     }, []);
 
     return (
-        <Sheet id="view-navigation-sheet" className="navigation-sheet" backdrop={false} closeByBackdropClick={false} closeByOutsideClick={true} onSheetClosed={() => props.onclosed()} style={{height: `${stateHeight}`, opacity: `${stateOpacity}`}}>
+        <Sheet id="view-navigation-sheet" className="navigation-sheet" backdrop={true} closeByBackdropClick={true} onSheetClosed={() => props.onclosed()} style={{height: `${stateHeight}`, opacity: `${stateOpacity}`}}>
             <div id='swipe-handler' className='swipe-container' onTouchStart={handleTouchStart} onTouchMove={handleTouchMove} onTouchEnd={handleTouchEnd}>
                 <Icon icon='icon icon-swipe'/>
             </div>

From e87995d33a5fd2839da1d9d10f25419e82e16359 Mon Sep 17 00:00:00 2001
From: SergeyEzhin <ezhin@mail.ru>
Date: Tue, 27 Dec 2022 23:16:46 +0400
Subject: [PATCH 2/3] [DE mobile] Fix Bug 60365

---
 apps/documenteditor/mobile/src/controller/Main.jsx | 5 ++++-
 apps/documenteditor/mobile/src/view/Toolbar.jsx    | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx
index 6deb76d39..a44ea3a65 100644
--- a/apps/documenteditor/mobile/src/controller/Main.jsx
+++ b/apps/documenteditor/mobile/src/controller/Main.jsx
@@ -236,6 +236,9 @@ class MainController extends Component {
 
                 const appOptions = this.props.storeAppOptions;
                 const appSettings = this.props.storeApplicationSettings;
+                const storeDocumentInfo = this.props.storeDocumentInfo;
+                const dataDoc = storeDocumentInfo.dataDoc;
+                const isExtRestriction = dataDoc.fileType !== 'oform';
 
                 f7.emit('resize');
 
@@ -268,7 +271,7 @@ class MainController extends Component {
 
                 value = LocalStorage.getBool('mobile-view', true);
 
-                if(value) {
+                if(value && isExtRestriction) {
                     this.api.ChangeReaderMode();
                 } else {
                     appOptions.changeMobileView();
diff --git a/apps/documenteditor/mobile/src/view/Toolbar.jsx b/apps/documenteditor/mobile/src/view/Toolbar.jsx
index 619ee7f69..e813b89bc 100644
--- a/apps/documenteditor/mobile/src/view/Toolbar.jsx
+++ b/apps/documenteditor/mobile/src/view/Toolbar.jsx
@@ -8,7 +8,7 @@ const ToolbarView = props => {
     const { t } = useTranslation();
     const isDisconnected = props.isDisconnected;
     const docExt = props.docExt;
-    const isAvailableExt = docExt && docExt !== 'djvu' && docExt !== 'pdf' && docExt !== 'xps';
+    const isAvailableExt = docExt && docExt !== 'djvu' && docExt !== 'pdf' && docExt !== 'xps' && docExt !== 'oform';
     const disableEditBtn = props.isObjectLocked || props.stateDisplayMode || props.disabledEditControls || isDisconnected;
     const isViewer = props.isViewer;
     const isMobileView = props.isMobileView;
@@ -62,7 +62,7 @@ const ToolbarView = props => {
                     onRedoClick: props.onRedo
                 })}
                 {/*isAvailableExt && !props.disabledControls &&*/}
-                {(isViewer || !Device.phone) && <Link className={(!isAvailableExt || props.disabledControls) && 'disabled'} icon={isMobileView ? 'icon-standard-view' : 'icon-mobile-view'} href={false} onClick={() => {
+                {((isViewer || !Device.phone) && isAvailableExt) && <Link className={props.disabledControls && 'disabled'} icon={isMobileView ? 'icon-standard-view' : 'icon-mobile-view'} href={false} onClick={() => {
                     props.changeMobileView();
                     props.openOptions('snackbar');
                 }}></Link>}

From 7094bc2089bf451a45a0872bef5c3f75253e0a57 Mon Sep 17 00:00:00 2001
From: SergeyEzhin <ezhin@mail.ru>
Date: Wed, 28 Dec 2022 00:14:06 +0400
Subject: [PATCH 3/3] [common] Fix Bug 60360

---
 apps/common/mobile/resources/less/material/icons.less | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/common/mobile/resources/less/material/icons.less b/apps/common/mobile/resources/less/material/icons.less
index 914e15bc3..8147d5876 100644
--- a/apps/common/mobile/resources/less/material/icons.less
+++ b/apps/common/mobile/resources/less/material/icons.less
@@ -34,6 +34,9 @@
                 height: 24px;
                 .encoded-svg-mask('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><g clip-path="url(#clip0_4309_12598)"><path fill-rule="evenodd" clip-rule="evenodd" d="M7.49999 14C4.67677 14 2.51136 15.4069 1.40113 17.2572C0.840114 18.1923 1.00119 18.562 1.10243 18.6903C1.25554 18.8844 1.60969 19 1.97238 19H7.5V20H1.97238C1.50174 20 0.75589 19.8656 0.317329 19.3097C-0.173093 18.688 -0.0953502 17.8077 0.543635 16.7428C1.8334 14.5931 4.3232 13 7.49999 13V14ZM7.49999 13C10.6768 13 13.139 14.5931 14.4287 16.7428C15.0677 17.8077 15.1455 18.688 14.655 19.3097C14.2165 19.8656 13.4706 20 13 20H7.5V19H13C13.3627 19 13.7168 18.8844 13.8699 18.6903C13.9712 18.562 14.1323 18.1923 13.5712 17.2572C12.461 15.4069 10.3232 14 7.49999 14V13Z" fill="black"/><path fill-rule="evenodd" clip-rule="evenodd" d="M15 20H22.0007C22.4714 20 23.2172 19.8656 23.6558 19.3097C24.1462 18.688 24.0685 17.8077 23.4295 16.7428C22.1397 14.5931 19.6775 13 16.5007 13C15.2069 13 14.1778 13.164 13.1465 13.6225C13.5096 13.9033 13.7857 14.1169 14.1435 14.3553C14.8626 14.1272 15.6519 14 16.5007 14C19.3239 14 21.4617 15.4069 22.572 17.2572C23.133 18.1923 22.9719 18.562 22.8707 18.6903C22.7176 18.8844 22.3634 19 22.0007 19H16.5C16.4511 19.1093 16.3884 19.2127 16.3119 19.3097C16.2637 19.3708 16.2117 19.4268 16.1568 19.4782C15.7126 19.8935 15.4189 20 15 20Z" fill="black"/><path fill-rule="evenodd" clip-rule="evenodd" d="M7.50001 11C8.75947 11 10 9.78646 10 8C10 6.21354 8.75947 5 7.50001 5C6.24055 5 5.00001 6.21354 5.00001 8C5.00001 9.78646 6.24055 11 7.50001 11ZM7.50001 12C9.433 12 11 10.2091 11 8C11 5.79086 9.433 4 7.50001 4C5.56701 4 4.00001 5.79086 4.00001 8C4.00001 10.2091 5.56701 12 7.50001 12Z" fill="black"/><path fill-rule="evenodd" clip-rule="evenodd" d="M17 11C17.9655 11 19 10.0309 19 8.5C19 6.96911 17.9655 6 17 6C16.0345 6 15 6.96911 15 8.5C15 10.0309 16.0345 11 17 11ZM17 12C18.6569 12 20 10.433 20 8.5C20 6.567 18.6569 5 17 5C15.3432 5 14 6.567 14 8.5C14 10.433 15.3432 12 17 12Z" fill="black"/></g><defs><clipPath id="clip0_4309_12598"><rect width="24" height="24" fill="white"/></clipPath></defs></svg>', @toolbar-icons);
             }
+            &.icon-back {
+                color: @toolbar-icons;
+            }
             &.icon-edit {
                 width: 22px;
                 height: 22px;