Compare commits

...

84 Commits

Author SHA1 Message Date
Ammar Ahmed
e57ca95af5 mobile: fix share extension. blank in dark mode on mobile 2025-11-27 10:52:52 +05:00
Ammar Ahmed
43cf1199d4 mobile: fix app alignment 2025-11-27 10:10:53 +05:00
Ammar Ahmed
d9d65f8e25 mobile: fix workflow get npm version 2025-11-26 15:19:06 +05:00
Ammar Ahmed
3ceb5f45cf mobile: do not set key prop on tag item 2025-11-26 14:04:20 +05:00
Ammar Ahmed
c126a7c933 mobile: fix list item rendering 2025-11-26 14:03:07 +05:00
Ammar Ahmed
9d9a4927b6 mobile: fix list not rerendering on sync 2025-11-26 13:43:08 +05:00
Ammar Ahmed
f97dafa5a7 mobile: fix share extension 2025-11-26 13:24:27 +05:00
Ammar Ahmed
55fd752f5c mobile: remove debug keystore before build 2025-11-25 17:17:33 +05:00
Ammar Ahmed
fb2afb6cf8 mobile: remove timeout for workflow 2025-11-25 13:22:52 +05:00
Ammar Ahmed
6335b1007b mobile: fix ts errors 2025-11-25 12:40:51 +05:00
Ammar Ahmed
5ea42e3297 mobile: update release workflows 2025-11-25 11:26:13 +05:00
Ammar Ahmed
13b7e35a01 Merge pull request #8982 from streetwriters/rn-81
Update Mobile App to React Native 0.82
2025-11-25 11:24:05 +05:00
Ammar Ahmed
44e69c7f28 Merge branch 'beta' into rn-81 2025-11-25 11:22:26 +05:00
Ammar Ahmed
93e4b4ef77 mobile: beta release 2025-11-25 11:20:43 +05:00
Ammar Ahmed
b1fe72b87b mobile: update workflow 2025-11-25 11:12:52 +05:00
Ammar Ahmed
4e1772f4cc mobile: add support for monograph analytics 2025-11-25 11:09:06 +05:00
Ammar Ahmed
8263db83d8 mobile: fix manage tags screen items collapsed 2025-11-25 10:53:13 +05:00
Abdullah Atta
9f88eaae77 web: bump version to 3.3.6-beta.0 2025-11-24 14:21:04 +05:00
01zulfi
704ad578fa editor: unhide children when collapsed heading is changed to non-heading node (#8946)
Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>
2025-11-24 14:20:02 +05:00
01zulfi
cf608977e1 editor: improve table cell styling (#8960)
Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>
2025-11-24 14:18:13 +05:00
Ammar Ahmed
c19d9ea315 mobile: refactor navigation 2025-11-24 11:25:56 +05:00
01zulfi
bdd78df452 editor: change heading collapse icon pos (#8953)
* editor: enable heading in table, change collapse icon pos, && disable empty heading collapse
Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>

* editor: migrate empty collapsed headings in parseHTML instead of plugin
Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>

* editor: remove migration for empty collapsed headings
Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>

* editor: fix heading collapse on mobile
Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>

* editor: use ontouchend instead of ontouchstart

---------

Co-authored-by: Abdullah Atta <abdullahatta@streetwriters.co>
2025-11-24 10:49:43 +05:00
01zulfi
cec05b6dfc web: allow archiving when notes drag-n-dropped on nav item
Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>
2025-11-24 10:46:21 +05:00
01zulfi
3e4779e6bf editor: fade checklist when checked
Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>

Update packages/editor/styles/styles.css

Signed-off-by: Abdullah Atta <thecodrr@protonmail.com>
2025-11-24 10:46:21 +05:00
01zulfi
9ebcbb7bd8 web: exclude empty paragraphs in editor stats
Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>
2025-11-24 10:46:21 +05:00
01zulfi
f3f8020929 editor: disable collapsible headings inside tables
Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>
2025-11-24 10:46:21 +05:00
01zulfi
43186d28e7 core: fix user keys re-encryption when updating password
Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>
2025-11-24 10:46:21 +05:00
Ammar Ahmed
927488706f mobile: update deps 2025-11-24 09:59:18 +05:00
Ammar Ahmed
d1a78c5d02 mobile: lazy load globals on first access 2025-11-24 09:58:50 +05:00
Ammar Ahmed
fddd0acf3a mobile: fixed slow app launch
1. Do not await any network request on app launch
2. Load navigation screens immediately without any delay
2025-11-24 09:58:21 +05:00
Ammar Ahmed
4bf86a0142 mobile: fix UI jump on app launch 2025-11-24 09:56:42 +05:00
Ammar Ahmed
c29f0dc79e mobile: fix current value not stored in useStoredValue hook 2025-11-24 09:56:08 +05:00
Ammar Ahmed
9a0bb42046 mobile: fix rerender due to useEffect dep array missing 2025-11-24 09:54:58 +05:00
Ammar Ahmed
420307ab8d mobile: fix floating button shadow clipped on android 2025-11-24 09:54:12 +05:00
Ammar Ahmed
1aa18eabd6 mobile: smaller batch size of items 2025-11-24 09:53:48 +05:00
Ammar Ahmed
3104d698fd mobile: lazy init data on db load 2025-11-24 09:53:34 +05:00
Ammar Ahmed
3cf5d1995c mobile: fix bootsplash not loading on android 2025-11-22 10:51:58 +05:00
Ammar Ahmed
5caddb0ec6 Merge branch 'beta' into rn-81 2025-11-20 14:32:16 +05:00
Ammar Ahmed
8e0cc7be38 mobile: update pods and patches 2025-11-12 11:53:21 +05:00
Ammar Ahmed
5b6fc6695e mobile: fix auto scroll on signup and login pages 2025-11-12 11:52:44 +05:00
Abdullah Atta
d9d6a40276 Merge pull request #8930 from streetwriters/feat/improve-tables-on-mobile
Improve tables on mobile
2025-11-12 11:23:55 +05:00
Ammar Ahmed
e5d61c34f8 mobile: fix input vertical padding 2025-11-12 10:57:59 +05:00
Ammar Ahmed
50dcf54e9d mobile: update packages 2025-11-12 09:55:50 +05:00
Abdullah Atta
818b7bd4d7 mobile: release v3.3.9 2025-11-12 09:50:34 +05:00
Abdullah Atta
dac78a2339 web: remove border separation 2025-11-12 09:50:34 +05:00
Abdullah Atta
c5d9ea612e web: lazily load monograph analytics 2025-11-12 09:50:34 +05:00
Abdullah Atta
9c3544b2c9 core: handle errors on monograph analytics fetch 2025-11-12 09:50:34 +05:00
Abdullah Atta
2f6571da36 web: make monograph analytics a pro feature 2025-11-12 09:50:34 +05:00
Abdullah Atta
41418a44e6 core: monographs stats -> monograph analytics 2025-11-12 09:50:34 +05:00
Abdullah Atta
64c5ec275a web: improve publish view ux 2025-11-12 09:50:34 +05:00
01zulfi
a9dae4ca65 web: use monograph stats api
Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>
2025-11-12 09:50:34 +05:00
01zulfi
567a5010eb web: show monograph's view count
Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>
2025-11-12 09:50:34 +05:00
Ammar Ahmed
b53904d6f2 mobile: release v3.3.8 2025-11-12 09:50:34 +05:00
Ammar Ahmed
67b2613053 mobile: update documentation link 2025-11-12 09:49:57 +05:00
Ammar Ahmed
76522527dd mobile: fix restore backup keeps loading 2025-11-12 09:49:57 +05:00
01zulfi
4602b56d72 web: bump version to 3.3.5
Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>
2025-11-12 09:49:57 +05:00
01zulfi
90ef20a0db editor: fix checklist parsing as bulletlist
* reduce list-item's parseHTML priority lower than check-list-item's parseHTML priority

Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>
2025-11-12 09:49:57 +05:00
Ammar Ahmed
5a49d69df3 Merge branch 'beta' into rn-81 2025-11-04 09:31:47 +05:00
Ammar Ahmed
fbf4d80210 mobile: migrate to use @legendapp/list 2025-11-03 18:36:11 +05:00
Ammar Ahmed
08d19794f4 mobile: fix restore backup 2025-11-03 13:33:06 +05:00
Ammar Ahmed
ee82ee7a0d mobile: fix layout shift on app launch 2025-11-03 12:17:58 +05:00
Ammar Ahmed
c46919b727 mobile: fix build with metro bundler 2025-11-03 11:29:31 +05:00
Ammar Ahmed
8094b52b68 mobile: update deps 2025-11-01 14:15:07 +05:00
Ammar Ahmed
9e2116c69b Merge branch 'beta' into rn-81 2025-11-01 14:14:51 +05:00
Ammar Ahmed
65c6e1c0f5 mobile: minor fixes 2025-10-24 12:41:48 +05:00
Ammar Ahmed
ee4b2c2ba9 mobile: update tsconfig.json 2025-10-24 09:20:45 +05:00
Ammar Ahmed
5a0d807f7b Merge branch 'beta' into rn-81 2025-10-24 09:20:10 +05:00
Ammar Ahmed
50d4d9c146 mobile: fix auth flow 2025-10-22 14:18:26 +05:00
Ammar Ahmed
c5d6802798 mobile: migrate auth flows to tsx 2025-10-22 14:17:58 +05:00
Ammar Ahmed
77540c7c4d mobile: migrate announcements to ts 2025-10-22 13:16:36 +05:00
Ammar Ahmed
ae7932c5d0 mobile: update share extension 2025-10-22 12:25:25 +05:00
Ammar Ahmed
c189c63c3d mobile: migrate share to ts 2025-10-22 11:11:10 +05:00
Ammar Ahmed
d468a8274e mobile: fix build errors on ios 2025-10-21 19:44:54 +05:00
Ammar Ahmed
8363ac92b9 mobile: fix font paths 2025-10-21 14:00:36 +05:00
Ammar Ahmed
b7249dc799 misc: update packages 2025-10-21 13:56:15 +05:00
Ammar Ahmed
f2b1086a02 Merge branch 'beta' into rn-81 2025-10-21 13:08:04 +05:00
Ammar Ahmed
45b17a9927 mobile: fix ios build on new architecture 2025-10-21 12:06:44 +05:00
Ammar Ahmed
f6695d0eb2 mobile: react-native 0.82.0 2025-10-20 10:58:08 +05:00
Ammar Ahmed
8e54485d3c mobile: minor fixes 2025-10-17 08:47:00 +05:00
Ammar Ahmed
9294b0b9e4 mobile: fix picker import 2025-10-11 10:16:08 +05:00
Ammar Ahmed
6bf8c918cb mobile: patch drax to fix measureLayout warnings 2025-10-10 15:34:41 +05:00
Ammar Ahmed
3e28e7aca1 mobile: enable new arch 2025-10-10 14:27:48 +05:00
Ammar Ahmed
773f450f12 mobile: react-native 0.81.4 2025-10-09 13:54:44 +05:00
Ammar Ahmed
15582f010c mobile: add note tests 2025-10-06 14:50:47 +05:00
421 changed files with 27084 additions and 43524 deletions

View File

@@ -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

View File

@@ -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,7 @@ 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: Install CCache
uses: hendrikmuhs/ccache-action@v1.2.11
@@ -79,6 +78,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 +91,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 +106,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 +116,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
@@ -135,7 +137,7 @@ 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
@@ -146,15 +148,15 @@ jobs:
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

View File

@@ -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,12 +55,12 @@ 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
cd apps/mobile/ios
bundle install
RCT_NEW_ARCH_ENABLED=0 bundle exec pod install
@@ -79,9 +79,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 +117,5 @@ jobs:
name: Notesnook.zip
path: |
Notesnook.ipa
apps/mobile/native/ios/**/*.map
apps/mobile/ios/**/*.map
packages/editor-mobile/sourcemaps/*.map

View File

@@ -1,12 +1,12 @@
{
"name": "@notesnook/desktop",
"version": "3.3.5",
"version": "3.3.6-beta.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@notesnook/desktop",
"version": "3.3.5",
"version": "3.3.6-beta.0",
"hasInstallScript": true,
"license": "GPL-3.0-or-later",
"dependencies": {

View File

@@ -2,7 +2,7 @@
"name": "@notesnook/desktop",
"productName": "Notesnook",
"description": "Your private note taking space",
"version": "3.3.5",
"version": "3.3.6-beta.0",
"appAppleId": "1544027013",
"private": true,
"main": "./dist/cjs/index.js",

92
apps/mobile/.detoxrc.js Normal file
View File

@@ -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 12"
}
},
attached: {
type: "android.attached",
device: {
adbName: ".*"
}
},
emulator: {
type: "android.emulator",
device: {
avdName: "Pixel_5_API_34"
}
}
},
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"
}
}
};

View File

@@ -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

View File

@@ -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'

View File

@@ -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

View File

@@ -11,13 +11,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 +44,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 +72,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 +94,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 +124,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled true
versionCode 3078
versionCode 3079
versionName getNpmVersion()
testBuildType System.getProperty('testBuildType', 'debug')
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -165,7 +165,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 +221,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 +234,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'
}

Binary file not shown.

View File

@@ -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">

View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

@@ -21,7 +21,8 @@ import com.zoontek.rnbootsplash.RNBootSplash;
public class MainActivity extends ReactActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
RNBootSplash.init(this);
RNBootSplash.init(this, R.style.BootTheme);
super.onCreate(null);
if (BuildConfig.DEBUG) {
WebView.setWebContentsDebuggingEnabled(true);

View File

@@ -0,0 +1,27 @@
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
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()
loadReactNative(this)
}
}

View File

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

View File

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

View File

@@ -18,10 +18,10 @@
<!-- BootTheme should inherit from Theme.SplashScreen -->
<style name="BootTheme" parent="Theme.SplashScreen">
<item name="windowSplashScreenBackground">@color/bootsplash_background</item>
<item name="windowSplashScreenAnimatedIcon">@mipmap/bootsplash_logo</item>
<item name="bootSplashBackground">@color/bootsplash_background</item>
<item name="bootSplashLogo">@mipmap/bootsplash_logo_dark</item>
<item name="android:navigationBarColor">@color/bootsplash_background</item>
<item name="postSplashScreenTheme">@style/AppTheme</item>
<item name="postBootSplashTheme">@style/AppTheme</item>
</style>
<!-- Base application theme. -->
@@ -29,7 +29,6 @@
<style name="AppThemeB" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowIsFloating">true</item>
<item name="android:backgroundDimEnabled">true</item>
<item name="android:editTextBackground">@drawable/edit_text</item>
<item name="android:navigationBarColor">@android:color/transparent</item>

Some files were not shown because too many files have changed in this diff Show More