update markdown icon, organize file type icons, bring FileTree up-to-…

…date with the available file type icons
PRIArobotics · Oct 15, 2020 · d162d92 · d162d92
1 parent 35e584e
commit d162d92
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/src/components/ide/FileTree/FileMenu.js b/src/components/ide/FileTree/FileMenu.js
@@ -12,7 +12,7 @@ import {
   FolderIcon,
   LanguageBlocklyIcon,
   LanguageJavascriptIcon,
-  LanguageMarkdownIcon,
+  MarkdownFileIcon,
   MetadataPluginsIcon,
   MetadataAssetsIcon,
   MetadataLayoutIcon,
@@ -303,7 +303,7 @@ class FileMenu extends React.Component<PropTypes, StateTypes> {
                         key="create_md_file"
                         titleMsg={messages.createMarkdownFile}
                         onClick={() => this.handleCreate({ type: 'FILE', extension: '.md' })}
-                        icon={LanguageMarkdownIcon}
+                        icon={MarkdownFileIcon}
                       />,
                     ]),
                 <Divider key="divider-directory" />,

diff --git a/src/components/ide/FileTree/FileTree.js b/src/components/ide/FileTree/FileTree.js
@@ -9,11 +9,14 @@ import sRcTree from 'rc-tree/assets/index.css';
 
 import {
   FileIcon,
-  ImageFileIcon,
   FolderIcon,
   FolderOpenIcon,
   LanguageBlocklyIcon,
   LanguageJavascriptIcon,
+  LanguagePythonIcon,
+  ImageFileIcon,
+  MarkdownFileIcon,
+  PdfFileIcon,
   MetadataPluginsIcon,
   MetadataAssetsIcon,
   MetadataLayoutIcon,
@@ -213,7 +216,10 @@ function FileTree({ files, expandedKeys, filter, onFileAction, onUpdate }: Props
           return MetadataPluginsIcon;
         if (file.name.endsWith('.blockly')) return LanguageBlocklyIcon;
         if (file.name.endsWith('.js')) return LanguageJavascriptIcon;
-        if (file.name.endsWith('.png') || file.name.endsWith('.jpg')) return ImageFileIcon;
+        if (file.name.endsWith('.py')) return LanguagePythonIcon;
+        if (file.name.endsWith('.png') || file.name.endsWith('.jpg') || file.name.endsWith('.svg')) return ImageFileIcon;
+        if (file.name.endsWith('.md')) return MarkdownFileIcon;
+        if (file.name.endsWith('.pdf')) return PdfFileIcon;
         return FileIcon;
       } else {
         if (isExpanded) return FolderOpenIcon;

diff --git a/src/components/ide/Markdown/Markdown.js b/src/components/ide/Markdown/Markdown.js
@@ -10,7 +10,7 @@ import MDEditor, { commands } from '@uiw/react-md-editor';
 // $FlowExpectError
 import md_s from '@uiw/react-md-editor/dist/markdown-editor.css';
 
-import { LanguageMarkdownIcon } from '../../misc/palette';
+import { MarkdownFileIcon } from '../../misc/palette';
 import * as hooks from '../../misc/hooks';
 
 import s from './Markdown.scss';
@@ -110,7 +110,7 @@ function Markdown({ layoutNode, project, path, assets, mode, onUpdate }: Props)
               <div className={s.previewToolbar}>
                 <Tooltip title="Edit">
                   <IconButton size="small" onClick={() => onUpdate({ mode: 'edit' })}>
-                    <LanguageMarkdownIcon />
+                    <MarkdownFileIcon />
                   </IconButton>
                 </Tooltip>
               </div>

diff --git a/src/components/misc/palette.js b/src/components/misc/palette.js
@@ -30,15 +30,18 @@ import MenuIcon from 'mdi-material-ui/DotsVertical';
 
 // files: general
 import FileIcon from 'mdi-material-ui/File';
-import ImageFileIcon from 'mdi-material-ui/Image';
 import FolderIcon from 'mdi-material-ui/Folder';
 import FolderOpenIcon from 'mdi-material-ui/FolderOpen';
 
 // files: code
 import LanguageBlocklyIcon from 'mdi-material-ui/Widgets';
 import LanguageJavascriptIcon from 'mdi-material-ui/LanguageJavascript';
 import LanguagePythonIcon from 'mdi-material-ui/LanguagePython';
-import LanguageMarkdownIcon from 'mdi-material-ui/FileDocument';
+
+// files: other file types
+import ImageFileIcon from 'mdi-material-ui/Image';
+import MarkdownFileIcon from 'mdi-material-ui/LanguageMarkdown';
+import PdfFileIcon from 'mdi-material-ui/FilePdf';
 
 // files: metadata
 import MetadataPluginsIcon from 'mdi-material-ui/ToyBrick';
@@ -105,13 +108,14 @@ import ExitToAppIcon from 'mdi-material-ui/ExitToApp';
 export {
   MenuIcon,
   FileIcon,
-  ImageFileIcon,
   FolderIcon,
   FolderOpenIcon,
   LanguageBlocklyIcon,
   LanguageJavascriptIcon,
   LanguagePythonIcon,
-  LanguageMarkdownIcon,
+  ImageFileIcon,
+  MarkdownFileIcon,
+  PdfFileIcon,
   MetadataPluginsIcon,
   MetadataAssetsIcon,
   MetadataLayoutIcon,