1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-08-27 20:29:45 +02:00

Compare commits

..

2 Commits

Author SHA1 Message Date
Laurent Cozic
5cb54a57ac Android 2.13.2 2023-10-07 18:09:36 +01:00
Laurent Cozic
0e0c1d8395 Mobile: Fix icon after react-native-vector-icon upgrade 2023-10-07 17:25:03 +01:00
11 changed files with 28 additions and 28 deletions

View File

@@ -110,8 +110,8 @@ android {
applicationId "net.cozic.joplin" applicationId "net.cozic.joplin"
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 2097721 versionCode 2097722
versionName "2.13.1" versionName "2.13.2"
ndk { ndk {
abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64" abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
} }

View File

@@ -49,7 +49,7 @@ const ActionButton = (props: ActionButtonProps) => {
}; };
}), [props.buttons]); }), [props.buttons]);
const closedIcon = useIcon(props.mainButton?.icon ?? 'md-add'); const closedIcon = useIcon(props.mainButton?.icon ?? 'add');
const openIcon = useIcon('close'); const openIcon = useIcon('close');
return ( return (

View File

@@ -158,11 +158,11 @@ class CameraView extends Component {
} }
public render() { public render() {
const photoIcon = this.state.snapping ? 'md-checkmark' : 'md-camera'; const photoIcon = this.state.snapping ? 'checkmark' : 'camera';
const displayRatios = this.supportsRatios() && this.state.ratios.length > 1; const displayRatios = this.supportsRatios() && this.state.ratios.length > 1;
const reverseCameraButton = this.renderButton(this.reverse_onPress, 'md-camera-reverse', { flex: 1, flexDirection: 'row', justifyContent: 'flex-start', marginLeft: 20 }); const reverseCameraButton = this.renderButton(this.reverse_onPress, 'camera-reverse', { flex: 1, flexDirection: 'row', justifyContent: 'flex-start', marginLeft: 20 });
const ratioButton = !displayRatios ? <View style={{ flex: 1 }}/> : this.renderButton(this.ratio_onPress, <Text style={{ fontWeight: 'bold', fontSize: 20 }}>{Setting.value('camera.ratio')}</Text>, { flex: 1, flexDirection: 'row', justifyContent: 'flex-end', marginRight: 20 }); const ratioButton = !displayRatios ? <View style={{ flex: 1 }}/> : this.renderButton(this.ratio_onPress, <Text style={{ fontWeight: 'bold', fontSize: 20 }}>{Setting.value('camera.ratio')}</Text>, { flex: 1, flexDirection: 'row', justifyContent: 'flex-end', marginRight: 20 });
let cameraRatio = '4:3'; let cameraRatio = '4:3';
@@ -202,7 +202,7 @@ class CameraView extends Component {
<TouchableOpacity onPress={this.back_onPress}> <TouchableOpacity onPress={this.back_onPress}>
<View style={{ marginLeft: 5, marginTop: 5, borderColor: '#00000040', borderWidth: 1, borderStyle: 'solid', borderRadius: 90, width: 50, height: 50, display: 'flex', backgroundColor: '#ffffff77', justifyContent: 'center', alignItems: 'center' }}> <View style={{ marginLeft: 5, marginTop: 5, borderColor: '#00000040', borderWidth: 1, borderStyle: 'solid', borderRadius: 90, width: 50, height: 50, display: 'flex', backgroundColor: '#ffffff77', justifyContent: 'center', alignItems: 'center' }}>
<Icon <Icon
name={'md-arrow-back'} name={'arrow-back'}
style={{ style={{
fontSize: 40, fontSize: 40,
color: 'black', color: 'black',

View File

@@ -308,7 +308,7 @@ class ScreenHeaderComponent extends PureComponent<ScreenHeaderProps, ScreenHeade
accessibilityHint={_('Show/hide the sidebar')} accessibilityHint={_('Show/hide the sidebar')}
accessibilityRole="button"> accessibilityRole="button">
<View style={styles.sideMenuButton}> <View style={styles.sideMenuButton}>
<Icon name="md-menu" style={styles.topIcon} /> <Icon name="menu" style={styles.topIcon} />
</View> </View>
</TouchableOpacity> </TouchableOpacity>
); );
@@ -324,7 +324,7 @@ class ScreenHeaderComponent extends PureComponent<ScreenHeaderProps, ScreenHeade
accessibilityRole="button"> accessibilityRole="button">
<View style={disabled ? styles.backButtonDisabled : styles.backButton}> <View style={disabled ? styles.backButtonDisabled : styles.backButton}>
<Icon <Icon
name="md-arrow-back" name="arrow-back"
style={styles.topIcon} style={styles.topIcon}
/> />
</View> </View>
@@ -337,7 +337,7 @@ class ScreenHeaderComponent extends PureComponent<ScreenHeaderProps, ScreenHeade
) { ) {
if (!show) return null; if (!show) return null;
const icon = disabled ? <Icon name="md-checkmark" style={styles.savedButtonIcon} /> : <Image style={styles.saveButtonIcon} source={require('./SaveIcon.png')} />; const icon = disabled ? <Icon name="checkmark" style={styles.savedButtonIcon} /> : <Image style={styles.saveButtonIcon} source={require('./SaveIcon.png')} />;
return ( return (
<TouchableOpacity <TouchableOpacity
@@ -407,7 +407,7 @@ class ScreenHeaderComponent extends PureComponent<ScreenHeaderProps, ScreenHeade
description={_('Select all')} description={_('Select all')}
contentStyle={styles.iconButton} contentStyle={styles.iconButton}
> >
<Icon name="md-checkmark-circle-outline" style={styles.topIcon} /> <Icon name="checkmark-circle-outline" style={styles.topIcon} />
</CustomButton> </CustomButton>
); );
} }
@@ -421,7 +421,7 @@ class ScreenHeaderComponent extends PureComponent<ScreenHeaderProps, ScreenHeade
themeId={themeId} themeId={themeId}
contentStyle={styles.iconButton} contentStyle={styles.iconButton}
> >
<Icon name="md-search" style={styles.topIcon} /> <Icon name="search" style={styles.topIcon} />
</CustomButton> </CustomButton>
); );
} }
@@ -439,7 +439,7 @@ class ScreenHeaderComponent extends PureComponent<ScreenHeaderProps, ScreenHeade
} }
contentStyle={disabled ? styles.iconButtonDisabled : styles.iconButton} contentStyle={disabled ? styles.iconButtonDisabled : styles.iconButton}
> >
<Icon name="md-trash" style={styles.topIcon} /> <Icon name="trash" style={styles.topIcon} />
</CustomButton> </CustomButton>
); );
} }
@@ -457,7 +457,7 @@ class ScreenHeaderComponent extends PureComponent<ScreenHeaderProps, ScreenHeade
} }
contentStyle={disabled ? styles.iconButtonDisabled : styles.iconButton} contentStyle={disabled ? styles.iconButtonDisabled : styles.iconButton}
> >
<Icon name="md-copy" style={styles.topIcon} /> <Icon name="copy" style={styles.topIcon} />
</CustomButton> </CustomButton>
); );
} }
@@ -602,7 +602,7 @@ class ScreenHeaderComponent extends PureComponent<ScreenHeaderProps, ScreenHeade
<Menu onSelect={value => this.menu_select(value)} style={this.styles().contextMenu}> <Menu onSelect={value => this.menu_select(value)} style={this.styles().contextMenu}>
<MenuTrigger style={contextMenuStyle}> <MenuTrigger style={contextMenuStyle}>
<View accessibilityLabel={_('Actions')}> <View accessibilityLabel={_('Actions')}>
<Icon name="md-ellipsis-vertical" style={this.styles().contextMenuTrigger} /> <Icon name="ellipsis-vertical" style={this.styles().contextMenuTrigger} />
</View> </View>
</MenuTrigger> </MenuTrigger>
<MenuOptions> <MenuOptions>

