From 6380db3ae50979be4e9d2f396d23f195d4c5244e Mon Sep 17 00:00:00 2001
From: SergeyEzhin <ezhin@mail.ru>
Date: Mon, 24 Apr 2023 08:56:36 +0400
Subject: [PATCH 1/4] [SSE mobile] Fix Bug 56203

---
 .../mobile/src/less/app.less                  |  9 +++++++-
 .../mobile/src/view/Statusbar.jsx             | 21 +++++++++++--------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/apps/spreadsheeteditor/mobile/src/less/app.less b/apps/spreadsheeteditor/mobile/src/less/app.less
index 2f6739b8d5..b0433a9f9f 100644
--- a/apps/spreadsheeteditor/mobile/src/less/app.less
+++ b/apps/spreadsheeteditor/mobile/src/less/app.less
@@ -266,4 +266,11 @@
             display: none;
         }
     }
-}
\ No newline at end of file
+}
+
+// Marker color sheet
+.marker-color-sheet {
+    width: 16px;
+    height: 16px;
+    border-radius: 50%;
+}
diff --git a/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx b/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx
index 9491a10f7f..6f310dc078 100644
--- a/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx
+++ b/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx
@@ -37,7 +37,7 @@ const PageListMove = props => {
     )
 };
 
-const PageAllList = (props) => {
+const PageAllList = observer((props) => {
     const { t } = useTranslation();
     const { sheets, onTabListClick } = props;
     const allSheets = sheets.sheets;
@@ -65,18 +65,21 @@ const PageAllList = (props) => {
                 <List>
                     {allSheets.map((model, sheetIndex) =>
                         <ListItem className='item-list' key={model.name} title={model.name} checkbox checked={model.active} onClick={() => onTabListClick(sheetIndex)}>
-                            {model.hidden ?     
-                                <div slot='after'>
-                                    {t('Statusbar.textHidden')}
-                                </div>
-                            : null}
-                        </ListItem>)
-                    }
+                            <div slot='after'>
+                                {model.hidden ? 
+                                    t('Statusbar.textHidden')
+                                :
+                                    <div className='marker-color-sheet' style={{
+                                        background: model.color ? '#' + Common.Utils.ThemeColor.getHexColor(model.color.get_r(), model.color.get_g(), model.color.get_b()) : 'transparent'}}></div>
+                                }
+                            </div>
+                        </ListItem>
+                    )}
                 </List>
             </Page>
         </View>
     )
-};
+});
 
 const PageCustomTabColor =  inject("storePalette")(observer (props => {
     const { t } = useTranslation();

From 4257909faf50b5d612b3a64e3cb72bbf9e689e33 Mon Sep 17 00:00:00 2001
From: SergeyEzhin <ezhin@mail.ru>
Date: Mon, 24 Apr 2023 09:44:34 +0400
Subject: [PATCH 2/4] [DE mobile] Fix Bug 61005

---
 apps/documenteditor/mobile/src/less/app.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/documenteditor/mobile/src/less/app.less b/apps/documenteditor/mobile/src/less/app.less
index a4cb668a7c..41f7cfb42d 100644
--- a/apps/documenteditor/mobile/src/less/app.less
+++ b/apps/documenteditor/mobile/src/less/app.less
@@ -285,7 +285,7 @@
         color: @text-normal;
         font-size: 16px;
     }
-    .calendar-day-selected .calendar-day-number {
+    .calendar-day-selected .calendar-day-number, .calendar-day-today.calendar-day-selected .calendar-day-number {
         border: 1px solid transparent;
         background-color: @brandColor;
         color: @fill-white;

From aa92f28597c961481cef1da079f447613c75299f Mon Sep 17 00:00:00 2001
From: SergeyEzhin <ezhin@mail.ru>
Date: Mon, 24 Apr 2023 10:32:23 +0400
Subject: [PATCH 3/4] [DE mobile] Fix Bug 62041

---
 .../mobile/src/view/edit/EditText.jsx         | 49 ++++++++++---------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx
index 01897e7548..6d0638773b 100644
--- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx
@@ -306,29 +306,32 @@ const PageBulletsAndNumbers = props => {
                     </NavRight>
                 }
             </Navbar>
-            <Swiper pagination>
-                <SwiperSlide>
-                    <PageNumbers 
-                        storeTextSettings={storeTextSettings} 
-                        onNumber={props.onNumber} 
-                        getIconsBulletsAndNumbers={props.getIconsBulletsAndNumbers} 
-                    />
-                </SwiperSlide> 
-                <SwiperSlide>
-                    <PageBullets 
-                        storeTextSettings={storeTextSettings} 
-                        onBullet={props.onBullet} 
-                        getIconsBulletsAndNumbers={props.getIconsBulletsAndNumbers}
-                    />
-                </SwiperSlide>
-                <SwiperSlide> 
-                    <PageMultiLevel 
-                        storeTextSettings={storeTextSettings} 
-                        onMultiLevelList={props.onMultiLevelList} 
-                        getIconsBulletsAndNumbers={props.getIconsBulletsAndNumbers}
-                    />
-                </SwiperSlide>
-            </Swiper>
+            <div className="swiper-container swiper-init" data-pagination='{"el": ".swiper-pagination"}'>
+                <div className="swiper-wrapper">
+                    <div className="swiper-slide">
+                        <PageNumbers 
+                            storeTextSettings={storeTextSettings} 
+                            onNumber={props.onNumber} 
+                            getIconsBulletsAndNumbers={props.getIconsBulletsAndNumbers} 
+                        />
+                    </div>
+                    <div className="swiper-slide">
+                        <PageBullets 
+                            storeTextSettings={storeTextSettings} 
+                            onBullet={props.onBullet} 
+                            getIconsBulletsAndNumbers={props.getIconsBulletsAndNumbers}
+                        />
+                    </div>
+                    <div className="swiper-slide">
+                        <PageMultiLevel 
+                            storeTextSettings={storeTextSettings} 
+                            onMultiLevelList={props.onMultiLevelList} 
+                            getIconsBulletsAndNumbers={props.getIconsBulletsAndNumbers}
+                        />
+                    </div>
+                </div>
+                <div className="swiper-pagination"></div>
+            </div>
         </Page>
     )
 };

From 95f001daac8af850345a98d60707c3701a65ea75 Mon Sep 17 00:00:00 2001
From: SergeyEzhin <ezhin@mail.ru>
Date: Mon, 24 Apr 2023 11:41:31 +0400
Subject: [PATCH 4/4] [DE mobile] Fix Bug 54520

---
 apps/documenteditor/mobile/src/view/Toolbar.jsx |  2 +-
 .../mobile/src/view/settings/Settings.jsx       | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/apps/documenteditor/mobile/src/view/Toolbar.jsx b/apps/documenteditor/mobile/src/view/Toolbar.jsx
index 95c3468f3f..47c8267a66 100644
--- a/apps/documenteditor/mobile/src/view/Toolbar.jsx
+++ b/apps/documenteditor/mobile/src/view/Toolbar.jsx
@@ -76,7 +76,7 @@ const ToolbarView = props => {
                 })}
                 {/*props.displayCollaboration &&*/}
                 {Device.phone ? null : <Link className={(props.disabledControls || props.readerMode) && 'disabled'} icon='icon-search' searchbarEnable='.searchbar' href={false}></Link>}
