mobile: refactor

mobile: fix loading note in editor from notifications

.github/workflows/android.e2e.yml

@@ -55,13 +55,13 @@ jobs:
       - name: Detox build
         run: |
           yarn build:android
-          ls apps/mobile/native/android/app/build/outputs/apk
-          ls apps/mobile/native/android/app/build/outputs/apk/release
+          ls apps/mobile/android/app/build/outputs/apk
+          ls apps/mobile/android/app/build/outputs/apk/release
 
       - name: Get device name
         id: device
         run: |
-          AVD_NAME=$(node -p "require('./apps/mobile/native/.detoxrc.js').devices.emulator.device.avdName")
+          AVD_NAME=$(node -p "require('./apps/mobile/.detoxrc.js').devices.emulator.device.avdName")
           echo "AVD_NAME=$AVD_NAME" >> $GITHUB_OUTPUT
 
       - name: AVD cache

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

@@ -5,7 +5,6 @@ on: workflow_dispatch
 jobs:
   build:
     runs-on: ubuntu-22.04
-    timeout-minutes: 40
     env:
       CMAKE_C_COMPILER_LAUNCHER: ccache
       CMAKE_CXX_COMPILER_LAUNCHER: ccache
@@ -31,7 +30,23 @@ jobs:
           npm run bootstrap -- --scope=mobile
 
       - name: Make Gradlew Executable
-        run: cd apps/mobile/native/android && chmod +x ./gradlew
+        run: cd apps/mobile/android && chmod +x ./gradlew
+
+      - 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 CCache
         uses: hendrikmuhs/ccache-action@v1.2.11
@@ -79,6 +94,9 @@ jobs:
           cd apps/mobile
           npx tsc --noEmit
 
+      - name: Remove debug keystore
+        run: rm -rf apps/mobile/android/app/debug.keystore
+
       - name: Build unsigned app bundle
         run: yarn release:android:bundle
 
@@ -89,7 +107,7 @@ jobs:
         id: sign_app
         uses: r0adkll/sign-android-release@master
         with:
-          releaseDirectory: apps/mobile/native/android/app/build/outputs/bundle/release
+          releaseDirectory: apps/mobile/android/app/build/outputs/bundle/release
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEY_PASSWORD }}
@@ -104,7 +122,7 @@ jobs:
         id: sign_apk
         uses: r0adkll/sign-android-release@master
         with:
-          releaseDirectory: apps/mobile/native/android/app/build/outputs/apk/release
+          releaseDirectory: apps/mobile/android/app/build/outputs/apk/release
           signingKeyBase64: ${{ secrets.PUBLIC_SIGNING_KEY }}
           alias: ${{ secrets.PUBLIC_ALIAS }}
           keyStorePassword: ${{ secrets.PUBLIC_KEY_PASSWORD }}
@@ -114,7 +132,7 @@ jobs:
 
       - name: Rename apk files
         run: |
-          cd apps/mobile/native/android/app/build/outputs/apk/release/
+          cd apps/mobile/android/app/build/outputs/apk/release/
           mv app-arm64-v8a-release-unsigned-signed.apk notesnook-arm64-v8a.apk
           mv app-armeabi-v7a-release-unsigned-signed.apk notesnook-armeabi-v7a.apk
           mv app-x86-release-unsigned-signed.apk notesnook-x86.apk
@@ -122,7 +140,7 @@ jobs:
 
       - name: Get app version
         id: package-version
-        uses: martinbeentjes/npm-get-version-action@master
+        uses: saionaro/extract-package-version@master
         with:
           path: apps/mobile
 
@@ -135,21 +153,21 @@ jobs:
           releaseFiles: ${{steps.sign_app.outputs.signedReleaseFile}}
           track: beta
           status: completed
-          whatsNewDirectory: apps/mobile/native/android/releasenotes/
+          whatsNewDirectory: apps/mobile/android/releasenotes/
 
       - name: Create release draft on Github
         uses: softprops/action-gh-release@v1
         with:
           draft: true
-          tag_name: ${{ steps.package-version.outputs.current-version}}-beta-android
-          name: Notesnook Android v${{ steps.package-version.outputs.current-version}}
+          tag_name: ${{ steps.package-version.outputs.version}}-beta-android
+          name: Notesnook Android v${{ steps.package-version.outputs.version}}
           repository: streetwriters/notesnook
           token: ${{ secrets.GITHUB_TOKEN }}
           files: |
