Merge remote-tracking branch 'upstream/dev' into pr/mobile/settings-c…

…ontrol-labels
laurent22 · Nov 2, 2024 · 305fe77 · 305fe77
2 parents 173df18 + 8fb85ab
commit 305fe77
Show file tree

Hide file tree

Showing 57 changed files with 3,418 additions and 1,519 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -553,7 +553,16 @@ packages/app-mobile/commands/util/goToNote.js
 packages/app-mobile/commands/util/showResource.js
 packages/app-mobile/components/BackButtonDialogBox.js
 packages/app-mobile/components/BetaChip.js
-packages/app-mobile/components/CameraView.js
+packages/app-mobile/components/CameraView/ActionButtons.js
+packages/app-mobile/components/CameraView/Camera/index.jest.js
+packages/app-mobile/components/CameraView/Camera/index.js
+packages/app-mobile/components/CameraView/Camera/types.js
+packages/app-mobile/components/CameraView/CameraView.test.js
+packages/app-mobile/components/CameraView/CameraView.js
+packages/app-mobile/components/CameraView/ScannedBarcodes.js
+packages/app-mobile/components/CameraView/types.js
+packages/app-mobile/components/CameraView/utils/fitRectIntoBounds.js
+packages/app-mobile/components/CameraView/utils/useBarcodeScanner.js
 packages/app-mobile/components/Checkbox.js
 packages/app-mobile/components/DialogManager.js
 packages/app-mobile/components/DismissibleDialog.js
@@ -730,6 +739,7 @@ packages/app-mobile/components/screens/UpgradeSyncTargetScreen.js
 packages/app-mobile/components/screens/encryption-config.js
 packages/app-mobile/components/screens/status.js
 packages/app-mobile/components/side-menu-content.js
+packages/app-mobile/components/testing/TestProviderStack.js
 packages/app-mobile/components/voiceTyping/VoiceTypingDialog.js
 packages/app-mobile/gulpfile.js
 packages/app-mobile/index.web.js

diff --git a/.gitignore b/.gitignore
@@ -530,7 +530,16 @@ packages/app-mobile/commands/util/goToNote.js
 packages/app-mobile/commands/util/showResource.js
 packages/app-mobile/components/BackButtonDialogBox.js
 packages/app-mobile/components/BetaChip.js
-packages/app-mobile/components/CameraView.js
+packages/app-mobile/components/CameraView/ActionButtons.js
+packages/app-mobile/components/CameraView/Camera/index.jest.js
+packages/app-mobile/components/CameraView/Camera/index.js
+packages/app-mobile/components/CameraView/Camera/types.js
+packages/app-mobile/components/CameraView/CameraView.test.js
+packages/app-mobile/components/CameraView/CameraView.js
+packages/app-mobile/components/CameraView/ScannedBarcodes.js
+packages/app-mobile/components/CameraView/types.js
+packages/app-mobile/components/CameraView/utils/fitRectIntoBounds.js
+packages/app-mobile/components/CameraView/utils/useBarcodeScanner.js
 packages/app-mobile/components/Checkbox.js
 packages/app-mobile/components/DialogManager.js
 packages/app-mobile/components/DismissibleDialog.js
@@ -707,6 +716,7 @@ packages/app-mobile/components/screens/UpgradeSyncTargetScreen.js
 packages/app-mobile/components/screens/encryption-config.js
 packages/app-mobile/components/screens/status.js
 packages/app-mobile/components/side-menu-content.js
+packages/app-mobile/components/testing/TestProviderStack.js
 packages/app-mobile/components/voiceTyping/VoiceTypingDialog.js
 packages/app-mobile/gulpfile.js
 packages/app-mobile/index.web.js