View File

@@ -40,7 +40,7 @@ class Checkbox extends Component {
} }
render() { render() {
const iconName = this.state.checked ? 'md-checkbox-outline' : 'md-square-outline'; const iconName = this.state.checked ? 'checkbox-outline' : 'square-outline';
const style = this.props.style ? { ...this.props.style } : {}; const style = this.props.style ? { ...this.props.style } : {};
style.justifyContent = 'center'; style.justifyContent = 'center';

View File

@@ -1406,7 +1406,7 @@ class NoteScreenComponent extends BaseScreenComponent {
const editButton = { const editButton = {
label: _('Edit'), label: _('Edit'),
icon: 'md-create', icon: 'create',
onPress: () => { onPress: () => {
this.setState({ mode: 'edit' }); this.setState({ mode: 'edit' });

View File

@@ -58,7 +58,7 @@ class NoteTagsDialogComponent extends React.Component {
this.renderTag = data => { this.renderTag = data => {
const tag = data.item; const tag = data.item;
const iconName = noteHasTag(tag.id) ? 'md-checkbox-outline' : 'md-square-outline'; const iconName = noteHasTag(tag.id) ? 'checkbox-outline' : 'square-outline';
return ( return (
<TouchableOpacity key={tag.id} onPress={() => this.tag_press(tag.id)} style={this.styles().tag}> <TouchableOpacity key={tag.id} onPress={() => this.tag_press(tag.id)} style={this.styles().tag}>
<View style={this.styles().tagIconText}> <View style={this.styles().tagIconText}>

View File

@@ -236,7 +236,7 @@ class NotesScreenComponent extends BaseScreenComponent<any> {
void this.newNoteNavigate(buttonFolderId, isTodo); void this.newNoteNavigate(buttonFolderId, isTodo);
}, },
color: '#9b59b6', color: '#9b59b6',
icon: 'md-checkbox-outline', icon: 'checkbox-outline',
}); });
buttons.push({ buttons.push({
@@ -246,7 +246,7 @@ class NotesScreenComponent extends BaseScreenComponent<any> {
void this.newNoteNavigate(buttonFolderId, isTodo); void this.newNoteNavigate(buttonFolderId, isTodo);
}, },
color: '#9b59b6', color: '#9b59b6',
icon: 'md-document', icon: 'document',
}); });
return <ActionButton buttons={buttons}/>; return <ActionButton buttons={buttons}/>;
} }

View File

@@ -190,7 +190,7 @@ class SearchScreenComponent extends BaseScreenComponent {
onPress={() => this.clearButton_press()} onPress={() => this.clearButton_press()}
accessibilityLabel={_('Clear')} accessibilityLabel={_('Clear')}
> >
<Icon name="md-close-circle" style={this.styles().clearIcon} /> <Icon name="close-circle" style={this.styles().clearIcon} />
</TouchableHighlight> </TouchableHighlight>
</View> </View>

View File

@@ -421,15 +421,15 @@ const SideMenuContentComponent = (props: Props) => {
items.push(makeDivider('divider_1')); items.push(makeDivider('divider_1'));
items.push(renderSidebarButton('newFolder_button', _('New Notebook'), 'md-folder-open', newFolderButton_press)); items.push(renderSidebarButton('newFolder_button', _('New Notebook'), 'folder-open', newFolderButton_press));
items.push(renderSidebarButton('tag_button', _('Tags'), 'md-pricetag', tagButton_press)); items.push(renderSidebarButton('tag_button', _('Tags'), 'pricetag', tagButton_press));
if (props.profileConfig && props.profileConfig.profiles.length > 1) { if (props.profileConfig && props.profileConfig.profiles.length > 1) {
items.push(renderSidebarButton('switchProfile_button', _('Switch profile'), 'md-people-circle-outline', switchProfileButton_press)); items.push(renderSidebarButton('switchProfile_button', _('Switch profile'), 'people-circle-outline', switchProfileButton_press));
} }
items.push(renderSidebarButton('config_button', _('Configuration'), 'md-settings', configButton_press)); items.push(renderSidebarButton('config_button', _('Configuration'), 'settings', configButton_press));
items.push(makeDivider('divider_2')); items.push(makeDivider('divider_2'));
@@ -451,7 +451,7 @@ const SideMenuContentComponent = (props: Props) => {
if (resourceFetcherText) fullReport.push(resourceFetcherText); if (resourceFetcherText) fullReport.push(resourceFetcherText);
if (decryptionReportText) fullReport.push(decryptionReportText); if (decryptionReportText) fullReport.push(decryptionReportText);
items.push(renderSidebarButton('synchronize_button', !props.syncStarted ? _('Synchronise') : _('Cancel'), 'md-sync', synchronize_press)); items.push(renderSidebarButton('synchronize_button', !props.syncStarted ? _('Synchronise') : _('Cancel'), 'sync', synchronize_press));
if (fullReport.length) { if (fullReport.length) {
items.push( items.push(
@@ -480,11 +480,11 @@ const SideMenuContentComponent = (props: Props) => {
// using padding. So instead creating blank elements for padding bottom and top. // using padding. So instead creating blank elements for padding bottom and top.
items.push(<View style={{ height: theme.marginTop }} key="bottom_top_hack" />); items.push(<View style={{ height: theme.marginTop }} key="bottom_top_hack" />);
items.push(renderSidebarButton('all_notes', _('All notes'), 'md-document', allNotesButton_press, props.notesParentType === 'SmartFilter')); items.push(renderSidebarButton('all_notes', _('All notes'), 'document', allNotesButton_press, props.notesParentType === 'SmartFilter'));
items.push(makeDivider('divider_all')); items.push(makeDivider('divider_all'));
items.push(renderSidebarButton('folder_header', _('Notebooks'), 'md-folder')); items.push(renderSidebarButton('folder_header', _('Notebooks'), 'folder'));
if (props.folders.length) { if (props.folders.length) {
const result = shared.renderFolders(props, renderFolderItem, false); const result = shared.renderFolders(props, renderFolderItem, false);

View File

@@ -1,6 +1,6 @@
# Joplin Android app changelog # Joplin Android app changelog
## [android-v2.13.1](https://github.com/laurent22/joplin/releases/tag/android-v2.13.1) (Pre-release) - 2023-10-07T13:20:47Z ## [android-v2.13.2](https://github.com/laurent22/joplin/releases/tag/android-v2.13.2) (Pre-release) - 2023-10-07T16:42:16Z
- New: Add share button to log screen (#8364 by Henry Heino) - New: Add share button to log screen (#8364 by Henry Heino)
- New: Add support for drawing pictures (#7588 by Henry Heino) - New: Add support for drawing pictures (#7588 by Henry Heino)