From 08e511cecb935962fd51e44b4f52093df8742699 Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Tue, 6 Feb 2024 13:22:42 -0600
Subject: [PATCH] Fix doodle modal icons (#2597)

---
 .../glitch/features/ui/components/doodle_modal.jsx   | 12 ++++++++----
 .../material-icons/400-24px/colors-fill.svg          |  1 +
 app/javascript/material-icons/400-24px/colors.svg    |  1 +
 app/javascript/material-icons/400-24px/undo-fill.svg |  1 +
 app/javascript/material-icons/400-24px/undo.svg      |  1 +
 5 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 app/javascript/material-icons/400-24px/colors-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/colors.svg
 create mode 100644 app/javascript/material-icons/400-24px/undo-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/undo.svg

diff --git a/app/javascript/flavours/glitch/features/ui/components/doodle_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/doodle_modal.jsx
index d682ef161d..ba593fc9fc 100644
--- a/app/javascript/flavours/glitch/features/ui/components/doodle_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/doodle_modal.jsx
@@ -9,6 +9,10 @@ import { connect } from 'react-redux';
 import Atrament from 'atrament'; // the doodling library
 import { debounce, mapValues } from 'lodash';
 
+import ColorsIcon from '@/material-icons/400-24px/colors.svg?react';
+import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
+import UndoIcon from '@/material-icons/400-24px/undo.svg?react';
 import { doodleSet, uploadCompose } from 'flavours/glitch/actions/compose';
 import { Button } from 'flavours/glitch/components/button';
 import { IconButton } from 'flavours/glitch/components/icon_button';
@@ -584,10 +588,10 @@ class DoodleModal extends ImmutablePureComponent {
             </div>
           </div>
           <div className='doodle-toolbar'>
-            <IconButton icon='pencil' title='Draw' label='Draw' onClick={this.setModeDraw} size={18} active={this.mode === 'draw'} inverted />
-            <IconButton icon='bath' title='Fill' label='Fill' onClick={this.setModeFill} size={18} active={this.mode === 'fill'} inverted />
-            <IconButton icon='undo' title='Undo' label='Undo' onClick={this.undo} size={18} inverted />
-            <IconButton icon='trash' title='Clear' label='Clear' onClick={this.handleClearBtn} size={18} inverted />
+            <IconButton icon='pencil' iconComponent={EditIcon} title='Draw' label='Draw' onClick={this.setModeDraw} size={18} active={this.mode === 'draw'} inverted />
+            <IconButton icon='bath' iconComponent={ColorsIcon} title='Fill' label='Fill' onClick={this.setModeFill} size={18} active={this.mode === 'fill'} inverted />
+            <IconButton icon='undo' iconComponent={UndoIcon} title='Undo' label='Undo' onClick={this.undo} size={18} inverted />
+            <IconButton icon='trash' iconComponent={DeleteIcon} title='Clear' label='Clear' onClick={this.handleClearBtn} size={18} inverted />
           </div>
           <div className='doodle-palette'>
             {
diff --git a/app/javascript/material-icons/400-24px/colors-fill.svg b/app/javascript/material-icons/400-24px/colors-fill.svg
new file mode 100644
index 0000000000..5e4b534fe2
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/colors-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M346-140 100-386q-10-10-15-22t-5-25q0-13 5-25t15-22l230-229-106-106 62-65 400 400q10 10 14.5 22t4.5 25q0 13-4.5 25T686-386L440-140q-10 10-22 15t-25 5q-13 0-25-5t-22-15Zm47-506L179-432h428L393-646Zm399 526q-36 0-61-25.5T706-208q0-27 13.5-51t30.5-47l42-54 44 54q16 23 30 47t14 51q0 37-26 62.5T792-120Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/colors.svg b/app/javascript/material-icons/400-24px/colors.svg
new file mode 100644
index 0000000000..5e4b534fe2
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/colors.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M346-140 100-386q-10-10-15-22t-5-25q0-13 5-25t15-22l230-229-106-106 62-65 400 400q10 10 14.5 22t4.5 25q0 13-4.5 25T686-386L440-140q-10 10-22 15t-25 5q-13 0-25-5t-22-15Zm47-506L179-432h428L393-646Zm399 526q-36 0-61-25.5T706-208q0-27 13.5-51t30.5-47l42-54 44 54q16 23 30 47t14 51q0 37-26 62.5T792-120Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/undo-fill.svg b/app/javascript/material-icons/400-24px/undo-fill.svg
new file mode 100644
index 0000000000..c451e1adc7
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/undo-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M280-200v-80h284q63 0 109.5-40T720-420q0-60-46.5-100T564-560H312l104 104-56 56-200-200 200-200 56 56-104 104h252q97 0 166.5 63T800-420q0 94-69.5 157T564-200H280Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/undo.svg b/app/javascript/material-icons/400-24px/undo.svg
new file mode 100644
index 0000000000..c451e1adc7
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/undo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M280-200v-80h284q63 0 109.5-40T720-420q0-60-46.5-100T564-560H312l104 104-56 56-200-200 200-200 56 56-104 104h252q97 0 166.5 63T800-420q0 94-69.5 157T564-200H280Z"/></svg>
\ No newline at end of file