🐛 fix for duration label & 🔔 add notification off effect

nathanfiscus · Jan 17, 2020 · 6a4b4f4 · 6a4b4f4
1 parent 9091b8b
commit 6a4b4f4
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 19 deletions.
diff --git a/src/NotificationCalc.js b/src/NotificationCalc.js
@@ -113,21 +113,6 @@ class NotificationCalc extends React.Component {
     );
   };
 
-  durationFormater = val => {
-    switch (val) {
-      case 255:
-        return "Forever";
-      case 1:
-        return "1 second";
-      default:
-        if (val > 59) {
-          return `${Math.floor(val / 60)}${val % 60} seconds`;
-        } else {
-          return `${val} seconds`;
-        }
-    }
-  };
-
   setValue = key => (e, v) => {
     this.props.onChange(
       key,
@@ -184,7 +169,12 @@ class NotificationCalc extends React.Component {
           </Tooltip>
         </div>
         <Typography gutterBottom>Color</Typography>
-        <div className={this.props.classes.colorHelper} />
+        <div
+          className={this.props.classes.colorHelper}
+          style={{
+            filter: this.props.effect === "0" ? "grayscale(75%)" : undefined
+          }}
+        />
         <Slider
           defaultValue={1}
           aria-labelledby="discrete-slider"
@@ -194,6 +184,7 @@ class NotificationCalc extends React.Component {
           max={255}
           value={this.props.color}
           onChange={this.setValue("color")}
+          disabled={this.props.effect === "0"}
         />
 
         <Typography gutterBottom>Brightness Level</Typography>
@@ -208,6 +199,7 @@ class NotificationCalc extends React.Component {
               min={0}
               max={10}
               onChange={this.setValue("level")}
+              disabled={this.props.effect === "0"}
             />
           </Grid>
           <Grid item>
@@ -229,6 +221,7 @@ class NotificationCalc extends React.Component {
               max={255}
               onChange={this.setValue("duration")}
               ValueLabelComponent={ValueLabelTooltip}
+              disabled={this.props.effect === "0"}
             />
           </Grid>
           <Grid item>
@@ -238,7 +231,7 @@ class NotificationCalc extends React.Component {
         <FormControl fullWidth={true} margin="normal">
           <InputLabel>Effect</InputLabel>
           <Select value={this.props.effect} onChange={this.setValue("effect")}>
-            {/* <MenuItem value="0">Off</MenuItem> */}
+            <MenuItem value="0">Off (Notification Cleared)</MenuItem>
             <MenuItem
               value={
                 this.props.type === "dimmer"

diff --git a/src/ValueLabelTooltip.js b/src/ValueLabelTooltip.js
@@ -9,8 +9,22 @@ const durationFormater = val => {
     case 1:
       return "1 second";
     default:
-      if (val > 59) {
-        return `${Math.floor(val / 60)} minutes ${val % 60} seconds`;
+      if (val >= 60 && val < 120) {
+        let minutes = val === 60 ? 1 : val - 60;
+        return `${minutes} minute${minutes <= 1 ? "" : "s"}`;
+      } else if (val >= 120) {
+        let hours = val === 120 ? 1 : val - 120;
+        let days = Math.floor(hours / 24);
+        if (days > 0) {
+          hours = hours % 24;
+        }
+        if (days === 0) {
+          return `${hours} hour${hours === 1 ? "" : "s"}`;
+        } else {
+          return `${days} day${days === 1 ? "" : "s"} ${hours} hour${
+            hours === 1 ? "" : "s"
+          }`;
+        }
       } else {
         return `${val} seconds`;
       }