add setting to enable/disable tray timer

Author: Onatcer

src/main/tray.ts

@@ -71,7 +71,7 @@ function updateTimerInterval(timeEntry: TimeEntry, tray: Tray) {
 }
 
 export function registerTrayListeners(tray: Tray, mainWindow: BrowserWindow) {
-    ipcMain.on('updateTrayState', (_, serializedTimeEntry: string) => {
+    ipcMain.on('updateTrayState', (_, serializedTimeEntry: string, showTimer: boolean = true) => {
         if (serializedTimeEntry) {
             const timeEntry = JSON.parse(serializedTimeEntry) as TimeEntry
             if (timeEntry && timeEntry.start && timeEntry.start !== '') {
@@ -81,9 +81,13 @@ export function registerTrayListeners(tray: Tray, mainWindow: BrowserWindow) {
                     clearInterval(timerInterval)
                     timerInterval = undefined
                 }
-                tray.setTitle('')
-                updateTimerInterval(timeEntry, tray)
-                timerInterval = setInterval(() => updateTimerInterval(timeEntry, tray), 1000)
+                if (showTimer) {
+                    tray.setTitle('')
+                    updateTimerInterval(timeEntry, tray)
+                    timerInterval = setInterval(() => updateTimerInterval(timeEntry, tray), 1000)
+                } else {
+                    tray.setTitle('')
+                }
                 tray.setContextMenu(buildMenu(mainWindow, timeEntry))
             } else {
                 if (timerInterval) {

src/preload/interface.d.ts

@@ -13,7 +13,7 @@ export interface IElectronAPI {
     onAutoUpdaterError: (callback: (error: string | undefined) => Promise<void>) => void
     onStartTimer: (callback: () => void) => void
     onStopTimer: (callback: () => void) => void
-    updateTrayState: (timeEntry: string) => void
+    updateTrayState: (timeEntry: string, showTimer: boolean) => void
     updateAutoUpdater: () => void
 }
 

src/preload/main.ts

@@ -28,7 +28,8 @@ if (process.contextIsolated || true) {
                 ipcRenderer.on('updateNotAvailable', () => callback()),
             onAutoUpdaterError: (callback) =>
                 ipcRenderer.on('updateError', (_event, value) => callback(value)),
-            updateTrayState: (timeEntry: string) => ipcRenderer.send('updateTrayState', timeEntry),
+            updateTrayState: (timeEntry: string, showTimer: boolean) =>
+                ipcRenderer.send('updateTrayState', timeEntry, showTimer),
             updateAutoUpdater: () => ipcRenderer.send('updateAutoUpdater'),
         })
     } catch (error) {

src/renderer/src/components/MainTimeEntryTable.vue

@@ -46,7 +46,7 @@ import { dayjs } from '../utils/dayjs.ts'
 import { listenForBackendEvent } from '../utils/events.ts'
 import { fromError } from 'zod-validation-error'
 import { apiClient } from '../utils/api'
-import { updateTrayState } from '../utils/tray'
+import { updateTrayState, isTrayTimerActivated } from '../utils/tray'
 import { getMe } from '../utils/me'
 
 const { currentOrganizationId, currentMembership } = useMyMemberships()
@@ -173,6 +173,10 @@ watch(currentTimeEntry, () => {
     updateTrayState({ ...currentTimeEntry.value })
 })
 
+watch(isTrayTimerActivated, () => {
+    updateTrayState({ ...currentTimeEntry.value })
+})
+
 watchEffect(() => {
     if (isActive.value) {
         startLiveTimer()

src/renderer/src/components/SettingsModal.vue

@@ -2,6 +2,7 @@
 import { Modal, PrimaryButton, SecondaryButton, Checkbox, LoadingSpinner } from '@solidtime/ui'
 import { logout } from '../utils/oauth.ts'
 import { isWidgetActivated } from '../utils/widget.ts'
+import { isTrayTimerActivated } from '../utils/tray.ts'
 import { useQuery, useQueryClient } from '@tanstack/vue-query'
 import { getMe } from '../utils/me'
 import { computed, onMounted, ref } from 'vue'
@@ -91,11 +92,15 @@ onMounted(() => {
             </div>
             <div class="mb-2 mt-6 font-medium text-muted" role="heading">Settings</div>
 
-            <div class="my-4 text-sm text-muted flex flex-col justify-center">
+            <div class="my-4 text-sm text-muted flex flex-col justify-center space-y-3">
                 <label class="flex items-center">
                     <Checkbox v-model:checked="isWidgetActivated" name="remember" />
                     <span class="ms-2 text-sm">Show Timetracker Widget</span>
                 </label>
+                <label class="flex items-center">
+                    <Checkbox v-model:checked="isTrayTimerActivated" name="tray_timer" />
+                    <span class="ms-2 text-sm">Show Tray / Menu Bar Timer</span>
+                </label>
             </div>
             <div class="mb-2 mt-6 font-medium text-muted" role="heading">Updates</div>
             <div class="flex items-center space-x-4">

src/renderer/src/utils/tray.ts

@@ -1,5 +1,8 @@
 import { type TimeEntry } from '@solidtime/api'
+import { useStorage } from '@vueuse/core'
+
+export const isTrayTimerActivated = useStorage('is_tray_timer_activated', true)
 
 export async function updateTrayState(timeEntry: TimeEntry) {
-    window.electronAPI.updateTrayState(JSON.stringify(timeEntry))
+    window.electronAPI.updateTrayState(JSON.stringify(timeEntry), isTrayTimerActivated.value)
 }