From d04d950e744b5673166c76948faa2e205ba4d0d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Advaita=20K=E1=B9=9B=E1=B9=A3=E1=B9=87a=20D=C4=81sa?=
 <advaita.krishna.das@gmail.com>
Date: Sun, 28 May 2023 16:37:04 +0200
Subject: [PATCH 1/3] fix

---
 ios/App/App/Info.plist                        |  2 ++
 src/app/decks/inbox/pages/InboxDeckPage.vue   |  8 +++--
 src/app/decks/review/pages/ReviewDeckPage.vue |  7 +++--
 src/app/home/components/HomePage.vue          |  8 -----
 .../composables/useLoadLibraryIntoMemory.ts   |  3 +-
 .../library/composables/useSyncLibraryTask.ts |  2 +-
 src/app/library/index.ts                      |  1 +
 src/app/library/pages/LibraryPage.vue         | 15 ++++------
 src/app/settings/pages/AccountPage.vue        |  7 ++++-
 src/app/settings/pages/SettingsPage.vue       |  9 ++++--
 src/app/shared/components/BackgroundTasks.vue | 30 +++++++++++++++++++
 src/app/shared/index.ts                       |  3 +-
 12 files changed, 67 insertions(+), 28 deletions(-)
 create mode 100644 src/app/shared/components/BackgroundTasks.vue

diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist
index 44d8251c..f324a0fd 100644
--- a/ios/App/App/Info.plist
+++ b/ios/App/App/Info.plist
@@ -73,6 +73,8 @@
     <key>LSApplicationQueriesSchemes</key>
     <array>
       <string>mailto</string>
+      <string>googlegmail</string>
+      <string>ms-outlook</string>
     </array>
   </dict>
 </plist>
diff --git a/src/app/decks/inbox/pages/InboxDeckPage.vue b/src/app/decks/inbox/pages/InboxDeckPage.vue
index af3bf1b9..608d827e 100644
--- a/src/app/decks/inbox/pages/InboxDeckPage.vue
+++ b/src/app/decks/inbox/pages/InboxDeckPage.vue
@@ -6,6 +6,10 @@
         <ion-title>
           {{ $t('decks.inbox.title') }}
         </ion-title>
+
+        <ion-buttons slot="primary">
+          <BackgroundTasks />
+        </ion-buttons>
       </ion-toolbar>
     </ion-header>
 
@@ -51,9 +55,9 @@
 
 <script lang="ts" setup>
 import { InboxCard, InboxCardMemorized, UpdateVerseStatus, Verse, VerseId } from '@akdasa-studios/shlokas-core'
-import { IonContent, IonHeader, IonPage, IonTitle, IonToolbar, onIonViewWillEnter, onIonViewDidLeave } from '@ionic/vue'
+import { IonContent, IonHeader, IonPage, IonTitle, IonToolbar, onIonViewWillEnter, onIonViewDidLeave, IonButtons } from '@ionic/vue'
 import { computed, ref, reactive, watch } from 'vue'
-import { testId , useApplication } from '@/app/shared'
+import { testId , useApplication , BackgroundTasks } from '@/app/shared'
 import { InboxFlipCard, InboxCardSwipeOverlay, InboxDeckEmpty } from '@/app/decks/inbox'
 import { useLibraryCache, useIndexedList, StackedFlipCardsDeck } from '@/app/decks/shared'
 import { useTutorialStore, TutorialSteps } from '@/app/tutorial'
diff --git a/src/app/decks/review/pages/ReviewDeckPage.vue b/src/app/decks/review/pages/ReviewDeckPage.vue
index b6d6b035..e9e2392e 100644
--- a/src/app/decks/review/pages/ReviewDeckPage.vue
+++ b/src/app/decks/review/pages/ReviewDeckPage.vue
@@ -6,6 +6,9 @@
         <ion-title>
           {{ $t('decks.review.title') }}
         </ion-title>
+        <ion-buttons slot="primary">
+          <BackgroundTasks />
+        </ion-buttons>
       </ion-toolbar>
     </ion-header>
 