-                {window.matchMedia("(min-width: 360px)").matches ? <Link className={props.disabledControls && 'disabled'} id='btn-coauth' href={false} icon='icon-collaboration' onClick={() => props.openOptions('coauth')}></Link> : null}
+                {window.matchMedia("(min-width: 360px)").matches && docExt !== 'oform' ? <Link className={props.disabledControls && 'disabled'} id='btn-coauth' href={false} icon='icon-collaboration' onClick={() => props.openOptions('coauth')}></Link> : null}
                 <Link className={(props.disabledSettings || props.disabledControls || isDisconnected) && 'disabled'} id='btn-settings' icon='icon-settings' href={false} onClick={() => props.openOptions('settings')}></Link>
             </NavRight>
         </Fragment>
diff --git a/apps/documenteditor/mobile/src/view/settings/Settings.jsx b/apps/documenteditor/mobile/src/view/settings/Settings.jsx
index 60bda1764f..f7d9d9af6f 100644
--- a/apps/documenteditor/mobile/src/view/settings/Settings.jsx
+++ b/apps/documenteditor/mobile/src/view/settings/Settings.jsx
@@ -96,7 +96,7 @@ const routes = [
 ];
 
 
-const SettingsList = inject("storeAppOptions", "storeReview")(observer(props => {
+const SettingsList = inject("storeAppOptions", "storeReview", "storeDocumentInfo")(observer(props => {
     const { t } = useTranslation();
     const _t = t('Settings', {returnObjects: true});
     const appOptions = props.storeAppOptions;
@@ -106,6 +106,9 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props =>
     const navbar = <Navbar title={_t.textSettings}>
                     {!props.inPopover  && <NavRight><Link popupClose=".settings-popup">{_t.textDone}</Link></NavRight>}
                     </Navbar>;
+    const docInfo = props.storeDocumentInfo;
+    const docExt = docInfo.dataDoc ? docInfo.dataDoc.fileType : '';
+    const isNotForm = docExt && docExt !== 'oform';
 
     const onoptionclick = page => {
         if ( props.onOptionClick )
@@ -211,10 +214,12 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props =>
                             <Icon slot="media" icon="icon-doc-setup"></Icon>
                         </ListItem>
                     }
-                    <ListItem title={_t.textApplicationSettings} link="#"
-                              onClick={onoptionclick.bind(this, "/application-settings/")}>
-                        <Icon slot="media" icon="icon-app-settings"></Icon>
-                    </ListItem>
+                    {isNotForm &&
+                        <ListItem title={_t.textApplicationSettings} link="#"
+                                onClick={onoptionclick.bind(this, "/application-settings/")}>
+                            <Icon slot="media" icon="icon-app-settings"></Icon>
+                        </ListItem>
+                    }
                     {_canDownload &&
                         <ListItem title={_t.textDownload} link="#" onClick={onoptionclick.bind(this, "/download/")}>
                             <Icon slot="media" icon="icon-download"></Icon>
@@ -238,7 +243,7 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props =>
                             <Icon slot="media" icon="icon-help"></Icon>
                         </ListItem>
                     }
-                    {_canAbout &&
+                    {(_canAbout && isNotForm) &&
                         <ListItem title={_t.textAbout} link="#" onClick={onoptionclick.bind(this, "/about/")}>
                             <Icon slot="media" icon="icon-about"></Icon>
                         </ListItem>