chore: make timeStep modifiable

uphy · Jan 1, 2025 · d40069d · d40069d
1 parent bf8c8a8
commit d40069d
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 11 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -58,7 +58,7 @@ export default class ReminderPlugin extends Plugin {
       this.reminders
     );
     this.reminderModal = new ReminderModal(this.app, SETTINGS.useSystemNotification, SETTINGS.laters);
-    this.autoComplete = new AutoComplete(SETTINGS.autoCompleteTrigger);
+    this.autoComplete = new AutoComplete(SETTINGS.autoCompleteTrigger, SETTINGS.reminderTimeStep);
   }
 
   override async onload() {

diff --git a/src/settings.ts b/src/settings.ts
@@ -11,6 +11,7 @@ class Settings {
   settings: SettingTabModel = new SettingTabModel();
 
   reminderTime: SettingModel<string, Time>;
+  reminderTimeStep: SettingModel<number, number>;
   useSystemNotification: SettingModel<boolean, boolean>;
   laters: SettingModel<string, Array<Later>>;
   dateFormat: SettingModel<string, string>;
@@ -36,6 +37,13 @@ class Settings {
       .placeHolder("Time (hh:mm)")
       .build(new TimeSerde());
 
+    this.reminderTimeStep = this.settings.newSettingBuilder()
+      .key("reminderTimeStep")
+      .name("Reminder Time Step (minutes)")
+      .desc("Step of time for reminder time (minutes)")
+      .number(15)
+      .build(new RawSerde());
+
     this.useSystemNotification = this.settings.newSettingBuilder()
       .key("useSystemNotification")
       .name("Use system notification")
@@ -152,6 +160,7 @@ class Settings {
       .newGroup("Notification Settings")
       .addSettings(
         this.reminderTime,
+        this.reminderTimeStep,
         this.laters,
         this.useSystemNotification
       );

diff --git a/src/ui/autocomplete.ts b/src/ui/autocomplete.ts
@@ -18,7 +18,7 @@ export interface AutoCompletableEditor {
 
 export class AutoComplete {
 
-    constructor(private trigger: ReadOnlyReference<string>) { };
+    constructor(private trigger: ReadOnlyReference<string>, private timeStep: ReadOnlyReference<number>) { };
 
     isTrigger(cmEditor: CodeMirror.Editor, changeObj: CodeMirror.EditorChange) {
         const trigger = this.trigger.value;
@@ -51,10 +51,11 @@ export class AutoComplete {
                 result = v.show();
             } catch (e) {
                 // Temporary workaround for Live preview mode
-                result = showDateTimeChooserModal(app, reminders);
+                console.error(e);
+                result = showDateTimeChooserModal(app, reminders, this.timeStep.value);
             }
         } else {
-            result = showDateTimeChooserModal(app, reminders);
+            result = showDateTimeChooserModal(app, reminders, this.timeStep.value);
         }
 
         result

diff --git a/src/ui/components/DateTimeChooser.svelte b/src/ui/components/DateTimeChooser.svelte
@@ -10,7 +10,8 @@
     export let component: Component|undefined;
     export let date = moment();
     export let reminders: Reminders;
-    export let onSelect: (time: DateTime) => void;    
+    export let onSelect: (time: DateTime) => void;
+    export let timeStep = 15;
     let time = reminders.reminderTime?.value.toString() ?? "10:00";
     let timeIsFocused = false;
 
@@ -42,7 +43,7 @@
     <div class="dtchooser-wrapper">
         <div class="dtchooser-time-picker">
             <span>Time: </span>
-            <TimePicker bind:value={time} step={15} on:select={()=>{handleSelect()}} on:focus={()=>{timeIsFocused = true}} />
+            <TimePicker bind:value={time} step={timeStep} on:select={()=>{handleSelect()}} on:focus={()=>{timeIsFocused = true}} />
         </div>
         <button class="mod-cta" on:click={handleSelect}>OK</button>
     </div>

diff --git a/src/ui/date-chooser-modal.ts b/src/ui/date-chooser-modal.ts
@@ -11,7 +11,8 @@ class DateTimeChooserModal extends Modal {
         app: App,
         private reminders: Reminders,
         private onSelect: (value: DateTime) => void,
-        private onCancel: () => void
+        private onCancel: () => void,
+        private timeStep: number
     ) {
         super(app);
     }
@@ -35,7 +36,8 @@ class DateTimeChooserModal extends Modal {
                     this.select(time);
                 },
                 reminders: this.reminders,
-                component: undefined
+                component: undefined,
+                timeStep: this.timeStep
             },
         });
     }
@@ -55,9 +57,9 @@ class DateTimeChooserModal extends Modal {
 
 }
 
-export function showDateTimeChooserModal(app: App, reminders: Reminders): Promise<DateTime> {
+export function showDateTimeChooserModal(app: App, reminders: Reminders, timeStep: number = 15): Promise<DateTime> {
     return new Promise((resolve, reject) => {
-        const modal = new DateTimeChooserModal(app, reminders, resolve, reject);
+        const modal = new DateTimeChooserModal(app, reminders, resolve, reject, timeStep);
         modal.open();
     });
 }
diff --git a/src/ui/editor-extension.ts b/src/ui/editor-extension.ts
@@ -19,8 +19,9 @@ export function buildCodeMirrorPlugin(app: App, reminders: Reminders) {
                         return;
                     }
                     const trigger = SETTINGS.autoCompleteTrigger.value;
+                    const timeStep = SETTINGS.reminderTimeStep.value;
                     if (trigger === text) {
-                        showDateTimeChooserModal(app, reminders).then(value => {
+                        showDateTimeChooserModal(app, reminders, timeStep).then(value => {
                             const format = SETTINGS.primaryFormat.value.format;
                             try {
                                 const line = doc.lineAt(toB);