@@ -62,7 +65,7 @@
 
 <script lang="ts" setup>
 import { ReviewCard, ReviewCardReviewed, ReviewGrade, Scheduler, UpdateVerseStatus, Verse, VerseId } from '@akdasa-studios/shlokas-core'
-import { IonContent, IonHeader, IonPage, IonTitle, IonToolbar, onIonViewWillEnter } from '@ionic/vue'
+import { IonContent, IonHeader, IonPage, IonTitle, IonToolbar, onIonViewWillEnter, IonButtons } from '@ionic/vue'
 import { computed, reactive, ref, watch } from 'vue'
 import { useArrayFind } from '@vueuse/core'
 import { storeToRefs } from 'pinia'
@@ -70,7 +73,7 @@ import { StackedFlipCardsDeck , useIndexedList, useLibraryCache } from '@/app/de
 import { ReviewFlipCard, ReviewDeckEmpty, ReviewCardSwipeOverlay, GradeCardButtons } from '@/app/decks/review'
 import { useSettingsStore } from '@/app/settings'
 import { TutorialSteps, useTutorialStore } from '@/app/tutorial'
-import { useApplication } from '@/app/shared'
+import { useApplication , BackgroundTasks } from '@/app/shared'
 
 
 /* -------------------------------------------------------------------------- */
diff --git a/src/app/home/components/HomePage.vue b/src/app/home/components/HomePage.vue
index 2bd97cda..0925a0f7 100644
--- a/src/app/home/components/HomePage.vue
+++ b/src/app/home/components/HomePage.vue
@@ -61,11 +61,6 @@
     <TutorialPlayer
       v-if="tutorialEnabled && !isTutorialCompleted"
     />
-
-    <ion-loading
-      :is-open="syncTask.inProgress.value"
-      :message="$t('sync.syncing')"
-    />
   </ion-page>
 </template>
 
