self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-11 18:24:43 +02:00
Code Issues Releases Activity

Mobile: Many small fixes and improvements to style and layout to make app more usable

Browse Source
This commit is contained in:
Laurent Cozic 2018-12-15 01:45:35 +01:00
parent 6dca4a0d6b
commit fa0572de77
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ReactNativeClient/lib/components/screens/config.js
View File

@ -83,10 +83,10 @@ class ConfigScreenComponent extends BaseScreenComponent {
}, },
} }
if (Platform.OS === 'ios') { // if (Platform.OS === 'ios') {
styles.settingControl.borderBottomWidth = 1; styles.settingControl.borderBottomWidth = 1;
styles.settingControl.borderBottomColor = theme.dividerColor; styles.settingControl.borderBottomColor = theme.strongDividerColor;
} // }
styles.switchSettingText = Object.assign({}, styles.settingText); styles.switchSettingText = Object.assign({}, styles.settingText);
styles.switchSettingText.width = '80%'; styles.switchSettingText.width = '80%';

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

@ -62,8 +62,8 @@ class DropboxLoginScreenComponent extends BaseScreenComponent {
</TouchableOpacity> </TouchableOpacity>
</View> </View>
<Text style={this.styles().stepText}>{_('Step 2: Enter the code provided by Dropbox:')}</Text> <Text style={this.styles().stepText}>{_('Step 2: Enter the code provided by Dropbox:')}</Text>
<TextInput selectionColor={theme.textSelectionColor} value={this.state.authCode} onChangeText={this.shared_.authCodeInput_change} style={theme.lineInput}/> <TextInput placeholder={_('Enter code here')} placeholderTextColor={theme.colorFaded} selectionColor={theme.textSelectionColor} value={this.state.authCode} onChangeText={this.shared_.authCodeInput_change} style={theme.lineInput}/>
<View style={{height:10}}></View>
<Button disabled={this.state.checkingAuthToken} title={_("Submit")} onPress={this.shared_.submit_click}></Button> <Button disabled={this.state.checkingAuthToken} title={_("Submit")} onPress={this.shared_.submit_click}></Button>
{/* Add this extra padding to make sure the view is scrollable when the keyboard is visible on small screens (iPhone SE) */} {/* Add this extra padding to make sure the view is scrollable when the keyboard is visible on small screens (iPhone SE) */}

5
ReactNativeClient/lib/components/screens/encryption-config.js
View File

@ -110,11 +110,8 @@ class EncryptionConfigScreenComponent extends BaseScreenComponent {
const active = this.props.activeMasterKeyId === mk.id ? '✔' : ''; const active = this.props.activeMasterKeyId === mk.id ? '✔' : '';
const inputStyle = {flex:1, marginRight: 10, color: theme.color}; const inputStyle = {flex:1, marginRight: 10, color: theme.color};
if (Platform.OS === 'ios') {
inputStyle.borderBottomWidth = 1; inputStyle.borderBottomWidth = 1;
inputStyle.borderBottomColor = theme.dividerColor; inputStyle.borderBottomColor = theme.strongDividerColor;
}
return ( return (
<View key={mk.id}> <View key={mk.id}>

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

@ -156,7 +156,7 @@ class NoteScreenComponent extends BaseScreenComponent {
this.resourceFetcher_downloadComplete = async (resource) => { this.resourceFetcher_downloadComplete = async (resource) => {
if (!this.state.note || !this.state.note.body) return; if (!this.state.note || !this.state.note.body) return;
const resourceIds = await Note.linkedResourceIds(this.state.note.body); const resourceIds = await Note.linkedResourceIds(this.state.note.body);
if (resourceIds.indexOf(resource.id) >= 0) { if (resourceIds.indexOf(resource.id) >= 0 && this.refs.noteBodyViewer) {
this.refs.noteBodyViewer.rebuildMd(); this.refs.noteBodyViewer.rebuildMd();
} }
} }

2
ReactNativeClient/lib/components/screens/notes.js
View File

@ -203,7 +203,7 @@ class NotesScreenComponent extends BaseScreenComponent {
let title = parent ? parent.title : null; let title = parent ? parent.title : null;
const addFolderNoteButtons = this.props.selectedFolderId && this.props.selectedFolderId != Folder.conflictFolderId(); const addFolderNoteButtons = this.props.selectedFolderId && this.props.selectedFolderId != Folder.conflictFolderId();
const thisComp = this; const thisComp = this;
const actionButtonComp = this.props.noteSelectionEnabled ? null : <ActionButton addFolderNoteButtons={addFolderNoteButtons} parentFolderId={this.props.selectedFolderId}></ActionButton> const actionButtonComp = this.props.noteSelectionEnabled || !this.props.visible ? null : <ActionButton addFolderNoteButtons={addFolderNoteButtons} parentFolderId={this.props.selectedFolderId}></ActionButton>
return ( return (
<View style={rootStyle}> <View style={rootStyle}>