Update android.publish.yml

Signed-off-by: Ammar Ahmed <40239442+ammarahm-ed@users.noreply.github.com>

.github/workflows/android.publish.yml

@@ -28,32 +28,6 @@ jobs:
       - name: Make Gradlew Executable
         run: cd apps/mobile/native/android && chmod +x ./gradlew
 
-      - name: Build unsigned app bundle
-        run: yarn release:android:bundle
-
-      - name: Sign app bundle for Playstore release
-        id: sign_app
-        uses: r0adkll/sign-android-release@master
-        with:
-          releaseDirectory: apps/mobile/native/android/app/build/outputs/bundle/release
-          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
-          alias: ${{ secrets.ALIAS }}
-          keyStorePassword: ${{ secrets.KEY_PASSWORD }}
-          keyPassword: ${{ secrets.KEY_PASSWORD }}
-        env:
-          BUILD_TOOLS_VERSION: "33.0.0"
-
-      - name: Publish to Playstore
-        id: deploy
-        uses: r0adkll/upload-google-play@v1.1.1
-        with:
-          serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
-          packageName: com.streetwriters.notesnook
-          releaseFiles: ${{steps.sign_app.outputs.signedReleaseFile}}
-          track: production
-          status: completed
-          whatsNewDirectory: apps/mobile/native/android/releasenotes/
-
       - name: Build apks for Github release
         run: yarn release:android
 

.gitignore

@@ -9,4 +9,5 @@ nx-cloud.env
 .env.local
 .nyc_output
 site
-node_modules.backup
+node_modules.backup
+.nx

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

@@ -481,7 +481,7 @@ export const useAppEvents = () => {
 
         subscribeToIAPListeners();
       } catch (e) {
-        DatabaseLogger.error(error);
+        DatabaseLogger.error(e);
 
         ToastEvent.error(e, "An error occurred", "global");
       }

apps/mobile/app/utils/github-version.ts

@@ -61,7 +61,10 @@ export const getGithubVersion = async () => {
   if (!res?.ok) return null;
   const data = (await res?.json()) as GithubRelease[];
 
-  const versions = data?.filter((tag) => tag.tag_name.endsWith("android"));
+  const versions = data?.filter(
+    (tag) =>
+      tag.tag_name.endsWith("android") && !tag.tag_name.endsWith("beta-android")
+  );
   const latestVersion = versions[0];
   const version = latestVersion.tag_name.replace("-android", "");
   return {

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

@@ -111,7 +111,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
-        versionCode 2075
+        versionCode 2076
         versionName getNpmVersion()
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

apps/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@notesnook/mobile",
-  "version": "2.6.15",
+  "version": "2.6.16",
   "private": true,
   "license": "GPL-3.0-or-later",
   "workspaces": [
@@ -45,4 +45,4 @@
     "react-native": "0.72.0",
     "react-native-iap": "12.11.0"
   }
-}
+}

apps/theme-builder/package-lock.json

@@ -1377,7 +1377,7 @@
     },
     "../web": {
       "name": "@notesnook/web",
-      "version": "2.6.14",
+      "version": "2.6.15",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@aws-sdk/util-base64-browser": "^3.208.0",

apps/web/package-lock.json

@@ -439,7 +439,7 @@
     },
     "../desktop": {
       "name": "@notesnook/desktop",
-      "version": "2.6.14",
+      "version": "2.6.15",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {

docs/help/contents/importing-notes/import-notes-from-skiff-pages.md

@@ -0,0 +1,40 @@
+---
+title: Skiff Pages
+---
+
+# How do I import notes from Skiff Pages?
+
+The following steps will help you quickly import your notes from Skiff Pages into Notesnook.
+
+## Exporting your Skiff Pages
+
+1. Open the [Skiff Pages](https://app.skiff.com) app
+2. Open Settings > Export or just go directly to [https://app.skiff.com/dashboard/?settingTab=export](https://app.skiff.com/dashboard/?settingTab=export)
+   ![](/static/skiff-importer/1.png)
+3. Click on the Export button next to `Pages and Files` — this might take a few minutes depending on how many pages you have.
+4. Once the export is complete, save the `Skiff.zip` file at your preferred location.
+   ![](/static/skiff-importer/2.png)
+
+## Importing Skiff.zip file into Notesnook
+
+Once you have the `Skiff.zip` file containing your Skiff pages, its time to import them into Notesnook.
+
+1. Go to [https://importer.notesnook.com/](https://importer.notesnook.com/) on your PC/Laptop.
+2. From the list of note apps to import from, select "Markdown".
+   ![](/static/skiff-importer/3.png)
+3. Drop your Skiff.zip file, or click anywhere inside the box to browse and select your Skiff.zip file. Then click "Start processing".
+   ![](/static/skiff-importer/4.png)
+4. Once the Importer finishes processing your files, download the .zip file.
+   ![](/static/import-ready.png)
+5. After you have downloaded the `.zip` file, [go to the Notesnook Web App](https://app.notesnook.com/) > Settings > Notesnook Importer. Select the .zip you downloaded earlier and click "Start import" button.
+   ![](/static/import-zip-app.png)
+6. Once importing completes you should see all your notes in Notesnook. If you face any issues during importing, feel free to [report them on GitHub](https://github.com/streetwriters/notesnook-importer).
+
+## Supported formats
+
+- [x] Images
+- [x] Code blocks
+- [ ] Math blocks (Skiff Pages doesn't mark them properly so there's no way to detect them.)
+- [x] Tables
+- [x] Rich text (bold, italic, headings, lists etc.)
+- [x] Task lists

docs/help/docgen.yaml

@@ -38,6 +38,7 @@ navigation:
       - path: importing-notes/import-notes-from-simplenote.md
       - path: importing-notes/import-notes-from-standardnotes.md
       - path: importing-notes/import-notes-from-zoho-notebook.md
+      - path: importing-notes/import-notes-from-skiff-pages.md
       - path: importing-notes/import-notes-from-obsidian.md
       - path: importing-notes/import-notes-from-html-files.md
       - path: importing-notes/import-notes-from-markdown-files.md