@@ -74,7 +69,6 @@
 import {
   IonTabBar, IonTabButton, IonTabs, IonLabel,
   IonIcon, IonPage, IonRouterOutlet, IonBadge,
-  IonLoading
 } from '@ionic/vue'
 import {
   enterOutline, libraryOutline, albumsOutline,
@@ -83,7 +77,6 @@ import {
 import { storeToRefs } from 'pinia'
 import { useStatisticsStore } from '@/app/statistics'
 import { TutorialPlayer, useTutorialStore } from '@/app/tutorial'
-import { useSync } from '@/app/shared'
 
 /* -------------------------------------------------------------------------- */
 /*                                Dependencies                                */
@@ -91,7 +84,6 @@ import { useSync } from '@/app/shared'
 
 const statisticsStore = useStatisticsStore()
 const tutorialStore = useTutorialStore()
-const syncTask = useSync()
 
 /* -------------------------------------------------------------------------- */
 /*                                    State                                   */
diff --git a/src/app/library/composables/useLoadLibraryIntoMemory.ts b/src/app/library/composables/useLoadLibraryIntoMemory.ts
index e27706bc..abafe478 100644
--- a/src/app/library/composables/useLoadLibraryIntoMemory.ts
+++ b/src/app/library/composables/useLoadLibraryIntoMemory.ts
@@ -1,13 +1,12 @@
 import { Application, Language, Synonym, Text, Translation, Verse, VerseId, VerseNumber } from '@akdasa-studios/shlokas-core'
 import { ref } from 'vue'
 
+const inProgress = ref(false)
 
 export function useLoadLibraryIntoMemory(
   app: Application,
   libraryDatabase: any
 ) {
-  const inProgress = ref(false)
-
   async function sync() {
     inProgress.value = true
     const docs: any = await libraryDatabase.db.find({ selector: { '@type': 'verse' }})
diff --git a/src/app/library/composables/useSyncLibraryTask.ts b/src/app/library/composables/useSyncLibraryTask.ts
index bb0a8665..10e1d33b 100644
--- a/src/app/library/composables/useSyncLibraryTask.ts
+++ b/src/app/library/composables/useSyncLibraryTask.ts
@@ -6,13 +6,13 @@ export interface SyncOptions {
   showProgress: boolean
 }
 
+const inProgress = ref(false)
 
 export function useSyncLibraryTask(
   libraryDatabase: any
 ) {
   const env = useEnv()
   const logger = new Logger('init')
-  const inProgress = ref(false)
 
   async function sync(options?: SyncOptions) {
     try {
diff --git a/src/app/library/index.ts b/src/app/library/index.ts
index 347da855..29a1b0df 100644
--- a/src/app/library/index.ts
+++ b/src/app/library/index.ts
@@ -10,6 +10,7 @@ export { default as VersesList } from './components/VersesList.vue'
 export { default as VersesListItem } from './components/VersesListItem.vue'
 export * from './composables/useSyncLibraryTask'
 export * from './composables/useLoadLibraryIntoMemory'
+export * from './composables/useSyncLibraryTask'
 
 // routes
 export * from './routes/library'
\ No newline at end of file
diff --git a/src/app/library/pages/LibraryPage.vue b/src/app/library/pages/LibraryPage.vue
index 1ee99f49..fe7cfa96 100644
--- a/src/app/library/pages/LibraryPage.vue
+++ b/src/app/library/pages/LibraryPage.vue
@@ -3,6 +3,9 @@
     <ion-header>
       <ion-toolbar>
         <ion-title>{{ $t('library.title') }}</ion-title>
+        <ion-buttons slot="primary">
+          <BackgroundTasks />
+        </ion-buttons>
       </ion-toolbar>
 
       <ion-toolbar>
@@ -27,12 +30,6 @@
         :verse-statuses="verseStatuses"
       />
     </ion-content>
-
-    <ion-loading
-      :is-open="syncLibraryTask.inProgress.value"
-      message="Loading verses..."
-      duration="3500"
-    />
   </ion-page>
 </template>
 
@@ -40,8 +37,8 @@
 <script lang="ts" setup>
 import { Language, Verse, VerseStatus } from '@akdasa-studios/shlokas-core'
 import {
-  IonContent, IonHeader, IonPage, IonLoading, IonRefresher, IonRefresherContent,
-  IonSearchbar, IonTitle, IonToolbar, onIonViewWillEnter
+  IonContent, IonHeader, IonPage, IonRefresher, IonRefresherContent,
+  IonSearchbar, IonTitle, IonToolbar, onIonViewWillEnter, IonButtons
 } from '@ionic/vue'
 import { inject, ref, shallowRef, watch } from 'vue'
 import { storeToRefs } from 'pinia'
@@ -49,7 +46,7 @@ import { IonRefresherCustomEvent, RefresherEventDetail } from '@ionic/core'
 import { useLoadLibraryIntoMemory, useSyncLibraryTask, VersesList } from '@/app/library'
 import { useSettingsStore } from '@/app/settings'
 import { TutorialSteps, useTutorialStore } from '@/app/tutorial'
-import { useApplication } from '@/app/shared'
+import { useApplication, BackgroundTasks } from '@/app/shared'
 
 /* -------------------------------------------------------------------------- */
 /*                                Dependencies                                */
diff --git a/src/app/settings/pages/AccountPage.vue b/src/app/settings/pages/AccountPage.vue
index f6e6dd27..dfcf0fe7 100644
--- a/src/app/settings/pages/AccountPage.vue
+++ b/src/app/settings/pages/AccountPage.vue
@@ -5,6 +5,11 @@
         <ion-buttons slot="start">
           <ion-back-button />
         </ion-buttons>
+
+        <ion-buttons slot="primary">
+          <BackgroundTasks />
+        </ion-buttons>
+
         <ion-title>{{ $t('settings.account') }}</ion-title>
       </ion-toolbar>
     </ion-header>
@@ -86,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 } from '@/app/shared'
+import { go, useAuthentication, useEmitter, useSync , BackgroundTasks } from '@/app/shared'
 import { useSettingsStore } from '@/app/settings'
 import { CouchDB } from '@/services/persistence'
 
diff --git a/src/app/settings/pages/SettingsPage.vue b/src/app/settings/pages/SettingsPage.vue
index 77f1a53c..6d1ace26 100644
--- a/src/app/settings/pages/SettingsPage.vue
+++ b/src/app/settings/pages/SettingsPage.vue
@@ -6,6 +6,10 @@
     >
       <ion-toolbar>
         <ion-title>{{ $t('settings.title') }}</ion-title>
+
+        <ion-buttons slot="primary">
+          <BackgroundTasks />
+        </ion-buttons>
       </ion-toolbar>
     </ion-header>
 
@@ -89,12 +93,13 @@
 <script lang="ts" setup>
 import {
   IonContent, IonHeader, IonItem, IonLabel, IonList,
-  IonPage, IonSelect, IonSelectOption, IonTitle, IonToggle, IonToolbar
+  IonPage, IonSelect, IonSelectOption, IonTitle, IonToggle, IonToolbar,
+  IonButtons
 } from '@ionic/vue'
 import { inject, ref } from 'vue'
 import { EmailComposer } from '@awesome-cordova-plugins/email-composer'
 import { useSettingsStore } from '@/app/settings'
-import { getAvailableLanguages, useClearCache } from '@/app/shared'
+import { BackgroundTasks, getAvailableLanguages, useClearCache } from '@/app/shared'
 
 /* -------------------------------------------------------------------------- */
 /*                                Dependencies                                */
diff --git a/src/app/shared/components/BackgroundTasks.vue b/src/app/shared/components/BackgroundTasks.vue
new file mode 100644
index 00000000..c4729184
--- /dev/null
+++ b/src/app/shared/components/BackgroundTasks.vue
@@ -0,0 +1,30 @@
+<template>
+  <ion-spinner
+    v-if="visible"
+  />
+</template>
+
+<script setup lang="ts">
+import { computed, inject } from 'vue'
+import { IonSpinner } from '@ionic/vue'
+import { useLoadLibraryIntoMemory, useSyncLibraryTask } from '@/app/library'
+import { useSync } from '../composables/useSync'
+import { useApplication } from '../composables/useApp'
+
+/* -------------------------------------------------------------------------- */
+/*                                Dependencies                                */
+/* -------------------------------------------------------------------------- */
+
+const application = useApplication()
+const libraryDatabase = inject('verses')
+const syncTask = useSync()
+const syncLibraryTask = useSyncLibraryTask(libraryDatabase)
+const loadLibrary = useLoadLibraryIntoMemory(application.instance(), libraryDatabase)
+
+
+/* -------------------------------------------------------------------------- */
+/*                                    State                                   */
+/* -------------------------------------------------------------------------- */
+
+const visible = computed(_ => syncTask.inProgress.value || syncLibraryTask.inProgress || loadLibrary.inProgress)
+</script>
\ No newline at end of file
diff --git a/src/app/shared/index.ts b/src/app/shared/index.ts
index 4d543ec0..6b5a88c1 100644
--- a/src/app/shared/index.ts
+++ b/src/app/shared/index.ts
@@ -18,4 +18,5 @@ export * from './tasks/runSyncTask'
 // components:
 export { default as ConfettiExplosion } from './components/ConfettiExplosion.vue'
 export { default as VerseAudioPlayer } from './components/VerseAudioPlayer.vue'
-export { default as DarkImage } from './components/DarkImage.vue'
\ No newline at end of file
+export { default as DarkImage } from './components/DarkImage.vue'
+export { default as BackgroundTasks } from './components/BackgroundTasks.vue'

From 4193f95c9583a08f79a34dd383d598b806e530c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Advaita=20K=E1=B9=9B=E1=B9=A3=E1=B9=87a=20D=C4=81sa?=
 <advaita.krishna.das@gmail.com>
Date: Sun, 28 May 2023 16:41:59 +0200
Subject: [PATCH 2/3] fixes

---
 .../composables/useLoadLibraryIntoMemory.ts   | 37 ++++++++++---------
 .../library/composables/useSyncLibraryTask.ts |  3 +-
 src/app/shared/components/BackgroundTasks.vue |  5 ++-
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/app/library/composables/useLoadLibraryIntoMemory.ts b/src/app/library/composables/useLoadLibraryIntoMemory.ts
index abafe478..288c2678 100644
--- a/src/app/library/composables/useLoadLibraryIntoMemory.ts
+++ b/src/app/library/composables/useLoadLibraryIntoMemory.ts
@@ -9,27 +9,30 @@ export function useLoadLibraryIntoMemory(
 ) {
   async function sync() {
     inProgress.value = true
-    const docs: any = await libraryDatabase.db.find({ selector: { '@type': 'verse' }})
+    try {
+      const docs: any = await libraryDatabase.db.find({ selector: { '@type': 'verse' } })
 
-    for (const verse of docs.docs) {
-      const synonyms = []
-      for (const w of verse.synonyms) {
-        synonyms.push(new Synonym(w.words.join(' '), w.translation, w.lineNumber))
-      }
+      for (const verse of docs.docs) {
+        const synonyms = []
+        for (const w of verse.synonyms) {
+          synonyms.push(new Synonym(w.words.join(' '), w.translation, w.lineNumber))
+        }
 
-      const v = new Verse(
-        new VerseId(verse._id),
-        new VerseNumber(verse.number),
-        verse.reference,
-        new Language(verse.language, verse.language),
-        new Text(verse.text),
-        new Translation(verse.translation),
-        synonyms
-      )
+        const v = new Verse(
+          new VerseId(verse._id),
+          new VerseNumber(verse.number),
+          verse.reference,
+          new Language(verse.language, verse.language),
+          new Text(verse.text),
+          new Translation(verse.translation),
+          synonyms
+        )
 
-      await app.repositories.verses.save(v)
+        await app.repositories.verses.save(v)
+      }
+    } finally {
+      inProgress.value = false
     }
-    inProgress.value = false
   }
 
   return { sync, inProgress }
diff --git a/src/app/library/composables/useSyncLibraryTask.ts b/src/app/library/composables/useSyncLibraryTask.ts
index 10e1d33b..e1f5e06f 100644
--- a/src/app/library/composables/useSyncLibraryTask.ts
+++ b/src/app/library/composables/useSyncLibraryTask.ts
@@ -24,8 +24,9 @@ export function useSyncLibraryTask(
       logger.debug('Library synced')
     } catch (err) {
       logger.error('Failed to sync static data', err)
+    } finally {
+      inProgress.value = false
     }
-    inProgress.value = false
   }
 
   return { sync, inProgress }
diff --git a/src/app/shared/components/BackgroundTasks.vue b/src/app/shared/components/BackgroundTasks.vue
index c4729184..59b02571 100644
--- a/src/app/shared/components/BackgroundTasks.vue
+++ b/src/app/shared/components/BackgroundTasks.vue
@@ -26,5 +26,8 @@ const loadLibrary = useLoadLibraryIntoMemory(application.instance(), libraryData
 /*                                    State                                   */
 /* -------------------------------------------------------------------------- */
 
-const visible = computed(_ => syncTask.inProgress.value || syncLibraryTask.inProgress || loadLibrary.inProgress)
+const visible = computed(_ =>
+  syncTask.inProgress.value
+  || syncLibraryTask.inProgress.value
+  || loadLibrary.inProgress.value)
 </script>
\ No newline at end of file

From 5de201d46f3f5c25933d81fb46b6f0e465efe550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Advaita=20K=E1=B9=9B=E1=B9=A3=E1=B9=87a=20D=C4=81sa?=
 <advaita.krishna.das@gmail.com>
Date: Mon, 29 May 2023 15:14:29 +0200
Subject: [PATCH 3/3] fix

---
 src/app/shared/components/BackgroundTasks.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/components/BackgroundTasks.vue b/src/app/shared/components/BackgroundTasks.vue
index 59b02571..7c9b3ff5 100644
--- a/src/app/shared/components/BackgroundTasks.vue
+++ b/src/app/shared/components/BackgroundTasks.vue
@@ -26,8 +26,9 @@ const loadLibrary = useLoadLibraryIntoMemory(application.instance(), libraryData
 /*                                    State                                   */
 /* -------------------------------------------------------------------------- */
 
-const visible = computed(_ =>
+const visible = computed(() =>
   syncTask.inProgress.value
   || syncLibraryTask.inProgress.value
-  || loadLibrary.inProgress.value)
+  || loadLibrary.inProgress.value
+)
 </script>
\ No newline at end of file