-            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-arm64-v8a.apk
-            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-armeabi-v7a.apk
-            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86.apk
-            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86_64.apk
+            apps/mobile/android/app/build/outputs/apk/release/notesnook-arm64-v8a.apk
+            apps/mobile/android/app/build/outputs/apk/release/notesnook-armeabi-v7a.apk
+            apps/mobile/android/app/build/outputs/apk/release/notesnook-x86.apk
+            apps/mobile/android/app/build/outputs/apk/release/notesnook-x86_64.apk
             ${{steps.sign_app.outputs.signedReleaseFile}}
 
       - name: Upload sourcemaps
@@ -157,5 +175,5 @@ jobs:
         with:
           name: sourcemaps
           path: |
-            apps/mobile/native/android/app/build/**/*.map
+            apps/mobile/android/app/build/**/*.map
             packages/editor-mobile/sourcemaps/*.map

.github/workflows/android.publish.yml

@@ -5,7 +5,6 @@ on: workflow_dispatch
 jobs:
   build:
     runs-on: ubuntu-22.04
-    timeout-minutes: 40
     env:
       CMAKE_C_COMPILER_LAUNCHER: ccache
       CMAKE_CXX_COMPILER_LAUNCHER: ccache
@@ -25,13 +24,29 @@ jobs:
           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/native/android && chmod +x ./gradlew
+        run: cd apps/mobile/android && chmod +x ./gradlew
 
       - name: Install CCache
         uses: hendrikmuhs/ccache-action@v1.2.11
@@ -79,6 +94,9 @@ jobs:
           cd apps/mobile
           npx tsc --noEmit
 
+      - name: Remove debug keystore
+        run: rm -rf apps/mobile/android/app/debug.keystore
+
       - name: Build unsigned app bundle
         run: yarn release:android:bundle
 
@@ -89,7 +107,7 @@ jobs:
         id: sign_app
         uses: r0adkll/sign-android-release@master
         with:
-          releaseDirectory: apps/mobile/native/android/app/build/outputs/bundle/release
+          releaseDirectory: apps/mobile/android/app/build/outputs/bundle/release
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEY_PASSWORD }}
@@ -104,7 +122,7 @@ jobs:
         id: sign_apk
         uses: r0adkll/sign-android-release@master
         with:
-          releaseDirectory: apps/mobile/native/android/app/build/outputs/apk/release
+          releaseDirectory: apps/mobile/android/app/build/outputs/apk/release
           signingKeyBase64: ${{ secrets.PUBLIC_SIGNING_KEY }}
           alias: ${{ secrets.PUBLIC_ALIAS }}
           keyStorePassword: ${{ secrets.PUBLIC_KEY_PASSWORD }}
@@ -114,7 +132,7 @@ jobs:
 
       - name: Rename apk files
         run: |
-          cd apps/mobile/native/android/app/build/outputs/apk/release/
+          cd apps/mobile/android/app/build/outputs/apk/release/
           mv app-arm64-v8a-release-unsigned-signed.apk notesnook-arm64-v8a.apk
           mv app-armeabi-v7a-release-unsigned-signed.apk notesnook-armeabi-v7a.apk
           mv app-x86-release-unsigned-signed.apk notesnook-x86.apk
@@ -122,7 +140,7 @@ jobs:
 
       - name: Get app version
         id: package-version
-        uses: martinbeentjes/npm-get-version-action@master
+        uses: saionaro/extract-package-version@master
         with:
           path: apps/mobile
 
@@ -135,26 +153,26 @@ jobs:
           releaseFiles: ${{steps.sign_app.outputs.signedReleaseFile}}
           track: production
           status: completed
-          whatsNewDirectory: apps/mobile/native/android/releasenotes/
+          whatsNewDirectory: apps/mobile/android/releasenotes/
 
       - name: Create release draft on Github
         uses: softprops/action-gh-release@v1
         with:
           draft: true
-          tag_name: ${{ steps.package-version.outputs.current-version}}-android
-          name: Notesnook Android v${{ steps.package-version.outputs.current-version}}
+          tag_name: ${{ steps.package-version.outputs.version}}-android
+          name: Notesnook Android v${{ steps.package-version.outputs.version}}
           repository: streetwriters/notesnook
           token: ${{ secrets.GITHUB_TOKEN }}
           files: |
-            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-arm64-v8a.apk
-            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-armeabi-v7a.apk
-            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86.apk
-            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86_64.apk
+            apps/mobile/android/app/build/outputs/apk/release/notesnook-arm64-v8a.apk
+            apps/mobile/android/app/build/outputs/apk/release/notesnook-armeabi-v7a.apk
+            apps/mobile/android/app/build/outputs/apk/release/notesnook-x86.apk
+            apps/mobile/android/app/build/outputs/apk/release/notesnook-x86_64.apk
 
       - name: Upload sourcemaps
         uses: actions/upload-artifact@v4
         with:
           name: sourcemaps
           path: |
-            apps/mobile/native/android/app/build/**/*.map
+            apps/mobile/android/app/build/**/*.map
             packages/editor-mobile/sourcemaps/*.map

.github/workflows/desktop.tests.yml

@@ -45,7 +45,7 @@ jobs:
   test-macos-x64:
     name: Test macOS x64
     needs: build
-    runs-on: macos-13
+    runs-on: macos-15-intel
 
     steps:
       - name: Check out Git repository

.github/workflows/ios.publish.yml

@@ -4,7 +4,7 @@ on: workflow_dispatch
 
 jobs:
   build:
-    runs-on: macos-14
+    runs-on: macos-26
     timeout-minutes: 60
 
     steps:
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: "16.1"
+          xcode-version: "26.1.1"
 
       - name: Install node modules
         run: |
@@ -30,7 +30,7 @@ jobs:
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2.11
         with:
-          key: ${{ runner.os }}-ccache-${{ hashFiles(format('apps/mobile/native/ios/Podfile.lock')) }}
+          key: ${{ runner.os }}-ccache-${{ hashFiles(format('apps/mobile/ios/Podfile.lock')) }}
           max-size: 1500M
           restore-keys: |
             ${{ runner.os }}-ccache-
@@ -55,14 +55,13 @@ jobs:
         uses: actions/cache@v3
         id: pods-cache
         with:
-          path: apps/mobile/native/ios/Pods
-          key: ${{ runner.os }}-pods-${{ hashFiles('apps/mobile/native/ios/Podfile.lock') }}
+          path: apps/mobile/ios/Pods
+          key: ${{ runner.os }}-pods-${{ hashFiles('apps/mobile/ios/Podfile.lock') }}
 
       - name: Install Pods
         run: |
-          cd apps/mobile/native/ios
-          bundle install
-          RCT_NEW_ARCH_ENABLED=0 bundle exec pod install
+          cd apps/mobile/ios
+          pod install
 
       - name: Check for typescript errors
         run: |
@@ -79,9 +78,9 @@ jobs:
           bundle-identifier: org.streetwriters.notesnook
           scheme: Notesnook
           configuration: "Release"
-          export-options: apps/mobile/native/ios/ExportOptions.plist
-          project-path: apps/mobile/native/ios/Notesnook.xcodeproj
-          workspace-path: apps/mobile/native/ios/Notesnook.xcworkspace
+          export-options: apps/mobile/ios/ExportOptions.plist
+          project-path: apps/mobile/ios/Notesnook.xcodeproj
+          workspace-path: apps/mobile/ios/Notesnook.xcworkspace
           update-targets: |
             Notesnook
             Make Note
@@ -117,5 +116,5 @@ jobs:
           name: Notesnook.zip
           path: |
             Notesnook.ipa
-            apps/mobile/native/ios/**/*.map
+            apps/mobile/ios/**/*.map
             packages/editor-mobile/sourcemaps/*.map

.vscode/settings.json

@@ -11,5 +11,5 @@
     "cache": true,
     "cacheStrategy": "content"
   },
-  "git.rebaseWhenSync": true
+  "git.rebaseWhenSync": false
 }

apps/desktop/package.json

@@ -2,7 +2,7 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "3.3.5",
+  "version": "3.3.7",
   "appAppleId": "1544027013",
   "private": true,
   "main": "./dist/cjs/index.js",
@@ -36,8 +36,8 @@
     "electron-trpc": "0.7.1",
     "electron-updater": "^6.6.2",
     "icojs": "^0.19.5",
-    "sqlite-better-trigram": "0.0.3",
-    "sqlite3-fts5-html": "^0.0.4",
+    "sqlite-better-trigram": "0.0.5",
+    "sqlite3-fts5-html": "^0.0.6",
     "typed-emitter": "^2.1.0",
     "yargs": "^17.7.2",
     "zod": "3.24.3"

apps/mobile/.detoxrc.js

@@ -0,0 +1,92 @@
+/** @type {Detox.DetoxConfig} */
+module.exports = {
+  testRunner: {
+    args: {
+      $0: "jest",
+      config: "e2e/jest.config.js"
+    },
+    jest: {
+      setupTimeout: 120000
+    }
+  },
+  apps: {
+    "ios.debug": {
+      type: "ios.app",
+      binaryPath:
+        "ios/build/Build/Products/Debug-iphonesimulator/Notesnook.app",
+      build:
+        "xcodebuild -workspace ios/Notesnook.xcworkspace -scheme YOUR_APP -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build"
+    },
+    "ios.release": {
+      type: "ios.app",
+      binaryPath:
+        "ios/build/Build/Products/Release-iphonesimulator/Notesnook.app",
+      build:
+        "xcodebuild -workspace ios/Notesnook.xcworkspace -scheme YOUR_APP -configuration Release -sdk iphonesimulator -derivedDataPath ios/build"
+    },
+    "android.debug": {
+      type: "android.apk",
+      binaryPath: "android/app/build/outputs/apk/debug/app-arm64-v8a-debug.apk",
+      testBinaryPath:
+        "android/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk",
+      build:
+        "cd android ; ENVFILE=.env.test ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug && cd ..",
+      reversePorts: [8081]
+    },
+    "android.release": {
+      type: "android.apk",
+      binaryPath:
+        "android/app/build/outputs/apk/release/app-arm64-v8a-release.apk",
+      testBinaryPath:
+        "android/app/build/outputs/apk/androidTest/release/app-release-androidTest.apk",
+      build:
+        "cd android ; ENVFILE=.env.test ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release ; cd .."
+    }
+  },
+  devices: {
+    simulator: {
+      type: "ios.simulator",
+      device: {
+        type: "iPhone 17 Pro Max"
+      }
+    },
+    attached: {
+      type: "android.attached",
+      device: {
+        adbName: ".*"
+      }
+    },
+    emulator: {
+      type: "android.emulator",
+      device: {
+        avdName: "Pixel_5_API_36"
+      }
+    }
+  },
+  configurations: {
+    "ios.sim.debug": {
+      device: "simulator",
+      app: "ios.debug"
+    },
+    "ios.sim.release": {
+      device: "simulator",
+      app: "ios.release"
+    },
+    "android.att.debug": {
+      device: "attached",
+      app: "android.debug"
+    },
+    "android.att.release": {
+      device: "attached",
+      app: "android.release"
+    },
+    "android.emu.debug": {
+      device: "emulator",
+      app: "android.debug"
+    },
+    "android.emu.release": {
+      device: "emulator",
+      app: "android.release"
+    }
+  }
+};

