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

Applied prettier to code base

Browse Source
This commit is contained in:
Laurent Cozic
2018-03-09 17:49:35 +00:00
parent e868102c98
commit c4f19465a6
203 changed files with 13395 additions and 7927 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
ReactNativeClient/lib/components/app-nav.js
View File

@ -1,25 +1,25 @@
const React = require('react'); const Component = React.Component;
const { connect } = require('react-redux');
const { NotesScreen } = require('lib/components/screens/notes.js');
const { SearchScreen } = require('lib/components/screens/search.js');
const { KeyboardAvoidingView, Keyboard, Platform, View } = require('react-native');
const { _ } = require('lib/locale.js');
const { themeStyle } = require('lib/components/global-style.js');
const React = require("react");
const Component = React.Component;
const { connect } = require("react-redux");
const { NotesScreen } = require("lib/components/screens/notes.js");
const { SearchScreen } = require("lib/components/screens/search.js");
const { KeyboardAvoidingView, Keyboard, Platform, View } = require("react-native");
const { _ } = require("lib/locale.js");
const { themeStyle } = require("lib/components/global-style.js");
class AppNavComponent extends Component {
constructor() {
super();
this.previousRouteName_ = null;
this.state = {
autoCompletionBarExtraHeight: 0, // Extra padding for the auto completion bar at the top of the keyboard
}
};
}
componentWillMount() {
if (Platform.OS === 'ios') {
this.keyboardDidShowListener = Keyboard.addListener('keyboardDidShow', this.keyboardDidShow.bind(this));
this.keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', this.keyboardDidHide.bind(this));
if (Platform.OS === "ios") {
this.keyboardDidShowListener = Keyboard.addListener("keyboardDidShow", this.keyboardDidShow.bind(this));
this.keyboardDidHideListener = Keyboard.addListener("keyboardDidHide", this.keyboardDidHide.bind(this));
}
}
@ -30,16 +30,16 @@ class AppNavComponent extends Component {
this.keyboardDidHideListener = null;
}
keyboardDidShow () {
this.setState({ autoCompletionBarExtraHeight: 30 })
keyboardDidShow() {
this.setState({ autoCompletionBarExtraHeight: 30 });
}
keyboardDidHide () {
this.setState({ autoCompletionBarExtraHeight:0 })
keyboardDidHide() {
this.setState({ autoCompletionBarExtraHeight: 0 });
}
render() {
if (!this.props.route) throw new Error('Route must not be null');
if (!this.props.route) throw new Error("Route must not be null");
// Note: certain screens are kept into memory, in particular Notes and Search
// so that the scroll position is not lost when the user navigate away from them.
@ -49,9 +49,9 @@ class AppNavComponent extends Component {
let notesScreenVisible = false;
let searchScreenVisible = false;
if (route.routeName == 'Notes') {
if (route.routeName == "Notes") {
notesScreenVisible = true;
} else if (route.routeName == 'Search') {
} else if (route.routeName == "Search") {
searchScreenVisible = true;
} else {
Screen = this.props.screens[route.routeName].screen;
@ -60,33 +60,30 @@ class AppNavComponent extends Component {
// Keep the search screen loaded if the user is viewing a note from that search screen
// so that if the back button is pressed, the screen is still loaded. However, unload
// it if navigating away.
let searchScreenLoaded = searchScreenVisible || (this.previousRouteName_ == 'Search' && route.routeName == 'Note');
let searchScreenLoaded = searchScreenVisible || (this.previousRouteName_ == "Search" && route.routeName == "Note");
this.previousRouteName_ = route.routeName;
const theme = themeStyle(this.props.theme);
const style = { flex: 1, backgroundColor: theme.backgroundColor }
const style = { flex: 1, backgroundColor: theme.backgroundColor };
return (
<KeyboardAvoidingView behavior={ Platform.OS === 'ios' ? "padding" : null } style={style}>
<KeyboardAvoidingView behavior={Platform.OS === "ios" ? "padding" : null} style={style}>
<NotesScreen visible={notesScreenVisible} navigation={{ state: route }} />
{ searchScreenLoaded && <SearchScreen visible={searchScreenVisible} navigation={{ state: route }} /> }
{ (!notesScreenVisible && !searchScreenVisible) && <Screen navigation={{ state: route }} /> }
{searchScreenLoaded && <SearchScreen visible={searchScreenVisible} navigation={{ state: route }} />}
{!notesScreenVisible && !searchScreenVisible && <Screen navigation={{ state: route }} />}
<View style={{ height: this.state.autoCompletionBarExtraHeight }} />
</KeyboardAvoidingView>
);
}
}
const AppNav = connect(
(state) => {
return {
route: state.route,
theme: state.settings.theme,
};
}
)(AppNavComponent)
const AppNav = connect(state => {
return {
route: state.route,
theme: state.settings.theme,
};
})(AppNavComponent);
module.exports = { AppNav };
module.exports = { AppNav };