diff --git a/apps/common/mobile/lib/component/WheelColorPicker.jsx b/apps/common/mobile/lib/component/WheelColorPicker.jsx index bdaeaec593..b1cf876d33 100644 --- a/apps/common/mobile/lib/component/WheelColorPicker.jsx +++ b/apps/common/mobile/lib/component/WheelColorPicker.jsx @@ -1,5 +1,9 @@ import React, { useEffect, useState } from 'react' import { f7, Icon } from 'framework7-react'; +import { Device } from '../../../../common/mobile/utils/device'; +import SvgIcon from '@common/lib/component/SvgIcon' +import IconPlusIos from '@common-ios-icons/icon-plus.svg?ios'; +import IconPlusAndroid from '@common-android-icons/icon-plus.svg?android'; export const WheelColorPicker = ({ initialColor = '#ffffff', onSelectColor }) => { const [color, setColor] = useState(initialColor); @@ -23,7 +27,10 @@ export const WheelColorPicker = ({ initialColor = '#ffffff', onSelectColor }) =>
onSelectColor(color)}> - + {Device.ios ? + : + + } diff --git a/apps/common/mobile/lib/pages/CollaborationPage.jsx b/apps/common/mobile/lib/pages/CollaborationPage.jsx index 68bbfde2e3..24b2787dd9 100644 --- a/apps/common/mobile/lib/pages/CollaborationPage.jsx +++ b/apps/common/mobile/lib/pages/CollaborationPage.jsx @@ -30,7 +30,7 @@ const CollaborationPage = props => { {Device.ios ? : - + } diff --git a/apps/common/mobile/lib/pages/UsersPage.jsx b/apps/common/mobile/lib/pages/UsersPage.jsx index 664a0f341a..4903c90add 100644 --- a/apps/common/mobile/lib/pages/UsersPage.jsx +++ b/apps/common/mobile/lib/pages/UsersPage.jsx @@ -20,7 +20,7 @@ const UsersPage = inject("users")(observer(props => { {Device.ios ? : - + } diff --git a/apps/common/mobile/lib/view/VersionHistory.jsx b/apps/common/mobile/lib/view/VersionHistory.jsx index f1fd8dee70..04cf26be43 100644 --- a/apps/common/mobile/lib/view/VersionHistory.jsx +++ b/apps/common/mobile/lib/view/VersionHistory.jsx @@ -4,7 +4,7 @@ import { useTranslation } from "react-i18next"; import { observer, inject } from "mobx-react"; import { Device } from '../../utils/device'; import SvgIcon from '@common/lib/component/SvgIcon'; -import IconExpandDownIos from '@common-ios-icons/icon-expand-down.svg'; +import IconExpandDownIos from '@common-ios-icons/icon-expand-down.svg?ios'; import IconExpandDownAndroid from '@common-android-icons/icon-expand-down.svg'; const VersionHistoryView = inject('storeVersionHistory', 'users')(observer(props => { @@ -56,7 +56,7 @@ const VersionHistoryView = inject('storeVersionHistory', 'users')(observer(props {Device.ios ? : - + } @@ -65,7 +65,7 @@ const VersionHistoryView = inject('storeVersionHistory', 'users')(observer(props {Device.ios ? : - + } diff --git a/apps/common/mobile/lib/view/collaboration/Comments.jsx b/apps/common/mobile/lib/view/collaboration/Comments.jsx index 09ca848e02..9113e6b0d5 100644 --- a/apps/common/mobile/lib/view/collaboration/Comments.jsx +++ b/apps/common/mobile/lib/view/collaboration/Comments.jsx @@ -733,7 +733,7 @@ const ViewComments = inject("storeComments", "storeAppOptions", "storeReview")(o {Device.ios ? : - + } diff --git a/apps/common/mobile/lib/view/collaboration/Review.jsx b/apps/common/mobile/lib/view/collaboration/Review.jsx index 4d21696a60..d7450b117c 100644 --- a/apps/common/mobile/lib/view/collaboration/Review.jsx +++ b/apps/common/mobile/lib/view/collaboration/Review.jsx @@ -35,7 +35,7 @@ const PageReview = props => { {Device.ios ? : - + } @@ -95,7 +95,7 @@ const DisplayMode = props => { {Device.ios ? : - + } @@ -150,7 +150,7 @@ const PageReviewChange = inject("storeAppOptions")(observer(props => { {Device.ios ? : - + } diff --git a/apps/common/mobile/resources/icons/common/icon-image.svg b/apps/common/mobile/resources/icons/common/icon-image.svg index ef8c3990a8..07ffa95ac5 100644 --- a/apps/common/mobile/resources/icons/common/icon-image.svg +++ b/apps/common/mobile/resources/icons/common/icon-image.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/apps/common/mobile/resources/less/ios/icons.less b/apps/common/mobile/resources/less/ios/icons.less index cb5c208261..39c4662b03 100644 --- a/apps/common/mobile/resources/less/ios/icons.less +++ b/apps/common/mobile/resources/less/ios/icons.less @@ -20,21 +20,6 @@ background: ~"url(@{common-image-path}/header/logo-ios.svg)" no-repeat center; background-size: contain; } - &.icon-show-password { - width: 25px; - height: 25px; - .encoded-svg-mask('', @text-secondary); - } - &.icon-hide-password { - width: 25px; - height: 25px; - .encoded-svg-mask('', @text-secondary); - } - &.icon-settings { - width: 24px; - height: 24px; - .encoded-svg-mask(''); - } } } diff --git a/apps/common/mobile/resources/less/material/icons.less b/apps/common/mobile/resources/less/material/icons.less index 70d55de7c0..e882c223e3 100644 --- a/apps/common/mobile/resources/less/material/icons.less +++ b/apps/common/mobile/resources/less/material/icons.less @@ -11,16 +11,6 @@ background: ~"url(@{common-image-path}/header/logo-android.svg) no-repeat center"; background-size: contain; } - &.icon-show-password { - width: 24px; - height: 24px; - .encoded-svg-mask('', @text-secondary); - } - &.icon-hide-password { - width: 24px; - height: 24px; - .encoded-svg-mask('', @text-secondary); - } } .dropdown-list { i.icon { @@ -34,17 +24,25 @@ .navbar { .icon-svg { fill: @toolbar-icons; + + &.white { + fill: var(--fill-white); + } + &.inactive { + fill: var(--text-tertiary); + } + &.active { + fill: @brandColor; + } + &.close { + fill: @brandColor; + } } i.icon { &.icon-back { color: @toolbar-icons; } - &.icon-settings { - width: 22px; - height: 22px; - .encoded-svg-mask('', @toolbar-icons); - } } } } diff --git a/apps/documenteditor/mobile/resources/icons/common/icon-protect-doc.svg b/apps/documenteditor/mobile/resources/icons/common/icon-protect-doc.svg index cbd4052660..c317c75308 100644 --- a/apps/documenteditor/mobile/resources/icons/common/icon-protect-doc.svg +++ b/apps/documenteditor/mobile/resources/icons/common/icon-protect-doc.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/apps/documenteditor/mobile/src/less/icons-common.less b/apps/documenteditor/mobile/src/less/icons-common.less index 5726db5df6..fce498c7a5 100644 --- a/apps/documenteditor/mobile/src/less/icons-common.less +++ b/apps/documenteditor/mobile/src/less/icons-common.less @@ -1,4 +1,10 @@ .icon-svg { fill: @brand-word; + &.password-field__icon { + fill: var(--text-secondary); + } + &.white { + fill: var(--fill-white); + } } diff --git a/apps/documenteditor/mobile/src/less/icons-ios.less b/apps/documenteditor/mobile/src/less/icons-ios.less index d4c2a108f2..9591905b09 100644 --- a/apps/documenteditor/mobile/src/less/icons-ios.less +++ b/apps/documenteditor/mobile/src/less/icons-ios.less @@ -1,11 +1,4 @@ .device-ios { - i.icon { - &.icon-expand-down { - width: 22px; - height: 22px; - .encoded-svg-mask(''); - } - } .tab-link { .icon-svg { fill: @toolbar-segment; diff --git a/apps/documenteditor/mobile/src/less/icons-material.less b/apps/documenteditor/mobile/src/less/icons-material.less index 913c271cae..e43cd426fc 100644 --- a/apps/documenteditor/mobile/src/less/icons-material.less +++ b/apps/documenteditor/mobile/src/less/icons-material.less @@ -1,20 +1,4 @@ .device-android { - .navbar { - i.icon { - &.icon-expand-down { - width: 22px; - height: 22px; - .encoded-svg-mask('', @fill-white); - } - } - } - i.icon { - &.icon-expand-down { - width: 17px; - height: 17px; - .encoded-svg-mask(''); - } - } .tab-link { .icon-svg { fill: var(--toolbar-tab-normal); diff --git a/apps/documenteditor/mobile/src/view/Toolbar.jsx b/apps/documenteditor/mobile/src/view/Toolbar.jsx index be4aed5378..1b36fa1bfe 100644 --- a/apps/documenteditor/mobile/src/view/Toolbar.jsx +++ b/apps/documenteditor/mobile/src/view/Toolbar.jsx @@ -15,7 +15,8 @@ import IconCollaboration from '@common-icons/icon-collaboration.svg'; import IconVersionHistory from '@common-icons/icon-version-history.svg'; import IconEditForAndroid from '@common-android-icons/icon-edit.svg'; import IconEditForIos from '@common-ios-icons/icon-edit.svg?ios'; -import IconSettings from '@common-icons/icon-settings.svg'; +import IconSettingsIos from '@common-ios-icons/icon-settings.svg?ios'; +import IconSettingsAndroid from '@common-android-icons/icon-settings.svg'; import IconNextField from '@icons/icon-next-field.svg'; import IconPrevField from '@icons/icon-prev-field.svg'; import IconCheck from '@common-android-icons/icon-check.svg'; @@ -139,7 +140,11 @@ const ToolbarView = props => { : null), - props.openOptions('settings')}> + props.openOptions('settings')}> + {Device.ios ? + : + + } ] : [ // /!Device.phone && { // // , - props.movePrevField()}>, - props.moveNextField()}>, + props.movePrevField()}>, + props.moveNextField()}>, (props.canSubmitForms ? [ props.openOptions('settings')}>, + onClick={() => props.openOptions('settings')}> + {Device.ios ? + : + + }, { href={false} onClick={() => props.saveForm()}>, {props.openOptions('settings')}}> + href={false} onClick={() => {props.openOptions('settings')}}> + {Device.ios ? + : + + } ] ) ]} diff --git a/apps/documenteditor/mobile/src/view/add/AddLink.jsx b/apps/documenteditor/mobile/src/view/add/AddLink.jsx index afb887653f..378978dc8d 100644 --- a/apps/documenteditor/mobile/src/view/add/AddLink.jsx +++ b/apps/documenteditor/mobile/src/view/add/AddLink.jsx @@ -27,7 +27,7 @@ const PageLink = props => { props.isNavigate ? f7.views.current.router.back() : props.closeModal('#add-link-popup', '#add-link-popover'); }}> {Device.android && - + } @@ -36,11 +36,11 @@ const PageLink = props => { { props.onInsertLink(stateLink, stateDisplay, stateTip); }} text={Device.ios ? t('Add.textDone') : ''}> - {Device.android && + {Device.android && ( stateLink.length < 1 ? - : - - } + : + + )} diff --git a/apps/documenteditor/mobile/src/view/add/AddingPage.jsx b/apps/documenteditor/mobile/src/view/add/AddingPage.jsx index 691ea999db..f5afa26f62 100644 --- a/apps/documenteditor/mobile/src/view/add/AddingPage.jsx +++ b/apps/documenteditor/mobile/src/view/add/AddingPage.jsx @@ -44,7 +44,7 @@ const AddLayoutNavbar = ({ tabs, storeTableSettings }) => { {Device.phone && {Device.ios ? : - + }} ) diff --git a/apps/documenteditor/mobile/src/view/edit/EditChart.jsx b/apps/documenteditor/mobile/src/view/edit/EditChart.jsx index 71a16a249f..ed33e65740 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditChart.jsx @@ -45,7 +45,7 @@ const PageCustomFillColor = props => { {Device.ios ? : - + } @@ -111,7 +111,7 @@ const PageCustomBorderColor = props => { {Device.ios ? : - + } @@ -150,7 +150,7 @@ const PageBorderColor = props => { {Device.ios ? : - + } @@ -340,7 +340,7 @@ const PageDesign = props => { {Device.ios ? : - + } @@ -389,7 +389,7 @@ const PageWrap = props => { {Device.ios ? : - + } @@ -509,7 +509,7 @@ const PageReorder = props => { {Device.ios ? : - + } diff --git a/apps/documenteditor/mobile/src/view/edit/EditHyperlink.jsx b/apps/documenteditor/mobile/src/view/edit/EditHyperlink.jsx index d0ed886d14..540f6ba91c 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditHyperlink.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditHyperlink.jsx @@ -41,11 +41,11 @@ const EditHyperlink = props => { { props.onEditLink(stateLink, stateDisplay, stateTip); }} text={Device.ios ? t('Add.textDone') : ''}> - {Device.android && + {Device.android && ( stateLink.length < 1 ? - : - - } + : + + )} diff --git a/apps/documenteditor/mobile/src/view/edit/EditImage.jsx b/apps/documenteditor/mobile/src/view/edit/EditImage.jsx index 0dd46a3b63..004a8fff66 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditImage.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditImage.jsx @@ -70,7 +70,7 @@ const PageWrap = props => { {Device.ios ? : - + } @@ -162,7 +162,7 @@ const PageWrappingStyle = props => { {Device.ios ? : - + } @@ -260,7 +260,7 @@ const PageLinkSettings = props => { {Device.ios ? : - + } @@ -299,7 +299,7 @@ const PageReplace = props => { {Device.ios ? : - + } @@ -341,7 +341,7 @@ const PageReorder = props => { {Device.ios ? : - + } diff --git a/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx b/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx index fef006a72f..44d3935bc6 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx @@ -50,7 +50,7 @@ const PageAdvancedSettings = props => { {Device.ios ? : - + } @@ -99,11 +99,11 @@ const PageAdvancedSettings = props => {
{isAndroid && }
@@ -153,7 +153,7 @@ const PageCustomBackColor = props => { {Device.ios ? : - + } @@ -192,7 +192,7 @@ const PageBackgroundColor = props => { {Device.ios ? : - + } @@ -277,7 +277,7 @@ const EditParagraphStyle = props => { {Device.ios ? : - + } diff --git a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx index 69b472a926..d2611d8505 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx @@ -44,7 +44,7 @@ const PageCustomFillColor = props => { {Device.ios ? : - + } @@ -110,7 +110,7 @@ const PageCustomBorderColor = props => { {Device.ios ? : - + } @@ -149,7 +149,7 @@ const PageBorderColor = props => { {Device.ios ? : - + } @@ -214,7 +214,7 @@ const PageStyle = props => { {Device.ios ? : - + } @@ -305,7 +305,7 @@ const PageStyleNoFill = props => { {Device.ios ? : - + } @@ -369,7 +369,7 @@ const PageWrap = props => { {Device.ios ? : - + } @@ -492,7 +492,7 @@ const PageReplace = props => { {Device.ios ? : - + } @@ -535,7 +535,7 @@ const PageReorder = props => { {Device.ios ? : - + } diff --git a/apps/documenteditor/mobile/src/view/edit/EditTable.jsx b/apps/documenteditor/mobile/src/view/edit/EditTable.jsx index c58a5666fd..a7ae1ba372 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditTable.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditTable.jsx @@ -60,7 +60,7 @@ const PageTableOptions = props => { {Device.ios ? : - + } @@ -130,7 +130,7 @@ const PageWrap = props => { {Device.ios ? : - + } @@ -269,7 +269,7 @@ const PageStyleOptions = props => { {Device.ios ? : - + } @@ -325,7 +325,7 @@ const PageCustomFillColor = props => { {Device.ios ? : - + } @@ -388,7 +388,7 @@ const PageCustomBorderColor = props => { {Device.ios ? : - + } @@ -426,7 +426,7 @@ const PageBorderColor = props => { {Device.ios ? : - + } @@ -560,7 +560,7 @@ const PageStyle = props => { {Device.ios ? : - + } diff --git a/apps/documenteditor/mobile/src/view/edit/EditTableContents.jsx b/apps/documenteditor/mobile/src/view/edit/EditTableContents.jsx index 4d6d75b4c1..1abb8f8307 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditTableContents.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditTableContents.jsx @@ -139,7 +139,7 @@ const PageEditStylesTableContents = props => { {Device.ios ? : - + } @@ -178,7 +178,7 @@ const PageEditLeaderTableContents = props => { {Device.ios ? : - + } @@ -227,7 +227,7 @@ const PageEditStructureTableContents = props => { {Device.ios ? : - + } diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx index ea19f07378..16809bf659 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx @@ -89,7 +89,7 @@ const PageFonts = props => { {Device.ios ? : - + } @@ -180,7 +180,7 @@ const PageAdditionalFormatting = props => { {Device.ios ? : - + } @@ -312,7 +312,7 @@ const PageBulletsAndNumbers = props => { {Device.ios ? : - + } @@ -364,7 +364,7 @@ const PageLineSpacing = props => { {Device.ios ? : - + } @@ -404,7 +404,7 @@ const PageCustomFontColor = props => { {Device.ios ? : - + } @@ -440,7 +440,7 @@ const PageFontColor = props => { {Device.ios ? : - + } @@ -485,7 +485,7 @@ const PageCustomBackColor = props => { {Device.ios ? : - + } @@ -519,7 +519,7 @@ const PageHighlightColor = props => { {Device.ios ? : - + } @@ -544,7 +544,7 @@ const PageOrientationTextShape = props => { {Device.ios ? : - + } diff --git a/apps/documenteditor/mobile/src/view/edit/EditingPage.jsx b/apps/documenteditor/mobile/src/view/edit/EditingPage.jsx index 3ea6566ac9..8c6886a77e 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditingPage.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditingPage.jsx @@ -11,6 +11,9 @@ import EditTableController from "../../controller/edit/EditTable"; import EditChartController from "../../controller/edit/EditChart"; import EditHeaderController from "../../controller/edit/EditHeader"; import EditTableContentsController from "../../controller/edit/EditTableContents"; +import SvgIcon from '@common/lib/component/SvgIcon' +import IconExpandDownIos from '@common-ios-icons/icon-expand-down.svg?ios'; +import IconExpandDownAndroid from '@common-android-icons/icon-expand-down.svg'; const EmptyEditLayout = () => { const { t } = useTranslation(); @@ -41,7 +44,11 @@ const EditLayoutNavbar = ({ editors }) => { : {editors[0].caption} } - {Device.phone && } + {Device.phone && + {Device.ios ? + : + + }} ) }; diff --git a/apps/presentationeditor/mobile/src/less/icons-common.less b/apps/presentationeditor/mobile/src/less/icons-common.less index a065d82013..58dd8bc9cd 100644 --- a/apps/presentationeditor/mobile/src/less/icons-common.less +++ b/apps/presentationeditor/mobile/src/less/icons-common.less @@ -1,4 +1,7 @@ .icon-svg { fill: @brand-slide; + &.white { + fill: var(--fill-white); + } } diff --git a/apps/presentationeditor/mobile/src/view/add/AddLink.jsx b/apps/presentationeditor/mobile/src/view/add/AddLink.jsx index f3cb8bd20d..56aad427b5 100644 --- a/apps/presentationeditor/mobile/src/view/add/AddLink.jsx +++ b/apps/presentationeditor/mobile/src/view/add/AddLink.jsx @@ -137,7 +137,7 @@ const PageLink = props => { isNavigate ? f7.views.current.router.back() : props.closeModal('#add-link-popup', '#add-link-popover'); }}> {Device.android && - + } @@ -148,11 +148,11 @@ const PageLink = props => { {url: link, display: stateDisplay, displayDisabled, tip: screenTip } : {linkTo: linkTo, numberTo: numberTo, display: stateDisplay, displayDisabled, tip: screenTip})); }} text={Device.ios ? t('View.Add.textDone') : ''}> - {Device.android && + {Device.android && ( link.length < 1 ? - : - - } + : + + )} diff --git a/apps/presentationeditor/mobile/src/view/edit/EditLink.jsx b/apps/presentationeditor/mobile/src/view/edit/EditLink.jsx index 70f750ffed..5eda5ca35e 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditLink.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditLink.jsx @@ -6,6 +6,7 @@ import {Device} from "../../../../../common/mobile/utils/device"; import SvgIcon from '@common/lib/component/SvgIcon'; import IconClose from '@common-android-icons/icon-close.svg'; import IconDone from '@common-android-icons/icon-done.svg'; +import IconDoneDisabled from '@common-android-icons/icon-done-disabled.svg'; import IconExpandDownAndroid from '@common-android-icons/icon-expand-down.svg'; import IconExpandUp from '@common-android-icons/icon-expand-up.svg'; @@ -158,7 +159,7 @@ const PageLink = props => { props.isNavigate ? f7.views.current.router.back() : props.closeModal(); }}> {Device.android && - + } @@ -169,11 +170,11 @@ const PageLink = props => { {url: link, display: stateDisplay, tip: screenTip, displayDisabled } : {linkTo: linkTo, numberTo: numberTo, display: stateDisplay, tip: screenTip, displayDisabled})); }} text={Device.ios ? t('View.Edit.textDone') : ''}> - {Device.android && + {Device.android && ( link.length < 1 ? - : - - } + : + + )} diff --git a/apps/spreadsheeteditor/mobile/src/less/icons-common.less b/apps/spreadsheeteditor/mobile/src/less/icons-common.less index 3a624fa8cf..9c6d168f5d 100644 --- a/apps/spreadsheeteditor/mobile/src/less/icons-common.less +++ b/apps/spreadsheeteditor/mobile/src/less/icons-common.less @@ -87,6 +87,12 @@ &.icon_function { fill: var(--text-normal) } + &.icon-list { + color: @brand-cell; + } + &.white { + fill: var(--fill-white); + } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/src/less/statusbar.less b/apps/spreadsheeteditor/mobile/src/less/statusbar.less index b4c972a916..1c47aa8563 100644 --- a/apps/spreadsheeteditor/mobile/src/less/statusbar.less +++ b/apps/spreadsheeteditor/mobile/src/less/statusbar.less @@ -74,9 +74,6 @@ height: 18px; vertical-align: middle; } - .icon-list { - color: @brand-cell; - } } } diff --git a/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx b/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx index 3432854377..04d23663ee 100644 --- a/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx @@ -245,7 +245,7 @@ const StatusbarView = inject('storeAppOptions', 'storeWorksheets', 'users')(obse f7.popover.open('#idx-all-list', e.target)}> {isAndroid ? : - } + } } diff --git a/apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx b/apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx index 45b3a85255..b7e7254302 100644 --- a/apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx @@ -102,7 +102,7 @@ const AddLink = props => { isNavigate ? f7.views.current.router.back() : props.closeModal('#add-link-popup', '#add-link-popover'); }}> {Device.android && - + } @@ -113,11 +113,11 @@ const AddLink = props => { {type: 'ext', url: link, text: stateDisplayText} : {type: 'int', url: range, sheet: curSheet.caption, text: stateDisplayText}); }} text={Device.ios ? t('View.Add.textDone') : ''}> - {Device.android && + {Device.android && ( link.length < 1 ? - : - - } + : + + )} diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditLink.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditLink.jsx index b2cfd71b6e..a2e673998e 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditLink.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditLink.jsx @@ -121,7 +121,7 @@ const EditLink = props => { props.isNavigate ? f7.views.current.router.back() : props.closeModal(); }}> {Device.android && - + } @@ -132,11 +132,11 @@ const EditLink = props => { {type: 1, url: link, text: stateDisplayText, tooltip: screenTip} : {type: 2, url: range, sheet: curSheet, text: stateDisplayText, tooltip: screenTip}); }} text={Device.ios ? t('View.Edit.textDone') : ''}> - {Device.android && + {Device.android && ( link.length < 1 ? - : - - } + : + + )} diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/Download.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/Download.jsx index ea09ad1c0c..78cd0e3e9e 100644 --- a/apps/spreadsheeteditor/mobile/src/view/settings/Download.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/settings/Download.jsx @@ -20,25 +20,25 @@ const Download = props => { {_t.textDownloadAs} props.onSaveFormat(Asc.c_oAscFileType.XLSX)}> - + props.onSaveFormat(Asc.c_oAscFileType.PDF)}> - + props.onSaveFormat(Asc.c_oAscFileType.PDFA)}> - + props.onSaveFormat(Asc.c_oAscFileType.ODS)}> - + props.onSaveFormat(Asc.c_oAscFileType.CSV)}> - + props.onSaveFormat(Asc.c_oAscFileType.XLTX)}> - + props.onSaveFormat(Asc.c_oAscFileType.OTS)}> - +