diff --git a/packages/app-mobile/components/ActionButton.tsx b/packages/app-mobile/components/ActionButton.tsx index d687ca3b89..e8bcc2d79a 100644 --- a/packages/app-mobile/components/ActionButton.tsx +++ b/packages/app-mobile/components/ActionButton.tsx @@ -49,7 +49,7 @@ const ActionButton = (props: ActionButtonProps) => { }; }), [props.buttons]); - const closedIcon = useIcon(props.mainButton?.icon ?? 'md-add'); + const closedIcon = useIcon(props.mainButton?.icon ?? 'add'); const openIcon = useIcon('close'); return ( diff --git a/packages/app-mobile/components/CameraView.tsx b/packages/app-mobile/components/CameraView.tsx index 2d31d3f2b8..f3ec968af9 100644 --- a/packages/app-mobile/components/CameraView.tsx +++ b/packages/app-mobile/components/CameraView.tsx @@ -158,11 +158,11 @@ class CameraView extends Component { } 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 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 ? : this.renderButton(this.ratio_onPress, {Setting.value('camera.ratio')}, { flex: 1, flexDirection: 'row', justifyContent: 'flex-end', marginRight: 20 }); let cameraRatio = '4:3'; @@ -202,7 +202,7 @@ class CameraView extends Component { - + ); @@ -324,7 +324,7 @@ class ScreenHeaderComponent extends PureComponent @@ -337,7 +337,7 @@ class ScreenHeaderComponent extends PureComponent : ; + const icon = disabled ? : ; return ( - + ); } @@ -421,7 +421,7 @@ class ScreenHeaderComponent extends PureComponent - + ); } @@ -439,7 +439,7 @@ class ScreenHeaderComponent extends PureComponent - + ); } @@ -457,7 +457,7 @@ class ScreenHeaderComponent extends PureComponent - + ); } @@ -602,7 +602,7 @@ class ScreenHeaderComponent extends PureComponent this.menu_select(value)} style={this.styles().contextMenu}> - + diff --git a/packages/app-mobile/components/checkbox.js b/packages/app-mobile/components/checkbox.js index e62327d604..1fd336f7c9 100644 --- a/packages/app-mobile/components/checkbox.js +++ b/packages/app-mobile/components/checkbox.js @@ -40,7 +40,7 @@ class Checkbox extends Component { } 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 } : {}; style.justifyContent = 'center'; diff --git a/packages/app-mobile/components/screens/Note.tsx b/packages/app-mobile/components/screens/Note.tsx index d130cb7788..9dd99a42a3 100644 --- a/packages/app-mobile/components/screens/Note.tsx +++ b/packages/app-mobile/components/screens/Note.tsx @@ -1406,7 +1406,7 @@ class NoteScreenComponent extends BaseScreenComponent { const editButton = { label: _('Edit'), - icon: 'md-create', + icon: 'create', onPress: () => { this.setState({ mode: 'edit' }); diff --git a/packages/app-mobile/components/screens/NoteTagsDialog.js b/packages/app-mobile/components/screens/NoteTagsDialog.js index 784d10a0b2..d1bf15ffd7 100644 --- a/packages/app-mobile/components/screens/NoteTagsDialog.js +++ b/packages/app-mobile/components/screens/NoteTagsDialog.js @@ -58,7 +58,7 @@ class NoteTagsDialogComponent extends React.Component { this.renderTag = data => { 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 ( this.tag_press(tag.id)} style={this.styles().tag}> diff --git a/packages/app-mobile/components/screens/Notes.tsx b/packages/app-mobile/components/screens/Notes.tsx index 919943feb2..b816616ed6 100644 --- a/packages/app-mobile/components/screens/Notes.tsx +++ b/packages/app-mobile/components/screens/Notes.tsx @@ -236,7 +236,7 @@ class NotesScreenComponent extends BaseScreenComponent { void this.newNoteNavigate(buttonFolderId, isTodo); }, color: '#9b59b6', - icon: 'md-checkbox-outline', + icon: 'checkbox-outline', }); buttons.push({ @@ -246,7 +246,7 @@ class NotesScreenComponent extends BaseScreenComponent { void this.newNoteNavigate(buttonFolderId, isTodo); }, color: '#9b59b6', - icon: 'md-document', + icon: 'document', }); return ; } diff --git a/packages/app-mobile/components/screens/search.tsx b/packages/app-mobile/components/screens/search.tsx index bcbc76a710..16d3df48c1 100644 --- a/packages/app-mobile/components/screens/search.tsx +++ b/packages/app-mobile/components/screens/search.tsx @@ -190,7 +190,7 @@ class SearchScreenComponent extends BaseScreenComponent { onPress={() => this.clearButton_press()} accessibilityLabel={_('Clear')} > - + diff --git a/packages/app-mobile/components/side-menu-content.tsx b/packages/app-mobile/components/side-menu-content.tsx index bacd89bbe4..e9422fb063 100644 --- a/packages/app-mobile/components/side-menu-content.tsx +++ b/packages/app-mobile/components/side-menu-content.tsx @@ -421,15 +421,15 @@ const SideMenuContentComponent = (props: Props) => { 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) { - 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')); @@ -451,7 +451,7 @@ const SideMenuContentComponent = (props: Props) => { if (resourceFetcherText) fullReport.push(resourceFetcherText); 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) { items.push( @@ -480,11 +480,11 @@ const SideMenuContentComponent = (props: Props) => { // using padding. So instead creating blank elements for padding bottom and top. items.push(); - 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(renderSidebarButton('folder_header', _('Notebooks'), 'md-folder')); + items.push(renderSidebarButton('folder_header', _('Notebooks'), 'folder')); if (props.folders.length) { const result = shared.renderFolders(props, renderFolderItem, false);