apps/mobile/.gitignore

@@ -4,7 +4,7 @@ artifacts/
 #
 .DS_Store
 
-native/android/app/src/main/assets/
+android/app/src/main/assets/
 *Issues.md
 build_cache/
 #
@@ -16,11 +16,12 @@ build_cache/
 .cxx/
 *.keystore
 !debug.keystore
+.kotlin/
 
 # Xcode
 #
-native/ios/Pods
-native/ios/DerivedData
+ios/Pods
+ios/DerivedData
 build/
 *.pbxuser
 !default.pbxuser
@@ -39,7 +40,7 @@ DerivedData
 *.xcuserstate
 *.hprof
 **/.xcode.env.local
-native/cache
+cache
 # Android/IntelliJ
 #
 rn-build-deps/
@@ -57,7 +58,7 @@ yarn-error.log
 # BUCK
 buck-out/
 \.buckd/
-*.keystore
+
 
 # fastlane
 #
@@ -69,7 +70,7 @@ buck-out/
 */fastlane/report.xml
 */fastlane/Preview.html
 */fastlane/screenshots
-native/vendor
+vendor
 
 # Bundle artifact
 *.jsbundle

apps/mobile/Gemfile

@@ -8,3 +8,9 @@ gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
 gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
 gem 'xcodeproj', '< 1.26.0'
 gem 'concurrent-ruby', '< 1.3.4'
+
+# Ruby 3.4.0 has removed some libraries from the standard library.
+gem 'bigdecimal'
+gem 'logger'
+gem 'benchmark'
+gem 'mutex_m'

apps/mobile/Gemfile.lock

@@ -109,8 +109,12 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (>= 6.1.7.5, != 7.1.0)
+  benchmark
+  bigdecimal
   cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
   concurrent-ruby (< 1.3.4)
+  logger
+  mutex_m
   xcodeproj (< 1.26.0)
 
 RUBY VERSION

apps/mobile/android/app/build.gradle

@@ -1,6 +1,7 @@
 apply plugin: "com.android.application"
 apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
+apply plugin: 'kotlin-parcelize'
 
 apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"
 
@@ -11,13 +12,13 @@ import org.apache.tools.ant.taskdefs.condition.Os
 react {
     /* Folders */
     //   The root of your project, i.e. where "package.json" lives. Default is '..'
-    root = file("$rootDir/../")
+    //root = file("$rootDir/..")
     //   The folder where the react-native NPM package is. Default is ../node_modules/react-native
-    reactNativeDir = file("$rootDir/../../node_modules/react-native")
+    //reactNativeDir = file("$rootDir/../node_modules/react-native")
     //   The folder where the react-native Codegen package is. Default is ../node_modules/react-native-codegen
-    codegenDir = file("$rootDir/../../node_modules/react-native-codegen")
+    //codegenDir = file("$rootDir/../node_modules/react-native-codegen")
     //   The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
-    cliFile = file("$rootDir/../../node_modules/react-native/cli.js")
+    // cliFile = file("$rootDir/../node_modules/react-native/cli.js")
     /* Variants */
     //   The list of variants to that are debuggable. For those we're going to
     //   skip the bundling of the JS bundle and the assets. By default is just 'debug'.
@@ -44,7 +45,7 @@ react {
     // extraPackagerArgs = []
     /* Hermes Commands */
     //   The hermes compiler command to run. By default it is 'hermesc'
-    hermesCommand = "$rootDir/../../node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc"
+    hermesCommand = "$rootDir/../node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc"
     //
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     hermesFlags = ["-O", "-output-source-map"]
@@ -72,14 +73,14 @@ def enableProguardInReleaseBuilds = true
  * The preferred build flavor of JavaScriptCore.
  *
  * For example, to use the international variant, you can use:
- * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
+ * `def jscFlavor = io.github.react-native-community:jsc-android-intl:2026004.+`
  *
  * The international variant includes ICU i18n library and necessary data
  * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
  * give correct results when using with locales other than en-US.  Note that
  * this variant is about 6MiB larger per architecture than default.
  */
-def jscFlavor = 'org.webkit:android-jsc:+'
+def jscFlavor = 'io.github.react-native-community:jsc-android:2026004.+'
 
 /**
  * Architectures to build native code for.
@@ -94,7 +95,7 @@ def fdroidBuild() {
 }
 
 def getNpmVersion() {
-    def inputFile = file("$rootDir/../../package.json")
+    def inputFile = file("$rootDir/../package.json")
     def jsonPackage = new JsonSlurper().parseText(inputFile.text)
     print(jsonPackage["version"])
     return jsonPackage["version"]
@@ -124,7 +125,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
-        versionCode 3078
+        versionCode 3087
         versionName getNpmVersion()
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -165,7 +166,7 @@ android {
             minifyEnabled enableProguardInReleaseBuilds
             shrinkResources false
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-            proguardFile "${rootProject.projectDir}/../../node_modules/detox/android/detox/proguard-rules-app.pro"
+            proguardFile "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro"
             buildConfigField "boolean", "FDROID_BUILD", "${fdroidBuild()}"
         
         }
@@ -221,6 +222,8 @@ dependencies {
     implementation 'com.squareup.okhttp3:logging-interceptor:4.9.2'
     implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.9.2'
     implementation 'com.google.code.gson:gson:2.11.0'
+    
+    implementation project(":react-native-config")
 
     androidTestImplementation('com.wix:detox:+')
     implementation 'androidx.appcompat:appcompat:1.1.0'
@@ -232,16 +235,14 @@ dependencies {
     }
     
 
-}  
-
-
+}
 
 task deleteFiles(type: Delete) {
   delete './src/main/assets/static'
 }
 
 task copyEditorBundle(type: Copy) {
-    from '../../../../../packages/editor-mobile/build.bundle'
+    from '../../../../packages/editor-mobile/build.bundle'
     into './src/main/assets'
 }
 

apps/mobile/android/app/proguard-rules.pro

@@ -63,4 +63,7 @@
 -keepattributes Signature
 -keep class com.google.gson.reflect.TypeToken { *; }
 -keep class * extends com.google.gson.reflect.TypeToken
--keep class com.streetwriters.notesnook.datatypes.* { *; }
+-keep class com.streetwriters.notesnook.datatypes.* { *; }
+
+-keep class net.gotev.uploadservice.* { *; }
+-keep class kotlinx.parcelize.* { *; }

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

@@ -166,7 +166,6 @@
             android:exported="true"
             android:label="@string/title_activity_share"
             android:noHistory="true"
-            android:screenOrientation="unspecified"
             android:taskAffinity=""
             android:theme="@style/AppThemeB"
             android:windowSoftInputMode="adjustResize">

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

@@ -20,8 +20,9 @@ import com.zoontek.rnbootsplash.RNBootSplash;
 
 public class MainActivity extends ReactActivity {
   @Override
-    protected void onCreate(Bundle savedInstanceState) {
-    RNBootSplash.init(this);
+  protected void onCreate(Bundle savedInstanceState) {
+    RNBootSplash.init(this, R.style.BootTheme);
+
     super.onCreate(null);
     if (BuildConfig.DEBUG) {
       WebView.setWebContentsDebuggingEnabled(true);
@@ -31,19 +32,6 @@ public class MainActivity extends ReactActivity {
       startService(new Intent(getBaseContext(), OnClearFromRecentService.class));
     } catch (Exception ignored) {}
 
-    if (Build.VERSION.SDK_INT >= 35) {
-      final View rootView = findViewById(android.R.id.content);
-      ViewCompat.setOnApplyWindowInsetsListener(rootView, (v, insets) -> {
-        Insets innerPadding = insets.getInsets(WindowInsetsCompat.Type.ime());
-        rootView.setPadding(
-                innerPadding.left,
-                innerPadding.top,
-                innerPadding.right,
-                innerPadding.bottom
-        );
-        return insets;
-      });
-    }
   }
 
   /**
@@ -59,20 +47,20 @@ public class MainActivity extends ReactActivity {
             DefaultNewArchitectureEntryPoint.getFabricEnabled());
   }
 
-@Override
-public void onNewIntent(Intent intent) {
-  super.onNewIntent(intent);
-  setIntent(intent);
-}
+  @Override
+  public void onNewIntent(Intent intent) {
+    super.onNewIntent(intent);
+    setIntent(intent);
+  }
 
-@Override
-public void onConfigurationChanged(Configuration newConfig) {
-  super.onConfigurationChanged(newConfig);
-  getReactInstanceManager().onConfigurationChanged(this, newConfig);
-  Intent intent = new Intent("onConfigurationChanged");
-  intent.putExtra("newConfig", newConfig);
-  this.sendBroadcast(intent);
-}
+  @Override
+  public void onConfigurationChanged(Configuration newConfig) {
+    super.onConfigurationChanged(newConfig);
+    getReactHost().onConfigurationChanged(this);
+    Intent intent = new Intent("onConfigurationChanged");
+    intent.putExtra("newConfig", newConfig);
+    this.sendBroadcast(intent);
+  }
 
   @Override
   protected String getMainComponentName() {

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

@@ -0,0 +1,28 @@
+package com.streetwriters.notesnook
+ 
+import android.app.Application
+import com.facebook.react.PackageList
+import com.facebook.react.ReactApplication
+import com.facebook.react.ReactHost
+import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
+import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
+import org.wonday.orientation.OrientationActivityLifecycle;
+class MainApplication : Application(), ReactApplication {
+    override val reactHost: ReactHost by lazy {
+    getDefaultReactHost(
+      context = applicationContext,
+      packageList =
+        PackageList(this).packages.apply {
+          // Packages that cannot be autolinked yet can be added manually here, for example:
+          // add(MyReactNativePackage())
+          add(NNativeModulePackage());
+        },
+    )
+  }
+ 
+  override fun onCreate() {
+    super.onCreate()
+      registerActivityLifecycleCallbacks(OrientationActivityLifecycle.getInstance());
+    loadReactNative(this)
+  }
+}