self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00
Code Issues Releases Activity

Mobile: Removed now unneeded Welcome screen

Browse Source
This commit is contained in:
Laurent Cozic
2019-06-29 00:24:00 +01:00
parent 2955914ca5
commit 6fea7116b6
3 changed files with 10 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ReactNativeClient/root.js
View File

@ -37,7 +37,6 @@ const { ConfigScreen } = require('lib/components/screens/config.js');
const { FolderScreen } = require('lib/components/screens/folder.js');
const { LogScreen } = require('lib/components/screens/log.js');
const { StatusScreen } = require('lib/components/screens/status.js');
const { WelcomeScreen } = require('lib/components/screens/welcome.js');
const { SearchScreen } = require('lib/components/screens/search.js');
const { OneDriveLoginScreen } = require('lib/components/screens/onedrive-login.js');
const { EncryptionConfigScreen } = require('lib/components/screens/encryption-config.js');
@ -167,13 +166,15 @@ function historyCanGoBackTo(route, nextRoute) {
return true;
}
const DEFAULT_ROUTE = {
type: 'NAV_GO',
routeName: 'Notes',
smartFilterId: 'c3176726992c11e9ac940492261af972',
};
const appDefaultState = Object.assign({}, defaultState, {
sideMenuOpenPercent: 0,
route: {
type: 'NAV_GO',
routeName: 'Welcome',
params: {},
},
route: DEFAULT_ROUTE,
noteSelectionEnabled: false,
});
@ -229,8 +230,6 @@ const appReducer = (state = appDefaultState, action) => {
}
}
if (action.routeName == 'Welcome') navHistory = [];
//reg.logger().info('Route: ' + currentRouteName + ' => ' + action.routeName);
newState = Object.assign({}, state);
@ -500,10 +499,7 @@ async function initialize(dispatch) {
});
if (!folder) {
dispatch({
type: 'NAV_GO',
routeName: 'Welcome',
});
dispatch(DEFAULT_ROUTE);
} else {
dispatch({
type: 'NAV_GO',
@ -692,7 +688,6 @@ class AppComponent extends React.Component {
const sideMenuContent = <SafeAreaView style={{flex:1, backgroundColor: theme.backgroundColor}}><SideMenuContent/></SafeAreaView>;
const appNavInit = {
Welcome: { screen: WelcomeScreen },
Notes: { screen: NotesScreen },
Note: { screen: NoteScreen },
Tags: { screen: TagsScreen },