Mobile: Upgrading to RN 60

ReactNativeClient/android/app/build.gradle

@@ -146,9 +146,7 @@ android {
 }
 
 dependencies {
-    implementation project(':@react-native-community_slider')
 	implementation "org.webkit:android-jsc:r241213"
-    implementation project(':react-native-webview')
     compile project(':react-native-push-notification')
     // implementation (project(':react-native-camera')) {
     // 	// This is required because com.google.firebase requires v16.0.x of com.google.android.gms
@@ -174,7 +172,7 @@ dependencies {
 	implementation project(':rn-fetch-blob')
 	implementation project(':react-native-document-picker')
 	implementation project(':react-native-image-resizer')
-	implementation project(':react-native-share-extension')
+	// implementation project(':react-native-share-extension')
 	implementation project(':react-native-version-info')
 	implementation project(':react-native-camera')
 	implementation "com.facebook.react:react-native:+"

ReactNativeClient/android/app/proguard-rules.pro

@@ -8,10 +8,3 @@
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
 # Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}

ReactNativeClient/android/app/src/main/java/net/cozic/joplin/MainApplication.java

@@ -1,28 +1,19 @@
 package net.cozic.joplin;
 
 import android.app.Application;
+import android.util.Log;
+import com.facebook.react.PackageList;
+import com.facebook.hermes.reactexecutor.HermesExecutorFactory;
+import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.ReactApplication;
-import com.reactnativecommunity.slider.ReactSliderPackage;
-import com.reactnativecommunity.webview.RNCWebViewPackage;
 import com.dieam.reactnativepushnotification.ReactNativePushNotificationPackage;
-import com.vinzscam.reactnativefileviewer.RNFileViewerPackage;
-import net.rhogan.rnsecurerandom.RNSecureRandomPackage;
-import com.imagepicker.ImagePickerPackage;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
 import com.facebook.soloader.SoLoader;
-import com.oblador.vectoricons.VectorIconsPackage;
-import com.reactnativedocumentpicker.ReactNativeDocumentPicker;
-import com.RNFetchBlob.RNFetchBlobPackage;
-import com.rnfs.RNFSPackage;
-import fr.bamlab.rnimageresizer.ImageResizerPackage;
-import org.pgsqlite.SQLitePluginPackage;
-import org.reactnative.camera.RNCameraPackage;
 import java.lang.reflect.Field;
-import com.alinz.parkerdan.shareextension.SharePackage;
-import cx.evermeet.versioninfo.RNVersionInfoPackage;
+// import com.alinz.parkerdan.shareextension.SharePackage;
 import java.util.Arrays;
 import java.util.List;
 import android.database.CursorWindow;
@@ -37,6 +28,15 @@ public class MainApplication extends Application implements ReactApplication {
 
 		@Override
 		protected List<ReactPackage> getPackages() {
+
+			// Was added in RN 60.x:
+			//
+			// @SuppressWarnings("UnnecessaryLocalVariable")
+			// List<ReactPackage> packages = new PackageList(this).getPackages();
+			// // Packages that cannot be autolinked yet can be added manually here, for example:
+			// // packages.add(new MyReactNativePackage());
+			// return packages;
+
 			return Arrays.<ReactPackage>asList(
 				new MainReactPackage(),
 				new ReactSliderPackage(),
@@ -51,7 +51,7 @@ public class MainApplication extends Application implements ReactApplication {
 				new RNFSPackage(),
 				new SQLitePluginPackage(),
 				new VectorIconsPackage(),
-				new SharePackage(),
+				// new SharePackage(),
 				new RNCameraPackage(),
 				new RNVersionInfoPackage()
 			);

ReactNativeClient/android/app/src/main/java/net/cozic/joplin/share/ShareApplication.java

@@ -2,7 +2,7 @@ package net.cozic.joplin.share;
 // import build config
 import net.cozic.joplin.BuildConfig;
 
-import com.alinz.parkerdan.shareextension.SharePackage;
+// import com.alinz.parkerdan.shareextension.SharePackage;
 
 import android.app.Application;
 
@@ -25,8 +25,8 @@ public class ShareApplication extends Application implements ReactApplication {
 		@Override
 		protected List<ReactPackage> getPackages() {
 			return Arrays.<ReactPackage>asList(
-				new MainReactPackage(),
-				new SharePackage()
+				new MainReactPackage()
+				// new SharePackage()
 			);
 		}
 	};

ReactNativeClient/android/app/src/main/res/values/styles.xml

@@ -3,6 +3,7 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
+        <item name="android:textColor">#000000</item>
     </style>
 
 </resources>