TagSpaces is an offline, open source, document manager with tagging support
making app detecting mobile mode
Ilian Sapundshiev3b83f64232c2
diff --git a/app/config.js b/app/config.jsindex c784051ba..17cd001b7 100644--- a/app/config.js+++ b/app/config.js@@ -18,6 +18,8 @@*/const isCordovaiOS = /^file:\/{3}[^\/]/i.test(window.location.href) && /ios|iphone|ipod|ipad/i.test(navigator.userAgent);const isCordovaAndroid = document.URL.indexOf('file:///android_asset') === 0;+const isIOS = navigator.userAgent.match(/(iPad|iPhone|iPod)/i);+const isAndroid = navigator.userAgent.toLowerCase().includes('android');export default {tagspacesAppPath: '/tagspaces/',@@ -76,10 +78,12 @@ export default {isFirefox: (navigator.userAgent.toLowerCase().includes('firefox')), // typeof InstallTrigger !== 'undefined';isWin: navigator.appVersion.includes('Win'),isMacLike: navigator.userAgent.match(/(Mac|iPhone|iPod|iPad)/i),- iOS: navigator.userAgent.match(/(iPad|iPhone|iPod)/i),+ isIOS,+ isAndroid,isWeb: (document.URL.startsWith('http') && !document.URL.startsWith('http://localhost:1212/')),isCordovaiOS,isCordovaAndroid,isCordova: isCordovaiOS || isCordovaAndroid,+ isMobile: isCordovaiOS || isCordovaAndroid || isIOS || isAndroid,dirSeparator: (navigator.appVersion.includes('Win') && !document.URL.startsWith('http')) ? '\\' : '/',};diff --git a/app/containers/MainPage.js b/app/containers/MainPage.jsindex ada87cb85..fa77d1896 100644--- a/app/containers/MainPage.js+++ b/app/containers/MainPage.js@@ -22,7 +22,6 @@ import { bindActionCreators } from 'redux';import { connect } from 'react-redux';import uuidv1 from 'uuid';import { withStyles } from '@material-ui/core/styles';-import classNames from 'classnames';import { translate } from 'react-i18next';import SplitPane from 'react-split-pane';import SwipeableDrawer from '@material-ui/core/SwipeableDrawer';@@ -39,7 +38,7 @@ import FolderContainer from '../components/FolderContainer';import EntryContainer from '../components/EntryContainer';import SettingsDialog from '../components/dialogs/settings/SettingsDialog';import CreateDirectoryDialog from '../components/dialogs/CreateDirectoryDialog';-import CreateFileDialog from '../components/dialogs/CreateFileDialog';+import CreateFileDialog from '../components/dialogs/CreateDialog';import {getDesktopMode,getKeyBindingObject,@@ -734,8 +733,8 @@ class MainPage extends Component<Props, State> {onClose={this.toggleDrawer}onOpen={this.toggleDrawer}hysteresis={0.20}- disableBackdropTransition={!AppConfig.iOS}- disableDiscovery={AppConfig.iOS}+ disableBackdropTransition={!AppConfig.isIOS}+ disableDiscovery={AppConfig.isIOS}><MobileNavigation toggleDrawer={this.toggleDrawer} /></SwipeableDrawer>diff --git a/app/reducers/settings-default.js b/app/reducers/settings-default.jsindex bbceb6e38..1bcbdf3f1 100644--- a/app/reducers/settings-default.js+++ b/app/reducers/settings-default.js@@ -19,6 +19,13 @@import AppConfig from '../config';+let desktopMode = !AppConfig.isMobile;+if (window.ExtDisplayMode && window.ExtDisplayMode === 'mobile') {+ desktopMode = false;+} else if (window.ExtDisplayMode && window.ExtDisplayMode === 'desktop') {+ desktopMode = true;+}+export default {settingsVersion: 3,isLoading: false,@@ -32,7 +39,7 @@ export default {isUpdateAvailable: false,tagDelimiter: ' ',maxSearchResult: 1000,- desktopMode: true,+ desktopMode,newHTMLFileContent:'<!DOCTYPE html><html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><style type="text/css">body{overflow:auto;width:100%;height:100%;font:13.34px Ubuntu,arial,clean,sans-serif;color:#000;line-height:1.4em;background-color:#fff;padding:15px}p{margin:1em 0;line-height:1.5em}table{font:100%;margin:1em}table th{border-bottom:1px solid #bbb;padding:.2em 1em}table td{border-bottom:1px solid #ddd;padding:.2em 1em}input[type=image],input[type=password],input[type=text],textarea{font:99% helvetica,arial,freesans,sans-serif}option,select{padding:0 .25em}optgroup{margin-top:.5em}code,pre{font:12px Monaco, Courier ,monospace}pre{margin:1em 0;font-size:12px;background-color:#eee;border:1px solid #ddd;padding:5px;line-height:1.5em;color:#444;overflow:auto;-webkit-box-shadow:rgba(0,0,0,.07) 0 1px 2px inset;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}pre code{padding:0;font-size:12px;background-color:#eee;border:none}code{font-size:12px;background-color:#f8f8ff;color:#444;padding:0 .2em;border:1px solid #dedede}img{border:0;max-width:100%}abbr{border-bottom:none}a{color:#4183c4;text-decoration:none}a:hover{text-decoration:underline}a code,a:link code,a:visited code{color:#4183c4}h2,h3{margin:1em 0}h1,h2,h3,h4,h5,h6{border:0}h1{font-size:170%;border-top:4px solid #aaa;padding-top:.5em;margin-top:1.5em}h1:first-child{margin-top:0;padding-top:.25em;border-top:none}h2{font-size:150%;margin-top:1.5em;border-top:4px solid #e0e0e0;padding-top:.5em}h3{font-size:130%;margin-top:1em}h4{font-size:120%;margin-top:1em}h5{font-size:115%;margin-top:1em}h6{font-size:110%;margin-top:1em}hr{border:1px solid #ddd}ol,ul{margin:1em 0 1em 2em}ol li,ul li{margin-top:.5em;margin-bottom:.5em}ol ol,ol ul,ul ol,ul ul{margin-top:0;margin-bottom:0}blockquote{margin:1em 0;border-left:5px solid #ddd;padding-left:.6em;color:#555}dt{font-weight:700;margin-left:1em}dd{margin-left:2em;margin-bottom:1em}</style></head><body></body></html>',showUnixHiddenEntries: false,