diff --git a/packages/app-cli/package.json b/packages/app-cli/package.json
@@ -35,15 +35,15 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "3.1.0",
+  "version": "3.2.0",
   "bin": "./main.js",
   "engines": {
     "node": ">=10.0.0"
   },
   "dependencies": {
-    "@joplin/lib": "~3.1",
-    "@joplin/renderer": "~3.1",
-    "@joplin/utils": "~3.1",
+    "@joplin/lib": "~3.2",
+    "@joplin/renderer": "~3.2",
+    "@joplin/utils": "~3.2",
     "aws-sdk": "2.1340.0",
     "chalk": "4.1.2",
     "compare-version": "0.1.2",
@@ -70,10 +70,10 @@
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@joplin/tools": "~3.1",
+    "@joplin/tools": "~3.2",
     "@types/fs-extra": "11.0.4",
     "@types/jest": "29.5.12",
-    "@types/node": "18.19.42",
+    "@types/node": "18.19.43",
     "@types/proper-lockfile": "^4.1.2",
     "gulp": "4.0.2",
     "jest": "29.7.0",

diff --git a/packages/app-clipper/manifest.json b/packages/app-clipper/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 3,
     "name": "Joplin Web Clipper [DEV]",
-    "version": "3.1.1",
+    "version": "3.2.0",
     "description": "Capture and save web pages and screenshots from your browser to Joplin.",
     "homepage_url": "https://joplinapp.org",
     "content_security_policy": {

diff --git a/packages/app-desktop/integration-tests/pluginApi.spec.ts b/packages/app-desktop/integration-tests/pluginApi.spec.ts
@@ -18,6 +18,7 @@ test.describe('pluginApi', () => {
 				await editor.richTextEditor.click();
 			}
 
+			await editor.expectToHaveText('This content should be overwritten.');
 			await mainScreen.goToAnything.runCommand(app, 'testUpdateEditorText');
 			await editor.expectToHaveText('PASS');
 

diff --git a/packages/app-desktop/package.json b/packages/app-desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/app-desktop",
-  "version": "3.1.18",
+  "version": "3.2.0",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "private": true,
@@ -125,12 +125,12 @@
   "devDependencies": {
     "7zip-bin": "5.2.0",
     "@electron/rebuild": "3.6.0",
-    "@joplin/default-plugins": "~3.1",
-    "@joplin/tools": "~3.1",
+    "@joplin/default-plugins": "~3.2",
+    "@joplin/tools": "~3.2",
     "@playwright/test": "1.45.3",
     "@testing-library/react-hooks": "8.0.1",
     "@types/jest": "29.5.12",
-    "@types/node": "18.19.42",
+    "@types/node": "18.19.43",
     "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
     "@types/react-redux": "7.1.33",
@@ -155,10 +155,10 @@
     "@electron/remote": "2.1.2",
     "@fortawesome/fontawesome-free": "5.15.4",
     "@joeattardi/emoji-button": "4.6.4",
-    "@joplin/editor": "~3.1",
-    "@joplin/lib": "~3.1",
-    "@joplin/renderer": "~3.1",
-    "@joplin/utils": "~3.1",
+    "@joplin/editor": "~3.2",
+    "@joplin/lib": "~3.2",
+    "@joplin/renderer": "~3.2",
+    "@joplin/utils": "~3.2",
     "@sentry/electron": "4.24.0",
     "@types/mustache": "4.2.5",
     "async-mutex": "0.5.0",

diff --git a/packages/app-mobile/android/app/build.gradle b/packages/app-mobile/android/app/build.gradle
@@ -80,13 +80,10 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
 		versionCode 2097753
-		versionName "3.1.5"
+		versionName "3.2.0"
 		ndk {
 			abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
 		}
-
-        // https://github.com/react-native-community/react-native-camera/issues/2138
-        missingDimensionStrategy 'react-native-camera', 'general'
 
         // Needed to fix: The number of method references in a .dex file cannot exceed 64K
         multiDexEnabled true
@@ -122,12 +119,6 @@ android {
 }
 
 dependencies {
-    // This removes proprietary bits to enable inclusion in F-Droid
-    // https://gitlab.com/fdroid/rfp/-/issues/434#note_443458711
-    implementation (project(':react-native-camera')){
-        exclude group: 'com.google.android.gms', module: 'play-services-vision'
-    }
-
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
 

diff --git a/packages/app-mobile/android/app/src/main/java/net/cozic/joplin/MainActivity.kt b/packages/app-mobile/android/app/src/main/java/net/cozic/joplin/MainActivity.kt
@@ -1,4 +1,5 @@
 package net.cozic.joplin
+import expo.modules.ReactActivityDelegateWrapper
 
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
@@ -18,5 +19,5 @@ class MainActivity : ReactActivity() {
    * which allows you to enable New Architecture with a single boolean flags [fabricEnabled]
    */
   override fun createReactActivityDelegate(): ReactActivityDelegate =
-      DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled)
+      ReactActivityDelegateWrapper(this, BuildConfig.IS_NEW_ARCHITECTURE_ENABLED, DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled))
 }
diff --git a/packages/app-mobile/android/app/src/main/java/net/cozic/joplin/MainApplication.kt b/packages/app-mobile/android/app/src/main/java/net/cozic/joplin/MainApplication.kt
@@ -1,4 +1,7 @@
 package net.cozic.joplin
+import android.content.res.Configuration
+import expo.modules.ApplicationLifecycleDispatcher
+import expo.modules.ReactNativeHostWrapper
 
 import android.app.Application
 import android.database.CursorWindow
@@ -18,7 +21,7 @@ import net.cozic.joplin.ssl.SslPackage
 import net.cozic.joplin.textinput.TextInputPackage
 
 class MainApplication : Application(), ReactApplication {
-    override val reactNativeHost: ReactNativeHost = object : DefaultReactNativeHost(this) {
+    override val reactNativeHost: ReactNativeHost = ReactNativeHostWrapper(this, object : DefaultReactNativeHost(this) {
         override fun getPackages(): List<ReactPackage> =
                 PackageList(this).packages.apply {
                     // Packages that cannot be autolinked yet can be added manually here, for example:
@@ -35,10 +38,10 @@ class MainApplication : Application(), ReactApplication {
 
         override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
         override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
-    }
+    })
 
     override val reactHost: ReactHost
-        get() = getDefaultReactHost(this.applicationContext, reactNativeHost)
+        get() = ReactNativeHostWrapper.createReactHost(this.applicationContext, reactNativeHost)
 
     override fun onCreate() {
         super.onCreate()
@@ -59,5 +62,11 @@ class MainApplication : Application(), ReactApplication {
             // If you opted-in for the New Architecture, we load the native entry point for this app.
             load()
         }
-    }
+      ApplicationLifecycleDispatcher.onApplicationCreate(this)
+  }
+
+  override fun onConfigurationChanged(newConfig: Configuration) {
+    super.onConfigurationChanged(newConfig)
+    ApplicationLifecycleDispatcher.onConfigurationChanged(this, newConfig)
+  }
 }
diff --git a/packages/app-mobile/android/build.gradle b/packages/app-mobile/android/build.gradle
@@ -53,6 +53,11 @@ allprojects {
 
         google()
         maven { url 'https://www.jitpack.io' }
+
+        maven {
+            // expo-camera bundles a custom com.google.android:cameraview
+            url "$rootDir/../node_modules/expo-camera/android/maven"
+        }
     }
 }
 

diff --git a/packages/app-mobile/android/settings.gradle b/packages/app-mobile/android/settings.gradle
@@ -3,4 +3,6 @@ include ':react-native-vector-icons'
 project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
-includeBuild('../node_modules/@react-native/gradle-plugin')
+includeBuild('../node_modules/@react-native/gradle-plugin')
+apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle")
+useExpoModules()