web: add cta footer & cancel card in plans page

Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>

.github/workflows/android.e2e.yml

@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Enable KVM
         run: |

.github/workflows/android.preview.build.yml

@@ -0,0 +1,104 @@
+name: Notesnook Android Preview Build
+
+# UNTRUSTED stage. Runs on `pull_request`, so fork code is checked out and
+# compiled with a read-only GITHUB_TOKEN and NO repository secrets. The release
+# APK is built without any signing secret (the same as before). Firebase
+# distribution and the PR comment happen in android.preview.publish.yml, which
+# runs in the trusted `workflow_run` context and never executes fork code.
+# Because no secrets are exposed here, the build runs automatically for every
+# PR (including forks) with no authorization gate.
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches: [master, beta]
+    paths:
+      - "apps/mobile/**"
+      - "packages/**"
+      - ".github/workflows/android.preview.build.yml"
+      - ".github/workflows/android.preview.publish.yml"
+
+concurrency:
+  group: android-preview-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    env:
+      STAGING_BUILD: true
+
+    steps:
+      - name: Checkout PR code
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
+
+      - name: Use specific Java version for the builds
+        uses: joschi/setup-jdk@v2
+        with:
+          java-version: "17"
+          architecture: "x64"
+
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+          android: false
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: true
+          swap-storage: true
+
+      - name: Install node modules
+        run: |
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=mobile
+
+      - name: Make Gradlew Executable
+        run: cd apps/mobile/android && chmod +x ./gradlew
+
+      - name: Get build number
+        id: build-number
+        run: echo "timestamp=$(($(date +%s) - 1774851180 ))" >> $GITHUB_OUTPUT
+
+      - name: Check for typescript errors
+        run: |
+          npm run tx mobile:build
+          cd apps/mobile
+          npx tsc --noEmit
+
+      - name: Build arm64-v8a apk
+        run: |
+          cd apps/mobile/android
+          ./gradlew assembleRelease -PreactNativeArchitectures=arm64-v8a -PstagingReleaseBuild=true -PprBuildNumber=${{ steps.build-number.outputs.timestamp }}
+
+      - name: Stage build artifact
+        run: |
+          set -euo pipefail
+          mkdir -p "$RUNNER_TEMP/artifact"
+          cp apps/mobile/android/app/build/outputs/apk/release/app-arm64-v8a-release.apk \
+            "$RUNNER_TEMP/artifact/app-preview.apk"
+          {
+            echo "PR_NUMBER=${{ github.event.pull_request.number }}"
+            echo "HEAD_SHA=${{ github.event.pull_request.head.sha }}"
+          } > "$RUNNER_TEMP/artifact/pr-meta.env"
+
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: android-preview-build
+          path: ${{ runner.temp }}/artifact
+          if-no-files-found: error
+          retention-days: 1
+
+      - name: Upload sourcemaps
+        uses: actions/upload-artifact@v4
+        with:
+          name: sourcemaps
+          path: |
+            apps/mobile/android/app/build/generated/sourcemaps/**/*.map

.github/workflows/android.preview.firebase.yml

@@ -1,135 +0,0 @@
-name: Notesnook Android Preview
-
-on:
-  pull_request_target:
-    types: [opened, reopened, synchronize]
-    branches: [master, beta]
-    paths:
-      - "apps/mobile/**"
-      - "packages/**"
-      - ".github/workflows/android.preview.firebase.yml"
-
-jobs:
-  authorize:
-    environment: ${{ github.event_name == 'pull_request_target' &&
-      github.event.pull_request.head.repo.full_name != github.repository &&
-      'external' || 'internal' }}
-
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo true
-
-  build:
-    needs: authorize
-    runs-on: ubuntu-22.04
-    env:
-      STAGING_BUILD: true
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.ref }}
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Use specific Java version for the builds
-        uses: joschi/setup-jdk@v2
-        with:
-          java-version: "17"
-          architecture: "x64"
-
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          # this might remove tools that are actually needed,
-          # if set to "true" but frees about 6 GB
-          tool-cache: false
-
-          # all of these default to true, but feel free to set to
-          # "false" if necessary for your workflow
-          android: false
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: true
-
-      - name: Install node modules
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=mobile
-
-      - name: Make Gradlew Executable
-        run: cd apps/mobile/android && chmod +x ./gradlew
-
-      - name: Get build number
-        id: build-number
-        run: echo "timestamp=$(($(date +%s) - 1774851180 ))" >> $GITHUB_OUTPUT
-
-      - name: Check for typescript errors
-        run: |
-          npm run tx mobile:build
-          cd apps/mobile
-          npx tsc --noEmit
-
-      - name: Build arm64-v8a apk
-        run: |
-          cd apps/mobile/android
-          ./gradlew assembleRelease -PreactNativeArchitectures=arm64-v8a -PstagingReleaseBuild=true -PprBuildNumber=${{ steps.build-number.outputs.timestamp }}
-
-      - name: Get app version
-        id: package-version
-        uses: saionaro/extract-package-version@master
-        with:
-          path: apps/mobile
-
-      - name: Publish to firebase CLI
-        id: firebase-output
-        uses: wzieba/Firebase-Distribution-Github-Action@v1
-        with:
-          appId: ${{secrets.FIREBASE_APP_ID}}
-          serviceCredentialsFileContent: ${{ secrets.QA_SERVICE_ACCOUNT }}
-          groups: testers
-          file: apps/mobile/android/app/build/outputs/apk/release/app-arm64-v8a-release.apk
-          releaseNotes: Preview for https://github.com/streetwriters/notesnook/pull/${{github.event.number}}
-
-      - name: Post or update PR comment
-        uses: actions/github-script@v6
-        env:
-          preview_url: ${{ steps.firebase-output.outputs.TESTING_URI }}
-        with:
-          script: |
-            const marker = '<!-- android-preview-comment -->';
-            const prNumber = context.issue.number;
-            const previewUrl = process.env.preview_url || '';
-            const body = `${marker}\n**Android App Preview**\n\n${previewUrl || 'Preview URL unavailable — check workflow logs.'}\n\nCommit: ${process.env.GITHUB_SHA}\n`;
-            const { data: comments } = await github.rest.issues.listComments({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: prNumber,
-            });
-            const existing = comments.find(c => c.body && c.body.includes(marker));
-            if (existing) {
-              await github.rest.issues.updateComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: existing.id,
-                body,
-              });
-            } else {
-              await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: prNumber,
-                body,
-              });
-            }
-
-      - name: Upload sourcemaps
-        uses: actions/upload-artifact@v4
-        with:
-          name: sourcemaps
-          path: |
-            apps/mobile/android/app/build/generated/sourcemaps/**/*.map

.github/workflows/android.preview.publish.yml

@@ -0,0 +1,72 @@
+name: Notesnook Android Preview Publish
+
+# TRUSTED stage. Runs via `workflow_run` after the build workflow finishes, so
+# it has the base repo's secrets and a write-scoped token. It downloads the APK
+# the build produced and distributes it + posts the PR comment. It never checks
+# out or executes fork code.
+
+on:
+  workflow_run:
+    workflows: ["Notesnook Android Preview Build"]
+    types: [completed]
+
+jobs:
+  publish:
+    if: github.event.workflow_run.conclusion == 'success'
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    steps:
+      - name: Download build artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: android-preview-build
+          path: ${{ runner.temp }}/artifact
+          run-id: ${{ github.event.workflow_run.id }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Load PR metadata
+        run: cat "$RUNNER_TEMP/artifact/pr-meta.env" >> "$GITHUB_ENV"
+
+      - name: Publish to Firebase
+        id: firebase-output
+        uses: wzieba/Firebase-Distribution-Github-Action@v1
+        with:
+          appId: ${{ secrets.FIREBASE_APP_ID }}
+          serviceCredentialsFileContent: ${{ secrets.QA_SERVICE_ACCOUNT }}
+          groups: testers
+          file: ${{ runner.temp }}/artifact/app-preview.apk
+          releaseNotes: Preview for https://github.com/${{ github.repository }}/pull/${{ env.PR_NUMBER }}
+
+      - name: Post or update PR comment
+        uses: actions/github-script@v7
+        env:
+          preview_url: ${{ steps.firebase-output.outputs.TESTING_URI }}
+        with:
+          script: |
+            const marker = '<!-- android-preview-comment -->';
+            const prNumber = Number(process.env.PR_NUMBER);
+            if (!prNumber) return;
+            const previewUrl = process.env.preview_url || '';
+            const body = `${marker}\n**Android App Preview**\n\n${previewUrl || 'Preview URL unavailable — check workflow logs.'}\n\nCommit: ${process.env.HEAD_SHA}\n`;
+            const { data: comments } = await github.rest.issues.listComments({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: prNumber,
+            });
+            const existing = comments.find(c => c.body && c.body.includes(marker));
+            if (existing) {
+              await github.rest.issues.updateComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                comment_id: existing.id,
+                body,
+              });
+            } else {
+              await github.rest.issues.createComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: prNumber,
+                body,
+              });
+            }

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

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/android.publish.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/core.tests.yml

@@ -35,7 +35,7 @@ jobs:
     needs: authorize
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.head.sha || github.ref }}
 

.github/workflows/desktop.preview.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -56,7 +56,7 @@ jobs:
       macos-artifact-url: ${{ steps.artifact-upload-step.outputs.artifact-url }}
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -127,7 +127,7 @@ jobs:
       linux-x64-artifact-url: ${{ steps.artifact-upload-step.outputs.artifact-url }}
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -171,7 +171,7 @@ jobs:
       linux-arm64-artifact-url: ${{ steps.artifact-upload-step.outputs.artifact-url }}
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -215,7 +215,7 @@ jobs:
       windows-artifact-url: ${{ steps.artifact-upload-step.outputs.artifact-url }}
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/desktop.publish.yml

@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -142,7 +142,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -246,7 +246,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -314,7 +314,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -378,7 +378,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup .NET Core SDK
         uses: actions/setup-dotnet@v2

.github/workflows/desktop.tests.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -58,7 +58,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -92,7 +92,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -126,7 +126,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/editor.tests.yml

@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/help.publish.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable

.github/workflows/ios.preview.build.yml

@@ -0,0 +1,152 @@
+name: Notesnook iOS Preview Build
+
+# UNTRUSTED stage. Runs on `pull_request`, so fork code is checked out and
+# compiled with a read-only GITHUB_TOKEN and NO repository secrets. It only
+# produces an *unsigned* archive. Signing, Firebase distribution and PR
+# comments happen in ios.preview.publish.yml, which runs in the trusted
+# `workflow_run` context and never executes fork code. Because no secrets are
+# exposed here, the build runs automatically for every PR (including forks)
+# with no authorization gate.
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches: [master, beta]
+    paths:
+      - "apps/mobile/**"
+      - "packages/**"
+      - ".github/workflows/ios.preview.build.yml"
+      - ".github/workflows/ios.preview.publish.yml"
+
+# A fork that spams pushes shouldn't queue up macOS builds.
+concurrency:
+  group: ios-preview-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: macos-26
+    timeout-minutes: 60
+
+    steps:
+      - name: Checkout PR code
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
+
+      - name: Setup Xcode
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: "26.1.1"
+
+      - name: Setup iOS Platform
+        run: |
+          # GitHub runs this as `/bin/bash -e`, so `set +e` is required -- without
+          # it the first failure aborts the step before any retry can happen.
+          # Both commands hit "Unable to connect to simulator" (exit 70) when
+          # CoreSimulatorService is wedged, so retry each and bounce it between.
+          set +e
+          DL_DIR="$RUNNER_TEMP/ios-platform"
+
+          retry() {
+            for i in 1 2 3; do
+              "$@" && return 0
+              echo "Attempt $i failed ($*); resetting CoreSimulator..."
+              sudo killall -9 com.apple.CoreSimulator.CoreSimulatorService simdiskimaged 2>/dev/null
+              sleep 20
+              xcrun simctl list runtimes >/dev/null 2>&1
+            done
+            echo "::error::Failed after 3 attempts: $*"
+            exit 1
+          }
+
+          xcrun simctl list runtimes >/dev/null 2>&1
+          retry xcodebuild -downloadPlatform iOS -exportPath "$DL_DIR"
+
+          # Find the dmg; its name embeds a build number that changes.
+          DMG="$(find "$DL_DIR" -name '*.dmg' | head -n1)"
+          [ -n "$DMG" ] || { echo "::error::No dmg in $DL_DIR"; exit 1; }
+          retry xcodebuild -importPlatform "$DMG"
+
+      - name: Install node modules
+        run: |
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=mobile
+
+      - name: Build packages
+        run: npm run tx @notesnook/mobile:build
+
+      - name: Cache Pods
+        uses: actions/cache@v4
+        id: pods-cache
+        with:
+          path: apps/mobile/ios/Pods
+          key: ${{ runner.os }}-pods-${{ hashFiles('apps/mobile/ios/Podfile.lock') }}
+
+      - name: Install Pods
+        run: |
+          cd apps/mobile/ios
+          pod install
+
+      - name: Check for typescript errors
+        run: |
+          npm run tx mobile:build
+          cd apps/mobile
+          npx tsc --noEmit
+
+      - name: Get marketing version
+        id: marketing-version
+        run: echo "version=$(grep "IOS_MARKETING_VERSION" apps/mobile/ios/build-configs/ios-build.staging.xcconfig | awk -F'=' '{print $2}' | xargs)" >> $GITHUB_OUTPUT
+
+      - name: Get build number
+        id: build-number
+        run: echo "timestamp=$(($(date +%s) - 1774851180 ))" >> $GITHUB_OUTPUT
+
+      - name: Make staging xcconfig active
+        run: |
+          cd apps/mobile/ios/build-configs
+          ./use-ios-build-config.sh staging --marketing-version ${{steps.marketing-version.outputs.version}} --build-number ${{steps.build-number.outputs.timestamp}}
+
+      # Archive unsigned: this job has no certs/profiles (secrets), and the iOS
+      # device SDK forbids ad-hoc signing, so real signing happens in the trusted
+      # publish workflow (ios.preview.publish.yml). Do NOT pass
+      # CODE_SIGN_ENTITLEMENTS="" -- each target must keep its own entitlements so
+      # the archive records them; blanking them dropped the App Group and crashed
+      # MMKV on launch.
+      - name: Archive (unsigned)
+        run: |
+          set -euo pipefail
+          xcodebuild \
+            -workspace apps/mobile/ios/Notesnook.xcworkspace \
+            -scheme Notesnook \
+            -configuration Release \
+            -sdk iphoneos \
+            -destination 'generic/platform=iOS' \
+            -archivePath "$RUNNER_TEMP/Notesnook.xcarchive" \
+            CODE_SIGNING_ALLOWED=NO \
+            CODE_SIGNING_REQUIRED=NO \
+            CODE_SIGN_IDENTITY="" \
+            archive
+
+      - name: Stage build artifact
+        run: |
+          set -euo pipefail
+          mkdir -p "$RUNNER_TEMP/artifact"
+          tar -czf "$RUNNER_TEMP/artifact/Notesnook.xcarchive.tar.gz" \
+            -C "$RUNNER_TEMP" Notesnook.xcarchive
+          # Carry the PR context forward; workflow_run cannot see it reliably for forks.
+          {
+            echo "PR_NUMBER=${{ github.event.pull_request.number }}"
+            echo "HEAD_SHA=${{ github.event.pull_request.head.sha }}"
+          } > "$RUNNER_TEMP/artifact/pr-meta.env"
+
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ios-preview-build
+          path: ${{ runner.temp }}/artifact
+          if-no-files-found: error
+          retention-days: 1

.github/workflows/ios.preview.firebase.yml

@@ -1,173 +0,0 @@
-name: Notesnook iOS Preview
-
-on:
-  pull_request_target:
-    types: [opened, reopened, synchronize]
-    branches: [master, beta]
-    paths:
-      - "apps/mobile/**"
-      - "packages/**"
-      - ".github/workflows/ios.preview.firebase.yml"
-
-jobs:
-  authorize:
-    environment: ${{ github.event_name == 'pull_request_target' &&
-      github.event.pull_request.head.repo.full_name != github.repository &&
-      'external' || 'internal' }}
-
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo true
-
-  build:
-    needs: authorize
-    runs-on: macos-26
-    timeout-minutes: 60
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.ref }}
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Setup Xcode
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: "26.1.1"
-
-      - name: Setup iOS Platform
-        run: |
-          xcodebuild -downloadPlatform iOS -exportPath ~/Downloads
-          xcodebuild -importPlatform ~/Downloads/iphonesimulator_26.1_23B86.dmg
-
-      - name: Install node modules
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=mobile
-
-      - name: Build packages
-        run: npm run tx @notesnook/mobile:build
-
-      - name: Cache Pods
-        uses: actions/cache@v3
-        id: pods-cache
-        with:
-          path: apps/mobile/ios/Pods
-          key: ${{ runner.os }}-pods-${{ hashFiles('apps/mobile/ios/Podfile.lock') }}
-
-      - name: Install Pods
-        run: |
-          cd apps/mobile/ios
-          pod install
-
-      - name: Check for typescript errors
-        run: |
-          npm run tx mobile:build
-          cd apps/mobile
-          npx tsc --noEmit
-
-      - name: Get marketing version
-        id: marketing-version
-        run: echo "version=$(grep "IOS_MARKETING_VERSION" apps/mobile/ios/build-configs/ios-build.staging.xcconfig | awk -F'=' '{print $2}' | xargs)" >> $GITHUB_OUTPUT
-
-      - name: Get build number
-        id: build-number
-        run: echo "timestamp=$(($(date +%s) - 1774851180 ))" >> $GITHUB_OUTPUT
-
-      - name: Make staging xcconfig active
-        run: |
-          cd apps/mobile/ios/build-configs
-          ./use-ios-build-config.sh staging --marketing-version ${{steps.marketing-version.outputs.version}} --build-number ${{steps.build-number.outputs.timestamp}}
-
-      - name: Build iOS App
-        uses: ammarahm-ed/ios-build-action@master
-        with:
-          bundle-identifier: org.streetwriters.notesnook
-          scheme: Notesnook
-          configuration: "Release"
-          export-options: apps/mobile/ios/ExportOptionsStaging.plist
-          export-method: "ad-hoc"
-          project-path: apps/mobile/ios/Notesnook.xcodeproj
-          workspace-path: apps/mobile/ios/Notesnook.xcworkspace
-          update-targets: |
-            Notesnook
-            Make Note
-            NotesWidgetExtension
-          disable-targets: Notesnook-tvOS,Notesnook-tvOSTests,NotesnookTests
-          code-signing-identity: Apple Distribution
-          team-id: ${{ secrets.APPLE_TEAM_ID }}
-          p12-base64: ${{ secrets.APPLE_CERTIFICATE_P12 }}
-          certificate-password: ${{ secrets.APPLE_CERTIFICATE_P12_PASSWORD }}
-          app-store-connect-api-key-issuer-id: ${{ secrets.API_KEY_ISSUER_ID }}
-          app-store-connect-api-key-id: ${{ secrets.APPSTORE_KEY_ID }}
-          app-store-connect-api-key-base64: ${{ secrets.APPSTORE_CONNECT_API_KEY_BASE64 }}
-          output-path: Notesnook.ipa
-          mobileprovision-base64: |
-            ${{ secrets.APPLE_MOBILE_PROVISION_ADHOC_APP }}
-            ${{ secrets.APPLE_MOBILE_PROVISION_ADHOC_SHARE }}
-            ${{ secrets.APPLE_MOBILE_PROVISION_ADHOC_WIDGET }}
-
-      - name: Upload IPA artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ios-preview-ipa
-          path: Notesnook.ipa
-          if-no-files-found: error
-          retention-days: 1
-
-  publish:
-    runs-on: ubuntu-latest
-    needs: build
-    timeout-minutes: 20
-
-    steps:
-      - name: Download IPA artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: ios-preview-ipa
-          path: .
-
-      - name: Publish to firebase CLI
-        id: firebase-output
-        uses: wzieba/Firebase-Distribution-Github-Action@v1
-        with:
-          appId: ${{secrets.FIREBASE_IOS_APP_ID}}
-          serviceCredentialsFileContent: ${{ secrets.QA_SERVICE_ACCOUNT }}
-          groups: testers
-          file: Notesnook.ipa
-          releaseNotes: Preview for https://github.com/streetwriters/notesnook/pull/${{github.event.number}}
-
-      - name: Post or update PR comment
-        uses: actions/github-script@v6
-        env:
-          preview_url: ${{ steps.firebase-output.outputs.TESTING_URI }}
-        with:
-          script: |
-            const marker = '<!-- ios-preview-comment -->';
-            const prNumber = context.issue.number;
-            const previewUrl = process.env.preview_url || '';
-            const body = `${marker}\n**iOS App Preview**\n\n${previewUrl || 'Preview URL unavailable — check workflow logs.'}\n\nCommit: ${process.env.GITHUB_SHA}\n`;
-            const { data: comments } = await github.rest.issues.listComments({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: prNumber,
-            });
-            const existing = comments.find(c => c.body && c.body.includes(marker));
-            if (existing) {
-              await github.rest.issues.updateComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: existing.id,
-                body,
-              });
-            } else {
-              await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: prNumber,
-                body,
-              });
-            }

.github/workflows/ios.preview.publish.yml

@@ -0,0 +1,222 @@
+name: Notesnook iOS Preview Publish
+
+# TRUSTED stage. Runs via `workflow_run` after the build workflow finishes, so
+# it has the base repo's secrets and a write-scoped token. It checks out the
+# BASE repository (never fork code), downloads the unsigned archive the build
+# produced, then signs + distributes it and posts the PR comment. Signing is
+# done directly with `codesign` on the prebuilt archive -- no app build phases
+# run here, so fork code is never executed in this trusted context.
+#
+# Split into two jobs on purpose: signing needs macOS, but the Firebase
+# distribution action is a Docker container action and only runs on Linux.
+
+on:
+  workflow_run:
+    workflows: ["Notesnook iOS Preview Build"]
+    types: [completed]
+
+jobs:
+  export:
+    # Only publish previews for builds that actually succeeded.
+    if: github.event.workflow_run.conclusion == 'success'
+    runs-on: macos-26
+    timeout-minutes: 30
+    outputs:
+      pr_number: ${{ steps.meta.outputs.PR_NUMBER }}
+      head_sha: ${{ steps.meta.outputs.HEAD_SHA }}
+
+    steps:
+      - name: Checkout base repo (trusted)
+        uses: actions/checkout@v5
+        # No `ref` -> checks out the default branch, i.e. trusted base code.
+
+      - name: Setup Xcode
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: "26.1.1"
+
+      - name: Download build artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ios-preview-build
+          path: ${{ runner.temp }}/artifact
+          run-id: ${{ github.event.workflow_run.id }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Load PR metadata & extract archive
+        id: meta
+        run: |
+          set -euo pipefail
+          cat "$RUNNER_TEMP/artifact/pr-meta.env" >> "$GITHUB_OUTPUT"
+          tar -xzf "$RUNNER_TEMP/artifact/Notesnook.xcarchive.tar.gz" -C "$RUNNER_TEMP"
+
+      - name: Import signing certificate
+        uses: apple-actions/import-codesign-certs@v3
+        with:
+          p12-file-base64: ${{ secrets.APPLE_CERTIFICATE_P12 }}
+          p12-password: ${{ secrets.APPLE_CERTIFICATE_P12_PASSWORD }}
+
+      - name: Install provisioning profiles
+        env:
+          PROFILE_APP: ${{ secrets.APPLE_MOBILE_PROVISION_ADHOC_APP }}
+          PROFILE_SHARE: ${{ secrets.APPLE_MOBILE_PROVISION_ADHOC_SHARE }}
+          PROFILE_WIDGET: ${{ secrets.APPLE_MOBILE_PROVISION_ADHOC_WIDGET }}
+        run: |
+          set -euo pipefail
+          PROFILE_DIR="$HOME/Library/MobileDevice/Provisioning Profiles"
+          mkdir -p "$PROFILE_DIR"
+          i=0
+          for p in "$PROFILE_APP" "$PROFILE_SHARE" "$PROFILE_WIDGET"; do
+            echo "$p" | base64 --decode > "$PROFILE_DIR/preview-$i.mobileprovision"
+            i=$((i + 1))
+          done
+
+      # Sign the unsigned archive by hand. `xcodebuild -exportArchive` re-signs
+      # from the archive's `archived-expanded-entitlements.xcent`, which an
+      # unsigned archive does not contain, so it dropped the App Group and the
+      # app crashed on launch. Instead we sign each bundle directly, taking the
+      # entitlements from each provisioning profile (exactly what Apple
+      # provisioned -- App Group, keychain groups with the right team prefix).
+      # Runs on macOS but executes NO fork build phases, so it stays trusted.
+      - name: Sign IPA
+        run: |
+          set -euo pipefail
+          PROFILES="$HOME/Library/MobileDevice/Provisioning Profiles"
+          APP="$(find "$RUNNER_TEMP/Notesnook.xcarchive/Products/Applications" -maxdepth 1 -name '*.app' | head -n1)"
+          [ -n "$APP" ] || { echo "::error::No .app in archive"; exit 1; }
+
+          # Single Apple Distribution identity from the imported keychain.
+          IDENTITY="$(security find-identity -v -p codesigning | awk '/Apple Distribution/{print $2; exit}')"
+          [ -n "$IDENTITY" ] || { echo "::error::No Apple Distribution identity found"; exit 1; }
+          echo "Signing identity: $IDENTITY"
+
+          TMP="$RUNNER_TEMP/sign"; mkdir -p "$TMP"
+
+          # Decode a profile's bundle id (application-identifier minus team prefix).
+          profile_bundle_id() {
+            security cms -D -i "$1" -o "$TMP/_p.plist" 2>/dev/null
+            local appid; appid="$(plutil -extract Entitlements.application-identifier raw -o - "$TMP/_p.plist")"
+            echo "${appid#*.}"
+          }
+          # Find the profile matching a bundle id; echoes its path.
+          profile_for() {
+            local want="$1" p
+            for p in "$PROFILES"/*.mobileprovision; do
+              [ -e "$p" ] || continue
+              [ "$(profile_bundle_id "$p")" = "$want" ] && { echo "$p"; return 0; }
+            done
+            return 1
+          }
+          # Embed the matching profile and sign a bundle with the profile's entitlements.
+          sign_bundle() {
+            local bundle="$1" bid prof ent
+            bid="$(/usr/libexec/PlistBuddy -c 'Print :CFBundleIdentifier' "$bundle/Info.plist")"
+            prof="$(profile_for "$bid")" || { echo "::error::No provisioning profile for $bid"; exit 1; }
+            ent="$TMP/ent-$bid.plist"
+            security cms -D -i "$prof" -o "$TMP/_p.plist"
+            plutil -extract Entitlements xml1 -o "$ent" "$TMP/_p.plist"
+            cp "$prof" "$bundle/embedded.mobileprovision"
+            echo "Signing $(basename "$bundle") ($bid)"
+            codesign --force --sign "$IDENTITY" --entitlements "$ent" "$bundle"
+          }
+
+          # Sign inside-out: nested code first, then extensions, then the app.
+          if [ -d "$APP/Frameworks" ]; then
+            find "$APP/Frameworks" -maxdepth 1 \( -name '*.framework' -o -name '*.dylib' \) -print0 \
+              | while IFS= read -r -d '' f; do codesign --force --sign "$IDENTITY" "$f"; done
+          fi
+          if [ -d "$APP/PlugIns" ]; then
+            for appex in "$APP/PlugIns"/*.appex; do
+              [ -e "$appex" ] || continue
+              if [ -d "$appex/Frameworks" ]; then
+                find "$appex/Frameworks" -maxdepth 1 \( -name '*.framework' -o -name '*.dylib' \) -print0 \
+                  | while IFS= read -r -d '' f; do codesign --force --sign "$IDENTITY" "$f"; done
+              fi
+              sign_bundle "$appex"
+            done
+          fi
+          sign_bundle "$APP"
+
+          codesign --verify --deep --strict --verbose=2 "$APP"
+
+          # Package into an IPA.
+          rm -rf "$TMP/Payload"; mkdir -p "$TMP/Payload"
+          cp -R "$APP" "$TMP/Payload/"
+          ( cd "$TMP" && zip -qry "$RUNNER_TEMP/Notesnook.ipa" Payload )
+
+          # Fail fast if the App Group didn't make it into the signed app -- its
+          # absence is the launch crash (MMKV nil group path). Never distribute
+          # a build without it.
+          echo "::group::Signed app entitlements"
+          codesign -d --entitlements :- "$APP" 2>/dev/null || true
+          echo "::endgroup::"
+          codesign -d --entitlements :- "$APP" 2>/dev/null | grep -q "group.org.streetwriters.notesnook" \
+            || { echo "::error::Signed app is missing the App Group entitlement; it would crash on launch."; exit 1; }
+          echo "App Group entitlement present."
+
+      - name: Upload signed IPA
+        uses: actions/upload-artifact@v4
+        with:
+          name: ios-preview-ipa
+          path: ${{ runner.temp }}/Notesnook.ipa
+          if-no-files-found: error
+          retention-days: 1
+
+  # Must be Linux: wzieba/Firebase-Distribution-Github-Action is a Docker
+  # container action, which GitHub only supports on Linux runners.
+  distribute:
+    needs: export
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    steps:
+      - name: Download signed IPA
+        uses: actions/download-artifact@v4
+        with:
+          name: ios-preview-ipa
+          path: ${{ runner.temp }}
+
+      - name: Publish to Firebase
+        id: firebase-output
+        uses: wzieba/Firebase-Distribution-Github-Action@v1
+        with:
+          appId: ${{ secrets.FIREBASE_IOS_APP_ID }}
+          serviceCredentialsFileContent: ${{ secrets.QA_SERVICE_ACCOUNT }}
+          groups: testers
+          file: ${{ runner.temp }}/Notesnook.ipa
+          releaseNotes: Preview for https://github.com/${{ github.repository }}/pull/${{ needs.export.outputs.pr_number }}
+
+      - name: Post or update PR comment
+        uses: actions/github-script@v7
+        env:
+          preview_url: ${{ steps.firebase-output.outputs.TESTING_URI }}
+          PR_NUMBER: ${{ needs.export.outputs.pr_number }}
+          HEAD_SHA: ${{ needs.export.outputs.head_sha }}
+        with:
+          script: |
+            const marker = '<!-- ios-preview-comment -->';
+            const prNumber = Number(process.env.PR_NUMBER);
+            if (!prNumber) return;
+            const previewUrl = process.env.preview_url || '';
+            const body = `${marker}\n**iOS App Preview**\n\n${previewUrl || 'Preview URL unavailable — check workflow logs.'}\n\nCommit: ${process.env.HEAD_SHA}\n`;
+            const { data: comments } = await github.rest.issues.listComments({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: prNumber,
+            });
+            const existing = comments.find(c => c.body && c.body.includes(marker));
+            if (existing) {
+              await github.rest.issues.updateComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                comment_id: existing.id,
+                body,
+              });
+            } else {
+              await github.rest.issues.createComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: prNumber,
+                body,
+              });
+            }

.github/workflows/ios.publish.yml

@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/monograph.publish.yml

@@ -22,7 +22,7 @@ jobs:
       id-token: write
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/theme-builder.publish.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/themes.publish.yml

@@ -22,7 +22,7 @@ jobs:
       id-token: write
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Collect package metadata
         id: package_metadata

.github/workflows/vericrypt.publish.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/web.preview.yml

@@ -19,7 +19,7 @@ jobs:
       CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

.github/workflows/web.publish.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/web.tests.yml

@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.head.sha || github.ref }}
 
@@ -66,7 +66,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.head.sha || github.ref }}
 

apps/desktop/__tests__/electron-test/utils.ts

@@ -42,6 +42,7 @@ export interface AppContext {
 
 export interface TestOptions {
   version: string;
+  args?: string[];
   config?: Record<string, unknown>;
 }
 
@@ -72,7 +73,8 @@ export async function buildAndLaunchApp(
   const { app } = await launchApp(
     executablePath,
     userDataDir,
-    options?.version
+    options?.version,
+    options?.args
   );
   const ctx: AppContext = {
     app,
@@ -82,7 +84,8 @@ export async function buildAndLaunchApp(
       const { app } = await launchApp(
         executablePath,
         userDataDir,
-        options?.version
+        options?.version,
+        options?.args
       );
       ctx.app = app;
       ctx.userDataDir = userDataDir;
@@ -94,11 +97,12 @@ export async function buildAndLaunchApp(
 async function launchApp(
   executablePath: string,
   userDataDir: string,
-  version?: string
+  version?: string,
+  args: string[] = []
 ) {
   const app = await electron.launch({
     executablePath,
-    args: IS_DEBUG ? [] : ["--hidden"],
+    args: IS_DEBUG ? [...args] : ["--hidden", ...args],
     baseURL: "https://app.notesnook.com",
     acceptDownloads: true,
     env: {
@@ -154,6 +158,7 @@ export async function buildApp(version?: string) {
         stdio: IS_DEBUG ? "inherit" : "ignore",
         env: {
           ...process.env,
+          CSC_IDENTITY_AUTO_DISCOVERY: "false",
           NOTESNOOK_STAGING: "true",
           NN_PRODUCT_NAME: productName,
           NN_APP_ID: `com.notesnook.test.${productName}`,

apps/desktop/__tests__/launch.test.ts

@@ -17,7 +17,65 @@ 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 { test } from "@nn/test";
+import { test, expect } from "@nn/test";
+import type { ElectronApplication } from "@playwright/test";
+
+async function getMainWindowState(app: ElectronApplication) {
+  return await app.evaluate((window) => {
+    const { BrowserWindow } = window;
+    const mainWindow = BrowserWindow.getAllWindows()[0];
+    if (!mainWindow) throw new Error("Main window not found");
+    return {
+      isMinimized: mainWindow.isMinimized(),
+      isVisible: mainWindow.isVisible()
+    };
+  });
+}
+
 test("make sure app loads", async ({ page }) => {
   await page.waitForSelector(".ProseMirror");
 });
+
+test("hidden launch minimizes when tray is disabled", async ({
+  launchElectronApp,
+  options
+}) => {
+  const app = await launchElectronApp({
+    version: options.version,
+    args: ["--hidden"],
+    config: {
+      desktopSettings: {
+        minimizeToSystemTray: false,
+        closeToSystemTray: false
+      }
+    }
+  });
+
+  const page = await app.firstWindow();
+  await page.waitForSelector(".ProseMirror");
+
+  const state = await getMainWindowState(app);
+  expect(state.isMinimized).toBe(true);
+});
+
+test("hidden launch does not minimize when close-to-tray is enabled", async ({
+  launchElectronApp,
+  options
+}) => {
+  const app = await launchElectronApp({
+    version: options.version,
+    args: ["--hidden"],
+    config: {
+      desktopSettings: {
+        minimizeToSystemTray: false,
+        closeToSystemTray: true
+      }
+    }
+  });
+
+  const page = await app.firstWindow();
+  await page.waitForSelector(".ProseMirror");
+
+  const state = await getMainWindowState(app);
+  expect(state.isMinimized).toBe(false);
+});

apps/desktop/electron-builder.config.js

@@ -203,11 +203,12 @@ module.exports = {
   toolsets: {
     appimage: "1.0.2"
   },
-  snap: {
-    autoStart: false,
-    confinement: "strict",
-    allowNativeWayland: true,
-    base: "core22"
+  snapcraft: {
+    base: "core24",
+    core24: {
+      confinement: "strict",
+      autoStart: false
+    }
   },
   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.4.3",
+  "version": "3.4.5",
   "appAppleId": "1544027013",
   "private": true,
   "main": "./dist/cjs/index.js",

apps/desktop/src/main.ts

@@ -92,6 +92,17 @@ async function createWindow() {
   const cliOptions = await parseArguments(process.argv);
   setTheme(getTheme());
 
+  // this workaround is necessary because macos doesn't support
+  // the --hidden flag when launching the app on startup
+  if (
+    process.platform === "darwin" &&
+    app.getLoginItemSettings().wasOpenedAtLogin &&
+    config.desktopSettings.autoStart &&
+    config.desktopSettings.startMinimized
+  ) {
+    cliOptions.hidden = true;
+  }
+
   const mainWindowState = new WindowState({});
   const mainWindow = new BrowserWindow({
     show: !cliOptions.hidden,
@@ -141,7 +152,13 @@ async function createWindow() {
   mainWindow.setMenuBarVisibility(false);
   mainWindowState.manage(mainWindow);
 
-  if (cliOptions.hidden && !config.desktopSettings.minimizeToSystemTray)
+  if (
+    cliOptions.hidden &&
+    !(
+      config.desktopSettings.minimizeToSystemTray ||
+      config.desktopSettings.closeToSystemTray
+    )
+  )
     mainWindow.minimize();
 
   await mainWindow.webContents.loadURL(`${createURL(cliOptions, "/")}`);
@@ -164,6 +181,14 @@ async function createWindow() {
   );
   mainWindow.webContents.session.setProxy({ proxyRules: config.proxyRules });
 
+  mainWindow.on("show", () =>
+    /**
+     * We may set `skipTaskbar` to true at startup.
+     * This also removes the window from the Alt-Tab switcher.
+     * To fix that, whenever the app is shown, we set `skipTaskbar` to false.
+     */
+    mainWindow.setSkipTaskbar(false)
+  );
   mainWindow.once("closed", () => {
     globalThis.window = null;
   });

apps/mobile/.github/workflows/android-public-release.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
 

apps/mobile/.github/workflows/android-release.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
 

apps/mobile/.nanoicons.json

@@ -0,0 +1,9 @@
+{
+  "iconSets": [
+    {
+      "inputDir": "../../packages/icons/svgs",
+      "fontFamily": "notesnook-icons",
+      "outputDir": "./fonts"
+    }
+  ]
+}

apps/mobile/android/app/build.gradle

@@ -140,7 +140,7 @@ android {
         if (project.hasProperty("prBuildNumber")) {
             versionCode Integer.parseInt(prBuildNumber())
         } else {
-            versionCode 3111
+            versionCode 3114
         }
         versionName getNpmVersion()
         testBuildType System.getProperty('testBuildType', 'debug')
@@ -233,6 +233,9 @@ dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
+    // Lets the widgets push their list data straight into the RemoteViews on every API level,
+    // instead of the deprecated RemoteViewsService adapter (which needs API 31 to do natively).
+    implementation("androidx.core:core-remoteviews:1.0.0")
     implementation("androidx.core:core-splashscreen:1.0.0")
     
     implementation 'androidx.multidex:multidex:2.0.1' 

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

@@ -86,8 +86,9 @@
             android:name=".NotePreviewWidget"
             android:exported="false"
             android:label="@string/note">
-            <intent-filter>"
+            <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+                <action android:name="android.appwidget.action.APPWIDGET_RESTORED" />
             </intent-filter>
 
             <meta-data
@@ -95,6 +96,15 @@
                 android:resource="@xml/note_widget_info" />
         </receiver>
 
+        <receiver
+            android:name=".WidgetTimeChangeReceiver"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.TIME_SET" />
+                <action android:name="android.intent.action.TIMEZONE_CHANGED" />
+            </intent-filter>
+        </receiver>
+
         <receiver
             android:name=".ReminderWidgetProvider"
             android:exported="false"
@@ -230,11 +240,6 @@
             </intent-filter>
         </service>
 
-        <service
-            android:name=".ReminderViewsService"
-            android:exported="true"
-            android:permission="android.permission.BIND_REMOTEVIEWS" />
-
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"

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

@@ -5,15 +5,11 @@ import android.appwidget.AppWidgetManager;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
-import android.widget.RemoteViews;
 
 import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactActivityDelegate;
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
 import com.facebook.react.defaults.DefaultReactActivityDelegate;
-import com.google.gson.Gson;
-import com.streetwriters.notesnook.datatypes.Note;
 
 public class NotePreviewConfigureActivity extends ReactActivity {
 
@@ -40,18 +36,32 @@ public class NotePreviewConfigureActivity extends ReactActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(null);
-        Intent intent = getIntent();
-        Bundle extras = intent.getExtras();
-        int appWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
-        if (extras != null) {
-            appWidgetId = extras.getInt(
-                    AppWidgetManager.EXTRA_APPWIDGET_ID,
-                    AppWidgetManager.INVALID_APPWIDGET_ID);
-            NotePreviewConfigureActivity.appWidgetId = appWidgetId;
-        }
+        activity = this;
+        readAppWidgetId(getIntent());
+    }
+
+    /**
+     * We launch as singleTask, so configuring a second widget while this screen is still alive
+     * arrives here rather than in onCreate(). Without this the activity would keep writing to
+     * whichever widget it happened to be opened for first.
+     */
+    @Override
+    public void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        setIntent(intent);
+        activity = this;
+        readAppWidgetId(intent);
+    }
+
+    private void readAppWidgetId(Intent intent) {
+        Bundle extras = intent != null ? intent.getExtras() : null;
+        int appWidgetId = extras != null
+                ? extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID)
+                : AppWidgetManager.INVALID_APPWIDGET_ID;
+
+        NotePreviewConfigureActivity.appWidgetId = appWidgetId;
         Intent resultValue = new Intent().putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
         setResult(Activity.RESULT_CANCELED, resultValue);
-        activity = this;
     }
 
     public static void saveAndFinish(Context context) {

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

@@ -1,6 +1,5 @@
 package com.streetwriters.notesnook;
 
-import android.app.ActivityOptions;
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
@@ -8,51 +7,125 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
+import android.view.View;
 import android.widget.RemoteViews;
-import com.google.gson.Gson;
 import com.streetwriters.notesnook.datatypes.Note;
 
+import java.util.HashSet;
+import java.util.Set;
+
 
 public class NotePreviewWidget extends AppWidgetProvider {
     static String OpenNoteId = "com.streetwriters.notesnook.OpenNoteId";
     static void updateAppWidget(Context context, AppWidgetManager appWidgetManager,
                                 int appWidgetId) {
-        String data = context.getSharedPreferences("appPreview", Context.MODE_PRIVATE).getString(String.valueOf(appWidgetId), "");
-        if (data.isEmpty()) {
+        String data = context.getSharedPreferences(WidgetUtils.PREFERENCES, Context.MODE_PRIVATE).getString(String.valueOf(appWidgetId), "");
+        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.note_widget);
+
+        Note note = WidgetUtils.parseNote(data);
+        if (note == null) {
+            // Either the widget was never configured, or we lost the note it pointed at (ids
+            // reassigned, data cleared). Point it back at the picker rather than leaving the user
+            // with an inert widget they can only fix by deleting and re-adding it.
+            views.setTextViewText(R.id.widget_title, context.getString(R.string.widget_note_unconfigured_title));
+            views.setTextViewText(R.id.widget_body, context.getString(R.string.widget_note_unconfigured_body));
+            views.setOnClickPendingIntent(R.id.open_note, getConfigurePendingIntent(context, appWidgetId));
+            appWidgetManager.updateAppWidget(appWidgetId, views);
             return;
         }
-        Gson gson = new Gson();
-        Note note = gson.fromJson(data, Note.class);
-        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.note_widget);
+
         views.setTextViewText(R.id.widget_title, note.getTitle());
         views.setTextViewText(R.id.widget_body, note.getHeadline());
+        // Once the user shrinks the widget down to a single row there is no room for the preview
+        // text, and a clipped half-line of it looks like a rendering glitch.
+        views.setViewVisibility(R.id.widget_body,
+                hasRoomForBody(appWidgetManager, appWidgetId) ? View.VISIBLE : View.GONE);
 
         Intent intent = new Intent(context, MainActivity.class);
         intent.putExtra(OpenNoteId, note.getId());
         intent.setAction(Intent.ACTION_VIEW);
         intent.putExtra(RCTNNativeModule.IntentType, "OpenNote");
         intent.setData(Uri.parse("nn://note/" + note.getId()));
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE, getActivityOptionsBundle());
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE, WidgetUtils.getActivityOptionsBundle());
         views.setOnClickPendingIntent(R.id.open_note, pendingIntent);
 
         appWidgetManager.updateAppWidget(appWidgetId, views);
     }
 
