cleanup useSyncTask

package.json

@@ -53,7 +53,6 @@
     "cordova-plugin-email-composer": "^0.10.1",
     "cordova-plugin-ionic": "5.5.3",
     "cordova-sqlite-storage": "^6.1.0",
-    "eventemitter2": "^6.4.9",
     "ionicons": "^7.1.0",
     "jwt-decode": "^3.1.2",
     "pinia": "^2.0.33",

src/app/decks/shared/index.ts

@@ -1,5 +1,6 @@
 export * from './composables/useLibraryCache'
 export * from './composables/useIndexedList'
+export * from './tasks/useEnterFullscreenMode'
 
 export { default as VerseTextLines } from './components/VerseTextLines.vue'
 export { default as StackedFlipCardsDeck } from './components/StackedFlipCardsDeck.vue'

src/app/shared/tasks/runEnterFullscreenMode.ts → src/app/decks/shared/tasks/useEnterFullscreenMode.ts

@@ -1,14 +1,14 @@
 import { watch } from 'vue'
 import { storeToRefs } from 'pinia'
+import { StatusBar } from '@capacitor/status-bar'
+import { Capacitor } from '@capacitor/core'
+import { useScreenOrientation , useAppStateStore } from '@/app/shared'
 import { useSettingsStore } from '@/app/settings'
-import { useScreenOrientation } from '../composables/useScreenOrientation'
-import { useAppStateStore } from '../stores/appStateStore'
-
 
 /**
  * Enter fullscreen mode when in landscape mode and hide controls is enabled.
  */
