refactor: percentage branded type with controls

Signed-off-by: Adam Setch <[email protected]>

Author: setchy

src/renderer/utils/notifications/sound.test.ts

@@ -2,6 +2,8 @@ import type { Percentage } from '../../types';
 import {
   canDecreaseVolume,
   canIncreaseVolume,
+  decreaseVolume,
+  increaseVolume,
   volumePercentageToLevel,
 } from './sound';
 
@@ -19,10 +21,24 @@ describe('renderer/utils/notifications/sound.ts', () => {
     expect(canDecreaseVolume(100 as Percentage)).toBe(true);
   });
 
+  it('should decrease volume by step amount', () => {
+    expect(decreaseVolume(100 as Percentage)).toBe(90);
+    expect(decreaseVolume(50 as Percentage)).toBe(40);
+    expect(decreaseVolume(0 as Percentage)).toBe(0);
+    expect(decreaseVolume(-10 as Percentage)).toBe(0);
+  });
+
   it('can increase volume percentage', () => {
     expect(canIncreaseVolume(10 as Percentage)).toBe(true);
     expect(canIncreaseVolume(90 as Percentage)).toBe(true);
     expect(canIncreaseVolume(100 as Percentage)).toBe(false);
     expect(canIncreaseVolume(110 as Percentage)).toBe(false);
   });
+
+  it('should increase volume by step amount', () => {
+    expect(increaseVolume(0 as Percentage)).toBe(10);
+    expect(increaseVolume(50 as Percentage)).toBe(60);
+    expect(increaseVolume(100 as Percentage)).toBe(100);
+    expect(increaseVolume(110 as Percentage)).toBe(100);
+  });
 });

src/renderer/utils/notifications/sound.ts

@@ -19,6 +19,20 @@ export function volumePercentageToLevel(percentage: Percentage): number {
   return percentage / 100;
 }
 
+/**
+ * Returns true if can decrease volume percentage further
+ */
+export function canDecreaseVolume(volumePercentage: Percentage) {
+  return volumePercentage - VOLUME_STEP >= MINIMUM_VOLUME_PERCENTAGE;
+}
+
+/**
+ * Returns true if can increase volume percentage further
+ */
+export function canIncreaseVolume(volumePercentage: Percentage) {
+  return volumePercentage + VOLUME_STEP <= MAXIMUM_VOLUME_PERCENTAGE;
+}
+
 /**
  * Decrease volume by step amount
  */
@@ -27,7 +41,7 @@ export function decreaseVolume(volume: Percentage) {
     return volume - VOLUME_STEP;
   }
 
-  return volume;
+  return MINIMUM_VOLUME_PERCENTAGE;
 }
 
 /**
@@ -38,19 +52,5 @@ export function increaseVolume(volume: Percentage) {
     return volume + VOLUME_STEP;
   }
 
-  return volume;
-}
-
-/**
- * Returns true if can increase volume percentage further
- */
-export function canIncreaseVolume(volumePercentage: Percentage) {
-  return volumePercentage + VOLUME_STEP <= MAXIMUM_VOLUME_PERCENTAGE;
-}
-
-/**
- * Returns true if can decrease volume percentage further
- */
-export function canDecreaseVolume(volumePercentage: Percentage) {
-  return volumePercentage - VOLUME_STEP >= MINIMUM_VOLUME_PERCENTAGE;
+  return MAXIMUM_VOLUME_PERCENTAGE;
 }

src/renderer/utils/zoom.ts

@@ -36,6 +36,20 @@ export function zoomLevelToPercentage(zoom: number): Percentage {
     RECOMMENDED_ZOOM_PERCENTAGE) as Percentage;
 }
 
+/**
+ * Returns true if can decrease zoom percentage further
+ */
+export function canDecreaseZoom(zoomPercentage: Percentage) {
+  return zoomPercentage - ZOOM_STEP >= MINIMUM_ZOOM_PERCENTAGE;
+}
+
+/**
+ * Returns true if can increase zoom percentage further
+ */
+export function canIncreaseZoom(zoomPercentage: Percentage) {
+  return zoomPercentage + ZOOM_STEP <= MAXIMUM_ZOOM_PERCENTAGE;
+}
+
 /**
  * Decrease zoom by step amount
  */
@@ -57,17 +71,3 @@ export function increaseZoom(zoomPercentage: Percentage) {
     );
   }
 }
-
-/**
- * Returns true if can increase zoom percentage further
- */
-export function canIncreaseZoom(zoomPercentage: Percentage) {
-  return zoomPercentage + ZOOM_STEP <= MAXIMUM_ZOOM_PERCENTAGE;
-}
-
-/**
- * Returns true if can decrease zoom percentage further
- */
-export function canDecreaseZoom(zoomPercentage: Percentage) {
-  return zoomPercentage - ZOOM_STEP >= MINIMUM_ZOOM_PERCENTAGE;
-}