self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Android: Fixes #2694: Remove gap on top of window when there is a notch

Browse Source
This commit is contained in:
Laurent Cozic 2020-03-09 23:44:38 +00:00
parent 84c3ef144d
commit b367955e56
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ReactNativeClient/lib/components/SafeAreaView.js
View File

@ -1,12 +1,18 @@
const React = require('react'); const React = require('react');
import { View, Platform, SafeAreaView, StyleSheet, StatusBar } from 'react-native'; import { View, Platform, SafeAreaView, StyleSheet /* , StatusBar */ } from 'react-native';
import DeviceInfo from 'react-native-device-info'; // import DeviceInfo from 'react-native-device-info';
// Untested! This should check if the device has a notch and, if it does, apply // Untested! This should check if the device has a notch and, if it does, apply
// an extra padding on top of the screen. // an extra padding on top of the screen.
const styles = StyleSheet.create({ const styles = StyleSheet.create({
AndroidSafeArea: { AndroidSafeArea: {
paddingTop: Platform.OS === 'android' && DeviceInfo.hasNotch() ? StatusBar.currentHeight : 0, // Disabled for now because it seems that even when there's a notch the system status bar
// covers it, and thus we should add our own gap.
// Can only test on emulator though
// Fixes: https://github.com/laurent22/joplin/issues/2694
// paddingTop: Platform.OS === 'android' && DeviceInfo.hasNotch() ? StatusBar.currentHeight : 0,
paddingTop: 0,
}, },
}); });

16
package-lock.json generated
View File

@ -59,16 +59,6 @@
"any-observable": "^0.3.0" "any-observable": "^0.3.0"
} }
}, },
"@types/draft-js": {
"version": "0.10.38",
"resolved": "https://registry.npmjs.org/@types/draft-js/-/draft-js-0.10.38.tgz",
"integrity": "sha512-iDg8fJATjGVfQVv/dysAMMcPwORyJix2AyAm8OdwseteYh1jV+Xwlz+1HddoCWxQWqzWf/MDkNQH5sLYG47e0w==",
"dev": true,
"requires": {
"@types/react": "*",
"immutable": "~3.7.4"
}
},
"@types/eslint-visitor-keys": { "@types/eslint-visitor-keys": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
@ -3302,12 +3292,6 @@
"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
"dev": true "dev": true
}, },
"immutable": {
"version": "3.7.6",
"resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz",
"integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks=",
"dev": true
},
"import-fresh": { "import-fresh": {
"version": "3.1.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz",