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

More styling

Browse Source
This commit is contained in:
Laurent Cozic
2017-07-21 23:42:24 +01:00
parent 29b607fac6
commit 840980dafd
6 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
import React, { Component } from 'react';
import { connect } from 'react-redux'
import { View, Text, Button, StyleSheet, TouchableOpacity, Picker } from 'react-native';
import Icon from 'react-native-vector-icons/Ionicons';
import { Log } from 'lib/log.js';
import { Menu, MenuOptions, MenuOption, MenuTrigger } from 'react-native-popup-menu';
import { _ } from 'lib/locale.js';
@ -13,10 +14,8 @@ import { globalStyle } from 'lib/components/global-style.js';
let styleObject = {
container: {
flexDirection: 'row',
paddingLeft: globalStyle.marginLeft,
paddingTop: 10,
paddingBottom: 10,
paddingRight: 0,
backgroundColor: globalStyle.backgroundColor,
alignItems: 'center',
shadowColor: '#000000',
@ -35,29 +34,29 @@ let styleObject = {
},
sideMenuButton: {
flex: 1,
backgroundColor: "#0482E3",
paddingLeft: 15,
paddingRight: 15,
marginRight: 10,
backgroundColor: globalStyle.backgroundColor,
paddingLeft: globalStyle.marginLeft,
paddingRight: 5,
marginRight: 2,
},
sideMenuButtonText: {
textAlignVertical: 'center',
color: "#ffffff",
color: globalStyle.color,
fontWeight: 'bold',
flex: 1,
},
backButton: {
flex: 1,
backgroundColor: "#0482E3",
backgroundColor: globalStyle.backgroundColor,
paddingLeft: 15,
paddingRight: 15,
marginRight: 10,
marginRight: 1,
},
backButtonText: {
textAlignVertical: 'center',
color: "#ffffff",
fontWeight: 'bold',
backButtonIcon: {
flex: 1,
fontSize: 20,
color: globalStyle.color,
textAlignVertical: 'center',
},
saveButton: {
flex: 1,
@ -94,13 +93,13 @@ let styleObject = {
},
titleText: {
flex: 1,
marginLeft: 10,
marginLeft: 0,
color: globalStyle.color,
}
};
styleObject.backButtonDisabled = Object.assign({}, styleObject.backButton, { backgroundColor: "#c6c6c6" });
styleObject.saveButtonDisabled = Object.assign({}, styleObject.saveButton, { backgroundColor: "#c6c6c6" });
styleObject.backButtonDisabled = Object.assign({}, styleObject.backButton, { opacity: 0.2 });
styleObject.saveButtonDisabled = Object.assign({}, styleObject.saveButton, { opacity: 0.2 });
const styles = StyleSheet.create(styleObject);
@ -147,10 +146,11 @@ class ScreenHeaderComponent extends Component {
}
function backButton(styles, onPress, disabled) {
// <Text style={styles.backButtonText}>&lt;</Text>
return (
<TouchableOpacity onPress={onPress} disabled={disabled}>
<View style={disabled ? styles.backButtonDisabled : styles.backButton}>
<Text style={styles.backButtonText}>&lt;</Text>
<Icon name='md-arrow-back' style={styles.backButtonIcon} />
</View>
</TouchableOpacity>
);