self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-27 23:28:38 +02:00
Code Issues Releases Activity

Desktop: UI update (#3586)

Browse Source
This commit is contained in:
Laurent
2020-09-15 14:01:07 +01:00
committed by GitHub
parent bdedf69439
commit 056285deda
138 changed files with 4620 additions and 2308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ReactNativeClient/lib/components/screens/log.js
View File

@ -26,9 +26,9 @@ class LogScreenComponent extends BaseScreenComponent {
}
styles() {
const theme = themeStyle(this.props.theme);
const theme = themeStyle(this.props.themeId);
if (this.styles_[this.props.theme]) return this.styles_[this.props.theme];
if (this.styles_[this.props.themeId]) return this.styles_[this.props.themeId];
this.styles_ = {};
const styles = {
@ -56,8 +56,8 @@ class LogScreenComponent extends BaseScreenComponent {
styles.rowTextWarn = Object.assign({}, styles.rowText);
styles.rowTextWarn.color = theme.colorWarn;
this.styles_[this.props.theme] = StyleSheet.create(styles);
return this.styles_[this.props.theme];
this.styles_[this.props.themeId] = StyleSheet.create(styles);
return this.styles_[this.props.themeId];
}
UNSAFE_componentWillMount() {
@ -96,7 +96,7 @@ class LogScreenComponent extends BaseScreenComponent {
// `enableEmptySections` is to fix this warning: https://github.com/FaridSafi/react-native-gifted-listview/issues/39
return (
<View style={this.rootStyle(this.props.theme).root}>
<View style={this.rootStyle(this.props.themeId).root}>
<ScreenHeader title={_('Log')} />
<FlatList
data={this.state.logEntries}
@ -128,7 +128,7 @@ class LogScreenComponent extends BaseScreenComponent {
const LogScreen = connect(state => {
return {
theme: state.settings.theme,
themeId: state.settings.theme,
};
})(LogScreenComponent);