Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hide the Export functionality on Cordova IOS untill fix this feature #1452

Merged
merged 3 commits into from
Apr 26, 2023
+34 −29
Merged

Hide the Export functionality on Cordova IOS untill fix this feature #1452

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1bae6d
Hide the Export functionality on Cordova IOS
tomivm Apr 12, 2023
fc86696
fix call to isIOS()
tomivm Apr 12, 2023
4fc831f
Merge branch 'master' into fix/block-use-of-export-boards-on-cordova-ios
martinbedouret Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/Board/Navbar/Navbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import AnalyticsButton from '../../UI/AnalyticsButton';
import HelpButton from '../../UI/HelpButton';
import SettingsButton from '../../UI/SettingsButton';
import messages from '../Board.messages';
import { isCordova, isAndroid } from '../../../cordova-util';
import { isCordova, isAndroid, isIOS } from '../../../cordova-util';
import './Navbar.css';
import { injectIntl } from 'react-intl';
import PremiumFeature from '../../PremiumFeature';
Expand Down Expand Up @@ -152,7 +152,7 @@ export class Navbar extends React.Component {
<div className="Navbar__group Navbar__group--end">
{!isLocked && (
<React.Fragment>
<PrintBoardButton />
{!isIOS() && <PrintBoardButton />}
{!isMobile.any && <FullScreenButton />}
{isLogged && !isCordova() && (
<PremiumFeature>
Expand Down
62 changes: 34 additions & 28 deletions src/components/Settings/Settings.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import Paper from '@material-ui/core/Paper';
import UserIcon from '../UI/UserIcon';
import SettingsTour from './SettingsTour.component';

import { isCordova, isAndroid } from '../../cordova-util';
import { isCordova, isAndroid, isIOS } from '../../cordova-util';

import './Settings.css';
import { CircularProgress } from '@material-ui/core';
Expand Down Expand Up @@ -107,6 +107,38 @@ export class Settings extends PureComponent {
peopleSettings.push(subscribeSection);
}

const systemSettings = [
{
icon: <CloudDownloadIcon />,
text: messages.import,
url: '/settings/import'
},
{
icon: <VisibilityIcon />,
text: messages.display,
url: '/settings/display'
},
{
icon: <ScanningIcon />,
text: messages.scanning,
url: '/settings/scanning'
},
{
icon: <NavigationIcon />,
text: messages.navigation,
url: '/settings/navigation'
}
];
//only untill fix export on cordova IOS after that add it directly to the systemSetting array
if (!isIOS()) {
const exportSetting = {
icon: <CloudUploadIcon />,
text: messages.export,
url: '/settings/export'
};
systemSettings.unshift(exportSetting);
}

return [
{
subheader: messages.people,
Expand All @@ -129,33 +161,7 @@ export class Settings extends PureComponent {
},
{
subheader: messages.system,
settings: [
{
icon: <CloudUploadIcon />,
text: messages.export,
url: '/settings/export'
},
{
icon: <CloudDownloadIcon />,
text: messages.import,
url: '/settings/import'
},
{
icon: <VisibilityIcon />,
text: messages.display,
url: '/settings/display'
},
{
icon: <ScanningIcon />,
text: messages.scanning,
url: '/settings/scanning'
},
{
icon: <NavigationIcon />,
text: messages.navigation,
url: '/settings/navigation'
}
]
settings: systemSettings
},
{
subheader: messages.help,
Expand Down