Trash options update + Android export directory

standardnotes · Mar 25, 2019 · d4769af · d4769af
1 parent f781158
commit d4769af
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 39 deletions.
diff --git a/src/lib/BackupsManager.js b/src/lib/BackupsManager.js
@@ -102,7 +102,7 @@ export default class BackupsManager {
   }
 
   async _exportAndroid(filename, data) {
-    let filepath = `${RNFS.DocumentDirectoryPath}/${filename}`;
+    let filepath = `${RNFS.ExternalDirectoryPath}/${filename}`;
     return RNFS.writeFile(filepath, data).then(() => {
       return filepath;
     })

diff --git a/src/screens/SideMenu/NoteSideMenu.js b/src/screens/SideMenu/NoteSideMenu.js
@@ -193,38 +193,35 @@ export default class NoteSideMenu extends AbstractSideMenu {
       options.push(option);
     }
 
-    return options;
-  }
-
-  buildOptionsForTrash() {
-    if(!this.note.content.trashed) {
-      return [];
+    if(this.note.content.trashed) {
+      options = options.concat([
+        {
+          text: "Restore",
+          textClass: "info",
+          key: "restore-note",
+          onSelect: () => {
+            this.runAction(ItemActionManager.RestoreEvent);
+          }
+        },
+        {
+          text: "Delete Forever",
+          textClass: "danger",
+          key: "delete-forever",
+          onSelect: () => {
+            this.runAction(ItemActionManager.DeleteEvent);
+          }
+        },
+        {
+          text: "Empty Trash",
+          textClass: "danger",
+          key: "empty trash",
+          onSelect: () => {
+            this.runAction(ItemActionManager.EmptyTrashEvent);
+          }
+        },
+      ]);
     }
 
-    let options = [
-      {
-        text: "Restore Note",
-        key: "restore-note",
-        onSelect: () => {
-          this.runAction(ItemActionManager.RestoreEvent);
-        }
-      },
-      {
-        text: "Delete Forever",
-        key: "delete-forever",
-        onSelect: () => {
-          this.runAction(ItemActionManager.DeleteEvent);
-        }
-      },
-      {
-        text: "Empty Trash",
-        key: "empty trash",
-        onSelect: () => {
-          this.runAction(ItemActionManager.EmptyTrashEvent);
-        }
-      },
-    ]
-
     return options;
   }
 
@@ -285,7 +282,6 @@ export default class NoteSideMenu extends AbstractSideMenu {
     }
 
     let noteOptions = this.buildOptionsForNoteManagement();
-    let trashOptions = this.buildOptionsForTrash();
     let editorOptions = this.buildOptionsForEditors();
     let selectedTags = this.handler.getSelectedTags();
 
@@ -296,10 +292,6 @@ export default class NoteSideMenu extends AbstractSideMenu {
 
             <SideMenuSection title="Options" options={noteOptions} />
 
-            {trashOptions.length > 0 &&
-              <SideMenuSection title="Trash" options={trashOptions} />
-            }
-
             <SideMenuSection title="Editors" options={editorOptions} collapsed={true} />
 
             <SideMenuSection title="Tags">

diff --git a/src/screens/SideMenu/SideMenuCell.js b/src/screens/SideMenu/SideMenuCell.js
@@ -68,9 +68,19 @@ export default class SideMenuCell extends ThemedComponent {
     }
   }
 
+  colorForTextClass = (textClass) => {
+    if(!textClass) {return null;}
+    return {
+      "info" : StyleKit.variables.stylekitInfoColor,
+      "danger" : StyleKit.variables.stylekitDangerColor,
+      "warning" : StyleKit.variables.stylekitWarningColor,
+    }[textClass];
+  }
+
   render() {
     let hasIcon = this.props.iconDesc;
     let iconSide = (hasIcon && this.props.iconDesc.side) ? this.props.iconDesc.side : (hasIcon ? "left" : null);
+    let textColor = this.colorForTextClass(this.props.textClass);
     return (
       <TouchableOpacity style={this.styles.cell} onPress={this.onPress} onLongPress={this.onLongPress}>
         <View style={this.styles.cellContent}>
@@ -87,7 +97,7 @@ export default class SideMenuCell extends ThemedComponent {
               <Text style={this.aggregateStyles(this.styles.subtext, this.styles.subtextSelected, this.props.selected)}>{this.props.subtext}</Text>
               </View>
             }
-            <Text style={this.aggregateStyles(this.styles.text, this.styles.textSelected, this.props.selected)}>{this.props.text}</Text>
+            <Text style={[this.aggregateStyles(this.styles.text, this.styles.textSelected, this.props.selected), (textColor ? {color: textColor} : null)]}>{this.props.text}</Text>
           </View>
 
 

diff --git a/src/screens/SideMenu/SideMenuSection.js b/src/screens/SideMenu/SideMenuSection.js
@@ -8,8 +8,8 @@ import ThemedComponent from "@Components/ThemedComponent";
 
 export default class SideMenuSection extends ThemedComponent {
 
-  static BuildOption({text, subtext, key, iconDesc, dimmed, selected, onSelect, onLongPress}) {
-    return { text, subtext, key, iconDesc, dimmed, selected, onSelect, onLongPress };
+  static BuildOption({text, subtext, textClass, key, iconDesc, dimmed, selected, onSelect, onLongPress}) {
+    return { text, subtext, textClass, key, iconDesc, dimmed, selected, onSelect, onLongPress };
   }
 
   constructor(props) {
@@ -46,6 +46,7 @@ export default class SideMenuSection extends ThemedComponent {
             {options.map((option) => {
               return <SideMenuCell
                 text={option.text}
+                textClass={option.textClass}
                 subtext={option.subtext}
                 key={option.text + option.subtext + option.key}
                 iconDesc={option.iconDesc}