mobile: fix typing in editor title input

.github/workflows/android.publish.internal.yml

@@ -69,6 +69,8 @@ jobs:
         run: |
           sed -i -e 's/arguments/arguments "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",/g' apps/mobile/node_modules/react-native-mmkv-storage/android/build.gradle
           sed -i -e 's/arguments/arguments "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",/g' apps/mobile/node_modules/react-native-reanimated/android/build.gradle
+          sed -i -e 's/defaultConfig {/ndkVersion safeExtGet('ndkVersion', "25.2.9519653")\n  defaultConfig {/g' apps/mobile/node_modules/react-native-reanimated//android/build.gradle
+          sed -i -e 's/defaultConfig {/ndkVersion safeExtGet('ndkVersion', "25.2.9519653")\n  defaultConfig {/g' apps/mobile/node_modules/react-native-mmkv-storage/android/build.gradle
 
       - name: CCache Stats Before Build
         run: ccache -sv

.github/workflows/android.publish.yml

@@ -69,6 +69,8 @@ jobs:
         run: |
           sed -i -e 's/arguments/arguments "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",/g' apps/mobile/node_modules/react-native-mmkv-storage/android/build.gradle
           sed -i -e 's/arguments/arguments "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",/g' apps/mobile/node_modules/react-native-reanimated/android/build.gradle
+          sed -i -e 's/defaultConfig {/ndkVersion safeExtGet('ndkVersion', "25.2.9519653")\n  defaultConfig {/g' apps/mobile/node_modules/react-native-reanimated//android/build.gradle
+          sed -i -e 's/defaultConfig {/ndkVersion safeExtGet('ndkVersion', "25.2.9519653")\n  defaultConfig {/g' apps/mobile/node_modules/react-native-mmkv-storage/android/build.gradle
 
       - name: CCache Stats Before Build
         run: ccache -sv

.github/workflows/desktop.publish.yml

@@ -45,7 +45,7 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -107,8 +107,7 @@ jobs:
           name: Notesnook Desktop v${{ steps.app_metadata.outputs.app_version }}
           tag_name: v${{ steps.app_metadata.outputs.app_version }}
           files: ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip
-          prerelease: ${{ inputs.release-track == 'beta' }}
-          target_commitish: ${{ github.ref }}
+          prerelease: ${{ endsWith(steps.app_metadata.outputs.app_version, '-beta') }}
 
       - name: Generate flatpak sources
         if: inputs.publish-github && inputs.build-linux
@@ -233,8 +232,8 @@ jobs:
           xcrun altool --upload-package $package -t osx --apiKey $API_KEY_ID --apiIssuer $API_KEY_ISSUER_ID --apple-id ${{ steps.app_metadata.outputs.apple_app_id }} --bundle-id ${{ steps.app_metadata.outputs.app_bundle_id }} --bundle-short-version-string ${{ steps.app_metadata.outputs.app_version }} --bundle-version ${{ steps.app_metadata.outputs.bundle_version }}
         working-directory: ./apps/desktop
 
-  build-linux-x64:
-    name: Build for Linux x64
+  build-linux:
+    name: Build for Linux
     needs: build
     if: inputs.build-linux
     runs-on: ubuntu-22.04
@@ -251,7 +250,7 @@ jobs:
         run: echo "SNAPCRAFT_STORE_CREDENTIALS=${{ secrets.snapcraft_token }}" >> $GITHUB_ENV
 
       - name: Install Snapcraft
-        uses: samuelmeuli/action-snapcraft@v3
+        uses: samuelmeuli/action-snapcraft@v1
         if: inputs.publish-snap
 
       - name: Download build
@@ -267,6 +266,7 @@ jobs:
 
       - name: Install sqlite-better-trigram for all arch
         run: |
+          npm i --cpu arm64 sqlite-better-trigram
           npm i --cpu x64 sqlite-better-trigram
         working-directory: ./apps/desktop
 
@@ -285,86 +285,18 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           if [ ${{ inputs.publish-github }} == true ]; then
-            yarn electron-builder --config=electron-builder.config.js --linux AppImage:x64 -p always
+            yarn electron-builder --config=electron-builder.config.js --linux AppImage:x64 AppImage:arm64 -p always
           else
-            yarn electron-builder --config=electron-builder.config.js --linux AppImage:x64 -p never
+            yarn electron-builder --config=electron-builder.config.js --linux AppImage:x64 AppImage:arm64 -p never
           fi
         working-directory: ./apps/desktop
 
       - name: Publish on Snapcraft
         if: inputs.publish-snap
         run: |
-          if [ ${{ inputs.release-track }} == 'beta' ]; then
-            snapcraft upload --release=beta ./output/notesnook_linux_amd64.snap
-          else
-            snapcraft upload --release=stable ./output/notesnook_linux_amd64.snap
-          fi
+          snapcraft upload --release=stable ./output/notesnook_linux_amd64.snap
         working-directory: ./apps/desktop
 
-  build-linux-arm64:
-    name: Build for Linux arm64
-    needs: build
-    if: inputs.build-linux
-    runs-on: ubuntu-22.04-arm
-
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      # - name: Setup Snapcraft Auth
-      #   if: inputs.publish-snap
-      #   run: echo "SNAPCRAFT_STORE_CREDENTIALS=${{ secrets.snapcraft_token }}" >> $GITHUB_ENV
-
-      # - name: Install Snapcraft
-      #   uses: samuelmeuli/action-snapcraft@v1
-      #   if: inputs.publish-snap
-
-      - name: Download build
-        uses: actions/download-artifact@v4
-        with:
-          name: build
-          path: ./apps/web/build
-
-      - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
-
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu arm64 sqlite-better-trigram
-        working-directory: ./apps/desktop
-
-      - name: Build Electron wrapper
-        run: npx nx run release --project @notesnook/desktop
-        working-directory: ./apps/desktop
-
-      # - name: Build snap
-      #   if: inputs.publish-snap
-      #   run: |
-      #     yarn electron-builder --config=electron-builder.config.js --linux snap:arm64 -p never
-      #   working-directory: ./apps/desktop
-
-      - name: Build AppImage
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          if [ ${{ inputs.publish-github }} == true ]; then
-            yarn electron-builder --config=electron-builder.config.js --linux AppImage:arm64 -p always
-          else
-            yarn electron-builder --config=electron-builder.config.js --linux AppImage:arm64 -p never
-          fi
-        working-directory: ./apps/desktop
-
-      # - name: Publish on Snapcraft
-      #   if: inputs.publish-snap
-      #   run: |
-      #     snapcraft upload --release=stable ./output/notesnook_linux_arm64.snap
-      #   working-directory: ./apps/desktop
-
   build-windows:
     name: Build for Windows
     needs: build

.github/workflows/ios.publish.yml

@@ -4,7 +4,7 @@ on: workflow_dispatch
 
 jobs:
   build:
-    runs-on: macos-14
+    runs-on: macos-latest
     timeout-minutes: 60
 
     steps:
@@ -14,11 +14,6 @@ jobs:
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
 
-      - name: Setup Xcode
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: "16.1"
-
       - name: Install node modules
         run: |
           npm ci --ignore-scripts --prefer-offline --no-audit
@@ -59,10 +54,7 @@ jobs:
           key: ${{ runner.os }}-pods-${{ hashFiles('apps/mobile/native/ios/Podfile.lock') }}
 
       - name: Install Pods
-        run: |
-          cd apps/mobile/native/ios
-          bundle install
-          RCT_NEW_ARCH_ENABLED=0 bundle exec pod install
+        run: npm run prepare:ios
 
       - name: CCache Stats Before Build
         run: ccache -sv

.gitignore

@@ -11,4 +11,4 @@ nx-cloud.env
 site
 node_modules.backup
 .nx
