refactor

apps/mobile/App.js

@@ -23,7 +23,7 @@ import {
 import Notifications from './src/services/Notifications';
 import SettingsService from './src/services/SettingsService';
 import {Tracker} from './src/utils';
-import {db} from './src/utils/DB';
+import {db} from './src/utils/database';
 import {eDispatchAction} from './src/utils/Events';
 import {MMKV} from './src/utils/mmkv';
 

apps/mobile/share/index.js

@@ -20,7 +20,7 @@ import ShareExtension from 'rn-extensions-share';
 import sanitize from 'sanitize-html';
 import validator from 'validator';
 import {COLOR_SCHEME_DARK, COLOR_SCHEME_LIGHT} from '../src/utils/Colors';
-import {db} from '../src/utils/DB';
+import {db} from '../src/utils/database';
 import {SIZE} from '../src/utils/SizeUtils';
 import Storage from '../src/utils/storage';
 import {sleep} from '../src/utils/TimeUtils';

apps/mobile/src/components/ActionSheetComponent/ActionSheetColorsSection.js

@@ -8,7 +8,7 @@ import {eSendEvent} from '../../services/EventManager';
 import Navigation from '../../services/Navigation';
 import {dWidth} from '../../utils';
 import {COLORS_NOTE} from '../../utils/Colors';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {refreshNotesPage} from '../../utils/Events';
 import {SIZE} from '../../utils/SizeUtils';
 import {PressableButton} from '../PressableButton';

apps/mobile/src/components/ActionSheetComponent/ActionSheetTagsSection.js

@@ -2,7 +2,7 @@ import React, {useState} from 'react';
 import {View} from 'react-native';
 import {eSendEvent} from '../../services/EventManager';
 import Navigation from '../../services/Navigation';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {refreshNotesPage} from '../../utils/Events';
 import {SIZE} from '../../utils/SizeUtils';
 import {sleep} from '../../utils/TimeUtils';

apps/mobile/src/components/ActionSheetComponent/index.js

@@ -39,7 +39,7 @@ import {
   COLOR_SCHEME_LIGHT,
   setColorScheme
 } from '../../utils/Colors';
-import { db } from '../../utils/DB';
+import { db } from '../../utils/database';
 import {
   eOpenAttachmentsDialog,
   eOpenMoveNoteDialog,

apps/mobile/src/components/AddNotebookDialog/index.js

@@ -6,7 +6,7 @@ import {useMenuStore} from '../../provider/stores';
 import {DDS} from '../../services/DeviceDetection';
 import {ToastEvent} from '../../services/EventManager';
 import Navigation from '../../services/Navigation';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {ph, pv, SIZE} from '../../utils/SizeUtils';
 import {sleep} from '../../utils/TimeUtils';
 import {ActionIcon} from '../ActionIcon';

apps/mobile/src/components/AddTopicDialog/index.js

@@ -7,7 +7,7 @@ import {
   ToastEvent
 } from '../../services/EventManager';
 import Navigation from '../../services/Navigation';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {eCloseAddTopicDialog, eOpenAddTopicDialog} from '../../utils/Events';
 import {sleep} from '../../utils/TimeUtils';
 import BaseDialog from '../Dialog/base-dialog';

apps/mobile/src/components/AppLoader/index.js

@@ -21,7 +21,7 @@ import {
 } from '../../services/EventManager';
 import {editing} from '../../utils';
 import {COLOR_SCHEME_DARK} from '../../utils/Colors';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {
   eOpenLoginDialog,
   eOpenProgressDialog,

apps/mobile/src/components/AttachmentDialog/index.js

@@ -9,7 +9,7 @@ import {
   eUnSubscribeEvent,
   ToastEvent
 } from '../../services/EventManager';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {
   eCloseAttachmentDialog,
   eCloseTagsDialog,

apps/mobile/src/components/LoginDialog/index.js

@@ -22,7 +22,7 @@ import {
 import {clearMessage, setEmailVerifyMessage} from '../../services/Message';
 import PremiumService from '../../services/PremiumService';
 import {hexToRGBA} from '../../utils/ColorUtils';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {
   eOpenLoginDialog,
   eOpenProgressDialog,

apps/mobile/src/components/Menu/ColorSection.js

@@ -9,7 +9,7 @@ import {
 } from '../../services/EventManager';
 import Navigation from '../../services/Navigation';
 import {COLORS_NOTE} from '../../utils/Colors';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {refreshNotesPage} from '../../utils/Events';
 import {normalize, SIZE} from '../../utils/SizeUtils';
 import {presentDialog} from '../Dialog/functions';

apps/mobile/src/components/Menu/TagsSection.js

@@ -9,7 +9,7 @@ import {
   eUnSubscribeEvent
 } from '../../services/EventManager';
 import Navigation from '../../services/Navigation';
-import { db } from '../../utils/DB';
+import { db } from '../../utils/database';
 import { eOnNewTopicAdded, refreshNotesPage } from '../../utils/Events';
 import { normalize, SIZE } from '../../utils/SizeUtils';
 import ActionSheetWrapper from '../ActionSheetComponent/ActionSheetWrapper';

apps/mobile/src/components/MergeEditor/index.js

@@ -15,7 +15,7 @@ import {
 import Navigation from '../../services/Navigation';
 import Sync from '../../services/Sync';
 import {dHeight} from '../../utils';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import diff from '../../utils/differ';
 import {
   eApplyChanges,

apps/mobile/src/components/MoveNoteDialog/index.js

@@ -14,7 +14,7 @@ import {
 } from '../../services/EventManager';
 import Navigation from '../../services/Navigation';
 import {getTotalNotes} from '../../utils';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {eOpenMoveNoteDialog} from '../../utils/Events';
 import {pv, SIZE} from '../../utils/SizeUtils';
 import ActionSheetWrapper from '../ActionSheetComponent/ActionSheetWrapper';

apps/mobile/src/components/NoteItem/index.js

@@ -7,7 +7,7 @@ import {useSettingStore} from '../../provider/stores';
 import {eSendEvent} from '../../services/EventManager';
 import Navigation from '../../services/Navigation';
 import {COLORS_NOTE} from '../../utils/Colors';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {refreshNotesPage} from '../../utils/Events';
 import {SIZE} from '../../utils/SizeUtils';
 import {ActionIcon} from '../ActionIcon';

apps/mobile/src/components/NoteItem/wrapper.js

@@ -6,7 +6,7 @@ import { DDS } from '../../services/DeviceDetection';
 import { eSendEvent, openVault, ToastEvent } from '../../services/EventManager';
 import Navigation from '../../services/Navigation';
 import { history } from '../../utils';
-import { db } from '../../utils/DB';
+import { db } from '../../utils/database';
 import { eOnLoadNote, eShowMergeDialog } from '../../utils/Events';
 import { tabBarRef } from '../../utils/Refs';
 import { presentDialog } from '../Dialog/functions';

apps/mobile/src/components/Premium/PendingDialog.js

@@ -1,7 +1,7 @@
 import React, { createRef } from 'react';
 import { View } from 'react-native';
 import { eSubscribeEvent, eUnSubscribeEvent } from '../../services/EventManager';
-import { db } from '../../utils/DB';
+import { db } from '../../utils/database';
 import { eClosePendingDialog, eOpenPendingDialog } from '../../utils/Events';
 import { SIZE } from '../../utils/SizeUtils';
 import ActionSheetWrapper from '../ActionSheetComponent/ActionSheetWrapper';

apps/mobile/src/components/Premium/PremiumComponent.js

@@ -6,7 +6,7 @@ import {useTracked} from '../../provider';
 import {DDS} from '../../services/DeviceDetection';
 import {eSendEvent, ToastEvent} from '../../services/EventManager';
 import PremiumService from '../../services/PremiumService';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {
   eCloseProgressDialog,
   eOpenLoginDialog,

apps/mobile/src/components/PublishNoteDialog/index.js

@@ -13,7 +13,7 @@ import {
   ToastEvent,
 } from '../../services/EventManager';
 import Navigation from '../../services/Navigation';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {
   eClosePublishNoteDialog,
   eOpenPublishNoteDialog,

apps/mobile/src/components/RecoveryKeyDialog/index.js

@@ -10,7 +10,7 @@ import {
   eUnSubscribeEvent,
   ToastEvent,
 } from '../../services/EventManager';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {eOpenRecoveryKeyDialog, eOpenResultDialog} from '../../utils/Events';
 import {sanitizeFilename} from '../../utils/filename';
 import {SIZE} from '../../utils/SizeUtils';

apps/mobile/src/components/RestoreDialog/index.js

@@ -9,7 +9,7 @@ import {
   eUnSubscribeEvent,
   ToastEvent
 } from '../../services/EventManager';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {eCloseRestoreDialog, eOpenRestoreDialog} from '../../utils/Events';
 import {SIZE} from '../../utils/SizeUtils';
 import storage from '../../utils/storage';

apps/mobile/src/components/SelectionHeader/index.js

@@ -5,7 +5,7 @@ import { useTracked } from '../../provider';
 import { useSelectionStore } from '../../provider/stores';
 import { eSendEvent, ToastEvent } from '../../services/EventManager';
 import Navigation from '../../services/Navigation';
-import { db } from '../../utils/DB';
+import { db } from '../../utils/database';
 import {
   eOpenMoveNoteDialog, refreshNotesPage
 } from '../../utils/Events';

apps/mobile/src/components/SelectionWrapper/actionstrip.js

@@ -11,7 +11,7 @@ import {
 import { openVault, ToastEvent } from '../../services/EventManager';
 import Navigation from '../../services/Navigation';
 import { dWidth, getElevation, toTXT } from '../../utils';
-import { db } from '../../utils/DB';
+import { db } from '../../utils/database';
 import { deleteItems } from '../../utils/functions';
 import { ActionIcon } from '../ActionIcon';
 import { Button } from '../Button';

apps/mobile/src/components/SimpleList/sectionheader.js

@@ -10,7 +10,7 @@ import {
 import SettingsService from '../../services/SettingsService';
 import {GROUP, SORT} from '../../utils';
 import {COLORS_NOTE} from '../../utils/Colors';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {eOpenJumpToDialog, eOpenSortDialog} from '../../utils/Events';
 import {SIZE} from '../../utils/SizeUtils';
 import {ActionIcon} from '../ActionIcon';

apps/mobile/src/components/SortDialog/index.js

@@ -8,7 +8,7 @@ import {
 } from '../../services/EventManager';
 import Navigation from '../../services/Navigation';
 import {GROUP, SORT} from '../../utils';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {eCloseSortDialog, eOpenSortDialog} from '../../utils/Events';
 import {SIZE} from '../../utils/SizeUtils';
 import {sleep} from '../../utils/TimeUtils';

apps/mobile/src/components/TagItem/index.js

@@ -4,7 +4,7 @@ import {notesnook} from '../../../e2e/test.ids';
 import {PressableButton} from '../../components/PressableButton';
 import {useTracked} from '../../provider';
 import Navigation from '../../services/Navigation';
-import { db } from '../../utils/DB';
+import { db } from '../../utils/database';
 import {SIZE} from '../../utils/SizeUtils';
 import {ActionIcon} from '../ActionIcon';
 import {ActionSheetEvent} from '../DialogManager/recievers';

apps/mobile/src/components/TagsDialog/index.js

@@ -5,7 +5,7 @@ import {useTracked} from '../../provider';
 import {useTagStore} from '../../provider/stores';
 import {eSubscribeEvent, eUnSubscribeEvent} from '../../services/EventManager';
 import Navigation from '../../services/Navigation';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {eCloseTagsDialog, eOpenTagsDialog} from '../../utils/Events';
 import {SIZE} from '../../utils/SizeUtils';
 import ActionSheetWrapper from '../ActionSheetComponent/ActionSheetWrapper';

apps/mobile/src/components/VaultDialog/index.js

@@ -20,7 +20,7 @@ import {
 } from '../../services/EventManager';
 import Navigation from '../../services/Navigation';
 import {getElevation, toTXT} from '../../utils';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {
   eClearEditor,
   eCloseActionSheet,

apps/mobile/src/provider/stores.ts

@@ -3,7 +3,7 @@ import { Dimensions } from 'react-native';
 import create from 'zustand';
 import PremiumService from '../services/PremiumService';
 import { history, SUBSCRIPTION_STATUS } from '../utils';
-import { db } from '../utils/DB';
+import { db } from '../utils/database';
 import { MMKV } from '../utils/mmkv';
 import {
   MenuStore,

apps/mobile/src/services/Backup.js

@@ -1,6 +1,6 @@
 const {MMKV} = require('../utils/MMKV');
 import storage from '../utils/storage';
-import {db} from '../utils/DB';
+import {db} from '../utils/database';
 import {eSendEvent, ToastEvent} from './EventManager';
 import SettingsService from './SettingsService';
 import {eCloseProgressDialog, eOpenProgressDialog} from '../utils/Events';

apps/mobile/src/services/Exporter.js

@@ -1,5 +1,5 @@
 import {Platform} from 'react-native';
-import {db} from '../utils/DB';
+import {db} from '../utils/database';
 import {ToastEvent} from './EventManager';
 import RNHTMLtoPDF from 'react-native-html-to-pdf-lite';
 import Storage from '../utils/storage';

apps/mobile/src/services/Notifications.ts

@@ -3,7 +3,7 @@ import PushNotificationIOS from '@react-native-community/push-notification-ios';
 import { Platform } from 'react-native';
 import PushNotification, { Importance, PushNotificationDeliveredObject } from 'react-native-push-notification';
 import { eSendEvent } from './EventManager';
-import { db } from '../utils/DB';
+import { db } from '../utils/database';
 import { DDS } from './DeviceDetection';
 import { tabBarRef } from '../utils/Refs';
 import { eOnLoadNote } from '../utils/Events';

apps/mobile/src/services/PremiumService.js

@@ -3,7 +3,7 @@ import * as RNIap from 'react-native-iap';
 import InAppBrowser from 'react-native-inappbrowser-reborn';
 import {useMessageStore, useUserStore} from '../provider/stores';
 import {itemSkus, SUBSCRIPTION_STATUS} from '../utils';
-import {db} from '../utils/DB';
+import {db} from '../utils/database';
 import {
   eOpenPremiumDialog,
   eOpenProgressDialog,

apps/mobile/src/services/SearchService.js

@@ -1,5 +1,5 @@
 import { useSearchStore } from '../provider/stores';
-import { db } from '../utils/DB';
+import { db } from '../utils/database';
 
 let searchInformation = {
   placeholder: 'Search in all notes',

apps/mobile/src/services/Sync.js

@@ -1,7 +1,7 @@
 import NetInfo from '@react-native-community/netinfo';
 import { initialize, useUserStore } from '../provider/stores';
 import { doInBackground } from '../utils';
-import { db } from '../utils/DB';
+import { db } from '../utils/database';
 import { getNote, updateNoteInEditor } from '../views/Editor/Functions';
 import { ToastEvent } from './EventManager';
 

apps/mobile/src/utils/functions.js

@@ -4,7 +4,7 @@ import { history } from '.';
 import { useMenuStore, useSelectionStore } from '../provider/stores';
 import { eSendEvent, ToastEvent } from '../services/EventManager';
 import Navigation from '../services/Navigation';
-import { db } from './DB';
+import { db } from './database';
 import { eClearEditor } from './Events';
 
 export const deleteItems = async (item) => {

apps/mobile/src/utils/useAnnouncement.js

@@ -2,7 +2,7 @@ import {useCallback, useEffect, useState} from 'react';
 import {Platform} from 'react-native';
 import {SUBSCRIPTION_STATUS} from '.';
 import PremiumService from '../services/PremiumService';
-import {db} from './DB';
+import {db} from './database';
 import {MMKV} from './mmkv';
 
 var CACHED_ANNOUNCEMENT;

apps/mobile/src/utils/useAppEvents.js

@@ -30,7 +30,7 @@ import SettingsService from '../services/SettingsService';
 import Sync from '../services/Sync';
 import {APP_VERSION, doInBackground, editing} from '.';
 import {updateStatusBarColor} from './Colors';
-import {db} from './DB';
+import {db} from './database';
 import {
   eClearEditor,
   eCloseProgressDialog,

apps/mobile/src/views/Editor/EditorHeader.js

@@ -25,7 +25,7 @@ import {
 } from '../../services/EventManager';
 import Navigation from '../../services/Navigation';
 import {editing} from '../../utils';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {
   eClearEditor,
   eCloseFullscreenEditor,

apps/mobile/src/views/Editor/Functions.js

@@ -13,7 +13,7 @@ import PremiumService from '../../services/PremiumService';
 import {editing, InteractionManager} from '../../utils';
 import {COLORS_NOTE, COLOR_SCHEME} from '../../utils/Colors';
 import {hexToRGBA} from '../../utils/ColorUtils';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {
   eOnLoadNote,
   eShowGetPremium,

apps/mobile/src/views/Editor/tiny/toolbar/commands.js

@@ -2,7 +2,7 @@ import DocumentPicker from 'react-native-document-picker';
 import Sodium, {launchCamera, launchImageLibrary} from 'react-native-sodium';
 import {eSendEvent} from '../../../../services/EventManager';
 import {editing} from '../../../../utils';
-import {db} from '../../../../utils/DB';
+import {db} from '../../../../utils/database';
 import {
   eCloseProgressDialog,
   eOpenProgressDialog

apps/mobile/src/views/Editor/tiny/toolbar/item.js

@@ -14,7 +14,7 @@ import {
 } from '../../../../services/EventManager';
 import PremiumService from '../../../../services/PremiumService';
 import {editing, showTooltip, TOOLTIP_POSITIONS} from '../../../../utils';
-import {db} from '../../../../utils/DB';
+import {db} from '../../../../utils/database';
 import {eShowGetPremium} from '../../../../utils/Events';
 import {MMKV} from '../../../../utils/mmkv';
 import {normalize, SIZE} from '../../../../utils/SizeUtils';

apps/mobile/src/views/Folders/index.js

@@ -12,7 +12,7 @@ import {eSendEvent} from '../../services/EventManager';
 import Navigation from '../../services/Navigation';
 import SearchService from '../../services/SearchService';
 import {InteractionManager} from '../../utils';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {eScrollEvent} from '../../utils/Events';
 
 export const Folders = ({route, navigation}) => {

apps/mobile/src/views/Home/index.js

@@ -11,7 +11,7 @@ import { eSendEvent } from '../../services/EventManager';
 import Navigation from '../../services/Navigation';
 import SearchService from '../../services/SearchService';
 import { editing, InteractionManager, scrollRef } from '../../utils';
-import { db } from '../../utils/DB';
+import { db } from '../../utils/database';
 import { eClearEditor, eOnLoadNote, eScrollEvent } from '../../utils/Events';
 import { tabBarRef } from '../../utils/Refs';
 import { sleep } from '../../utils/TimeUtils';

apps/mobile/src/views/Notebook/index.js

@@ -13,7 +13,7 @@ import {
 import Navigation from '../../services/Navigation';
 import SearchService from '../../services/SearchService';
 import {InteractionManager} from '../../utils';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {
   eOnNewTopicAdded,
   eOpenAddNotebookDialog,

apps/mobile/src/views/Notes/index.js

@@ -16,7 +16,7 @@ import {
 import Navigation from '../../services/Navigation';
 import SearchService from '../../services/SearchService';
 import { editing, InteractionManager } from '../../utils';
-import { db } from '../../utils/DB';
+import { db } from '../../utils/database';
 import {
   eOnLoadNote,
   eOpenAddTopicDialog,

apps/mobile/src/views/Settings/index.js

@@ -69,7 +69,7 @@ import {
   setColorScheme
 } from '../../utils/Colors';
 import {hexToRGBA, RGB_Linear_Shade} from '../../utils/ColorUtils';
-import {db} from '../../utils/DB';
+import {db} from '../../utils/database';
 import {
   eCloseProgressDialog,
   eOpenLoginDialog,

apps/mobile/src/views/Trash/index.js

@@ -11,7 +11,7 @@ import { eSendEvent, ToastEvent } from '../../services/EventManager';
 import Navigation from '../../services/Navigation';
 import SearchService from '../../services/SearchService';
 import { InteractionManager } from '../../utils';
-import { db } from '../../utils/DB';
+import { db } from '../../utils/database';
 import { eScrollEvent } from '../../utils/Events';
 
 export const Trash = ({route, navigation}) => {