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

iOS: Added safe area for iPhone X support

Browse Source
This commit is contained in:
Laurent Cozic
2017-12-07 22:42:40 +00:00
parent 145ee13356
commit 45ca6284f9
3 changed files with 90 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ReactNativeClient/root.js
View File

@ -1,5 +1,6 @@
const React = require('react'); const Component = React.Component;
const { Keyboard, NativeModules, BackHandler } = require('react-native');
const { SafeAreaView } = require('react-navigation');
const { connect, Provider } = require('react-redux');
const { BackButtonService } = require('lib/services/back-button.js');
const AlarmService = require('lib/services/AlarmService.js');
@ -461,7 +462,7 @@ class AppComponent extends React.Component {
render() {
if (this.props.appState != 'ready') return null;
const sideMenuContent = <SideMenuContent/>;
const sideMenuContent = <SafeAreaView style={{flex:1}}><SideMenuContent/></SafeAreaView>;
const appNavInit = {
Welcome: { screen: WelcomeScreen },
@ -487,7 +488,9 @@ class AppComponent extends React.Component {
}}
>
<MenuContext style={{ flex: 1 }}>
<AppNav screens={appNavInit} />
<SafeAreaView style={{flex:1}}>
<AppNav screens={appNavInit} />
</SafeAreaView>
<DropdownAlert ref={ref => this.dropdownAlert_ = ref} tapToCloseEnabled={true} />
</MenuContext>
</SideMenu>