Various RN changes

ReactNativeClient/lib/components/screens/folder.js

@@ -5,6 +5,7 @@ import { Log } from 'lib/log.js'
 import { Folder } from 'lib/models/folder.js'
 import { BaseModel } from 'lib/base-model.js'
 import { ScreenHeader } from 'lib/components/screen-header.js';
+import { NotesScreenUtils } from 'lib/components/screens/notes-utils.js'
 
 class FolderScreenComponent extends React.Component {
 	
@@ -51,11 +52,7 @@ class FolderScreenComponent extends React.Component {
 		this.originalFolder = await Folder.save(toSave);
 		this.setState({ folder: this.originalFolder });
 
-		this.props.dispatch({
-			type: 'Navigation/NAVIGATE',
-			routeName: 'Notes',
-			folderId: toSave.id,
-		});
+		await NotesScreenUtils.openDefaultNoteList();
 	}
 
 	render() {

ReactNativeClient/lib/components/screens/notes-utils.js

@@ -1,4 +1,5 @@
 import { Note } from 'lib/models/note.js'
+import { Folder } from 'lib/models/folder.js'
 import { Log } from 'lib/log.js'
 
 class NotesScreenUtils {
@@ -20,6 +21,18 @@ class NotesScreenUtils {
 		});
 	}
 
+	static async openDefaultNoteList() {
+		const selectedFolder = await Folder.defaultFolder();
+		if (selectedFolder) {
+			this.openNoteList(selectedFolder.id);
+		} else {
+			this.dispatch({
+				type: 'Navigation/NAVIGATE',
+				routeName: 'Loading',
+			});
+		}
+	}
+
 }
 
 export { NotesScreenUtils }

ReactNativeClient/lib/components/screens/notes.js

@@ -8,6 +8,8 @@ import { ScreenHeader } from 'lib/components/screen-header.js';
 import { MenuOption, Text } from 'react-native-popup-menu';
 import { _ } from 'lib/locale.js';
 import { ActionButton } from 'lib/components/action-button.js';
+import { dialogs } from 'lib/dialogs.js';
+import { NotesScreenUtils } from 'lib/components/screens/notes-utils.js'
 import DialogBox from 'react-native-dialogbox';
 
 class NotesScreenComponent extends React.Component {
@@ -17,16 +19,15 @@ class NotesScreenComponent extends React.Component {
 	}
 
 	deleteFolder_onPress(folderId) {
-		let ok = confirm(_('Delete notebook?'));
-		if (!ok) return;
+		dialogs.confirm(this, _('Delete notebook?')).then((ok) => {
+			if (!ok) return;
 
-		Folder.delete(folderId).then(() => {
-			this.props.dispatch({
-				type: 'Navigation/NAVIGATE',
-				routeName: 'Folders',
+
+			Folder.delete(folderId).then(() => {
+				return NotesScreenUtils.openDefaultNoteList();
+			}).catch((error) => {
+				alert(error.message);
 			});
-		}).catch((error) => {
-			alert(error.message);
 		});
 	}
 
@@ -49,12 +50,16 @@ class NotesScreenComponent extends React.Component {
 		let folder = Folder.byId(this.props.folders, this.props.selectedFolderId);
 		let title = folder ? folder.title : null;
 
+		console.info('FOLDER', folder);
+
 		const { navigate } = this.props.navigation;
 		return (
 			<View style={{flex: 1}}>
 				<ScreenHeader title={title} navState={this.props.navigation.state} menuOptions={this.menuOptions()} />
 				<NoteList noItemMessage={_('There are currently no notes. Create one by clicking on the (+) button.')} style={{flex: 1}}/>
 				<ActionButton parentFolderId={this.props.selectedFolderId}></ActionButton>
+
+				<DialogBox ref={dialogbox => { this.dialogbox = dialogbox }}/>
 			</View>
 		);
 	}