self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-27 08:21:03 +02:00
Code Issues Releases Activity

Mobile: Fixes OneDribe login screen

Browse Source
This commit is contained in:
Laurent Cozic 2020-06-20 11:14:01 +01:00
parent d5ed611920
commit 6350506ce7
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ReactNativeClient/lib/components/screens/dropbox-login.js
View File

@ -31,6 +31,10 @@ class DropboxLoginScreenComponent extends BaseScreenComponent {
this.styles_ = {};
const styles = {
screen: {
flex: 1,
backgroundColor: theme.backgroundColor,
},
container: {
padding: theme.margin,
backgroundColor: theme.backgroundColor,

4
ReactNativeClient/lib/components/screens/note.js
View File

@ -268,6 +268,10 @@ class NoteScreenComponent extends BaseScreenComponent {
// TODO: Clean up these style names and nesting
const styles = {
screen: {
flex: 1,
backgroundColor: theme.backgroundColor,
},
bodyTextInput: {
flex: 1,
paddingLeft: theme.marginLeft,

17
ReactNativeClient/lib/components/screens/onedrive-login.js
View File

@ -9,6 +9,7 @@ const { reg } = require('lib/registry.js');
const { _ } = require('lib/locale.js');
const { BaseScreenComponent } = require('lib/components/base-screen.js');
const parseUri = require('lib/parseUri');
const { themeStyle } = require('lib/components/global-style.js');
class OneDriveLoginScreenComponent extends BaseScreenComponent {
static navigationOptions() {
@ -21,6 +22,16 @@ class OneDriveLoginScreenComponent extends BaseScreenComponent {
this.authCode_ = null;
}
styles() {
const theme = themeStyle(this.props.theme);
return {
screen: {
flex: 1,
backgroundColor: theme.backgroundColor,
},
};
}
UNSAFE_componentWillMount() {
this.setState({
webviewUrl: this.startUrl(),
@ -116,8 +127,10 @@ class OneDriveLoginScreenComponent extends BaseScreenComponent {
}
}
const OneDriveLoginScreen = connect(() => {
return {};
const OneDriveLoginScreen = connect((state) => {
return {
theme: state.settings.theme,
};
})(OneDriveLoginScreenComponent);
module.exports = { OneDriveLoginScreen };