+    /**
+     * Reopens the configure screen for this widget. The launcher's own "reconfigure" gesture is
+     * hard to discover and not offered by every launcher, so an unconfigured widget needs its own
+     * way back in.
+     */
+    private static PendingIntent getConfigurePendingIntent(Context context, int appWidgetId) {
+        Intent intent = new Intent(context, NotePreviewConfigureActivity.class);
+        intent.setAction(AppWidgetManager.ACTION_APPWIDGET_CONFIGURE);
+        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
+        // PendingIntent equality ignores extras, so the widget id has to be the request code for
+        // each widget to get its own.
+        return PendingIntent.getActivity(context, appWidgetId, intent,
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE,
+                WidgetUtils.getActivityOptionsBundle());
+    }
+
+    /**
+     * Height below which the note preview text is dropped, leaving just the title.
+     */
+    private static final int MIN_HEIGHT_FOR_BODY_DP = 70;
+
+    private static boolean hasRoomForBody(AppWidgetManager appWidgetManager, int appWidgetId) {
+        Bundle options = appWidgetManager.getAppWidgetOptions(appWidgetId);
+        if (options == null) return true;
+
+        int minHeight = options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT);
+        // Not reported yet (the widget has just been placed): assume there is room.
+        return minHeight <= 0 || minHeight >= MIN_HEIGHT_FOR_BODY_DP;
+    }
+
     @Override
     public void onAppWidgetOptionsChanged(Context context, AppWidgetManager appWidgetManager, int appWidgetId, Bundle newOptions) {
         super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions);
+        // This used to do nothing at all, so resizing the widget left it rendered for its old size.
+        updateAppWidget(context, appWidgetManager, appWidgetId);
     }
 
-    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);
-            return activityOptions.toBundle();
-        } else
-            return null;
+    /**
+     * The note shown by each widget is stored in the "appPreview" preferences under its widget id.
+     * When the system restores our widgets it hands out fresh ids, so unless we move the stored
+     * notes over to the new ids the widgets are left permanently blank with no way to recover
+     * other than removing and re-adding them.
+     *
+     * AppWidgetProvider calls onUpdate() with the new ids right after this, which re-renders them.
+     */
+    @Override
+    public void onRestored(Context context, int[] oldWidgetIds, int[] newWidgetIds) {
+        super.onRestored(context, oldWidgetIds, newWidgetIds);
+        if (oldWidgetIds == null || newWidgetIds == null) return;
+
+        int count = Math.min(oldWidgetIds.length, newWidgetIds.length);
+        SharedPreferences preferences = context.getSharedPreferences("appPreview", Context.MODE_PRIVATE);
+
+        // Read everything up front: an old id can collide with the new id of another widget.
+        String[] notes = new String[count];
+        Set<String> newKeys = new HashSet<>();
+        for (int i = 0; i < count; i++) {
+            notes[i] = preferences.getString(String.valueOf(oldWidgetIds[i]), "");
+            newKeys.add(String.valueOf(newWidgetIds[i]));
+        }
+
+        SharedPreferences.Editor edit = preferences.edit();
+        for (int i = 0; i < count; i++) {
+            String oldKey = String.valueOf(oldWidgetIds[i]);
+            if (!newKeys.contains(oldKey)) {
+                edit.remove(oldKey);
+            }
+        }
+        for (int i = 0; i < count; i++) {
+            if (notes[i].isEmpty()) continue;
+            edit.putString(String.valueOf(newWidgetIds[i]), notes[i]);
+        }
+        edit.apply();
     }
 
     @Override

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

@@ -1,12 +1,10 @@
 package com.streetwriters.notesnook;
 
-import android.app.ActivityOptions;
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 import android.widget.RemoteViews;
 
@@ -24,20 +22,10 @@ public class NoteWidget extends AppWidgetProvider {
 
     static void setClickIntent(Context context, RemoteViews views) {
         Intent intent = new Intent(context, ShareActivity.class);
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE, getActivityOptionsBundle());
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE, WidgetUtils.getActivityOptionsBundle());
         views.setOnClickPendingIntent(R.id.new_note, pendingIntent);
     }
 
-    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);
-            return activityOptions.toBundle();
-        } else
-            return null;
-    }
-
     @Override
     public void onAppWidgetOptionsChanged(Context context, AppWidgetManager appWidgetManager, int appWidgetId, Bundle newOptions) {
         super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions);

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

@@ -12,7 +12,6 @@ import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.graphics.RectF;
 import android.graphics.drawable.Icon;
 import android.os.Build;
 import android.os.Bundle;
@@ -29,7 +28,6 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
-import com.google.gson.Gson;
 import com.streetwriters.notesnook.datatypes.Note;
 
 import java.util.ArrayList;
@@ -138,7 +136,7 @@ public class RCTNNativeModule extends ReactContextBaseJavaModule {
                 if (Objects.equals(extras.getString(IntentType), "NewReminder")) {
                     map.putString(ReminderWidgetProvider.NewReminder, extras.getString(ReminderWidgetProvider.NewReminder));
                 } else if (Objects.equals(extras.getString(IntentType), "OpenReminder")) {
-                    map.putString(ReminderViewsService.OpenReminderId, extras.getString(ReminderViewsService.OpenReminderId));
+                    map.putString(ReminderWidgetProvider.OpenReminderId, extras.getString(ReminderWidgetProvider.OpenReminderId));
                 } else if (Objects.equals(extras.getString(IntentType), "OpenNote")) {
                     map.putString(NotePreviewWidget.OpenNoteId, extras.getString(NotePreviewWidget.OpenNoteId));
                 }
@@ -156,14 +154,8 @@ public class RCTNNativeModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void getWidgetNotes(Promise promise) {
-        SharedPreferences pref = getReactApplicationContext().getSharedPreferences("appPreview", Context.MODE_PRIVATE);
-        Map<String, ?> map = pref.getAll();
         WritableArray arr = Arguments.createArray();
-        for(Map.Entry<String,?> entry : map.entrySet()){
-            if (entry.getKey().equals("remindersList")) continue;
-            String value = (String) entry.getValue();
-            Gson gson = new Gson();
-            Note note = gson.fromJson(value, Note.class);
+        for (Note note : WidgetUtils.getWidgetNotes(getReactApplicationContext()).values()) {
             arr.pushString(note.getId());
         }
         promise.resolve(arr);
@@ -171,36 +163,46 @@ public class RCTNNativeModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void hasWidgetNote(final String noteId, Promise promise) {
-        SharedPreferences pref = getReactApplicationContext().getSharedPreferences("appPreview", Context.MODE_PRIVATE);
-        Map<String, ?> map = pref.getAll();
         boolean found = false;
-        for(Map.Entry<String,?> entry : map.entrySet()){
-            String value = (String) entry.getValue();
-            if (value.contains(noteId)) {
+        for (Note note : WidgetUtils.getWidgetNotes(getReactApplicationContext()).values()) {
+            if (note.getId().equals(noteId)) {
                 found = true;
+                break;
             }
         }
         promise.resolve(found);
     }
+
     @ReactMethod
     public void updateWidgetNote(final String noteId, final String data) {
-        SharedPreferences pref = getReactApplicationContext().getSharedPreferences("appPreview", Context.MODE_PRIVATE);
-        Map<String, ?> map = pref.getAll();
+        SharedPreferences pref = getReactApplicationContext().getSharedPreferences(WidgetUtils.PREFERENCES, Context.MODE_PRIVATE);
         SharedPreferences.Editor edit = pref.edit();
-        ArrayList<String> ids = new ArrayList<>();
-        for(Map.Entry<String,?> entry : map.entrySet()) {
-            String value = (String) entry.getValue();
-            if (value.contains(noteId)) {
-                edit.putString(entry.getKey(), data);
-                ids.add(entry.getKey());
-            }
+        List<Integer> ids = new ArrayList<>();
+
+        // Match on the note's id, not on the raw JSON containing it somewhere: a note whose body
+        // happens to mention another note's id is not the same note.
+        for (Map.Entry<Integer, Note> entry : WidgetUtils.getWidgetNotes(getReactApplicationContext()).entrySet()) {
+            if (!noteId.equals(entry.getValue().getId())) continue;
+            edit.putString(String.valueOf(entry.getKey()), data);
+            ids.add(entry.getKey());
         }
         edit.apply();
-        for (String id: ids) {
-            NotePreviewWidget.updateAppWidget(mContext, AppWidgetManager.getInstance(mContext), Integer.parseInt(id));
+
+        for (int id : ids) {
+            NotePreviewWidget.updateAppWidget(mContext, AppWidgetManager.getInstance(mContext), id);
         }
     }
 
+    /**
+     * Redraws every widget from scratch. Needed because the app can be stopped while its widgets
+     * stay on the home screen: clearing app data empties the store without the widgets ever being
+     * told, so they keep showing content that is gone until something forces a redraw.
+     */
+    @ReactMethod
+    public void refreshWidgets() {
+        WidgetUtils.refreshAll(mContext);
+    }
+
     @ReactMethod
     public void updateReminderWidget() {
         AppWidgetManager wm = AppWidgetManager.getInstance(mContext);
@@ -208,8 +210,8 @@ public class RCTNNativeModule extends ReactContextBaseJavaModule {
         for (int id: ids) {
             Log.d("Reminders", "Updating" + id);
             RemoteViews views = new RemoteViews(mContext.getPackageName(), R.layout.widget_reminders);
+            // The rows are part of this update, so there is nothing left to invalidate afterwards.
             ReminderWidgetProvider.updateAppWidget(mContext, wm, id, views);
-            wm.notifyAppWidgetViewDataChanged(id, R.id.widget_list_view);
         }
     }
 

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

@@ -1,106 +0,0 @@
-package com.streetwriters.notesnook;
-
-import android.app.ActivityOptions;
-import android.app.PendingIntent;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.util.Log;
-import android.widget.RemoteViewsService;
-import android.content.Context;
-import android.widget.RemoteViews;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import com.streetwriters.notesnook.datatypes.Reminder;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ReminderViewsService extends RemoteViewsService {
-    static String OpenReminderId = "com.streetwriters.notesnook.OpenReminderId";
-    @Override
-    public RemoteViewsFactory onGetViewFactory(Intent intent) {
-        return new ReminderRemoteViewsFactory(this.getApplicationContext(), intent);
-    }
-}
-
-class ReminderRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactory {
-    private Context context;
-    private List<Reminder> reminders;
-
-    public ReminderRemoteViewsFactory(Context context, Intent intent) {
-        this.context = context;
-    }
-
-    @Override
-    public void onCreate() {
-        // Initialize reminders list
-        reminders = new ArrayList<Reminder>();
-    }
-
-    @Override
-    public void onDataSetChanged() {
-        reminders.clear();
-        SharedPreferences preferences = context.getSharedPreferences("appPreview", Context.MODE_PRIVATE);
-        Gson gson = new Gson();
-        reminders = gson.fromJson(preferences.getString("remindersList","[]"), new TypeToken<List<Reminder>>(){}.getType());
-
-    }
-
-    @Override
-    public void onDestroy() {
-        reminders.clear();
-    }
-
-    @Override
-    public int getCount() {
-        return reminders.size();
-    }
-
-    @Override
-    public RemoteViews getViewAt(int position) {
-        Reminder reminder = reminders.get(position);
-
-        boolean useMiniLayout = reminder.getDescription() == null || reminder.getDescription().isEmpty();
-
-        RemoteViews views = new RemoteViews(context.getPackageName(), useMiniLayout ? R.layout.widget_reminder_layout_small :  R.layout.widget_reminder_layout);
-
-        views.setTextViewText(R.id.reminder_title, reminder.getTitle());
-        if (!useMiniLayout) {
-               views.setTextViewText(R.id.reminder_description, reminder.getDescription());
-        }
-        views.setTextViewText(R.id.reminder_time, reminder.getFormattedTime());
-        final Intent fillInIntent = new Intent();
-        final Bundle extras = new Bundle();
-        extras.putString(ReminderViewsService.OpenReminderId, reminder.getId());
-        fillInIntent.setData(Uri.parse("https://app.notesnook.com/open_reminder?id=" + reminder.getId()));
-        fillInIntent.putExtra(RCTNNativeModule.IntentType, "OpenReminder");
-        fillInIntent.putExtras(extras);
-        views.setOnClickFillInIntent(R.id.reminder_item_btn, fillInIntent);
-        return views;
-    }
-
-
-    @Override
-    public RemoteViews getLoadingView() {
-        return null;
-    }
-
-    @Override
-    public int getViewTypeCount() {
-        return 2;
-    }
-
-    @Override
-    public long getItemId(int position) {
-
-        return position;
-    }
-
-    @Override
-    public boolean hasStableIds() {
-        return true;
-    }
-}

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

@@ -1,18 +1,22 @@
 package com.streetwriters.notesnook;
 
-import android.app.ActivityOptions;
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
 import android.widget.RemoteViews;
 
+import androidx.core.widget.RemoteViewsCompat;
+
+import com.streetwriters.notesnook.datatypes.Reminder;
+
+import java.util.List;
+
 public class ReminderWidgetProvider extends AppWidgetProvider {
     static String NewReminder = "com.streetwriters.notesnook.NewReminder";
+    static String OpenReminderId = "com.streetwriters.notesnook.OpenReminderId";
 
     @Override
     public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
@@ -23,20 +27,10 @@ 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);
-            return activityOptions.toBundle();
-        } else
-            return null;
-    }
-
     static void updateAppWidget(Context context, AppWidgetManager appWidgetManager, int appWidgetId, RemoteViews views) {
         Intent listview_intent_template = new Intent(context, MainActivity.class);
         listview_intent_template.setAction(Intent.ACTION_VIEW);
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, listview_intent_template, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE, getActivityOptionsBundle());
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, listview_intent_template, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE, WidgetUtils.getActivityOptionsBundle());
         views.setPendingIntentTemplate(R.id.widget_list_view, pendingIntent);
 
         Intent new_reminder_intent = new Intent(context, MainActivity.class);
@@ -44,13 +38,31 @@ public class ReminderWidgetProvider extends AppWidgetProvider {
         new_reminder_intent.setAction(Intent.ACTION_VIEW);
         new_reminder_intent.putExtra(RCTNNativeModule.IntentType, "NewReminder");
         new_reminder_intent.setData(Uri.parse("https://app.notesnook.com/new_reminder"));
-        PendingIntent pendingIntent2 = PendingIntent.getActivity(context, appWidgetId, new_reminder_intent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE, getActivityOptionsBundle());
+        PendingIntent pendingIntent2 = PendingIntent.getActivity(context, appWidgetId, new_reminder_intent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE, WidgetUtils.getActivityOptionsBundle());
         views.setOnClickPendingIntent(R.id.add_button, pendingIntent2);
 
-        Intent list_remote_adapter_intent = new Intent(context, ReminderViewsService.class);
-        list_remote_adapter_intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
-        views.setRemoteAdapter(R.id.widget_list_view, list_remote_adapter_intent);
+        // The rows travel with the update itself, so there is no bound service to keep in sync and
+        // nothing to invalidate separately: every update redraws from the current data.
+        List<Reminder> reminders = WidgetUtils.getWidgetReminders(context);
+        RemoteViewsCompat.RemoteCollectionItems.Builder items =
+                new RemoteViewsCompat.RemoteCollectionItems.Builder();
+        for (Reminder reminder : reminders) {
+            items.addItem(getItemId(reminder), WidgetUtils.createReminderItem(context, reminder));
+        }
+        // Two, because a reminder without a description uses the compact row layout.
+        items.setViewTypeCount(2);
+        items.setHasStableIds(true);
+
+        RemoteViewsCompat.setRemoteAdapter(context, views, appWidgetId, R.id.widget_list_view, items.build());
         views.setEmptyView(R.id.widget_list_view, R.id.empty_view);
         appWidgetManager.updateAppWidget(appWidgetId, views);
     }
-}
+
+    /**
+     * Ties a row to its reminder rather than to its position, so rows keep their identity when the
+     * list shifts around them.
+     */
+    private static long getItemId(Reminder reminder) {
+        return reminder.getId() == null ? 0 : reminder.getId().hashCode();
+    }
+}

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

@@ -0,0 +1,28 @@
+package com.streetwriters.notesnook;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * Redraws the widgets when the clock or timezone changes.
+ *
+ * Reminder rows are described relative to the current time ("Upcoming"/"Last", "Today"/"Tomorrow"),
+ * and a reminder that has passed drops off the list entirely. All of that is decided when the
+ * widget is drawn, so moving the clock leaves the previous drawing in place: a reminder can still
+ * read "Upcoming" long after its time has gone by.
+ *
+ * The app normally redraws the list when a reminder notification is delivered, but that does not
+ * happen if the reminder never fires, which is exactly the case when the clock jumps past it.
+ *
+ * Only TIME_SET and TIMEZONE_CHANGED are handled here: DATE_CHANGED is not exempt from the
+ * Android 8 limits on manifest-registered implicit broadcasts, so a receiver for it would never
+ * run. Crossing midnight is instead picked up by the widget's own periodic update.
+ */
+public class WidgetTimeChangeReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        WidgetUtils.refreshAll(context);
+    }
+}

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

@@ -0,0 +1,299 @@
+package com.streetwriters.notesnook;
+
+import android.app.ActivityOptions;
+import android.appwidget.AppWidgetManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.format.DateUtils;
+import android.util.Log;
+import android.widget.RemoteViews;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.streetwriters.notesnook.datatypes.Note;
+import com.streetwriters.notesnook.datatypes.Reminder;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Shared helpers for the home screen widgets.
+ */
+public class WidgetUtils {
+
+    static final String PREFERENCES = "appPreview";
+    static final String REMINDERS_KEY = "remindersList";
+
+    /**
+     * Every row is serialized into the widget update itself, which has to fit inside a binder
+     * transaction, so the list cannot grow without bound. Far more than fits on screen anyway.
+     */
+    private static final int MAX_REMINDERS = 50;
+
+    /**
+     * Redraws every widget that currently exists, and drops stored notes for widgets that no
+     * longer do.
+     *
+     * Everything else keys off what we have stored, which is fine while the app is running but
+     * leaves widgets showing content that no longer exists once the store is emptied underneath
+     * them (clearing app data) or a widget is removed while the app is stopped (onDeleted never
+     * arrives). Starting from the widgets the system knows about, rather than from our own data,
+     * is what makes this self-correcting.
+     *
+     * NoteWidget is left alone deliberately: it is a static button with no stored state, and its
+     * layout depends on the size it was last given.
+     */
+    static void refreshAll(Context context) {
+        AppWidgetManager manager = AppWidgetManager.getInstance(context);
+
+        int[] noteWidgetIds = manager.getAppWidgetIds(
+                new ComponentName(context, NotePreviewWidget.class));
+        removeOrphanedNotes(context, noteWidgetIds);
+        for (int appWidgetId : noteWidgetIds) {
+            NotePreviewWidget.updateAppWidget(context, manager, appWidgetId);
+        }
+
+        for (int appWidgetId : manager.getAppWidgetIds(
+                new ComponentName(context, ReminderWidgetProvider.class))) {
+            RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_reminders);
+            ReminderWidgetProvider.updateAppWidget(context, manager, appWidgetId, views);
+        }
+    }
+
+    /**
+     * Drops stored notes whose widget is gone, so the preferences file cannot grow forever.
+     */
+    private static void removeOrphanedNotes(Context context, int[] liveWidgetIds) {
+        Set<String> live = new HashSet<>();
+        for (int appWidgetId : liveWidgetIds) live.add(String.valueOf(appWidgetId));
+
+        SharedPreferences preferences = context.getSharedPreferences(PREFERENCES, Context.MODE_PRIVATE);
+        SharedPreferences.Editor edit = preferences.edit();
+        boolean changed = false;
+
+        for (String key : preferences.getAll().keySet()) {
+            // Leave anything that is not a widget id alone, the reminders list included.
+            if (parseWidgetId(key) == null || live.contains(key)) continue;
+            edit.remove(key);
+            changed = true;
+        }
+        if (changed) edit.apply();
+    }
+
+    /**
+     * The note each note widget is showing, keyed by widget id.
+     *
+     * The preferences file mixes two things: one note per widget id, and the reminders list under
+     * its own key. Only numeric keys are widget notes, so anything else is skipped rather than
+     * being treated as a note.
+     */
+    static Map<Integer, Note> getWidgetNotes(Context context) {
+        SharedPreferences preferences = context.getSharedPreferences(PREFERENCES, Context.MODE_PRIVATE);
+        Map<Integer, Note> notes = new LinkedHashMap<>();
+
+        for (Map.Entry<String, ?> entry : preferences.getAll().entrySet()) {
+            Integer widgetId = parseWidgetId(entry.getKey());
+            if (widgetId == null) continue;
+            if (!(entry.getValue() instanceof String)) continue;
+
+            Note note = parseNote((String) entry.getValue());
+            if (note == null || note.getId() == null) continue;
+            notes.put(widgetId, note);
+        }
+        return notes;
+    }
+
+    /**
+     * The widget id a preferences key refers to, or null if the key is not a widget id at all.
+     */
+    private static Integer parseWidgetId(String key) {
+        try {
+            return Integer.valueOf(key);
+        } catch (NumberFormatException e) {
+            return null;
+        }
+    }
+
+    static Note parseNote(String data) {
+        if (data == null || data.isEmpty()) return null;
+        try {
+            return new Gson().fromJson(data, Note.class);
+        } catch (Exception e) {
+            Log.e("NotePreviewWidget", "Could not read a stored note", e);
+            return null;
+        }
+    }
+
+    /**
+     * The reminders the app last wrote out, minus any that have now dropped out of view. Reading
+     * and filtering happens here so the provider can push the rows straight into the widget.
+     */
+    static List<Reminder> getWidgetReminders(Context context) {
+        SharedPreferences preferences = context.getSharedPreferences(PREFERENCES, Context.MODE_PRIVATE);
+        List<Reminder> stored = null;
+        try {
+            stored = new Gson().fromJson(preferences.getString(REMINDERS_KEY, "[]"),
+                    new TypeToken<List<Reminder>>() {}.getType());
+        } catch (Exception e) {
+            Log.e("Reminders", "Could not read the stored reminders list", e);
+        }
+
+        List<Reminder> active = new ArrayList<>();
+        if (stored == null) return active;
+
+        for (Reminder reminder : stored) {
+            if (!isVisibleInWidget(reminder)) continue;
+            if (active.size() >= MAX_REMINDERS) {
+                Log.w("Reminders", "Widget list truncated to " + MAX_REMINDERS + " reminders");
+                break;
+            }
+            active.add(reminder);
+        }
+        return active;
+    }
+
+    /**
+     * Builds a single row of the reminders list.
+     */
+    static RemoteViews createReminderItem(Context context, Reminder reminder) {
+        boolean useMiniLayout = reminder.getDescription() == null || reminder.getDescription().isEmpty();
+
+        RemoteViews views = new RemoteViews(context.getPackageName(),
+                useMiniLayout ? R.layout.widget_reminder_layout_small : R.layout.widget_reminder_layout);
+
+        views.setTextViewText(R.id.reminder_title, reminder.getTitle());
+        if (!useMiniLayout) {
+            views.setTextViewText(R.id.reminder_description, reminder.getDescription());
+        }
+        views.setTextViewText(R.id.reminder_time, formatReminderTime(context, reminder));
+
+        Intent fillInIntent = new Intent();
+        fillInIntent.setData(Uri.parse("https://app.notesnook.com/open_reminder?id=" + reminder.getId()));
+        fillInIntent.putExtra(RCTNNativeModule.IntentType, "OpenReminder");
+        fillInIntent.putExtra(ReminderWidgetProvider.OpenReminderId, reminder.getId());
+        views.setOnClickFillInIntent(R.id.reminder_item_btn, fillInIntent);
+        return views;
+    }
+
+    /**
+     * Options attached to the PendingIntents our widgets hand to the launcher, opting the creator
+     * (us) in to background activity starts so a tap on the widget can bring up an activity.
+     *
+     * MODE_BACKGROUND_ACTIVITY_START_ALLOWED is deprecated since API 36 and Android 17 extends the
+     * background activity launch restrictions to IntentSender, so on API 36+ we use the narrower
+     * MODE_BACKGROUND_ACTIVITY_START_ALLOW_IF_VISIBLE instead. That is enough for widgets: the
+     * sender is the launcher, which is visible whenever the user taps the widget.
+     */
+    static Bundle getActivityOptionsBundle() {
+        ActivityOptions activityOptions;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA) {
+            activityOptions = ActivityOptions.makeBasic();
+            activityOptions.setPendingIntentCreatorBackgroundActivityStartMode(
+                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOW_IF_VISIBLE);
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            activityOptions = ActivityOptions.makeBasic();
+            activityOptions.setPendingIntentCreatorBackgroundActivityStartMode(
+                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
+        } else {
+            return null;
+        }
+        return activityOptions.toBundle();
+    }
+
+    /**
+     * How long a reminder keeps its place in the list after going off, so the user can see that it
+     * happened rather than watching it vanish. Must match RECENTLY_PASSED_WINDOW in
+     * services/notifications.ts, which decides what gets written out in the first place.
+     */
+    private static final long RECENTLY_PASSED_WINDOW_MS = TimeUnit.HOURS.toMillis(3);
+
+    /**
+     * Whether a reminder should still be drawn.
+     *
+     * We re-check here rather than trusting the stored list because that list is only rewritten
+     * while the app runs. This is what actually retires a reminder once its grace period is up:
+     * every redraw re-evaluates it against the current time.
+     */
+    static boolean isVisibleInWidget(Reminder reminder) {
+        if (reminder == null) return false;
+        if (reminder.isDisabled()) return false;
+
+        long now = System.currentTimeMillis();
+        if (reminder.getSnoozeUntil() > now) return true;
+        if (!"once".equals(reminder.getMode())) return true;
+
+        long triggerDate = reminder.getTriggerDate() > 0 ? reminder.getTriggerDate() : reminder.getDate();
+        return triggerDate > now - RECENTLY_PASSED_WINDOW_MS;
+    }
+
+    /**
+     * Builds the label shown under a reminder. The app sends us the absolute trigger time plus the
+     * parts that never change ("5:00 PM", "12-05-2026, 5:00 PM"); everything that depends on the
+     * current time is decided here so it stays right as the widget redraws.
+     *
+     * Falls back to the pre-formatted string for lists written by an older version of the app.
+     */
+    static String formatReminderTime(Context context, Reminder reminder) {
+        long triggerDate = reminder.getTriggerDate();
+        String timeOfDay = reminder.getFormattedTimeOfDay();
+        if (triggerDate <= 0 || timeOfDay == null || timeOfDay.isEmpty()) {
+            return reminder.getFormattedTime();
+        }
+
+        if ("permanent".equals(reminder.getMode())) {
+            return context.getString(R.string.reminder_ongoing);
+        }
+
+        long now = System.currentTimeMillis();
+        if (reminder.getSnoozeUntil() > now) {
+            return context.getString(R.string.reminder_snoozed_until, timeOfDay);
+        }
+
+        String text;
+        long dayOffset = daysFromToday(triggerDate, now);
+        if (dayOffset == 0) {
+            text = context.getString(R.string.reminder_today, timeOfDay);
+        } else if (dayOffset == 1) {
+            text = context.getString(R.string.reminder_tomorrow, timeOfDay);
+        } else if (dayOffset == -1) {
+            text = context.getString(R.string.reminder_yesterday, timeOfDay);
+        } else {
+            text = reminder.getFormattedDateTime();
+            if (text == null || text.isEmpty()) return reminder.getFormattedTime();
+        }
+
+        return context.getString(
+                triggerDate <= now ? R.string.reminder_last : R.string.reminder_upcoming, text);
+    }
+
+    /**
+     * Calendar days between two instants. Compares midnights rather than subtracting the raw
+     * difference so that "tomorrow" is still tomorrow across a DST change or just before midnight.
+     */
+    private static long daysFromToday(long time, long now) {
+        long target = startOfDay(time);
+        long today = startOfDay(now);
+        return Math.round((target - today) / (double) DateUtils.DAY_IN_MILLIS);
+    }
+
+    private static long startOfDay(long time) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTimeInMillis(time);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        return calendar.getTimeInMillis();
+    }
+}

apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/datatypes/Reminder.java

@@ -2,13 +2,14 @@ package com.streetwriters.notesnook.datatypes;
 
 import androidx.annotation.Keep;
 
-import java.util.concurrent.TimeUnit;
-
 @Keep
 public class Reminder extends BaseItem {
     private String title;
     private String description;
     private String formattedTime;
+    private String formattedTimeOfDay; // e.g. "5:00 PM"
+    private String formattedDateTime; // e.g. "12-05-2026, 5:00 PM"
+    private long triggerDate; // absolute time this reminder next fires
     private String priority; // "silent", "vibrate", "urgent"
     private long date;
     private String mode; // "repeat", "once", "permanent"
@@ -107,32 +108,27 @@ public class Reminder extends BaseItem {
         this.formattedTime = formattedTime;
     }
 
-    public String formatTime(long timeInMillis) {
-        long currentTime = System.currentTimeMillis();
-        long diff = timeInMillis - currentTime;
+    public String getFormattedTimeOfDay() {
+        return formattedTimeOfDay;
+    }
 
-        if (diff < TimeUnit.MINUTES.toMillis(1)) {
-            return "in " + (diff / 1000) + " seconds";
-        } else if (diff < TimeUnit.HOURS.toMillis(1)) {
-            long minutes = TimeUnit.MILLISECONDS.toMinutes(diff);
-            return "in " + minutes + " minute" + (minutes > 1 ? "s" : "");
-        } else if (diff < TimeUnit.DAYS.toMillis(1)) {
-            long hours = TimeUnit.MILLISECONDS.toHours(diff);
-            return "in " + hours + " hour" + (hours > 1 ? "s" : "");
-        } else if (diff < TimeUnit.DAYS.toMillis(2)) {
-            return "tomorrow";
-        } else if (diff < TimeUnit.DAYS.toMillis(7)) {
-            long days = TimeUnit.MILLISECONDS.toDays(diff);
-            return "in " + days + " day" + (days > 1 ? "s" : "");
-        } else if (diff < TimeUnit.DAYS.toMillis(30)) {
-            long weeks = TimeUnit.MILLISECONDS.toDays(diff) / 7;
-            return "in " + weeks + " week" + (weeks > 1 ? "s" : "");
-        } else if (diff < TimeUnit.DAYS.toMillis(365)) {
-            long months = TimeUnit.MILLISECONDS.toDays(diff) / 30;
-            return "in " + months + " month" + (months > 1 ? "s" : "");
-        } else {
-            long years = TimeUnit.MILLISECONDS.toDays(diff) / 365;
-            return "in " + years + " year" + (years > 1 ? "s" : "");
-        }
+    public void setFormattedTimeOfDay(String formattedTimeOfDay) {
+        this.formattedTimeOfDay = formattedTimeOfDay;
+    }
+
+    public String getFormattedDateTime() {
+        return formattedDateTime;
+    }
+
+    public void setFormattedDateTime(String formattedDateTime) {
+        this.formattedDateTime = formattedDateTime;
+    }
+
+    public long getTriggerDate() {
+        return triggerDate;
+    }
+
+    public void setTriggerDate(long triggerDate) {
+        this.triggerDate = triggerDate;
     }
 }

apps/mobile/android/app/src/main/res/drawable/layout_bg.xml

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid  android:color="@color/background"/>
     <stroke android:width="0dp" android:color="#B1BCBE" />
-    <corners android:radius="10dp"/>
+    <corners android:radius="@dimen/widget_background_radius"/>
     <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
 </shape>

apps/mobile/android/app/src/main/res/layout/new_note_widget.xml

@@ -2,8 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/transparent"
-    android:theme="@style/ThemeOverlay.Notesnook.AppWidgetContainer">
+    android:background="@android:color/transparent">
 
     <LinearLayout
         android:layout_width="match_parent"

apps/mobile/android/app/src/main/res/layout/note_widget.xml

@@ -2,8 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/transparent"
-    android:theme="@style/ThemeOverlay.Notesnook.AppWidgetContainer">
+    android:background="@android:color/transparent">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -25,7 +24,7 @@
             android:textColor="@color/text"
             android:textSize="16sp"
             android:textStyle="bold"
-            android:text="Widget unconfigured" />
+            android:text="@string/widget_note_unconfigured_title" />
         <TextView
             android:id="@+id/widget_body"
             android:layout_width="wrap_content"
@@ -34,7 +33,7 @@
             android:layout_marginLeft="8dp"
             android:textColor="@color/text"
             android:textSize="14sp"
-            android:text="Configure this widget to show a note here." />
+            android:text="@string/widget_note_unconfigured_body" />
     </LinearLayout>
 
 </RelativeLayout>

apps/mobile/android/app/src/main/res/layout/note_widget_preview.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Shown in the widget picker only. Mirrors note_widget.xml, but with sample content, since the
+  real layout has nothing to show until the widget has been configured.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/transparent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:background="@drawable/layout_bg"
+        android:elevation="5dp"
+        android:orientation="vertical"
+        android:paddingHorizontal="10dp"
+        android:paddingVertical="10dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="8dp"
+            android:text="@string/widget_preview_note_title"
+            android:textColor="@color/text"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="8dp"
+            android:text="@string/widget_preview_note_body"
+            android:textColor="@color/text"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+</RelativeLayout>

apps/mobile/android/app/src/main/res/layout/widget_reminder_empty.xml

@@ -1,8 +0,0 @@
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="16dp"
-    android:text="No upcoming reminders"
-    android:textSize="16sp"
-    android:textColor="@android:color/darker_gray"
-    android:gravity="center" />

apps/mobile/android/app/src/main/res/layout/widget_reminders.xml

@@ -12,22 +12,23 @@
         android:orientation="horizontal"
         android:paddingHorizontal="12dp"
         android:layout_gravity="center"
-        android:paddingTop="12dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
         >
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
             android:layout_marginTop="2dp"
-            android:textSize="16sp"
+            android:textSize="15sp"
             android:textStyle="bold"
             android:textColor="@color/text"
-            android:text="Upcoming Reminders"/>
+            android:text="Reminders"/>
 
         <ImageButton
-            android:layout_width="35dp"
+            android:layout_width="25dp"
             android:id="@+id/add_button"
-            android:layout_height="35dp"
+            android:layout_height="25dp"
             android:layout_alignParentRight="true"
             android:background="@drawable/ic_newnote" />
     </RelativeLayout>
@@ -57,7 +58,8 @@
             android:layout_height="match_parent"
             android:textAlignment="center"
             android:gravity="center"
-            android:text="Tap on + to add reminder"/>
+            android:textColor="@color/text"
+            android:text="@string/widget_reminders_empty"/>
 
     </LinearLayout>
 

apps/mobile/android/app/src/main/res/layout/widget_reminders_preview.xml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Shown in the widget picker only. Mirrors widget_reminders.xml, but with the list replaced by
+  sample rows, since an adapter-backed list renders empty in the picker.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/layout_bg"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:paddingHorizontal="12dp"
+        android:paddingTop="12dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_marginTop="2dp"
+            android:text="Reminders"
+            android:textColor="@color/text"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <ImageButton
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_alignParentRight="true"
+            android:background="@drawable/ic_newnote"
+            android:contentDescription="@string/add_widget" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="2dp"
+        android:layout_marginBottom="8dp"
+        android:background="@color/border" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingHorizontal="12dp"
+        android:paddingBottom="12dp">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/widget_preview_reminder_title"
+            android:textColor="@color/text"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:text="@string/widget_preview_reminder_time"
+            android:textColor="@color/text"
+            android:textSize="12sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/widget_preview_reminder_title_alt"
+            android:textColor="@color/text"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/widget_preview_reminder_time_alt"
+            android:textColor="@color/text"
+            android:textSize="12sp" />
+    </LinearLayout>
+
+</LinearLayout>

apps/mobile/android/app/src/main/res/values-night/colors.xml

@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="light_blue_50">#FFE1F5FE</color>
-    <color name="light_blue_200">#FF81D4FA</color>
-    <color name="light_blue_600">#FF039BE5</color>
-    <color name="light_blue_900">#FF01579B</color>
     <color name="bootsplash_background">#1f1f1f</color>
     <color name="background">#1D1D1D</color>
     <color name="border">#2E2E2E</color>

apps/mobile/android/app/src/main/res/values-v31/dimens.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Android 12 onwards the launcher tells us what radius widgets should use, so ours line up
+         with every other widget on the home screen instead of being a fixed 10dp. -->
+    <dimen name="widget_background_radius">@android:dimen/system_app_widget_background_radius</dimen>
+
+</resources>

apps/mobile/android/app/src/main/res/values/attrs.xml

@@ -1,6 +0,0 @@
-<resources>
-    <declare-styleable name="AppWidgetAttrs">
-        <attr name="appWidgetBackgroundColor" format="color" />
-        <attr name="appWidgetTextColor" format="color" />
-    </declare-styleable>
-</resources>

apps/mobile/android/app/src/main/res/values/colors.xml

@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="light_blue_50">#FFE1F5FE</color>
-    <color name="light_blue_200">#FF81D4FA</color>
-    <color name="light_blue_600">#FF039BE5</color>
-    <color name="light_blue_900">#FF01579B</color>
     <color name="bootsplash_background">#FFFFFF</color>
     <color name="background">#DCEDEDED</color>
     <color name="border">#BFBFBF</color>

apps/mobile/android/app/src/main/res/values/dimens.xml

@@ -7,4 +7,8 @@ http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
     -->
     <dimen name="widget_margin">0dp</dimen>
 
+    <!-- Overridden in values-v31 with the platform's own widget radius, so our widgets match the
+         rest of the home screen. This is the fallback for older versions. -->
+    <dimen name="widget_background_radius">10dp</dimen>
+
 </resources>

apps/mobile/android/app/src/main/res/values/strings.xml

@@ -4,9 +4,28 @@
     <string name="appwidget_text">EXAMPLE</string>
     <string name="add_widget">Add widget</string>
     <string name="take_a_quick_note">Take a quick note.</string>
-    <string name="reminders">Quick overview of upcoming reminders</string>
+    <string name="reminders">Quick overview of reminders</string>
     <string name="reminders_title">Reminders</string>
     <string name="note">Note</string>
     <string name="note_description">Add a note to home screen</string>
     <string name="quick_note">Quick note</string>
+    <string name="widget_reminders_empty">Tap + to add a reminder</string>
+
+    <!-- Sample content, only ever shown in the widget picker's preview. -->
+    <string name="widget_preview_note_title">Meeting notes</string>
+    <string name="widget_preview_note_body">Discuss the roadmap and agree on timelines.</string>
+    <string name="widget_preview_reminder_title">Take a walk</string>
+    <string name="widget_preview_reminder_time">Upcoming: Today, 5:00 PM</string>
+    <string name="widget_preview_reminder_title_alt">Call the dentist</string>
+    <string name="widget_preview_reminder_time_alt">Upcoming: Tomorrow, 9:00 AM</string>
+
+    <string name="widget_note_unconfigured_title">Tap to choose a note</string>
+    <string name="widget_note_unconfigured_body">Pick the note you want shown here.</string>
+    <string name="reminder_ongoing">Ongoing</string>
+    <string name="reminder_snoozed_until">Snoozed until %1$s</string>
+    <string name="reminder_today">Today, %1$s</string>
+    <string name="reminder_tomorrow">Tomorrow, %1$s</string>
+    <string name="reminder_yesterday">Yesterday, %1$s</string>
+    <string name="reminder_upcoming">Upcoming: %1$s</string>
+    <string name="reminder_last">Last: %1$s</string>
 </resources>

apps/mobile/android/app/src/main/res/values/themes.xml

@@ -1,7 +0,0 @@
-<resources>
-
-    <style name="ThemeOverlay.Notesnook.AppWidgetContainer" parent="">
-        <item name="appWidgetBackgroundColor">@color/light_blue_600</item>
-        <item name="appWidgetTextColor">@color/light_blue_50</item>
-    </style>
-</resources>

apps/mobile/android/app/src/main/res/xml-v36/note_widget_info.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Keep this in sync with res/xml/note_widget_info.xml. It exists only to add not_keyguard: from
+  Android 16 QPR1 widgets are lock screen eligible by default, and this one renders the note's
+  title and preview text, which should not be readable on a locked device.
+-->
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:initialKeyguardLayout="@layout/note_widget"
+    android:initialLayout="@layout/note_widget"
+    android:configure="com.streetwriters.notesnook.NotePreviewConfigureActivity"
+    android:widgetFeatures="reconfigurable"
+    android:minResizeWidth="100dp"
+    android:minResizeHeight="50dp"
+    android:minWidth="400dp"
+    android:description="@string/note_description"
+    android:minHeight="50dp"
+    android:targetCellWidth="5"
+    android:targetCellHeight="1"
+    android:previewImage="@drawable/note_widget_preview"
+    android:previewLayout="@layout/note_widget_preview"
+    android:resizeMode="horizontal|vertical"
+    android:updatePeriodMillis="86400000"
+    android:widgetCategory="home_screen|not_keyguard"/>

apps/mobile/android/app/src/main/res/xml-v36/widget_reminders_info.xml

@@ -0,0 +1,15 @@
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:initialLayout="@layout/widget_reminders"
+    android:minWidth="250dp"
+    android:minHeight="110dp"
+    android:minResizeWidth="180dp"
+    android:minResizeHeight="110dp"
+    android:description="@string/reminders"
+    android:targetCellWidth="5"
+    android:targetCellHeight="2"
+    android:resizeMode="horizontal|vertical"
+    android:previewImage="@drawable/reminder_preview"
+    android:previewLayout="@layout/widget_reminders_preview"
+    android:updatePeriodMillis="1800000"
+    android:widgetCategory="home_screen|not_keyguard"
+    />

apps/mobile/android/app/src/main/res/xml/new_note_widget_info.xml

@@ -10,6 +10,7 @@
     android:targetCellWidth="5"
     android:targetCellHeight="1"
     android:previewImage="@drawable/widget_preview"
+    android:previewLayout="@layout/new_note_widget"
     android:resizeMode="horizontal|vertical"
     android:updatePeriodMillis="86400000"
     android:widgetCategory="home_screen"/>

apps/mobile/android/app/src/main/res/xml/note_widget_info.xml

@@ -12,6 +12,7 @@
     android:targetCellWidth="5"
     android:targetCellHeight="1"
     android:previewImage="@drawable/note_widget_preview"
+    android:previewLayout="@layout/note_widget_preview"
     android:resizeMode="horizontal|vertical"
     android:updatePeriodMillis="86400000"
     android:widgetCategory="home_screen"/>

apps/mobile/android/app/src/main/res/xml/widget_reminders_info.xml

@@ -1,14 +1,15 @@
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
     android:initialLayout="@layout/widget_reminders"
-    android:minWidth="400dp"
-    android:minHeight="100dp"
-    android:minResizeWidth="400dp"
-    android:minResizeHeight="50dp"
+    android:minWidth="250dp"
+    android:minHeight="110dp"
+    android:minResizeWidth="180dp"
+    android:minResizeHeight="110dp"
     android:description="@string/reminders"
     android:targetCellWidth="5"
     android:targetCellHeight="2"
     android:resizeMode="horizontal|vertical"
     android:previewImage="@drawable/reminder_preview"
-    android:updatePeriodMillis="1024"
+    android:previewLayout="@layout/widget_reminders_preview"
+    android:updatePeriodMillis="1800000"
     android:widgetCategory="home_screen"
     />

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

@@ -1,3 +1,6 @@
+- Added sync status icon in sidebar
+- Added new reminder shortcut in app icon context menu
+- Improved editor saving reliability
 - Minor bug fixes and improvements
 
 Thank you for using Notesnook!

apps/mobile/app/app.tsx

@@ -23,7 +23,7 @@ import {
   THEME_COMPATIBILITY_VERSION,
   useThemeEngineStore
 } from "@notesnook/theme";
-import React, { PropsWithChildren, useEffect } from "react";
+import React, { PropsWithChildren, useEffect, useState } from "react";
 import { Appearance, I18nManager, Linking, StatusBar } from "react-native";
 import "react-native-gesture-handler";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
@@ -35,7 +35,7 @@ import { Toast } from "./components/toast";
 import { useAppEvents } from "./hooks/use-app-events";
 import { NotePreviewConfigure } from "./screens/note-preview-configure";
 import { RootNavigation } from "./navigation/navigation-stack";
-import { themeTrpcClient } from "./screens/settings/theme-selector";
+import { themeTrpcClient } from "./screens/settings/components/theme-selector";
 import Notifications from "./services/notifications";
 import SettingsService from "./services/settings";
 import { TipManager } from "./services/tip-manager";
@@ -44,26 +44,38 @@ import { useUserStore } from "./stores/use-user-store";
 import RNBootSplash from "react-native-bootsplash";
 import AppLocked from "./components/app-lock";
 import { useSettingStore } from "./stores/use-setting-store";
+import {
+  initShortcutListener,
+  launchNewNoteTab,
+  registerAppShortcuts
+} from "./hooks/use-shortcut-manager";
+import Shortcuts from "react-native-actions-shortcuts";
+import { THEME_DARK, THEME_LIGHT } from "./common/design/theme";
 I18nManager.allowRTL(false);
 I18nManager.forceRTL(false);
 I18nManager.swapLeftAndRightInRTL(false);
+
 const { appLockEnabled, appLockMode } = SettingsService.get();
 if (appLockEnabled || appLockMode !== "none") {
   useUserStore.getState().lockApp(true);
 }
-RNBootSplash.hide({
-  fade: true
-});
-Linking.getInitialURL().then((url) => {
-  useSettingStore.setState({
-    initialUrl: url
-  });
-});
+
 const App = (props: { configureMode: "note-preview" }) => {
   useAppEvents();
   //@ts-ignore
   globalThis["IS_MAIN_APP_RUNNING"] = true;
+  const introCompleted = useSettingStore(
+    (state) => state.settings.introCompleted
+  );
+
   useEffect(() => {
+    if (introCompleted) {
+      registerAppShortcuts();
+    }
+  }, [introCompleted]);
+
+  useEffect(() => {
+    RNBootSplash.hide({ fade: true });
     SettingsService.onFirstLaunch();
     changeSystemBarColors();
     SettingsService.setPrivacyScreen(
@@ -120,30 +132,30 @@ export const withTheme = (
     ]);
 
     useEffect(() => {
-      setTimeout(() => {
-        const currentTheme = colorScheme === "dark" ? darkTheme : lightTheme;
-        if (!currentTheme) return;
-        themeTrpcClient.updateTheme
-          .query({
-            version: currentTheme.version,
-            compatibilityVersion: THEME_COMPATIBILITY_VERSION,
-            id: currentTheme.id
-          })
-          .then((theme) => {
-            if (theme) {
-              theme.colorScheme === "dark"
-                ? useThemeStore.setState({
-                    darkTheme: theme
-                  })
-                : useThemeStore.setState({
-                    lightTheme: theme
-                  });
-            }
-          })
-          .catch(() => {
-            /* empty */
-          });
-      }, 1000);
+      // setTimeout(() => {
+      //   const currentTheme = colorScheme === "dark" ? darkTheme : lightTheme;
+      //   if (!currentTheme) return;
+      //   themeTrpcClient.updateTheme
+      //     .query({
+      //       version: currentTheme.version,
+      //       compatibilityVersion: THEME_COMPATIBILITY_VERSION,
+      //       id: currentTheme.id
+      //     })
+      //     .then((theme) => {
+      //       if (theme) {
+      //         theme.colorScheme === "dark"
+      //           ? useThemeStore.setState({
+      //               darkTheme: theme
+      //             })
+      //           : useThemeStore.setState({
+      //               lightTheme: theme
+      //             });
+      //       }
+      //     })
+      //     .catch(() => {
+      //       /* empty */
+      //     });
+      // }, 1000);
 
       const listener = Appearance.addChangeListener(({ colorScheme }) => {
         if (colorScheme && SettingsService.getProperty("useSystemTheme")) {
@@ -159,11 +171,11 @@ export const withTheme = (
     }, []);
 
     useEffect(() => {
-      const nextTheme = colorScheme === "dark" ? darkTheme : lightTheme;
+      const nextTheme = colorScheme === "dark" ? THEME_DARK : THEME_LIGHT;
       if (JSON.stringify(nextTheme) !== JSON.stringify(currTheme)) {
         useThemeEngineStore
           .getState()
-          .setTheme(colorScheme === "dark" ? darkTheme : lightTheme);
+          .setTheme(colorScheme === "dark" ? THEME_DARK : THEME_LIGHT);
         currTheme = nextTheme;
       }
     }, [colorScheme, darkTheme, lightTheme]);
@@ -176,4 +188,41 @@ export const withTheme = (
   };
 };
 
-export default withTheme(withErrorBoundry(App, "App"));
+export const withStartupBoundry = (
+  Element: (props: PropsWithChildren) => JSX.Element
+) => {
+  return function AppWithStartupBoundary(props: PropsWithChildren) {
+    const [ready, setReady] = useState(false);
+
+    useEffect(() => {
+      async function init() {
+        try {
+          const [url, shortcut] = await Promise.all([
+            Linking.getInitialURL(),
+            Shortcuts.getInitialShortcut()
+          ]);
+          console.log(url, shortcut);
+          if (shortcut?.type === "notesnook.action.newnote") {
+            launchNewNoteTab();
+          }
+          useSettingStore.setState({
+            initialUrl: url,
+            pendingShortcut: shortcut ?? null
+          });
+
+          initShortcutListener();
+        } finally {
+          setReady(true);
+        }
+      }
+
+      init();
+    }, []);
+
+    if (!ready) return null;
+
+    return <Element {...props} />;
+  };
+};
+
+export default withStartupBoundry(withTheme(withErrorBoundry(App, "App")));

apps/mobile/app/common/design/font.ts

@@ -0,0 +1,56 @@
+/*
+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/>.
+*/
+export const FontSizes = {
+  XXS: 10,
+  XS: 12,
+  SM: 14,
+  MD: 16,
+  LG: 18,
+  XL: 20,
+  XXL: 32
+};
+
+export const FontFamily = {
+  REGULAR: "Inter-Regular", // 400
+  MEDIUM: "Inter-Medium", // 500
+  SEMI_BOLD: "Inter-SemiBold", // 600
+  BOLD: "Inter-Bold" // 700
+};
+
+const LineHeightMultipliers = {
+  "100%": 1,
+  "110%": 1.1,
+  "120%": 1.2,
+  "130%": 1.3,
+  "140%": 1.4,
+  "150%": 1.5
+};
+export type LineHeightVariants =
+  | "100%"
+  | "110%"
+  | "120%"
+  | "130%"
+  | "140%"
+  | "150%";
+export const getLineHeight = (
+  fontSize: keyof typeof FontSizes,
+  type: LineHeightVariants
+) => {
+  return FontSizes[fontSize] * LineHeightMultipliers[type];
+};

apps/mobile/app/common/design/spacing.ts

@@ -0,0 +1,39 @@
+/*
+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/>.
+*/
+export const Spacing = {
+  LEVEL_0: 4,
+  LEVEL_1: 8,
+  LEVEL_2: 12,
+  LEVEL_3: 16,
+  LEVEL_4: 20,
+  LEVEL_5: 24,
+  LEVEL_6: 28,
+  LEVEL_7: 32,
+  LEVEL_8: 40
+};
+
+export const Radius = {
+  XXS: 4,
+  XS: 8,
+  S: 12,
+  MD: 16,
+  LG: 20,
+  LG_2: 32,
+  XXL: 40
+};

apps/mobile/app/common/design/theme.ts

@@ -0,0 +1,283 @@
+/*
+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 { ThemeDefinition } from "@notesnook/theme";
+
+export const THEME_LIGHT: any = {
+  $schema:
+    "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
+  name: "Notesnook Light",
+  id: "default-light",
+  version: 2.1,
+  license: "GPL-3.0-or-later",
+  homepage: "https://notesnook.com",
+  description: "The default light theme for Notesnook app.",
+  colorScheme: "light",
+  codeBlockCSS: ``,
+  compatibilityVersion: 1,
+  authors: [
+    {
+      name: "Streetwriters",
+      email: "support@streetwriters.co",
+      url: "https://streetwriters.co"
+    }
+  ],
+  scopes: {
+    base: {
+      primary: {
+        accent: "#008836",
+        accentForeground: "#ffffff",
+        paragraph: "#666666",
+        background: "#ffffff",
+        border: "#E2E2E2",
+        heading: "#181818",
+        icon: "#181818",
+        separator: "#F0F0F0",
+        placeholder: "#858585",
+        hover: "#eee",
+        backdrop: "#0000001a",
+        buttonForeground: "#181818"
+      },
+      secondary: {
+        accent: "#0D9E46",
+        accentForeground: "#ffffff",
+        paragraph: "#858585",
+        background: "#F7F7F7",
+        border: "#EFEFEF",
+        heading: "#4B4B4B",
+        icon: "#666666",
+        separator: "#E8E8E8",
+        placeholder: "#999999",
+        hover: "#dbdbdb",
+        backdrop: "#0000001a",
+        buttonForeground: "#181818"
+      },
+      tertiary: {
+        accent: "#008836",
+        accentForeground: "#ffffff",
+        paragraph: "#777",
+        background: "#ECECEC",
+        border: "#E8E8E8",
+        heading: "#666",
+        icon: "#777",
+        separator: "#E8E8E8",
+        placeholder: "#a9a9a9",
+        hover: "#dbdbdb",
+        backdrop: "#0000001a"
+      },
+      disabled: {
+        accent: "#008836",
+        accentForeground: "#ffffff",
+        paragraph: "#A6A6A6",
+        background: "#ffffff",
+        border: "#E8E8E8",
+        heading: "#212121",
+        icon: "#DADADA",
+        separator: "#E8E8E8",
+        placeholder: "#a9a9a9",
+        hover: "#00000010",
+        backdrop: "#0000001a"
+      },
+      selected: {
+        accent: "#008836",
+        accentForeground: "#ffffff",
+        paragraph: "#181818",
+        background: "#00883610",
+        border: "#008836",
+        heading: "#212121",
+        icon: "#181818",
+        separator: "#E8E8E8",
+        placeholder: "#a9a9a9",
+        hover: "#eee",
+        backdrop: "#0000001a"
+      },
+      error: {
+        accent: "#f54b42",
+        accentForeground: "#ffffff",
+        paragraph: "#FF242E",
+        background: "#FFEDEE",
+        border: "#F7999D",
+        heading: "#f54b42",
+        icon: "#FB2C36",
+        separator: "#E8E8E8",
+        placeholder: "#a9a9a9",
+        hover: "#00000010",
+        backdrop: "#0000001a"
+      },
+      success: {
+        accent: "#4F8A10",
+        accentForeground: "#ffffff",
+        paragraph: "#4F8A10",
+        background: "#85ce68",
+        border: "#E8E8E8",
+        heading: "#4F8A10",
+        icon: "#4F8A10",
+        separator: "#E8E8E8",
+        placeholder: "#a9a9a9",
+        hover: "#00000010",
+        backdrop: "#0000001a"
+      }
+    },
+    statusBar: {
+      primary: { paragraph: "#5E5E5E", background: "#f7f7f7" }
+    },
+    navigationMenu: {
+      primary: {
+        background: "#f7f7f7",
+        paragraph: "#666",
+        icon: "#666",
+        hover: "#eee"
+      },
+      secondary: { background: "#EEEEEE" },
+      selected: {
+        background: "#00883610",
+        hover: "#eee"
+      }
+    },
+    contextMenu: { primary: { background: "#f7f7f7" } },
+    editor: { selected: { background: "#e1e1e1" } },
+    sheet: { selected: { paragraph: "#008836" } },
+    list: {
+      secondary: {
+        heading: "#A6A6A6"
+      }
+    }
+  }
+};
+
+export const THEME_DARK: any = {
+  name: "Notesnook Dark",
+  id: "default-dark",
+  version: 2.1,
+  license: "GPL-3.0-or-later",
+  homepage: "https://notesnook.com",
+  description: "The default dark theme for the Notesnook app",
+  colorScheme: "dark",
+  codeBlockCSS: ``,
+  compatibilityVersion: 1,
+  authors: [
+    {
+      name: "Streetwriters",
+      email: "support@streetwriters.co",
+      url: "https://streetwriters.co"
+    }
+  ],
+  scopes: {
+    base: {
+      primary: {
+        accent: "#008836",
+        accentForeground: "#ffffff",
+        paragraph: "#F2F2F2",
+        background: "#181818",
+        border: "#2A2A2A",
+        heading: "#FFFFFF",
+        icon: "#FFFFFF",
+        separator: "#383838",
+        placeholder: "#404040",
+        hover: "#2b2b2b",
+        backdrop: "#35353580",
+        buttonForeground: "#FFFFFF"
+      },
+      secondary: {
+        accent: "#0D9E46",
+        accentForeground: "#ffffff",
+        paragraph: "#A1A1A1",
+        background: "#252525",
+        border: "#0A5729",
+        heading: "#C0BFBF",
+        icon: "#808080",
+        separator: "#383838",
+        placeholder: "#404040",
+        hover: "#ffffff10",
+        backdrop: "#35353580",
+        buttonForeground: "#BFBFBF"
+      },
+      tertiary: {
+        accent: "#0D9E46",
+        accentForeground: "#ffffff",
+        paragraph: "#818589",
+        background: "#2C2C2C",
+        border: "#2b2b2b",
+        heading: "#808080",
+        icon: "#808080",
+        separator: "#383838",
+        placeholder: "#404040",
+        hover: "#ffffff10",
+        backdrop: "#35353580"
+      },
+      disabled: {
+        accent: "#008836",
+        accentForeground: "#ffffff",
+        paragraph: "#505050",
+        background: "#ffffff",
+        border: "#383838",
+        heading: "#212121",
+        icon: "#FFFFFF",
+        separator: "#383838",
+        placeholder: "#404040",
+        hover: "#ffffff10",
+        backdrop: "#35353580"
+      },
+      selected: {
+        accent: "#008836",
+        accentForeground: "#ffffff",
+        paragraph: "#FBFBFB",
+        background: "#494949",
+        border: "#008836",
+        heading: "#e3e3e3",
+        icon: "#008836",
+        separator: "#383838",
+        placeholder: "#404040",
+        hover: "#ffffff10",
+        backdrop: "#35353580"
+      },
+      error: {
+        accent: "#f54b42",
+        accentForeground: "#ffffff",
+        paragraph: "#f54b42",
+        background: "#250b0a",
+        border: "#F7999D",
+        heading: "#f54b42",
+        icon: "#f54b42",
+        separator: "#383838",
+        placeholder: "#404040",
+        hover: "#ffffff10",
+        backdrop: "#35353580"
+      },
+      success: {
+        accent: "#4F8A10",
+        accentForeground: "#ffffff",
+        paragraph: "#4F8A10",
+        background: "#132204",
+        border: "#383838",
+        heading: "#4F8A10",
+        icon: "#4F8A10",
+        separator: "#383838",
+        placeholder: "#404040",
+        hover: "#ffffff10",
+        backdrop: "#35353580"
+      }
+    },
+    list: { selected: { background: "#202020" } },
+    contextMenu: { primary: { background: "#202020" } },
+    sheet: { selected: { paragraph: "#008836" } }
+  },
+  $schema:
+    "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
+};

apps/mobile/app/components/announcements/announcement.tsx

@@ -71,7 +71,7 @@ export const Announcement = () => {
               alignItems: "center",
               paddingHorizontal: DefaultAppStyles.GAP,
               borderBottomWidth: 1,
-              borderBottomColor: colors.primary.border,
+              borderBottomColor: colors.primary.separator,
               paddingBottom: DefaultAppStyles.GAP_VERTICAL_SMALL
             }}
           >

apps/mobile/app/components/app-lock/index.tsx

@@ -55,6 +55,7 @@ import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view
 import { strings } from "@notesnook/intl";
 import { editorController } from "../../screens/editor/tiptap/utils";
 import { useTabStore } from "../../screens/editor/tiptap/use-tab-store";
+import { PASSWORD_PLACEHOLDER } from "../../utils/constants";
 
 const getUser = () => {
   const user = MMKV.getString("user");
@@ -96,9 +97,6 @@ const AppLocked = () => {
   const lastAppState = useRef<AppStateStatus>(appState);
   const biometricUnlockAwaitingUserInput = useRef(false);
   const { height } = useWindowDimensions();
-  const keyboardType = useSettingStore(
-    (state) => state.settings.applockKeyboardType
-  );
   const appLockHasPasswordSecurity = useSettingStore(
     (state) => state.settings.appLockHasPasswordSecurity
   );
@@ -157,8 +155,7 @@ const AppLocked = () => {
         if (!appLockHasPasswordSecurity) {
           await setAppLockVerificationCipher(password.current);
           SettingsService.set({
-            appLockHasPasswordSecurity: true,
-            applockKeyboardType: "default"
+            appLockHasPasswordSecurity: true
           });
           DatabaseLogger.info("App lock migrated to password security");
         }
@@ -167,7 +164,7 @@ const AppLocked = () => {
         password.current = undefined;
       } else {
         ToastManager.show({
-          heading: strings.invalid(keyboardType),
+          heading: strings.invalid("password"),
           type: "error",
           context: "local"
         });
@@ -290,9 +287,7 @@ const AppLocked = () => {
               <Input
                 fwdRef={passwordInputRef}
                 secureTextEntry
-                keyboardType={
-                  appLockHasPasswordSecurity ? keyboardType : "default"
-                }
+                keyboardType={"default"}
                 onLayout={async () => {
                   if (
                     !biometricsAuthEnabled ||
@@ -303,13 +298,7 @@ const AppLocked = () => {
                     }, 32);
                   }
                 }}
-                placeholder={
-                  appLockHasPasswordSecurity
-                    ? keyboardType === "numeric"
-                      ? strings.enterApplockPassword()
-                      : strings.enterApplockPin()
-                    : strings.enterAccountPassword()
-                }
+                placeholder={PASSWORD_PLACEHOLDER}
                 onChangeText={(v) => (password.current = v)}
                 onSubmit={() => {
                   onSubmit();

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

@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { formatBytes } from "@notesnook/common";
 import { Attachment, Note, VirtualizedGrouping } from "@notesnook/core";
+import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import Clipboard from "@react-native-clipboard/clipboard";
 import React, { RefObject, useEffect, useState } from "react";
@@ -26,6 +27,7 @@ import { TextInput, View } from "react-native";
 import { ActionSheetRef } from "react-native-actions-sheet";
 import { ScrollView } from "react-native-gesture-handler";
 import { db } from "../../common/database";
+import { Radius, Spacing } from "../../common/design/spacing";
 import filesystem from "../../common/filesystem";
 import downloadAttachment from "../../common/filesystem/download-attachment";
 import { useAttachmentProgress } from "../../hooks/use-attachment-progress";
@@ -37,6 +39,7 @@ import {
   eSendEvent,
   presentSheet
 } from "../../services/event-manager";
+import Navigation from "../../services/navigation";
 import PremiumService from "../../services/premium";
 import { useAttachmentStore } from "../../stores/use-attachment-store";
 import {
@@ -46,20 +49,19 @@ import {
   eOnLoadNote
 } from "../../utils/events";
 import { AppFontSize } from "../../utils/size";
+import { DefaultAppStyles } from "../../utils/styles";
 import { Dialog } from "../dialog";
 import { presentDialog } from "../dialog/functions";
 import { openNote } from "../list-items/note/wrapper";
 import { DateMeta } from "../properties/date-meta";
 import SheetProvider from "../sheet-provider";
-import { Button } from "../ui/button";
+import AppIcon from "../ui/AppIcon";
+import { createFormRef, validators } from "../ui/input/form-input";
 import { Notice } from "../ui/notice";
 import { Pressable } from "../ui/pressable";
+import LineSeparator from "../ui/seperator/line-separator";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
-import { strings } from "@notesnook/intl";
-import { DefaultAppStyles } from "../../utils/styles";
-import Navigation from "../../services/navigation";
-import { createFormRef, validators } from "../ui/input/form-input";
 
 const Actions = ({
   attachment,
@@ -94,7 +96,7 @@ const Actions = ({
         downloadAttachment(attachment.hash, context === "global");
         fwdRef.current?.hide();
       },
-      icon: "download"
+      icon: "download-simple"
     },
     {
       name: strings.network.reupload(),
@@ -114,7 +116,7 @@ const Actions = ({
           type: attachment.mimeType.startsWith("image") ? "image" : "file"
         });
       },
-      icon: "upload"
+      icon: "upload-simple"
     },
     {
       name: strings.fileCheck(),
@@ -149,7 +151,7 @@ const Actions = ({
           name: undefined
         });
       },
-      icon: "file-check"
+      icon: "file"
     },
     {
       name: strings.rename(),
@@ -197,7 +199,7 @@ const Actions = ({
           });
         }, 500);
       },
-      icon: "form-textbox"
+      icon: "pencil-simple"
     },
     {
       name: strings.delete(),
@@ -249,7 +251,7 @@ const Actions = ({
           });
         }, 500);
       },
-      icon: "delete-outline"
+      icon: "trash"
     }
   ];
 
@@ -267,6 +269,7 @@ const Actions = ({
       onMomentumScrollEnd={() => {
         fwdRef?.current?.handleChildScrollEnd();
       }}
+      bounces={false}
       nestedScrollEnabled={true}
       style={{
         maxHeight: "100%"
@@ -277,42 +280,34 @@ const Actions = ({
       <SheetProvider context={contextId} />
       <View
         style={{
-          borderBottomWidth: 1,
-          borderBottomColor: colors.primary.border,
-          marginBottom:
-            notes && notes.length > 0 ? 0 : DefaultAppStyles.GAP_VERTICAL
+          paddingHorizontal: Spacing.LEVEL_3,
+          paddingTop: Spacing.LEVEL_4,
+          gap: Spacing.LEVEL_1
         }}
       >
-        <Heading
-          style={{
-            paddingHorizontal: DefaultAppStyles.GAP
-          }}
-          size={AppFontSize.lg}
-        >
-          {filename}
-        </Heading>
+        <Heading fontSize="LG">{filename}</Heading>
 
         <View
           style={{
             flexDirection: "row",
-            marginBottom: DefaultAppStyles.GAP_VERTICAL,
-            paddingHorizontal: DefaultAppStyles.GAP,
-            marginTop: DefaultAppStyles.GAP_VERTICAL_SMALL,
-            gap: 10
+            gap: Spacing.LEVEL_1,
+            alignItems: "center"
           }}
         >
-          <Paragraph size={AppFontSize.xs} color={colors.secondary.paragraph}>
+          <Paragraph fontSize="XS" color={colors.secondary.paragraph}>
             {attachment.mimeType}
           </Paragraph>
+          <Paragraph fontSize="XS">•</Paragraph>
           <Paragraph size={AppFontSize.xs} color={colors.secondary.paragraph}>
             {formatBytes(attachment.size)}
           </Paragraph>
-
+          <Paragraph fontSize="XS">•</Paragraph>
           {notes.length ? (
-            <Paragraph size={AppFontSize.xs} color={colors.secondary.paragraph}>
+            <Paragraph fontSize="XS" color={colors.secondary.paragraph}>
               {strings.notes(notes.length)}
             </Paragraph>
           ) : null}
+          <Paragraph fontSize="XS">•</Paragraph>
           <Paragraph
             onPress={() => {
               Clipboard.setString(attachment.hash);
@@ -322,82 +317,123 @@ const Actions = ({
                 context: "local"
               });
             }}
-            size={AppFontSize.xs}
+            fontSize="XS"
             color={colors.secondary.paragraph}
           >
+            <AppIcon
+              name="copy"
+              size={10}
+              color={colors.secondary.paragraph}
+              iconFamily="notesnook"
+            />{" "}
             {attachment.hash}
           </Paragraph>
         </View>
 
+        <LineSeparator paddingVertical={Spacing.LEVEL_2} />
+
         <DateMeta item={attachment} />
       </View>
 
       {notes && notes.length > 0 ? (
-        <View
-          style={{
-            borderBottomWidth: 1,
-            borderBottomColor: colors.primary.border,
-            marginBottom: DefaultAppStyles.GAP_VERTICAL,
-            paddingVertical: DefaultAppStyles.GAP_VERTICAL
-          }}
-        >
-          <>
-            <Heading
-              style={{
-                paddingHorizontal: DefaultAppStyles.GAP
-              }}
-              size={AppFontSize.sm}
-            >
-              {strings.listOf()} {strings.dataTypesPlural.note()}:
-            </Heading>
+        <>
+          <LineSeparator
+            paddingHorizontal={Spacing.LEVEL_3}
+            paddingVertical={Spacing.LEVEL_3}
+          />
+          <View
+            style={{
+              paddingHorizontal: Spacing.LEVEL_3,
+              gap: Spacing.LEVEL_2
+            }}
+          >
+            <>
+              <Heading size={AppFontSize.sm}>
+                {strings.notes(notes.length)}
+              </Heading>
 
-            {notes.map((item) => (
-              <Pressable
-                onPress={async () => {
-                  eSendEvent(eCloseSheet, contextId);
-                  close?.();
-                  eSendEvent(eCloseAttachmentDialog);
-                  Navigation.navigate("FluidPanelsView");
-                  openNote(item, (item as any).type === "trash");
-                }}
-                style={{
-                  paddingVertical: DefaultAppStyles.GAP_VERTICAL,
-                  alignItems: "flex-start",
-
-                  paddingHorizontal: DefaultAppStyles.GAP
-                }}
-                key={item.id}
-              >
-                <Paragraph size={AppFontSize.xs}>{item.title}</Paragraph>
-              </Pressable>
-            ))}
-          </>
-        </View>
+              {notes.map((item) => (
+                <Pressable
+                  onPress={async () => {
+                    eSendEvent(eCloseSheet, contextId);
+                    close?.();
+                    eSendEvent(eCloseAttachmentDialog);
+                    Navigation.navigate("FluidPanelsView");
+                    openNote(item, (item as any).type === "trash");
+                  }}
+                  style={{
+                    alignItems: "flex-start"
+                  }}
+                  key={item.id}
+                >
+                  <Paragraph fontSize="XS">{item.title}</Paragraph>
+                </Pressable>
+              ))}
+            </>
+          </View>
+        </>
       ) : null}
 
-      {actions.map((item) => (
-        <Button
-          key={item.name}
-          buttonType={{
-            text:
-              item.name === "Delete"
-                ? colors.error.paragraph
-                : colors.primary.paragraph
-          }}
-          onPress={item.onPress}
-          title={item.name}
-          icon={item.icon}
-          loading={loading?.name === item.name}
-          type="plain"
-          fontSize={AppFontSize.sm}
-          style={{
-            borderRadius: 0,
-            justifyContent: "flex-start",
-            alignSelf: "flex-start",
-            width: "100%"
-          }}
-        />
-      ))}
+      <LineSeparator
+        paddingHorizontal={Spacing.LEVEL_3}
+        paddingVertical={Spacing.LEVEL_3}
+      />
+
+      <View
+        style={{
+          gap: Spacing.LEVEL_2
+        }}
+      >
+        {actions.map((item) => (
+          <Pressable
+            key={item.name}
+            onPress={item.onPress}
+            type="plain"
+            style={{
+              borderRadius: 0,
+              flexDirection: "row",
+              width: "100%",
+              gap: Spacing.LEVEL_1,
+              justifyContent: "flex-start",
+              paddingHorizontal: Spacing.LEVEL_3
+            }}
+          >
+            <View
+              style={{
+                width: 32,
+                height: 32,
+                backgroundColor: colors.secondary.background,
+                borderRadius: Radius.XS,
+                justifyContent: "center",
+                alignItems: "center"
+              }}
+            >
+              <AppIcon
+                color={
+                  item.icon === "trash"
+                    ? colors.error.accent
+                    : colors.primary.icon
+                }
+                name={item.icon}
+                iconFamily="notesnook"
+                size={16}
+              />
+            </View>
+
+            <Paragraph
+              color={
+                item.icon === "trash"
+                  ? colors.error.accent
+                  : colors.primary.heading
+              }
+              fontSize="SM"
+              fontFamily="MEDIUM"
+            >
+              {item.name}
+            </Paragraph>
+          </Pressable>
+        ))}
+      </View>
 
       <View
         style={{

apps/mobile/app/components/attachments/attachment-item.tsx

@@ -17,26 +17,29 @@ 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 { formatBytes } from "@notesnook/common";
+import { formatBytes, getFormattedDate } from "@notesnook/common";
 import { Attachment, VirtualizedGrouping } from "@notesnook/core";
+import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import React from "react";
-import { TouchableOpacity, View } from "react-native";
-import { db } from "../../common/database";
+import { View } from "react-native";
+import { Radius, Spacing } from "../../common/design/spacing";
 import { useAttachmentProgress } from "../../hooks/use-attachment-progress";
 import { useDBItem } from "../../hooks/use-db-item";
-import { defaultBorderRadius, AppFontSize } from "../../utils/size";
-import { IconButton } from "../ui/icon-button";
-import { ProgressCircleComponent } from "../ui/svg/lazy";
+import AppIcon from "../ui/AppIcon";
+import { Pressable } from "../ui/pressable";
+import { ProgressBarComponent } from "../ui/svg/lazy";
+import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
 import Actions from "./actions";
-import { strings } from "@notesnook/intl";
-import { Pressable } from "../ui/pressable";
-import { DefaultAppStyles } from "../../utils/styles";
+import { IconButton } from "../ui/icon-button";
 
-function getFileExtension(filename: string) {
-  const ext = /^.+\.([^.]+)$/.exec(filename);
-  return ext == null ? "" : ext[1];
+function getAttachmentIcon(attachment: Attachment) {
+  const mimeType = attachment.mimeType || "";
+  if (mimeType.startsWith("image/")) return "image";
+  if (mimeType.startsWith("video/")) return "video-camera";
+  if (mimeType.startsWith("audio/")) return "music-notes";
+  return "file-text";
 }
 
 export const AttachmentItem = ({
@@ -75,11 +78,15 @@ export const AttachmentItem = ({
       onPress={onPress}
       style={{
         flexDirection: "row",
-        marginVertical: 5,
+        alignItems: "center",
         justifyContent: "space-between",
-        padding: DefaultAppStyles.GAP,
-        paddingVertical: DefaultAppStyles.GAP_VERTICAL,
-        minHeight: 45
+        gap: Spacing.LEVEL_2,
+        borderWidth: 1,
+        borderColor: colors.primary.border,
+        borderRadius: Radius.S,
+        paddingHorizontal: Spacing.LEVEL_2,
+        paddingVertical: Spacing.LEVEL_3,
+        marginBottom: Spacing.LEVEL_2
       }}
     >
       {!attachment ? null : (
@@ -89,107 +96,112 @@ export const AttachmentItem = ({
               flexShrink: 1,
               flexDirection: "row",
               alignItems: "center",
-              gap: 10
+              gap: Spacing.LEVEL_2
             }}
           >
             <View
               style={{
+                width: 40,
+                height: 40,
+                borderRadius: Radius.XS,
+                backgroundColor: colors.secondary.background,
                 justifyContent: "center",
-                alignItems: "center",
-                marginLeft: -5,
-                borderWidth: 1,
-                borderColor: colors.secondary.border,
-                paddingHorizontal: 2,
-                width: 30,
-                height: 30,
-                borderRadius: defaultBorderRadius
+                alignItems: "center"
               }}
             >
-              <Paragraph
-                adjustsFontSizeToFit
-                size={8}
-                color={colors.secondary.paragraph}
-                style={{
-                  maxWidth: 30
-                }}
-                numberOfLines={1}
-              >
-                {getFileExtension(attachment.filename).toUpperCase() ||
-                  attachment.mimeType.split("/")?.[1]?.toUpperCase()}
-              </Paragraph>
+              <AppIcon
+                name={getAttachmentIcon(attachment)}
+                iconFamily="notesnook"
+                size={20}
+                color={colors.primary.icon}
+              />
             </View>
 
             <View
               style={{
-                flexShrink: 1
+                flexShrink: 1,
+                width: "100%",
+                gap: Spacing.LEVEL_1
               }}
             >
-              <Paragraph
-                size={AppFontSize.sm}
-                style={{
-                  flexWrap: "wrap"
-                }}
-                numberOfLines={1}
+              <Heading
+                fontSize="MD"
                 lineBreakMode="middle"
-                color={colors.primary.paragraph}
+                color={colors.primary.heading}
               >
-                {attachment.filename}
-              </Paragraph>
+                book.pdf
+              </Heading>
 
-              {!hideWhenNotDownloading ? (
-                <Paragraph
-                  color={colors.secondary.paragraph}
-                  size={AppFontSize.xxs}
+              <View
+                style={{
+                  flexDirection: "row",
+                  gap: Spacing.LEVEL_1
+                }}
+              >
+                {attachment.failed ? (
+                  <AppIcon
+                    size={13}
+                    name="alert-circle-outline"
+                    color={colors.error.paragraph}
+                  />
+                ) : null}
+                {!hideWhenNotDownloading ? (
+                  <Paragraph
+                    fontSize="XS"
+                    numberOfLines={1}
+                    color={colors.secondary.paragraph}
+                  >
+                    {getFormattedDate(attachment.dateModified)} |{" "}
+                    {formatBytes(attachment.size)}
+                  </Paragraph>
+                ) : null}
+              </View>
+
+              {currentProgress ? (
+                <View
+                  style={{
+                    width: "100%",
+                    gap: Spacing.LEVEL_0,
+                    flexGrow: 1
+                  }}
                 >
-                  {strings.fileSize()}: {formatBytes(attachment.size)}
-                </Paragraph>
+                  <ProgressBarComponent
+                    height={6}
+                    width={null}
+                    animated={true}
+                    useNativeDriver
+                    progress={currentProgress.value}
+                    unfilledColor={colors.secondary.background}
+                    color={colors.primary.accent}
+                    borderWidth={0}
+                  />
+                  <Paragraph color={colors.secondary.paragraph} fontSize="XS">
+                    {currentProgress.percent} |{" "}
+                    {currentProgress.type === "upload"
+                      ? strings.uploading()
+                      : strings.downloading()}
+                  </Paragraph>
+                </View>
               ) : null}
             </View>
           </View>
-
-          {currentProgress ? (
-            <TouchableOpacity
-              activeOpacity={0.9}
-              onPress={() => {
-                if (encryption || !pressable) return;
-                db.fs().cancel(attachment.hash);
-                setCurrentProgress(undefined);
-              }}
-              style={{
-                justifyContent: "center",
-                marginLeft: 5,
-                marginTop: 5,
-                marginRight: -5
-              }}
-            >
-              <ProgressCircleComponent
-                size={AppFontSize.xxl}
-                progress={
-                  currentProgress?.value ? currentProgress?.value / 100 : 0
-                }
-                showsText
-                textStyle={{
-                  fontSize: 10
-                }}
-                color={colors.primary.accent}
-                formatText={(progress) => (progress * 100).toFixed(0)}
-                borderWidth={0}
-                thickness={2}
-              />
-            </TouchableOpacity>
-          ) : (
-            <>
-              {attachment.failed ? (
-                <IconButton
-                  onPress={onPress}
-                  name="alert-circle-outline"
-                  color={colors.error.paragraph}
-                />
-              ) : null}
-            </>
-          )}
         </>
       )}
+
+      <IconButton
+        color={colors.secondary.icon}
+        name="dots-three"
+        iconFamily="notesnook"
+        size={20}
+        onPress={onPress}
+        style={{
+          justifyContent: "center",
+          height: undefined,
+          width: undefined,
+          borderRadius: 100,
+          alignItems: "center"
+        }}
+      />
     </Pressable>
   );
 };

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

@@ -21,21 +21,23 @@ import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import React, { useRef, useState } from "react";
 import { View } from "react-native";
+import { TextInput } from "react-native-gesture-handler";
+import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
 import { db } from "../../common/database";
+import { Spacing } from "../../common/design/spacing";
 import BackupService from "../../services/backup";
-import { eSendEvent, ToastManager } from "../../services/event-manager";
+import { ToastManager } from "../../services/event-manager";
 import Navigation from "../../services/navigation";
 import { useUserStore } from "../../stores/use-user-store";
-import { eOpenRecoveryKeyDialog } from "../../utils/events";
 import { AppFontSize } from "../../utils/size";
 import { DefaultAppStyles } from "../../utils/styles";
 import { Dialog } from "../dialog";
+import RecoveryKeySheet from "../sheets/recovery-key";
 import AppIcon from "../ui/AppIcon";
 import { Button } from "../ui/button";
 import FormInput, { createFormRef, validators } from "../ui/input/form-input";
 import { Notice } from "../ui/notice";
 import Paragraph from "../ui/typography/paragraph";
-import { TextInput } from "react-native-gesture-handler";
 
 export const ChangePassword = () => {
   const { colors } = useThemeColors();
@@ -92,7 +94,7 @@ export const ChangePassword = () => {
       });
       setLoading(false);
       Navigation.goBack();
-      eSendEvent(eOpenRecoveryKeyDialog);
+      RecoveryKeySheet.present();
     } catch (e) {
       const message = (e as Error).message;
       setLoading(false);
@@ -106,15 +108,22 @@ export const ChangePassword = () => {
   };
 
   return (
-    <View
+    <KeyboardAwareScrollView
       style={{
-        width: "100%",
-        padding: DefaultAppStyles.GAP
+        width: "100%"
       }}
+      contentContainerStyle={{
+        paddingTop: Spacing.LEVEL_4,
+        paddingHorizontal: Spacing.LEVEL_3,
+        gap: Spacing.LEVEL_2
+      }}
+      keyboardShouldPersistTaps="handled"
+      keyboardDismissMode="interactive"
     >
       <Dialog context="change-password-dialog" />
       <FormInput
         name="oldPassword"
+        label={strings.oldPassword()}
         formRef={formRef}
         fwdRef={oldPasswordInputRef}
         loading={loading}
@@ -125,7 +134,7 @@ export const ChangePassword = () => {
         autoComplete="password"
         autoCapitalize="none"
         autoCorrect={false}
-        placeholder={strings.currentPassword()}
+        placeholder={"•••••••••"}
         onSubmitEditing={() => {
           passwordInputRef.current?.focus();
         }}
@@ -133,6 +142,7 @@ export const ChangePassword = () => {
 
       <FormInput
         name="password"
+        label={strings.newPassword()}
         formRef={formRef}
         fwdRef={passwordInputRef}
         loading={loading}
@@ -143,7 +153,28 @@ export const ChangePassword = () => {
         autoComplete="password"
         autoCapitalize="none"
         autoCorrect={false}
-        placeholder={strings.newPassword()}
+        placeholder={"•••••••••"}
+        onSubmitEditing={() => {
+          changePassword();
+        }}
+      />
+
+      <FormInput
+        name="confirmPassword"
+        label={strings.confirmPassword()}
+        formRef={formRef}
+        fwdRef={passwordInputRef}
+        loading={loading}
+        validators={[
+          validators.matchField("password", strings.confirmPasswordRequired())
+        ]}
+        returnKeyLabel={strings.next()}
+        returnKeyType="next"
+        secureTextEntry
+        autoComplete="password"
+        autoCapitalize="none"
+        autoCorrect={false}
+        placeholder={"•••••••••"}
         onSubmitEditing={() => {
           changePassword();
         }}
@@ -168,22 +199,39 @@ export const ChangePassword = () => {
         </Paragraph>
       ) : null}
 
-      <Notice text={strings.changePasswordNotice()} type="alert" />
-
-      <View style={{ height: 10 }} />
-
-      <Notice text={strings.changePasswordNotice2()} type="alert" />
+      <Notice
+        text={strings.changePasswordNotice()}
+        type="information"
+        size="small"
+      />
 
       <Button
         style={{
-          marginTop: DefaultAppStyles.GAP_VERTICAL,
-          width: "100%"
+          width: "100%",
+          marginTop: Spacing.LEVEL_1
         }}
         loading={loading}
         onPress={changePassword}
         type="accent"
         title={loading ? null : strings.changePasswordConfirm()}
       />
-    </View>
+
+      <View
+        style={{
+          flexDirection: "row",
+          gap: Spacing.LEVEL_1,
+          alignSelf: "center",
+          marginTop: Spacing.LEVEL_0
+        }}
+      >
+        <AppIcon
+          size={15}
+          name="shield-check"
+          iconFamily="notesnook"
+          color={colors.secondary.icon}
+        />
+        <Paragraph>{strings.yourSecurityIsPriority()}</Paragraph>
+      </View>
+    </KeyboardAwareScrollView>
   );
 };

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

@@ -24,6 +24,9 @@ import { Button } from "../ui/button";
 import { IconButton } from "../ui/icon-button";
 import { hideAuth } from "./common";
 import { AuthParams } from "../../stores/use-navigation-store";
+import { ProgressPills } from "../intro/progress-pills";
+import { FontSizes } from "../../common/design/font";
+import { Spacing } from "../../common/design/spacing";
 export const AuthHeader = (props: { welcome?: boolean }) => {
   const { colors } = useThemeColors();
   const route = useRoute();
@@ -37,19 +40,22 @@ export const AuthHeader = (props: { welcome?: boolean }) => {
       <View
         style={{
           flexDirection: "row",
-          alignItems: "center",
-          paddingHorizontal: 12,
+          paddingHorizontal: Spacing.LEVEL_3,
           width: "100%",
-          height: 50,
-          justifyContent: !props.welcome ? "space-between" : "flex-end"
+          justifyContent: "space-between",
+          alignItems: "center"
         }}
       >
-        {props.welcome ? null : (
+        {props.welcome ? (
+          <ProgressPills activePillIndex={1} />
+        ) : (
           <IconButton
-            name="arrow-left"
+            name="arrow-back"
+            iconFamily="notesnook"
             onPress={() => {
               hideAuth((route.params as AuthParams)?.context);
             }}
+            size={24}
             color={colors.primary.paragraph}
           />
         )}
@@ -60,16 +66,16 @@ export const AuthHeader = (props: { welcome?: boolean }) => {
             onPress={() => {
               hideAuth();
             }}
-            iconSize={16}
+            iconSize={24}
+            fontSize={FontSizes.SM}
             type="plain"
+            fontFamily="REGULAR"
             iconPosition="right"
             icon="chevron-right"
-            height={25}
-            iconStyle={{
-              marginTop: 2
-            }}
             style={{
-              paddingHorizontal: 6
+              paddingRight: 0,
+              paddingHorizontal: 0,
+              paddingVertical: 0
             }}
           />
         )}

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

@@ -17,15 +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 { useThemeColors } from "@notesnook/theme";
 import React, { useState } from "react";
 import { SafeAreaView } from "react-native-safe-area-context";
 import { useNavigationFocus } from "../../hooks/use-navigation-focus";
+import { NavigationProps } from "../../services/navigation";
 import { Toast } from "../toast";
 import { AuthMode, initialAuthMode } from "./common";
 import { Login } from "./login";
 import { Signup } from "./signup";
-import { useThemeColors } from "@notesnook/theme";
-import { NavigationProps } from "../../services/navigation";
 
 const Auth = ({ navigation, route }: NavigationProps<"Auth">) => {
   const [currentAuthMode, setCurrentAuthMode] = useState(

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

@@ -21,8 +21,10 @@ import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import { RouteProp, useRoute } from "@react-navigation/native";
 import React, { useEffect, useState } from "react";
-import { TouchableOpacity, View, useWindowDimensions } from "react-native";
+import { TouchableOpacity, View } from "react-native";
 import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
+import { db } from "../../common/database";
+import { Spacing } from "../../common/design/spacing";
 import { DDS } from "../../services/device-detection";
 import { eSendEvent, presentSheet } from "../../services/event-manager";
 import Navigation from "../../services/navigation";
@@ -33,19 +35,20 @@ import { RouteParams } from "../../stores/use-navigation-store";
 import { useUserStore } from "../../stores/use-user-store";
 import { eUserLoggedIn } from "../../utils/events";
 import { AppFontSize } from "../../utils/size";
-import { DefaultAppStyles } from "../../utils/styles";
 import { sleep } from "../../utils/time";
-import { Dialog } from "../dialog";
+import { ProgressPills } from "../intro/progress-pills";
 import { Progress } from "../sheets/progress";
-import AppIcon from "../ui/AppIcon";
 import { Button } from "../ui/button";
-import FormInput, { validators } from "../ui/input/form-input";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
 import { hideAuth } from "./common";
 import { ForgotPassword } from "./forgot-password";
 import { AuthHeader } from "./header";
+import TwoFactorVerification from "./two-factor";
 import { useLogin } from "./use-login";
+import FormInput, { validators } from "../ui/input/form-input";
+import AppIcon from "../ui/AppIcon";
+import { PASSWORD_PLACEHOLDER } from "../../utils/constants";
 
 const LoginSteps = {
   emailAuth: 1,
@@ -68,8 +71,9 @@ export const Login = ({
     passwordInputRef,
     loading,
     setLoading,
-    login,
     error,
+    login,
+    mfaData,
     formRef
   } = useLogin(async () => {
     eSendEvent(eUserLoggedIn, true);
@@ -91,8 +95,6 @@ export const Login = ({
       Progress.present();
     }
   });
-  const { width, height } = useWindowDimensions();
-  const isTablet = width > 600;
 
   const onContinue = () => {
     login();
@@ -114,249 +116,257 @@ export const Login = ({
   return (
     <>
       <AuthHeader />
-      <Dialog context="two_factor_verify" />
+
+      <View
+        style={{
+          paddingHorizontal: Spacing.LEVEL_3,
+          marginTop: Spacing.LEVEL_4
+        }}
+      >
+        <ProgressPills
+          count={2}
+          activePillIndex={step === LoginSteps.emailAuth ? 0 : 1}
+        />
+      </View>
+
       <KeyboardAwareScrollView
         style={{
           width: "100%"
         }}
         contentContainerStyle={{
-          minHeight: "90%"
+          minHeight: "99%"
         }}
         nestedScrollEnabled
         enableAutomaticScroll={true}
         keyboardShouldPersistTaps="handled"
       >
-        <View
-          style={{
-            borderRadius: DDS.isTab ? 5 : 0,
-            backgroundColor: colors.primary.background,
-            zIndex: 10,
-            width: "100%",
-            height: "100%",
-            alignSelf: "center"
-          }}
-        >
+        {step === LoginSteps.emailAuth || step === LoginSteps.passwordAuth ? (
           <View
             style={{
-              justifyContent: "flex-end",
-              paddingHorizontal: DefaultAppStyles.GAP,
-              borderBottomWidth: 0.8,
-              marginBottom: DefaultAppStyles.GAP_VERTICAL,
-              borderBottomColor: colors.primary.border,
-              alignSelf: isTablet ? "center" : undefined,
-              borderWidth: isTablet ? 1 : undefined,
-              borderColor: isTablet ? colors.primary.border : undefined,
-              borderRadius: isTablet ? 20 : undefined,
-              marginTop: isTablet ? 50 : undefined,
-              width: !isTablet ? undefined : "50%",
-              minHeight: height * 0.4
+              borderRadius: DDS.isTab ? 5 : 0,
+              backgroundColor: colors.primary.background,
+              zIndex: 10,
+              width: "100%",
+              alignSelf: "center",
+              height: "100%",
+              paddingHorizontal: Spacing.LEVEL_3,
+              paddingTop: Spacing.LEVEL_6
             }}
           >
-            <View
-              style={{
-                flexDirection: "row"
-              }}
-            >
-              <View
-                style={{
-                  width: 100,
-                  height: 5,
-                  backgroundColor: colors.primary.accent,
-                  borderRadius: 2,
-                  marginRight: 7
-                }}
-              />
-
-              <View
-                style={{
-                  width: 20,
-                  height: 5,
-                  backgroundColor: colors.secondary.background,
-                  borderRadius: 2
-                }}
-              />
-            </View>
             <Heading
               style={{
-                marginBottom: 25,
-                marginTop: DefaultAppStyles.GAP_VERTICAL
+                paddingBottom: Spacing.LEVEL_4
               }}
-              extraBold
-              size={AppFontSize.xxl}
+              fontSize="XL"
             >
               {strings.loginToYourAccount()}
             </Heading>
-          </View>
-
-          <View
-            style={{
-              width: DDS.isTab
-                ? focused
-                  ? "50%"
-                  : "49.99%"
-                : focused
-                  ? "100%"
-                  : "99.9%",
-              backgroundColor: colors.primary.background,
-              alignSelf: "center",
-              paddingHorizontal: DDS.isTab ? 0 : DefaultAppStyles.GAP,
-              gap: DefaultAppStyles.GAP_VERTICAL
-            }}
-          >
-            <FormInput
-              name="email"
-              formRef={formRef}
-              fwdRef={emailInputRef}
-              testID="input.email"
-              returnKeyLabel="Next"
-              returnKeyType="next"
-              autoComplete="email"
-              keyboardType="email-address"
-              marginBottom={0}
-              autoCorrect={false}
-              autoCapitalize="none"
-              placeholder={strings.email()}
-              editable={step === LoginSteps.emailAuth && !loading}
-              validators={[
-                validators.required(strings.emailRequired()),
-                validators.email(strings.enterAValidEmailAddress())
-              ]}
-              onSubmitEditing={() => {
-                if (step === LoginSteps.emailAuth) {
-                  onContinue();
-                } else {
-                  passwordInputRef.current?.focus();
-                }
+            <View
+              style={{
+                width: DDS.isTab
+                  ? focused
+                    ? "50%"
+                    : "49.99%"
+                  : focused
+                    ? "100%"
+                    : "99.9%",
+                backgroundColor: colors.primary.background,
+                alignSelf: "center",
+                gap: Spacing.LEVEL_2
               }}
-            />
-
-            {step === LoginSteps.passwordAuth && (
-              <>
-                <FormInput
-                  name="password"
-                  formRef={formRef}
-                  fwdRef={passwordInputRef}
-                  testID="input.password"
-                  returnKeyLabel={strings.done()}
-                  returnKeyType="done"
-                  secureTextEntry
-                  autoComplete="password"
-                  autoCapitalize="none"
-                  autoCorrect={false}
-                  placeholder={strings.password()}
-                  marginBottom={0}
-                  editable={!loading}
-                  validators={[validators.required(strings.passwordRequired())]}
-                  onSubmitEditing={() => {
-                    onContinue();
-                  }}
-                />
-                <Button
-                  title={strings.forgotPassword()}
-                  style={{
-                    alignSelf: "flex-end",
-                    paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL,
-                    paddingHorizontal: 0
-                  }}
-                  onPress={() => {
-                    if (loading) return;
-                    presentSheet({
-                      component: (
-                        <ForgotPassword
-                          userEmail={formRef.current.getValue("email")}
-                        />
-                      )
-                    });
-                  }}
-                  textStyle={{
-                    textDecorationLine: "underline"
-                  }}
-                  fontSize={AppFontSize.xs}
-                  type="plain"
-                />
-              </>
-            )}
-
-            <View>
-              <Button
-                loading={loading}
-                onPress={() => {
-                  onContinue();
+            >
+              <FormInput
+                name="email"
+                formRef={formRef}
+                fwdRef={emailInputRef}
+                testID="input.email"
+                label={strings.email()}
+                returnKeyLabel="Next"
+                returnKeyType="next"
+                autoComplete="email"
+                keyboardType="email-address"
+                marginBottom={0}
+                autoCorrect={false}
+                autoCapitalize="none"
+                placeholder={strings.email()}
+                editable={step === LoginSteps.emailAuth && !loading}
+                validators={[
+                  validators.required(strings.emailRequired()),
+                  validators.email(strings.enterAValidEmailAddress())
+                ]}
+                onSubmitEditing={() => {
+                  passwordInputRef.current?.focus();
                 }}
-                style={{
-                  width: "100%"
-                }}
-                type="accent"
-                title={!loading ? strings.continue() : null}
-                fontSize={AppFontSize.sm}
               />
 
-              {step === LoginSteps.passwordAuth && (
+              <FormInput
+                name="password"
+                formRef={formRef}
+                fwdRef={passwordInputRef}
+                label={strings.password()}
+                testID="input.password"
+                returnKeyLabel={strings.done()}
+                returnKeyType="done"
+                secureTextEntry
+                autoComplete="password"
+                autoCapitalize="none"
+                autoCorrect={false}
+                placeholder={PASSWORD_PLACEHOLDER}
+                marginBottom={0}
+                editable={!loading}
+                validators={[validators.required(strings.passwordRequired())]}
+                onSubmitEditing={() => {
+                  onContinue();
+                }}
+              />
+
+              <Button
+                title={strings.forgotPassword()}
+                style={{
+                  alignSelf: "flex-end",
+                  paddingVertical: 0,
+                  paddingHorizontal: 0
+                }}
+                onPress={() => {
+                  if (loading || !formRef.current.getValue("email")) return;
+                  presentSheet({
+                    component: (
+                      <ForgotPassword
+                        userEmail={formRef.current.getValue("email")}
+                      />
+                    )
+                  });
+                }}
+                fontFamily="REGULAR"
+                fontSize={AppFontSize.sm}
+                type="plain"
+                textStyle={{
+                  color: colors.secondary.paragraph
+                }}
+              />
+
+              <View
+                style={{
+                  marginTop: Spacing.LEVEL_1,
+                  gap: Spacing.LEVEL_2
+                }}
+              >
                 <Button
-                  title={strings.cancelLogin()}
+                  loading={loading}
+                  onPress={() => {
+                    if (loading) return;
+                    login();
+                  }}
                   style={{
-                    alignSelf: "center",
-                    marginTop: DefaultAppStyles.GAP_VERTICAL,
                     width: "100%"
                   }}
-                  onPress={() => {
-                    if (loading) return;
-                    setStep(LoginSteps.emailAuth);
-                    setLoading(false);
-                  }}
-                  type="secondaryAccented"
+                  type="accent"
+                  title={!loading ? strings.continue() : null}
+                  fontSize={AppFontSize.sm}
                 />
-              )}
 
-              {!loading ? (
-                <TouchableOpacity
-                  onPress={() => {
-                    if (loading) return;
-                    changeMode(1);
-                  }}
-                  activeOpacity={0.8}
-                  style={{
-                    alignSelf: "center",
-                    marginTop: DefaultAppStyles.GAP_VERTICAL,
-                    paddingVertical: DefaultAppStyles.GAP_VERTICAL
-                  }}
-                >
-                  <Paragraph
-                    size={AppFontSize.xs}
-                    color={colors.secondary.paragraph}
+                {!loading ? (
+                  <TouchableOpacity
+                    onPress={() => {
+                      if (loading) return;
+                      changeMode(1);
+                    }}
+                    activeOpacity={0.8}
+                    style={{
+                      alignSelf: "center",
+                      paddingVertical: 0
+                    }}
                   >
-                    {strings.dontHaveAccount()}{" "}
-                    <Paragraph
-                      size={AppFontSize.xs}
-                      style={{ color: colors.primary.accent }}
-                    >
-                      {strings.signUp()}
+                    <Paragraph fontSize="SM" color={colors.secondary.paragraph}>
+                      {strings.dontHaveAccount()}{" "}
+                      <Paragraph
+                        fontSize="SM"
+                        style={{ color: colors.primary.accent }}
+                        fontFamily="SEMI_BOLD"
+                      >
+                        {strings.signUp()}
+                      </Paragraph>
                     </Paragraph>
-                  </Paragraph>
-                </TouchableOpacity>
-              ) : null}
+                  </TouchableOpacity>
+                ) : null}
 
-              {error ? (
-                <Paragraph
-                  numberOfLines={4}
-                  onPress={() => {}}
-                  color={colors.error.accent}
-                  style={{
-                    textAlign: "center",
-                    marginTop: DefaultAppStyles.GAP_VERTICAL
-                  }}
-                >
-                  <AppIcon
+                {error ? (
+                  <Paragraph
+                    numberOfLines={4}
+                    onPress={() => {}}
                     color={colors.error.accent}
-                    name="alert-circle-outline"
-                    size={AppFontSize.sm - 1}
-                  />{" "}
-                  {error.message}
-                </Paragraph>
-              ) : null}
+                    style={{
+                      textAlign: "center",
+                      marginTop: Spacing.LEVEL_2
+                    }}
+                  >
+                    <AppIcon
+                      color={colors.error.accent}
+                      name="alert-circle-outline"
+                      size={AppFontSize.sm - 1}
+                    />{" "}
+                    {error.message}
+                  </Paragraph>
+                ) : null}
+              </View>
             </View>
           </View>
-        </View>
+        ) : (
+          <View
+            style={{
+              borderRadius: DDS.isTab ? 5 : 0,
+              backgroundColor: colors.primary.background,
+              zIndex: 10,
+              width: "100%",
+              alignSelf: "center",
+              height: "100%",
+              paddingHorizontal: Spacing.LEVEL_3,
+              paddingTop: Spacing.LEVEL_6
+            }}
+          >
+            <TwoFactorVerification
+              onMfaLogin={async (
+                mfa: any,
+                callback: (success: boolean) => void,
+                onerror: (error: Error) => void
+              ) => {
+                try {
+                  const success = await db.user.authenticateMultiFactorCode(
+                    mfa.code,
+                    mfa.method
+                  );
+
+                  await login();
+
+                  if (success) {
+                    setLoading(false);
+                    callback && callback(true);
+                  }
+                  callback && callback(false);
+                } catch (e) {
+                  callback && callback(false);
+                  if ((e as Error).message === "invalid_grant") {
+                    setLoading(false);
+                    setStep(LoginSteps.emailAuth);
+                  } else {
+                    onerror(e as Error);
+                  }
+                }
+              }}
+              mfaInfo={
+                mfaData.current || {
+                  primaryMethod: "email",
+                  secondaryMethod: "sms",
+                  token: ""
+                }
+              }
+              onCancel={() => {
+                setLoading(false);
+                setStep(LoginSteps.emailAuth);
+              }}
+            />
+          </View>
+        )}
       </KeyboardAwareScrollView>
     </>
   );

apps/mobile/app/components/auth/session-expired.tsx

@@ -34,21 +34,21 @@ import Sync from "../../services/sync";
 import { clearAllStores } from "../../stores";
 import { useUserStore } from "../../stores/use-user-store";
 import { eLoginSessionExpired, eUserLoggedIn } from "../../utils/events";
-import { AppFontSize } from "../../utils/size";
 import { sleep } from "../../utils/time";
 import { Dialog } from "../dialog";
 import BaseDialog from "../dialog/base-dialog";
 import { presentDialog } from "../dialog/functions";
 import SheetProvider from "../sheet-provider";
 import { Toast } from "../toast";
+import AppIcon from "../ui/AppIcon";
 import { Button } from "../ui/button";
-import { IconButton } from "../ui/icon-button";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
-import { LoginSteps, useLogin } from "./use-login";
+import { useLogin } from "./use-login";
 import { strings } from "@notesnook/intl";
 import { getObfuscatedEmail } from "../../utils/functions";
 import { DefaultAppStyles } from "../../utils/styles";
+import { Spacing } from "../../common/design/spacing";
 import FormInput, { validators } from "../ui/input/form-input";
 
 export const SessionExpired = () => {
@@ -158,92 +158,119 @@ export const SessionExpired = () => {
             width: focused ? "100%" : "99.9%",
             padding: DefaultAppStyles.GAP,
             justifyContent: "center",
+            gap: Spacing.LEVEL_7,
             flex: 1,
             backgroundColor: colors.primary.background
           }}
         >
-          <View
-            style={{
-              justifyContent: "center",
-              alignItems: "center",
-              width: "100%",
-              marginBottom: 20,
-              borderRadius: 10,
-              paddingVertical: 20
-            }}
-          >
-            <IconButton
+          <View style={{ gap: Spacing.LEVEL_7, alignItems: "center" }}>
+            <View
               style={{
-                width: 60,
-                height: 60
-              }}
-              name="alert"
-              color={colors.error.icon}
-              size={50}
-            />
-            <Heading size={AppFontSize.xxxl} color={colors.primary.heading}>
-              {strings.sessionExpired()}
-            </Heading>
-            <Paragraph
-              style={{
-                textAlign: "center"
+                width: 100,
+                height: 100,
+                borderRadius: 50,
+                alignItems: "center",
+                justifyContent: "center",
+                backgroundColor: colors.error.background
               }}
             >
-              {strings.sessionExpiredDesc(
-                getObfuscatedEmail(formRef.current.getValue("email") as string)
-              )}
-            </Paragraph>
+              <View
+                style={{
+                  width: 56,
+                  height: 56,
+                  borderRadius: 28,
+                  alignItems: "center",
+                  justifyContent: "center",
+                  backgroundColor: colors.error.accent
+                }}
+              >
+                <AppIcon
+                  name="warning"
+                  iconFamily="notesnook"
+                  size={30}
+                  color={colors.static.white}
+                />
+              </View>
+            </View>
+
+            <View style={{ width: "100%", gap: Spacing.LEVEL_3 }}>
+              <View
+                style={{
+                  alignItems: "center",
+                  gap: DefaultAppStyles.GAP_VERTICAL_SMALL
+                }}
+              >
+                <Heading
+                  fontSize="XL"
+                  lineHeight="100%"
+                  color={colors.primary.heading}
+                >
+                  {strings.sessionExpired()}
+                </Heading>
+                <Paragraph
+                  fontSize="SM"
+                  color={colors.primary.paragraph}
+                  style={{
+                    textAlign: "center"
+                  }}
+                >
+                  {strings.sessionExpiredDesc(
+                    getObfuscatedEmail(
+                      formRef.current.getValue("email") as string
+                    )
+                  )}
+                </Paragraph>
+              </View>
+
+              <FormInput
+                fwdRef={passwordInputRef}
+                formRef={formRef}
+                name="password"
+                label={strings.enterYourPassword()}
+                validators={[validators.required(strings.passwordRequired())]}
+                returnKeyLabel={strings.done()}
+                returnKeyType="next"
+                secureTextEntry
+                autoComplete="password"
+                autoCapitalize="none"
+                autoCorrect={false}
+                placeholder={strings.password()}
+                onSubmitEditing={() => {
+                  login();
+                }}
+              />
+            </View>
           </View>
 
-          {step === LoginSteps.passwordAuth ? (
-            <FormInput
-              fwdRef={passwordInputRef}
-              formRef={formRef}
-              name="password"
-              validators={[validators.required(strings.passwordRequired())]}
-              returnKeyLabel={strings.done()}
-              returnKeyType="next"
-              secureTextEntry
-              autoComplete="password"
-              autoCapitalize="none"
-              autoCorrect={false}
-              placeholder={strings.password()}
-              onSubmitEditing={() => {
-                login();
+          <View style={{ gap: Spacing.LEVEL_2 }}>
+            <Button
+              style={{
+                width: "100%"
               }}
+              loading={loading}
+              onPress={() => login()}
+              type="accent"
+              title={loading ? null : strings.login()}
             />
-          ) : null}
 
-          <Button
-            style={{
-              marginTop: DefaultAppStyles.GAP_VERTICAL,
-              width: 250,
-              borderRadius: 100
-            }}
-            loading={loading}
-            onPress={() => login()}
-            type="accent"
-            title={loading ? null : strings.login()}
-          />
-
-          <Button
-            style={{
-              marginTop: DefaultAppStyles.GAP_VERTICAL,
-              width: "100%"
-            }}
-            onPress={() => {
-              presentDialog({
-                context: "session_expiry",
-                title: strings.logoutFromDevice(),
-                paragraph: strings.logoutDesc(),
-                positiveText: strings.logout(),
-                positiveType: "errorShade",
-                positivePress: logout
-              });
-            }}
-            type="errorShade"
-            title={loading ? null : strings.logoutFromDevice()}
-          />
+            <Button
+              style={{
+                width: "100%"
+              }}
+              onPress={() => {
+                presentDialog({
+                  context: "session_expiry",
+                  title: strings.logoutFromDevice(),
+                  paragraph: strings.logoutDesc(),
+                  positiveText: strings.logout(),
+                  positiveType: "error-shade-outline",
+                  positivePress: logout
+                });
+              }}
+              type="plain-outline"
+              title={strings.logoutFromDevice()}
+            />
+          </View>
         </View>
         <Toast context="local" />
         <Dialog context="session_expiry" />

apps/mobile/app/components/auth/signup.tsx

@@ -21,12 +21,7 @@ import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import { RouteProp, useRoute } from "@react-navigation/native";
 import React, { useRef, useState } from "react";
-import {
-  TextInput,
-  TouchableOpacity,
-  View,
-  useWindowDimensions
-} from "react-native";
+import { TextInput, TouchableOpacity, View } from "react-native";
 import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
 import { db } from "../../common/database";
 import { DDS } from "../../services/device-detection";
@@ -46,6 +41,29 @@ import { SignupContext } from "./signup-context";
 import { RouteParams } from "../../stores/use-navigation-store";
 import SettingsService from "../../services/settings";
 import AppIcon from "../ui/AppIcon";
+import { Spacing } from "../../common/design/spacing";
+import { SETTING_ACCOUNT_SVG } from "../../assets/images/assets";
+import { ProgressPills } from "../intro/progress-pills";
+import { sleep } from "../../utils/time";
+import { PASSWORD_PLACEHOLDER } from "../../utils/constants";
+
+const getSettingAccountSvg = (dark: boolean) => {
+  if (dark) return SETTING_ACCOUNT_SVG;
+
+  return SETTING_ACCOUNT_SVG.replace('stroke="#1F2722"', 'stroke="#E8F4ED"')
+    .replace(
+      'fill="#008836" fill-opacity="0.09" stroke="#233C2D"',
+      'fill="#008836" fill-opacity="0.04" stroke="#E3F1E8"'
+    )
+    .replace(
+      'fill="#008836" fill-opacity="0.09" stroke="#233C2D"',
+      'fill="#008836" fill-opacity="0.05" stroke="#E8F0EC"'
+    )
+    .replace(
+      'fill="#008836" fill-opacity="0.08" stroke="#233C2D"',
+      'fill="#008836" fill-opacity="0.06" stroke="#D3E8DB"'
+    );
+};
 
 const SignupSteps = {
   signup: 0,
@@ -61,7 +79,7 @@ export const Signup = ({
   welcome: boolean;
 }) => {
   const [currentStep, setCurrentStep] = useState(SignupSteps.signup);
-  const { colors } = useThemeColors();
+  const { colors, isDark } = useThemeColors();
   const formRef = useRef(
     createFormRef({
       email: "",
@@ -76,8 +94,6 @@ export const Signup = ({
   const [loading, setLoading] = useState(false);
   const setUser = useUserStore((state) => state.setUser);
   const setLastSynced = useUserStore((state) => state.setLastSynced);
-  const { width, height } = useWindowDimensions();
-  const isTablet = width > 600;
   const route = useRoute<RouteProp<RouteParams, "Auth">>();
 
   const signup = async () => {
@@ -89,8 +105,9 @@ export const Signup = ({
 
     setLoading(true);
     try {
-      setCurrentStep(SignupSteps.createAccount);
       await db.user.signup(values.email.toLowerCase(), values.password);
+      await sleep(1000);
+      setCurrentStep(SignupSteps.createAccount);
       const user = await db.user.getUser();
       setUser(user);
       setLastSynced(await db.lastSynced());
@@ -133,8 +150,9 @@ export const Signup = ({
               width: "100%"
             }}
             contentContainerStyle={{
-              minHeight: "90%"
+              flex: 1
             }}
+            bounces={false}
             nestedScrollEnabled
             keyboardShouldPersistTaps="handled"
           >
@@ -145,68 +163,24 @@ export const Signup = ({
                 zIndex: 10,
                 width: "100%",
                 alignSelf: "center",
-                height: "100%"
+                height: "100%",
+                paddingHorizontal: Spacing.LEVEL_3,
+                paddingTop: Spacing.LEVEL_6
               }}
             >
-              <View
+              <Heading
                 style={{
-                  justifyContent: "flex-end",
-                  paddingHorizontal: 16,
-                  marginBottom: DefaultAppStyles.GAP_VERTICAL,
-                  borderBottomWidth: 0.8,
-                  borderBottomColor: colors.primary.border,
-                  alignSelf: isTablet ? "center" : undefined,
-                  borderWidth: isTablet ? 1 : undefined,
-                  borderColor: isTablet ? colors.primary.border : undefined,
-                  borderRadius: isTablet ? 20 : undefined,
-                  marginTop: isTablet ? 50 : undefined,
-                  width: !isTablet ? undefined : "50%",
-                  minHeight: height * 0.25
+                  paddingBottom: Spacing.LEVEL_4
                 }}
+                fontSize="XL"
               >
-                <View
-                  style={{
-                    flexDirection: "row"
-                  }}
-                >
-                  <View
-                    style={{
-                      width: 100,
-                      height: 5,
-                      backgroundColor: colors.primary.accent,
-                      borderRadius: 2,
-                      marginRight: 7
-                    }}
-                  />
-
-                  <View
-                    style={{
-                      width: 20,
-                      height: 5,
-                      backgroundColor: colors.secondary.background,
-                      borderRadius: 2
-                    }}
-                  />
-                </View>
-                <Heading
-                  extraBold
-                  style={{
-                    marginBottom: 25,
-                    marginTop: 10
-                  }}
-                  size={AppFontSize.xxl}
-                >
-                  {strings.createAccount()}
-                </Heading>
-              </View>
+                {strings.createAccount()}
+              </Heading>
 
               <View
                 style={{
-                  width: DDS.isTab ? "50%" : "100%",
-                  paddingHorizontal: DDS.isTab ? 0 : 16,
-                  backgroundColor: colors.primary.background,
-                  flexGrow: 1,
-                  alignSelf: "center"
+                  gap: Spacing.LEVEL_2,
+                  paddingBottom: Spacing.LEVEL_4
                 }}
               >
                 <FormInput
@@ -214,6 +188,7 @@ export const Signup = ({
                   formRef={formRef}
                   fwdRef={emailInputRef}
                   loading={loading}
+                  label={strings.email()}
                   testID="input.email"
                   returnKeyLabel="Next"
                   returnKeyType="next"
@@ -221,7 +196,7 @@ export const Signup = ({
                   keyboardType="email-address"
                   autoCorrect={false}
                   autoCapitalize="none"
-                  placeholder={strings.email()}
+                  placeholder="you@example.com"
                   blurOnSubmit={false}
                   validators={[
                     validators.required(strings.emailRequired()),
@@ -245,9 +220,11 @@ export const Signup = ({
                   autoCapitalize="none"
                   blurOnSubmit={false}
                   autoCorrect={false}
-                  placeholder={strings.password()}
+                  label={strings.password()}
+                  placeholder={PASSWORD_PLACEHOLDER}
                   validators={[validators.required(strings.passwordRequired())]}
                   onSubmitEditing={() => {
+                    if (formRef.current.validateField("password")) return;
                     confirmPasswordInputRef.current?.focus();
                   }}
                 />
@@ -265,8 +242,8 @@ export const Signup = ({
                   autoCapitalize="none"
                   autoCorrect={false}
                   blurOnSubmit={false}
-                  placeholder={strings.confirmPassword()}
-                  marginBottom={12}
+                  label={strings.confirmPassword()}
+                  placeholder={PASSWORD_PLACEHOLDER}
                   validators={[
                     validators.required(strings.confirmPasswordRequired()),
                     validators.matchField(
@@ -278,7 +255,17 @@ export const Signup = ({
                     signup();
                   }}
                 />
+              </View>
 
+              <View
+                style={{
+                  width: DDS.isTab ? "50%" : "100%",
+                  backgroundColor: colors.primary.background,
+                  flexGrow: 1,
+                  alignSelf: "center",
+                  gap: Spacing.LEVEL_2
+                }}
+              >
                 <Button
                   title={!loading ? strings.continue() : null}
                   type="accent"
@@ -296,18 +283,21 @@ export const Signup = ({
                   }}
                   activeOpacity={0.8}
                   style={{
-                    alignSelf: "center",
-                    marginTop: 12,
-                    paddingVertical: 12
+                    alignSelf: "center"
                   }}
                 >
                   <Paragraph
-                    size={AppFontSize.xs + 1}
-                    color={colors.secondary.paragraph}
+                    style={{
+                      marginBottom: 25,
+                      textAlign: "center"
+                    }}
+                    fontSize="SM"
+                    color={colors.primary.paragraph}
                   >
                     {strings.alreadyHaveAccount()}{" "}
                     <Paragraph
-                      size={AppFontSize.xs + 1}
+                      fontSize="SM"
+                      fontFamily="SEMI_BOLD"
                       style={{ color: colors.primary.accent }}
                     >
                       {strings.login()}
@@ -347,18 +337,16 @@ export const Signup = ({
                     marginBottom: 25,
                     textAlign: "center"
                   }}
-                  size={AppFontSize.xxs}
+                  fontSize="XS"
                   color={colors.secondary.paragraph}
                 >
                   {strings.signupAgreement[0]()}
                   <Paragraph
-                    size={AppFontSize.xxs}
+                    fontSize="XS"
                     onPress={() => {
                       openLinkInBrowser("https://notesnook.com/tos");
                     }}
-                    style={{
-                      textDecorationLine: "underline"
-                    }}
+                    fontFamily="SEMI_BOLD"
                     color={colors.primary.accent}
                   >
                     {" "}
@@ -366,31 +354,38 @@ export const Signup = ({
                   </Paragraph>{" "}
                   {strings.signupAgreement[2]()}
                   <Paragraph
-                    size={AppFontSize.xxs}
+                    fontSize="XS"
                     onPress={() => {
                       openLinkInBrowser("https://notesnook.com/privacy");
                     }}
-                    style={{
-                      textDecorationLine: "underline"
-                    }}
+                    fontFamily="SEMI_BOLD"
                     color={colors.primary.accent}
                   >
                     {" "}
                     {strings.signupAgreement[3]()}
-                  </Paragraph>{" "}
-                  {strings.signupAgreement[4]()}
+                  </Paragraph>
                 </Paragraph>
               </View>
             </View>
           </KeyboardAwareScrollView>
         </>
       ) : (
-        <>
+        <View
+          style={{
+            paddingHorizontal: Spacing.LEVEL_3
+          }}
+        >
+          {welcome ? <ProgressPills activePillIndex={2} /> : null}
           <Loading
-            title={"Setting up your account..."}
-            description="Your account is almost ready, please wait..."
+            title={strings.settingUpYourAccount()}
+            svgSrc={getSettingAccountSvg(isDark)}
+            description={strings.accountAlmostReady()}
+            style={{
+              height: undefined,
+              marginTop: Spacing.LEVEL_6
+            }}
           />
-        </>
+        </View>
       )}
     </SignupContext.Provider>
   );

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

@@ -20,19 +20,18 @@ 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 } from "react-native";
-import { ScrollView } from "react-native-actions-sheet";
+import { TextInput, TouchableOpacity, View } from "react-native";
 import { db } from "../../common/database/index";
+import { Radius, Spacing } from "../../common/design/spacing";
 import useTimer from "../../hooks/use-timer";
-import { eSendEvent, ToastManager } from "../../services/event-manager";
-import { eCloseSimpleDialog } from "../../utils/events";
+import { hexToRGBA, RGB_Linear_Shade } from "../../utils/colors";
 import { AppFontSize } from "../../utils/size";
 import { DefaultAppStyles } from "../../utils/styles";
 import { presentDialog } from "../dialog/functions";
 import AppIcon from "../ui/AppIcon";
 import { Button } from "../ui/button";
 import { IconButton } from "../ui/icon-button";
-import Input from "../ui/input";
+import PinInput from "../ui/pin-input/index";
 import { Pressable } from "../ui/pressable";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
@@ -73,11 +72,19 @@ const TwoFactorVerification = ({
   const inputRef = useRef<TextInput>(null);
   const [sending, setSending] = useState(false);
   const [error, setError] = useState<Error | undefined>(undefined);
+  const [codeInput, setCodeInput] = useState("");
+
+  const isRecoveryCode = currentMethod.method === "recoveryCode";
+  const codeLength = isRecoveryCode ? 10 : 6;
 
   const onNext = async () => {
     if (!code.current || code.current.length < 6) {
       setError(
-        new Error("Please provide a valid multi-factor authentication code.")
+        new Error(
+          currentMethod.method === "recoveryCode"
+            ? strings.provideValidMultiFactorAuthRecoveryCode()
+            : strings.provideValidMultiFactorAuthCode()
+        )
       );
       return;
     }
@@ -94,10 +101,7 @@ const TwoFactorVerification = ({
         method: currentMethod.method,
         code: code.current
       },
-      (result) => {
-        if (result) {
-          eSendEvent(eCloseSimpleDialog, "two_factor_verify");
-        }
+      () => {
         setLoading(false);
       },
       (e) => {
@@ -118,12 +122,14 @@ const TwoFactorVerification = ({
     {
       id: "sms",
       title: strings.sendCodeSms(),
-      icon: "message-plus-outline"
+      icon: "chat",
+      iconFamily: "notesnook"
     },
     {
       id: "email",
       title: strings.sendCodeEmail(),
-      icon: "email-outline"
+      icon: "envelope-simple",
+      iconFamily: "notesnook"
     },
     {
       id: "app",
@@ -133,7 +139,8 @@ const TwoFactorVerification = ({
     {
       id: "recoveryCode",
       title: strings.recoveryCode(),
-      icon: "key"
+      icon: "lock-simple",
+      iconFamily: "notesnook"
     }
   ];
 
@@ -155,6 +162,7 @@ const TwoFactorVerification = ({
       setSending(false);
     } catch (e) {
       setSending(false);
+      console.log("error e");
       setError(
         new Error(`Error sending 2FA Code. Tap "Send code" to try again `)
       );
@@ -168,48 +176,56 @@ const TwoFactorVerification = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [currentMethod.method]);
 
+  useEffect(() => {
+    setCodeInput("");
+    code.current = "";
+  }, [currentMethod.method]);
+
   return (
-    <ScrollView
-      keyboardShouldPersistTaps="handled"
-      keyboardDismissMode="interactive"
-      style={{
-        width: "100%",
-        height: "100%",
-        backgroundColor: colors.primary.background,
-        paddingTop: 60
-      }}
+    <View
       onLayout={() => {
         setTimeout(() => {
           inputRef.current?.focus();
         }, 500);
       }}
+      style={{
+        alignItems: "center",
+        gap: Spacing.LEVEL_3
+      }}
     >
       <View
         style={{
-          alignItems: "center",
-          paddingHorizontal: currentMethod.method ? 12 : 0,
-          gap: 12
+          paddingHorizontal: Spacing.LEVEL_3,
+          width: "100%"
         }}
       >
         <IconButton
           style={{
-            width: 70,
-            height: 70
+            width: 50,
+            height: 50,
+            backgroundColor: colors.primary.shade,
+            borderRadius: Radius.XS,
+            marginBottom: Spacing.LEVEL_7
           }}
-          size={50}
-          name="key"
+          size={25}
+          iconFamily="notesnook"
+          name="shield-check"
           color={colors.primary.accent}
         />
         <Heading
           style={{
-            textAlign: "center"
+            textAlign: "center",
+            marginBottom: Spacing.LEVEL_1
           }}
         >
-          {currentMethod.method ? strings["2fa"]() : strings.select2faMethod()}
+          {currentMethod.method === "recoveryCode"
+            ? strings.recoveryCodeTitle()
+            : currentMethod.method
+              ? strings["2fa"]()
+              : strings.select2faMethod()}
         </Heading>
         <Paragraph
           style={{
-            width: "80%",
             textAlign: "center"
           }}
         >
@@ -219,61 +235,35 @@ const TwoFactorVerification = ({
               ]?.() || strings.select2faCodeHelpText()
             : strings.select2faCodeHelpText()}
         </Paragraph>
+      </View>
 
-        {currentMethod.method === "sms" || currentMethod.method === "email" ? (
-          <Button
-            onPress={onSendCode}
-            type={seconds ? "plain" : "transparent"}
-            title={
-              sending
-                ? ""
-                : `${
-                    seconds
-                      ? strings.resend2faCode(`${seconds}`)
-                      : strings.sendCode()
-                  }`
-            }
-            loading={sending}
-            height={30}
-          />
-        ) : null}
-
-        {currentMethod.method ? (
-          <>
-            <Input
-              placeholder={
-                currentMethod.method === "recoveryCode"
-                  ? "xxxxx-xxxxx"
-                  : "xxxxxx"
-              }
+      {currentMethod.method ? (
+        <>
+          <View
+            style={{
+              borderRadius: Radius.S,
+              width: "100%",
+              gap: Spacing.LEVEL_4
+            }}
+          >
+            <PinInput
               testID={"input.totp"}
-              maxLength={
-                currentMethod.method === "recoveryCode" ? undefined : 6
-              }
-              fwdRef={inputRef}
-              textAlign="center"
-              onChangeText={(value) => {
-                setError(undefined);
+              inputRef={inputRef}
+              length={codeLength}
+              value={codeInput}
+              onChangeText={(value: string) => {
+                setCodeInput(value);
                 code.current = value;
               }}
-              cursorColor={colors.selected.accent}
-              selectionHandleColor={colors.selected.accent}
-              selectionColor={colors.selected.accent}
               onSubmitEditing={onNext}
-              height={60}
-              marginBottom={0}
-              inputStyle={{
-                fontSize: AppFontSize.lg,
-                textAlign: "center",
-                letterSpacing: 7,
-                width: 250
-              }}
-              keyboardType={
-                currentMethod.method === "recoveryCode" ? "default" : "numeric"
-              }
-              enablesReturnKeyAutomatically
-              containerStyle={{
-                minWidth: "50%"
+              keyboardType={isRecoveryCode ? "web-search" : "number-pad"}
+              showDashAfterDigit={isRecoveryCode ? 5 : undefined}
+              sanitize={(value: string) => {
+                if (isRecoveryCode) {
+                  return value.replace(/[^0-9a-zA-Z]/g, "").toUpperCase();
+                }
+
+                return value.replace(/[^0-9]/g, "");
               }}
             />
             {error ? (
@@ -284,7 +274,9 @@ const TwoFactorVerification = ({
                 style={{
                   textAlign: "center",
                   marginVertical: DefaultAppStyles.GAP_VERTICAL_SMALL,
-                  maxWidth: 250
+                  maxWidth: 250,
+                  alignSelf: "center",
+                  marginTop: -10
                 }}
               >
                 <AppIcon
@@ -296,76 +288,144 @@ const TwoFactorVerification = ({
               </Paragraph>
             ) : null}
 
-            <Button
-              title={loading ? null : strings.next()}
-              type="accent"
-              width={250}
-              loading={loading}
-              onPress={onNext}
-            />
-            <Button
-              title={strings.cancel()}
-              type="secondaryAccented"
-              onPress={() => {
-                reset();
-                onCancel();
+            <View
+              style={{
+                flexDirection: "row",
+                gap: Spacing.LEVEL_2
               }}
-              width={250}
-            />
-
-            <Button
-              title={strings["2faCodeSecondaryMethodText"][
-                currentMethod.method as keyof (typeof strings)["2faCodeSecondaryMethodText"]
-              ]()}
-              type="plain"
-              onPress={onRequestSecondaryMethod}
-              height={30}
-            />
-          </>
-        ) : (
-          <>
-            {getMethods().map((item) => (
-              <Pressable
-                key={item.title}
+            >
+              <Button
+                title={strings.cancel()}
+                type="secondary"
                 onPress={() => {
-                  setCurrentMethod({
-                    method: item.id,
-                    isPrimary: false
-                  });
+                  reset();
+                  onCancel();
                 }}
                 style={{
-                  paddingHorizontal: DefaultAppStyles.GAP,
-                  paddingVertical: DefaultAppStyles.GAP_VERTICAL,
-                  marginTop: 0,
-                  flexDirection: "row",
-                  borderRadius: 0,
-                  alignItems: "center",
-                  width: "100%",
-                  justifyContent: "flex-start"
+                  width: "48%"
+                }}
+              />
+              <Button
+                title={loading ? null : strings.continue()}
+                type="accent"
+                loading={loading}
+                onPress={onNext}
+                style={{
+                  width: "48%"
+                }}
+              />
+            </View>
+
+            <View
+              style={{
+                gap: Spacing.LEVEL_1,
+                marginTop: -Spacing.LEVEL_0
+              }}
+            >
+              {currentMethod.method === "sms" ||
+              currentMethod.method === "email" ? (
+                <Button
+                  onPress={onSendCode}
+                  type={"plain"}
+                  disabled={parseInt(`${seconds}`) !== 0}
+                  title={
+                    sending
+                      ? ""
+                      : `${
+                          seconds
+                            ? strings.resend2faCode(`${seconds}`)
+                            : strings.resendCode()
+                        }`
+                  }
+                  loading={sending}
+                  fontSize={AppFontSize.sm}
+                  fontFamily="REGULAR"
+                  style={{
+                    paddingVertical: 0,
+                    alignSelf: "flex-start",
+                    paddingHorizontal: 0
+                  }}
+                />
+              ) : null}
+              <TouchableOpacity
+                onPress={onRequestSecondaryMethod}
+                activeOpacity={0.8}
+                style={{
+                  alignSelf: "flex-start"
                 }}
               >
-                <IconButton
-                  type="secondaryAccented"
-                  style={{
-                    marginRight: 10
-                  }}
-                  size={15}
-                  color={colors.primary.accent}
-                  name={item.icon}
-                />
-                <View
-                  style={{
-                    flexShrink: 1
-                  }}
+                <Paragraph
+                  fontFamily={isRecoveryCode ? "REGULAR" : "SEMI_BOLD"}
+                  fontSize="SM"
+                  color={
+                    isRecoveryCode
+                      ? colors.primary.paragraph
+                      : colors.primary.accent
+                  }
                 >
-                  <Paragraph size={AppFontSize.md}>{item.title}</Paragraph>
-                </View>
-              </Pressable>
-            ))}
-          </>
-        )}
-      </View>
-    </ScrollView>
+                  {strings["2faCodeSecondaryMethodText"][
+                    currentMethod.method as keyof (typeof strings)["2faCodeSecondaryMethodText"]
+                  ]()}
+                </Paragraph>
+              </TouchableOpacity>
+            </View>
+          </View>
+        </>
+      ) : (
+        <View
+          style={{
+            gap: Spacing.LEVEL_2,
+            width: "100%"
+          }}
+        >
+          {getMethods().map((item) => (
+            <Pressable
+              key={item.title}
+              onPress={() => {
+                setCurrentMethod({
+                  method: item.id,
+                  isPrimary: false
+                });
+              }}
+              style={{
+                padding: Spacing.LEVEL_2,
+                backgroundColor: colors.secondary.background,
+                flexDirection: "row",
+                borderRadius: Radius.S,
+                alignItems: "center",
+                width: "100%",
+                justifyContent: "flex-start",
+                gap: Spacing.LEVEL_1
+              }}
+            >
+              <IconButton
+                style={{
+                  borderRadius: Radius.XS,
+                  padding: Spacing.LEVEL_1,
+                  width: undefined,
+                  height: undefined,
+                  backgroundColor: RGB_Linear_Shade(
+                    0.04,
+                    hexToRGBA(colors.secondary.background)
+                  )
+                }}
+                size={17}
+                color={colors.primary.icon}
+                name={item.icon}
+                iconFamily={item.iconFamily as "notesnook"}
+              />
+              <View
+                style={{
+                  flexShrink: 1
+                }}
+              >
+                <Paragraph size={AppFontSize.sm}>{item.title}</Paragraph>
+              </View>
+            </Pressable>
+          ))}
+        </View>
+      )}
+    </View>
   );
 };
 

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

@@ -21,13 +21,11 @@ import { strings } from "@notesnook/intl";
 import { useRef, useState } from "react";
 import { TextInput } from "react-native";
 import { db } from "../../common/database";
-import { ToastManager, eSendEvent } from "../../services/event-manager";
+import { ToastManager } from "../../services/event-manager";
 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 TwoFactorVerification from "./two-factor";
 import { createFormRef } from "../ui/input/form-input";
 
 export const LoginSteps = {
@@ -46,6 +44,7 @@ export const useLogin = (
   const [step, setStep] = useState(LoginSteps.emailAuth);
   const emailInputRef = useRef<TextInput>(null);
   const passwordInputRef = useRef<TextInput>(null);
+  const mfaData = useRef<any>(undefined);
   const formRef = useRef(
     createFormRef({
       email: "",
@@ -60,69 +59,43 @@ export const useLogin = (
       setLoading(true);
       switch (step) {
         case LoginSteps.emailAuth: {
-          if (formRef.current.validateField("email")) {
+          if (!formRef.current.validate()) {
             setLoading(false);
             return;
           }
           const mfaInfo = await db.user.authenticateEmail(
             formRef.current.getValue("email")
           );
-
           if (mfaInfo) {
-            TwoFactorVerification.present(
-              async (mfa: any, callback: (success: boolean) => void, onerror: (e: Error) => void) => {
-                try {
-                  const success = await db.user.authenticateMultiFactorCode(
-                    mfa.code,
-                    mfa.method
-                  );
-
-                  if (success) {
-                    setStep(LoginSteps.passwordAuth);
-                    setLoading(false);
-                    setTimeout(() => {
-                      passwordInputRef.current?.focus();
-                    }, 500);
-                    callback && callback(true);
-                  }
-                  callback && callback(false);
-                } catch (e) {
-                  callback && callback(false);
-                  if ((e as Error).message === "invalid_grant") {
-                    eSendEvent(eCloseSimpleDialog, "two_factor_verify");
-                    setLoading(false);
-                    setStep(LoginSteps.emailAuth);
-                    ToastManager.error(new Error("Token expired, try logging in again"));
-                  } else {
-                    onerror(e as Error);
-                  }
-                }
-              },
-              mfaInfo,
-              () => {
-                eSendEvent(eCloseSimpleDialog, "two_factor_verify");
-                setLoading(false);
-                setStep(LoginSteps.emailAuth);
-              }
-            );
+            mfaData.current = mfaInfo;
+            setStep(LoginSteps.mfaAuth);
+            setLoading(false);
           } else {
             finishWithError(new Error(strings.unableToSend2faCode()));
           }
           break;
         }
-        case LoginSteps.passwordAuth: {
+        case LoginSteps.passwordAuth:
+        case LoginSteps.mfaAuth: {
           if (!formRef.current.validate()) {
             setLoading(false);
             return;
           }
           const values = formRef.current.getValues();
-          await db.user.authenticatePassword(
+          try {
+            await db.user.authenticatePassword(
             values.email,
             values.password,
             undefined,
             sessionExpired
           );
-          finishLogin();
+            finishLogin();
+          } catch(e) {
+            formRef.current.setError("password", (e as Error).message);
+            setLoading(false);
+            setStep(LoginSteps.passwordAuth);
+          }
+     
           break;
         }
       }
@@ -172,6 +145,7 @@ export const useLogin = (
     setLoading,
     error,
     setError,
-    formRef
+    formRef,
+    mfaData
   };
 };

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

@@ -36,6 +36,8 @@ 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 useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
+import AppIcon from "../ui/AppIcon";
 
 interface FloatingButtonProps {
   onPress: () => void;
@@ -47,6 +49,7 @@ interface FloatingButtonProps {
   position?: "left" | "right";
   size?: "small" | "large";
   style?: ViewStyle;
+  hideOnKeyboard?: boolean;
 }
 
 const FloatingButton = ({
@@ -57,26 +60,28 @@ const FloatingButton = ({
   testID,
   position = "right",
   size = "large",
-  style
+  style,
+  hideOnKeyboard = true
 }: FloatingButtonProps) => {
   const { colors } = useThemeColors();
   const deviceMode = useSettingStore((state) => state.deviceMode);
   const selectionMode = useSelectionStore((state) => state.selectionMode);
   const translate = useSharedValue(0);
+  const keyboardHeight = useSharedValue(0);
   const route = useRoute();
+  const insets = useGlobalSafeAreaInsets();
 
-  const animatedStyle = useAnimatedStyle(() => {
-    return {
-      transform: [
-        {
-          translateX: translate.value
-        },
-        {
-          translateY: translate.value
-        }
-      ]
-    };
-  });
+  const animatedStyle = useAnimatedStyle(() => ({
+    transform: [
+      {
+        translateX: hideOnKeyboard ? translate.value : 0
+      },
+      {
+        translateY: hideOnKeyboard ? translate.value : 0
+      }
+    ],
+    bottom: hideOnKeyboard ? 15 : keyboardHeight.value + 15
+  }));
 
   const animate = useCallback(
     (toValue: number) => {
@@ -97,12 +102,22 @@ const FloatingButton = ({
       editorState().keyboardState = false;
       if (deviceMode !== "mobile") return;
       animate(0);
+      keyboardHeight.value = withTiming(0);
     };
 
-    const onKeyboardShow = () => {
+    const onKeyboardShow = (e: any) => {
       editorState().keyboardState = true;
       if (deviceMode !== "mobile") return;
-      animate(150);
+      if (hideOnKeyboard) {
+        animate(150);
+      } else {
+        keyboardHeight.value = withTiming(
+          e.endCoordinates.height - insets.bottom,
+          {
+            duration: 250
+          }
+        );
+      }
     };
 
     const sub = [
@@ -110,9 +125,9 @@ const FloatingButton = ({
       Keyboard.addListener("keyboardDidHide", onKeyboardHide)
     ];
     return () => {
-      sub.forEach((sub) => sub?.remove?.());
+      sub.forEach((sub) => sub.remove());
     };
-  }, [deviceMode, animate]);
+  }, [deviceMode, animate, hideOnKeyboard, keyboardHeight, insets.bottom]);
 
   return deviceMode !== "mobile" && !alwaysVisible ? null : (
     <Animated.View
@@ -140,7 +155,7 @@ const FloatingButton = ({
           borderBottomWidth: 0,
           borderLeftWidth: 0,
           borderRightWidth: 0,
-          backgroundColor: colors.primary.background
+          backgroundColor: colors.primary.accent
         }}
         onPress={onPress}
       >
@@ -148,26 +163,27 @@ const FloatingButton = ({
           style={{
             alignItems: "center",
             justifyContent: "center",
-            height: normalize(size === "small" ? 40 : 60),
-            width: normalize(size === "small" ? 40 : 60),
+            height: 55,
+            width: 55,
             backgroundColor: color
               ? RGB_Linear_Shade(0.87, hexToRGBA(color))
-              : colors.primary.shade,
+              : colors.primary.accent,
             borderRadius: size === "small" ? 15 : 20
           }}
         >
-          <Icon
+          <AppIcon
             name={
               icon
                 ? icon
                 : route.name === "Notebooks"
-                ? "notebook-plus"
-                : route.name === "Trash"
-                ? "delete"
-                : "plus"
+                  ? "plus"
+                  : route.name === "Trash"
+                    ? "trash-alt"
+                    : "plus"
             }
-            color={color || colors.primary.accent}
-            size={size === "small" ? AppFontSize.xl : AppFontSize.xxxl}
+            iconFamily="notesnook"
+            color={color || colors.primary.accentForeground}
+            size={24}
           />
         </View>
       </TouchableOpacity>

apps/mobile/app/components/date-picker/index.tsx

@@ -1,91 +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 { useThemeColors } from "@notesnook/theme";
-import { useRef } from "react";
-import { useWindowDimensions, View } from "react-native";
-import { defaultBorderRadius } from "../../utils/size";
-import { DefaultAppStyles } from "../../utils/styles";
-import DatePicker from "react-native-date-picker";
-import dayjs from "dayjs";
-import { strings } from "@notesnook/intl";
-import { Button } from "../ui/button";
-
-export default function DatePickerComponent(props: {
-  onConfirm: (date: Date) => void;
-  onCancel: () => void;
-}) {
-  const { colors, isDark } = useThemeColors();
-  const dateRef = useRef<Date>(dayjs().add(1, "week").toDate());
-
-  const { width } = useWindowDimensions();
-
-  return (
-    <View
-      style={{
-        backgroundColor: colors.primary.background,
-        borderRadius: defaultBorderRadius,
-        padding: DefaultAppStyles.GAP,
-        borderWidth: 0.5,
-        borderColor: colors.primary.border,
-        width: "80%",
-        gap: DefaultAppStyles.GAP_VERTICAL
-      }}
-    >
-      <DatePicker
-        style={{
-          width: width * 0.8 - DefaultAppStyles.GAP * 2
-        }}
-        theme={isDark ? "dark" : "light"}
-        mode="date"
-        minimumDate={dayjs().add(1, "day").toDate()}
-        onCancel={() => {
-          close?.();
-        }}
-        date={dateRef.current}
-        onDateChange={(date) => {
-          dateRef.current = date;
-        }}
-      />
-
-      <Button
-        title={strings.setExpiry()}
-        type="accent"
-        style={{
-          width: "100%"
-        }}
-        onPress={async () => {
-          if (!dateRef.current) return;
-          props.onConfirm(dateRef.current);
-        }}
-      />
-
-      <Button
-        title={strings.cancel()}
-        type="secondary"
-        style={{
-          width: "100%"
-        }}
-        onPress={async () => {
-          props.onCancel();
-        }}
-      />
-    </View>
-  );
-}

apps/mobile/app/components/date-time-picker/date-time-picker.tsx

@@ -0,0 +1,200 @@
+/*
+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 dayjs, { locale } from "dayjs";
+import React, { useMemo } from "react";
+import { I18nManager, ViewStyle } from "react-native";
+import RNDateTimePicker, {
+  DateType,
+  useDefaultStyles
+} from "react-native-ui-datepicker";
+import { FontFamily } from "../../common/design/font";
+import { Radius } from "../../common/design/spacing";
+import { db } from "../../common/database";
+import { useSettingStore } from "../../stores/use-setting-store";
+import AppIcon from "../ui/AppIcon";
+import DeviceInfo from "react-native-device-info";
+
+export type DateTimePickerMode = "date" | "time" | "datetime";
+
+export type DateTimePickerProps = {
+  /**
+   * Which parts of the value can be picked. `date` shows only the calendar,
+   * `time` shows only the time wheel and `datetime` shows both.
+   */
+  mode?: DateTimePickerMode;
+  date: Date;
+  onChange: (date: Date) => void;
+  minDate?: Date;
+  maxDate?: Date;
+  /**
+   * Force 24-hour time. Defaults to the user's time format setting.
+   */
+  is24Hour?: boolean;
+  /**
+   * First day of the week (0 = Sunday, 1 = Monday). Defaults to the user's
+   * week format setting.
+   */
+  firstDayOfWeek?: number;
+  style?: ViewStyle;
+};
+
+const toDate = (value: DateType) =>
+  value ? dayjs(value).toDate() : new Date();
+
+/**
+ * Themed date/time picker built on top of `react-native-ui-datepicker`.
+ * Renders inline; use `DateTimePicker.present()` (see index) for the sheet.
+ */
+export default function DateTimePicker({
+  mode = "date",
+  date,
+  onChange,
+  minDate,
+  maxDate,
+  is24Hour,
+  firstDayOfWeek,
+  style
+}: DateTimePickerProps) {
+  const { colors, isDark } = useThemeColors();
+  const defaultStyles = useDefaultStyles(isDark ? "dark" : "light");
+  const weekFormat = useSettingStore((state) => state.weekFormat);
+
+  const use12Hours =
+    (is24Hour ?? db.settings.getTimeFormat() === "24-hour") === false;
+  const firstDay = firstDayOfWeek ?? (weekFormat === "Mon" ? 1 : 0);
+
+  const styles = useMemo(
+    () =>
+      ({
+        ...defaultStyles,
+        today: {
+          borderColor: colors.primary.accent,
+          borderWidth: 1,
+          borderRadius: Radius.S
+        },
+        today_label: {
+          color: colors.primary.accent
+        },
+        selected: {
+          backgroundColor: colors.primary.accent,
+          borderRadius: Radius.S
+        },
+        selected_label: {
+          color: colors.static.white
+        },
+        day_label: {
+          color: colors.primary.paragraph,
+          fontFamily: FontFamily.REGULAR
+        },
+        disabled_label: {
+          color: colors.disabled.paragraph
+        },
+        outside_label: {
+          color: colors.secondary.paragraph
+        },
+        weekday_label: {
+          color: colors.secondary.paragraph,
+          fontFamily: FontFamily.MEDIUM
+        },
+        month_selector_label: {
+          color: colors.primary.heading,
+          fontFamily: FontFamily.SEMI_BOLD
+        },
+        year_selector_label: {
+          color: colors.primary.heading,
+          fontFamily: FontFamily.SEMI_BOLD
+        },
+        time_selector_label: {
+          color: colors.primary.heading,
+          fontFamily: FontFamily.SEMI_BOLD
+        },
+        month_label: {
+          color: colors.primary.paragraph
+        },
+        year_label: {
+          color: colors.primary.paragraph
+        },
+        selected_month: {
+          backgroundColor: colors.primary.accent,
+          borderRadius: Radius.S
+        },
+        selected_month_label: {
+          color: colors.static.white
+        },
+        selected_year: {
+          backgroundColor: colors.primary.accent,
+          borderRadius: Radius.S
+        },
+        selected_year_label: {
+          color: colors.static.white
+        },
+        active_year: {
+          backgroundColor: colors.secondary.background,
+          borderRadius: Radius.S
+        },
+        time_label: {
+          color: colors.primary.heading,
+          fontFamily: FontFamily.SEMI_BOLD
+        },
+        time_selected_indicator: {
+          backgroundColor: colors.secondary.background,
+          borderRadius: Radius.S
+        }
+      }) as ReturnType<typeof useDefaultStyles>,
+    [colors, defaultStyles]
+  );
+
+  return (
+    <RNDateTimePicker
+      mode="single"
+      date={date}
+      timePicker={mode !== "date"}
+      initialView={mode === "time" ? "time" : "day"}
+      hideHeader={mode === "time"}
+      use12Hours={use12Hours}
+      firstDayOfWeek={firstDay}
+      minDate={minDate}
+      maxDate={maxDate}
+      styles={styles}
+      components={{
+        IconPrev: (
+          <AppIcon
+            name="chevron-left"
+            iconFamily="notesnook"
+            size={20}
+            color={colors.primary.icon}
+          />
+        ),
+        IconNext: (
+          <AppIcon
+            name="chevron-right"
+            iconFamily="notesnook"
+            size={20}
+            color={colors.primary.icon}
+          />
+        )
+      }}
+      onChange={(params) => {
+        const changed = (params as { date: DateType }).date;
+        onChange(toDate(changed));
+      }}
+    />
+  );
+}

apps/mobile/app/components/date-time-picker/index.tsx

@@ -0,0 +1,224 @@
+/*
+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 { strings } from "@notesnook/intl";
+import { useThemeColors } from "@notesnook/theme";
+import React, { useState } from "react";
+import { View, ViewStyle } from "react-native";
+import { Radius, Spacing } from "../../common/design/spacing";
+import { presentDialog } from "../dialog/functions";
+import { presentSheet } from "../../services/event-manager";
+import AppIcon from "../ui/AppIcon";
+import { Button } from "../ui/button";
+import Heading from "../ui/typography/heading";
+import Paragraph from "../ui/typography/paragraph";
+import DateTimePicker, {
+  DateTimePickerMode,
+  DateTimePickerProps
+} from "./date-time-picker";
+
+export { default } from "./date-time-picker";
+export type {
+  DateTimePickerMode,
+  DateTimePickerProps
+} from "./date-time-picker";
+
+const DEFAULT_ICONS: Record<DateTimePickerMode, string> = {
+  date: "calendar-dots",
+  time: "clock",
+  datetime: "calendar-dots"
+};
+
+export type PresentDateTimePickerOptions = Pick<
+  DateTimePickerProps,
+  "minDate" | "maxDate" | "is24Hour" | "firstDayOfWeek"
+> & {
+  mode?: DateTimePickerMode;
+  /** Initial value the picker opens on. Defaults to now. */
+  date?: Date;
+  title?: string;
+  description?: string;
+  icon?: string;
+  /** Label for the confirm button. Defaults to `strings.done()`. */
+  confirmText?: string;
+  /** Dialog context to render into (dialog presentation only). */
+  context?: string;
+  onConfirm: (date: Date) => void;
+  onCancel?: () => void;
+};
+
+type Presentation = "dialog" | "sheet";
+
+type DateTimePickerContentProps = PresentDateTimePickerOptions & {
+  presentation: Presentation;
+  close?: (ctx?: string) => void;
+};
+
+/**
+ * The shared picker body used by both the dialog and the sheet: a header,
+ * the themed picker, and Cancel/Confirm actions. Presentation-specific chrome
+ * (the dialog card vs. the sheet surface) is applied by the outer container.
+ */
+function DateTimePickerContent({
+  presentation,
+  mode = "date",
+  date,
+  minDate,
+  maxDate,
+  is24Hour,
+  firstDayOfWeek,
+  title,
+  description,
+  icon,
+  confirmText,
+  onConfirm,
+  onCancel,
+  close
+}: DateTimePickerContentProps) {
+  const { colors } = useThemeColors();
+  const [selected, setSelected] = useState<Date>(date || new Date());
+
+  const containerStyle: ViewStyle =
+    presentation === "dialog"
+      ? {
+          width: "90%",
+          maxWidth: 400,
+          alignSelf: "center",
+          backgroundColor: colors.primary.background,
+          borderRadius: Radius.S,
+          borderWidth: 0.5,
+          borderColor: colors.primary.border,
+          overflow: "hidden"
+        }
+      : {
+          width: "100%"
+        };
+
+  return (
+    <View style={containerStyle}>
+      <View
+        style={{
+          paddingHorizontal: Spacing.LEVEL_3,
+          paddingVertical: Spacing.LEVEL_4,
+          gap: Spacing.LEVEL_3
+        }}
+      >
+        <View
+          style={{
+            flexDirection: "row",
+            alignItems: "flex-start",
+            gap: Spacing.LEVEL_1
+          }}
+        >
+          <View
+            style={{
+              width: 40,
+              height: 40,
+              borderRadius: Radius.XS,
+              alignItems: "center",
+              justifyContent: "center",
+              backgroundColor: colors.secondary.background
+            }}
+          >
+            <AppIcon
+              name={icon || DEFAULT_ICONS[mode]}
+              iconFamily="notesnook"
+              size={16}
+              color={colors.primary.icon}
+            />
+          </View>
+          <View style={{ flexShrink: 1, gap: Spacing.LEVEL_1 }}>
+            <Heading fontSize="XL" lineHeight="100%">
+              {title ||
+                (mode === "time"
+                  ? strings.selectTimeHeading()
+                  : strings.selectDate())}
+            </Heading>
+            {description ? (
+              <Paragraph fontSize="SM" color={colors.secondary.paragraph}>
+                {description}
+              </Paragraph>
+            ) : null}
+          </View>
+        </View>
+
+        {/* <View style={{ height: 1, backgroundColor: colors.primary.border }} /> */}
+
+        <DateTimePicker
+          mode={mode}
+          date={selected}
+          onChange={setSelected}
+          minDate={minDate}
+          maxDate={maxDate}
+          is24Hour={is24Hour}
+          firstDayOfWeek={firstDayOfWeek}
+        />
+
+        <View style={{ flexDirection: "row", gap: Spacing.LEVEL_2 }}>
+          <Button
+            title={strings.cancel()}
+            type="plain-outline"
+            style={{ flex: 1, width: "auto" }}
+            onPress={() => {
+              close?.();
+              onCancel?.();
+            }}
+          />
+          <Button
+            title={confirmText || strings.done()}
+            type="accent"
+            style={{ flex: 1, width: "auto" }}
+            onPress={() => {
+              close?.();
+              onConfirm(selected);
+            }}
+          />
+        </View>
+      </View>
+    </View>
+  );
+}
+
+/**
+ * Show the themed date/time picker in a dialog. This is the default surface
+ * used across the app. Resolves the picked value through `onConfirm`;
+ * dismissing without confirming calls `onCancel`.
+ */
+export function presentDateTimePicker(options: PresentDateTimePickerOptions) {
+  presentDialog({
+    context: options.context || "global",
+    component: (close) => (
+      <DateTimePickerContent {...options} presentation="dialog" close={close} />
+    )
+  });
+}
+
+/**
+ * Show the same date/time picker in a bottom sheet. Preferred on the
+ * add-reminder screen; elsewhere use {@link presentDateTimePicker}.
+ */
+export function presentDateTimePickerSheet(
+  options: PresentDateTimePickerOptions
+) {
+  presentSheet({
+    context: options.context || "global",
+    component: (_ref, close) => (
+      <DateTimePickerContent {...options} presentation="sheet" close={close} />
+    )
+  });
+}

apps/mobile/app/components/delay-layout/index.tsx

@@ -30,6 +30,7 @@ interface IDelayLayoutProps extends ViewProps {
   type?: "default" | "settings";
   color?: string;
   animated?: boolean;
+  disabled?: boolean;
 }
 
 const placeholder = {
@@ -39,13 +40,14 @@ const placeholder = {
 
 export default function DelayLayout({
   animated = true,
+  disabled,
   ...props
 }: IDelayLayoutProps) {
   const { colors } = useThemeColors();
   const loading = useDelayLayout(props.delay === undefined ? 200 : props.delay);
   const Placeholder = placeholder[props.type || "default"];
 
-  return loading || props.wait ? (
+  return (loading || props.wait) && !disabled ? (
     <View
       style={{
         backgroundColor: colors.primary.background,

apps/mobile/app/components/dialog-provider/index.jsx

@@ -31,8 +31,7 @@ import ImagePreview from "../image-preview";
 import MergeConflicts from "../merge-conflicts";
 import SheetProvider from "../sheet-provider";
 import RateAppSheet from "../sheets/rate-app";
-import RecoveryKeySheet from "../sheets/recovery-key";
-import Progress from "../dialogs/progress";
+import Progress from "../dialogs/progress/progress";
 import { useSettingStore } from "../../stores/use-setting-store";
 
 const DialogProvider = () => {
@@ -51,7 +50,6 @@ const DialogProvider = () => {
       {isAppLoading ? null : (
         <>
           <MergeConflicts />
-          <RecoveryKeySheet colors={colors} />
           <VaultDialog colors={colors} />
           <RateAppSheet />
           <ImagePreview />

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

@@ -20,14 +20,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import React from "react";
-import { ActivityIndicator, StyleSheet, View } from "react-native";
-import Icon from "react-native-vector-icons/MaterialCommunityIcons";
+import { View } from "react-native";
 import { notesnook } from "../../../e2e/test.ids";
-import { getColorLinearShade } from "../../utils/colors";
+import { Spacing } from "../../common/design/spacing";
 import { AppFontSize } from "../../utils/size";
-import { DefaultAppStyles } from "../../utils/styles";
 import { Button, ButtonProps } from "../ui/button";
-import Paragraph from "../ui/typography/paragraph";
 
 const DialogButtons = ({
   onPressPositive,
@@ -51,82 +48,41 @@ const DialogButtons = ({
   return (
     <View
       style={[
-        styles.container,
         {
-          backgroundColor: colors.secondary.background,
-          height: 60,
-          paddingHorizontal: DefaultAppStyles.GAP,
-          borderTopWidth: 0.7,
-          borderTopColor: getColorLinearShade(
-            colors.secondary.background,
-            0.05,
-            isDark
-          )
+          flexDirection: "row",
+          gap: Spacing.LEVEL_2,
+          paddingHorizontal: Spacing.LEVEL_3
         }
       ]}
     >
-      {doneText ? (
-        <View
-          style={{
-            flexDirection: "row",
-            alignItems: "center"
-          }}
-        >
-          <Icon
-            color={colors.primary.accent}
-            name="check-circle-outline"
-            size={AppFontSize.md}
-          />
-          <Paragraph color={colors.primary.accent}>{" " + doneText}</Paragraph>
-        </View>
-      ) : loading ? (
-        <ActivityIndicator
-          size={AppFontSize.lg}
-          color={colors.primary.accent}
-        />
-      ) : (
-        <View />
-      )}
-
-      <View
+      <Button
+        onPress={onPressNegative}
+        fontSize={AppFontSize.md}
+        testID={notesnook.ids.default.dialog.no}
+        type="plain-outline"
         style={{
-          flexDirection: "row",
-          alignItems: "center"
+          flexGrow: 1,
+          flexShrink: 1
         }}
-      >
+        title={negativeTitle}
+      />
+      {onPressPositive ? (
         <Button
-          onPress={onPressNegative}
-          fontSize={AppFontSize.sm}
-          testID={notesnook.ids.default.dialog.no}
-          type="plain"
+          onPress={onPressPositive}
+          fontSize={AppFontSize.md}
+          testID={notesnook.ids.default.dialog.yes}
+          style={{
+            flexGrow: 1,
+            flexShrink: 1
+          }}
+          loading={loading}
           bold
-          title={negativeTitle}
+          type={positiveType || "accent"}
+          title={positiveTitle}
         />
-        {onPressPositive ? (
-          <Button
-            onPress={onPressPositive}
-            fontSize={AppFontSize.sm}
-            testID={notesnook.ids.default.dialog.yes}
-            style={{
-              marginLeft: 10
-            }}
-            bold
-            type={positiveType || "transparent"}
-            title={positiveTitle}
-          />
-        ) : null}
-      </View>
+      ) : null}
     </View>
   );
 };
 
 export default DialogButtons;
-
-const styles = StyleSheet.create({
-  container: {
-    justifyContent: "space-between",
-    alignItems: "center",
-    flexDirection: "row",
-    marginTop: DefaultAppStyles.GAP_VERTICAL
-  }
-});

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

@@ -23,6 +23,7 @@ import { DDS } from "../../services/device-detection";
 import { useThemeColors } from "@notesnook/theme";
 import { getElevationStyle } from "../../utils/elevation";
 import { getContainerBorder } from "../../utils/colors";
+import { Radius } from "../../common/design/spacing";
 
 const DialogContainer = ({
   width,
@@ -44,9 +45,10 @@ const DialogContainer = ({
         {
           width: width || DDS.isTab ? 500 : "85%",
           maxHeight: height || 450,
-          borderRadius: 10,
+          borderRadius: Radius.LG,
           backgroundColor: colors.primary.background,
-          paddingTop: 12
+          paddingTop: 12,
+          marginTop: -300
         },
         restProps?.noBorder
           ? {}

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

@@ -17,17 +17,20 @@ 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 from "react";
 import { Text, View, ViewStyle } from "react-native";
-import { useThemeColors } from "@notesnook/theme";
-import { AppFontSize } from "../../utils/size";
+import { Radius, Spacing } from "../../common/design/spacing";
+import { DefaultAppStyles } from "../../utils/styles";
+import AppIcon, { IconProps } from "../ui/AppIcon";
 import { Button, ButtonProps } from "../ui/button";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
-import { DefaultAppStyles } from "../../utils/styles";
 
 type DialogHeaderProps = {
   icon?: string;
+  iconFamily?: IconProps["iconFamily"];
+  iconType?: "error" | "normal";
   title?: string;
   paragraph?: string;
   button?: ButtonProps;
@@ -46,7 +49,10 @@ const DialogHeader = ({
   padding,
   centered,
   titlePart,
-  style
+  style,
+  icon,
+  iconFamily,
+  iconType
 }: DialogHeaderProps) => {
   const { colors } = useThemeColors();
 
@@ -57,61 +63,89 @@ const DialogHeader = ({
           flexDirection: "row",
           alignItems: "center",
           justifyContent: "space-between",
-          minHeight: 50,
           paddingHorizontal: padding,
           ...style
         }}
       >
         <View
           style={{
-            width: "100%"
+            width: "100%",
+            gap: Spacing.LEVEL_4
           }}
         >
+          {icon ? (
+            <View
+              style={{
+                alignSelf: centered ? "center" : "flex-start",
+                width: 40,
+                height: 40,
+                backgroundColor: colors.error.shade,
+                justifyContent: "center",
+                alignItems: "center",
+                borderRadius: Radius.XS
+              }}
+            >
+              <AppIcon
+                name={icon}
+                iconFamily={iconFamily}
+                color={
+                  iconType == "error" ? colors.static.red : colors.primary.icon
+                }
+              />
+            </View>
+          ) : null}
+
           <View
             style={{
-              flexDirection: "row",
-              justifyContent: centered ? "center" : "space-between",
-              alignItems: "center"
+              gap: Spacing.LEVEL_1
             }}
           >
-            <Heading
-              style={{ textAlign: centered ? "center" : "left" }}
-              size={AppFontSize.lg}
+            <View
+              style={{
+                flexDirection: "row",
+                justifyContent: centered ? "center" : "space-between",
+                alignItems: "center"
+              }}
             >
-              {title}{" "}
-              {titlePart ? (
-                <Text style={{ color: colors.primary.accent }}>
-                  {titlePart}
-                </Text>
-              ) : null}
-            </Heading>
+              <Heading
+                style={{ textAlign: centered ? "center" : "left" }}
+                fontSize="XL"
+              >
+                {title}{" "}
+                {titlePart ? (
+                  <Text style={{ color: colors.primary.accent }}>
+                    {titlePart}
+                  </Text>
+                ) : null}
+              </Heading>
 
-            {button ? (
-              <Button
+              {button ? (
+                <Button
+                  style={{
+                    borderRadius: 100,
+                    paddingHorizontal: DefaultAppStyles.GAP
+                  }}
+                  fontSize={13}
+                  type={button.type || "secondary"}
+                  height={30}
+                  {...button}
+                />
+              ) : null}
+            </View>
+
+            {paragraph ? (
+              <Paragraph
                 style={{
-                  borderRadius: 100,
-                  paddingHorizontal: DefaultAppStyles.GAP
+                  textAlign: centered ? "center" : "left",
+                  maxWidth: centered ? "90%" : "100%",
+                  alignSelf: centered ? "center" : "flex-start"
                 }}
-                fontSize={13}
-                type={button.type || "secondary"}
-                height={30}
-                {...button}
-              />
+                color={paragraphColor || colors.secondary.paragraph}
+              >
+                {paragraph}
+              </Paragraph>
             ) : null}
           </View>
-
-          {paragraph ? (
-            <Paragraph
-              style={{
-                textAlign: centered ? "center" : "left",
-                maxWidth: centered ? "90%" : "100%",
-                alignSelf: centered ? "center" : "flex-start"
-              }}
-              color={paragraphColor || colors.secondary.paragraph}
-            >
-              {paragraph}
-            </Paragraph>
-          ) : null}
         </View>
       </View>
     </>

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

@@ -17,16 +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 { KeyboardTypeOptions, TextInput } from "react-native";
+import { KeyboardTypeOptions, TextInput, TextInputProps } from "react-native";
 import { eSendEvent } from "../../services/event-manager";
 import { eCloseSimpleDialog, eOpenSimpleDialog } from "../../utils/events";
 import { ButtonProps } from "../ui/button";
 import { FieldValidator, FormRef } from "../ui/input/form-input";
 import { RefObject } from "react";
+import { IconProps } from "../ui/AppIcon";
+import { PressableProps } from "../ui/pressable";
 
 export type DialogInfo = {
   title?: string;
   paragraph?: string;
+  centered?: boolean;
   positiveText: string;
   negativeText: string;
   background?: string;
@@ -34,16 +37,10 @@ export type DialogInfo = {
   statusBarTranslucent?: boolean;
   positivePress?: (...args: any[]) => Promise<any>;
   onClose?: () => void;
-  positiveType?:
-    | "transparent"
-    | "plain"
-    | "secondary"
-    | "accent"
-    | "inverted"
-    | "shade"
-    | "error"
-    | "errorShade";
+  positiveType?: PressableProps["type"];
   icon?: string;
+  iconFamily?: IconProps["iconFamily"];
+  iconType?: "error" | "normal";
   paragraphColor: string;
   form?: {
     formRef: FormRef;
@@ -54,10 +51,12 @@ export type DialogInfo = {
       validators: FieldValidator[];
       defaultValue?: string;
       ref: RefObject<TextInput | null>;
+      inputProps?: TextInputProps;
     }[];
-    onFormSubmit?: (form: FormRef) => Promise<boolean>;
+    onFormSubmit?: (form: FormRef, checked?: boolean) => Promise<boolean>;
   };
   input: boolean;
+  inputLabel?: string;
   inputPlaceholder: string;
   defaultValue: string;
   // eslint-disable-next-line @typescript-eslint/ban-types

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

@@ -19,13 +19,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { useThemeColors } from "@notesnook/theme";
 import React, {
+  RefObject,
   useCallback,
   useEffect,
   useRef,
-  useState,
-  RefObject
+  useState
 } from "react";
 import { TextInput, View, ViewStyle } from "react-native";
+import { Spacing } from "../../common/design/spacing";
 import { DDS } from "../../services/device-detection";
 import {
   eSubscribeEvent,
@@ -38,11 +39,10 @@ import { defaultBorderRadius } from "../../utils/size";
 import { DefaultAppStyles } from "../../utils/styles";
 import { sleep } from "../../utils/time";
 import { Toast } from "../toast";
-import { Button } from "../ui/button";
+import { Checkbox } from "../ui/checkbox";
 import Input from "../ui/input";
 import { FormInput, type FormRef } from "../ui/input/form-input";
 import { Notice } from "../ui/notice";
-import Seperator from "../ui/seperator";
 import BaseDialog from "./base-dialog";
 import DialogButtons from "./dialog-buttons";
 import DialogHeader from "./dialog-header";
@@ -74,7 +74,10 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
         }
         if (dialogInfo.form.onFormSubmit) {
           setLoading(true);
-          const result = await dialogInfo.form.onFormSubmit(formRef.current);
+          const result = await dialogInfo.form.onFormSubmit(
+            formRef.current,
+            checked
+          );
           if (result === false) {
             setLoading(false);
             return;
@@ -143,9 +146,6 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
   }, [hide, show]);
 
   const onNegativePress = async () => {
-    if (dialogInfo?.onClose) {
-      await dialogInfo.onClose();
-    }
     hide();
   };
 
@@ -155,7 +155,7 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
     maxHeight: 450,
     borderRadius: defaultBorderRadius,
     backgroundColor: colors.primary.background,
-    paddingTop: 12,
+    gap: Spacing.LEVEL_4,
     ...getContainerBorder(colors.primary.border, 0.5),
     overflow: "hidden"
   };
@@ -170,9 +170,7 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
       bounce={!dialogInfo.input && !dialogInfo.form}
       closeOnTouch={!dialogInfo.disableBackdropClosing}
       background={dialogInfo.background}
-      transparent={
-        dialogInfo.transparent === undefined ? false : dialogInfo.transparent
-      }
+      transparent={dialogInfo.transparent}
       onShow={async () => {
         if (dialogInfo.input && !dialogInfo.form) {
           inputRef.current?.setNativeProps({
@@ -201,54 +199,66 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
         : dialogInfo.component}
 
       {dialogInfo.component ? null : (
-        <View style={style}>
-          <DialogHeader
-            title={dialogInfo.title}
-            icon={dialogInfo.icon}
-            paragraph={dialogInfo.paragraph}
-            paragraphColor={dialogInfo.paragraphColor}
-            padding={12}
-            style={{
-              minHeight: 0
-            }}
-          />
-          <Seperator half />
+        <View
+          style={[
+            {
+              paddingVertical: Spacing.LEVEL_4
+            },
+            style
+          ]}
+        >
+          <View
+            style={[
+              {
+                paddingHorizontal: Spacing.LEVEL_3,
+                gap: Spacing.LEVEL_4
+              }
+            ]}
+          >
+            <DialogHeader
+              title={dialogInfo.title}
+              icon={dialogInfo.icon}
+              iconFamily={dialogInfo.iconFamily}
+              iconType={dialogInfo.iconType}
+              centered={dialogInfo.centered}
+              paragraph={dialogInfo.paragraph}
+              paragraphColor={dialogInfo.paragraphColor}
+              style={{
+                minHeight: 0
+              }}
+            />
 
-          {dialogInfo.form ? (
-            <View
-              style={{
-                paddingHorizontal: DefaultAppStyles.GAP,
-                gap: DefaultAppStyles.GAP / 2
-              }}
-            >
-              {dialogInfo.form.items.map((item, index) => (
-                <FormInput
-                  key={item.name}
-                  fwdRef={item.ref}
-                  name={item.name}
-                  autoFocus={index === 0}
-                  placeholder={item.placeholder}
-                  formRef={formRef as RefObject<FormRef>}
-                  validators={item.validators}
-                  defaultValue={item.defaultValue}
-                  secureTextEntry={dialogInfo.secureTextEntry}
-                  onSubmitEditing={() => {
-                    const nextItem = dialogInfo?.form?.items?.[index + 1];
-                    if (nextItem) {
-                      nextItem?.ref.current?.focus();
-                    } else {
-                      onPressPositive();
-                    }
-                  }}
-                />
-              ))}
-            </View>
-          ) : dialogInfo.input ? (
-            <View
-              style={{
-                paddingHorizontal: DefaultAppStyles.GAP
-              }}
-            >
+            {dialogInfo.form ? (
+              <View
+                style={{
+                  gap: Spacing.LEVEL_2
+                }}
+              >
+                {dialogInfo.form.items.map((item, index) => (
+                  <FormInput
+                    {...item.inputProps}
+                    key={item.name}
+                    fwdRef={item.ref}
+                    name={item.name}
+                    label={item.label}
+                    autoFocus={index === 0}
+                    placeholder={item.placeholder}
+                    formRef={formRef as RefObject<FormRef>}
+                    validators={item.validators}
+                    defaultValue={item.defaultValue}
+                    secureTextEntry={dialogInfo.secureTextEntry}
+                    onSubmitEditing={() => {
+                      const nextItem = dialogInfo?.form?.items?.[index + 1];
+                      if (nextItem) {
+                        nextItem?.ref.current?.focus();
+                      } else {
+                        onPressPositive();
+                      }
+                    }}
+                  />
+                ))}
+              </View>
+            ) : dialogInfo.input ? (
               <Input
                 fwdRef={inputRef}
                 autoCapitalize="none"
@@ -258,6 +268,7 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
                 testID="input-value"
                 secureTextEntry={dialogInfo.secureTextEntry}
                 defaultValue={dialogInfo.defaultValue}
+                label={dialogInfo.inputLabel}
                 onSubmit={() => {
                   onPressPositive();
                 }}
@@ -266,48 +277,34 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
                 keyboardType={dialogInfo.keyboardType || "default"}
                 placeholder={dialogInfo.inputPlaceholder}
               />
-            </View>
-          ) : null}
+            ) : null}
 
-          {dialogInfo?.notice ? (
-            <View
-              style={{
-                paddingHorizontal: DefaultAppStyles.GAP
-              }}
-            >
-              <Notice
-                type={dialogInfo.notice.type || "information"}
-                text={dialogInfo.notice.text}
-              />
-            </View>
-          ) : null}
+            {dialogInfo?.notice ? (
+              <View
+                style={{
+                  paddingHorizontal: DefaultAppStyles.GAP
+                }}
+              >
+                <Notice
+                  type={dialogInfo.notice.type || "information"}
+                  text={dialogInfo.notice.text}
+                />
+              </View>
+            ) : null}
 
-          {dialogInfo.check ? (
-            <>
-              <Button
+            {dialogInfo.check ? (
+              <Checkbox
+                checked={checked}
                 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"}
+                style={{
+                  marginTop: -Spacing.LEVEL_1
+                }}
               />
-            </>
-          ) : null}
-
+            ) : null}
+          </View>
           <DialogButtons
             onPressNegative={onNegativePress}
             onPressPositive={

apps/mobile/app/components/dialogs/applock-password/index.tsx

@@ -16,9 +16,11 @@ 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 { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import React, { useEffect, useRef, useState } from "react";
 import { TextInput, View } from "react-native";
+import { Radius, Spacing } from "../../../common/design/spacing";
 import { db } from "../../../common/database";
 import {
   clearAppLockVerificationCipher,
@@ -33,7 +35,7 @@ import {
   eSubscribeEvent
 } from "../../../services/event-manager";
 import SettingsService from "../../../services/settings";
-import { useSettingStore } from "../../../stores/use-setting-store";
+import { PASSWORD_PLACEHOLDER } from "../../../utils/constants";
 import { getElevationStyle } from "../../../utils/elevation";
 import {
   eCloseAppLocKPasswordDailog,
@@ -42,61 +44,122 @@ import {
 import { AppFontSize } from "../../../utils/size";
 import { sleep } from "../../../utils/time";
 import BaseDialog from "../../dialog/base-dialog";
-import DialogButtons from "../../dialog/dialog-buttons";
-import DialogHeader from "../../dialog/dialog-header";
 import { Toast } from "../../toast";
 import { Button } from "../../ui/button";
-import { IconButton } from "../../ui/icon-button";
-import Input from "../../ui/input";
-import Seperator from "../../ui/seperator";
-import { strings } from "@notesnook/intl";
-import { DefaultAppStyles } from "../../../utils/styles";
+import FormInput, {
+  createFormRef,
+  validators
+} from "../../ui/input/form-input";
+import Heading from "../../ui/typography/heading";
 
 export const AppLockPassword = () => {
   const { colors } = useThemeColors();
   const [mode, setMode] = useState<"create" | "change" | "remove">("create");
-  const [keyboardType, setKeyboardType] = useState<"pin" | "password">(
-    useSettingStore.getState().settings.applockKeyboardType === "default"
-      ? "password"
-      : "pin"
-  );
   const [visible, setVisible] = useState(false);
   const currentPasswordInputRef = useRef<TextInput>(null);
   const passwordInputRef = useRef<TextInput>(null);
   const confirmPasswordInputRef = useRef<TextInput>(null);
-  const values = useRef<{
-    currentPassword?: string;
-    password?: string;
-    confirmPassword?: string;
-  }>({});
-  const [secureTextEntry, setSecureTextEntry] = useState(true);
+  const formRef = useRef(
+    createFormRef({
+      currentPassword: "",
+      password: "",
+      confirmPassword: ""
+    })
+  );
   const [accountPass, setAccountPass] = useState(false);
+  const enableApplock = useRef(false);
 
   useEffect(() => {
     const subs = [
       eSubscribeEvent(
         eOpenAppLockPasswordDialog,
-        (mode: "create" | "change" | "remove") => {
+        (mode: "create" | "change" | "remove", _enableApplock = false) => {
           setMode(mode);
           setAccountPass(false);
           setVisible(true);
+          enableApplock.current = _enableApplock;
         }
       ),
       eSubscribeEvent(eCloseAppLocKPasswordDailog, () => {
-        values.current = {};
-        setVisible(false);
+        close();
       })
     ];
     return () => {
       subs.forEach((sub) => sub?.unsubscribe());
     };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   const close = () => {
-    values.current = {};
+    formRef.current.setValue("currentPassword", "");
+    formRef.current.setValue("password", "");
+    formRef.current.setValue("confirmPassword", "");
+    formRef.current.clearErrors();
     setVisible(false);
   };
 
+  const onSubmit = async () => {
+    if (!formRef.current.validate()) return;
+
+    const currentPassword = formRef.current.getValue("currentPassword");
+    const password = formRef.current.getValue("password");
+
+    if (mode === "create") {
+      setAppLockVerificationCipher(password);
+      SettingsService.setProperty("appLockHasPasswordSecurity", true);
+      if (enableApplock.current) {
+        SettingsService.setProperty("appLockEnabled", true);
+      }
+    } else if (mode === "change") {
+      const isCurrentPasswordCorrect =
+        await validateAppLockPassword(currentPassword);
+
+      if (!isCurrentPasswordCorrect) {
+        formRef.current.setError(
+          "currentPassword",
+          strings.incorrect("password")
+        );
+        return;
+      }
+
+      await clearAppLockVerificationCipher();
+      SettingsService.setProperty("appLockHasPasswordSecurity", true);
+      await setAppLockVerificationCipher(password);
+    } else if (mode === "remove") {
+      const isCurrentPasswordCorrect = accountPass
+        ? await db.user.verifyPassword(password)
+        : await validateAppLockPassword(password);
+
+      if (!isCurrentPasswordCorrect) {
+        formRef.current.setError(
+          "password",
+          accountPass
+            ? strings.passwordIncorrect()
+            : strings.incorrect("password")
+        );
+        return;
+      }
+      clearAppLockVerificationCipher();
+      SettingsService.setProperty("appLockHasPasswordSecurity", false);
+
+      if (
+        !(await BiometricService.isBiometryAvailable()) ||
+        SettingsService.getProperty("biometricsAuthEnabled") === false
+      ) {
+        SettingsService.setProperty("appLockEnabled", false);
+        SettingsService.setPrivacyScreen(
+          SettingsService.getProperty("privacyScreen")
+        );
+        ToastManager.show({
+          message: strings.applockDisabled(),
+          type: "success"
+        });
+      }
+    }
+
+    close();
+  };
+
   return !visible ? null : (
     <BaseDialog
       onShow={async () => {
@@ -115,286 +178,132 @@ export const AppLockPassword = () => {
         style={{
           ...getElevationStyle(10),
           width: DDS.isTab ? 350 : "85%",
-          borderRadius: 10,
+          borderRadius: Radius.MD,
           backgroundColor: colors.primary.background,
-          paddingTop: 12
+          paddingHorizontal: Spacing.LEVEL_3,
+          paddingVertical: Spacing.LEVEL_4,
+          gap: Spacing.LEVEL_4
         }}
       >
-        <DialogHeader
-          title={strings.changeAppLockCredentials(mode, keyboardType)}
-          icon="shield"
-          padding={12}
-        />
-        <Seperator half />
+        <Heading fontSize="XL" lineHeight="100%">
+          {strings.changeAppLockCredentials(mode, "password")}
+        </Heading>
 
-        <View
-          style={{
-            paddingHorizontal: DefaultAppStyles.GAP
-          }}
-        >
+        <View style={{ gap: Spacing.LEVEL_2 }}>
           {mode === "change" ? (
-            <Input
+            <FormInput
+              name="currentPassword"
+              formRef={formRef}
+              label={strings.currentPassword()}
               fwdRef={currentPasswordInputRef}
               autoCapitalize="none"
-              onChangeText={(value) => {
-                values.current.currentPassword = value;
-              }}
-              onSubmit={() => {
-                passwordInputRef.current?.focus();
-              }}
-              defaultValue={values.current.currentPassword}
               autoComplete="password"
+              onSubmitEditing={() => passwordInputRef.current?.focus()}
               returnKeyLabel={strings.next()}
-              keyboardType={keyboardType === "pin" ? "number-pad" : "default"}
               returnKeyType="next"
-              secureTextEntry={secureTextEntry}
-              placeholder={
-                keyboardType === "pin"
-                  ? strings.currentPin()
-                  : strings.currentPassword()
-              }
+              secureTextEntry
+              placeholder={PASSWORD_PLACEHOLDER}
+              containerStyle={{ borderRadius: Radius.XS }}
+              validators={[validators.required(strings.passwordRequired())]}
             />
           ) : null}
 
-          <Input
+          <FormInput
+            name="password"
+            formRef={formRef}
+            label={
+              mode === "change"
+                ? strings.newPassword()
+                : strings.enterPassword()
+            }
             fwdRef={passwordInputRef}
             autoCapitalize="none"
-            onChangeText={(value) => {
-              values.current.password = value;
-            }}
-            onSubmit={() => {
-              confirmPasswordInputRef.current?.focus();
-            }}
-            defaultValue={values.current.password}
-            keyboardType={
-              keyboardType === "pin" && !accountPass ? "number-pad" : "default"
-            }
             autoComplete="password"
+            onSubmitEditing={() => {
+              if (mode !== "remove") {
+                confirmPasswordInputRef.current?.focus();
+              } else {
+                onSubmit();
+              }
+            }}
             returnKeyLabel={
               mode !== "remove" ? strings.next() : strings.remove()
             }
             returnKeyType={mode !== "remove" ? "next" : "done"}
-            secureTextEntry={secureTextEntry}
-            buttonLeft={
-              accountPass ? null : (
-                <IconButton
-                  name={keyboardType === "password" ? "numeric" : "keyboard"}
-                  onPress={() => {
-                    setKeyboardType(
-                      keyboardType === "password" ? "pin" : "password"
-                    );
-                    setSecureTextEntry(false);
-                    setImmediate(() => {
-                      setSecureTextEntry(true);
-                    });
-                  }}
-                  style={{
-                    width: 25,
-                    height: 25,
-                    marginRight: 5
-                  }}
-                  size={AppFontSize.lg}
-                />
-              )
-            }
-            placeholder={
-              accountPass
-                ? strings.enterAccountPassword()
-                : mode === "change"
-                  ? keyboardType === "pin"
-                    ? strings.newPin()
-                    : strings.newPassword()
-                  : `${
-                      keyboardType === "pin"
-                        ? strings.pin()
-                        : strings.password()
-                    }`
-            }
+            secureTextEntry
+            placeholder={PASSWORD_PLACEHOLDER}
+            containerStyle={{ borderRadius: Radius.XS }}
+            validators={[validators.required(strings.passwordRequired())]}
           />
 
           {mode !== "remove" ? (
-            <Input
-              fwdRef={confirmPasswordInputRef}
-              autoCapitalize="none"
-              onChangeText={(value) => {
-                values.current.confirmPassword = value;
-              }}
-              onSubmit={() => {
-                confirmPasswordInputRef.current?.focus();
-              }}
-              defaultValue={values.current.confirmPassword}
-              keyboardType={keyboardType === "pin" ? "number-pad" : "default"}
-              customValidator={() => values.current.password || ""}
-              validationType="confirmPassword"
-              autoComplete="password"
-              returnKeyLabel={strings.done()}
-              returnKeyType="done"
-              secureTextEntry={secureTextEntry}
-              placeholder={
-                keyboardType === "pin"
-                  ? strings.confirmPin()
+            <FormInput
+              name="confirmPassword"
+              formRef={formRef}
+              label={
+                mode === "change"
+                  ? strings.confirmNewPassword()
                   : strings.confirmPassword()
               }
+              fwdRef={confirmPasswordInputRef}
+              autoCapitalize="none"
+              autoComplete="password"
+              onSubmitEditing={() => onSubmit()}
+              returnKeyLabel={strings.done()}
+              returnKeyType="done"
+              secureTextEntry
+              placeholder={PASSWORD_PLACEHOLDER}
+              containerStyle={{ borderRadius: Radius.XS }}
+              validators={[
+                validators.required(strings.confirmPasswordRequired()),
+                validators.matchField("password", strings.passwordNotMatched())
+              ]}
             />
           ) : null}
 
           {mode === "remove" ? (
-            <>
-              <Button
-                icon={
-                  accountPass ? "checkbox-marked" : "checkbox-blank-outline"
-                }
-                onPress={() => {
-                  setSecureTextEntry(false);
-                  setAccountPass(!accountPass);
-                  setTimeout(() => {
-                    setSecureTextEntry(true);
-                  });
-                }}
-                iconSize={AppFontSize.lg}
-                type="plain"
-                iconColor={
-                  accountPass ? colors.primary.accent : colors.primary.icon
-                }
-                title={strings.useAccountPassword()}
-                style={{
-                  width: "100%",
-                  alignSelf: "flex-start",
-                  justifyContent: "flex-start",
-                  paddingHorizontal: 0,
-                  paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL
-                }}
-              />
-            </>
+            <Button
+              icon={accountPass ? "checkbox" : "box-empty"}
+              iconFamily="notesnook"
+              onPress={() => setAccountPass(!accountPass)}
+              iconSize={AppFontSize.sm}
+              fontFamily="MEDIUM"
+              fontSize={AppFontSize.xs}
+              type="plain"
+              iconColor={
+                accountPass
+                  ? [colors.primary.accent, colors.primary.accentForeground]
+                  : colors.primary.icon
+              }
+              textStyle={{
+                color: colors.primary.paragraph
+              }}
+              title={strings.useAccountPassword()}
+              style={{
+                width: "100%",
+                alignSelf: "flex-start",
+                justifyContent: "flex-start",
+                paddingHorizontal: 0,
+                paddingVertical: 0
+              }}
+            />
           ) : null}
         </View>
 
-        <DialogButtons
-          onPressNegative={close}
-          onPressPositive={async () => {
-            if (mode === "create") {
-              if (!values.current.password || !values.current.confirmPassword) {
-                ToastManager.error(
-                  new Error(strings.allFieldsRequired()),
-                  undefined,
-                  "local"
-                );
-                return;
-              }
-
-              if (values.current.password !== values.current.confirmPassword) {
-                ToastManager.error(
-                  new Error(strings.mismatch(keyboardType)),
-                  undefined,
-                  "local"
-                );
-                return;
-              }
-              const password = values.current.password;
-              setAppLockVerificationCipher(password);
-              SettingsService.setProperty("appLockHasPasswordSecurity", true);
-            } else if (mode === "change") {
-              if (
-                !values.current.currentPassword ||
-                !values.current.password ||
-                !values.current.confirmPassword
-              ) {
-                ToastManager.error(
-                  new Error(strings.allFieldsRequired()),
-                  undefined,
-                  "local"
-                );
-                return;
-              }
-
-              if (values.current.password !== values.current.confirmPassword) {
-                ToastManager.error(
-                  new Error(strings.mismatch(keyboardType)),
-                  undefined,
-                  "local"
-                );
-                return;
-              }
-              const isCurrentPasswordCorrect = await validateAppLockPassword(
-                values.current.currentPassword
-              );
-
-              if (!isCurrentPasswordCorrect) {
-                ToastManager.error(
-                  new Error(strings.incorrect(keyboardType)),
-                  undefined,
-                  "local"
-                );
-                return;
-              }
-
-              const password = values.current.password;
-              await clearAppLockVerificationCipher();
-              SettingsService.setProperty("appLockHasPasswordSecurity", true);
-              await setAppLockVerificationCipher(password);
-            } else if (mode === "remove") {
-              if (!values.current.password) {
-                ToastManager.error(
-                  new Error(strings.allFieldsRequired()),
-                  undefined,
-                  "local"
-                );
-                return;
-              }
-
-              const isCurrentPasswordCorrect = accountPass
-                ? await db.user.verifyPassword(values.current.password)
-                : await validateAppLockPassword(values.current.password);
-
-              if (!isCurrentPasswordCorrect) {
-                ToastManager.error(
-                  new Error(
-                    accountPass
-                      ? strings.passwordIncorrect()
-                      : strings.incorrect(keyboardType)
-                  ),
-                  undefined,
-                  "local"
-                );
-                return;
-              }
-              clearAppLockVerificationCipher();
-              SettingsService.setProperty("appLockHasPasswordSecurity", false);
-
-              if (
-                !(await BiometricService.isBiometryAvailable()) ||
-                SettingsService.getProperty("biometricsAuthEnabled") === false
-              ) {
-                SettingsService.setProperty("appLockEnabled", false);
-                SettingsService.setPrivacyScreen(
-                  SettingsService.getProperty("privacyScreen")
-                );
-                ToastManager.show({
-                  message: strings.applockDisabled(),
-                  type: "success"
-                });
-              }
-            }
-
-            SettingsService.setProperty(
-              "applockKeyboardType",
-              keyboardType === "password" ? "default" : "numeric"
-            );
-
-            close();
-          }}
-          positiveTitle={
-            mode === "remove"
-              ? strings.remove()
-              : mode === "change"
-                ? strings.change()
-                : strings.save()
-          }
-          negativeTitle={strings.cancel()}
-          positiveType="transparent"
-          loading={false}
-          doneText=""
-        />
+        <View style={{ flexDirection: "row", gap: Spacing.LEVEL_2 }}>
+          <Button
+            title={strings.cancel()}
+            type="plain-outline"
+            onPress={close}
+            style={{ flex: 1, paddingVertical: Spacing.LEVEL_3 }}
+          />
+          <Button
+            title={mode === "remove" ? strings.remove() : strings.save()}
+            type="accent"
+            onPress={onSubmit}
+            style={{ flex: 1, paddingVertical: Spacing.LEVEL_3 }}
+          />
+        </View>
       </View>
 
       <Toast context="local" />
@@ -402,6 +311,9 @@ export const AppLockPassword = () => {
   );
 };
 
-AppLockPassword.present = (mode: "create" | "change" | "remove") => {
-  eSendEvent(eOpenAppLockPasswordDialog, mode);
+AppLockPassword.present = (
+  mode: "create" | "change" | "remove",
+  enableAppLock?: boolean
+) => {
+  eSendEvent(eOpenAppLockPasswordDialog, mode, enableAppLock);
 };

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

@@ -45,6 +45,7 @@ import { IconButton } from "../../ui/icon-button";
 import { ProgressBarComponent } from "../../ui/svg/lazy";
 import Paragraph from "../../ui/typography/paragraph";
 import ReactNativeBlobUtil from "react-native-blob-util";
+import { useSettingStore } from "../../../stores/use-setting-store";
 
 const WIN_WIDTH = Dimensions.get("window").width;
 const WIN_HEIGHT = Dimensions.get("window").height;
@@ -286,6 +287,9 @@ const PDFPreview = () => {
                     color={colors.static.white}
                     name="open-in-new"
                     onPress={() => {
+                      useSettingStore
+                        .getState()
+                        .setAppDidEnterBackgroundForAction(true);
                       FileViewer.open(pdfSource, {
                         showOpenWithDialog: true,
                         showAppsSuggestions: true

apps/mobile/app/components/dialogs/progress/index.tsx

@@ -17,28 +17,8 @@ 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, { useEffect } from "react";
-import { View } from "react-native";
-import { eSendEvent, eSubscribeEvent } from "../../../services/event-manager";
-import { AppFontSize } from "../../../utils/size";
-import { Dialog } from "../../dialog";
-import BaseDialog from "../../dialog/base-dialog";
-import DialogContainer from "../../dialog/dialog-container";
-import { Button } from "../../ui/button";
-import { ProgressBarComponent } from "../../ui/svg/lazy";
-import Heading from "../../ui/typography/heading";
-import Paragraph from "../../ui/typography/paragraph";
-import { DefaultAppStyles } from "../../../utils/styles";
-
-export type ProgressOptions = {
-  progress?: string;
-  cancelCallback?: () => void;
-  title?: string;
-  paragraph?: string;
-  fillBackground?: boolean;
-  canHideProgress?: boolean;
-};
+import { eSendEvent } from "../../../services/event-manager";
+import { ProgressOptions } from "./progress";
 
 export const PROGRESS_EVENTS = {
   start: "startProgress",
@@ -46,146 +26,6 @@ export const PROGRESS_EVENTS = {
   update: "updateProgress"
 };
 
-export default function Progress() {
-  const { colors } = useThemeColors();
-  const [progress, setProgress] = React.useState<string | undefined>();
-  const [visible, setVisible] = React.useState(false);
-  const cancelCallback = React.useRef<() => void>(undefined);
-  const [data, setData] = React.useState<{
-    title?: string;
-    paragraph?: string;
-    fillBackground?: boolean;
-    canHideProgress?: boolean;
-  }>();
-
-  useEffect(() => {
-    const events = [
-      eSubscribeEvent(PROGRESS_EVENTS.start, (options: ProgressOptions) => {
-        setProgress(options.progress);
-        cancelCallback.current = options.cancelCallback;
-
-        setData({
-          title: options.title,
-          paragraph: options.paragraph,
-          fillBackground: options.fillBackground,
-          canHideProgress: options.canHideProgress
-        });
-        setVisible(true);
-      }),
-      eSubscribeEvent(PROGRESS_EVENTS.end, () => {
-        setProgress(undefined);
-        setVisible(false);
-        setData(undefined);
-        cancelCallback.current?.();
-        cancelCallback.current = undefined;
-      }),
-      eSubscribeEvent(PROGRESS_EVENTS.update, (options: ProgressOptions) => {
-        setProgress(options.progress);
-        if (options.cancelCallback) {
-          cancelCallback.current = options.cancelCallback;
-        }
-
-        const data: ProgressOptions = {};
-        if (options.title) data.title = options.title;
-        if (options.paragraph) data.paragraph = options.paragraph;
-        if (options.fillBackground)
-          data.fillBackground = options.fillBackground;
-
-        setData((current) => {
-          return {
-            ...current,
-            ...data
-          };
-        });
-      })
-    ];
-    return () => {
-      events.forEach((event) => event?.unsubscribe());
-      cancelCallback.current = undefined;
-    };
-  }, []);
-
-  return !visible ? null : (
-    <BaseDialog
-      background={data?.fillBackground ? colors.primary.background : undefined}
-      visible
-    >
-      <DialogContainer
-        style={{
-          paddingHorizontal: DefaultAppStyles.GAP,
-          paddingBottom: 10
-        }}
-        noBorder={data?.fillBackground ? true : false}
-      >
-        <Dialog context="local" />
-        <View
-          style={{
-            justifyContent: "center",
-            alignItems: "center",
-            paddingHorizontal: DefaultAppStyles.GAP,
-            gap: 10,
-            paddingBottom: 20
-          }}
-        >
-          <Heading
-            style={{
-              textAlign: "center"
-            }}
-            color={colors.primary.paragraph}
-            size={AppFontSize.lg}
-          >
-            {data?.title}
-          </Heading>
-          <Paragraph
-            style={{
-              textAlign: "center"
-            }}
-            color={colors.secondary.paragraph}
-          >
-            {progress ? progress : data?.paragraph}
-          </Paragraph>
-
-          <View
-            style={{
-              flexDirection: "row",
-              width: 100,
-              paddingVertical: DefaultAppStyles.GAP_VERTICAL
-            }}
-          >
-            <ProgressBarComponent
-              height={5}
-              width={100}
-              animated={true}
-              useNativeDriver
-              indeterminate
-              indeterminateAnimationDuration={2000}
-              unfilledColor={colors.secondary.background}
-              color={colors.primary.accent}
-              borderWidth={0}
-            />
-          </View>
-
-          {!data?.canHideProgress ? null : (
-            <Button
-              title={cancelCallback.current ? "Cancel" : "Hide"}
-              type="secondaryAccented"
-              onPress={() => {
-                if (cancelCallback.current) {
-                  cancelCallback.current?.();
-                }
-                setVisible(false);
-                setProgress(undefined);
-                setData(undefined);
-              }}
-              width="100%"
-            />
-          )}
-        </View>
-      </DialogContainer>
-    </BaseDialog>
-  );
-}
-
 export function startProgress(options: ProgressOptions) {
   eSendEvent(PROGRESS_EVENTS.start, options);
 }

apps/mobile/app/components/dialogs/progress/progress.tsx

@@ -0,0 +1,210 @@
+/*
+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, { useEffect } from "react";
+import { View } from "react-native";
+import { PROGRESS_EVENTS } from ".";
+import { Radius, Spacing } from "../../../common/design/spacing";
+import { eSubscribeEvent } from "../../../services/event-manager";
+import { AppFontSize } from "../../../utils/size";
+import { Dialog } from "../../dialog";
+import BaseDialog from "../../dialog/base-dialog";
+import DialogContainer from "../../dialog/dialog-container";
+import AppIcon from "../../ui/AppIcon";
+import { Button } from "../../ui/button";
+import { ProgressBarComponent } from "../../ui/svg/lazy";
+import Heading from "../../ui/typography/heading";
+import Paragraph from "../../ui/typography/paragraph";
+
+export type ProgressOptions = {
+  progress?: string;
+  cancelCallback?: () => void;
+  title?: string;
+  paragraph?: string;
+  fillBackground?: boolean;
+  canHideProgress?: boolean;
+  icon?: string;
+};
+
+export default function Progress() {
+  const { colors } = useThemeColors();
+  const [progress, setProgress] = React.useState<string | undefined>();
+  const [visible, setVisible] = React.useState(false);
+  const cancelCallback = React.useRef<() => void>(undefined);
+  const [data, setData] = React.useState<{
+    title?: string;
+    paragraph?: string;
+    fillBackground?: boolean;
+    canHideProgress?: boolean;
+    icon?: string;
+  }>();
+
+  useEffect(() => {
+    const events = [
+      eSubscribeEvent(PROGRESS_EVENTS.start, (options: ProgressOptions) => {
+        setProgress(options.progress);
+        cancelCallback.current = options.cancelCallback;
+
+        setData({
+          ...options
+        });
+        setVisible(true);
+      }),
+      eSubscribeEvent(PROGRESS_EVENTS.end, () => {
+        setProgress(undefined);
+        setVisible(false);
+        setData(undefined);
+        cancelCallback.current?.();
+        cancelCallback.current = undefined;
+      }),
+      eSubscribeEvent(PROGRESS_EVENTS.update, (options: ProgressOptions) => {
+        setProgress(options.progress);
+        if (options.cancelCallback) {
+          cancelCallback.current = options.cancelCallback;
+        }
+
+        const data: ProgressOptions = {};
+        if (options.title) data.title = options.title;
+        if (options.paragraph) data.paragraph = options.paragraph;
+        if (options.fillBackground)
+          data.fillBackground = options.fillBackground;
+        if (options.icon) {
+          data.icon = options.icon;
+        }
+
+        setData((current) => {
+          return {
+            ...current,
+            ...data
+          };
+        });
+      })
+    ];
+    return () => {
+      events.forEach((event) => event?.unsubscribe());
+      cancelCallback.current = undefined;
+    };
+  }, []);
+
+  return !visible ? null : (
+    <BaseDialog
+      background={data?.fillBackground ? colors.primary.background : undefined}
+      visible
+    >
+      <DialogContainer
+        style={{
+          padding: Spacing.LEVEL_4
+        }}
+        noBorder={data?.fillBackground ? true : false}
+      >
+        <Dialog context="local" />
+        <View
+          style={{
+            justifyContent: "center",
+            alignItems: "center",
+            gap: Spacing.LEVEL_4,
+            paddingTop: Spacing.LEVEL_1
+          }}
+        >
+          {data?.icon ? (
+            <View
+              style={{
+                width: 40,
+                height: 40,
+                borderRadius: Radius.XS,
+                alignItems: "center",
+                justifyContent: "center",
+                backgroundColor: colors.secondary.background
+              }}
+            >
+              <AppIcon
+                name={data?.icon}
+                iconFamily="notesnook"
+                size={20}
+                color={colors.primary.icon}
+              />
+            </View>
+          ) : null}
+
+          <View
+            style={{
+              gap: Spacing.LEVEL_1
+            }}
+          >
+            <Heading
+              style={{
+                textAlign: "center"
+              }}
+              color={colors.primary.heading}
+              size={AppFontSize.lg}
+            >
+              {data?.title}
+            </Heading>
+            <Paragraph
+              style={{
+                textAlign: "center"
+              }}
+              color={colors.secondary.paragraph}
+            >
+              {progress ? progress : data?.paragraph}
+            </Paragraph>
+
+            <View
+              style={{
+                flexDirection: "row",
+                width: "100%"
+              }}
+            >
+              <ProgressBarComponent
+                height={8}
+                width={null}
+                style={{
+                  flex: 1
+                }}
+                animated={true}
+                useNativeDriver
+                indeterminate
+                indeterminateAnimationDuration={2000}
+                unfilledColor={colors.secondary.background}
+                color={colors.primary.accent}
+                borderWidth={0}
+              />
+            </View>
+          </View>
+
+          {!data?.canHideProgress ? null : (
+            <Button
+              title={cancelCallback.current ? "Cancel" : "Hide"}
+              type="accent"
+              onPress={() => {
+                if (cancelCallback.current) {
+                  cancelCallback.current?.();
+                }
+                setVisible(false);
+                setProgress(undefined);
+                setData(undefined);
+              }}
+              width={160}
+            />
+          )}
+        </View>
+      </DialogContainer>
+    </BaseDialog>
+  );
+}

apps/mobile/app/components/dialogs/vault/index.tsx

@@ -55,10 +55,7 @@ import FormInput, {
   createFormRef,
   validators
 } from "../../ui/input/form-input";
-import Seperator from "../../ui/seperator";
-import Paragraph from "../../ui/typography/paragraph";
 import { strings } from "@notesnook/intl";
-import { DefaultAppStyles } from "../../../utils/styles";
 import {
   isEncryptedContent,
   Note,
@@ -67,9 +64,13 @@ import {
 } from "@notesnook/core";
 import { useThemeColors } from "@notesnook/theme";
 import { useUserStore } from "../../../stores/use-user-store";
-import { AppFontSize } from "../../../utils/size";
 import { Pressable } from "../../ui/pressable";
 import AppIcon from "../../ui/AppIcon";
+import { Radius, Spacing } from "../../../common/design/spacing";
+import { PASSWORD_PLACEHOLDER } from "../../../utils/constants";
+import { AppFontSize } from "../../../utils/size";
+import { useSettingStore } from "../../../stores/use-setting-store";
+import { Checkbox } from "../../ui/checkbox";
 
 export const VaultDialog: React.FC = () => {
   const { colors } = useThemeColors();
@@ -91,7 +92,7 @@ export const VaultDialog: React.FC = () => {
   const paragraphRef = useRef<string | null>(null);
   const buttonTitleRef = useRef<string | null>(null);
   const positiveButtonTypeRef = useRef<"errorShade" | "transparent" | "accent">(
-    "transparent"
+    "accent"
   );
   const customActionTitleRef = useRef<string | null>(null);
   const customActionParagraphRef = useRef<string | null>(null);
@@ -119,6 +120,7 @@ export const VaultDialog: React.FC = () => {
   const passInputRef = useRef<TextInput>(null);
   const confirmPassRef = useRef<TextInput>(null);
   const newPassInputRef = useRef<TextInput>(null);
+  const [icon, setIcon] = useState<string>();
 
   const close = useCallback(() => {
     if (loading) {
@@ -146,7 +148,7 @@ export const VaultDialog: React.FC = () => {
     descriptionRef.current = null;
     paragraphRef.current = null;
     buttonTitleRef.current = null;
-    positiveButtonTypeRef.current = "transparent";
+    positiveButtonTypeRef.current = "accent";
     customActionTitleRef.current = null;
     customActionParagraphRef.current = null;
     noteLockedRef.current = false;
@@ -186,7 +188,6 @@ export const VaultDialog: React.FC = () => {
         }
         await db.vault.delete(deleteAll);
         await BiometricService.resetCredentials();
-
         if (deleteAll) {
           noteIds.forEach((id) => {
             eSendEvent(
@@ -355,6 +356,7 @@ export const VaultDialog: React.FC = () => {
     async (note: Note & { content?: NoteContent<false> }) => {
       close();
       try {
+        useSettingStore.getState().setAppDidEnterBackgroundForAction(true);
         await Share.open({
           title: note.title,
           failOnCancel: false,
@@ -628,7 +630,7 @@ export const VaultDialog: React.FC = () => {
       descriptionRef.current = data.description || null;
       paragraphRef.current = data.paragraph || null;
       buttonTitleRef.current = data.buttonTitle || null;
-      positiveButtonTypeRef.current = data.positiveButtonType || "transparent";
+      positiveButtonTypeRef.current = data.positiveButtonType || "accent";
       customActionTitleRef.current = data.customActionTitle || null;
       customActionParagraphRef.current = data.customActionParagraph || null;
       onUnlockRef.current = data.onUnlock;
@@ -637,7 +639,8 @@ export const VaultDialog: React.FC = () => {
       // Set UI state
       setIsBiometryAvailable(available);
       setIsBiometryEnrolled(fingerprint);
-      setBiometricUnlock(fingerprint);
+      // setBiometricUnlock(fingerprint);
+      setIcon(data.icon);
       setDeleteAll(false);
       setLoading(false);
 
@@ -707,24 +710,36 @@ export const VaultDialog: React.FC = () => {
         style={{
           ...getElevationStyle(5),
           width: DDS.isTab ? 350 : "85%",
-          borderRadius: 10,
+          borderRadius: Radius.MD,
           backgroundColor: colors.primary.background,
-          paddingTop: 12,
+          paddingVertical: Spacing.LEVEL_4,
           overflow: "hidden"
         }}
       >
         <DialogHeader
-          title={titleRef.current}
+          title={
+            requestType === VaultRequestType.PermanentUnlock
+              ? noteRef.current?.title
+              : titleRef.current
+          }
           paragraph={
             paragraphRef.current || customActionParagraphRef.current || ""
           }
-          icon="shield"
-          padding={12}
+          style={{
+            paddingHorizontal: Spacing.LEVEL_3
+          }}
+          centered={!!icon}
+          icon={icon}
+          iconType="error"
+          iconFamily="notesnook"
         />
 
         <View
           style={{
-            paddingHorizontal: DefaultAppStyles.GAP
+            paddingHorizontal: Spacing.LEVEL_3,
+            gap: isDeleteVault ? 0 : Spacing.LEVEL_4,
+            marginTop: Spacing.LEVEL_4,
+            marginBottom: Spacing.LEVEL_4
           }}
         >
           {(isChangePassword ||
@@ -743,20 +758,20 @@ export const VaultDialog: React.FC = () => {
               <FormInput
                 name="password"
                 formRef={formRef}
+                label={
+                  isDeleteVault
+                    ? strings.enterAccountPassword()
+                    : isClearVault
+                      ? strings.enterVaultPassword()
+                      : isChangePassword
+                        ? strings.currentPassword()
+                        : strings.password()
+                }
                 fwdRef={passInputRef}
                 editable={!loading}
                 autoCapitalize="none"
                 testID={notesnook.ids.dialogs.vault.pwd}
                 autoComplete="password"
-                marginBottom={
-                  !biometricUnlock ||
-                  !isBiometryEnrolled ||
-                  isCreateVault ||
-                  isChangePassword ||
-                  isCustomAction
-                    ? 0
-                    : 10
-                }
                 onSubmitEditing={() => {
                   if (isChangePassword) {
                     newPassInputRef.current?.focus();
@@ -769,11 +784,7 @@ export const VaultDialog: React.FC = () => {
                 }
                 returnKeyType={isChangePassword ? "next" : "done"}
                 secureTextEntry
-                placeholder={
-                  isChangePassword
-                    ? strings.currentPassword()
-                    : strings.password()
-                }
+                placeholder={PASSWORD_PLACEHOLDER}
                 validators={[validators.required(strings.passwordRequired())]}
               />
 
@@ -798,39 +809,38 @@ export const VaultDialog: React.FC = () => {
           ) : null}
 
           {isDeleteVault && (
-            <Pressable
+            <Button
               onPress={() => setDeleteAll(!deleteAll)}
+              icon={deleteAll ? "checkbox" : "box-empty"}
+              iconFamily="notesnook"
+              fontFamily="MEDIUM"
+              iconSize={14}
+              fontSize={AppFontSize.sm}
+              width="100%"
               style={{
+                justifyContent: "flex-start",
+                paddingHorizontal: 0,
                 paddingVertical: 0,
-                flexDirection: "row",
-                gap: DefaultAppStyles.GAP_SMALL,
-                marginTop: isUserLoggedIn
-                  ? DefaultAppStyles.GAP_VERTICAL_SMALL
-                  : 0,
-                justifyContent: "flex-start"
+                marginTop: Spacing.LEVEL_1
               }}
-            >
-              <AppIcon
-                name={
-                  deleteAll
-                    ? "check-circle-outline"
-                    : "checkbox-blank-circle-outline"
-                }
-                color={colors.error.accent}
-                size={AppFontSize.md}
-              />
-
-              <Paragraph color={colors.error.accent} size={AppFontSize.sm}>
-                {strings.deleteAllNotes()}
-              </Paragraph>
-            </Pressable>
+              title={strings.deleteAllNotes()}
+              type="transparent"
+              iconColor={
+                deleteAll
+                  ? [colors.error.accent, colors.error.accentForeground]
+                  : colors.error.accent
+              }
+              textStyle={{
+                color: colors.error.accent
+              }}
+            />
           )}
 
           {isChangePassword ? (
             <>
-              <Seperator half />
               <FormInput
                 name="newPassword"
+                label={strings.newPassword()}
                 formRef={formRef}
                 fwdRef={newPassInputRef}
                 editable={!loading}
@@ -843,16 +853,21 @@ export const VaultDialog: React.FC = () => {
                 returnKeyLabel="Change"
                 returnKeyType="done"
                 secureTextEntry
-                placeholder={strings.newPassword()}
+                placeholder={PASSWORD_PLACEHOLDER}
                 validators={[validators.required(strings.passwordRequired())]}
               />
             </>
           ) : null}
 
           {isCreateVault ? (
-            <View>
+            <View
+              style={{
+                gap: Spacing.LEVEL_2
+              }}
+            >
               <FormInput
                 name="password"
+                label={strings.password()}
                 formRef={formRef}
                 fwdRef={passInputRef}
                 autoCapitalize="none"
@@ -864,12 +879,13 @@ export const VaultDialog: React.FC = () => {
                 onSubmitEditing={() => {
                   confirmPassRef.current?.focus();
                 }}
-                placeholder={strings.password()}
+                placeholder={PASSWORD_PLACEHOLDER}
                 validators={[validators.required(strings.passwordRequired())]}
               />
 
               <FormInput
                 name="confirmPassword"
+                label={strings.confirmPassword()}
                 formRef={formRef}
                 fwdRef={confirmPassRef}
                 autoCapitalize="none"
@@ -882,7 +898,7 @@ export const VaultDialog: React.FC = () => {
                 onSubmitEditing={() => {
                   onPress();
                 }}
-                placeholder={strings.confirmPassword()}
+                placeholder={PASSWORD_PLACEHOLDER}
                 validators={[
                   validators.required(strings.confirmPasswordRequired()),
                   validators.matchField(
@@ -894,12 +910,7 @@ export const VaultDialog: React.FC = () => {
             </View>
           ) : null}
 
-          {biometricUnlock && !isBiometryEnrolled && !isCreateVault ? (
-            <Paragraph>{strings.vaultEnableBiometrics()}</Paragraph>
-          ) : null}
-
-          {!biometricUnlock &&
-          !isBiometryEnrolled &&
+          {!isBiometryEnrolled &&
           isBiometryAvailable &&
           (requestType === VaultRequestType.CopyNote ||
             requestType === VaultRequestType.DeleteNote ||
@@ -908,20 +919,16 @@ export const VaultDialog: React.FC = () => {
             requestType === VaultRequestType.GoToEditor ||
             requestType === VaultRequestType.PermanentUnlock ||
             requestType === VaultRequestType.LockNote) ? (
-            <Button
+            <Checkbox
+              title={strings.vaultEnableBiometrics()}
+              checked={biometricUnlock}
+              iconSize={12}
+              style={{
+                marginTop: -Spacing.LEVEL_1
+              }}
               onPress={() => {
                 setBiometricUnlock(!biometricUnlock);
               }}
-              style={{
-                marginTop: DefaultAppStyles.GAP_VERTICAL
-              }}
-              icon="fingerprint"
-              width="100%"
-              title={strings.unlockWithBiometrics()}
-              iconColor={
-                biometricUnlock ? colors.selected.accent : colors.primary.icon
-              }
-              type={biometricUnlock ? "transparent" : "plain"}
             />
           ) : null}
         </View>

apps/mobile/app/components/fluid-panels/index.tsx

@@ -51,9 +51,10 @@ interface TabProps extends ViewProps {
   onScroll: (offset: number) => void;
   enabled: boolean;
   onDrawerStateChange: (state: boolean) => void;
+  initialPage?: FluidTabPage;
 }
 
-type FluidTabPage = "home" | "editor";
+export type FluidTabPage = "home" | "editor";
 
 export interface TabsRef {
   goToPage: (page: FluidTabPage, animated?: boolean) => void;
@@ -77,15 +78,21 @@ export const FluidPanels = forwardRef<TabsRef, TabProps>(function FluidTabs(
     onChangeTab,
     onScroll,
     enabled,
-    onDrawerStateChange
+    onDrawerStateChange,
+    initialPage
   }: TabProps,
   ref
 ) {
   const deviceMode = useSettingStore((state) => state.deviceMode);
   const fullscreen = useSettingStore((state) => state.fullscreen);
-  const translateX = useSharedValue(widths ? widths.sidebar : 0);
+  const editorStartPosition = widths.sidebar + widths.list;
+  const translateX = useSharedValue(
+    initialPage === "editor" ? editorStartPosition : widths ? widths.sidebar : 0
+  );
   const startX = useSharedValue(0);
-  const currentTab = useSharedValue(1);
+  const currentTab = useSharedValue(
+    initialPage === "editor" && deviceMode !== "tablet" ? 2 : 1
+  );
   const previousTab = useSharedValue(1);
   const isDrawerOpen = useSharedValue(false);
   const gestureStartValue = useSharedValue({

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

@@ -17,25 +17,23 @@ 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, useState } from "react";
-import { View } from "react-native";
+import { Platform, View, ViewStyle } from "react-native";
+import { notesnook } from "../../../e2e/test.ids";
+import { Radius, Spacing } from "../../common/design/spacing";
 import {
   eSubscribeEvent,
   eUnSubscribeEvent
 } from "../../services/event-manager";
+import Navigation from "../../services/navigation";
 import { RouteName } from "../../stores/use-navigation-store";
 import { useSelectionStore } from "../../stores/use-selection-store";
+import { useSettingStore } from "../../stores/use-setting-store";
 import { eScrollEvent } from "../../utils/events";
-import { AppFontSize } from "../../utils/size";
-import { DefaultAppStyles } from "../../utils/styles";
-import { IconButtonProps } from "../ui/icon-button";
-import { Pressable } from "../ui/pressable";
+import { fluidTabsRef } from "../../utils/global-refs";
+import { IconButton, IconButtonProps } from "../ui/icon-button";
 import Heading from "../ui/typography/heading";
-import Paragraph from "../ui/typography/paragraph";
-import { LeftMenus } from "./left-menus";
-import { RightMenus } from "./right-menus";
 
 export const Header = ({
   renderedInRoute,
@@ -45,7 +43,8 @@ export const Header = ({
   canGoBack,
   hasSearch,
   onSearch,
-  rightButton
+  rightButton,
+  style
 }: {
   onLeftMenuButtonPress?: () => void;
   renderedInRoute?: RouteName;
@@ -56,6 +55,7 @@ export const Header = ({
   hasSearch?: boolean;
   onSearch?: () => void;
   rightButton?: IconButtonProps;
+  style?: ViewStyle;
 }) => {
   const { colors } = useThemeColors();
   const [borderHidden, setBorderHidden] = useState(true);
@@ -64,6 +64,9 @@ export const Header = ({
     state.selectionMode
   ]);
 
+  const deviceMode = useSettingStore((state) => state.deviceMode);
+  const isTablet = deviceMode === "tablet";
+
   const onScroll = useCallback(
     (data: { x: number; y: number; id?: string; route: string }) => {
       if (data.route !== renderedInRoute || data.id !== id) return;
@@ -85,34 +88,60 @@ export const Header = ({
     };
   }, [borderHidden, onScroll]);
 
-  const HeaderWrapper = hasSearch ? Pressable : View;
+  const _onLeftButtonPress = () => {
+    if (onLeftMenuButtonPress) return onLeftMenuButtonPress();
+
+    if (!canGoBack) {
+      if (fluidTabsRef.current?.isDrawerOpen()) {
+        Navigation.closeDrawer();
+      } else {
+        Navigation.openDrawer();
+      }
+      return;
+    }
+    Navigation.goBack();
+  };
 
   return (
     <View
       style={{
-        paddingHorizontal: DefaultAppStyles.GAP
+        paddingHorizontal: Spacing.LEVEL_3,
+        marginTop: Platform.OS === "android" ? 5 : 0
       }}
     >
-      <HeaderWrapper
-        style={{
-          flexDirection: "row",
-          justifyContent: "space-between",
-          borderRadius: 10,
-          paddingVertical: 3,
-          borderWidth: hasSearch ? 1 : 0,
-          borderColor: colors.primary.border,
-          paddingHorizontal: !hasSearch ? 0 : DefaultAppStyles.GAP_SMALL,
-          alignItems: "center"
-        }}
+      <View
+        style={[
+          {
+            flexDirection: "row",
+            justifyContent: "space-between",
+            borderRadius: Radius.S,
+            paddingVertical: Spacing.LEVEL_3,
+            backgroundColor: colors.secondary.background,
+            alignItems: "center"
+          },
+          style
+        ]}
         testID="search-header"
-        onPress={() => {
-          onSearch?.();
-        }}
       >
-        <LeftMenus
-          canGoBack={canGoBack}
-          onLeftButtonPress={onLeftMenuButtonPress}
-        />
+        {isTablet && !canGoBack ? null : (
+          <IconButton
+            testID={notesnook.ids.default.header.buttons.left}
+            left={40}
+            top={40}
+            onPress={_onLeftButtonPress}
+            onLongPress={() => {
+              Navigation.popToTop();
+            }}
+            style={{
+              width: 20,
+              height: 20
+            }}
+            size={20}
+            name={canGoBack ? "arrow-back" : "menu"}
+            iconFamily="notesnook"
+            color={colors.primary.icon}
+          />
+        )}
 
         {!title ? (
           <View
@@ -123,18 +152,46 @@ export const Header = ({
               borderRadius: 100
             }}
           />
-        ) : hasSearch ? (
-          <Paragraph>
-            {selectionMode
-              ? `${selectedItemsList.length} selected`
-              : strings.searchInRoute(title)}
-          </Paragraph>
         ) : (
-          <Heading size={AppFontSize.lg}>{title}</Heading>
+          <Heading fontSize="XL">
+            {selectionMode ? `${selectedItemsList.length} selected` : title}
+          </Heading>
         )}
 
-        <RightMenus rightButton={rightButton} />
-      </HeaderWrapper>
+        <View
+          style={{
+            flexDirection: "row",
+            alignItems: "center"
+          }}
+        >
+          {rightButton ? (
+            <IconButton {...rightButton} color={colors.primary.icon} />
+          ) : !hasSearch ? (
+            <View
+              style={{
+                width: 20,
+                height: 20
+              }}
+            />
+          ) : null}
+
+          {hasSearch ? (
+            <IconButton
+              color={colors.primary.icon}
+              size={20}
+              onPress={() => {
+                onSearch?.();
+              }}
+              style={{
+                width: 20,
+                height: 20
+              }}
+              iconFamily="notesnook"
+              name="search"
+            />
+          ) : null}
+        </View>
+      </View>
     </View>
   );
 };

apps/mobile/app/components/header/left-menus.tsx

@@ -1,66 +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 { useThemeColors } from "@notesnook/theme";
-import React from "react";
-import { notesnook } from "../../../e2e/test.ids";
-import Navigation from "../../services/navigation";
-import { useSettingStore } from "../../stores/use-setting-store";
-import { fluidTabsRef } from "../../utils/global-refs";
-import { IconButton } from "../ui/icon-button";
-
-export const LeftMenus = ({
-  canGoBack,
-  onLeftButtonPress
-}: {
-  canGoBack?: boolean;
-  onLeftButtonPress?: () => void;
-}) => {
-  const { colors } = useThemeColors();
-  const deviceMode = useSettingStore((state) => state.deviceMode);
-  const isTablet = deviceMode === "tablet";
-
-  const _onLeftButtonPress = () => {
-    if (onLeftButtonPress) return onLeftButtonPress();
-
-    if (!canGoBack) {
-      if (fluidTabsRef.current?.isDrawerOpen()) {
-        Navigation.closeDrawer();
-      } else {
-        Navigation.openDrawer();
-      }
-      return;
-    }
-    Navigation.goBack();
-  };
-
-  return isTablet && !canGoBack ? null : (
-    <IconButton
-      testID={notesnook.ids.default.header.buttons.left}
-      left={40}
-      top={40}
-      onPress={_onLeftButtonPress}
-      onLongPress={() => {
-        Navigation.popToTop();
-      }}
-      name={canGoBack ? "arrow-left" : "menu"}
-      color={colors.primary.icon}
-    />
-  );
-};

apps/mobile/app/components/intro/illustration.tsx

@@ -0,0 +1,314 @@
+/*
+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 { Gesture, GestureDetector } from "react-native-gesture-handler";
+import Animated, {
+  Easing,
+  useAnimatedStyle,
+  useSharedValue,
+  withRepeat,
+  withSequence,
+  withSpring,
+  withTiming
+} from "react-native-reanimated";
+import Svg, {
+  Circle,
+  ClipPath,
+  Defs,
+  G,
+  Mask,
+  Path,
+  Rect
+} from "react-native-svg";
+import { useThemeColors } from "@notesnook/theme";
+
+const SPRING_CONFIG = {
+  damping: 14,
+  stiffness: 120,
+  mass: 0.8
+};
+
+// Each icon floats independently with a different phase/speed
+function useFloatAnim(delay: number, range = 6) {
+  const y = useSharedValue(0);
+
+  React.useEffect(() => {
+    const start = () => {
+      y.value = withSequence(
+        withTiming(0, { duration: delay, easing: Easing.linear }),
+        withRepeat(
+          withSequence(
+            withTiming(-range, {
+              duration: 1600,
+              easing: Easing.inOut(Easing.sin)
+            }),
+            withTiming(range, {
+              duration: 1600,
+              easing: Easing.inOut(Easing.sin)
+            })
+          ),
+          -1, // infinite
+          true // reverse
+        )
+      );
+    };
+    start();
+  }, []);
+
+  return y;
+}
+
+export const IntroIllustration = () => {
+  const { isDark } = useThemeColors();
+  // Gesture-driven tilt
+  const tiltX = useSharedValue(0); // rotateX: finger up/down
+  const tiltY = useSharedValue(0); // rotateY: finger left/right
+  const translateX = useSharedValue(0);
+  const translateY = useSharedValue(0);
+
+  // Independent float offsets for each corner icon
+  const floatTR = useFloatAnim(0, 2); // top-right  lock
+  const floatBR = useFloatAnim(500, 4); // bottom-right eye-off
+  const floatTL = useFloatAnim(260, 3); // top-left   share
+  const floatBL = useFloatAnim(780, 2); // bottom-left document
+  const pan = Gesture.Pan()
+    .onUpdate((e) => {
+      // Clamp tilt to ±15 degrees and translate ±12 pts
+      tiltY.value = (e.translationX / 12) * 1;
+      tiltX.value = -(e.translationY / 12) * 1;
+      translateX.value = e.translationX * 0.08;
+      translateY.value = e.translationY * 0.08;
+    })
+    .onEnd(() => {
+      tiltX.value = withSpring(0, SPRING_CONFIG);
+      tiltY.value = withSpring(0, SPRING_CONFIG);
+      translateX.value = withSpring(0, SPRING_CONFIG);
+      translateY.value = withSpring(0, SPRING_CONFIG);
+    });
+
+  const containerStyle = useAnimatedStyle(() => ({
+    transform: [
+      { perspective: 600 },
+      { rotateX: `${tiltX.value}deg` },
+      { rotateY: `${tiltY.value}deg` },
+      { translateX: translateX.value },
+      { translateY: translateY.value }
+    ]
+  }));
+
+  // Derived animated styles for each floating icon
+  const styleTR = useAnimatedStyle(() => ({
+    transform: [{ translateY: floatTR.value }]
+  }));
+  const styleBR = useAnimatedStyle(() => ({
+    transform: [{ translateY: floatBR.value }]
+  }));
+  const styleTL = useAnimatedStyle(() => ({
+    transform: [{ translateY: floatTL.value }]
+  }));
+  const styleBL = useAnimatedStyle(() => ({
+    transform: [{ translateY: floatBL.value }]
+  }));
+
+  return (
+    <GestureDetector gesture={pan}>
+      <Animated.View style={containerStyle}>
+        <Svg width={243} height={210} viewBox="0 0 243 210" fill="none">
+          {/* ── Concentric background circles (static) ── */}
+          <Circle
+            cx={116}
+            cy={105}
+            r={104.75}
+            stroke={isDark ? "#1F2722" : "#E8F4ED"}
+            strokeWidth={0.5}
+          />
+          <Circle
+            cx={116.5}
+            cy={105.5}
+            r={95.25}
+            fill="#008836"
+            fillOpacity={0.05}
+            stroke={isDark ? "#233C2D" : "#E8F0EC"}
+            strokeWidth={0.5}
+          />
+          <Circle
+            cx={116.5}
+            cy={105.5}
+            r={82.25}
+            fill="#008836"
+            fillOpacity={0.04}
+            stroke={isDark ? "#233C2D" : "#E3F1E8"}
+            strokeWidth={0.5}
+          />
+          <Circle
+            cx={116.5}
+            cy={105.5}
+            r={62.25}
+            fill="#008836"
+            fillOpacity={0.06}
+            stroke={isDark ? "#233C2D" : "#D3E8DB"}
+            strokeWidth={0.5}
+          />
+          <Circle cx={116.5} cy={105.5} r={44.5} fill="#008836" />
+
+          {/* ── Defs ── */}
+          <Defs>
+            <ClipPath id="clip0">
+              <Rect width={45} height={45} x={94.5} y={83} />
+            </ClipPath>
+            <ClipPath id="clip1">
+              <Rect width={21.5} height={21.5} x={202.75} y={176.75} />
+            </ClipPath>
+            <Mask
+              id="mask0"
+              maskUnits="userSpaceOnUse"
+              x={91}
+              y={80}
+              width={52}
+              height={51}
+            >
+              <Path
+                d="M132.504 80.055H101.496C96.007 80.055 91.5574 84.5046 91.5574 89.9935V121.002C91.5574 126.491 96.007 130.94 101.496 130.94H132.504C137.993 130.94 142.443 126.491 142.443 121.002V89.9935C142.443 84.5046 137.993 80.055 132.504 80.055Z"
+                fill="white"
+              />
+            </Mask>
+          </Defs>
+
+          {/* ── Centre logo (static) ── */}
+          <G clipPath="url(#clip0)">
+            <G mask="url(#mask0)">
+              <Path
+                d="M127.584 113.991C126.726 116.496 125.008 118.616 122.734 119.973C120.461 121.33 117.78 121.836 115.168 121.401C112.556 120.967 110.183 119.62 108.471 117.6C106.759 115.58 105.82 113.018 105.819 110.371V104.892L109.751 106.535V110.368C109.751 111.401 109.971 112.422 110.398 113.362C110.825 114.302 111.448 115.14 112.226 115.819C112.373 115.948 112.527 116.073 112.685 116.19C113.845 117.054 115.239 117.549 116.685 117.611C116.734 117.611 116.781 117.615 116.83 117.616C116.879 117.617 116.942 117.616 116.998 117.616H117.166C117.221 117.616 117.262 117.616 117.311 117.611C118.756 117.549 120.149 117.054 121.31 116.191C121.467 116.074 121.621 115.949 121.769 115.821C122.79 114.927 123.541 113.765 123.934 112.467L127.584 113.991ZM128.181 100.628V110.371C128.181 110.497 128.181 110.623 128.173 110.749L124.249 109.108V100.628C124.249 98.7551 123.523 96.9554 122.225 95.6055C120.928 94.2557 119.158 93.4604 117.287 93.3862C115.415 93.3121 113.588 93.9649 112.188 95.2078C110.787 96.4508 109.922 98.1875 109.773 100.054C109.759 100.243 109.751 100.435 109.751 100.628V103.048L105.819 101.405V89.4469H117C119.965 89.4469 122.809 90.6249 124.906 92.7217C127.003 94.8185 128.181 97.6624 128.181 100.628Z"
+                fill="white"
+              />
+            </G>
+          </G>
+        </Svg>
+
+        {/* ── Floating corner icons rendered as absolute Animated.Views over the SVG ── */}
+
+        {/* Top-left — share */}
+        <Animated.View
+          style={[{ position: "absolute", top: 0, left: -10 }, styleTL]}
+        >
+          <Svg width={47} height={47} viewBox="0 0 47 47" fill="none">
+            <Rect
+              x={0.25}
+              y={0.25}
+              width={46.5}
+              height={46.5}
+              rx={7.75}
+              fill={isDark ? "#1A1D1B" : "#f7f7f7"}
+              stroke={isDark ? "#233C2D" : "#D3E8DB"}
+              strokeWidth={0.5}
+            />
+            <Rect
+              width={22}
+              height={22}
+              x={13}
+              y={12}
+              fill={isDark ? "#1A1D1B" : "#f7f7f7"}
+            />
+            <Path
+              d="M28.125 25.75C27.6663 25.7499 27.2124 25.8417 26.7899 26.0202C26.3674 26.1987 25.9851 26.4601 25.6654 26.789L21.7037 24.2427C22.0153 23.4435 22.0153 22.5565 21.7037 21.7573L25.6654 19.211C26.2605 19.8206 27.0607 20.1875 27.911 20.2406C28.7612 20.2937 29.6008 20.0292 30.2671 19.4984C30.9334 18.9675 31.3788 18.2082 31.5171 17.3677C31.6554 16.5271 31.4766 15.6651 31.0154 14.9488C30.5542 14.2326 29.8435 13.7131 29.0211 13.4911C28.1987 13.269 27.3231 13.3603 26.5641 13.7472C25.8051 14.134 25.2169 14.7889 24.9133 15.5849C24.6098 16.3808 24.6126 17.2612 24.9212 18.0552L20.9595 20.6015C20.4824 20.1117 19.8701 19.7753 19.2009 19.6353C18.5317 19.4953 17.8359 19.5581 17.2025 19.8156C16.5691 20.0731 16.0269 20.5136 15.6452 21.0808C15.2635 21.6481 15.0596 22.3163 15.0596 23C15.0596 23.6837 15.2635 24.3519 15.6452 24.9192C16.0269 25.4864 16.5691 25.9269 17.2025 26.1844C17.8359 26.4419 18.5317 26.5047 19.2009 26.3647C19.8701 26.2247 20.4824 25.8883 20.9595 25.3985L24.9212 27.9448C24.6558 28.6294 24.6165 29.3809 24.8091 30.0893C25.0018 30.7978 25.4161 31.4259 25.9916 31.8819C26.567 32.3378 27.2733 32.5975 28.007 32.6229C28.7408 32.6484 29.4634 32.4383 30.069 32.0233C30.6747 31.6084 31.1316 31.0105 31.3729 30.3171C31.6141 29.6237 31.627 28.8712 31.4097 28.17C31.1924 27.4687 30.7562 26.8554 30.1652 26.42C29.5741 25.9845 28.8591 25.7497 28.125 25.75ZM28.125 14.75C28.5329 14.75 28.9317 14.871 29.2708 15.0976C29.61 15.3242 29.8744 15.6463 30.0305 16.0232C30.1866 16.4001 30.2274 16.8148 30.1478 17.2149C30.0683 17.615 29.8718 17.9825 29.5834 18.2709C29.2949 18.5594 28.9274 18.7558 28.5273 18.8354C28.1273 18.915 27.7126 18.8741 27.3357 18.718C26.9588 18.5619 26.6367 18.2975 26.4101 17.9584C26.1834 17.6192 26.0625 17.2204 26.0625 16.8125C26.0625 16.2655 26.2798 15.7409 26.6666 15.3541C27.0533 14.9673 27.578 14.75 28.125 14.75ZM18.5 25.0625C18.092 25.0625 17.6933 24.9415 17.3541 24.7149C17.0149 24.4883 16.7506 24.1662 16.5945 23.7893C16.4384 23.4124 16.3975 22.9977 16.4771 22.5976C16.5567 22.1975 16.7531 21.83 17.0416 21.5416C17.33 21.2532 17.6975 21.0567 18.0976 20.9771C18.4977 20.8976 18.9124 20.9384 19.2892 21.0945C19.6661 21.2506 19.9882 21.515 20.2149 21.8541C20.4415 22.1933 20.5625 22.5921 20.5625 23C20.5625 23.547 20.3452 24.0716 19.9584 24.4584C19.5716 24.8452 19.047 25.0625 18.5 25.0625ZM28.125 31.25C27.717 31.25 27.3183 31.129 26.9791 30.9024C26.6399 30.6758 26.3756 30.3537 26.2195 29.9768C26.0634 29.5999 26.0225 29.1852 26.1021 28.7851C26.1817 28.385 26.3781 28.0175 26.6666 27.7291C26.955 27.4407 27.3225 27.2442 27.7226 27.1646C28.1227 27.0851 28.5374 27.1259 28.9142 27.282C29.2911 27.4381 29.6132 27.7025 29.8399 28.0416C30.0665 28.3808 30.1875 28.7796 30.1875 29.1875C30.1875 29.7345 29.9702 30.2591 29.5834 30.6459C29.1966 31.0327 28.672 31.25 28.125 31.25Z"
+              fill="#008836"
+            />
+          </Svg>
+        </Animated.View>
+
+        {/* Top-right — lock */}
+        <Animated.View
+          style={[{ position: "absolute", top: 28, right: -5 }, styleTR]}
+        >
+          <Svg width={32} height={32} viewBox="0 0 32 32" fill="none">
+            <Rect
+              x={0.25}
+              y={0.25}
+              width={31.5}
+              height={31.5}
+              rx={7.75}
+              fill={isDark ? "#1A1D1B" : "#f7f7f7"}
+              stroke={isDark ? "#233C2D" : "#D3E8DB"}
+              strokeWidth={0.5}
+            />
+            <Path
+              d="M16 14.125C15.475 14.1252 14.967 14.3144 14.57 14.658C14.172 15.0017 13.912 15.4769 13.836 15.9967C13.76 16.5165 13.874 17.0462 14.157 17.4891C14.439 17.9319 14.872 18.2583 15.375 18.4086V19.75C15.375 19.9158 15.441 20.0747 15.558 20.1919C15.675 20.3092 15.834 20.375 16 20.375C16.166 20.375 16.325 20.3092 16.442 20.1919C16.559 20.0747 16.625 19.9158 16.625 19.75V18.4086C17.128 18.2583 17.561 17.9319 17.843 17.4891C18.126 17.0462 18.24 16.5165 18.164 15.9967C18.088 15.4769 17.828 15.0017 17.43 14.658C17.033 14.3144 16.525 14.1252 16 14.125ZM16 17.25C15.815 17.25 15.633 17.195 15.479 17.092C15.325 16.989 15.205 16.8426 15.134 16.6713C15.063 16.5 15.044 16.3115 15.081 16.1296C15.117 15.9477 15.206 15.7807 15.337 15.6496C15.468 15.5185 15.635 15.4292 15.817 15.393C15.999 15.3568 16.187 15.3754 16.359 15.4464C16.53 15.5173 16.676 15.6375 16.78 15.7917C16.883 15.9458 16.937 16.1271 16.937 16.3125C16.937 16.5611 16.839 16.7996 16.663 16.9754C16.487 17.1512 16.249 17.25 16 17.25ZM22.25 11.625H19.75V9.75C19.75 8.7554 19.355 7.8016 18.652 7.0983C17.948 6.3951 16.995 6 16 6C15.005 6 14.052 6.3951 13.348 7.0983C12.645 7.8016 12.25 8.7554 12.25 9.75V11.625H9.75C9.418 11.625 9.101 11.7567 8.866 11.9911C8.632 12.2255 8.5 12.5435 8.5 12.875V21.625C8.5 21.9565 8.632 22.2745 8.866 22.5089C9.101 22.7433 9.418 22.875 9.75 22.875H22.25C22.582 22.875 22.899 22.7433 23.134 22.5089C23.368 22.2745 23.5 21.9565 23.5 21.625V12.875C23.5 12.5435 23.368 12.2255 23.134 11.9911C22.899 11.7567 22.582 11.625 22.25 11.625ZM13.5 9.75C13.5 9.087 13.763 8.4511 14.232 7.9822C14.701 7.5134 15.337 7.25 16 7.25C16.663 7.25 17.299 7.5134 17.768 7.9822C18.237 8.4511 18.5 9.087 18.5 9.75V11.625H13.5V9.75ZM22.25 21.625H9.75V12.875H22.25V21.625Z"
+              fill="#008836"
+            />
+          </Svg>
+        </Animated.View>
+
+        {/* Bottom-left — document */}
+        <Animated.View
+          style={[{ position: "absolute", bottom: 0, left: 25 }, styleBL]}
+        >
+          <Svg width={35} height={35} viewBox="0 0 35 35" fill="none">
+            <Rect
+              x={0.25}
+              y={0.25}
+              width={34.5}
+              height={34.5}
+              rx={7.75}
+              fill={isDark ? "#1A1D1B" : "#f7f7f7"}
+              stroke={isDark ? "#233C2D" : "#D3E8DB"}
+              strokeWidth={0.5}
+            />
+            <Rect
+              width={18.3333}
+              height={18.3333}
+              x={8.3334}
+              y={8.333}
+              fill={isDark ? "#1A1D1B" : "#f7f7f7"}
+            />
+            <Path
+              d="M23.6346 14.178L19.6242 10.168C19.5709 10.114 19.5077 10.072 19.4382 10.044C19.3686 10.015 19.2941 10 19.2188 10H12.3438C12.0399 10 11.7485 10.121 11.5336 10.336C11.3187 10.551 11.198 10.842 11.198 11.146V23.75C11.198 24.054 11.3187 24.345 11.5336 24.56C11.7485 24.775 12.0399 24.896 12.3438 24.896H22.6563C22.9602 24.896 23.2517 24.775 23.4666 24.56C23.6814 24.345 23.8022 24.054 23.8022 23.75V14.583C23.8022 14.508 23.7875 14.434 23.7587 14.364C23.7299 14.295 23.6878 14.231 23.6346 14.178ZM19.7917 11.956L21.8464 14.01H19.7917V11.956ZM22.6563 23.75H12.3438V11.146H18.6459V14.583C18.6459 14.735 18.7063 14.881 18.8137 14.989C18.9212 15.096 19.0669 15.156 19.2188 15.156H22.6563V23.75ZM20.3647 18.021C20.3647 18.173 20.3043 18.319 20.1969 18.426C20.0894 18.533 19.9437 18.594 19.7917 18.594H15.2084C15.0565 18.594 14.9107 18.533 14.8033 18.426C14.6959 18.319 14.6355 18.173 14.6355 18.021C14.6355 17.869 14.6959 17.723 14.8033 17.616C14.9107 17.508 15.0565 17.448 15.2084 17.448H19.7917C19.9437 17.448 20.0894 17.508 20.1969 17.616C20.3043 17.723 20.3647 17.869 20.3647 18.021ZM20.3647 20.313C20.3647 20.465 20.3043 20.61 20.1969 20.718C20.0894 20.825 19.9437 20.885 19.7917 20.885H15.2084C15.0565 20.885 14.9107 20.825 14.8033 20.718C14.6959 20.61 14.6355 20.465 14.6355 20.313C14.6355 20.161 14.6959 20.015 14.8033 19.907C14.9107 19.8 15.0565 19.74 15.2084 19.74H19.7917C19.9437 19.74 20.0894 19.8 20.1969 19.907C20.3043 20.015 20.3647 20.161 20.3647 20.313Z"
+              fill="#008836"
+            />
+          </Svg>
+        </Animated.View>
+
+        {/* Bottom-right — eye-off */}
+        <Animated.View
+          style={[{ position: "absolute", bottom: 0, right: 5 }, styleBR]}
+        >
+          <Svg width={43} height={43} viewBox="0 0 43 43" fill="none">
+            <Rect
+              x={0.25}
+              y={0.25}
+              width={42.5}
+              height={42.5}
+              rx={7.75}
+              fill={isDark ? "#1A1D1B" : "#f7f7f7"}
+              stroke={isDark ? "#233C2D" : "#D3E8DB"}
+              strokeWidth={0.5}
+            />
+            <G>
+              <Path
+                d="M15.028 3.408C14.969 3.341 14.898 3.287 14.818 3.248C14.738 3.21 14.651 3.187 14.562 3.182C14.473 3.178 14.384 3.191 14.301 3.22C14.217 3.25 14.14 3.296 14.074 3.356C14.008 3.416 13.955 3.488 13.917 3.569C13.88 3.649 13.858 3.737 13.855 3.825C13.851 3.914 13.865 4.003 13.896 4.086C13.926 4.17 13.973 4.246 14.034 4.311L15.65 6.089C12.6 7.961 11.288 10.847 11.23 10.978C11.192 11.064 11.172 11.157 11.172 11.251C11.172 11.345 11.192 11.438 11.23 11.524C11.259 11.59 11.971 13.167 13.552 14.749C15.659 16.855 18.321 17.969 21.25 17.969C22.756 17.977 24.246 17.667 25.623 17.059L27.471 19.092C27.53 19.159 27.601 19.213 27.681 19.252C27.761 19.29 27.848 19.313 27.937 19.317C28.026 19.322 28.115 19.309 28.199 19.28C28.282 19.25 28.359 19.204 28.425 19.144C28.491 19.084 28.544 19.012 28.582 18.931C28.62 18.851 28.641 18.763 28.645 18.675C28.648 18.586 28.634 18.497 28.604 18.414C28.573 18.33 28.526 18.254 28.465 18.189L15.028 3.408ZM19.003 9.777L22.503 13.628C21.976 13.905 21.372 13.999 20.785 13.896C20.199 13.793 19.663 13.497 19.263 13.057C18.862 12.616 18.62 12.055 18.573 11.461C18.526 10.868 18.677 10.275 19.003 9.777ZM21.25 16.625C18.665 16.625 16.407 15.685 14.537 13.833C13.77 13.07 13.117 12.2 12.6 11.25C12.993 10.512 14.251 8.446 16.576 7.103L18.088 8.762C17.503 9.511 17.201 10.443 17.237 11.394C17.273 12.344 17.643 13.251 18.283 13.955C18.923 14.658 19.791 15.113 20.733 15.238C21.676 15.364 22.633 15.152 23.434 14.64L24.672 16.001C23.58 16.42 22.419 16.631 21.25 16.625ZM21.754 8.61C21.579 8.577 21.424 8.475 21.324 8.328C21.224 8.181 21.186 7.999 21.22 7.824C21.253 7.649 21.355 7.495 21.502 7.394C21.65 7.294 21.831 7.257 22.006 7.29C22.862 7.456 23.642 7.895 24.229 8.54C24.815 9.185 25.178 10.003 25.262 10.871C25.279 11.049 25.224 11.225 25.11 11.363C24.997 11.5 24.833 11.586 24.656 11.603C24.635 11.604 24.614 11.604 24.593 11.603C24.425 11.603 24.263 11.541 24.138 11.428C24.014 11.316 23.936 11.16 23.921 10.993C23.864 10.416 23.623 9.872 23.232 9.442C22.842 9.013 22.323 8.721 21.754 8.61ZM31.268 11.524C31.232 11.603 30.382 13.486 28.466 15.202C28.4 15.263 28.324 15.31 28.24 15.34C28.156 15.371 28.067 15.384 27.978 15.38C27.889 15.376 27.802 15.354 27.721 15.316C27.641 15.277 27.569 15.223 27.509 15.157C27.45 15.091 27.404 15.013 27.375 14.929C27.346 14.845 27.334 14.755 27.339 14.666C27.345 14.577 27.368 14.491 27.408 14.411C27.447 14.331 27.502 14.26 27.57 14.201C28.51 13.357 29.299 12.359 29.905 11.25C29.386 10.299 28.732 9.429 27.963 8.666C26.093 6.815 23.835 5.875 21.25 5.875C20.705 5.874 20.162 5.918 19.624 6.007C19.537 6.022 19.447 6.02 19.36 6.001C19.274 5.982 19.192 5.945 19.119 5.894C19.047 5.843 18.985 5.778 18.938 5.703C18.891 5.627 18.859 5.544 18.844 5.456C18.83 5.369 18.833 5.279 18.853 5.193C18.873 5.106 18.91 5.025 18.962 4.953C19.014 4.88 19.079 4.819 19.155 4.773C19.231 4.726 19.315 4.695 19.402 4.682C20.013 4.581 20.631 4.53 21.25 4.531C24.179 4.531 26.841 5.645 28.948 7.752C30.529 9.333 31.241 10.912 31.27 10.978C31.308 11.064 31.328 11.157 31.328 11.251C31.328 11.345 31.308 11.438 31.27 11.524H31.268Z"
+                fill="#008836"
+                transform="translate(0, 10)"
+              />
+            </G>
+          </Svg>
+        </Animated.View>
+      </Animated.View>
+    </GestureDetector>
+  );
+};