From 32f35836981e7d653454ead16e482463c44b95f7 Mon Sep 17 00:00:00 2001
From: Marquis Kurt <software@marquiskurt.net>
Date: Sun, 28 Apr 2019 12:46:26 -0400
Subject: [PATCH 1/4] Add icons to Settings options (depends on #14 before
 close)

---
 src/pages/Settings.tsx | 42 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/pages/Settings.tsx b/src/pages/Settings.tsx
index 76b7720..792b8cf 100644
--- a/src/pages/Settings.tsx
+++ b/src/pages/Settings.tsx
@@ -1,7 +1,8 @@
 import React, { Component } from 'react';
 import {
     List, 
-    ListItem, 
+    ListItem,
+    ListItemAvatar,
     ListItemText, 
     ListSubheader, 
     ListItemSecondaryAction, 
@@ -22,7 +23,6 @@ import {
     Theme,
     Typography
 } from '@material-ui/core';
-import OpenInNewIcon from '@material-ui/icons/OpenInNew';
 import {styles} from './PageLayout.styles';
 import {setUserDefaultBool, getUserDefaultBool, getUserDefaultTheme, setUserDefaultTheme, getUserDefaultVisibility, setUserDefaultVisibility} from '../utilities/settings';
 import {canSendNotifications, browserSupportsNotificationRequests} from '../utilities/notifications';
@@ -31,6 +31,17 @@ import ThemePreview from '../components/ThemePreview';
 import {setHyperspaceTheme, getHyperspaceTheme} from '../utilities/themes';
 import { Visibility } from '../types/Visibility';
 
+import OpenInNewIcon from '@material-ui/icons/OpenInNew';
+import DevicesIcon from '@material-ui/icons/Devices';
+import Brightness3Icon from '@material-ui/icons/Brightness3';
+import PaletteIcon from '@material-ui/icons/Palette';
+import MastodonIcon from 'mdi-material-ui/Mastodon';
+import VisibilityIcon from '@material-ui/icons/Visibility';
+import NotificationsIcon from '@material-ui/icons/Notifications';
+import NotificationActiveIcon from '@material-ui/icons/NotificationsActive';
+import RefreshIcon from '@material-ui/icons/Refresh';
+import UndoIcon from '@material-ui/icons/Undo';
+
 interface ISettingsState {
     darkModeEnabled: boolean;
     systemDecidesDarkMode: boolean;
@@ -281,6 +292,9 @@ class SettingsPage extends Component<any, ISettingsState> {
                 <Paper className={classes.pageListConstraints}>
                     <List>
                         <ListItem>
+                            <ListItemAvatar>
+                                <DevicesIcon color="action"/>
+                            </ListItemAvatar>
                             <ListItemText primary="Match system appearance" secondary="Obey light/dark theme from your system"/>
                             <ListItemSecondaryAction>
                                 <Switch 
@@ -290,6 +304,9 @@ class SettingsPage extends Component<any, ISettingsState> {
                             </ListItemSecondaryAction>
                         </ListItem>
                         <ListItem>
+                            <ListItemAvatar>
+                                <Brightness3Icon color="action"/>
+                            </ListItemAvatar>
                             <ListItemText primary="Dark mode" secondary="Toggles light or dark theme"/>
                             <ListItemSecondaryAction>
                                 <Switch
@@ -300,6 +317,9 @@ class SettingsPage extends Component<any, ISettingsState> {
                             </ListItemSecondaryAction>
                         </ListItem>
                         <ListItem>
+                            <ListItemAvatar>
+                                <PaletteIcon color="action"/>
+                            </ListItemAvatar>
                             <ListItemText primary="Interface theme" secondary="The color palette used for the interface"/>
                             <ListItemSecondaryAction>
                                 <Button onClick={this.toggleThemeDialog}>
@@ -314,6 +334,9 @@ class SettingsPage extends Component<any, ISettingsState> {
                 <Paper className={classes.pageListConstraints}>
                     <List>
                         <ListItem>
+                            <ListItemAvatar>
+                                <MastodonIcon color="action"/>
+                            </ListItemAvatar>
                             <ListItemText primary="Configure on Mastodon"/>
                             <ListItemSecondaryAction>
                                 <IconButton href={(localStorage.getItem("baseurl") as string) + "/settings/preferences"} target="_blank" rel="noreferrer">
@@ -328,6 +351,9 @@ class SettingsPage extends Component<any, ISettingsState> {
                 <Paper className={classes.pageListConstraints}>
                     <List>
                         <ListItem>
+                            <ListItemAvatar>
+                                <VisibilityIcon color="action"/>
+                            </ListItemAvatar>
                             <ListItemText primary="Default visibility" secondary="New posts in composer will use this visiblity"/>
                             <ListItemSecondaryAction>
                                 <Button onClick={this.toggleVisibilityDialog}>
@@ -342,6 +368,9 @@ class SettingsPage extends Component<any, ISettingsState> {
                 <Paper className={classes.pageListConstraints}>
                     <List>
                         <ListItem>
+                            <ListItemAvatar>
+                                <NotificationsIcon color="action"/>
+                            </ListItemAvatar>
                             <ListItemText 
                                 primary="Enable push notifications"
                                 secondary={
@@ -361,6 +390,9 @@ class SettingsPage extends Component<any, ISettingsState> {
                             </ListItemSecondaryAction>
                         </ListItem>
                         <ListItem>
+                            <ListItemAvatar>
+                                <NotificationActiveIcon color="action"/>
+                            </ListItemAvatar>
                             <ListItemText 
                                 primary="Notification badge counts all notifications"
                                 secondary={
@@ -381,6 +413,9 @@ class SettingsPage extends Component<any, ISettingsState> {
                 <Paper className={classes.pageListConstraints}>
                     <List>
                         <ListItem>
+                            <ListItemAvatar>
+                                <RefreshIcon color="action"/>
+                            </ListItemAvatar>
                             <ListItemText primary="Refresh settings" secondary="Reset the settings to defaults."/>
                             <ListItemSecondaryAction>
                                 <Button onClick={() => this.toggleResetSettingsDialog()}>
@@ -389,6 +424,9 @@ class SettingsPage extends Component<any, ISettingsState> {
                             </ListItemSecondaryAction>
                         </ListItem>
                         <ListItem>
+                            <ListItemAvatar>
+                                <UndoIcon color="action"/>
+                            </ListItemAvatar>
                             <ListItemText primary="Reset Hyperspace" secondary="Deletes all data and resets the app"/>
                             <ListItemSecondaryAction>
                                 <Button onClick={() => this.toggleResetDialog()}>

From 8529b51c0586d645b8fabc81bb73c56df97a085f Mon Sep 17 00:00:00 2001
From: Marquis Kurt <software@marquiskurt.net>
Date: Tue, 30 Apr 2019 12:02:39 -0400
Subject: [PATCH 2/4] Add missing mdi-material-ui dep to package.json

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index b62db8d..a918b30 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
     "emoji-mart": "^2.8.2",
     "file-dialog": "^0.0.7",
     "material-ui-pickers": "^2.2.4",
+    "mdi-material-ui": "^5.11.0",
     "megalodon": "^0.6.3",
     "moment": "^2.24.0",
     "notistack": "^0.5.1",

From d54f573b6460ca32ef75a0a3d404004fbea44606 Mon Sep 17 00:00:00 2001
From: Marquis Kurt <software@marquiskurt.net>
Date: Fri, 3 May 2019 14:23:22 -0400
Subject: [PATCH 3/4] Change to Bell Alert icon

---
 src/pages/Settings.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Settings.tsx b/src/pages/Settings.tsx
index d80606f..04e70ce 100644
--- a/src/pages/Settings.tsx
+++ b/src/pages/Settings.tsx
@@ -39,7 +39,7 @@ import PaletteIcon from '@material-ui/icons/Palette';
 import MastodonIcon from 'mdi-material-ui/Mastodon';
 import VisibilityIcon from '@material-ui/icons/Visibility';
 import NotificationsIcon from '@material-ui/icons/Notifications';
-import NotificationActiveIcon from '@material-ui/icons/NotificationsActive';
+import BellAlertIcon from 'mdi-material-ui/BellAlert';
 import RefreshIcon from '@material-ui/icons/Refresh';
 import UndoIcon from '@material-ui/icons/Undo';
 
@@ -419,7 +419,7 @@ class SettingsPage extends Component<any, ISettingsState> {
                         </ListItem>
                         <ListItem>
                             <ListItemAvatar>
-                                <NotificationActiveIcon color="action"/>
+                                <BellAlertIcon color="action"/>
                             </ListItemAvatar>
                             <ListItemText 
                                 primary="Notification badge counts all notifications"

From b69e8ef220c4818105166480043610762c1560ff Mon Sep 17 00:00:00 2001
From: Marquis Kurt <software@marquiskurt.net>
Date: Fri, 3 May 2019 14:25:40 -0400
Subject: [PATCH 4/4] Fix account icons

---
 src/pages/Settings.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/Settings.tsx b/src/pages/Settings.tsx
index 04e70ce..cd4a981 100644
--- a/src/pages/Settings.tsx
+++ b/src/pages/Settings.tsx
@@ -36,6 +36,7 @@ import OpenInNewIcon from '@material-ui/icons/OpenInNew';
 import DevicesIcon from '@material-ui/icons/Devices';
 import Brightness3Icon from '@material-ui/icons/Brightness3';
 import PaletteIcon from '@material-ui/icons/Palette';
+import AccountEditIcon from 'mdi-material-ui/AccountEdit';
 import MastodonIcon from 'mdi-material-ui/Mastodon';
 import VisibilityIcon from '@material-ui/icons/Visibility';
 import NotificationsIcon from '@material-ui/icons/Notifications';
@@ -357,7 +358,7 @@ class SettingsPage extends Component<any, ISettingsState> {
                     <List>
                         <ListItem>
                             <ListItemAvatar>
-                                <MastodonIcon color="action"/>
+                                <AccountEditIcon color="action"/>
                             </ListItemAvatar>
                             <ListItemText primary="Edit your profile" secondary="Change your bio, display name, and images"/>
                             <ListItemSecondaryAction>
@@ -365,6 +366,9 @@ class SettingsPage extends Component<any, ISettingsState> {
                             </ListItemSecondaryAction>
                         </ListItem>
                         <ListItem>
+                            <ListItemAvatar>
+                                <MastodonIcon color="action"/>
+                            </ListItemAvatar>
                             <ListItemText primary="Configure on Mastodon"/>
                             <ListItemSecondaryAction>
                                 <IconButton href={(localStorage.getItem("baseurl") as string) + "/settings/preferences"} target="_blank" rel="noreferrer">