mirror of
https://github.com/laurent22/joplin.git
synced 2024-11-27 08:21:03 +02:00
Various clean up and optimisations
This commit is contained in:
Laurent Cozic
parent
80ad3e0dfd
commit
d47a02a24a
@ -90,8 +90,8 @@ android {
|
||||
applicationId "net.cozic.joplin"
|
||||
minSdkVersion 16
|
||||
targetSdkVersion 22
|
||||
versionCode 31
|
||||
versionName "0.9.18"
|
||||
versionCode 32
|
||||
versionName "0.9.19"
|
||||
ndk {
|
||||
abiFilters "armeabi-v7a", "x86"
|
||||
}
|
||||
|
||||
2
ReactNativeClient/debug_log.sh
Normal file
2
ReactNativeClient/debug_log.sh
Normal file
@ -0,0 +1,2 @@
|
||||
#!/bin/bash
|
||||
adb logcat *:S ReactNative:V ReactNativeJS:V
|
||||
@ -1,101 +0,0 @@
|
||||
import React, { Component } from 'react';
|
||||
import { connect } from 'react-redux'
|
||||
import { ListView, Text, TouchableHighlight, Switch, View, StyleSheet } from 'react-native';
|
||||
import { Log } from 'lib/log.js';
|
||||
import { _ } from 'lib/locale.js';
|
||||
import { Checkbox } from 'lib/components/checkbox.js';
|
||||
import { NoteItem } from 'lib/components/note-item.js';
|
||||
import { reg } from 'lib/registry.js';
|
||||
import { Note } from 'lib/models/note.js';
|
||||
import { Setting } from 'lib/models/setting.js';
|
||||
import { time } from 'lib/time-utils.js';
|
||||
import { globalStyle } from 'lib/components/global-style.js';
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
noItemMessage: {
|
||||
paddingLeft: globalStyle.marginLeft,
|
||||
paddingRight: globalStyle.marginRight,
|
||||
paddingTop: globalStyle.marginTop,
|
||||
paddingBottom: globalStyle.marginBottom
|
||||
},
|
||||
});
|
||||
|
||||
class ItemListComponent extends Component {
|
||||
|
||||
constructor() {
|
||||
super();
|
||||
const ds = new ListView.DataSource({
|
||||
rowHasChanged: (r1, r2) => { return r1 !== r2; }
|
||||
});
|
||||
this.state = {
|
||||
dataSource: ds,
|
||||
items: [],
|
||||
selectedItemIds: [],
|
||||
};
|
||||
}
|
||||
|
||||
filterNotes(notes) {
|
||||
const todoFilter = Setting.value('todoFilter');
|
||||
if (todoFilter == 'all') return notes;
|
||||
|
||||
const now = time.unixMs();
|
||||
const maxInterval = 1000 * 60 * 60 * 24 * 2;
|
||||
const notRecentTime = now - maxInterval;
|
||||
|
||||
let output = [];
|
||||
for (let i = 0; i < notes.length; i++) {
|
||||
const note = notes[i];
|
||||
if (note.is_todo) {
|
||||
if (todoFilter == 'recent' && note.updated_time < notRecentTime && !!note.todo_completed) continue;
|
||||
if (todoFilter == 'nonCompleted' && !!note.todo_completed) continue;
|
||||
}
|
||||
output.push(note);
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
componentWillMount() {
|
||||
const newDataSource = this.state.dataSource.cloneWithRows(this.filterNotes(this.props.items));
|
||||
this.state = { dataSource: newDataSource };
|
||||
}
|
||||
|
||||
componentWillReceiveProps(newProps) {
|
||||
// https://stackoverflow.com/questions/38186114/react-native-redux-and-listview
|
||||
this.setState({
|
||||
dataSource: this.state.dataSource.cloneWithRows(this.filterNotes(newProps.items)),
|
||||
});
|
||||
}
|
||||
|
||||
async todoCheckbox_change(itemId, checked) {
|
||||
let note = await Note.load(itemId);
|
||||
await Note.save({ id: note.id, todo_completed: checked ? time.unixMs() : 0 });
|
||||
reg.scheduleSync();
|
||||
}
|
||||
|
||||
listView_itemLongPress(itemId) {}
|
||||
listView_itemPress(itemId) {}
|
||||
|
||||
render() {
|
||||
// `enableEmptySections` is to fix this warning: https://github.com/FaridSafi/react-native-gifted-listview/issues/39
|
||||
|
||||
if (this.state.dataSource.getRowCount()) {
|
||||
return (
|
||||
<ListView
|
||||
dataSource={this.state.dataSource}
|
||||
renderRow={(note) => {
|
||||
return <NoteItem
|
||||
note={note}
|
||||
onPress={(note) => this.listView_itemPress(note.id) }
|
||||
onCheckboxChange={(note, checked) => this.todoCheckbox_change(note.id, checked) }
|
||||
/> }}
|
||||
enableEmptySections={true}
|
||||
/>
|
||||
);
|
||||
} else {
|
||||
const noItemMessage = this.props.noItemMessage ? this.props.noItemMessage : '';
|
||||
return <Text style={styles.noItemMessage} >{noItemMessage}</Text>;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export { ItemListComponent };
|
||||
@ -1,11 +1,76 @@
|
||||
import React, { Component } from 'react';
|
||||
import { connect } from 'react-redux'
|
||||
import { ListView, Text, TouchableHighlight } from 'react-native';
|
||||
import { ListView, Text, TouchableHighlight, Switch, View, StyleSheet } from 'react-native';
|
||||
import { Log } from 'lib/log.js';
|
||||
import { ItemListComponent } from 'lib/components/item-list.js';
|
||||
import { _ } from 'lib/locale.js';
|
||||
import { Checkbox } from 'lib/components/checkbox.js';
|
||||
import { NoteItem } from 'lib/components/note-item.js';
|
||||
import { reg } from 'lib/registry.js';
|
||||
import { Note } from 'lib/models/note.js';
|
||||
import { Setting } from 'lib/models/setting.js';
|
||||
import { time } from 'lib/time-utils.js';
|
||||
import { globalStyle } from 'lib/components/global-style.js';
|
||||
|
||||
class NoteListComponent extends ItemListComponent {
|
||||
const styles = StyleSheet.create({
|
||||
noItemMessage: {
|
||||
paddingLeft: globalStyle.marginLeft,
|
||||
paddingRight: globalStyle.marginRight,
|
||||
paddingTop: globalStyle.marginTop,
|
||||
paddingBottom: globalStyle.marginBottom
|
||||
},
|
||||
});
|
||||
|
||||
class NoteListComponent extends Component {
|
||||
|
||||
constructor() {
|
||||
super();
|
||||
const ds = new ListView.DataSource({
|
||||
rowHasChanged: (r1, r2) => { return r1 !== r2; }
|
||||
});
|
||||
this.state = {
|
||||
dataSource: ds,
|
||||
items: [],
|
||||
selectedItemIds: [],
|
||||
};
|
||||
}
|
||||
|
||||
filterNotes(notes) {
|
||||
const todoFilter = Setting.value('todoFilter');
|
||||
if (todoFilter == 'all') return notes;
|
||||
|
||||
const now = time.unixMs();
|
||||
const maxInterval = 1000 * 60 * 60 * 24;
|
||||
const notRecentTime = now - maxInterval;
|
||||
|
||||
let output = [];
|
||||
for (let i = 0; i < notes.length; i++) {
|
||||
const note = notes[i];
|
||||
if (note.is_todo) {
|
||||
if (todoFilter == 'recent' && note.updated_time < notRecentTime && !!note.todo_completed) continue;
|
||||
if (todoFilter == 'nonCompleted' && !!note.todo_completed) continue;
|
||||
}
|
||||
output.push(note);
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
componentWillMount() {
|
||||
const newDataSource = this.state.dataSource.cloneWithRows(this.filterNotes(this.props.items));
|
||||
this.state = { dataSource: newDataSource };
|
||||
}
|
||||
|
||||
componentWillReceiveProps(newProps) {
|
||||
// https://stackoverflow.com/questions/38186114/react-native-redux-and-listview
|
||||
this.setState({
|
||||
dataSource: this.state.dataSource.cloneWithRows(this.filterNotes(newProps.items)),
|
||||
});
|
||||
}
|
||||
|
||||
async todoCheckbox_change(itemId, checked) {
|
||||
let note = await Note.load(itemId);
|
||||
await Note.save({ id: note.id, todo_completed: checked ? time.unixMs() : 0 });
|
||||
reg.scheduleSync();
|
||||
}
|
||||
|
||||
listView_itemPress(noteId) {
|
||||
this.props.dispatch({
|
||||
@ -15,6 +80,29 @@ class NoteListComponent extends ItemListComponent {
|
||||
});
|
||||
}
|
||||
|
||||
listView_itemLongPress(itemId) {}
|
||||
|
||||
render() {
|
||||
// `enableEmptySections` is to fix this warning: https://github.com/FaridSafi/react-native-gifted-listview/issues/39
|
||||
|
||||
if (this.state.dataSource.getRowCount()) {
|
||||
return (
|
||||
<ListView
|
||||
dataSource={this.state.dataSource}
|
||||
renderRow={(note) => {
|
||||
return <NoteItem
|
||||
note={note}
|
||||
onPress={(note) => this.listView_itemPress(note.id) }
|
||||
onCheckboxChange={(note, checked) => this.todoCheckbox_change(note.id, checked) }
|
||||
/> }}
|
||||
enableEmptySections={true}
|
||||
/>
|
||||
);
|
||||
} else {
|
||||
const noItemMessage = _('There are currently no notes. Create one by clicking on the (+) button.');
|
||||
return <Text style={styles.noItemMessage} >{noItemMessage}</Text>;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const NoteList = connect(
|
||||
|
||||
@ -112,11 +112,13 @@ class NoteScreenComponent extends BaseScreenComponent {
|
||||
note = await Note.load(this.props.noteId);
|
||||
}
|
||||
|
||||
const folder = Folder.byId(this.props.folders, note.parent_id);
|
||||
|
||||
this.setState({
|
||||
lastSavedNote: Object.assign({}, note),
|
||||
note: note,
|
||||
mode: mode,
|
||||
folder: await Folder.load(note.parent_id),
|
||||
folder: folder,
|
||||
isLoading: false,
|
||||
});
|
||||
|
||||
@ -439,7 +441,7 @@ class NoteScreenComponent extends BaseScreenComponent {
|
||||
let output = [];
|
||||
for (let i = 0; i < this.props.folders.length; i++) {
|
||||
let f = this.props.folders[i];
|
||||
output.push({ label: f.title + ' ' + f.id, value: f.id });
|
||||
output.push({ label: f.title, value: f.id });
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
@ -63,7 +63,7 @@ class NotesScreenComponent extends BaseScreenComponent {
|
||||
return (
|
||||
<View style={this.styles().screen}>
|
||||
<ScreenHeader title={title} menuOptions={this.menuOptions()} />
|
||||
<NoteList noItemMessage={_('There are currently no notes. Create one by clicking on the (+) button.')} style={{flex: 1}}/>
|
||||
<NoteList style={{flex: 1}}/>
|
||||
<ActionButton addFolderNoteButtons={addFolderNoteButtons} parentFolderId={this.props.selectedFolderId}></ActionButton>
|
||||
<DialogBox ref={dialogbox => { this.dialogbox = dialogbox }}/>
|
||||
</View>
|
||||
|
||||
@ -16,7 +16,6 @@ import { BaseItem } from 'lib/models/base-item.js'
|
||||
import { BaseModel } from 'lib/base-model.js'
|
||||
import { JoplinDatabase } from 'lib/joplin-database.js'
|
||||
import { Database } from 'lib/database.js'
|
||||
import { ItemList } from 'lib/components/item-list.js'
|
||||
import { NotesScreen } from 'lib/components/screens/notes.js'
|
||||
import { NotesScreenUtils } from 'lib/components/screens/notes-utils.js'
|
||||
import { NoteScreen } from 'lib/components/screens/note.js'
|
||||
|
||||
2
ReactNativeClient/start_server.sh
Normal file
2
ReactNativeClient/start_server.sh
Normal file
@ -0,0 +1,2 @@
|
||||
#!/bin/bash
|
||||
npm start -- --reset-cache
|
||||
Loading…
Reference in New Issue
Block a user