self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-12 22:57:38 +02:00
Code Issues Releases Activity

Fixed geolocation bug and improved saving of notes and folders

Browse Source
This commit is contained in:
Laurent Cozic
2017-07-16 11:17:40 +01:00
parent e2d426a986
commit cd6d8ce284
9 changed files with 56 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ReactNativeClient/lib/components/screen-header.js
View File

@ -42,9 +42,23 @@ let styleObject = {
fontWeight: 'bold',
flex: 1,
},
saveButton: {
flex: 1,
backgroundColor: "#0482E3",
paddingLeft: 15,
paddingRight: 15,
marginRight: 10,
},
saveButtonText: {
textAlignVertical: 'center',
color: "#ffffff",
fontWeight: 'bold',
flex: 1,
},
};
styleObject.backButtonDisabled = Object.assign({}, styleObject.backButton, { backgroundColor: "#c6c6c6" });
styleObject.saveButtonDisabled = Object.assign({}, styleObject.saveButton, { backgroundColor: "#c6c6c6" });
const styles = StyleSheet.create(styleObject);
@ -100,6 +114,18 @@ class ScreenHeaderComponent extends Component {
);
}
function saveButton(styles, onPress, disabled, show) {
if (!show) return null;
return (
<TouchableOpacity onPress={onPress} disabled={disabled}>
<View style={disabled ? styles.saveButtonDisabled : styles.saveButton}>
<Text style={styles.saveButtonText}>Save</Text>
</View>
</TouchableOpacity>
);
}
let key = 0;
let menuOptionComponents = [];
for (let i = 0; i < this.props.menuOptions.length; i++) {
@ -130,6 +156,7 @@ class ScreenHeaderComponent extends Component {
<View style={{ flexDirection: 'row', paddingLeft: 10, paddingTop: 10, paddingBottom: 10, paddingRight: 0, backgroundColor: '#ffffff', alignItems: 'center' }} >
{ sideMenuButton(styles, () => this.sideMenuButton_press()) }
{ backButton(styles, () => this.backButton_press(), !this.props.historyCanGoBack) }
{ saveButton(styles, () => { if (this.props.onSaveButtonPress) this.props.onSaveButtonPress() }, this.props.saveButtonDisabled === true, this.props.showSaveButton === true) }
<Text style={{ flex:1, marginLeft: 10 }} >{title}</Text>
<Menu onSelect={(value) => this.menu_select(value)}>
<MenuTrigger>