From 1da5808503afd170908ce1a85497d22c563f93b3 Mon Sep 17 00:00:00 2001
From: Jessie Keck <jessie.keck@gmail.com>
Date: Mon, 25 Feb 2019 14:40:05 -0800
Subject: [PATCH] Update existing icons to be Sharp versions.
---
__tests__/src/components/WindowTopBar.test.js | 2 +-
__tests__/src/components/WindowTopMenuButton.test.js | 2 +-
__tests__/src/components/WorkspaceAddButton.test.js | 6 +++---
src/components/CompanionWindow.js | 2 +-
src/components/ManifestListItemError.js | 2 +-
src/components/ViewerNavigation.js | 7 +++----
src/components/WindowSideBarButtons.js | 2 +-
src/components/WindowSideBarPanel.js | 2 +-
src/components/WindowThumbnailSettings.js | 4 ++--
src/components/WindowTopBar.js | 4 ++--
src/components/WindowTopMenuButton.js | 2 +-
src/components/WindowViewSettings.js | 4 ++--
src/components/WorkspaceAdd.js | 4 ++--
src/components/WorkspaceAddButton.js | 6 +++---
src/components/WorkspaceFullScreenButton.js | 2 +-
src/components/WorkspaceMenu.js | 4 ++--
src/components/WorkspaceMenuButton.js | 2 +-
src/components/ZoomControls.js | 4 ++--
18 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/__tests__/src/components/WindowTopBar.test.js b/__tests__/src/components/WindowTopBar.test.js
index d2ac3dc29..7a50a7c62 100644
--- a/__tests__/src/components/WindowTopBar.test.js
+++ b/__tests__/src/components/WindowTopBar.test.js
@@ -3,7 +3,7 @@ import { shallow } from 'enzyme';
import Typography from '@material-ui/core/Typography';
import IconButton from '@material-ui/core/IconButton';
-import MenuIcon from '@material-ui/icons/Menu';
+import MenuIcon from '@material-ui/icons/MenuSharp';
import Toolbar from '@material-ui/core/Toolbar';
import AppBar from '@material-ui/core/AppBar';
diff --git a/__tests__/src/components/WindowTopMenuButton.test.js b/__tests__/src/components/WindowTopMenuButton.test.js
index 498a65f0d..e4848f5a7 100644
--- a/__tests__/src/components/WindowTopMenuButton.test.js
+++ b/__tests__/src/components/WindowTopMenuButton.test.js
@@ -1,7 +1,7 @@
import React from 'react';
import { shallow } from 'enzyme';
import IconButton from '@material-ui/core/IconButton';
-import MoreVertIcon from '@material-ui/icons/MoreVert';
+import MoreVertIcon from '@material-ui/icons/MoreVertSharp';
import WindowTopMenu from '../../../src/containers/WindowTopMenu';
import { WindowTopMenuButton } from '../../../src/components/WindowTopMenuButton';
diff --git a/__tests__/src/components/WorkspaceAddButton.test.js b/__tests__/src/components/WorkspaceAddButton.test.js
index 2e1df73ef..9d20b9fd0 100644
--- a/__tests__/src/components/WorkspaceAddButton.test.js
+++ b/__tests__/src/components/WorkspaceAddButton.test.js
@@ -1,8 +1,8 @@
import React from 'react';
import { shallow } from 'enzyme';
import Fab from '@material-ui/core/Fab';
-import AddIcon from '@material-ui/icons/Add';
-import ClearIcon from '@material-ui/icons/Clear';
+import AddIcon from '@material-ui/icons/AddSharp';
+import CloseIcon from '@material-ui/icons/CloseSharp';
import { WorkspaceAddButton } from '../../../src/components/WorkspaceAddButton';
/** create wrapper */
@@ -31,7 +31,7 @@ describe('WorkspaceAddButton', () => {
const setWorkspaceAddVisibility = jest.fn();
const wrapper = createWrapper({ isWorkspaceAddVisible: true, setWorkspaceAddVisibility });
- expect(wrapper.find(ClearIcon).length).toBe(1);
+ expect(wrapper.find(CloseIcon).length).toBe(1);
wrapper.find(Fab).simulate('click');
expect(setWorkspaceAddVisibility).toHaveBeenCalledWith(false);
diff --git a/src/components/CompanionWindow.js b/src/components/CompanionWindow.js
index 5ec80ef2d..95d064f7d 100644
--- a/src/components/CompanionWindow.js
+++ b/src/components/CompanionWindow.js
@@ -1,6 +1,6 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
-import CloseIcon from '@material-ui/icons/Close';
+import CloseIcon from '@material-ui/icons/CloseSharp';
import IconButton from '@material-ui/core/IconButton';
import Paper from '@material-ui/core/Paper';
import ns from '../config/css-ns';
diff --git a/src/components/ManifestListItemError.js b/src/components/ManifestListItemError.js
index 038427370..9488ad293 100644
--- a/src/components/ManifestListItemError.js
+++ b/src/components/ManifestListItemError.js
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import Button from '@material-ui/core/Button';
-import ErrorIcon from '@material-ui/icons/ErrorOutline';
+import ErrorIcon from '@material-ui/icons/ErrorOutlineSharp';
import Grid from '@material-ui/core/Grid';
import Typography from '@material-ui/core/Typography';
diff --git a/src/components/ViewerNavigation.js b/src/components/ViewerNavigation.js
index 3d5ed7a06..f3272c3b7 100644
--- a/src/components/ViewerNavigation.js
+++ b/src/components/ViewerNavigation.js
@@ -1,7 +1,6 @@
import React, { Component } from 'react';
import IconButton from '@material-ui/core/IconButton';
-import ChevronLeftIcon from '@material-ui/icons/ChevronLeft';
-import ChevronRightIcon from '@material-ui/icons/ChevronRight';
+import NavigationIcon from '@material-ui/icons/PlayCircleOutlineSharp';
import PropTypes from 'prop-types';
import ns from '../config/css-ns';
@@ -56,14 +55,14 @@ export class ViewerNavigation extends Component {
disabled={!this.hasPreviousCanvas()}
onClick={this.previousCanvas}
>
- <ChevronLeftIcon />
+ <NavigationIcon style={{ transform: 'rotate(180deg)' }} />
</IconButton>
<IconButton
className={ns('next-canvas-button')}
disabled={!this.hasNextCanvas()}
onClick={this.nextCanvas}
>
- <ChevronRightIcon />
+ <NavigationIcon />
</IconButton>
</div>
);
diff --git a/src/components/WindowSideBarButtons.js b/src/components/WindowSideBarButtons.js
index 80ba4886c..6eb26ea7c 100644
--- a/src/components/WindowSideBarButtons.js
+++ b/src/components/WindowSideBarButtons.js
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import IconButton from '@material-ui/core/IconButton';
-import InfoIcon from '@material-ui/icons/Info';
+import InfoIcon from '@material-ui/icons/InfoSharp';
import ListIcon from '@material-ui/icons/FormatAlignJustify';
/**
diff --git a/src/components/WindowSideBarPanel.js b/src/components/WindowSideBarPanel.js
index 659e484d6..d7d94b624 100644
--- a/src/components/WindowSideBarPanel.js
+++ b/src/components/WindowSideBarPanel.js
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import IconButton from '@material-ui/core/IconButton';
-import OpenInNewIcon from '@material-ui/icons/OpenInNew';
+import OpenInNewIcon from '@material-ui/icons/OpenInNewSharp';
import WindowSideBarInfoPanel from '../containers/WindowSideBarInfoPanel';
import WindowSideBarCanvasPanel from '../containers/WindowSideBarCanvasPanel';
diff --git a/src/components/WindowThumbnailSettings.js b/src/components/WindowThumbnailSettings.js
index 7f2a84520..7ed18f974 100644
--- a/src/components/WindowThumbnailSettings.js
+++ b/src/components/WindowThumbnailSettings.js
@@ -3,7 +3,7 @@ import FormControlLabel from '@material-ui/core/FormControlLabel';
import Radio from '@material-ui/core/Radio';
import RadioGroup from '@material-ui/core/RadioGroup';
import Typography from '@material-ui/core/Typography';
-import CancelPresentationIcon from '@material-ui/icons/CancelPresentation';
+import ThumbnailsOffIcon from '@material-ui/icons/CropDinSharp';
import VideoLabelIcon from '@material-ui/icons/VideoLabel';
import PropTypes from 'prop-types';
@@ -42,7 +42,7 @@ export class WindowThumbnailSettings extends Component {
<RadioGroup aria-label={t('position')} name="position" value={thumbnailNavigationPosition} onChange={this.handleChange} row>
<FormControlLabel
value="off"
- control={<Radio color="primary" icon={<CancelPresentationIcon />} checkedIcon={<CancelPresentationIcon />} />}
+ control={<Radio color="primary" icon={<ThumbnailsOffIcon />} checkedIcon={<ThumbnailsOffIcon />} />}
label={t('off')}
labelPlacement="bottom"
/>
diff --git a/src/components/WindowTopBar.js b/src/components/WindowTopBar.js
index bab19df9f..1eb134694 100644
--- a/src/components/WindowTopBar.js
+++ b/src/components/WindowTopBar.js
@@ -2,8 +2,8 @@ import React, { Component } from 'react';
import PropTypes from 'prop-types';
import Typography from '@material-ui/core/Typography';
import IconButton from '@material-ui/core/IconButton';
-import MenuIcon from '@material-ui/icons/Menu';
-import CloseIcon from '@material-ui/icons/Close';
+import MenuIcon from '@material-ui/icons/MenuSharp';
+import CloseIcon from '@material-ui/icons/CloseSharp';
import Toolbar from '@material-ui/core/Toolbar';
import AppBar from '@material-ui/core/AppBar';
import classNames from 'classnames';
diff --git a/src/components/WindowTopMenuButton.js b/src/components/WindowTopMenuButton.js
index 4af5dc32d..52ca4e0b1 100644
--- a/src/components/WindowTopMenuButton.js
+++ b/src/components/WindowTopMenuButton.js
@@ -1,6 +1,6 @@
import React, { Component } from 'react';
import IconButton from '@material-ui/core/IconButton';
-import MoreVertIcon from '@material-ui/icons/MoreVert';
+import MoreVertIcon from '@material-ui/icons/MoreVertSharp';
import PropTypes from 'prop-types';
import WindowTopMenu from '../containers/WindowTopMenu';
diff --git a/src/components/WindowViewSettings.js b/src/components/WindowViewSettings.js
index 61f5d899e..f2efa7015 100644
--- a/src/components/WindowViewSettings.js
+++ b/src/components/WindowViewSettings.js
@@ -3,7 +3,7 @@ import FormControlLabel from '@material-ui/core/FormControlLabel';
import Radio from '@material-ui/core/Radio';
import RadioGroup from '@material-ui/core/RadioGroup';
import Typography from '@material-ui/core/Typography';
-import PhotoIcon from '@material-ui/icons/Photo';
+import SingleIcon from '@material-ui/icons/CropOriginalSharp';
import ViewAgendaIcon from '@material-ui/icons/ViewAgenda';
import PropTypes from 'prop-types';
@@ -42,7 +42,7 @@ export class WindowViewSettings extends Component {
<RadioGroup aria-label={t('position')} name="position" value={windowViewType} onChange={this.handleChange} row>
<FormControlLabel
value="single"
- control={<Radio color="primary" icon={<PhotoIcon />} checkedIcon={<PhotoIcon />} />}
+ control={<Radio color="primary" icon={<SingleIcon />} checkedIcon={<SingleIcon />} />}
label={t('single')}
labelPlacement="bottom"
/>
diff --git a/src/components/WorkspaceAdd.js b/src/components/WorkspaceAdd.js
index 8be99d002..20c8c96bf 100644
--- a/src/components/WorkspaceAdd.js
+++ b/src/components/WorkspaceAdd.js
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
-import AddIcon from '@material-ui/icons/Add';
-import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
+import AddIcon from '@material-ui/icons/AddSharp';
+import ExpandMoreIcon from '@material-ui/icons/ExpandMoreSharp';
import AppBar from '@material-ui/core/AppBar';
import Drawer from '@material-ui/core/Drawer';
import Fab from '@material-ui/core/Fab';
diff --git a/src/components/WorkspaceAddButton.js b/src/components/WorkspaceAddButton.js
index 12dd32b86..9fe12fef2 100644
--- a/src/components/WorkspaceAddButton.js
+++ b/src/components/WorkspaceAddButton.js
@@ -2,8 +2,8 @@ import React, { Component } from 'react';
import PropTypes from 'prop-types';
import ListItem from '@material-ui/core/ListItem';
import Fab from '@material-ui/core/Fab';
-import AddIcon from '@material-ui/icons/Add';
-import ClearIcon from '@material-ui/icons/Clear';
+import AddIcon from '@material-ui/icons/AddSharp';
+import CloseIcon from '@material-ui/icons/CloseSharp';
/**
*/
@@ -27,7 +27,7 @@ export class WorkspaceAddButton extends Component {
>
{
isWorkspaceAddVisible
- ? <ClearIcon />
+ ? <CloseIcon />
: <AddIcon />
}
</Fab>
diff --git a/src/components/WorkspaceFullScreenButton.js b/src/components/WorkspaceFullScreenButton.js
index 008de38d3..0f12ac23f 100644
--- a/src/components/WorkspaceFullScreenButton.js
+++ b/src/components/WorkspaceFullScreenButton.js
@@ -1,6 +1,6 @@
import React, { Component } from 'react';
import IconButton from '@material-ui/core/IconButton';
-import FullscreenIcon from '@material-ui/icons/Fullscreen';
+import FullscreenIcon from '@material-ui/icons/FullscreenSharp';
import ListItem from '@material-ui/core/ListItem';
import PropTypes from 'prop-types';
diff --git a/src/components/WorkspaceMenu.js b/src/components/WorkspaceMenu.js
index 361a21337..5019f94da 100644
--- a/src/components/WorkspaceMenu.js
+++ b/src/components/WorkspaceMenu.js
@@ -6,8 +6,8 @@ import ListItemIcon from '@material-ui/core/ListItemIcon';
import LoupeIcon from '@material-ui/icons/Loupe';
import MenuItem from '@material-ui/core/MenuItem';
import Typography from '@material-ui/core/Typography';
-import SaveAltIcon from '@material-ui/icons/SaveAlt';
-import SettingsIcon from '@material-ui/icons/Settings';
+import SaveAltIcon from '@material-ui/icons/SaveAltSharp';
+import SettingsIcon from '@material-ui/icons/SettingsSharp';
import ViewHeadlineIcon from '@material-ui/icons/ViewHeadline';
import PropTypes from 'prop-types';
import LanguageSettings from '../containers/LanguageSettings';
diff --git a/src/components/WorkspaceMenuButton.js b/src/components/WorkspaceMenuButton.js
index 43948b517..56b831769 100644
--- a/src/components/WorkspaceMenuButton.js
+++ b/src/components/WorkspaceMenuButton.js
@@ -1,6 +1,6 @@
import React, { Component } from 'react';
import IconButton from '@material-ui/core/IconButton';
-import MenuIcon from '@material-ui/icons/Menu';
+import MenuIcon from '@material-ui/icons/MenuSharp';
import ListItem from '@material-ui/core/ListItem';
import PropTypes from 'prop-types';
import WorkspaceMenu from '../containers/WorkspaceMenu';
diff --git a/src/components/ZoomControls.js b/src/components/ZoomControls.js
index b50db0694..7edb63420 100644
--- a/src/components/ZoomControls.js
+++ b/src/components/ZoomControls.js
@@ -2,8 +2,8 @@ import React, { Component } from 'react';
import IconButton from '@material-ui/core/IconButton';
import List from '@material-ui/core/List';
import ListItem from '@material-ui/core/ListItem';
-import AddCircleIcon from '@material-ui/icons/AddCircle';
-import RemoveCircleIcon from '@material-ui/icons/RemoveCircle';
+import AddCircleIcon from '@material-ui/icons/AddCircleOutlineSharp';
+import RemoveCircleIcon from '@material-ui/icons/RemoveCircleOutlineSharp';
import RefreshIcon from '@material-ui/icons/Refresh';
import PropTypes from 'prop-types';
--
GitLab