-export function runEnterFullscreenMode() {
+export function useEnterFullscreenMode() {
   /* -------------------------------------------------------------------------- */
   /*                                Dependencies                                */
   /* -------------------------------------------------------------------------- */
@@ -27,13 +27,15 @@ export function runEnterFullscreenMode() {
 
 
   /* -------------------------------------------------------------------------- */
-  /*                                    Init                                    */
+  /*                                 Actions                                    */
   /* -------------------------------------------------------------------------- */
 
-  watch(
-    [screenOrientation.isPortrait, routeName],
-    onChanged
-  )
+  async function run() {
+    watch(
+      [screenOrientation.isPortrait, routeName],
+      onChanged
+    )
+  }
 
 
   /* -------------------------------------------------------------------------- */
@@ -45,5 +47,16 @@ export function runEnterFullscreenMode() {
     const isFullscreenEligible = fullscrenEligibleRoutes.includes(routeName.value)
     const hideControls = hideControlsInLandscapeMode.value
     appStateStore.fullscreen = isLandscape && isFullscreenEligible && hideControls
+
+    if (Capacitor.getPlatform() !== 'web') {
+      if (appStateStore.fullscreen) { await StatusBar.hide() } else { await StatusBar.show() }
+    }
   }
+
+
+  /* -------------------------------------------------------------------------- */
+  /*                                  Interface                                 */
+  /* -------------------------------------------------------------------------- */
+
+  return { run }
 }

src/app/settings/pages/AccountPage.vue

@@ -91,7 +91,7 @@ import {
 import { mail, logoApple, logoGoogle } from 'ionicons/icons'
 import { computed, inject } from 'vue'
 import { Capacitor } from '@capacitor/core'
-import { go, useAuthentication, useEmitter, useSync , BackgroundTasks } from '@/app/shared'
+import { go, useAuthentication, useSync , BackgroundTasks } from '@/app/shared'
 import { useSettingsStore } from '@/app/settings'
 import { CouchDB } from '@/services/persistence'
 
@@ -100,7 +100,6 @@ import { CouchDB } from '@/services/persistence'
 /* -------------------------------------------------------------------------- */
 
 const userDataDb = inject('userData') as CouchDB
-const emitter = useEmitter()
 const settings = useSettingsStore()
 const auth = useAuthentication()
 const router = useIonRouter()
@@ -121,7 +120,6 @@ const isAuthenticated = computed(() => !!settings.authToken)
 
 async function onSync() {
   await syncTask.run({ force: true })
-  emitter.emit('syncCompleted')
 }
 
 async function onSignIn(strategy: string) {
@@ -152,6 +150,5 @@ async function onLogOut() {
   settings.syncCollectionId = ''
   settings.syncAt = 0
   await userDataDb.destroy()
-  emitter.emit('syncCompleted')
 }
 </script>

src/app/settings/pages/EmailPage.vue

@@ -77,7 +77,7 @@
 <script setup lang="ts">
 import { IonContent, IonHeader, IonList, IonItem, IonToolbar, IonButtons, IonButton, IonTitle, IonInput, IonPage, IonBackButton, IonFooter, useIonRouter, alertController } from '@ionic/vue'
 import { ref, watch } from 'vue'
-import { useAuthentication, useEmitter } from '@/app/shared'
+import { useAuthentication } from '@/app/shared'
 
 
 /* -------------------------------------------------------------------------- */
@@ -96,7 +96,6 @@ const props = defineProps<{
 
 const router = useIonRouter()
 const auth = useAuthentication()
-const emitter = useEmitter()
 
 /* -------------------------------------------------------------------------- */
 /*                                    State                                   */
@@ -149,7 +148,6 @@ async function onSignIn() {
       email: email.value,
       code: code.value,
     })
-    emitter.emit('signedIn')
     state.value = LoginState.SignedIn
     navigateNext(props.nextUrl, props.navigationType)
   } catch (e) {

src/app/shared/composables/useSync.ts

@@ -6,7 +6,6 @@ import { useEnv } from './useEnv'
 import { useAuthentication } from './useAuthentication'
 import { useApplication } from './useApp'
 import { useLogger } from './useLogger'
-import { useEmitter } from './useEmitter'
 
 /* -------------------------------------------------------------------------- */
 /*                                  Interface                                 */
@@ -34,7 +33,6 @@ export function useSync() {
   const auth        = useAuthentication()
   const env         = useEnv()
   const log         = useLogger('sync')
-  const emitter     = useEmitter()
 
 
   /* -------------------------------------------------------------------------- */
@@ -72,7 +70,6 @@ export function useSync() {
         currentTime: currentTime
       })
       settings.syncAt = currentTime
-      emitter.emit('syncCompleted')
     } catch (e) {
       log.error('Syncing failed...', e)
       throw new Error('Syncing failed: ' + JSON.stringify(e))

src/app/shared/index.ts

@@ -8,19 +8,16 @@ export * from './composables/useApp'
 export * from './composables/useDeviceStorage'
 export * from './composables/useAuthentication'
 export * from './composables/useSync'
-export * from './composables/useEmitter'
 export * from './composables/useTestId'
 export * from './composables/useClearCache'
 export * from './composables/useAppVersion'
 export * from './composables/useArrayShuffler'
 export * from './composables/useScreenOrientation'
 
 // tasks:
-export * from './tasks/runSyncTask'
-export * from './tasks/runEnterFullscreenMode'
-export * from './tasks/runHideStatusBar'
-export * from './tasks/runScheduleNotifications'
-export * from './tasks/runUpdateAppBadge'
+export * from './tasks/useSyncTask'
+export * from './tasks/useScheduleNotifications'
+export * from './tasks/useUpdateAppBadge'
 export * from './tasks/useResetMemorizationTime'
 export * from './tasks/useAppStatePersistenceTask'
 

src/app/shared/stores/appStateStore.ts

@@ -5,8 +5,7 @@ import { ref } from 'vue'
  * Global app state.
  */
 export const useAppStateStore = defineStore('appState', () => {
-  const isActive = ref(true)
-  // const appStateChangedAt = ref(0)
+  const isActive = ref(false)
 
   /**
    * If true, the app is in fullscreen mode, otherwise not. In fullscreen mode,

src/app/shared/tasks/useAppStatePersistenceTask.ts

@@ -43,6 +43,7 @@ export function useAppStatePersistenceTask() {
   /* -------------------------------------------------------------------------- */
 
   async function onAppStateChanged() {
+    if (isActive.value) { return }
     logger.debug('Saving app state')
     for (const key of settingsKeys) {
       // @ts-ignore

src/app/shared/tasks/useResetMemorizationTime.ts

@@ -1,26 +1,48 @@
-import { useAppStateStore } from '@/app/shared'
+import { storeToRefs } from 'pinia'
+import { watch } from 'vue'
+import { useAppStateStore, useApplication } from '@/app/shared'
 
 
 export function useResetMemorizationTime() {
   /* -------------------------------------------------------------------------- */
   /*                                Dependencies                                */
   /* -------------------------------------------------------------------------- */
 
-  const appState = useAppStateStore()
+  const app           = useApplication()
+  const appStateStore = useAppStateStore()
+
+
+  /* -------------------------------------------------------------------------- */
+  /*                                    State                                   */
+  /* -------------------------------------------------------------------------- */
+
+  const { isActive } = storeToRefs(appStateStore)
 
 
   /* -------------------------------------------------------------------------- */
   /*                                   Actions                                  */
   /* -------------------------------------------------------------------------- */
 
   async function run() {
-    const lastResetAt = appState.memorizationTimeResetAt
-    const now         = new Date()
+    watch([
+      isActive, app.now
+    ], reset)
+    reset()
+  }
+
+
+  /* -------------------------------------------------------------------------- */
+  /*                                   Helpers                                  */
+  /* -------------------------------------------------------------------------- */
+
+  async function reset() {
+    const lastResetAt = appStateStore.memorizationTimeResetAt
+    const now         = app.now.value
     const today       = `${now.getFullYear()}-${now.getMonth()+1}-${now.getDate()}`
 
     if (lastResetAt !== today) {
-      appState.memorizationTimeSpend = 0
-      appState.memorizationTimeResetAt = today
+      appStateStore.memorizationTimeSpend = 0
+      appStateStore.memorizationTimeResetAt = today
     }
   }