-/*.patch
+*.patch

README.md

@@ -66,7 +66,7 @@ We take all queries, issues and bug reports that you might have. Feel free to as
 
 ## Additional Resources
 
-- [Migrating & Importing your data from other apps — Importer](https://help.notesnook.com/importing-notes)
+- [Migrating & Importing your data from other apps — Importer](https://importer.notesnook.com/)
 - [Privacy policy](https://notesnook.com/privacy) & [Terms of service](https://notesnook.com/terms)
 - [Verify Notesnook encryption claims yourself — Vericrypt](https://vericrypt.notesnook.com/)
 - [Why Notesnook requires an email address?](https://blog.notesnook.com/why-notesnook-requires-an-email-address/)

apps/desktop/README.md

@@ -58,10 +58,10 @@ This will compile and run the app in production mode but it won't generate any p
 npm run release -- --rebuild
 
 # For macOS
-npx electron-builder --config=electron-builder.config.js --mac dmg --arm64 --x64 --publish never
+npx electron-builder --config=electron-builder.config.js --mac dmg --arm64 --x64 -publish never
 
 # For Linux (AppImage)
-npx electron-builder --config=electron-builder.config.js --linux AppImage:x64 AppImage:arm64 --publish never
+npx electron-builder --config=electron-builder.config.js --linux AppImage:x64 AppImage:arm64 -publish never
 
 # For Windows
 npx electron-builder --config=electron-builder.config.js --win --publish never

apps/desktop/electron-builder.config.js

@@ -38,9 +38,6 @@ const linuxExecutableName = process.env.NN_PRODUCT_NAME
 const year = new Date().getFullYear();
 const isBeta = pkg.version.includes("-beta");
 
-/**
- * @type {import("app-builder-lib").Configuration}
- */
 module.exports = {
   appId: appId,
   productName: productName,
@@ -60,7 +57,6 @@ module.exports = {
     "node_modules/bindings",
     "node_modules/node-gyp-build",
     "node_modules/sqlite-better-trigram",
-    "node_modules/sqlite3-fts5-html",
     "node_modules/sodium-native/prebuilds/${platform}-${arch}",
     {
       from: "node_modules/sqlite-better-trigram-linux-${arch}",
@@ -74,20 +70,6 @@ module.exports = {
       from: "node_modules/sqlite-better-trigram-windows-${arch}",
       to: "node_modules/sqlite-better-trigram-windows-${arch}"
     },
-
-    {
-      from: "node_modules/sqlite3-fts5-html-linux-${arch}",
-      to: "node_modules/sqlite3-fts5-html-linux-${arch}"
-    },
-    {
-      from: "node_modules/sqlite3-fts5-html-darwin-${arch}",
-      to: "node_modules/sqlite3-fts5-html-darwin-${arch}"
-    },
-    {
-      from: "node_modules/sqlite3-fts5-html-windows-${arch}",
-      to: "node_modules/sqlite3-fts5-html-windows-${arch}"
-    },
-
     "node_modules/sodium-native/index.js",
     "node_modules/sodium-native/package.json"
   ],
@@ -178,27 +160,29 @@ module.exports = {
     description: "Your private note taking space",
     executableName: linuxExecutableName,
     desktop: {
-      desktopActions: {
-        "new-note": {
-          Name: "New note",
-          Exec: `${linuxExecutableName} new note`
+      actions: [
+        {
+          id: "new-note",
+          name: "New note",
+          args: "new note"
         },
-        "new-notebook": {
-          Name: "New notebook",
-          Exec: `${linuxExecutableName} new notebook`
+        {
+          id: "new-notebook",
+          name: "New notebook",
+          args: "new notebook"
         },
-        "new-reminder": {
-          Name: "New reminder",
-          Exec: `${linuxExecutableName} new reminder`
+        {
+          id: "new-reminder",
+          name: "New reminder",
+          args: "new reminder"
         }
-      }
+      ]
     }
   },
   snap: {
     autoStart: false,
     confinement: "strict",
-    allowNativeWayland: true,
-    base: "core22"
+    allowNativeWayland: true
   },
   extraResources: ["app-update.yml", "./assets/**"],
   extraMetadata: {

apps/desktop/package.json

@@ -2,7 +2,7 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "3.2.3",
+  "version": "3.1.0",
   "appAppleId": "1544027013",
   "private": true,
   "main": "./dist/cjs/index.js",
@@ -27,42 +27,37 @@
   "dependencies": {
     "@lingui/core": "5.1.2",
     "@notesnook/intl": "file:../../packages/intl",
-    "@notesnook/ui": "file:../../packages/ui",
     "@trpc/client": "10.45.2",
     "@trpc/server": "10.45.2",
-    "better-sqlite3-multiple-ciphers": "^11.10.0",
+    "better-sqlite3-multiple-ciphers": "11.5.0",
     "electron-trpc": "0.7.1",
-    "electron-updater": "^6.6.2",
-    "icojs": "^0.19.5",
-    "sqlite-better-trigram": "0.0.3",
-    "sqlite3-fts5-html": "^0.0.4",
+    "electron-updater": "^6.3.4",
+    "icojs": "^0.19.4",
+    "sqlite-better-trigram": "0.0.2",
     "typed-emitter": "^2.1.0",
     "yargs": "^17.7.2",
-    "zod": "3.24.3"
+    "zod": "3.23.8"
   },
   "devDependencies": {
     "@streetwriters/kysely": "^0.27.4",
-    "@types/node": "22.15.3",
+    "@types/node": "22.7.0",
     "@types/yargs": "^17.0.33",
-    "chokidar": "^4.0.3",
-    "electron": "^34.0.0",
-    "electron-builder": "^26.0.12",
+    "chokidar": "^4.0.1",
+    "electron": "^31.7.4",
+    "electron-builder": "^25.1.8",
     "esbuild": "0.21.5",
-    "node-abi": "^4.5.0",
-    "node-gyp-build": "^4.8.4",
-    "playwright": "1.48.2",
+    "node-abi": "^3.68.0",
+    "node-gyp-build": "^4.8.2",
+    "playwright": "^1.48.2",
     "prebuildify": "^6.0.1",
     "slugify": "1.6.6",
     "tree-kill": "^1.2.2",
-    "undici": "^7.8.0",
-    "vitest": "2.1.8"
+    "undici": "^6.19.8",
+    "vitest": "^2.1.8"
   },
   "optionalDependencies": {
     "dmg-license": "^1.0.11"
   },
-  "overrides": {
-    "@electron/node-gyp": "^10.2.0-electron.2"
-  },
   "scripts": {
     "start": "node scripts/dev.mjs",
     "staging": "node scripts/build.mjs --run",

apps/desktop/patches/app-builder-lib+25.0.5.patch

@@ -0,0 +1,36 @@
+diff --git a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
+index 739a48c..7a7b4af 100644
+--- a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
++++ b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
+@@ -117,6 +117,7 @@ class LinuxTargetHelper {
+             StartupWMClass: appInfo.productName,
+             ...extra,
+             ...targetSpecificOptions.desktop,
++            actions: undefined
+         };
+         const description = this.getDescription(targetSpecificOptions);
+         if (!(0, builder_util_1.isEmptyOrSpaces)(description)) {
+@@ -160,6 +161,23 @@ class LinuxTargetHelper {
+             data += `\n${name}=${desktopMeta[name]}`;
+         }
+         data += "\n";
++               
++        if (targetSpecificOptions.desktop.actions) {
++            let actionsData = "";
++            const validActions = [];
++            for (const action of targetSpecificOptions.desktop.actions) {
++                if (!action.id || !action.name || !action.args) continue;
++                actionsData += "\n";
++                actionsData += `[Desktop Action ${action.id}]
++Name=${action.name}
++Exec=${desktopMeta.Exec} ${action.args}`;
++                actionsData += "\n";
++
++                validActions.push(action.id);
++            }
++
++            data += `Actions=${validActions.join(";")};\n${actionsData}`
++        }
+         return Promise.resolve(data);
+     }
+ }

apps/desktop/patches/app-builder-lib+26.0.12.patch

@@ -1,13 +0,0 @@
-diff --git a/node_modules/app-builder-lib/out/targets/snap.js b/node_modules/app-builder-lib/out/targets/snap.js
-index 0b5405e..753f6c6 100644
---- a/node_modules/app-builder-lib/out/targets/snap.js
-+++ b/node_modules/app-builder-lib/out/targets/snap.js
-@@ -115,7 +115,7 @@ class SnapTarget extends core_1.Target {
-         else {
-             const archTriplet = archNameToTriplet(arch);
-             appDescriptor.environment = {
--                DISABLE_WAYLAND: options.allowNativeWayland ? "" : "1",
-+                DISABLE_WAYLAND: options.allowNativeWayland ? "0" : "1",
-                 PATH: "$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH",
-                 SNAP_DESKTOP_RUNTIME: "$SNAP/gnome-platform",
-                 LD_LIBRARY_PATH: [

apps/desktop/patches/better-sqlite3-multiple-ciphers+11.10.0.patch

@@ -1,11 +0,0 @@
-diff --git a/node_modules/better-sqlite3-multiple-ciphers/deps/defines.gypi b/node_modules/better-sqlite3-multiple-ciphers/deps/defines.gypi
-index 1a14ecd..ff938f1 100644
---- a/node_modules/better-sqlite3-multiple-ciphers/deps/defines.gypi
-+++ b/node_modules/better-sqlite3-multiple-ciphers/deps/defines.gypi
-@@ -38,5 +38,6 @@
-     'SQLITE_TRACE_SIZE_LIMIT=32',
-     'SQLITE_USER_AUTHENTICATION=0',
-     'SQLITE_USE_URI=0',
-+    'SQLITE_ENABLE_REGEXP',
-   ],
- }

apps/desktop/patches/electron-trpc+0.6.1.patch

@@ -0,0 +1,39 @@
+diff --git a/node_modules/electron-trpc/dist/main.mjs b/node_modules/electron-trpc/dist/main.mjs
+index 07971db..b67a3cf 100644
+--- a/node_modules/electron-trpc/dist/main.mjs
++++ b/node_modules/electron-trpc/dist/main.mjs
+@@ -537,8 +537,15 @@ class be {
+   attachWindow(r) {
+     F(this, w).includes(r) || (y("Attaching window", r.id), F(this, w).push(r), v(this, N, Z).call(this, r));
+   }
+-  detachWindow(r) {
+-    y("Detaching window", r.id), L(this, w, F(this, w).filter((e) => e !== r)), v(this, R, M).call(this, { webContentsId: r.webContents.id });
++  detachWindow(r, webContentsId) {
++    y("Detaching window", r.id);
++
++    if (r.isDestroyed() && webContentsId === undefined) {
++      throw new Error('webContentsId is required when calling detachWindow on a destroyed window');
++    }
++
++    L(this, w, F(this, w).filter((e) => e !== r));
++    v(this, R, M).call(this, { webContentsId: webContentsId ?? r.webContents.id });
+   }
+ }
+ w = new WeakMap(), E = new WeakMap(), R = new WeakSet(), M = function({
+@@ -548,6 +555,7 @@ w = new WeakMap(), E = new WeakMap(), R = new WeakSet(), M = function({
+   for (const [i, a] of F(this, E).entries())
+     i.startsWith(`${r}-${e ?? ""}`) && (y("Closing subscription", i), a.unsubscribe(), F(this, E).delete(i));
+ }, N = new WeakSet(), Z = function(r) {
++  const webContentsId = r.webContents.id;
+   r.webContents.on("did-start-navigation", ({ frame: e }) => {
+     y(
+       "Handling webContents `did-start-navigation` event",
+@@ -558,7 +566,7 @@ w = new WeakMap(), E = new WeakMap(), R = new WeakSet(), M = function({
+       frameRoutingId: e.routingId
+     });
+   }), r.webContents.on("destroyed", () => {
+-    y("Handling webContents `destroyed` event"), this.detachWindow(r);
++    y("Handling webContents `destroyed` event"), this.detachWindow(r, webContentsId);
+   });
+ };
+ const me = ({

apps/desktop/scripts/build.mjs

@@ -43,7 +43,8 @@ if (args.rebuild || !existsSync(path.join(webAppPath, "build"))) {
   );
 }
 
-await patchBetterSQLite3();
+// temporary until there's support for prebuilt binaries for linux ARM
+if (os.platform() === "linux") await patchBetterSQLite3();
 
 await fs.cp(path.join(webAppPath, "build"), path.join(root, "build"), {
   recursive: true,

apps/desktop/scripts/patch-better-sqlite3.mjs

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { readFile, rm, writeFile } from "fs/promises";
+import { readFile, writeFile } from "fs/promises";
 import path from "path";
 import { fileURLToPath } from "url";
 
@@ -25,8 +25,6 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 export async function patchBetterSQLite3() {
-  console.log("Patching better-sqlite3");
-
   const jsonPath = path.join(
     __dirname,
     "..",
@@ -36,23 +34,15 @@ export async function patchBetterSQLite3() {
   );
   const json = JSON.parse(await readFile(jsonPath, "utf-8"));
 
-  delete json.homepage;
-  delete json.repository;
+  json.version = "11.5.1";
+  json.homepage = "https://github.com/thecodrr/better-sqlite3-multiple-ciphers";
+  json.repository.url =
+    "git://github.com/thecodrr/better-sqlite3-multiple-ciphers.git";
 
   await writeFile(jsonPath, JSON.stringify(json));
-
-  await rm(
-    path.join(
-      __dirname,
-      "..",
-      "node_modules",
-      "better-sqlite3-multiple-ciphers",
-      "build"
-    ),
-    { force: true, recursive: true }
-  );
 }
 
 if (process.argv[1] === __filename) {
+  console.log("Patching better-sqlite3");
   patchBetterSQLite3();
 }

apps/desktop/src/api/os-integration.ts

@@ -19,16 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { initTRPC } from "@trpc/server";
 import { z } from "zod";
-import {
-  app,
-  dialog,
-  Menu,
-  MenuItem,
-  nativeImage,
-  nativeTheme,
-  Notification,
-  shell
-} from "electron";
+import { app, dialog, nativeTheme, Notification, shell } from "electron";
 import { AutoLaunch } from "../utils/autolaunch";
 import { config, DesktopIntegration } from "../utils/config";
 import { bringToFront } from "../utils/bring-to-front";
@@ -42,7 +33,6 @@ import { isFlatpak, isSnap } from "../utils";
 import { setupDesktopIntegration } from "../utils/desktop-integration";
 import { rm } from "fs/promises";
 import { disableCustomDns, enableCustomDns } from "../utils/custom-dns";
-import type { MenuItem as NNMenuItem } from "@notesnook/ui";
 
 const t = initTRPC.create();
 
@@ -235,63 +225,5 @@ export const osIntegrationRouter = t.router({
         nativeTheme.off("updated", updated);
       };
     })
-  ),
-
-  showMenu: t.procedure
-    .input(
-      z.object({
-        menuItems: z.array(z.any())
-      })
-    )
-    .subscription(({ input: { menuItems } }) =>
-      observable<string[]>((emit) => {
-        const items = menuItems as NNMenuItem[];
-        const menu = new Menu();
-        for (const item of items) {
-          const menuItem = toMenuItem(item, (id) => emit.next(id));
-          if (menuItem) menu.append(menuItem);
-        }
-        if (menu.items.length > 0) menu.popup();
-        return () => {
-          menu.removeAllListeners();
-          menu.closePopup();
-        };
-      })
-    )
+  )
 });
-
-function toMenuItem(
-  item: NNMenuItem,
-  onClick: (id: string[]) => void,
-  parentKey?: string
-): MenuItem | undefined {
-  switch (item.type) {
-    case "lazy-loader":
-      return undefined;
-    case "separator":
-      return new MenuItem({ type: "separator" });
-    case "button": {
-      const submenu = item.menu ? new Menu() : undefined;
-      if (submenu && item.menu) {
-        for (const subitem of item.menu.items) {
-          const subMenuItem = toMenuItem(subitem, onClick, item.key);
-          if (subMenuItem) submenu.append(subMenuItem);
-        }
-      }
-
-      return new MenuItem({
-        label: item.title,
-        enabled: !item.isDisabled,
-        visible: !item.isHidden,
-        toolTip: item.tooltip,
-        sublabel: item.tooltip,
-        checked: item.isChecked,
-        type: submenu ? "submenu" : item.isChecked ? "checkbox" : "normal",
-        id: item.key,
-        submenu,
-        click: () => onClick(parentKey ? [parentKey, item.key] : [item.key]),
-        accelerator: item.modifier?.replace("Mod", "CommandOrControl")
-      });
-    }
-  }
-}

apps/desktop/src/api/sqlite-kysely.ts

@@ -33,8 +33,6 @@ export class SQLite {
   initialized = false;
   preparedStatements: Map<string, Statement<unknown[]>> = new Map();
   retryCounter: Record<string, number> = {};
-  extensionsLoaded = false;
-
   constructor() {
     console.log("new sqlite worker");
   }
@@ -48,6 +46,8 @@ export class SQLite {
     this.sqlite = require("better-sqlite3-multiple-ciphers")(
       filePath
     ).unsafeMode(true);
+    const betterTrigram = require("sqlite-better-trigram");
+    betterTrigram.load(this.sqlite);
   }
 
   /**
@@ -115,20 +115,6 @@ export class SQLite {
     } catch (e) {
       if (e instanceof Error) e.message += ` (query: ${sql})`;
       throw e;
-    } finally {
-      // Since SQLite 3.48.0 (SQLite3MC v2.0.2) it's not possible to load fts5
-      // extensions before database has been decrypting. This is because
-      // executing a `SELECT` now accesses the underlying databases resulting in
-      // an error. Since FTS5 extensions depend on `SELECT fts5` to load the
-      // fts5 API, we must wait decrypt the database before we can load
-      // the extensions.
-      if (!this.extensionsLoaded && (await this.isDatabaseReady())) {
-        const betterTrigram = require("sqlite-better-trigram");
-        const fts5Html = require("sqlite3-fts5-html");
-        betterTrigram.load(this.sqlite);
-        fts5Html.load(this.sqlite);
-        this.extensionsLoaded = true;
-      }
     }
   }
 
@@ -156,22 +142,4 @@ export class SQLite {
       retryDelay: 500
     });
   }
-
-  /**
-   * This just executes `SELECT 1` on the database to make sure its ready.
-   * On an encrypted database, this will fail until `PRAGMA key` has been
-   * called.
-   */
-  private async isDatabaseReady() {
-    // return this.exec(`SELECT 1;`)
-    //   .then(() => true)
-    //   .catch(() => false);
-    if (!this.sqlite) return false;
-    try {
-      this.sqlite.prepare(`SELECT 1;`).run();
-      return true;
-    } catch {
-      return false;
-    }
-  }
 }

apps/desktop/src/utils/menu.ts

@@ -143,44 +143,16 @@ function setupMenu() {
         })
       );
 
-    if (params.isEditable) {
+    if (params.isEditable)
       menu.append(
         new MenuItem({
           label: strings.paste(),
-          role: "paste",
+          role: "pasteAndMatchStyle",
           enabled: clipboard.readText("clipboard").length > 0,
           accelerator: "CommandOrControl+V"
         })
       );
 
-      menu.append(
-        new MenuItem({
-          label:
-            process.platform === "darwin"
-              ? strings.pasteAndMatchStyle()
-              : strings.pasteWithoutFormatting(),
-          role: "pasteAndMatchStyle",
-          enabled: clipboard.readText("clipboard").length > 0,
-          accelerator:
-            process.platform === "darwin"
-              ? "Option+Shift+Command+V"
-              : "Shift+CommandOrControl+V"
-        })
-      );
-
-      menu.append(
-        new MenuItem({
-          type: "separator"
-        })
-      );
-      menu.append(
-        new MenuItem({
-          label: strings.spellCheck(),
-          role: "toggleSpellChecker"
-        })
-      );
-    }
-
     if (menu.items.length > 0) menu.popup();
   });
 }

apps/mobile/.gitignore

@@ -69,7 +69,6 @@ buck-out/
 */fastlane/report.xml
 */fastlane/Preview.html
 */fastlane/screenshots
-native/vendor
 
 # Bundle artifact
 *.jsbundle

apps/mobile/app/components/attachments/actions.tsx

@@ -167,7 +167,6 @@ const Actions = ({
               setAttachments();
               eSendEvent(eDBItemUpdate, attachment.id);
             }
-            return true;
           },
           positiveText: strings.rename()
         });

apps/mobile/app/components/auth/change-password.js

@@ -17,20 +17,26 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { strings } from "@notesnook/intl";
 import React, { useRef, useState } from "react";
 import { View } from "react-native";
 import { db } from "../../common/database";
-import BackupService from "../../services/backup";
-import { eSendEvent, ToastManager } from "../../services/event-manager";
-import Navigation from "../../services/navigation";
+import {
+  eSendEvent,
+  presentSheet,
+  ToastManager
+} from "../../services/event-manager";
 import { useUserStore } from "../../stores/use-user-store";
-import { eOpenRecoveryKeyDialog } from "../../utils/events";
-import { DefaultAppStyles } from "../../utils/styles";
-import { Dialog } from "../dialog";
+import { eCloseSheet, eOpenRecoveryKeyDialog } from "../../utils/events";
+import DialogHeader from "../dialog/dialog-header";
 import { Button } from "../ui/button";
 import Input from "../ui/input";
 import { Notice } from "../ui/notice";
+import Seperator from "../ui/seperator";
+import { Dialog } from "../dialog";
+import BackupService from "../../services/backup";
+import { sleep } from "../../utils/time";
+import { strings } from "@notesnook/intl";
+import { DefaultAppStyles } from "../../utils/styles";
 
 export const ChangePassword = () => {
   const passwordInputRef = useRef();
@@ -79,7 +85,8 @@ export const ChangePassword = () => {
         context: "global"
       });
       setLoading(false);
-      Navigation.goBack();
+      eSendEvent(eCloseSheet);
+      await sleep(300);
       eSendEvent(eOpenRecoveryKeyDialog);
     } catch (e) {
       setLoading(false);
@@ -101,6 +108,9 @@ export const ChangePassword = () => {
       }}
     >
       <Dialog context="change-password-dialog" />
+      <DialogHeader title={strings.changePassword()} />
+      <Seperator />
+
       <Input
         fwdRef={oldPasswordInputRef}
         onChangeText={(value) => {
@@ -150,3 +160,9 @@ export const ChangePassword = () => {
     </View>
   );
 };
+
+ChangePassword.present = () => {
+  presentSheet({
+    component: <ChangePassword />
+  });
+};

apps/mobile/app/components/auth/login.js

@@ -39,7 +39,6 @@ import { hideAuth } from "./common";
 import { ForgotPassword } from "./forgot-password";
 import { useLogin } from "./use-login";
 import { DefaultAppStyles } from "../../utils/styles";
-import { Dialog } from "../dialog";
 
 const LoginSteps = {
   emailAuth: 1,
@@ -90,7 +89,7 @@ export const Login = ({ changeMode }) => {
   return (
     <>
       <ForgotPassword />
-      <Dialog context="two_factor_verify" />
+      <SheetProvider context="two_factor_verify" />
       <View
         style={{
           borderRadius: DDS.isTab ? 5 : 0,

apps/mobile/app/components/auth/two-factor.js

@@ -24,8 +24,12 @@ import { View } from "react-native";
 import { ScrollView } from "react-native-actions-sheet";
 import { db } from "../../common/database/index";
 import useTimer from "../../hooks/use-timer";
-import { eSendEvent, ToastManager } from "../../services/event-manager";
-import { eCloseSimpleDialog } from "../../utils/events";
+import {
+  eSendEvent,
+  presentSheet,
+  ToastManager
+} from "../../services/event-manager";
+import { eCloseSheet } from "../../utils/events";
 import { AppFontSize } from "../../utils/size";
 import { Button } from "../ui/button";
 import { IconButton } from "../ui/icon-button";
@@ -34,7 +38,6 @@ import { Pressable } from "../ui/pressable";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
 import { DefaultAppStyles } from "../../utils/styles";
-import { presentDialog } from "../dialog/functions";
 
 const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
   const { colors } = useThemeColors();
@@ -43,7 +46,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
     method: mfaInfo?.primaryMethod,
     isPrimary: true
   });
-  const { seconds, start, reset } = useTimer(currentMethod.method);
+  const { seconds, start } = useTimer(currentMethod.method);
   const [loading, setLoading] = useState(false);
   const inputRef = useRef();
   const [sending, setSending] = useState(false);
@@ -59,7 +62,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
       },
       (result) => {
         if (result) {
-          eSendEvent(eCloseSimpleDialog, "two_factor_verify");
+          eSendEvent(eCloseSheet, "two_factor_verify");
         }
         setLoading(false);
       }
@@ -130,12 +133,6 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
     <ScrollView
       keyboardShouldPersistTaps="handled"
       keyboardDismissMode="interactive"
-      style={{
-        width: "100%",
-        height: "100%",
-        backgroundColor: colors.primary.background,
-        paddingTop: 60
-      }}
     >
       <View
         style={{
@@ -239,10 +236,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
             <Button
               title={strings.cancel()}
               type="secondaryAccented"
-              onPress={() => {
-                reset();
-                onCancel();
-              }}
+              onPress={onCancel}
               width={250}
             />
 
@@ -303,7 +297,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
 };
 
 TwoFactorVerification.present = (onMfaLogin, data, onCancel, context) => {
-  presentDialog({
+  presentSheet({
     component: () => (
       <TwoFactorVerification
         onMfaLogin={onMfaLogin}
@@ -312,9 +306,7 @@ TwoFactorVerification.present = (onMfaLogin, data, onCancel, context) => {
       />
     ),
     context: context || "two_factor_verify",
-    disableClosing: true,
-    transparent: false,
-    statusBarTranslucent: true
+    disableClosing: true
   });
 };
 

apps/mobile/app/components/auth/use-login.js

@@ -24,7 +24,7 @@ import { clearMessage } from "../../services/message";
 import PremiumService from "../../services/premium";
 import SettingsService from "../../services/settings";
 import { useUserStore } from "../../stores/use-user-store";
-import { eCloseSimpleDialog } from "../../utils/events";
+import { eCloseSheet } from "../../utils/events";
 import TwoFactorVerification from "./two-factor";
 import { strings } from "@notesnook/intl";
 
@@ -92,7 +92,7 @@ export const useLogin = (onFinishLogin, sessionExpired = false) => {
                 } catch (e) {
                   callback && callback(false);
                   if (e.message === "invalid_grant") {
-                    eSendEvent(eCloseSimpleDialog, "two_factor_verify");
+                    eSendEvent(eCloseSheet, "two_factor_verify");
                     setLoading(false);
                     setStep(LoginSteps.emailAuth);
                   }
@@ -100,7 +100,7 @@ export const useLogin = (onFinishLogin, sessionExpired = false) => {
               },
               mfaInfo,
               () => {
-                eSendEvent(eCloseSimpleDialog, "two_factor_verify");
+                eSendEvent(eCloseSheet, "two_factor_verify");
                 setLoading(false);
                 setStep(LoginSteps.emailAuth);
               }

apps/mobile/app/components/container/floating-button.tsx

@@ -36,7 +36,6 @@ import { getElevationStyle } from "../../utils/elevation";
 import { AppFontSize, normalize } from "../../utils/size";
 import { DefaultAppStyles } from "../../utils/styles";
 import { hexToRGBA, RGB_Linear_Shade } from "../../utils/colors";
-import useKeyboard from "../../hooks/use-keyboard";
 
 interface FloatingButtonProps {
   onPress: () => void;

apps/mobile/app/components/dialog/dialog-buttons.js

@@ -26,7 +26,7 @@ import { notesnook } from "../../../e2e/test.ids";
 import { getColorLinearShade } from "../../utils/colors";
 import { AppFontSize } from "../../utils/size";
 import { DefaultAppStyles } from "../../utils/styles";
-import { Button, ButtonProps } from "../ui/button";
+import { Button } from "../ui/button";
 import Paragraph from "../ui/typography/paragraph";
 
 const DialogButtons = ({
@@ -37,14 +37,6 @@ const DialogButtons = ({
   loading,
   doneText,
   positiveType
-}: {
-  onPressPositive?: () => void;
-  onPressNegative: () => void;
-  positiveTitle: string;
-  negativeTitle?: string;
-  loading?: boolean;
-  doneText?: string;
-  positiveType?: ButtonProps["type"];
 }) => {
   const { colors, isDark } = useThemeColors();
 

apps/mobile/app/components/dialog/dialog-header.tsx

@@ -21,7 +21,7 @@ import React from "react";
 import { Text, View, ViewStyle } from "react-native";
 import { useThemeColors } from "@notesnook/theme";
 import { AppFontSize } from "../../utils/size";
-import { Button, ButtonProps } from "../ui/button";
+import { Button } from "../ui/button";
 import { PressableProps } from "../ui/pressable";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
@@ -31,7 +31,13 @@ type DialogHeaderProps = {
   icon?: string;
   title?: string;
   paragraph?: string;
-  button?: ButtonProps;
+  button?: {
+    onPress?: () => void;
+    loading?: boolean;
+    title?: string;
+    type?: PressableProps["type"];
+    icon?: string;
+  };
   paragraphColor?: string;
   padding?: number;
   centered?: boolean;
@@ -89,14 +95,17 @@ const DialogHeader = ({
 
             {button ? (
               <Button
+                onPress={button.onPress}
                 style={{
                   borderRadius: 100,
                   paddingHorizontal: DefaultAppStyles.GAP
                 }}
+                loading={button.loading}
                 fontSize={13}
+                title={button.title}
+                icon={button.icon}
                 type={button.type || "secondary"}
                 height={30}
-                {...button}
               />
             ) : null}
           </View>

apps/mobile/app/components/dialog/functions.ts

@@ -17,20 +17,15 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { KeyboardTypeOptions } from "react-native";
 import { eSendEvent } from "../../services/event-manager";
 import { eCloseSimpleDialog, eOpenSimpleDialog } from "../../utils/events";
-import { ButtonProps } from "../ui/button";
 
-export type DialogInfo = {
+type DialogInfo = {
   title?: string;
   paragraph?: string;
-  positiveText: string;
-  negativeText: string;
-  background?: string;
-  transparent?: boolean;
-  statusBarTranslucent?: boolean;
-  positivePress?: (...args: any[]) => Promise<any>;
+  positiveText?: string;
+  negativeText?: string;
+  positivePress?: (...args: any[]) => void;
   onClose?: () => void;
   positiveType?:
     | "transparent"
@@ -49,18 +44,16 @@ export type DialogInfo = {
   // eslint-disable-next-line @typescript-eslint/ban-types
   context: "global" | "local" | (string & {});
   secureTextEntry?: boolean;
-  keyboardType?: KeyboardTypeOptions;
+  keyboardType?: string;
   check?: {
     info: string;
-    type?: ButtonProps["type"];
+    type?: string;
     defaultValue?: boolean;
   };
   notice: {
     text: string;
     type: "alert" | "information";
   };
-  disableBackdropClosing: boolean;
-  component: JSX.Element | ((close?: () => void) => JSX.Element);
 };
 
 export function presentDialog(data: Partial<DialogInfo>): void {

apps/mobile/app/components/dialog/index.js

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import React, { useCallback, useEffect, useRef, useState } from "react";
-import { TextInput, View, ViewStyle } from "react-native";
+import { View } from "react-native";
 import { DDS } from "../../services/device-detection";
 import {
   eSubscribeEvent,
@@ -40,26 +40,42 @@ import Seperator from "../ui/seperator";
 import BaseDialog from "./base-dialog";
 import DialogButtons from "./dialog-buttons";
 import DialogHeader from "./dialog-header";
-import { DialogInfo } from "./functions";
 
-export const Dialog = ({ context = "global" }: { context?: string }) => {
+export const Dialog = ({ context = "global" }) => {
   const { colors } = useThemeColors();
-  const [visible, setVisible] = useState<boolean>();
-  const [checked, setChecked] = useState<boolean>();
-  const [loading, setLoading] = useState<boolean>();
-  const values = useRef<{
-    inputValue?: string;
-  }>({
+  const [visible, setVisible] = useState(false);
+  const [checked, setChecked] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const values = useRef({
     inputValue: undefined
   });
-  const inputRef = useRef<TextInput>(null);
-  const [dialogInfo, setDialogInfo] = useState<DialogInfo>();
+  const inputRef = useRef();
+  const [dialogInfo, setDialogInfo] = useState({
+    title: "",
+    paragraph: "",
+    positiveText: strings.done(),
+    negativeText: strings.cancel(),
+    positivePress: () => {},
+    onClose: () => {},
+    positiveType: "transparent",
+    icon: null,
+    paragraphColor: colors.primary.paragraph,
+    input: false,
+    inputPlaceholder: "Enter some text",
+    defaultValue: "",
+    disableBackdropClosing: false,
+    check: {
+      info: "Check",
+      type: "transparent",
+      defaultValue: false
+    }
+  });
 
   const onPressPositive = async () => {
-    if (dialogInfo?.positivePress) {
+    if (dialogInfo.positivePress) {
       inputRef.current?.blur();
       setLoading(true);
-      let result = false;
+      let result;
       try {
         result = await dialogInfo.positivePress(
           values.current.inputValue || dialogInfo.defaultValue,
@@ -81,7 +97,7 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
   };
 
   const show = useCallback(
-    (data: DialogInfo) => {
+    (data) => {
       if (!data.context) data.context = "global";
       if (data.context !== context) return;
       setDialogInfo(data);
@@ -92,14 +108,6 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
     [context]
   );
 
-  const hide = React.useCallback(() => {
-    setChecked(false);
-    values.current.inputValue = undefined;
-    setVisible(false);
-    setDialogInfo(undefined);
-    dialogInfo?.onClose?.();
-  }, [dialogInfo]);
-
   useEffect(() => {
     eSubscribeEvent(eOpenSimpleDialog, show);
     eSubscribeEvent(eCloseSimpleDialog, hide);
@@ -110,14 +118,21 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
     };
   }, [hide, show]);
 
+  const hide = React.useCallback(() => {
+    setChecked(false);
+    values.current.inputValue = undefined;
+    setVisible(false);
+    dialogInfo.onClose?.();
+  }, [dialogInfo]);
+
   const onNegativePress = async () => {
-    if (dialogInfo?.onClose) {
+    if (dialogInfo.onClose) {
       await dialogInfo.onClose();
     }
     hide();
   };
 
-  const style: ViewStyle = {
+  const style = {
     ...getElevationStyle(5),
     width: DDS.isTab ? 400 : "85%",
     maxHeight: 450,
@@ -128,19 +143,11 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
     overflow: "hidden"
   };
 
-  return visible && dialogInfo ? (
+  return visible ? (
     <BaseDialog
-      statusBarTranslucent={
-        dialogInfo.statusBarTranslucent === undefined
-          ? false
-          : dialogInfo.statusBarTranslucent
-      }
+      statusBarTranslucent={false}
       bounce={!dialogInfo.input}
       closeOnTouch={!dialogInfo.disableBackdropClosing}
-      background={dialogInfo.background}
-      transparent={
-        dialogInfo.transparent === undefined ? true : dialogInfo.transparent
-      }
       onShow={async () => {
         if (dialogInfo.input) {
           inputRef.current?.setNativeProps({
@@ -153,99 +160,89 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
       visible={true}
       onRequestClose={hide}
     >
-      {typeof dialogInfo.component === "function"
-        ? dialogInfo.component(() => hide())
-        : dialogInfo.component}
+      <View style={style}>
+        <DialogHeader
+          title={dialogInfo.title}
+          icon={dialogInfo.icon}
+          paragraph={dialogInfo.paragraph}
+          paragraphColor={dialogInfo.paragraphColor}
+          padding={12}
+          style={{
+            minHeight: 0
+          }}
+        />
+        <Seperator half />
 
-      {dialogInfo.component ? null : (
-        <View style={style}>
-          <DialogHeader
-            title={dialogInfo.title}
-            icon={dialogInfo.icon}
-            paragraph={dialogInfo.paragraph}
-            paragraphColor={dialogInfo.paragraphColor}
-            padding={12}
+        {dialogInfo.input ? (
+          <View
             style={{
-              minHeight: 0
+              paddingHorizontal: DefaultAppStyles.GAP
             }}
-          />
-          <Seperator half />
-
-          {dialogInfo.input ? (
-            <View
-              style={{
-                paddingHorizontal: DefaultAppStyles.GAP
+          >
+            <Input
+              fwdRef={inputRef}
+              autoCapitalize="none"
+              onChangeText={(value) => {
+                values.current.inputValue = value;
               }}
-            >
-              <Input
-                fwdRef={inputRef}
-                autoCapitalize="none"
-                onChangeText={(value) => {
-                  values.current.inputValue = value;
-                }}
-                testID="input-value"
-                secureTextEntry={dialogInfo.secureTextEntry}
-                //defaultValue={dialogInfo.defaultValue}
-                onSubmit={() => {
-                  onPressPositive();
-                }}
-                returnKeyLabel="Done"
-                returnKeyType="done"
-                keyboardType={dialogInfo.keyboardType || "default"}
-                placeholder={dialogInfo.inputPlaceholder}
-              />
-            </View>
-          ) : null}
+              testID="input-value"
+              secureTextEntry={dialogInfo.secureTextEntry}
+              //defaultValue={dialogInfo.defaultValue}
+              onSubmit={onPressPositive}
+              returnKeyLabel="Done"
+              returnKeyType="done"
+              keyboardType={dialogInfo.keyboardType || "default"}
+              placeholder={dialogInfo.inputPlaceholder}
+            />
+          </View>
+        ) : null}
 
-          {dialogInfo?.notice ? (
-            <View
-              style={{
-                paddingHorizontal: DefaultAppStyles.GAP
+        {dialogInfo?.notice ? (
+          <View
+            style={{
+              paddingHorizontal: DefaultAppStyles.GAP
+            }}
+          >
+            <Notice
+              type={dialogInfo.notice.type || "information"}
+              text={dialogInfo.notice.text}
+            />
+          </View>
+        ) : null}
+
+        {dialogInfo.check ? (
+          <>
+            <Button
+              onPress={() => {
+                setChecked(!checked);
               }}
-            >
-              <Notice
-                type={dialogInfo.notice.type || "information"}
-                text={dialogInfo.notice.text}
-              />
-            </View>
-          ) : null}
+              icon={
+                checked
+                  ? "check-circle-outline"
+                  : "checkbox-blank-circle-outline"
+              }
+              iconColor={checked ? colors.secondary.icon : colors.primary.icon}
+              style={{
+                justifyContent: "flex-start"
+              }}
+              height={35}
+              iconSize={20}
+              width="100%"
+              title={dialogInfo.check.info}
+              type={checked ? dialogInfo.check.type || "plain" : "plain"}
+            />
+          </>
+        ) : null}
 
-          {dialogInfo.check ? (
-            <>
-              <Button
-                onPress={() => {
-                  setChecked(!checked);
-                }}
-                icon={
-                  checked
-                    ? "check-circle-outline"
-                    : "checkbox-blank-circle-outline"
-                }
-                iconColor={
-                  checked ? colors.secondary.icon : colors.primary.icon
-                }
-                style={{
-                  justifyContent: "flex-start"
-                }}
-                height={35}
-                iconSize={20}
-                width="100%"
-                title={dialogInfo.check.info}
-                type={checked ? dialogInfo.check.type || "plain" : "plain"}
-              />
-            </>
-          ) : null}
-
-          <DialogButtons
-            onPressNegative={onNegativePress}
-            onPressPositive={dialogInfo.positivePress && onPressPositive}
-            loading={loading}
-            positiveTitle={dialogInfo.positiveText}
-            negativeTitle={dialogInfo.negativeText}
-            positiveType={dialogInfo.positiveType}
-          />
-        </View>
-      )}
+        <DialogButtons
+          onPressNegative={onNegativePress}
+          onPressPositive={dialogInfo.positivePress && onPressPositive}
+          loading={loading}
+          positiveTitle={dialogInfo.positiveText}
+          negativeTitle={dialogInfo.negativeText}
+          positiveType={dialogInfo.positiveType}
+        />
+      </View>
       <Toast context="local" />
     </BaseDialog>
   ) : null;

apps/mobile/app/components/dialogs/pdf-preview/index.js

@@ -17,15 +17,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { strings } from "@notesnook/intl";
-import { useThemeColors } from "@notesnook/theme";
 import React, { useCallback, useEffect, useRef, useState } from "react";
 import { Dimensions, TextInput, View } from "react-native";
 import Orientation from "react-native-orientation-locker";
 import Pdf from "react-native-pdf";
-import { MMKV } from "../../../common/database/mmkv";
+import Animated, { FadeIn, FadeOut } from "react-native-reanimated";
 import downloadAttachment from "../../../common/filesystem/download-attachment";
-import { deleteCacheFileByPath, exists } from "../../../common/filesystem/io";
 import { cacheDir } from "../../../common/filesystem/utils";
 import { useAttachmentProgress } from "../../../hooks/use-attachment-progress";
 import useGlobalSafeAreaInsets from "../../../hooks/use-global-safe-area-insets";
@@ -33,9 +30,8 @@ import {
   eSubscribeEvent,
   eUnSubscribeEvent
 } from "../../../services/event-manager";
+import { useThemeColors } from "@notesnook/theme";
 import { AppFontSize } from "../../../utils/size";
-import { DefaultAppStyles } from "../../../utils/styles";
-import { sleep } from "../../../utils/time";
 import { Dialog } from "../../dialog";
 import BaseDialog from "../../dialog/base-dialog";
 import { presentDialog } from "../../dialog/functions";
@@ -43,6 +39,11 @@ import SheetProvider from "../../sheet-provider";
 import { IconButton } from "../../ui/icon-button";
 import { ProgressBarComponent } from "../../ui/svg/lazy";
 import Paragraph from "../../ui/typography/paragraph";
+import { sleep } from "../../../utils/time";
+import { MMKV } from "../../../common/database/mmkv";
+import { deleteCacheFileByPath } from "../../../common/filesystem/io";
+import { strings } from "@notesnook/intl";
+import { DefaultAppStyles } from "../../../utils/styles";
 
 const WIN_WIDTH = Dimensions.get("window").width;
 const WIN_HEIGHT = Dimensions.get("window").height;
@@ -104,19 +105,15 @@ const PDFPreview = () => {
   const open = useCallback(
     async (attachment) => {
       setVisible(true);
+      setLoading(true);
       setTimeout(async () => {
         setAttachment(attachment);
         let hash = attachment.hash;
         if (!hash) return;
-        if (!(await exists(hash))) setLoading(true);
         const uri = await downloadAttachment(hash, false, {
           silent: true,
           cache: true
         });
-        if (!(await exists(hash))) {
-          setVisible(false);
-          return;
-        }
         const path = `${cacheDir}/${uri}`;
         snapshotValue.current = snapshot.current;
         setPDFSource("file://" + path);
@@ -169,7 +166,8 @@ const PDFPreview = () => {
           }}
         >
           {loading ? (
-            <View
+            <Animated.View
+              exiting={FadeOut}
               style={{
                 flex: 1,
                 justifyContent: "center",
@@ -190,7 +188,7 @@ const PDFPreview = () => {
               >
                 {strings.loadingWithProgress(progress?.percent)}
               </Paragraph>
-            </View>
+            </Animated.View>
           ) : (
             <>
               <View
@@ -272,42 +270,49 @@ const PDFPreview = () => {
                 </View>
               </View>
               {pdfSource ? (
-                <Pdf
-                  source={{
-                    uri: pdfSource
-                  }}
-                  ref={pdfRef}
-                  onLoadComplete={(numberOfPages) => {
-                    setNumPages(numberOfPages);
-                  }}
-                  onPageChanged={(page) => {
-                    setCurrentPage(page);
-                    inputRef.current?.setNativeProps({
-                      text: page + ""
-                    });
-                    saveSnapshot({
-                      currentPage: page,
-                      scale: snapshot?.current?.scale
-                    });
-                  }}
-                  // scale={snapshotValue.current?.scale}
-                  // onScaleChanged={(scale) => {
-                  //   saveSnapshot({
-                  //     currentPage: snapshot?.current?.currentPage,
-                  //     scale: scale
-                  //   });
-                  // }}
-                  page={snapshotValue?.current?.currentPage}
-                  password={password}
-                  maxScale={6}
-                  onError={onError}
-                  onPressLink={(uri) => {}}
+                <Animated.View
                   style={{
-                    flex: 1,
-                    width: width,
-                    height: Dimensions.get("window").height
+                    flex: 1
                   }}
-                />
+                  entering={FadeIn}
+                >
+                  <Pdf
+                    source={{
+                      uri: pdfSource
+                    }}
+                    ref={pdfRef}
+                    onLoadComplete={(numberOfPages) => {
+                      setNumPages(numberOfPages);
+                    }}
+                    onPageChanged={(page) => {
+                      setCurrentPage(page);
+                      inputRef.current?.setNativeProps({
+                        text: page + ""
+                      });
+                      saveSnapshot({
+                        currentPage: page,
+                        scale: snapshot?.current?.scale
+                      });
+                    }}
+                    // scale={snapshotValue.current?.scale}
+                    // onScaleChanged={(scale) => {
+                    //   saveSnapshot({
+                    //     currentPage: snapshot?.current?.currentPage,
+                    //     scale: scale
+                    //   });
+                    // }}
+                    page={snapshotValue?.current?.currentPage}
+                    password={password}
+                    maxScale={6}
+                    onError={onError}
+                    onPressLink={(uri) => {}}
+                    style={{
+                      flex: 1,
+                      width: width,
+                      height: Dimensions.get("window").height
+                    }}
+                  />
+                </Animated.View>
               ) : null}
             </>
           )}

apps/mobile/app/components/header/index.tsx

@@ -97,6 +97,7 @@ export const Header = ({
         style={{
           flexDirection: "row",
           justifyContent: "space-between",
+          marginTop: DefaultAppStyles.GAP_SMALL,
           borderRadius: 10,
           paddingVertical: 3,
           borderWidth: hasSearch ? 1 : 0,

apps/mobile/app/components/list-items/headers/section-header.tsx

@@ -133,9 +133,7 @@ export const SectionHeader = React.memo<
                         <Sort
                           screen={screen}
                           type={dataType}
-                          hideGroupOptions={
-                            screen === "Reminders" || screen === "Search"
-                          }
+                          hideGroupOptions={screen === "Reminders"}
                         />
                       )
                     });

apps/mobile/app/components/list-items/reminder/index.tsx

@@ -17,26 +17,24 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 import { Reminder } from "@notesnook/core";
-import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import React from "react";
 import { View } from "react-native";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { notesnook } from "../../../../e2e/test.ids";
-import useIsSelected from "../../../hooks/use-selected";
-import AddReminder from "../../../screens/add-reminder";
-import { eSendEvent } from "../../../services/event-manager";
-import { useSelectionStore } from "../../../stores/use-selection-store";
-import { eCloseSheet } from "../../../utils/events";
-import { AppFontSize, defaultBorderRadius } from "../../../utils/size";
-import { DefaultAppStyles } from "../../../utils/styles";
+import { defaultBorderRadius, AppFontSize } from "../../../utils/size";
 import { Properties } from "../../properties";
-import AppIcon from "../../ui/AppIcon";
+import ReminderSheet from "../../sheets/reminder";
 import { IconButton } from "../../ui/icon-button";
 import { ReminderTime } from "../../ui/reminder-time";
 import Heading from "../../ui/typography/heading";
 import Paragraph from "../../ui/typography/paragraph";
 import SelectionWrapper, { selectItem } from "../selection-wrapper";
+import { strings } from "@notesnook/intl";
+import { useSelectionStore } from "../../../stores/use-selection-store";
+import useIsSelected from "../../../hooks/use-selected";
+import AppIcon from "../../ui/AppIcon";
+import { DefaultAppStyles } from "../../../utils/styles";
 
 const ReminderItem = React.memo(
   ({
@@ -51,10 +49,8 @@ const ReminderItem = React.memo(
     const { colors } = useThemeColors();
     const openReminder = () => {
       if (selectItem(item)) return;
-      AddReminder.present(item, undefined);
-      if (isSheet) {
-        eSendEvent(eCloseSheet);
-      }
+
+      ReminderSheet.present(item, undefined, isSheet);
     };
     const selectionMode = useSelectionStore((state) => state.selectionMode);
     const [selected] = useIsSelected(item);

apps/mobile/app/components/list-items/search-result/index.tsx

@@ -1,181 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-import React from "react";
-import { HighlightedResult } from "@notesnook/core";
-import { View } from "react-native";
-import { Pressable } from "../../ui/pressable";
-import Paragraph from "../../ui/typography/paragraph";
-import { useThemeColors } from "@notesnook/theme";
-import { DefaultAppStyles } from "../../../utils/styles";
-import Heading from "../../ui/typography/heading";
-import { AppFontSize } from "../../../utils/size";
-import { Properties } from "../../properties";
-import { db } from "../../../common/database";
-import { eSendEvent } from "../../../services/event-manager";
-import { eOnLoadNote } from "../../../utils/events";
-import { IconButton } from "../../ui/icon-button";
-import { fluidTabsRef } from "../../../utils/global-refs";
-type SearchResultProps = {
-  item: HighlightedResult;
-};
-
-export const SearchResult = (props: SearchResultProps) => {
-  const [expanded, setExpanded] = React.useState(true);
-  const { colors } = useThemeColors();
-
-  const openNote = async (index?: number) => {
-    const note = await db.notes.note(props.item.id);
-    eSendEvent(eOnLoadNote, {
-      item: {
-        ...note,
-        content: props.item.rawContent
-          ? {
-              data: props.item.rawContent || "",
-              type: "tiptap"
-            }
-          : undefined
-      },
-      searchResultIndex: index
-    });
-    fluidTabsRef.current?.goToPage("editor");
-  };
-
-  return (
-    <Pressable
-      style={{
-        alignSelf: "flex-start",
-        alignItems: "flex-start",
-        paddingHorizontal: DefaultAppStyles.GAP,
-        paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL,
-        borderRadius: 0
-      }}
-      onLongPress={async () => {
-        const note = await db.notes.note(props.item.id);
-        Properties.present(note);
-      }}
-      onPress={async () => openNote()}
-    >
-      <View
-        style={{
-          flexDirection: "row",
-          justifyContent: "space-between",
-          alignItems: "center",
-          width: "100%"
-        }}
-      >
-        <View
-          style={{
-            flexDirection: "row",
-            alignItems: "center",
-            gap: DefaultAppStyles.GAP_SMALL / 2,
-            flexShrink: 1
-          }}
-        >
-          {props.item.content?.length ? (
-            <IconButton
-              name={!expanded ? "chevron-right" : "chevron-down"}
-              onPress={() => setExpanded((prev) => !prev)}
-              size={AppFontSize.md + 2}
-              color={colors.secondary.icon}
-              style={{
-                width: 23,
-                height: 23
-              }}
-            />
-          ) : null}
-          <Heading
-            size={AppFontSize.sm}
-            style={{
-              flexShrink: 1
-            }}
-          >
-            {props.item.title.map((title, index) => (
-              <React.Fragment key={props.item.id + index + "-srt"}>
-                {title.prefix}
-                <Heading
-                  size={AppFontSize.sm}
-                  style={{
-                    backgroundColor: colors.secondary.accent,
-                    color: colors.secondary.accentForeground
-                  }}
-                >
-                  {title.match}
-                </Heading>
-                {title.suffix}
-              </React.Fragment>
-            ))}
-          </Heading>
-        </View>
-        {props.item.content?.length ? (
-          <Paragraph size={AppFontSize.xxs} color={colors.secondary.paragraph}>
-            {props.item.content.length}
-          </Paragraph>
-        ) : null}
-      </View>
-
-      {expanded &&
-        props.item.content.map((content, index) => (
-          <Pressable
-            key={props.item.id + index}
-            style={{
-              alignSelf: "flex-start",
-              alignItems: "flex-start",
-              paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL,
-              borderColor: colors.primary.border,
-              borderWidth: 0,
-              borderRadius: 0,
-              borderBottomWidth: 1,
-              borderBottomColor: colors.primary.border,
-              width: "100%"
-            }}
-            onLongPress={async () => {
-              const note = await db.notes.note(props.item.id);
-              Properties.present(note);
-            }}
-            onPress={() => {
-              let activeIndex = 0;
-              for (let i = 0; i <= index; i++) {
-                activeIndex += props.item.content[i].length;
-              }
-              console.log(activeIndex);
-              openNote(activeIndex);
-            }}
-          >
-            <Paragraph>
-              {content.map((match, index) => (
-                <React.Fragment key={props.item.id + index + "src"}>
-                  {match.prefix}
-                  <Paragraph
-                    size={AppFontSize.sm}
-                    style={{
-                      backgroundColor: colors.secondary.accent,
-                      color: colors.secondary.accentForeground
-                    }}
-                  >
-                    {match.match}
-                  </Paragraph>
-                  {match.suffix}
-                </React.Fragment>
-              ))}
-            </Paragraph>
-          </Pressable>
-        ))}
-    </Pressable>
-  );
-};

apps/mobile/app/components/list/index.tsx

@@ -73,7 +73,7 @@ export default function List(props: ListProps) {
       ? "home"
       : props.renderedInRoute === "Favorites"
       ? "favorites"
-      : props.renderedInRoute === "Trash" || props.dataType === "trash"
+      : props.renderedInRoute === "Trash"
       ? "trash"
       : `${props.dataType}s`;
 
@@ -150,7 +150,7 @@ export default function List(props: ListProps) {
           flex: 1
         }}
       >
-        {props.data?.placeholders?.length === 0 || !props.data ? (
+        {props.data?.placeholders?.length === 0 ? (
           <>
             {props.CustomLisHeader ? (
               props.CustomLisHeader

apps/mobile/app/components/list/list-item.wrapper.tsx

@@ -27,7 +27,6 @@ import {
   GroupHeader,
   GroupOptions,
   GroupingKey,
-  HighlightedResult,
   Item,
   ItemType,
   Note,
@@ -50,7 +49,6 @@ import { NoteWrapper } from "../list-items/note/wrapper";
 import { NotebookWrapper } from "../list-items/notebook/wrapper";
 import ReminderItem from "../list-items/reminder";
 import TagItem from "../list-items/tag";
-import { SearchResult } from "../list-items/search-result";
 
 type ListItemWrapperProps<TItem = Item> = {
   group?: GroupingKey;
@@ -155,9 +153,7 @@ export function ListItemWrapper(props: ListItemWrapperProps) {
           },
           items?.cacheItem(index) ? 100 : 0
         );
-      } catch (e) {
-        /** empty */
-      }
+      } catch (e) {}
     })();
   }, [index, items, refreshItem]);
 
@@ -200,7 +196,7 @@ export function ListItemWrapper(props: ListItemWrapperProps) {
             notebooks={notebooks.current}
             reminder={reminder.current}
             attachmentsCount={attachmentsCount.current}
-            date={getDate(item as Note, group)}
+            date={getDate(item, group)}
             isRenderedInActionSheet={isSheet}
             index={index}
             locked={locked.current}
@@ -231,7 +227,7 @@ export function ListItemWrapper(props: ListItemWrapperProps) {
           <NotebookWrapper
             item={item as Notebook}
             totalNotes={totalNotes.current}
-            date={getDate(item as Notebook, group)}
+            date={getDate(item, group)}
             index={index}
           />
         </>
@@ -289,34 +285,12 @@ export function ListItemWrapper(props: ListItemWrapperProps) {
           />
         </>
       );
-    case "searchResult":
-      return (
-        <>
-          {groupHeader && previousIndex.current === index && !isSheet ? (
-            <SectionHeader
-              screen={props.renderedInRoute}
-              item={groupHeader}
-              index={index}
-              dataType={item.type}
-              color={props.customAccentColor}
-              groupOptions={groupOptions}
-              onOpenJumpToDialog={() => {
-                eSendEvent(eOpenJumpToDialog, {
-                  ref: props.scrollRef,
-                  data: items
-                });
-              }}
-            />
-          ) : null}
-          <SearchResult item={item as HighlightedResult} />
-        </>
-      );
     default:
       return null;
   }
 }
 
-function getDate(item: Notebook | Note, groupType?: GroupingKey): number {
+function getDate(item: Item, groupType?: GroupingKey): number {
   return (
     getSortValue(
       groupType

apps/mobile/app/components/properties/index.js

@@ -58,6 +58,7 @@ const Line = ({ top = 6, bottom = 6 }) => {
 
 export const Properties = ({ close = () => {}, item, buttons = [] }) => {
   const { colors } = useThemeColors();
+  const isColor = !!ColorValues[item.title];
   if (!item || !item.id) {
     return (
       <Paragraph style={{ marginVertical: 10, alignSelf: "center" }}>

apps/mobile/app/components/properties/items.tsx

@@ -36,7 +36,6 @@ import Paragraph from "../ui/typography/paragraph";
 const TOP_BAR_ITEMS: ActionId[] = [
   "pin",
   "favorite",
-  "archive",
   "lock-unlock",
   "publish",
   "local-only",
@@ -67,7 +66,6 @@ const COLUMN_BAR_ITEMS: ActionId[] = [
   "move-notebook",
   "pin",
   "default-notebook",
-  "default-tag",
   "default-homepage",
   "add-shortcut",
   "reorder",

apps/mobile/app/components/properties/tags.js

@@ -24,11 +24,11 @@ import { TaggedNotes } from "../../screens/notes/tagged";
 import { useThemeColors } from "@notesnook/theme";
 import { AppFontSize } from "../../utils/size";
 import { sleep } from "../../utils/time";
+import ManageTagsSheet from "../sheets/manage-tags";
 import { Button } from "../ui/button";
 import { ColorTags } from "./color-tags";
 import { strings } from "@notesnook/intl";
 import { DefaultAppStyles } from "../../utils/styles";
-import ManageTags from "../../screens/manage-tags";
 
 export const Tags = ({ item, close }) => {
   const { colors } = useThemeColors();
@@ -47,8 +47,7 @@ export const Tags = ({ item, close }) => {
     >
       <Button
         onPress={async () => {
-          ManageTags.present([item.id]);
-          close();
+          ManageTagsSheet.present([item.id]);
         }}
         buttonType={{
           text: colors.primary.accent

apps/mobile/app/components/selection-header/index.tsx

@@ -42,11 +42,10 @@ import { DefaultAppStyles } from "../../utils/styles";
 import { sleep } from "../../utils/time";
 import { presentDialog } from "../dialog/functions";
 import ExportNotesSheet from "../sheets/export-notes";
-
+import ManageTagsSheet from "../sheets/manage-tags";
 import { MoveNotebook } from "../../screens/move-notebook";
 import { IconButton } from "../ui/icon-button";
 import NativeTooltip from "../../utils/tooltip";
-import ManageTags from "../../screens/manage-tags";
 
 export const SelectionHeader = React.memo(
   ({
@@ -210,7 +209,7 @@ export const SelectionHeader = React.memo(
                     {
                       title: strings.manageTags(),
                       onPress: async () => {
-                        ManageTags.present(selectedItemsList);
+                        ManageTagsSheet.present(selectedItemsList);
                       },
                       visible: type === "note",
                       icon: "pound"

apps/mobile/app/components/sheets/add-notebook/index.tsx

@@ -24,22 +24,23 @@ import { TextInput, View } from "react-native";
 import { notesnook } from "../../../../e2e/test.ids";
 import { db } from "../../../common/database";
 import { DDS } from "../../../services/device-detection";
-import { ToastManager, eSendEvent } from "../../../services/event-manager";
+import {
+  ToastManager,
+  eSendEvent,
+  presentSheet
+} from "../../../services/event-manager";
 import Navigation from "../../../services/navigation";
 import { useMenuStore } from "../../../stores/use-menu-store";
 import { useNotebookStore } from "../../../stores/use-notebook-store";
 import { useRelationStore } from "../../../stores/use-relation-store";
 import { eOnNotebookUpdated } from "../../../utils/events";
 import { getParentNotebookId } from "../../../utils/notebooks";
+import { AppFontSize } from "../../../utils/size";
+import { Button } from "../../ui/button";
 import Input from "../../ui/input";
-import { useSettingStore } from "../../../stores/use-setting-store";
-import DialogHeader from "../../dialog/dialog-header";
-import DialogButtons from "../../dialog/dialog-buttons";
-import { presentDialog } from "../../dialog/functions";
-import { getElevationStyle } from "../../../utils/elevation";
-import { defaultBorderRadius } from "../../../utils/size";
-import { useThemeColors } from "@notesnook/theme";
-import { getContainerBorder } from "../../../utils/colors";
+import Seperator from "../../ui/seperator";
+import Heading from "../../ui/typography/heading";
+import { DefaultAppStyles } from "../../../utils/styles";
 
 export const AddNotebookSheet = ({
   notebook,
@@ -54,7 +55,6 @@ export const AddNotebookSheet = ({
   showMoveNotesOnComplete: boolean;
   defaultTitle?: string;
 }) => {
-  const { colors } = useThemeColors();
   const title = useRef(notebook?.title || defaultTitle);
   const description = useRef(notebook?.description);
   const titleInput = useRef<TextInput>(null);
@@ -124,66 +124,57 @@ export const AddNotebookSheet = ({
   return (
     <View
       style={{
-        ...getElevationStyle(5),
-        width: DDS.isTab ? 400 : "85%",
-        maxHeight: 450,
-        borderRadius: defaultBorderRadius,
-        backgroundColor: colors.primary.background,
-        paddingTop: 12,
-        ...getContainerBorder(colors.primary.border, 0.5),
-        overflow: "hidden"
+        maxHeight: DDS.isTab ? "90%" : "97%",
+        borderRadius: DDS.isTab ? 5 : 0,
+        paddingHorizontal: DefaultAppStyles.GAP
       }}
     >
-      <View
+      <Heading size={AppFontSize.lg}>
+        {notebook ? strings.editNotebook() : strings.newNotebook()}
+      </Heading>
+
+      <Seperator />
+
+      <Input
+        fwdRef={titleInput}
+        testID={notesnook.ids.dialogs.notebook.inputs.title}
+        onChangeText={(value) => {
+          title.current = value;
+        }}
+        onLayout={() => {
+          setImmediate(() => {
+            titleInput?.current?.focus();
+          });
+        }}
+        placeholder={strings.enterNotebookTitle()}
+        onSubmit={() => {
+          descriptionInput.current?.focus();
+        }}
+        returnKeyLabel="Next"
+        returnKeyType="next"
+        defaultValue={notebook ? notebook.title : title.current}
+      />
+
+      <Input
+        fwdRef={descriptionInput}
+        testID={notesnook.ids.dialogs.notebook.inputs.description}
+        onChangeText={(value) => {
+          description.current = value;
+        }}
+        placeholder={strings.enterNotebookDescription()}
+        returnKeyLabel={strings.next()}
+        returnKeyType="next"
+        defaultValue={notebook ? notebook.description : ""}
+      />
+
+      <Button
+        title={notebook ? strings.save() : strings.add()}
+        type="accent"
         style={{
-          paddingHorizontal: 12
+          paddingHorizontal: DefaultAppStyles.GAP * 2,
+          width: "100%"
         }}
-      >
-        <DialogHeader
-          title={notebook ? strings.editNotebook() : strings.newNotebook()}
-        />
-
-        <Input
-          fwdRef={titleInput}
-          testID={notesnook.ids.dialogs.notebook.inputs.title}
-          onChangeText={(value) => {
-            title.current = value;
-          }}
-          onLayout={() => {
-            setTimeout(() => {
-              titleInput?.current?.focus();
-            }, 300);
-          }}
-          placeholder={strings.enterNotebookTitle()}
-          onSubmit={() => {
-            descriptionInput.current?.focus();
-          }}
-          returnKeyLabel="Next"
-          returnKeyType="next"
-          defaultValue={notebook ? notebook.title : title.current}
-        />
-
-        <Input
-          fwdRef={descriptionInput}
-          testID={notesnook.ids.dialogs.notebook.inputs.description}
-          onChangeText={(value) => {
-            description.current = value;
-          }}
-          placeholder={strings.enterNotebookDescription()}
-          returnKeyLabel={strings.next()}
-          returnKeyType="next"
-          defaultValue={notebook ? notebook.description : ""}
-        />
-      </View>
-      <DialogButtons
-        onPressNegative={() => {
-          title.current = undefined;
-          close?.(false);
-          useSettingStore.getState().setSheetKeyboardHandler(true);
-        }}
-        positiveTitle={notebook ? strings.save() : strings.add()}
-        negativeTitle={strings.cancel()}
-        onPressPositive={onSaveChanges}
+        onPress={onSaveChanges}
       />
     </View>
   );
@@ -197,9 +188,9 @@ AddNotebookSheet.present = (
   showMoveNotesOnComplete = true,
   defaultTitle?: string
 ) => {
-  presentDialog({
+  presentSheet({
     context: context,
-    component: (close) => (
+    component: (ref, close) => (
       <AddNotebookSheet
         notebook={notebook}
         parentNotebook={parentNotebook}

apps/mobile/app/components/sheets/change-email/index.tsx

@@ -16,22 +16,35 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-import React, { useRef, useState } from "react";
+import React, { RefObject, useRef, useState } from "react";
 import { TextInput, View } from "react-native";
+import { ActionSheetRef } from "react-native-actions-sheet";
 import { db } from "../../../common/database";
-import { eSendEvent, ToastManager } from "../../../services/event-manager";
+import {
+  eSendEvent,
+  presentSheet,
+  PresentSheetOptions,
+  ToastManager
+} from "../../../services/event-manager";
+import DialogHeader from "../../dialog/dialog-header";
+import { Button } from "../../ui/button";
+import Input from "../../ui/input";
 import { eUserLoggedIn } from "../../../utils/events";
 import { strings } from "@notesnook/intl";
 import { DefaultAppStyles } from "../../../utils/styles";
-import Input from "../../../components/ui/input";
-import { Button } from "../../../components/ui/button";
+
+type ChangeEmailProps = {
+  actionSheetRef: RefObject<ActionSheetRef>;
+  close?: () => void;
+  update?: (options: PresentSheetOptions) => void;
+};
 
 enum EmailChangeSteps {
   verify,
   changeEmail
 }
 
-export const ChangeEmail = () => {
+export const ChangeEmail = ({ close }: ChangeEmailProps) => {
   const [step, setStep] = useState(EmailChangeSteps.verify);
   const emailChangeData = useRef<{
     email?: string;
@@ -90,6 +103,10 @@ export const ChangeEmail = () => {
 
   return (
     <View style={{ paddingHorizontal: DefaultAppStyles.GAP }}>
+      <DialogHeader
+        title={strings.changeEmail()}
+        paragraph={strings.changeEmailDesc()}
+      />
       <View
         style={{
           marginTop: DefaultAppStyles.GAP_VERTICAL
@@ -139,12 +156,23 @@ export const ChangeEmail = () => {
             : strings.changeEmail()
         }
         type="accent"
-        style={{
-          width: "100%"
-        }}
+        width={250}
         loading={loading}
         onPress={onSubmit}
+        style={{
+          borderRadius: 100,
+          height: 45,
+          marginTop: 2
+        }}
       />
     </View>
   );
 };
+
+ChangeEmail.present = () => {
+  presentSheet({
+    component: (ref, close, update) => (
+      <ChangeEmail actionSheetRef={ref} close={close} update={update} />
+    )
+  });
+};

apps/mobile/app/components/sheets/link-note/index.tsx

@@ -283,14 +283,7 @@ export default function LinkNote(props: {
                   width: "100%"
                 }}
               >
-                <Paragraph
-                  style={{
-                    flexShrink: 1
-                  }}
-                  numberOfLines={1}
-                >
-                  {selectedNote?.title}
-                </Paragraph>
+                <Paragraph numberOfLines={1}>{selectedNote?.title}</Paragraph>
 
                 <Paragraph
                   color={colors.secondary.paragraph}

apps/mobile/app/components/sheets/manage-tags/index.tsx

@@ -29,30 +29,27 @@ import React, {
   useRef,
   useState
 } from "react";
-import { SafeAreaView } from "react-native-safe-area-context";
 import { TextInput, View, useWindowDimensions } from "react-native";
 import { ActionSheetRef } from "react-native-actions-sheet";
 import { FlashList } from "react-native-actions-sheet/dist/src/views/FlashList";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
-import { db } from "../../common/database";
-import { useDBItem } from "../../hooks/use-db-item";
-import { ToastManager } from "../../services/event-manager";
-import Navigation, { NavigationProps } from "../../services/navigation";
+import { db } from "../../../common/database";
+import { useDBItem } from "../../../hooks/use-db-item";
+import { ToastManager, presentSheet } from "../../../services/event-manager";
+import Navigation from "../../../services/navigation";
 import {
   ItemSelection,
   createItemSelectionStore
-} from "../../stores/item-selection-store";
-import { useRelationStore } from "../../stores/use-relation-store";
-import { useTagStore } from "../../stores/use-tag-store";
-import { defaultBorderRadius, AppFontSize } from "../../utils/size";
-import Input from "../../components/ui/input";
-import { Pressable } from "../../components/ui/pressable";
-import Heading from "../../components/ui/typography/heading";
-import Paragraph from "../../components/ui/typography/paragraph";
+} from "../../../stores/item-selection-store";
+import { useRelationStore } from "../../../stores/use-relation-store";
+import { useTagStore } from "../../../stores/use-tag-store";
+import { defaultBorderRadius, AppFontSize } from "../../../utils/size";
+import Input from "../../ui/input";
+import { Pressable } from "../../ui/pressable";
+import Heading from "../../ui/typography/heading";
+import Paragraph from "../../ui/typography/paragraph";
 import { strings } from "@notesnook/intl";
-import { DefaultAppStyles } from "../../utils/styles";
-import { Header } from "../../components/header";
-import { useNavigationFocus } from "../../hooks/use-navigation-focus";
+import { DefaultAppStyles } from "../../../utils/styles";
 
 async function updateInitialSelectionState(items: string[]) {
   const relations = await db.relations
@@ -88,14 +85,16 @@ async function updateInitialSelectionState(items: string[]) {
 
 const useTagItemSelection = createItemSelectionStore(true);
 
-const ManageTags = (props: NavigationProps<"ManageTags">) => {
+const ManageTagsSheet = (props: {
+  ids?: string[];
+  actionSheetRef: RefObject<ActionSheetRef>;
+}) => {
   const { colors } = useThemeColors();
-  const ids = props.route.params.ids || [];
+  const ids = useMemo(() => props.ids || [], [props.ids]);
   const [tags, setTags] = useState<VirtualizedGrouping<Tag>>();
   const [query, setQuery] = useState<string>();
   const inputRef = useRef<TextInput>(null);
   const [focus, setFocus] = useState(false);
-  useNavigationFocus(props.navigation, { focusOnInit: true });
   const [queryExists, setQueryExists] = useState(false);
   const dimensions = useWindowDimensions();
   const refreshSelection = useCallback(() => {
@@ -240,117 +239,112 @@ const ManageTags = (props: NavigationProps<"ManageTags">) => {
   );
 
   return (
-    <SafeAreaView
+    <View
       style={{
         width: "100%",
         alignSelf: "center",
-        backgroundColor: colors.primary.background,
-        gap: DefaultAppStyles.GAP_VERTICAL
+        paddingHorizontal: DefaultAppStyles.GAP,
+        maxHeight: dimensions.height * 0.85
       }}
     >
-      <Header title={strings.manageTags()} canGoBack />
+      <Input
+        button={{
+          icon: "magnify",
+          color: colors.primary.accent,
+          size: AppFontSize.lg,
+          onPress: () => {}
+        }}
+        testID="tag-input"
+        fwdRef={inputRef}
+        autoCapitalize="none"
+        onChangeText={(v) => {
+          setQuery(sanitizeTag(v));
+          checkQueryExists(sanitizeTag(v));
+        }}
+        onFocusInput={() => {
+          setFocus(true);
+        }}
+        onBlurInput={() => {
+          setFocus(false);
+        }}
+        onSubmit={() => {
+          onSubmit();
+        }}
+        placeholder={strings.searchForTags()}
+      />
+
+      {query && !queryExists ? (
+        <Pressable
+          key={"query_item"}
+          style={{
+            flexDirection: "row",
+            marginVertical: 5,
+            justifyContent: "space-between",
+            padding: DefaultAppStyles.GAP
+          }}
+          onPress={onSubmit}
+          type="selected"
+        >
+          <Heading size={AppFontSize.sm} color={colors.selected.heading}>
+            {strings.add()} {'"' + "#" + query + '"'}
+          </Heading>
+          <Icon
+            name="plus"
+            color={colors.selected.icon}
+            size={AppFontSize.lg}
+          />
+        </Pressable>
+      ) : null}
+
       <View
         style={{
-          paddingHorizontal: DefaultAppStyles.GAP
+          width: "100%",
+          flexGrow: 1,
+          height: "100%"
         }}
       >
-        <Input
-          button={{
-            icon: "magnify",
-            color: colors.primary.accent,
-            size: AppFontSize.lg,
-            onPress: () => {}
-          }}
-          testID="tag-input"
-          fwdRef={inputRef}
-          autoCapitalize="none"
-          onChangeText={(v) => {
-            setQuery(sanitizeTag(v));
-            checkQueryExists(sanitizeTag(v));
-          }}
-          onFocusInput={() => {
-            setFocus(true);
-          }}
-          onBlurInput={() => {
-            setFocus(false);
-          }}
-          onSubmit={() => {
-            onSubmit();
-          }}
-          placeholder={strings.searchForTags()}
-        />
-
-        {query && !queryExists ? (
-          <Pressable
-            key={"query_item"}
-            style={{
-              flexDirection: "row",
-              justifyContent: "space-between",
-              paddingHorizontal: DefaultAppStyles.GAP,
-              paddingVertical: DefaultAppStyles.GAP_VERTICAL
-            }}
-            onPress={onSubmit}
-            type="selected"
-          >
-            <Heading size={AppFontSize.sm} color={colors.selected.heading}>
-              {strings.add()} {'"' + "#" + query + '"'}
-            </Heading>
-            <Icon
-              name="plus"
-              color={colors.selected.icon}
-              size={AppFontSize.lg}
-            />
-          </Pressable>
-        ) : null}
-
-        <View
-          style={{
-            width: "100%",
-            flexGrow: 1,
-            height: "100%"
-          }}
-        >
-          <FlashList
-            data={tags?.placeholders}
-            keyboardShouldPersistTaps
-            keyboardDismissMode="interactive"
-            estimatedItemSize={50}
-            renderItem={renderTag}
-            ListEmptyComponent={
-              <View
-                style={{
-                  width: "100%",
-                  height: 200,
-                  justifyContent: "center",
-                  alignItems: "center"
-                }}
+        <FlashList
+          data={tags?.placeholders}
+          keyboardShouldPersistTaps
+          keyboardDismissMode="interactive"
+          estimatedItemSize={50}
+          renderItem={renderTag}
+          ListEmptyComponent={
+            <View
+              style={{
+                width: "100%",
+                height: 200,
+                justifyContent: "center",
+                alignItems: "center"
+              }}
+            >
+              <Heading size={50} color={colors.secondary.heading}>
+                #
+              </Heading>
+              <Paragraph
+                textBreakStrategy="balanced"
+                color={colors.secondary.paragraph}
               >
-                <Heading size={50} color={colors.secondary.heading}>
-                  #
-                </Heading>
-                <Paragraph
-                  textBreakStrategy="balanced"
-                  color={colors.secondary.paragraph}
-                >
-                  {strings.emptyPlaceholders("tag")}
-                </Paragraph>
-              </View>
-            }
-            ListFooterComponent={<View style={{ height: 50 }} />}
-          />
-        </View>
+                {strings.emptyPlaceholders("tag")}
+              </Paragraph>
+            </View>
+          }
+          ListFooterComponent={<View style={{ height: 50 }} />}
+        />
       </View>
-    </SafeAreaView>
+    </View>
   );
 };
 
-ManageTags.present = (ids?: string[]) => {
-  Navigation.push("ManageTags", {
-    ids: ids
+ManageTagsSheet.present = (ids?: string[]) => {
+  presentSheet({
+    component: (ref) => {
+      return <ManageTagsSheet actionSheetRef={ref} ids={ids} />;
+    }
   });
 };
 
-export default ManageTags;
+export default ManageTagsSheet;
 
 const TagItem = ({
   id,

apps/mobile/app/components/sheets/relations-list/index.tsx

@@ -34,7 +34,7 @@ import { AppFontSize } from "../../../utils/size";
 import DialogHeader from "../../dialog/dialog-header";
 import List from "../../list";
 import SheetProvider from "../../sheet-provider";
-import { Button, ButtonProps } from "../../ui/button";
+import { Button } from "../../ui/button";
 import { PressableProps } from "../../ui/pressable";
 import Paragraph from "../../ui/typography/paragraph";
 import { DefaultAppStyles } from "../../../utils/styles";
@@ -47,10 +47,18 @@ type RelationsListProps = {
   referenceType: string;
   relationType: "to" | "from";
   title: string;
-  button?: ButtonProps;
+  button?: Button;
   onAdd: () => void;
 };
 
+type Button = {
+  onPress?: (() => void) | undefined;
+  loading?: boolean | undefined;
+  title?: string | undefined;
+  type?: PressableProps["type"];
+  icon?: string;
+};
+
 const IconsByType = {
   reminder: "bell"
 };
@@ -146,7 +154,7 @@ RelationsList.present = ({
   referenceType: string;
   relationType: "to" | "from";
   title: string;
-  button?: ButtonProps;
+  button?: Button;
   onAdd: () => void;
 }) => {
   presentSheet({

apps/mobile/app/components/sheets/reminder/index.tsx

@@ -0,0 +1,630 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import { useThemeColors } from "@notesnook/theme";
+import React, { RefObject, useRef, useState } from "react";
+import {
+  Platform,
+  TextInput,
+  View,
+  ScrollView as RNScrollView
+} from "react-native";
+import { ActionSheetRef, ScrollView } from "react-native-actions-sheet";
+import DateTimePickerModal from "react-native-modal-datetime-picker";
+import {
+  PresentSheetOptions,
+  ToastManager,
+  presentSheet
+} from "../../../services/event-manager";
+import { defaultBorderRadius, AppFontSize } from "../../../utils/size";
+import { Button } from "../../ui/button";
+import Input from "../../ui/input";
+
+import dayjs from "dayjs";
+import DatePicker from "react-native-date-picker";
+import { db } from "../../../common/database";
+import { DDS } from "../../../services/device-detection";
+import Navigation from "../../../services/navigation";
+import Notifications from "../../../services/notifications";
+import PremiumService from "../../../services/premium";
+import SettingsService from "../../../services/settings";
+import { useRelationStore } from "../../../stores/use-relation-store";
+import { Dialog } from "../../dialog";
+import { ReminderTime } from "../../ui/reminder-time";
+import Heading from "../../ui/typography/heading";
+import Paragraph from "../../ui/typography/paragraph";
+import { ItemReference, Note, Reminder } from "@notesnook/core";
+import { strings } from "@notesnook/intl";
+import { DefaultAppStyles } from "../../../utils/styles";
+
+type ReminderSheetProps = {
+  actionSheetRef: RefObject<ActionSheetRef>;
+  close?: (ctx?: string) => void;
+  update?: (options: PresentSheetOptions) => void;
+  reminder?: Reminder;
+  reference?: ItemReference;
+};
+
+const ReminderModes =
+  Platform.OS === "ios"
+    ? {
+        Once: "once",
+        Repeat: "repeat"
+      }
+    : {
+        Once: "once",
+        Repeat: "repeat",
+        Permanent: "permanent"
+      };
+
+const RecurringModes = {
+  Daily: "day",
+  Week: "week",
+  Month: "month",
+  Year: "year"
+};
+
+const WeekDays = new Array(7).fill(true);
+const MonthDays = new Array(31).fill(true);
+const WeekDayNames = {
+  0: "Sunday",
+  1: "Monday",
+  2: "Tuesday",
+  3: "Wednesday",
+  4: "Thursday",
+  5: "Friday",
+  6: "Saturday"
+};
+
+const ReminderNotificationModes = {
+  Silent: "silent",
+  Vibrate: "vibrate",
+  Urgent: "urgent"
+};
+
+export default function ReminderSheet({
+  actionSheetRef,
+  close,
+  update,
+  reminder,
+  reference
+}: ReminderSheetProps) {
+  const { colors, isDark } = useThemeColors();
+  const [reminderMode, setReminderMode] = useState<Reminder["mode"]>(
+    reminder?.mode || "once"
+  );
+  const [recurringMode, setRecurringMode] = useState<Reminder["recurringMode"]>(
+    reminder?.recurringMode || "week"
+  );
+  const [selectedDays, setSelectedDays] = useState<number[]>(
+    reminder?.selectedDays || []
+  );
+  const [date, setDate] = useState<Date>(
+    new Date(reminder?.date || Date.now())
+  );
+  const [reminderNotificationMode, setReminderNotificatioMode] = useState<
+    Reminder["priority"]
+  >(reminder?.priority || SettingsService.get().reminderNotificationMode);
+  const [isDatePickerVisible, setDatePickerVisibility] = useState(false);
+  const [repeatFrequency, setRepeatFrequency] = useState(1);
+  const referencedItem = reference ? (reference as Note) : null;
+
+  const title = useRef<string | undefined>(
+    !reminder ? referencedItem?.title : reminder?.title
+  );
+  const details = useRef<string | undefined>(
+    !reminder ? referencedItem?.headline : reminder?.description
+  );
+  const titleRef = useRef<TextInput>(null);
+  const timer = useRef<NodeJS.Timeout>();
+
+  const showDatePicker = () => {
+    setDatePickerVisibility(true);
+  };
+
+  const hideDatePicker = () => {
+    setDatePickerVisibility(false);
+  };
+
+  const handleConfirm = (date: Date) => {
+    timer.current = setTimeout(() => {
+      hideDatePicker();
+      setDate(date);
+    }, 50);
+  };
+  function nth(n: number) {
+    return (
+      ["st", "nd", "rd"][(((((n < 0 ? -n : n) + 90) % 100) - 10) % 10) - 1] ||
+      "th"
+    );
+  }
+
+  function getSelectedDaysText(selectedDays: number[]) {
+    const text = selectedDays
+      .sort((a, b) => a - b)
+      .map((day, index) => {
+        const isLast = index === selectedDays.length - 1;
+        const isSecondLast = index === selectedDays.length - 2;
+        const joinWith = isSecondLast ? " & " : isLast ? "" : ", ";
+        return recurringMode === RecurringModes.Week
+          ? WeekDayNames[day as keyof typeof WeekDayNames] + joinWith
+          : `${day}${nth(day)} ${joinWith}`;
+      })
+      .join("");
+    return text;
+  }
+
+  async function saveReminder() {
+    try {
+      if (!(await Notifications.checkAndRequestPermissions(true)))
+        throw new Error(strings.noNotificationPermission());
+      if (!date && reminderMode !== ReminderModes.Permanent) return;
+      if (
+        reminderMode === ReminderModes.Repeat &&
+        recurringMode !== "day" &&
+        recurringMode !== "year" &&
+        selectedDays.length === 0
+      )
+        throw new Error(strings.selectDayError());
+
+      if (!title.current) throw new Error(strings.setTitleError());
+      if (date.getTime() < Date.now() && reminderMode === "once") {
+        titleRef?.current?.focus();
+        throw new Error(strings.dateError());
+      }
+
+      date.setSeconds(0, 0);
+
+      const reminderId = await db.reminders?.add({
+        id: reminder?.id,
+        date: date?.getTime(),
+        priority: reminderNotificationMode,
+        title: title.current,
+        description: details.current,
+        recurringMode: recurringMode,
+        selectedDays: selectedDays,
+        mode: reminderMode,
+        localOnly: reminderMode === "permanent",
+        snoozeUntil:
+          date?.getTime() > Date.now() ? undefined : reminder?.snoozeUntil,
+        disabled: false
+      });
+      if (!reminderId) return;
+      const _reminder = await db.reminders?.reminder(reminderId);
+
+      if (reference && _reminder) {
+        await db.relations?.add(reference, {
+          id: _reminder?.id as string,
+          type: _reminder?.type
+        });
+      }
+      Notifications.scheduleNotification(_reminder as Reminder);
+      Navigation.queueRoutesForUpdate();
+      useRelationStore.getState().update();
+      close?.();
+    } catch (e) {
+      ToastManager.error(e as Error, undefined, "local");
+    }
+  }
+
+  return (
+    <View
+      style={{
+        paddingHorizontal: DefaultAppStyles.GAP,
+        maxHeight: "100%"
+      }}
+    >
+      <Heading size={AppFontSize.lg}>
+        {reminder ? strings.editReminder() : strings.newReminder()}
+      </Heading>
+
+      <Dialog context="local" />
+      <ScrollView
+        bounces={false}
+        style={{
+          marginBottom: DDS.isTab ? 25 : undefined
+        }}
+      >
+        <Input
+          fwdRef={titleRef}
+          defaultValue={reminder?.title || referencedItem?.title}
+          placeholder={strings.remindeMeOf()}
+          onChangeText={(text) => (title.current = text)}
+          wrapperStyle={{
+            marginTop: DefaultAppStyles.GAP_VERTICAL
+          }}
+        />
+
+        <Input
+          defaultValue={
+            reminder ? reminder?.description : referencedItem?.headline
+          }
+          placeholder={strings.addShortNote()}
+          onChangeText={(text) => (details.current = text)}
+          containerStyle={{
+            maxHeight: 80
+          }}
+          multiline
+          textAlignVertical="top"
+          inputStyle={{
+            minHeight: 80,
+            paddingVertical: DefaultAppStyles.GAP_VERTICAL
+          }}
+          height={80}
+          wrapperStyle={{
+            marginBottom: DefaultAppStyles.GAP_VERTICAL
+          }}
+        />
+
+        <ScrollView
+          style={{
+            flexDirection: "row",
+            marginBottom: DefaultAppStyles.GAP_VERTICAL,
+            height: 50
+          }}
+          horizontal
+        >
+          {Object.keys(ReminderModes).map((mode) => (
+            <Button
+              key={mode}
+              title={strings.reminderModes(
+                ReminderModes[mode as keyof typeof ReminderModes] as string
+              )}
+              style={{
+                marginRight: 12,
+                borderRadius: 100,
+                minWidth: 70,
+                paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL
+              }}
+              proTag={mode === "Repeat"}
+              height={35}
+              type={
+                reminderMode ===
+                ReminderModes[mode as keyof typeof ReminderModes]
+                  ? "selected"
+                  : "plain"
+              }
+              onPress={() => {
+                if (mode === "Repeat" && !PremiumService.get()) return;
+                setReminderMode(
+                  ReminderModes[
+                    mode as keyof typeof ReminderModes
+                  ] as Reminder["mode"]
+                );
+                if (mode === "Repeat") {
+                  setSelectedDays((days) => {
+                    if (days.length > 0) return days;
+                    if (days.indexOf(date.getDay()) > -1) {
+                      return days;
+                    }
+                    days.push(date.getDay());
+                    return [...days];
+                  });
+                }
+              }}
+            />
+          ))}
+        </ScrollView>
+
+        {reminderMode === ReminderModes.Repeat ? (
+          <View
+            style={{
+              backgroundColor: colors.secondary.background,
+              padding: DefaultAppStyles.GAP,
+              borderRadius: defaultBorderRadius,
+              marginBottom: DefaultAppStyles.GAP_VERTICAL
+            }}
+          >
+            <View
+              style={{
+                flexDirection: "row",
+                marginBottom:
+                  recurringMode === "day" || recurringMode === "year" ? 0 : 12,
+                alignItems: "center"
+              }}
+            >
+              {Object.keys(RecurringModes).map((mode) => (
+                <Button
+                  key={mode}
+                  title={strings.recurringModes(
+                    RecurringModes[mode as keyof typeof RecurringModes]
+                  )}
+                  style={{
+                    marginRight: 6,
+                    borderRadius: 100,
+                    paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL
+                  }}
+                  type={
+                    recurringMode ===
+                    RecurringModes[mode as keyof typeof RecurringModes]
+                      ? "selected"
+                      : "plain"
+                  }
+                  onPress={() => {
+                    setRecurringMode(
+                      RecurringModes[
+                        mode as keyof typeof RecurringModes
+                      ] as Reminder["recurringMode"]
+                    );
+                    setSelectedDays([]);
+                    setRepeatFrequency(1);
+                  }}
+                />
+              ))}
+            </View>
+
+            <RNScrollView showsHorizontalScrollIndicator={false} horizontal>
+              {recurringMode === RecurringModes.Daily ||
+              recurringMode === RecurringModes.Year
+                ? null
+                : recurringMode === RecurringModes.Week
+                ? WeekDays.map((item, index) => (
+                    <Button
+                      key={strings.weekDayNamesShort[
+                        index as keyof typeof strings.weekDayNamesShort
+                      ]()}
+                      title={strings.weekDayNamesShort[
+                        index as keyof typeof strings.weekDayNamesShort
+                      ]()}
+                      type={
+                        selectedDays.indexOf(index) > -1 ? "selected" : "plain"
+                      }
+                      fontSize={AppFontSize.xs}
+                      style={{
+                        height: 40,
+                        borderRadius: 100,
+                        marginRight: 10
+                      }}
+                      onPress={() => {
+                        setSelectedDays((days) => {
+                          if (days.indexOf(index) > -1) {
+                            days.splice(days.indexOf(index), 1);
+                            return [...days];
+                          }
+                          days.push(index);
+                          return [...days];
+                        });
+                      }}
+                    />
+                  ))
+                : MonthDays.map((item, index) => (
+                    <Button
+                      key={index + "monthday"}
+                      title={index + 1 + ""}
+                      type={
+                        selectedDays.indexOf(index + 1) > -1
+                          ? "selected"
+                          : "plain"
+                      }
+                      fontSize={AppFontSize.xs}
+                      style={{
+                        height: 40,
+                        borderRadius: 100,
+                        marginRight: 10
+                      }}
+                      onPress={() => {
+                        setSelectedDays((days) => {
+                          if (days.indexOf(index + 1) > -1) {
+                            days.splice(days.indexOf(index + 1), 1);
+                            return [...days];
+                          }
+                          days.push(index + 1);
+                          return [...days];
+                        });
+                      }}
+                    />
+                  ))}
+            </RNScrollView>
+          </View>
+        ) : null}
+
+        {reminderMode === ReminderModes.Permanent ? null : (
+          <View
+            style={{
+              width: "100%",
+              flexDirection: "column",
+              justifyContent: "center",
+              marginBottom: DefaultAppStyles.GAP_VERTICAL,
+              alignItems: "center"
+            }}
+          >
+            <DateTimePickerModal
+              isVisible={isDatePickerVisible}
+              mode="date"
+              onConfirm={handleConfirm}
+              onCancel={hideDatePicker}
+              is24Hour={db.settings.getTimeFormat() === "24-hour"}
+              date={date || new Date(Date.now())}
+            />
+
+            <DatePicker
+              date={date}
+              maximumDate={dayjs(date).add(3, "months").toDate()}
+              onDateChange={handleConfirm}
+              textColor={isDark ? colors.static.white : colors.static.black}
+              fadeToColor={colors.primary.background}
+              theme={isDark ? "dark" : "light"}
+              androidVariant="nativeAndroid"
+              is24hourSource="locale"
+              locale={
+                db.settings?.getTimeFormat() === "24-hour" ? "en_GB" : "en_US"
+              }
+              mode={
+                reminderMode === ReminderModes.Repeat &&
+                recurringMode !== "year"
+                  ? "time"
+                  : "datetime"
+              }
+            />
+
+            {reminderMode === ReminderModes.Repeat ? null : (
+              <Button
+                style={{
+                  width: "100%"
+                }}
+                title={date ? date.toLocaleDateString() : strings.selectDate()}
+                type={date ? "secondaryAccented" : "secondary"}
+                icon="calendar"
+                fontSize={AppFontSize.sm}
+                onPress={() => {
+                  showDatePicker();
+                }}
+              />
+            )}
+          </View>
+        )}
+
+        {reminderMode === ReminderModes.Once ||
+        reminderMode === ReminderModes.Permanent ? null : (
+          <View
+            style={{
+              borderRadius: defaultBorderRadius,
+              flexDirection: "row",
+              paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL,
+              alignItems: "center",
+              justifyContent: "flex-start",
+              marginBottom: DefaultAppStyles.GAP_VERTICAL
+            }}
+          >
+            <>
+              <Paragraph
+                size={AppFontSize.xxs}
+                color={colors.secondary.paragraph}
+              >
+                {recurringMode === RecurringModes.Daily
+                  ? strings.reminderRepeatStrings.day(
+                      dayjs(date).format("hh:mm A")
+                    )
+                  : recurringMode === RecurringModes.Year
+                  ? strings.reminderRepeatStrings.year(
+                      dayjs(date).format("dddd, MMMM D, h:mm A")
+                    )
+                  : selectedDays.length === 7 &&
+                    recurringMode === RecurringModes.Week
+                  ? strings.reminderRepeatStrings.week.daily(
+                      dayjs(date).format("hh:mm A")
+                    )
+                  : selectedDays.length === 0
+                  ? strings.reminderRepeatStrings[
+                      recurringMode as "week" | "month"
+                    ].selectDays()
+                  : strings.reminderRepeatStrings.repeats(
+                      repeatFrequency,
+                      recurringMode as string,
+                      getSelectedDaysText(selectedDays),
+                      dayjs(date).format("hh:mm A")
+                    )}
+              </Paragraph>
+            </>
+          </View>
+        )}
+
+        <ReminderTime
+          reminder={reminder}
+          style={{
+            width: "100%",
+            justifyContent: "flex-start",
+            borderWidth: 0,
+            paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL,
+            alignSelf: "flex-start"
+          }}
+        />
+
+        {reminderMode === ReminderModes.Permanent ? null : (
+          <RNScrollView
+            style={{
+              flexDirection: "row",
+              marginTop: DefaultAppStyles.GAP_VERTICAL,
+              height: 50
+            }}
+            horizontal
+          >
+            {Object.keys(ReminderNotificationModes).map((mode) => (
+              <Button
+                key={mode}
+                title={strings.reminderNotificationModes(
+                  mode as keyof typeof ReminderNotificationModes
+                )}
+                style={{
+                  marginRight: 12,
+                  borderRadius: 100,
+                  paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL
+                }}
+                icon={
+                  mode === "Silent"
+                    ? "minus-circle"
+                    : mode === "Vibrate"
+                    ? "vibrate"
+                    : "volume-high"
+                }
+                height={35}
+                type={
+                  reminderNotificationMode ===
+                  ReminderNotificationModes[
+                    mode as keyof typeof ReminderNotificationModes
+                  ]
+                    ? "selected"
+                    : "plain"
+                }
+                onPress={() => {
+                  const _mode = ReminderNotificationModes[
+                    mode as keyof typeof ReminderNotificationModes
+                  ] as Reminder["priority"];
+                  SettingsService.set({
+                    reminderNotificationMode: _mode
+                  });
+                  setReminderNotificatioMode(_mode);
+                }}
+              />
+            ))}
+          </RNScrollView>
+        )}
+      </ScrollView>
+
+      <Button
+        title={strings.save()}
+        type="accent"
+        style={{
+          paddingHorizontal: DefaultAppStyles.GAP * 2,
+          marginTop: DefaultAppStyles.GAP_VERTICAL,
+          width: "100%"
+        }}
+        onPress={saveReminder}
+      />
+    </View>
+  );
+}
+
+ReminderSheet.present = (
+  reminder?: Reminder,
+  reference?: ItemReference,
+  isSheet?: boolean
+) => {
+  presentSheet({
+    context: isSheet ? "local" : undefined,
+    component: (ref, close, update) => (
+      <ReminderSheet
+        actionSheetRef={ref}
+        close={close}
+        update={update}
+        reminder={reminder}
+        reference={reference}
+      />
+    )
+  });
+};

apps/mobile/app/components/sheets/sort/index.tsx

@@ -52,42 +52,23 @@ const Sort = ({
   hideGroupOptions?: boolean;
 }) => {
   const { colors } = useThemeColors();
-
-  const groupType =
-    screen === "Archive"
-      ? "archive"
-      : screen === "Search"
-      ? "search"
-      : screen === "Notes"
-      ? "home"
-      : screen === "Trash" || type === "trash"
-      ? "trash"
-      : ((type + "s") as GroupingKey);
-
   const [groupOptions, setGroupOptions] = useState(
-    db.settings.getGroupOptions(groupType)
+    db.settings.getGroupOptions(
+      screen === "Notes"
+        ? "home"
+        : screen === "Trash"
+        ? "trash"
+        : ((type + "s") as GroupingKey)
+    )
   );
-
-  const getSortButtonTitle = () => {
-    const { sortDirection, groupBy, sortBy } = groupOptions || {};
-    const isAlphabetical = groupBy === "abc" || sortBy === "title";
-    const isDueDate = sortBy === "dueDate";
-    const isRelevance = sortBy === "relevance";
-
-    if (sortDirection === "asc") {
-      if (isAlphabetical) return strings.aToZ();
-      if (isDueDate) return strings.earliestFirst();
-      if (isRelevance) return strings.leastRelevantFirst();
-      return strings.oldNew();
-    } else {
-      if (isAlphabetical) return strings.zToA();
-      if (isDueDate) return strings.latestFirst();
-      if (isRelevance) return strings.mostRelevantFirst();
-      return strings.newOld();
-    }
-  };
-
   const updateGroupOptions = async (_groupOptions: GroupOptions) => {
+    const groupType =
+      screen === "Notes"
+        ? "home"
+        : screen === "Trash"
+        ? "trash"
+        : ((type + "s") as GroupingKey);
+    console.log("updateGroupOptions for group", groupType, "in", screen);
     await db.settings.setGroupOptions(groupType, _groupOptions);
     setGroupOptions(_groupOptions);
     setTimeout(() => {
@@ -128,10 +109,31 @@ const Sort = ({
           paddingHorizontal: DefaultAppStyles.GAP
         }}
       >
-        <Heading size={AppFontSize.lg}>{strings.sortBy()}</Heading>
+        <Heading
+          size={AppFontSize.lg}
+          style={{
+            alignSelf: "center"
+          }}
+        >
+          {strings.sortBy()}
+        </Heading>
 
         <Button
-          title={getSortButtonTitle()}
+          title={
+            groupOptions?.sortDirection === "asc"
+              ? groupOptions?.groupBy === "abc" ||
+                groupOptions?.sortBy === "title"
+                ? strings.aToZ()
+                : groupOptions?.sortBy === "dueDate"
+                ? strings.earliestFirst()
+                : strings.oldNew()
+              : groupOptions?.groupBy === "abc" ||
+                groupOptions?.sortBy === "title"
+              ? strings.zToA()
+              : groupOptions?.sortBy === "dueDate"
+              ? strings.latestFirst()
+              : strings.newOld()
+          }
           icon={
             groupOptions?.sortDirection === "asc"
               ? "sort-ascending"
@@ -155,24 +157,13 @@ const Sort = ({
           borderBottomColor: colors.primary.border
         }}
       >
-        {Object.keys(SORT).map((item) => {
-          const sortOptionVisibility = {
-            relevance: screen === "Search",
-            dueDate: screen === "Reminders",
-            dateModified: screen === "Tags" || screen === "Reminders",
-            dateEdited: screen !== "Tags" && screen !== "Reminders"
-          };
-
-          // Check if this sort option should be skipped for the current screen
-          const shouldSkip =
-            item in sortOptionVisibility &&
-            !sortOptionVisibility[item as keyof typeof sortOptionVisibility];
-
-          if (shouldSkip) {
-            return null;
-          }
-
-          return (
+        {Object.keys(SORT).map((item) =>
+          (item === "dueDate" && screen !== "Reminders") ||
+          (screen !== "Tags" &&
+            screen !== "Reminders" &&
+            item === "dateModified") ||
+          ((screen === "Tags" || screen === "Reminders") &&
+            item === "dateEdited") ? null : (
             <Pressable
               key={item}
               type={groupOptions?.sortBy === item ? "selected" : "plain"}
@@ -210,8 +201,8 @@ const Sort = ({
                 />
               ) : null}
             </Pressable>
-          );
-        })}
+          )
+        )}
       </View>
 
       {!hideGroupOptions ? (

apps/mobile/app/components/sheets/user/index.tsx

@@ -40,7 +40,6 @@ import Sync from "../../../services/sync";
 
 import Clipboard from "@react-native-clipboard/clipboard";
 import { logoutUser } from "../../../screens/settings/logout";
-import { sleep } from "../../../utils/time";
 export const UserSheet = () => {
   const ref = useSheetRef();
   const { colors } = useThemeColors();
@@ -311,11 +310,10 @@ export const UserSheet = () => {
           {
             icon: "logout",
             title: strings.logout(),
-            onPress: async () => {
+            onPress: () => {
               console.log("logout");
-              ref.current?.hide();
-              await sleep(300);
               logoutUser();
+              ref.current?.hide();
             },
             hidden: !user
           }

apps/mobile/app/components/side-menu/menu-item.tsx

@@ -80,9 +80,6 @@ function _MenuItem({
             case "Monographs":
               setItemCount(await db.monographs.all.count());
               break;
-            case "Archive":
-              setItemCount(await db.notes.archived.count());
-              break;
             case "Trash":
               setItemCount((await db.trash.all()).length);
               break;

apps/mobile/app/components/side-menu/notebook-item.tsx

@@ -93,11 +93,7 @@ export const NotebookItem = ({
     <View
       style={{
         paddingLeft:
-          item.depth === 0
-            ? undefined
-            : item.depth < 6
-            ? 15 * item.depth
-            : 15 * 5,
+          item.depth > 0 && item.depth < 6 ? 15 * item.depth : undefined,
         width: "100%",
         marginTop: 2
       }}

apps/mobile/app/components/ui/input/index.tsx

@@ -321,9 +321,6 @@ const Input = ({
                 bottom={10}
                 onPress={button.onPress}
                 color={button.color}
-                style={{
-                  marginRight: -8
-                }}
               />
             )}
 

apps/mobile/app/features.ts

@@ -21,7 +21,11 @@ import { FeatureType } from "./components/sheets/new-feature";
 
 export const features: FeatureType[] = [
   {
-    title: "Improved Search",
-    body: "Improved search results with better relevance and highlighting."
+    title: "Notebook Tree View",
+    body: "Notebooks are now displayed in a tree view for better organization and user experience."
+  },
+  {
+    title: "New SideBar",
+    body: "Sidebar now contains tabs for Notebooks and Tags for easy navigation."
   }
 ];

apps/mobile/app/hooks/use-actions.tsx

@@ -41,6 +41,7 @@ import ExportNotesSheet from "../components/sheets/export-notes";
 import PublishNoteSheet from "../components/sheets/publish-note";
 import { ReferencesList } from "../components/sheets/references";
 import { RelationsList } from "../components/sheets/relations-list/index";
+import ReminderSheet from "../components/sheets/reminder";
 import { useSideBarDraggingStore } from "../components/side-menu/dragging-store";
 import { ButtonProps } from "../components/ui/button";
 import { useTabStore } from "../screens/editor/tiptap/use-tab-store";
@@ -53,24 +54,21 @@ import {
 } from "../services/event-manager";
 import Navigation from "../services/navigation";
 import Notifications from "../services/notifications";
-import SettingsService from "../services/settings";
-import { useArchivedStore } from "../stores/use-archived-store";
 import { useMenuStore } from "../stores/use-menu-store";
 import useNavigationStore from "../stores/use-navigation-store";
 import { useRelationStore } from "../stores/use-relation-store";
 import { useSelectionStore } from "../stores/use-selection-store";
-import { useSettingStore } from "../stores/use-setting-store";
 import { useTagStore } from "../stores/use-tag-store";
 import { useUserStore } from "../stores/use-user-store";
 import { eUpdateNoteInEditor } from "../utils/events";
 import { deleteItems } from "../utils/functions";
 import { convertNoteToText } from "../utils/note-to-text";
 import { sleep } from "../utils/time";
-import AddReminder from "../screens/add-reminder";
+import SettingsService from "../services/settings";
+import { useSettingStore } from "../stores/use-setting-store";
 
 export type ActionId =
   | "select"
-  | "archive"
   | "restore"
   | "delete"
   | "reorder"
@@ -110,8 +108,7 @@ export type ActionId =
   | "favorite"
   | "remove-from-notebook"
   | "trash"
-  | "default-homepage"
-  | "default-tag";
+  | "default-homepage";
 
 export type Action = {
   id: ActionId;
@@ -159,8 +156,6 @@ export const useActions = ({
   const [defaultNotebook, setDefaultNotebook] = useState(
     db.settings.getDefaultNotebook()
   );
-  const [defaultTag, setDefaultTag] = useState(db.settings.getDefaultTag());
-
   const [noteInCurrentNotebook, setNoteInCurrentNotebook] = useState(false);
   const [locked, setLocked] = useState(false);
   const isHomepage = useSettingStore(
@@ -448,8 +443,7 @@ export const useActions = ({
         title: strings.editReminder(),
         icon: "pencil",
         onPress: async () => {
-          AddReminder.present(item);
-          close();
+          ReminderSheet.present(item);
         }
       }
     );
@@ -473,39 +467,15 @@ export const useActions = ({
   }
 
   if (item.type === "tag" || item.type === "notebook") {
-    actions.push(
-      {
-        id: "add-shortcut",
-        title: isPinnedToMenu
-          ? strings.removeShortcut()
-          : strings.addShortcut(),
-        icon: isPinnedToMenu ? "link-variant-remove" : "link-variant",
-        onPress: createMenuShortcut,
-        isToggle: true,
-        checked: isPinnedToMenu,
-        activeColor: colors.error.paragraph
-      },
-      {
-        id: "default-tag",
-        title:
-          defaultTag === item.id
-            ? strings.removeAsDefault()
-            : strings.setAsDefault(),
-        hidden: item.type !== "tag",
-        icon: "pound",
-        onPress: async () => {
-          if (defaultTag === item.id) {
-            await db.settings.setDefaultTag(undefined);
-            setDefaultTag(undefined);
-          } else {
-            await db.settings.setDefaultTag(item.id);
-            setDefaultTag(item.id);
-          }
-          close();
-        },
-        checked: defaultTag === item.id
-      }
-    );
+    actions.push({
+      id: "add-shortcut",
+      title: isPinnedToMenu ? strings.removeShortcut() : strings.addShortcut(),
+      icon: isPinnedToMenu ? "link-variant-remove" : "link-variant",
+      onPress: createMenuShortcut,
+      isToggle: true,
+      checked: isPinnedToMenu,
+      activeColor: colors.error.paragraph
+    });
   }
 
   if (item.type === "notebook") {
@@ -681,8 +651,7 @@ export const useActions = ({
 
     async function pinToNotifications() {
       if (notifPinned) {
-        await Notifications.remove(item.id);
-        await sleep(500);
+        Notifications.remove(item.id);
         await Notifications.get();
         setNotifPinned(isNotePinnedInNotifications(item));
         return;
@@ -696,8 +665,7 @@ export const useActions = ({
         return;
       }
 
-      await Notifications.pinNote(item.id);
-      await sleep(500);
+      Notifications.pinNote(item.id);
       await Notifications.get();
       setNotifPinned(isNotePinnedInNotifications(item));
     }
@@ -909,18 +877,12 @@ export const useActions = ({
             referenceType: "reminder",
             relationType: "from",
             title: strings.dataTypesPluralCamelCase.reminder(),
-            onAdd: () => {
-              AddReminder.present(undefined, item);
-              close();
-            },
+            onAdd: () => ReminderSheet.present(undefined, item, true),
             button: {
-              type: "plain",
-              onPress: () => {
-                AddReminder.present(undefined, item);
-                close();
-              },
-              icon: "plus",
-              iconSize: 20
+              title: strings.add(),
+              type: "accent",
+              onPress: () => ReminderSheet.present(undefined, item, true),
+              icon: "plus"
             }
           });
         }
@@ -964,8 +926,7 @@ export const useActions = ({
         title: strings.remindMe(),
         icon: "clock-plus-outline",
         onPress: () => {
-          close();
-          AddReminder.present(undefined, item);
+          ReminderSheet.present(undefined, { id: item.id, type: "note" });
         }
       },
       {
@@ -1011,19 +972,6 @@ export const useActions = ({
             reference: item as ItemReference
           });
         }
-      },
-      {
-        id: "archive",
-        title: !item.archived ? strings.archive() : strings.unarchive(),
-        icon: "archive",
-        onPress: async () => {
-          db.notes.archive(!item.archived, item.id);
-          setItem((await db.notes.note(item.id)) as Item);
-          Navigation.queueRoutesForUpdate();
-          useArchivedStore.getState().refresh();
-        },
-        checked: item.archived,
-        isToggle: true
       }
     );
 

apps/mobile/app/hooks/use-app-events.tsx

@@ -49,6 +49,7 @@ import { MMKV } from "../common/database/mmkv";
 import { endProgress, startProgress } from "../components/dialogs/progress";
 import Migrate from "../components/sheets/migrate";
 import NewFeature from "../components/sheets/new-feature";
+import ReminderSheet from "../components/sheets/reminder";
 import { Walkthrough } from "../components/walkthroughs";
 import {
   resetTabStore,
@@ -102,7 +103,6 @@ import { getGithubVersion } from "../utils/github-version";
 import { fluidTabsRef } from "../utils/global-refs";
 import { NotesnookModule } from "../utils/notesnook-module";
 import { sleep } from "../utils/time";
-import AddReminder from "../screens/add-reminder";
 
 const onCheckSyncStatus = async (type: SyncStatusEvent) => {
   const { disableSync, disableAutoSync } = SettingsService.get();
@@ -182,10 +182,10 @@ const onAppOpenedFromURL = async (event: { url: string }) => {
       const id = new URL(url).searchParams.get("id");
       if (id) {
         const reminder = await db.reminders.reminder(id);
-        if (reminder) AddReminder.present(reminder);
+        if (reminder) ReminderSheet.present(reminder);
       }
     } else if (url.startsWith("https://notesnook.com/new_reminder")) {
-      AddReminder.present();
+      ReminderSheet.present();
     }
   } catch (e) {
     console.error(e);
@@ -341,15 +341,8 @@ const doAppLoadActions = async () => {
 };
 
 const checkAppUpdateAvailable = async () => {
-  if (
-    __DEV__ ||
-    Config.isTesting === "true" ||
-    Config.FDROID_BUILD ||
-    BETA ||
-    !SettingsService.getProperty("checkForUpdates")
-  )
+  if (__DEV__ || Config.isTesting === "true" || Config.FDROID_BUILD || BETA)
     return;
-
   try {
     const version =
       Config.GITHUB_RELEASE === "true"

apps/mobile/app/hooks/use-group-options.ts

@@ -32,7 +32,7 @@ export function useGroupOptions(type: any) {
     const onUpdate = (groupType: string) => {
       if (groupType !== type) return;
       const options = db.settings?.getGroupOptions(type) as any;
-      if (!options) return;
+
       if (
         groupOptions?.groupBy !== options.groupBy ||
         groupOptions?.sortBy !== options.sortBy ||

apps/mobile/app/hooks/use-timer.ts

@@ -52,14 +52,7 @@ const useTimer = (initialId?: string) => {
     };
   }, [seconds, id]);
 
-  const reset = () => {
-    if (id) {
-      timers[id] = 0;
-      setSeconds(0);
-    }
-  };
-
-  return { seconds, setId, start, reset };
+  return { seconds, setId, start };
 };
 
 export default useTimer;

apps/mobile/app/navigation/fluid-panels-view.tsx

@@ -530,11 +530,17 @@ const onChangeTab = async (event: { i: number; from: number }) => {
     activateKeepAwake();
     eSendEvent(eOnEnterEditor);
 
-    if (
-      useTabStore.getState().getTab(useTabStore.getState().currentTab)?.session
-        ?.locked
-    ) {
-      eSendEvent(eUnlockNote);
+    if (!useTabStore.getState().getCurrentNoteId()) {
+      eSendEvent(eOnLoadNote, {
+        newNote: true
+      });
+    } else {
+      if (
+        useTabStore.getState().getTab(useTabStore.getState().currentTab)
+          ?.session?.locked
+      ) {
+        eSendEvent(eUnlockNote);
+      }
     }
   } else {
     if (event.from === 2) {

apps/mobile/app/navigation/navigation-stack.tsx

@@ -21,7 +21,6 @@ import { useThemeColors } from "@notesnook/theme";
 import { NavigationContainer } from "@react-navigation/native";
 import { createNativeStackNavigator } from "@react-navigation/native-stack";
 import * as React from "react";
-import { db } from "../common/database";
 import { hideAllTooltips } from "../hooks/use-tooltip";
 import SettingsService from "../services/settings";
 import useNavigationStore, {
@@ -30,6 +29,7 @@ import useNavigationStore, {
 import { useSelectionStore } from "../stores/use-selection-store";
 import { useSettingStore } from "../stores/use-setting-store";
 import { rootNavigatorRef } from "../utils/global-refs";
+import { db } from "../common/database";
 
 const RootStack = createNativeStackNavigator();
 const AppStack = createNativeStackNavigator();
@@ -43,7 +43,7 @@ let Reminders: any = null;
 let Monographs: any = null;
 let TaggedNotes: any = null;
 let ColoredNotes: any = null;
-let Archive: any = null;
+
 const AppNavigation = React.memo(
   () => {
     const { colors } = useThemeColors();
@@ -192,14 +192,6 @@ const AppNavigation = React.memo(
           initialParams={home.name === "ColoredNotes" ? home.params : undefined}
         />
 
-        <AppStack.Screen
-          name="Archive"
-          getComponent={() => {
-            Archive = Archive || require("../screens/archive").default;
-            return Archive;
-          }}
-        />
-
         <AppStack.Screen
           name="Reminders"
           getComponent={() => {
@@ -247,8 +239,6 @@ let LinkNotebooks: any = null;
 let MoveNotebook: any = null;
 let MoveNotes: any = null;
 let Settings: any = null;
-let ManageTags: any = null;
-let AddReminder: any = null;
 
 export const RootNavigation = () => {
   const introCompleted = useSettingStore(
@@ -328,24 +318,6 @@ export const RootNavigation = () => {
             return Settings;
           }}
         />
-
-        <RootStack.Screen
-          name="ManageTags"
-          getComponent={() => {
-            ManageTags =
-              ManageTags || require("../screens/manage-tags").default;
-            return ManageTags;
-          }}
-        />
-
-        <RootStack.Screen
-          name="AddReminder"
-          getComponent={() => {
-            AddReminder =
-              AddReminder || require("../screens/add-reminder").default;
-            return AddReminder;
-          }}
-        />
       </RootStack.Navigator>
     </NavigationContainer>
   );

apps/mobile/app/screens/add-reminder/index.tsx

@@ -1,608 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-import { Note, Reminder } from "@notesnook/core";
-import { strings } from "@notesnook/intl";
-import { useThemeColors } from "@notesnook/theme";
-import dayjs from "dayjs";
-import React, { useRef, useState } from "react";
-import {
-  KeyboardAvoidingView,
-  Platform,
-  ScrollView,
-  TextInput,
-  View
-} from "react-native";
-import DatePicker from "react-native-date-picker";
-import DateTimePickerModal from "react-native-modal-datetime-picker";
-import { SafeAreaView } from "react-native-safe-area-context";
-import { db } from "../../common/database";
-import { Dialog } from "../../components/dialog";
-import { Header } from "../../components/header";
-import { Button } from "../../components/ui/button";
-import Input from "../../components/ui/input";
-import { ReminderTime } from "../../components/ui/reminder-time";
-import Paragraph from "../../components/ui/typography/paragraph";
-import { DDS } from "../../services/device-detection";
-import { ToastManager } from "../../services/event-manager";
-import Navigation, { NavigationProps } from "../../services/navigation";
-import Notifications from "../../services/notifications";
-import PremiumService from "../../services/premium";
-import SettingsService from "../../services/settings";
-import { useRelationStore } from "../../stores/use-relation-store";
-import { AppFontSize, defaultBorderRadius } from "../../utils/size";
-import { DefaultAppStyles } from "../../utils/styles";
-
-const ReminderModes =
-  Platform.OS === "ios"
-    ? {
-        Once: "once",
-        Repeat: "repeat"
-      }
-    : {
-        Once: "once",
-        Repeat: "repeat",
-        Permanent: "permanent"
-      };
-
-const RecurringModes = {
-  Daily: "day",
-  Week: "week",
-  Month: "month",
-  Year: "year"
-};
-
-const WeekDays = new Array(7).fill(true);
-const MonthDays = new Array(31).fill(true);
-const WeekDayNames = {
-  0: "Sunday",
-  1: "Monday",
-  2: "Tuesday",
-  3: "Wednesday",
-  4: "Thursday",
-  5: "Friday",
-  6: "Saturday"
-};
-
-const ReminderNotificationModes = {
-  Silent: "silent",
-  Vibrate: "vibrate",
-  Urgent: "urgent"
-};
-
-export default function AddReminder(props: NavigationProps<"AddReminder">) {
-  const { reminder, reference } = props.route.params;
-  const { colors, isDark } = useThemeColors();
-  const [reminderMode, setReminderMode] = useState<Reminder["mode"]>(
-    reminder?.mode || "once"
-  );
-  const [recurringMode, setRecurringMode] = useState<Reminder["recurringMode"]>(
-    reminder?.recurringMode || "week"
-  );
-  const [selectedDays, setSelectedDays] = useState<number[]>(
-    reminder?.selectedDays || []
-  );
-  const [date, setDate] = useState<Date>(
-    new Date(reminder?.date || Date.now())
-  );
-  const [reminderNotificationMode, setReminderNotificatioMode] = useState<
-    Reminder["priority"]
-  >(reminder?.priority || SettingsService.get().reminderNotificationMode);
-  const [isDatePickerVisible, setDatePickerVisibility] = useState(false);
-  const [repeatFrequency, setRepeatFrequency] = useState(1);
-  const referencedItem = reference ? (reference as Note) : null;
-
-  const title = useRef<string | undefined>(
-    !reminder ? referencedItem?.title : reminder?.title
-  );
-  const details = useRef<string | undefined>(
-    !reminder ? referencedItem?.headline : reminder?.description
-  );
-  const titleRef = useRef<TextInput>(null);
-  const timer = useRef<NodeJS.Timeout>();
-
-  const showDatePicker = () => {
-    setDatePickerVisibility(true);
-  };
-
-  const hideDatePicker = () => {
-    setDatePickerVisibility(false);
-  };
-
-  const handleConfirm = (date: Date) => {
-    timer.current = setTimeout(() => {
-      hideDatePicker();
-      setDate(date);
-    }, 50);
-  };
-  function nth(n: number) {
-    return (
-      ["st", "nd", "rd"][(((((n < 0 ? -n : n) + 90) % 100) - 10) % 10) - 1] ||
-      "th"
-    );
-  }
-
-  function getSelectedDaysText(selectedDays: number[]) {
-    const text = selectedDays
-      .sort((a, b) => a - b)
-      .map((day, index) => {
-        const isLast = index === selectedDays.length - 1;
-        const isSecondLast = index === selectedDays.length - 2;
-        const joinWith = isSecondLast ? " & " : isLast ? "" : ", ";
-        return recurringMode === RecurringModes.Week
-          ? WeekDayNames[day as keyof typeof WeekDayNames] + joinWith
-          : `${day}${nth(day)} ${joinWith}`;
-      })
-      .join("");
-    return text;
-  }
-
-  async function saveReminder() {
-    try {
-      if (!(await Notifications.checkAndRequestPermissions(true)))
-        throw new Error(strings.noNotificationPermission());
-      if (!date && reminderMode !== ReminderModes.Permanent) return;
-      if (
-        reminderMode === ReminderModes.Repeat &&
-        recurringMode !== "day" &&
-        recurringMode !== "year" &&
-        selectedDays.length === 0
-      )
-        throw new Error(strings.selectDayError());
-
-      if (!title.current) throw new Error(strings.setTitleError());
-      if (date.getTime() < Date.now() && reminderMode === "once") {
-        titleRef?.current?.focus();
-        throw new Error(strings.dateError());
-      }
-
-      date.setSeconds(0, 0);
-
-      const reminderId = await db.reminders?.add({
-        id: reminder?.id,
-        date: date?.getTime(),
-        priority: reminderNotificationMode,
-        title: title.current,
-        description: details.current,
-        recurringMode: recurringMode,
-        selectedDays: selectedDays,
-        mode: reminderMode,
-        localOnly: reminderMode === "permanent",
-        snoozeUntil:
-          date?.getTime() > Date.now() ? undefined : reminder?.snoozeUntil,
-        disabled: false
-      });
-      if (!reminderId) return;
-      const _reminder = await db.reminders?.reminder(reminderId);
-
-      if (reference && _reminder) {
-        await db.relations?.add(reference, {
-          id: _reminder?.id as string,
-          type: _reminder?.type
-        });
-      }
-      Notifications.scheduleNotification(_reminder as Reminder);
-      Navigation.queueRoutesForUpdate();
-      useRelationStore.getState().update();
-      Navigation.goBack();
-    } catch (e) {
-      ToastManager.error(e as Error, undefined);
-    }
-  }
-
-  const KeyboardViewIOS = Platform.OS === "ios" ? KeyboardAvoidingView : View;
-
-  return (
-    <SafeAreaView
-      style={{
-        backgroundColor: colors.primary.background,
-        flex: 1
-      }}
-    >
-      <KeyboardViewIOS
-        behavior="padding"
-        style={{
-          flex: 1
-        }}
-      >
-        <Header
-          title={reminder ? strings.editReminder() : strings.newReminder()}
-          canGoBack
-          rightButton={{
-            name: "check",
-            onPress: saveReminder
-          }}
-        />
-        <Dialog context="local" />
-        <ScrollView
-          style={{
-            marginBottom: DDS.isTab ? 25 : undefined,
-            paddingHorizontal: DefaultAppStyles.GAP
-          }}
-          keyboardDismissMode="interactive"
-          keyboardShouldPersistTaps="handled"
-        >
-          <Input
-            fwdRef={titleRef}
-            defaultValue={reminder?.title || referencedItem?.title}
-            placeholder={strings.remindeMeOf()}
-            onChangeText={(text) => (title.current = text)}
-            wrapperStyle={{
-              marginTop: DefaultAppStyles.GAP_VERTICAL
-            }}
-          />
-
-          <Input
-            defaultValue={
-              reminder ? reminder?.description : referencedItem?.headline
-            }
-            placeholder={strings.addShortNote()}
-            onChangeText={(text) => (details.current = text)}
-            containerStyle={{
-              maxHeight: 80
-            }}
-            multiline
-            textAlignVertical="top"
-            inputStyle={{
-              minHeight: 80,
-              paddingVertical: DefaultAppStyles.GAP_VERTICAL
-            }}
-            height={80}
-            wrapperStyle={{
-              marginBottom: DefaultAppStyles.GAP_VERTICAL
-            }}
-          />
-
-          <ScrollView
-            style={{
-              flexDirection: "row",
-              marginBottom: DefaultAppStyles.GAP_VERTICAL
-            }}
-            horizontal
-          >
-            {Object.keys(ReminderModes).map((mode) => (
-              <Button
-                key={mode}
-                title={strings.reminderModes(
-                  ReminderModes[mode as keyof typeof ReminderModes] as string
-                )}
-                style={{
-                  paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL,
-                  marginRight: DefaultAppStyles.GAP_SMALL
-                }}
-                proTag={mode === "Repeat"}
-                height={35}
-                type={
-                  reminderMode ===
-                  ReminderModes[mode as keyof typeof ReminderModes]
-                    ? "selected"
-                    : "plain"
-                }
-                onPress={() => {
-                  if (mode === "Repeat" && !PremiumService.get()) return;
-                  setReminderMode(
-                    ReminderModes[
-                      mode as keyof typeof ReminderModes
-                    ] as Reminder["mode"]
-                  );
-                  if (mode === "Repeat") {
-                    setSelectedDays((days) => {
-                      if (days.length > 0) return days;
-                      if (days.indexOf(date.getDay()) > -1) {
-                        return days;
-                      }
-                      days.push(date.getDay());
-                      return [...days];
-                    });
-                  }
-                }}
-              />
-            ))}
-          </ScrollView>
-
-          {reminderMode === ReminderModes.Repeat ? (
-            <View
-              style={{
-                backgroundColor: colors.secondary.background,
-                padding: DefaultAppStyles.GAP,
-                borderRadius: defaultBorderRadius,
-                marginBottom: DefaultAppStyles.GAP_VERTICAL
-              }}
-            >
-              <View
-                style={{
-                  flexDirection: "row",
-                  marginBottom:
-                    recurringMode === "day" || recurringMode === "year"
-                      ? 0
-                      : 12,
-                  alignItems: "center"
-                }}
-              >
-                {Object.keys(RecurringModes).map((mode) => (
-                  <Button
-                    key={mode}
-                    title={strings.recurringModes(
-                      RecurringModes[mode as keyof typeof RecurringModes]
-                    )}
-                    style={{
-                      marginRight: 6,
-                      borderRadius: 100,
-                      paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL
-                    }}
-                    type={
-                      recurringMode ===
-                      RecurringModes[mode as keyof typeof RecurringModes]
-                        ? "selected"
-                        : "plain"
-                    }
-                    onPress={() => {
-                      setRecurringMode(
-                        RecurringModes[
-                          mode as keyof typeof RecurringModes
-                        ] as Reminder["recurringMode"]
-                      );
-                      setSelectedDays([]);
-                      setRepeatFrequency(1);
-                    }}
-                  />
-                ))}
-              </View>
-
-              <ScrollView showsHorizontalScrollIndicator={false} horizontal>
-                {recurringMode === RecurringModes.Daily ||
-                recurringMode === RecurringModes.Year
-                  ? null
-                  : recurringMode === RecurringModes.Week
-                  ? WeekDays.map((item, index) => (
-                      <Button
-                        key={strings.weekDayNamesShort[
-                          index as keyof typeof strings.weekDayNamesShort
-                        ]()}
-                        title={strings.weekDayNamesShort[
-                          index as keyof typeof strings.weekDayNamesShort
-                        ]()}
-                        type={
-                          selectedDays.indexOf(index) > -1
-                            ? "selected"
-                            : "plain"
-                        }
-                        fontSize={AppFontSize.xs}
-                        style={{
-                          height: 40,
-                          borderRadius: 100,
-                          marginRight: 10
-                        }}
-                        onPress={() => {
-                          setSelectedDays((days) => {
-                            if (days.indexOf(index) > -1) {
-                              days.splice(days.indexOf(index), 1);
-                              return [...days];
-                            }
-                            days.push(index);
-                            return [...days];
-                          });
-                        }}
-                      />
-                    ))
-                  : MonthDays.map((item, index) => (
-                      <Button
-                        key={index + "monthday"}
-                        title={index + 1 + ""}
-                        type={
-                          selectedDays.indexOf(index + 1) > -1
-                            ? "selected"
-                            : "plain"
-                        }
-                        fontSize={AppFontSize.xs}
-                        style={{
-                          height: 40,
-                          borderRadius: 100,
-                          marginRight: 10
-                        }}
-                        onPress={() => {
-                          setSelectedDays((days) => {
-                            if (days.indexOf(index + 1) > -1) {
-                              days.splice(days.indexOf(index + 1), 1);
-                              return [...days];
-                            }
-                            days.push(index + 1);
-                            return [...days];
-                          });
-                        }}
-                      />
-                    ))}
-              </ScrollView>
-            </View>
-          ) : null}
-
-          {reminderMode === ReminderModes.Permanent ? null : (
-            <View
-              style={{
-                width: "100%",
-                flexDirection: "column",
-                justifyContent: "center",
-                marginBottom: DefaultAppStyles.GAP_VERTICAL,
-                alignItems: "center"
-              }}
-            >
-              <DateTimePickerModal
-                isVisible={isDatePickerVisible}
-                mode="date"
-                onConfirm={handleConfirm}
-                onCancel={hideDatePicker}
-                is24Hour={db.settings.getTimeFormat() === "24-hour"}
-                date={date || new Date(Date.now())}
-              />
-
-              <DatePicker
-                date={date}
-                maximumDate={dayjs(date).add(3, "months").toDate()}
-                onDateChange={handleConfirm}
-                textColor={isDark ? colors.static.white : colors.static.black}
-                fadeToColor={colors.primary.background}
-                theme={isDark ? "dark" : "light"}
-                androidVariant="nativeAndroid"
-                is24hourSource="locale"
-                locale={
-                  db.settings?.getTimeFormat() === "24-hour" ? "en_GB" : "en_US"
-                }
-                mode={
-                  reminderMode === ReminderModes.Repeat &&
-                  recurringMode !== "year"
-                    ? "time"
-                    : "datetime"
-                }
-              />
-
-              {reminderMode === ReminderModes.Repeat ? null : (
-                <Button
-                  style={{
-                    width: "100%"
-                  }}
-                  title={
-                    date ? date.toLocaleDateString() : strings.selectDate()
-                  }
-                  type={date ? "secondaryAccented" : "secondary"}
-                  icon="calendar"
-                  fontSize={AppFontSize.sm}
-                  onPress={() => {
-                    showDatePicker();
-                  }}
-                />
-              )}
-            </View>
-          )}
-
-          {reminderMode === ReminderModes.Once ||
-          reminderMode === ReminderModes.Permanent ? null : (
-            <View
-              style={{
-                borderRadius: defaultBorderRadius,
-                flexDirection: "row",
-                paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL,
-                alignItems: "center",
-                justifyContent: "flex-start",
-                marginBottom: DefaultAppStyles.GAP_VERTICAL
-              }}
-            >
-              <>
-                <Paragraph
-                  size={AppFontSize.xxs}
-                  color={colors.secondary.paragraph}
-                >
-                  {recurringMode === RecurringModes.Daily
-                    ? strings.reminderRepeatStrings.day(
-                        dayjs(date).format("hh:mm A")
-                      )
-                    : recurringMode === RecurringModes.Year
-                    ? strings.reminderRepeatStrings.year(
-                        dayjs(date).format("dddd, MMMM D, h:mm A")
-                      )
-                    : selectedDays.length === 7 &&
-                      recurringMode === RecurringModes.Week
-                    ? strings.reminderRepeatStrings.week.daily(
-                        dayjs(date).format("hh:mm A")
-                      )
-                    : selectedDays.length === 0
-                    ? strings.reminderRepeatStrings[
-                        recurringMode as "week" | "month"
-                      ].selectDays()
-                    : strings.reminderRepeatStrings.repeats(
-                        repeatFrequency,
-                        recurringMode as string,
-                        getSelectedDaysText(selectedDays),
-                        dayjs(date).format("hh:mm A")
-                      )}
-                </Paragraph>
-              </>
-            </View>
-          )}
-
-          <ReminderTime
-            reminder={reminder}
-            style={{
-              width: "100%",
-              justifyContent: "flex-start",
-              borderWidth: 0,
-              paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL,
-              alignSelf: "flex-start"
-            }}
-          />
-
-          {reminderMode === ReminderModes.Permanent ? null : (
-            <ScrollView
-              style={{
-                flexDirection: "row",
-                marginTop: DefaultAppStyles.GAP_VERTICAL,
-                height: 50
-              }}
-              horizontal
-            >
-              {Object.keys(ReminderNotificationModes).map((mode) => (
-                <Button
-                  key={mode}
-                  title={strings.reminderNotificationModes(
-                    mode as keyof typeof ReminderNotificationModes
-                  )}
-                  style={{
-                    marginRight: 12,
-                    paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL
-                  }}
-                  icon={
-                    mode === "Silent"
-                      ? "minus-circle"
-                      : mode === "Vibrate"
-                      ? "vibrate"
-                      : "volume-high"
-                  }
-                  fontSize={AppFontSize.xs}
-                  height={35}
-                  type={
-                    reminderNotificationMode ===
-                    ReminderNotificationModes[
-                      mode as keyof typeof ReminderNotificationModes
-                    ]
-                      ? "selected"
-                      : "plain"
-                  }
-                  onPress={() => {
-                    const _mode = ReminderNotificationModes[
-                      mode as keyof typeof ReminderNotificationModes
-                    ] as Reminder["priority"];
-                    SettingsService.set({
-                      reminderNotificationMode: _mode
-                    });
-                    setReminderNotificatioMode(_mode);
-                  }}
-                />
-              ))}
-            </ScrollView>
-          )}
-        </ScrollView>
-      </KeyboardViewIOS>
-    </SafeAreaView>
-  );
-}
-
-AddReminder.present = (reminder?: Reminder, reference?: Note) => {
-  Navigation.navigate("AddReminder", {
-    reminder,
-    reference
-  });
-};

apps/mobile/app/screens/archive/index.tsx

@@ -1,88 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import React from "react";
-import DelayLayout from "../../components/delay-layout";
-import { Header } from "../../components/header";
-import List from "../../components/list";
-import SelectionHeader from "../../components/selection-header";
-import { useNavigationFocus } from "../../hooks/use-navigation-focus";
-import Navigation, { NavigationProps } from "../../services/navigation";
-import SettingsService from "../../services/settings";
-import useNavigationStore from "../../stores/use-navigation-store";
-import { db } from "../../common/database";
-import { strings } from "@notesnook/intl";
-import { useArchived } from "../../stores/use-archived-store";
-
-export const Archive = ({ navigation, route }: NavigationProps<"Archive">) => {
-  const [archive, loading, refresh] = useArchived();
-  const isFocused = useNavigationFocus(navigation, {
-    onFocus: (prev) => {
-      Navigation.routeNeedsUpdate(
-        route.name,
-        Navigation.routeUpdateFunctions[route.name]
-      );
-      useNavigationStore.getState().setFocusedRouteId(route?.name);
-      return false;
-    },
-    onBlur: () => false,
-    delay: SettingsService.get().homepage === route.name ? 1 : -1
-  });
-
-  return (
-    <>
-      <SelectionHeader id={route.name} items={archive} type="note" />
-      <Header
-        renderedInRoute={route.name}
-        title={strings.routes[route.name]()}
-        canGoBack={false}
-        hasSearch={true}
-        id={route.name}
-        onSearch={() => {
-          Navigation.push("Search", {
-            placeholder: strings.searchInRoute(route.name),
-            type: "note",
-            title: route.name,
-            route: route.name,
-            items: db.notes.archived
-          });
-        }}
-      />
-      <DelayLayout wait={loading}>
-        <List
-          data={archive}
-          dataType="note"
-          onRefresh={() => {
-            refresh();
-          }}
-          renderedInRoute="Archive"
-          loading={loading}
-          placeholder={{
-            title: strings.yourArchive(),
-            paragraph: strings.yourArchiveIsEmpty(),
-            loading: strings.loadingArchive()
-          }}
-          headerTitle={strings.routes.Archive()}
-        />
-      </DelayLayout>
-    </>
-  );
-};
-
-export default Archive;

apps/mobile/app/screens/editor/tiptap/commands.ts

@@ -236,11 +236,6 @@ class Commands {
     const tabId = useTabStore.getState().currentTab;
     return this.sendCommand("scrollIntoViewById", id, tabId);
   };
-
-  scrollToSearchResult = (index: number) => {
-    const tabId = useTabStore.getState().currentTab;
-    return this.sendCommand("scrollToSearchResult", index, tabId);
-  };
 }
 
 export default Commands;

apps/mobile/app/screens/editor/tiptap/use-editor-events.tsx

@@ -38,11 +38,12 @@ import { WebViewMessageEvent } from "react-native-webview";
 import { DatabaseLogger, db } from "../../../common/database";
 import downloadAttachment from "../../../common/filesystem/download-attachment";
 import { AuthMode } from "../../../components/auth/common";
-import { Properties } from "../../../components/properties";
 import EditorTabs from "../../../components/sheets/editor-tabs";
 import { Issue } from "../../../components/sheets/github/issue";
 import LinkNote from "../../../components/sheets/link-note";
+import ManageTagsSheet from "../../../components/sheets/manage-tags";
 import { RelationsList } from "../../../components/sheets/relations-list";
+import ReminderSheet from "../../../components/sheets/reminder";
 import TableOfContents from "../../../components/sheets/toc";
 import { DDS } from "../../../services/device-detection";
 import {
@@ -73,13 +74,11 @@ import {
 } from "../../../utils/events";
 import { openLinkInBrowser } from "../../../utils/functions";
 import { fluidTabsRef } from "../../../utils/global-refs";
-import { sleep } from "../../../utils/time";
-import ManageTags from "../../manage-tags";
 import { useDragState } from "../../settings/editor/state";
 import { EditorMessage, EditorProps, useEditorType } from "./types";
 import { useTabStore } from "./use-tab-store";
 import { editorState, openInternalLink } from "./utils";
-import AddReminder from "../../add-reminder";
+import { Properties } from "../../../components/properties";
 
 const publishNote = async () => {
   const user = useUserStore.getState().user;
@@ -178,7 +177,7 @@ export const useEditorEvents = (
   useEffect(() => {
     const handleKeyboardDidShow: KeyboardEventListener = () => {
       editor.commands.keyboardShown(true);
-      editor.postMessage(NativeEvents.keyboardShown, undefined);
+      //editor.postMessage(NativeEvents.keyboardShown, undefined);
     };
     const handleKeyboardDidHide: KeyboardEventListener = () => {
       editor.commands.keyboardShown(false);
@@ -438,7 +437,7 @@ export const useEditorEvents = (
             referenceType: "reminder",
             relationType: "from",
             title: strings.dataTypesPluralCamelCase.reminder(),
-            onAdd: () => AddReminder.present(undefined, note)
+            onAdd: () => ReminderSheet.present(undefined, note, true)
           });
           break;
         case EditorEvents.newtag:
@@ -449,7 +448,7 @@ export const useEditorEvents = (
             });
             return;
           }
-          ManageTags.present([noteId]);
+          ManageTagsSheet.present([noteId]);
           break;
         case EditorEvents.tag:
           if (editorMessage.value) {
@@ -614,10 +613,6 @@ export const useEditorEvents = (
           eSendEvent(eEditorTabFocused, editorMessage.tabId);
           if (!editor.state.current.initialLoadCalled) break;
           if (editorMessage.noteId) {
-            // Wait for next tick to ensure the tab is not changed.
-            await sleep(1);
-            if (useTabStore.getState().currentTab !== editorMessage.tabId)
-              return;
             if (!useSettingStore.getState().isAppLoading) {
               const note = await db.notes.note(editorMessage.noteId);
               if (note) {

apps/mobile/app/screens/editor/tiptap/use-editor.ts

@@ -365,24 +365,14 @@ export const useEditor = (
               }
             });
 
-            if (!state.current.onNoteCreated) {
-              const defaultNotebook = db.settings.getDefaultNotebook();
-              if (defaultNotebook) {
-                onNoteCreated(id, {
-                  type: "notebook",
-                  id: defaultNotebook
-                });
-              }
-
-              const defaultTag = db.settings.getDefaultTag();
-              if (defaultTag) {
-                onNoteCreated(id, {
-                  type: "tag",
-                  id: defaultTag
-                });
-              }
+            const defaultNotebook = db.settings.getDefaultNotebook();
+            if (!state.current.onNoteCreated && defaultNotebook) {
+              onNoteCreated(id, {
+                type: "notebook",
+                id: defaultNotebook
+              });
             } else {
-              state.current.onNoteCreated(id);
+              state.current?.onNoteCreated && state.current.onNoteCreated(id);
             }
           }
 
@@ -479,7 +469,8 @@ export const useEditor = (
       }
     ) => {
       currentNotes.current[note.id] = note;
-      if (note.content && note.content?.data) {
+      const locked = note && (await db.vaults.itemExists(note));
+      if ((locked || note.content) && note.content?.data) {
         currentContents.current[note.id] = {
           data: note.content?.data,
           type: note.content?.type || "tiptap",
@@ -507,7 +498,6 @@ export const useEditor = (
       session?: TabSessionItem;
       newTab?: boolean;
       refresh?: boolean;
-      searchResultIndex?: number;
     }) => {
       loadNoteMutex.runExclusive(async () => {
         if (!event) return;
@@ -693,17 +683,13 @@ export const useEditor = (
             {
               data: currentContents.current[item.id]?.data || "",
               scrollTop: tab?.session?.scrollTop,
-              selection: tab?.session?.selection,
-              searchResultIndex: event.searchResultIndex
+              selection: tab?.session?.selection
             },
             tabId,
             10000
           );
 
           setTimeout(() => {
-            if (event.searchResultIndex !== undefined) {
-              commands.scrollToSearchResult(event.searchResultIndex);
-            }
             if (blockIdRef.current) {
               commands.scrollIntoViewById(blockIdRef.current);
               blockIdRef.current = undefined;
@@ -755,8 +741,6 @@ export const useEditor = (
             ? (data as ContentItem).noteId
             : data.id;
 
-        if (!useTabStore.getState().hasTabForNote(noteId)) return;
-
         const note = data.type === "note" ? data : await db.notes?.note(noteId);
         lock.current = true;
         // Handle this case where note was locked on another device and synced.

apps/mobile/app/screens/editor/tiptap/use-tab-store.ts

@@ -98,7 +98,7 @@ class TabSessionStorage {
 
   static get(id: string): TabSessionItem | null {
     if (!id) return null;
-    return TabSessionStorage.storage.getMap(id) || null;
+    return TabSessionStorage.storage.getMap(id);
   }
 
   static set(id: string, session: TabSessionItem): void {

apps/mobile/app/screens/move-notes/index.tsx

@@ -248,13 +248,7 @@ const SelectableNoteItem = React.memo(
                 flexGrow: 1
               }}
             >
-              <Heading
-                size={AppFontSize.sm}
-                numberOfLines={1}
-                style={{
-                  maxWidth: "93%"
-                }}
-              >
+              <Heading size={AppFontSize.sm} numberOfLines={1}>
                 {item?.title}
               </Heading>
               {item.type == "note" && item.headline ? (
@@ -262,9 +256,6 @@ const SelectableNoteItem = React.memo(
                   numberOfLines={1}
                   color={colors?.secondary.paragraph}
                   size={AppFontSize.sm}
-                  style={{
-                    maxWidth: "93%"
-                  }}
                 >
                   {item.headline}
                 </Paragraph>

apps/mobile/app/screens/note-preview-configure/index.tsx

@@ -29,7 +29,6 @@ import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
 import { useSettingStore } from "../../stores/use-setting-store";
 import { NotesnookModule } from "../../utils/notesnook-module";
 import { DefaultAppStyles } from "../../utils/styles";
-import { SafeAreaView } from "react-native-safe-area-context";
 
 const NoteItem = (props: {
   id: string | number;
@@ -112,7 +111,7 @@ export const NotePreviewConfigure = () => {
   );
 
   return (
-    <SafeAreaView
+    <View
       style={{
         backgroundColor: colors.primary.background,
         flex: 1
@@ -166,6 +165,6 @@ export const NotePreviewConfigure = () => {
           ListFooterComponent={<View style={{ height: 200 }} />}
         />
       </View>
-    </SafeAreaView>
+    </View>
   );
 };

apps/mobile/app/screens/reminders/index.tsx

@@ -17,19 +17,19 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { strings } from "@notesnook/intl";
 import React from "react";
 import { FloatingButton } from "../../components/container/floating-button";
 import DelayLayout from "../../components/delay-layout";
 import { Header } from "../../components/header";
 import List from "../../components/list";
 import SelectionHeader from "../../components/selection-header";
+import ReminderSheet from "../../components/sheets/reminder";
 import { useNavigationFocus } from "../../hooks/use-navigation-focus";
 import Navigation, { NavigationProps } from "../../services/navigation";
 import SettingsService from "../../services/settings";
 import useNavigationStore from "../../stores/use-navigation-store";
 import { useReminders } from "../../stores/use-reminder-store";
-import AddReminder from "../add-reminder";
+import { strings } from "@notesnook/intl";
 
 export const Reminders = ({
   navigation,
@@ -68,7 +68,7 @@ export const Reminders = ({
         }}
         id={route.name}
         onPressDefaultRightButton={() => {
-          AddReminder.present();
+          ReminderSheet.present();
         }}
       />
 
@@ -84,7 +84,7 @@ export const Reminders = ({
             paragraph: strings.remindersEmpty(),
             button: strings.setReminder(),
             action: () => {
-              AddReminder.present();
+              ReminderSheet.present();
             },
             loading: strings.loadingReminders()
           }}
@@ -92,7 +92,7 @@ export const Reminders = ({
 
         <FloatingButton
           onPress={() => {
-            AddReminder.present();
+            ReminderSheet.present();
           }}
           alwaysVisible
         />

apps/mobile/app/screens/search/index.tsx

@@ -17,37 +17,35 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import {
-  FilteredSelector,
-  Item,
-  Note,
-  VirtualizedGrouping
-} from "@notesnook/core";
-import { strings } from "@notesnook/intl";
+import { Item, Note, VirtualizedGrouping } from "@notesnook/core";
 import React, { useEffect, useRef, useState } from "react";
 import { DatabaseLogger, db } from "../../common/database";
 import List from "../../components/list";
 import SelectionHeader from "../../components/selection-header";
 import { useNavigationFocus } from "../../hooks/use-navigation-focus";
-import { ToastManager, eSubscribeEvent } from "../../services/event-manager";
+import {
+  ToastManager,
+  eSubscribeEvent,
+  eUnSubscribeEvent
+} from "../../services/event-manager";
 import { NavigationProps } from "../../services/navigation";
 import useNavigationStore from "../../stores/use-navigation-store";
-import { eGroupOptionsUpdated, eOnRefreshSearch } from "../../utils/events";
+import { eOnRefreshSearch } from "../../utils/events";
 import { SearchBar } from "./search-bar";
+import { FilteredSelector } from "@notesnook/core";
+import { strings } from "@notesnook/intl";
 export const Search = ({ route, navigation }: NavigationProps<"Search">) => {
   const [results, setResults] = useState<VirtualizedGrouping<Item>>();
   const [loading, setLoading] = useState(false);
   const [searchStatus, setSearchStatus] = useState<string>();
   const currentQuery = useRef<string>();
   const timer = useRef<NodeJS.Timeout>();
-  useNavigationFocus(navigation, {
+  const isFocused = useNavigationFocus(navigation, {
     onFocus: (prev) => {
       useNavigationStore.getState().setFocusedRouteId(route.name);
       return !prev?.current;
     },
-    onBlur: () => {
-      return false;
-    }
+    onBlur: () => false
   });
 
   const onSearch = React.useCallback(
@@ -62,35 +60,32 @@ export const Search = ({ route, navigation }: NavigationProps<"Search">) => {
       try {
         setLoading(true);
         let results: VirtualizedGrouping<Item> | undefined;
-        const groupOptions = db.settings.getGroupOptions("search");
+
         switch (route.params.type) {
           case "note":
-            results = await db.lookup.notesWithHighlighting(
-              query,
-              route.params.items as FilteredSelector<Note>,
-              groupOptions
-            );
-
+            results = await db.lookup
+              .notes(query, route.params.items as FilteredSelector<Note>)
+              .sorted();
             break;
           case "notebook":
-            results = await db.lookup.notebooks(query).sorted(groupOptions);
+            results = await db.lookup.notebooks(query).sorted();
             break;
           case "tag":
-            results = await db.lookup.tags(query).sorted(groupOptions);
+            results = await db.lookup.tags(query).sorted();
             break;
           case "reminder":
-            results = await db.lookup.reminders(query).sorted(groupOptions);
+            results = await db.lookup.reminders(query).sorted();
             break;
           case "trash":
-            results = await db.lookup.trash(query).sorted(groupOptions);
+            results = await db.lookup.trash(query).sorted();
             break;
           case "attachment":
-            results = await db.lookup.attachments(query).sorted(groupOptions);
+            results = await db.lookup.attachments(query).sorted();
             break;
           default:
             results = undefined;
         }
-        if (currentQuery.current !== query) return;
+
         if (!results) {
           setSearchStatus(strings.noResultsFound(query));
           setLoading(false);
@@ -102,7 +97,6 @@ export const Search = ({ route, navigation }: NavigationProps<"Search">) => {
         );
         if (currentQuery.current !== query) return;
         await results.item(0);
-        if (currentQuery.current !== query) return;
         setResults(results);
         if (results.placeholders?.length === 0) {
           setSearchStatus(strings.noResultsFound(query));
@@ -124,18 +118,9 @@ export const Search = ({ route, navigation }: NavigationProps<"Search">) => {
         onSearch(currentQuery.current);
       }
     };
-
-    const subs = [
-      eSubscribeEvent(eGroupOptionsUpdated, (groupType) => {
-        if (groupType === "search") {
-          onSearch(currentQuery.current);
-        }
-      }),
-      eSubscribeEvent(eOnRefreshSearch, onRefreshSearch)
-    ];
-
+    eSubscribeEvent(eOnRefreshSearch, onRefreshSearch);
     return () => {
-      subs.forEach((sub) => sub?.unsubscribe());
+      eUnSubscribeEvent(eOnRefreshSearch, onRefreshSearch);
     };
   }, [onSearch, route.params?.type]);
 
@@ -152,7 +137,7 @@ export const Search = ({ route, navigation }: NavigationProps<"Search">) => {
           clearTimeout(timer.current);
           timer.current = setTimeout(() => {
             onSearch(query);
-          }, 500);
+          }, 300);
         }}
         loading={loading}
       />

apps/mobile/app/screens/settings/components.tsx

@@ -43,8 +43,6 @@ import ThemeSelector from "./theme-selector";
 import { TitleFormat } from "./title-format";
 import { View } from "react-native";
 import { DefaultAppStyles } from "../../utils/styles";
-import { ChangePassword } from "../../components/auth/change-password";
-import { ChangeEmail } from "./change-email";
 
 export const components: { [name: string]: ReactElement } = {
   colorpicker: <AccentColorPicker />,
@@ -71,7 +69,5 @@ export const components: { [name: string]: ReactElement } = {
       <AttachmentGroupProgress groupId="offline-mode" />
     </View>
   ),
-  "sidebar-tab-selector": <SidebarTabPicker />,
-  "change-password": <ChangePassword />,
-  "change-email": <ChangeEmail />
+  "sidebar-tab-selector": <SidebarTabPicker />
 };

apps/mobile/app/screens/settings/settings-data.tsx

@@ -32,9 +32,11 @@ import { enabled } from "react-native-privacy-snapshot";
 import ScreenGuardModule from "react-native-screenguard";
 import { db } from "../../common/database";
 import filesystem from "../../common/filesystem";
+import { ChangePassword } from "../../components/auth/change-password";
 import { presentDialog } from "../../components/dialog/functions";
 import { AppLockPassword } from "../../components/dialogs/applock-password";
 import { endProgress, startProgress } from "../../components/dialogs/progress";
+import { ChangeEmail } from "../../components/sheets/change-email";
 import ExportNotesSheet from "../../components/sheets/export-notes";
 import { Issue } from "../../components/sheets/github/issue";
 import { Progress } from "../../components/sheets/progress";
@@ -80,8 +82,7 @@ export const settingsGroups: SettingSection[] = [
         useHook: () => useUserStore((state) => state.user),
         hidden: (current) => !current,
         name: (current) => {
-          const user = (current as User) || useUserStore.getState().user;
-          if (!user) return strings.subscribeToPro();
+          const user = current as User;
           const isBasic = user.subscription?.type === SUBSCRIPTION_STATUS.BASIC;
           const isTrial = user.subscription?.type === SUBSCRIPTION_STATUS.TRIAL;
           return isBasic || !user.subscription?.type
@@ -95,7 +96,6 @@ export const settingsGroups: SettingSection[] = [
         icon: "crown",
         description: (current) => {
           const user = current as User;
-          if (!user) return strings.neverHesitate();
           const subscriptionDaysLeft =
             user &&
             getTimeLeft(
@@ -241,15 +241,17 @@ export const settingsGroups: SettingSection[] = [
           {
             id: "change-password",
             name: strings.changePassword(),
-            type: "screen",
-            description: strings.changePasswordDesc(),
-            component: "change-password"
+            modifer: async () => {
+              ChangePassword.present();
+            },
+            description: strings.changePasswordDesc()
           },
           {
             id: "change-email",
             name: strings.changeEmail(),
-            type: "screen",
-            component: "change-email",
+            modifer: async () => {
+              ChangeEmail.present();
+            },
             description: strings.changeEmailDesc()
           },
           {
@@ -668,13 +670,6 @@ export const settingsGroups: SettingSection[] = [
               });
             },
             disabled: () => !db.settings.getDefaultNotebook()
-          },
-          {
-            id: "disable-update-check",
-            type: "switch",
-            name: strings.autoUpdateCheck(),
-            description: strings.autoUpdateCheckDesc(),
-            property: "checkForUpdates"
           }
         ]
       },

apps/mobile/app/services/background-sync.ts

@@ -113,10 +113,7 @@ async function onBackgroundSyncStarted() {
       useUserStore.getState().setSyncing(false);
     }
     await Notifications.setupReminders();
-    if (SettingsService.get().notifNotes) {
-      Notifications.pinQuickNote(false);
-    }
-    Notifications.restorePinnedNotes();
+
     NotePreviewWidget.updateNotes();
     deleteDCacheFiles();
     DatabaseLogger.info("BACKGROUND SYNC COMPLETE");
@@ -145,7 +142,6 @@ const onBoot = async () => {
       Notifications.pinQuickNote(false);
     }
     Notifications.restorePinnedNotes();
-    NotePreviewWidget.updateNotes();
     DatabaseLogger.info("BOOT TASK COMPLETE");
   } catch (e) {
     DatabaseLogger.error(e as Error);

apps/mobile/app/services/intent.ts

@@ -18,12 +18,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 import { Platform } from "react-native";
 import { db } from "../common/database";
+import ReminderSheet from "../components/sheets/reminder";
 import { setAppState } from "../screens/editor/tiptap/utils";
 import { eOnLoadNote } from "../utils/events";
 import { NotesnookModule } from "../utils/notesnook-module";
 import { eSendEvent } from "./event-manager";
 import { fluidTabsRef } from "../utils/global-refs";
-import AddReminder from "../screens/add-reminder";
 
 const launchIntent = Platform.OS === "ios" ? {} : NotesnookModule.getIntent();
 let used = false;
@@ -65,9 +65,9 @@ export const IntentService = {
         const reminder = await db.reminders.reminder(
           intent["com.streetwriters.notesnook.OpenReminderId"]
         );
-        if (reminder) AddReminder.present(reminder);
+        if (reminder) ReminderSheet.present(reminder);
       } else if (intent["com.streetwriters.notesnook.NewReminder"]) {
-        AddReminder.present();
+        ReminderSheet.present();
       }
     } catch (e) {
       /* empty */

apps/mobile/app/services/navigation.ts

@@ -37,7 +37,6 @@ import {
   rootNavigatorRef
 } from "../utils/global-refs";
 import { eSendEvent } from "./event-manager";
-import { useArchivedStore } from "../stores/use-archived-store";
 
 /**
  * Routes that should be updated on focus
@@ -67,10 +66,7 @@ const routeNames = {
   Reminders: "Reminders",
   MoveNotebook: "MoveNotebook",
   LinkNotebooks: "LinkNotebooks",
-  MoveNotes: "MoveNotes",
-  Archive: "Archive",
-  ManageTags: "ManageTags",
-  AddReminder: "AddReminder"
+  MoveNotes: "MoveNotes"
 };
 
 export type NavigationProps<T extends RouteName> = NativeStackScreenProps<
@@ -96,8 +92,7 @@ const routeUpdateFunctions: {
   TopicNotes: (params) => eSendEvent("TopicNotes", params),
   Monographs: (params) => eSendEvent("Monographs", params),
   Reminders: () => useReminderStore.getState().refresh(),
-  Search: () => eSendEvent(eOnRefreshSearch),
-  Archive: () => useArchivedStore.getState().refresh()
+  Search: () => eSendEvent(eOnRefreshSearch)
 };
 
 function clearRouteFromQueue(routeName: RouteName) {

apps/mobile/app/services/notifications.ts

@@ -348,7 +348,7 @@ async function scheduleNotification(
           title: title,
           message: description || "",
           ongoing: true,
-          // subtitle: description || "",
+          subtitle: description || "",
           actions: [strings.unpin()]
         });
       }
@@ -396,7 +396,7 @@ async function scheduleNotification(
             payload: payload || "",
             dateModified: reminder.dateModified + ""
           },
-          // subtitle: !description ? undefined : description,
+          subtitle: !description ? undefined : description,
           android: {
             channelId: await getChannelId(priority),
             smallIcon: "ic_stat_name",

apps/mobile/app/stores/use-archived-store.ts

@@ -1,30 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { db } from "../common/database";
-import createDBCollectionStore from "./create-db-collection-store";
-
-const { useStore: useArchivedStore, useCollection: useArchived } =
-  createDBCollectionStore({
-    getCollection: () =>
-      db.notes.archived.grouped(db.settings.getGroupOptions("archive")),
-    eagerlyFetchFirstBatch: true
-  });
-
-export { useArchivedStore, useArchived };

apps/mobile/app/stores/use-navigation-store.ts

@@ -74,7 +74,6 @@ export interface RouteParams extends ParamListBase {
   TaggedNotes: NotesScreenParams;
   ColoredNotes: NotesScreenParams;
   TopicNotes: NotesScreenParams;
-  Archive: GenericRouteParam;
   Monographs: NotesScreenParams;
   Reminders: GenericRouteParam;
   SettingsGroup: GenericRouteParam;
@@ -91,13 +90,6 @@ export interface RouteParams extends ParamListBase {
   MoveNotes: {
     notebook: Notebook;
   };
-  ManageTags: {
-    ids?: string[];
-  };
-  AddReminder: {
-    reminder?: Reminder;
-    reference?: Note;
-  };
 }
 
 export type RouteName = keyof RouteParams;

apps/mobile/app/stores/use-setting-store.ts

@@ -98,7 +98,6 @@ export type Settings = {
   lastFullBackupDate?: number;
   serverUrls?: Record<HostId, string>;
   defaultSidebarTab: number;
-  checkForUpdates?: boolean;
 };
 
 type DimensionsType = {
@@ -197,8 +196,7 @@ export const defaultSettings: SettingStore["settings"] = {
   settingsVersion: 0,
   backupType: "partial",
   fullBackupReminder: "never",
-  lastFullBackupDate: 0,
-  checkForUpdates: true
+  lastFullBackupDate: 0
 };
 
 export const useSettingStore = create<SettingStore>((set, get) => ({

apps/mobile/app/utils/constants.ts

@@ -45,8 +45,7 @@ export const SORT = {
   dateEdited: "Date edited",
   dateCreated: "Date created",
   title: "Title",
-  dueDate: "Due date",
-  relevance: "Relevance"
+  dueDate: "Due date"
 };
 
 export const itemSkus = [

apps/mobile/app/utils/menu-items.ts

@@ -77,13 +77,12 @@ export const MenuItemsList: SideMenuItem[] = [
     },
     type: "side-menu-item"
   },
-  {
-    dataType: "note",
-    id: "Archive",
-    title: "Archive",
-    icon: "archive",
-    type: "side-menu-item"
-  },
+  // {
+  //   dataType: "note",
+  //   id: "Archive",
+  //   title: "Archive",
+  //   icon: "archive"
+  // },
   {
     dataType: "note",
     id: "Trash",

apps/mobile/native/Gemfile

@@ -1,10 +1,7 @@
 source 'https://rubygems.org'
-
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
-
-# Exclude problematic versions of cocoapods and activesupport that causes build failures.
-gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
-gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
-gem 'xcodeproj', '< 1.26.0'
-gem 'concurrent-ruby', '< 1.3.4'
+# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
+# bound in the template on Cocoapods with next React Native release.
+gem 'cocoapods', '>= 1.13', '< 1.15'
+gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'

apps/mobile/native/Gemfile.lock

@@ -1,41 +1,30 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.7)
-      base64
-      nkf
+    CFPropertyList (3.0.5)
       rexml
-    activesupport (7.2.2.1)
-      base64
-      benchmark (>= 0.3)
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
-      connection_pool (>= 2.2.5)
-      drb
+    activesupport (6.1.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
       minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
-    base64 (0.3.0)
-    benchmark (0.4.1)
-    bigdecimal (3.2.1)
     claide (1.1.0)
-    cocoapods (1.15.2)
+    cocoapods (1.11.3)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.15.2)
+      cocoapods-core (= 1.11.3)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 2.1, < 3.0)
+      cocoapods-downloader (>= 1.4.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.6.0, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
@@ -43,10 +32,10 @@ GEM
       gh_inspector (~> 1.0)
       molinillo (~> 0.8.0)
       nap (~> 1.0)
-      ruby-macho (>= 2.3.0, < 3.0)
-      xcodeproj (>= 1.23.0, < 2.0)
-    cocoapods-core (1.15.2)
-      activesupport (>= 5.0, < 8)
+      ruby-macho (>= 1.0, < 3.0)
+      xcodeproj (>= 1.21.0, < 2.0)
+    cocoapods-core (1.11.3)
+      activesupport (>= 5.0, < 7)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
@@ -56,7 +45,7 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (2.1)
+    cocoapods-downloader (1.6.3)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -65,56 +54,47 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.3.3)
-    connection_pool (2.5.3)
-    drb (2.2.3)
+    concurrent-ruby (1.1.10)
     escape (0.0.4)
-    ethon (0.16.0)
+    ethon (0.15.0)
       ffi (>= 1.15.0)
-    ffi (1.17.2)
+    ffi (1.15.5)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    httpclient (2.9.0)
-      mutex_m
-    i18n (1.14.7)
+    httpclient (2.8.3)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    json (2.12.2)
-    logger (1.7.0)
-    minitest (5.25.5)
+    json (2.6.1)
+    minitest (5.15.0)
     molinillo (0.8.0)
-    mutex_m (0.3.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
-    nkf (0.2.0)
     public_suffix (4.0.7)
-    rexml (3.4.1)
+    rexml (3.2.5)
     ruby-macho (2.5.1)
-    securerandom (0.4.1)
-    typhoeus (1.4.1)
+    typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (2.0.6)
+    tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    xcodeproj (1.25.1)
+    xcodeproj (1.21.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
-      rexml (>= 3.3.6, < 4.0)
+      rexml (~> 3.2.4)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 6.1.7.5, != 7.1.0)
-  cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
-  concurrent-ruby (< 1.3.4)
-  xcodeproj (< 1.26.0)
+  cocoapods (~> 1.11, >= 1.11.2)
 
 RUBY VERSION
-   ruby 3.4.1p0
+   ruby 2.7.4p191
 
 BUNDLED WITH
-   2.6.2
+   2.2.27

apps/mobile/native/android/app/build.gradle

@@ -48,9 +48,6 @@ react {
     //
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     hermesFlags = ["-O", "-output-source-map"]
-
-    /* Autolinking */
-    autolinkLibrariesWithApp()
 }
 
 /**
@@ -124,7 +121,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
-        versionCode 3063
+        versionCode 3049
         versionName getNpmVersion()
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -261,3 +258,7 @@ copyFontFiles.dependsOn(copyEditorBundle);
 copyPlainEditorBundle.dependsOn(copyFontFiles);
 preBuild.dependsOn(copyPlainEditorBundle)
 
+apply from: file("../../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+
+
+

apps/mobile/native/android/app/src/main/AndroidManifest.xml

@@ -11,69 +11,67 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        tools:node="remove" />
-    <uses-permission
-        android:name="android.permission.READ_EXTERNAL_STORAGE"
-        tools:node="remove" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission
-        android:name="android.permission.USE_FULL_SCREEN_INTENT"
-        tools:node="remove" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:node="remove"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" tools:node="remove"/>
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" tools:node="remove" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
 
-    <uses-feature
-        android:name="android.hardware.camera"
-        android:required="false" />
 
     <queries>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
-            <data android:mimeType="application/pdf" />
-        </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
-            <data android:mimeType="text/*" />
-        </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
-            <data android:mimeType="image/*" />
-        </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
+            <intent>
+                <action android:name="android.intent.action.VIEW" />
+                <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
+                <data android:mimeType="application/pdf" />
+            </intent>
+            <intent>
+                <action android:name="android.intent.action.VIEW" />
+                <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
+                <data android:mimeType="text/*" />
+            </intent>
+            <intent>
+                <action android:name="android.intent.action.VIEW" />
+                <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
+                <data android:mimeType="image/*" />
+            </intent>
+            <intent>
+                <action android:name="android.intent.action.VIEW" />
+                <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
 
-            <data android:mimeType="video/*" />
-        </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
-            <data android:mimeType="audio/*" />
-        </intent>
-    </queries>
+                <data android:mimeType="video/*" />
+            </intent>
+            <intent>
+                <action android:name="android.intent.action.VIEW" />
+                <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
+                <data android:mimeType="audio/*" />
+            </intent>
+        </queries>
 
     <application
         android:name=".MainApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:largeHeap="true"
-        android:networkSecurityConfig="@xml/network_security_config"
         android:requestLegacyExternalStorage="true"
-        android:supportsRtl="true"
-        android:theme="@style/BootTheme">
+        android:theme="@style/BootTheme"
+        android:largeHeap="true"
+        android:supportsRtl="false"
+        android:networkSecurityConfig="@xml/network_security_config"
+        tools:replace="android:supportsRtl">
 
-        <receiver
-            android:name=".NoteWidget"
-            android:exported="false"
-            android:label="@string/quick_note">
+        <receiver android:exported="false" android:label="@string/reminders_title" android:name=".ReminderWidgetProvider">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_reminders_info" />
+        </receiver>
+    
+        <receiver android:exported="false" android:label="@string/quick_note" android:name=".NoteWidget">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -83,10 +81,7 @@
                 android:resource="@xml/new_note_widget_info" />
         </receiver>
 
-        <receiver
-            android:name=".NotePreviewWidget"
-            android:exported="false"
-            android:label="@string/note">
+        <receiver android:exported="false" android:label="@string/note" android:name=".NotePreviewWidget">
             <intent-filter>"
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -96,49 +91,33 @@
                 android:resource="@xml/note_widget_info" />
         </receiver>
 
-        <receiver
-            android:name=".ReminderWidgetProvider"
-            android:exported="false"
-            android:label="@string/reminders_title">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/widget_reminders_info" />
-        </receiver>
-
-        <activity
-            android:name=".NotePreviewConfigureActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
-            android:exported="true"
+        <activity android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
             android:label="NotePreviewConfigure"
             android:launchMode="singleTask"
+            android:exported="true"
             android:theme="@style/AppTheme"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize" android:name=".NotePreviewConfigureActivity">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
             </intent-filter>
         </activity>
 
         <activity
             android:name=".MainActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
-            android:exported="true"
             android:label="@string/app_name"
             android:launchMode="singleTask"
             android:resizeableActivity="true"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
-
+                <action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
             <intent-filter android:label="Notesnook">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
@@ -149,7 +128,6 @@
 
             <intent-filter android:label="Notesnook">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
@@ -157,25 +135,22 @@
             </intent-filter>
 
         </activity>
-        <activity
-            android:name="com.facebook.react.devsupport.DevSettingsActivity"
-            android:exported="false" />
+        <activity android:exported="false" android:name="com.facebook.react.devsupport.DevSettingsActivity" />
         <activity
             android:name=".ShareActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
-            android:excludeFromRecents="true"
-            android:exported="true"
             android:label="@string/title_activity_share"
             android:noHistory="true"
             android:screenOrientation="unspecified"
+            android:exported="true"
             android:taskAffinity=""
-            android:theme="@style/AppThemeB"
-            android:windowSoftInputMode="adjustResize">
+            android:excludeFromRecents="true"
+            android:windowSoftInputMode="adjustResize"
+            android:theme="@style/AppThemeB">
 
             <intent-filter android:label="Make Note">
                 <action android:name="android.intent.action.SEND" />
                 <category android:name="android.intent.category.DEFAULT" />
-
                 <data android:mimeType="text/*" />
                 <data android:mimeType="image/*" />
                 <data android:mimeType="video/*" />
@@ -186,7 +161,6 @@
             <intent-filter android:label="Make Note">
                 <action android:name="android.intent.action.SEND_MULTIPLE" />
                 <category android:name="android.intent.category.DEFAULT" />
-
                 <data android:mimeType="text/*" />
                 <data android:mimeType="image/*" />
                 <data android:mimeType="video/*" />
@@ -206,41 +180,35 @@
             android:enabled="true"
             android:exported="true"
             android:stopWithTask="false" />
-        <service android:name="com.asterinet.react.bgactions.RNBackgroundActionsTask" />
+        <service android:name="com.asterinet.react.bgactions.RNBackgroundActionsTask" />   
 
-        <service
-            android:name="com.streetwriters.notesnook.BootTaskService"
-            android:foregroundServiceType="specialUse">
-            <property
-                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
-                android:value="The service is required by the app to restore notifications of pinned notes, restore notification with reply input for creating notes and restore data in note preview widgets on device reboot." />
-        </service>
+        <service android:name="com.streetwriters.notesnook.BootTaskService" android:foregroundServiceType="dataSync" />
 
         <service
             android:name=".NotesnookTileService"
-            android:exported="true"
             android:icon="@drawable/add_note"
             android:label="New note"
+            android:exported="true"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE" />
+                <action android:name="android.service.quicksettings.action.QS_TILE"/>
             </intent-filter>
         </service>
 
-        <service
-            android:name=".ReminderViewsService"
-            android:exported="true"
-            android:permission="android.permission.BIND_REMOTEVIEWS" />
+        <service 
+        android:name=".ReminderViewsService"
+        android:exported="true"
+        android:permission="android.permission.BIND_REMOTEVIEWS" />
 
         <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_viewer_provider_paths" />
-        </provider>
+        android:name="androidx.core.content.FileProvider"
+        android:authorities="${applicationId}.provider"
+        android:grantUriPermissions="true"
+        android:exported="false">
+        <meta-data
+            android:name="android.support.FILE_PROVIDER_PATHS"
+            android:resource="@xml/file_viewer_provider_paths" />
+    </provider> 
 
         <provider
             android:name="com.vinzscam.reactnativefileviewer.FileProvider"
@@ -252,14 +220,12 @@
                 android:resource="@xml/file_viewer_provider_paths" />
         </provider>
 
-        <receiver
-            android:name=".BootRecieverService"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
-            </intent-filter>
-        </receiver>
+       <receiver android:exported="true" android:name=".BootRecieverService">
+           <intent-filter>
+               <action android:name="android.intent.action.BOOT_COMPLETED" />
+               <action android:name="android.intent.action.QUICKBOOT_POWERON" />
+           </intent-filter>
+      </receiver>
 
     </application>
 

apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/BootRecieverService.java

@@ -14,21 +14,19 @@ public class BootRecieverService extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
-         try {
-             if (!isAppOnForeground((context))) {
-                 /**
-                  We will start our service and send extra info about
-                  network connections
-                  **/
-                 Intent serviceIntent = new Intent(context, BootTaskService.class);
-                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                     context.startForegroundService(serviceIntent);
-                 } else {
-                     context.startService(serviceIntent);
-                 }
-                 HeadlessJsTaskService.acquireWakeLockNow(context);
-             }
-         } catch (Exception ignored) {}
+          if (!isAppOnForeground((context))) {
+            /**
+             We will start our service and send extra info about
+             network connections
+             **/
+            Intent serviceIntent = new Intent(context, BootTaskService.class);
+              if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                  context.startForegroundService(serviceIntent);
+              } else {
+                  context.startService(serviceIntent);
+              }
+              HeadlessJsTaskService.acquireWakeLockNow(context);
+        }
     }
 
     private boolean isAppOnForeground(Context context) {

apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/BootTaskService.java

@@ -39,6 +39,7 @@ public class BootTaskService extends HeadlessJsTaskService {
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
+
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
             NotificationChannel channel = new NotificationChannel("com.streetwriters.notesnook",
                     "Default",
@@ -54,7 +55,7 @@ public class BootTaskService extends HeadlessJsTaskService {
                 this.startForeground(
                         1,
                         notification,
-                        ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE);
+                        ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC);
             } else {
                 this.startForeground(
                         1,

apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/MainActivity.java

@@ -3,16 +3,8 @@ package com.streetwriters.notesnook;
 import com.facebook.react.ReactActivity;
 import android.content.Intent;
 import android.content.res.Configuration;
-import androidx.core.graphics.Insets;
-import android.os.Build;
 import android.os.Bundle;
-import android.view.View;
 import android.webkit.WebView;
-
-import androidx.core.view.OnApplyWindowInsetsListener;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
-
 import com.facebook.react.ReactActivityDelegate;
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
 import com.facebook.react.defaults.DefaultReactActivityDelegate;
@@ -30,20 +22,6 @@ public class MainActivity extends ReactActivity {
     try {
       startService(new Intent(getBaseContext(), OnClearFromRecentService.class));
     } catch (Exception ignored) {}
-
-    if (Build.VERSION.SDK_INT >= 35) {
-      final View rootView = findViewById(android.R.id.content);
-      ViewCompat.setOnApplyWindowInsetsListener(rootView, (v, insets) -> {
-        Insets innerPadding = insets.getInsets(WindowInsetsCompat.Type.ime());
-        rootView.setPadding(
-                innerPadding.left,
-                innerPadding.top,
-                innerPadding.right,
-                innerPadding.bottom
-        );
-        return insets;
-      });
-    }
   }
 
   /**

apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/MainApplication.kt

@@ -10,7 +10,6 @@ import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
 import com.facebook.soloader.SoLoader
-import com.facebook.react.soloader.OpenSourceMergedSoMapping
  
 class MainApplication : Application(), ReactApplication {
  
@@ -37,7 +36,7 @@ class MainApplication : Application(), ReactApplication {
  
   override fun onCreate() {
     super.onCreate()
-    SoLoader.init(this, OpenSourceMergedSoMapping)
+    SoLoader.init(this, false)
     if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
       // If you opted-in for the New Architecture, we load the native entry point for this app.
       load()

apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NotePreviewWidget.java

@@ -48,8 +48,7 @@ public class NotePreviewWidget extends AppWidgetProvider {
     private static Bundle getActivityOptionsBundle() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
             ActivityOptions activityOptions = ActivityOptions.makeBasic();
-            activityOptions.setPendingIntentCreatorBackgroundActivityStartMode(
-                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
+            activityOptions.setPendingIntentBackgroundActivityStartMode(ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
             return activityOptions.toBundle();
         } else
             return null;

apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NoteWidget.java

@@ -31,8 +31,7 @@ public class NoteWidget extends AppWidgetProvider {
     private static Bundle getActivityOptionsBundle() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
             ActivityOptions activityOptions = ActivityOptions.makeBasic();
-            activityOptions.setPendingIntentCreatorBackgroundActivityStartMode(
-                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
+            activityOptions.setPendingIntentBackgroundActivityStartMode(ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
             return activityOptions.toBundle();
         } else
             return null;

apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/ReminderWidgetProvider.java

@@ -26,8 +26,7 @@ public class ReminderWidgetProvider extends AppWidgetProvider {
     private static Bundle getActivityOptionsBundle() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
             ActivityOptions activityOptions = ActivityOptions.makeBasic();
-            activityOptions.setPendingIntentCreatorBackgroundActivityStartMode(
-                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
+            activityOptions.setPendingIntentBackgroundActivityStartMode(ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
             return activityOptions.toBundle();
         } else
             return null;

apps/mobile/native/android/build.gradle

@@ -3,16 +3,16 @@ import org.apache.tools.ant.taskdefs.condition.Os
 
 buildscript {
     ext {
-        buildToolsVersion = "35.0.0"
-        minSdkVersion = 24
-        compileSdkVersion = 35
-        targetSdkVersion = 35
-        kotlinVersion = '2.0.21'
+        buildToolsVersion = "34.0.0"
+        minSdkVersion = 23
+        compileSdkVersion = 34
+        targetSdkVersion = 34
+        kotlinVersion = '1.9.22'
         androidXAnnotation = "1.1.0"
         androidXCoreVersion = "1.7.0"
         androidXCore = "1.7.0"
         androidXBrowser = "1.0.0"
-        ndkVersion = "27.1.12297006"
+        ndkVersion = "23.2.8568313"
     }
     
     repositories {

apps/mobile/native/android/gradle.properties

@@ -23,7 +23,7 @@ org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-# android.enableJetifier=true
+android.enableJetifier=true
 
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using
@@ -47,4 +47,4 @@ hermesEnabled=true
 # fdroid
 fdroidBuild=false
 # -DSQLITE_USER_AUTHENTICATION=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS=1 -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_OMIT_DEPRECATED=1 -DSQLITE_OMIT_PROGRESS_CALLBACK=1  
-quickSqliteFlags=-DSQLITE3MC_OMIT_AES_HARDWARE_SUPPORT -DHAVE_CIPHER_AES_128_CBC=0 -DHAVE_CIPHER_AES_256_CBC=0 -DHAVE_CIPHER_SQLCIPHER=0 -DHAVE_CIPHER_RC4=0 -DHAVE_CIPHER_CHACHA20=1 -DSQLITE_ENABLE_FTS5 -DSQLITE_OMIT_PROGRESS_CALLBACK=1 -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_OMIT_DEPRECATED=1 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS=1 -DSQLITE_DQS=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_USE_ALLOCA=1 -DSQLITE_ENABLE_REGEXP=1
+quickSqliteFlags=-DSQLITE3MC_OMIT_AES_HARDWARE_SUPPORT -DHAVE_CIPHER_AES_128_CBC=0 -DHAVE_CIPHER_AES_256_CBC=0 -DHAVE_CIPHER_SQLCIPHER=0 -DHAVE_CIPHER_RC4=0 -DHAVE_CIPHER_CHACHA20=1 -DSQLITE_ENABLE_FTS5 -DSQLITE_OMIT_PROGRESS_CALLBACK=1 -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_OMIT_DEPRECATED=1 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS=1 -DSQLITE_DQS=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_USE_ALLOCA=1

apps/mobile/native/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

apps/mobile/native/android/gradlew

@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -86,8 +84,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

apps/mobile/native/android/gradlew.bat

@@ -13,8 +13,6 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

apps/mobile/native/android/releasenotes/whatsnew-en-US

@@ -1,5 +1,8 @@
-- Fix crash on device boot on android 15 devices
-- Fix note not opening in editor randomly
-- Minor bug fixes and improvements
+- v3.1.0 brings new features and improvements to enhance your Notesnook experience.
+- Notebooks and Tags are not located in the Sidebar
+- Tree view for notebooks
+- Improved list view UI for better user experience
+- Improved notebook related actions by integrating tree view in most places
+- You can set any notebook, tag or colors as home screen
 
 Thank you for using Notesnook!

apps/mobile/native/android/settings.gradle

@@ -1,9 +1,4 @@
-pluginManagement { includeBuild("../../node_modules/@react-native/gradle-plugin") }
-plugins { id("com.facebook.react.settings") }
-extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
 rootProject.name = 'Notesnook'
+apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 includeBuild('../../node_modules/@react-native/gradle-plugin')
-
-include ":lazysodium"
-project(':lazysodium').projectDir = new File(rootProject.projectDir, '../../node_modules/@ammarahmed/react-native-sodium/android/lazysodium')

apps/mobile/native/babel.config.js

@@ -6,7 +6,7 @@ module.exports = function (api, opts) {
   if (!PROCESS_ENV) PROCESS_ENV = 'production';
 
   const env = {
-    presets: ['module:@react-native/babel-preset'],
+    presets: ['module:metro-react-native-babel-preset'],
     plugins: [
       '@babel/plugin-transform-named-capturing-groups-regex',
       'react-native-reanimated/plugin',

apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj

@@ -124,6 +124,7 @@
 		6529D2B0257B4A2900B49BC3 /* NotesnookDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = NotesnookDebug.entitlements; path = Notesnook/NotesnookDebug.entitlements; sourceTree = "<group>"; };
 		656835802BB29A8300144BAB /* OpenSans-Italic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-Italic.ttf"; path = "../../../../packages/editor-mobile/public/fonts/OpenSans-Italic.ttf"; sourceTree = "<group>"; };
 		6593E4A2281C345400492C50 /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = Notesnook/AppDelegate.mm; sourceTree = "<group>"; };
+		6594DDF22CD8BFE8007F5EC2 /* BetterTrigram.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = BetterTrigram.xcframework; sourceTree = "<group>"; };
 		659BE46625E11A5100E05671 /* notesnook-text.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "notesnook-text.png"; path = "Notesnook/Images.xcassets/notesnook-text.png"; sourceTree = "<group>"; };
 		65A7F34F255689AD00699170 /* Notesnook.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = Notesnook.entitlements; path = Notesnook/Notesnook.entitlements; sourceTree = "<group>"; };
 		65AA857725E6DDEC00772A01 /* NotesWidgetExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = NotesWidgetExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -255,6 +256,7 @@
 		2D16E6871FA4F8E400B85C8A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				6594DDF22CD8BFE8007F5EC2 /* BetterTrigram.xcframework */,
 				6515C42E2580AA2F00E83E39 /* StoreKit.framework */,
 				ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
 				ED2971642150620600B7C4FE /* JavaScriptCore.framework */,
@@ -651,25 +653,15 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Notesnook/Pods-Notesnook-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RCT-Folly/RCT-Folly_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNSVG/RNSVGFilters.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/boost/boost_privacy.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/glog/glog_privacy.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCT-Folly_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNSVGFilters.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/boost_privacy.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/glog_privacy.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -818,25 +810,15 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Notesnook-NotesnookTests/Pods-Notesnook-NotesnookTests-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RCT-Folly/RCT-Folly_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNSVG/RNSVGFilters.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/boost/boost_privacy.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/glog/glog_privacy.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCT-Folly_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNSVGFilters.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/boost_privacy.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/glog_privacy.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -872,19 +854,11 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Make Note/Pods-Make Note-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RCT-Folly/RCT-Folly_privacy.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/boost/boost_privacy.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/glog/glog_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCT-Folly_privacy.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/boost_privacy.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/glog_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -1089,7 +1063,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2142;
+				CURRENT_PROJECT_VERSION = 2132;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1163,7 +1137,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.2.7;
+				MARKETING_VERSION = 3.1.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1194,7 +1168,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2142;
+				CURRENT_PROJECT_VERSION = 2132;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1268,7 +1242,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.2.7;
+				MARKETING_VERSION = 3.1.0;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1427,7 +1401,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2142;
+				CURRENT_PROJECT_VERSION = 2132;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1439,7 +1413,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.2.7;
+				MARKETING_VERSION = 3.1.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
@@ -1470,7 +1444,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2142;
+				CURRENT_PROJECT_VERSION = 2132;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1483,7 +1457,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.2.7;
+				MARKETING_VERSION = 3.1.0;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1513,16 +1487,10 @@
 				CODE_SIGN_ENTITLEMENTS = "Make Note/Make Note.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2142;
+				CURRENT_PROJECT_VERSION = 2132;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/universal\"",
-					"\"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built\"",
-					"\"${PROJECT_DIR}\"",
-				);
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1593,8 +1561,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
-				MARKETING_VERSION = 3.2.7;
+				MARKETING_VERSION = 3.1.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
@@ -1625,17 +1592,11 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2142;
+				CURRENT_PROJECT_VERSION = 2132;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/universal\"",
-					"\"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built\"",
-					"\"${PROJECT_DIR}\"",
-				);
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1706,8 +1667,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
-				MARKETING_VERSION = 3.2.7;
+				MARKETING_VERSION = 3.1.0;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1790,7 +1750,6 @@
 				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../../node_modules/react-native";
 				SDKROOT = iphoneos;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
 				USE_HERMES = true;
 			};
 			name = Debug;