self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-04-11 11:12:03 +02:00
Code Issues Releases Activity

Improved init sequence

Browse Source
This commit is contained in:
Laurent Cozic 2017-07-08 23:57:09 +01:00
parent a9f7b0d531
commit e9f0d38a80
4 changed files with 79 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ReactNativeClient/lib/components/action-button.js
View File

@ -44,21 +44,31 @@ class ActionButtonComponent extends React.Component {
}
render() {
return (
<ReactNativeActionButton buttonColor="rgba(231,76,60,1)">
let buttons = [];
<ReactNativeActionButton.Item buttonColor='#9b59b6' title="New todo" onPress={() => { this.newTodo_press() }}>
if (this.props.folders.length) {
buttons.push(
<ReactNativeActionButton.Item key="ab_todo" buttonColor='#9b59b6' title="New todo" onPress={() => { this.newTodo_press() }}>
<Icon name="md-checkbox-outline" style={styles.actionButtonIcon} />
</ReactNativeActionButton.Item>
);
<ReactNativeActionButton.Item buttonColor='#9b59b6' title="New note" onPress={() => { this.newNote_press() }}>
buttons.push(
<ReactNativeActionButton.Item key="ab_note" buttonColor='#9b59b6' title="New note" onPress={() => { this.newNote_press() }}>
<Icon name="md-document" style={styles.actionButtonIcon} />
</ReactNativeActionButton.Item>
);
}
<ReactNativeActionButton.Item buttonColor='#3498db' title="New folder" onPress={() => { this.newFolder_press() }}>
<Icon name="md-folder" style={styles.actionButtonIcon} />
</ReactNativeActionButton.Item>
buttons.push(
<ReactNativeActionButton.Item key="ab_folder" buttonColor='#3498db' title="New folder" onPress={() => { this.newFolder_press() }}>
<Icon name="md-folder" style={styles.actionButtonIcon} />
</ReactNativeActionButton.Item>
);
return (
<ReactNativeActionButton buttonColor="rgba(231,76,60,1)">
{ buttons }
</ReactNativeActionButton>
);
}
@ -66,7 +76,9 @@ class ActionButtonComponent extends React.Component {
const ActionButton = connect(
(state) => {
return {};
return {
folders: state.folders,
};
}
)(ActionButtonComponent)

6
ReactNativeClient/lib/components/screens/folder.js
View File

@ -50,6 +50,12 @@ class FolderScreenComponent extends React.Component {
this.originalFolder = await Folder.save(toSave);
this.setState({ folder: this.originalFolder });
this.props.dispatch({
type: 'Navigation/NAVIGATE',
routeName: 'Notes',
params: toSave.id,
});
}
render() {

26
ReactNativeClient/lib/components/screens/loading.js
View File

@ -2,8 +2,8 @@ import React, { Component } from 'react';
import { View, Text } from 'react-native';
import { connect } from 'react-redux'
import { Log } from 'lib/log.js'
import { Folder } from 'lib/models/folder.js'
import { ScreenHeader } from 'lib/components/screen-header.js';
import { ActionButton } from 'lib/components/action-button.js';
class LoadingScreenComponent extends React.Component {
@ -12,18 +12,30 @@ class LoadingScreenComponent extends React.Component {
}
render() {
return (
<View style={{flex: 1}}>
<Text>Loading...</Text>
</View>
);
if (this.props.loading) {
return (
<View style={{flex: 1}}>
<Text>Loading...</Text>
</View>
);
} else {
return (
<View style={{flex: 1}}>
<ScreenHeader navState={this.props.navigation.state} />
<Text>You currently have no notebook. Create one by clicking on (+) button.</Text>
<ActionButton></ActionButton>
</View>
);
}
}
}
const LoadingScreen = connect(
(state) => {
return {};
return {
loading: state.loading,
};
}
)(LoadingScreenComponent)

41
ReactNativeClient/root.js
View File

@ -43,6 +43,8 @@ let defaultState = {
selectedItemType: 'note',
selectedFolderId: null,
showSideMenu: false,
screens: {},
loading: true,
};
const reducer = (state = defaultState, action) => {
@ -76,10 +78,18 @@ const reducer = (state = defaultState, action) => {
newState.selectedItemType = action.itemType;
}
if ('screens' in action) {
for (let n in action.screens) {
if (!action.screens.hasOwnProperty(n)) continue;
newState.screens[n] = action.screens[n];
}
}
if (currentRouteName == action.routeName) {
// If the current screen is already the requested screen, don't do anything
} else {
const nextStateNav = AppNavigator.router.getStateForAction(action, currentRouteName != 'Loading' ? state.nav : null);
//const nextStateNav = AppNavigator.router.getStateForAction(action, currentRouteName != 'Loading' ? state.nav : null);
const nextStateNav = AppNavigator.router.getStateForAction(action, state.nav);
if (nextStateNav) {
newState.nav = nextStateNav;
}
@ -87,6 +97,13 @@ const reducer = (state = defaultState, action) => {
break;
// Replace all the notes with the provided array
case 'APPLICATION_LOADING_DONE':
newState = Object.assign({}, state);
newState.loading = false;
break;
// Replace all the notes with the provided array
case 'NOTES_UPDATE_ALL':
@ -186,7 +203,7 @@ const AppNavigator = StackNavigator({
Notes: { screen: NotesScreen },
Note: { screen: NoteScreen },
Folder: { screen: FolderScreen },
Folders: { screen: FoldersScreen },
//Folders: { screen: FoldersScreen },
Loading: { screen: LoadingScreen },
OneDriveLogin: { screen: OneDriveLoginScreen },
Log: { screen: LogScreen },
@ -259,7 +276,7 @@ class AppComponent extends React.Component {
if (Setting.value('env') == 'prod') {
await db.open({ name: 'joplin.sqlite' })
} else {
await db.open({ name: 'joplin-52.sqlite' })
await db.open({ name: 'joplin-53.sqlite' })
await db.exec('DELETE FROM notes');
await db.exec('DELETE FROM folders');
@ -274,17 +291,27 @@ class AppComponent extends React.Component {
await Setting.load();
reg.logger().info('Loading folders...');
let folders = await Folder.all();
let initialFolders = await Folder.all();
this.props.dispatch({
type: 'FOLDERS_UPDATE_ALL',
folders: folders,
folders: initialFolders,
});
this.props.dispatch({
type: 'Navigation/NAVIGATE',
routeName: 'Folders',
type: 'APPLICATION_LOADING_DONE',
});
// console.info(initialFolders);
// if (initialFolders.length) {
// // const selectedFolder = await Folder.defaultFolder();
// // this.props.dispatch({
// // type: 'Navigation/NAVIGATE',
// // routeName: 'Notes',
// // params: selectedFolder.id,
// // });
// }
} catch (error) {
Log.error('Initialization error:', error);
}