mirror of
https://github.com/laurent22/joplin.git
synced 2025-06-06 22:46:29 +02:00
Getting latest RNCamera to work with Android
This commit is contained in:
parent
ff257060d1
commit
c3f20d3ebc
@ -99,6 +99,7 @@ android {
|
|||||||
ndk {
|
ndk {
|
||||||
abiFilters "armeabi-v7a", "x86"
|
abiFilters "armeabi-v7a", "x86"
|
||||||
}
|
}
|
||||||
|
missingDimensionStrategy 'react-native-camera', 'general'
|
||||||
}
|
}
|
||||||
splits {
|
splits {
|
||||||
abi {
|
abi {
|
||||||
@ -174,6 +175,7 @@ dependencies {
|
|||||||
implementation project(':react-native-image-resizer')
|
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-version-info')
|
||||||
|
implementation project(':react-native-camera')
|
||||||
implementation "com.facebook.react:react-native:+"
|
implementation "com.facebook.react:react-native:+"
|
||||||
|
|
||||||
// implementation "com.google.android.gms:play-services-base:16.0.1" // For Firebase
|
// implementation "com.google.android.gms:play-services-base:16.0.1" // For Firebase
|
||||||
|
@ -19,6 +19,7 @@ import com.RNFetchBlob.RNFetchBlobPackage;
|
|||||||
import com.rnfs.RNFSPackage;
|
import com.rnfs.RNFSPackage;
|
||||||
import fr.bamlab.rnimageresizer.ImageResizerPackage;
|
import fr.bamlab.rnimageresizer.ImageResizerPackage;
|
||||||
import org.pgsqlite.SQLitePluginPackage;
|
import org.pgsqlite.SQLitePluginPackage;
|
||||||
|
import org.reactnative.camera.RNCameraPackage;
|
||||||
|
|
||||||
import com.alinz.parkerdan.shareextension.SharePackage;
|
import com.alinz.parkerdan.shareextension.SharePackage;
|
||||||
|
|
||||||
@ -51,6 +52,7 @@ public class MainApplication extends Application implements ReactApplication {
|
|||||||
new SQLitePluginPackage(),
|
new SQLitePluginPackage(),
|
||||||
new VectorIconsPackage(),
|
new VectorIconsPackage(),
|
||||||
new SharePackage(),
|
new SharePackage(),
|
||||||
|
new RNCameraPackage(),
|
||||||
new RNVersionInfoPackage()
|
new RNVersionInfoPackage()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -25,6 +25,7 @@ allprojects {
|
|||||||
mavenLocal()
|
mavenLocal()
|
||||||
google()
|
google()
|
||||||
jcenter() // Was added by me - still needed?
|
jcenter() // Was added by me - still needed?
|
||||||
|
maven { url "https://jitpack.io" }
|
||||||
maven {
|
maven {
|
||||||
url "https://maven.google.com"
|
url "https://maven.google.com"
|
||||||
}
|
}
|
||||||
|
@ -34,3 +34,6 @@ project(':react-native-version-info').projectDir = new File(rootProject.projectD
|
|||||||
|
|
||||||
include ':react-native-push-notification'
|
include ':react-native-push-notification'
|
||||||
project(':react-native-push-notification').projectDir = file('../node_modules/react-native-push-notification/android')
|
project(':react-native-push-notification').projectDir = file('../node_modules/react-native-push-notification/android')
|
||||||
|
|
||||||
|
include ':react-native-camera'
|
||||||
|
project(':react-native-camera').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-camera/android')
|
@ -364,6 +364,7 @@ class ScreenHeaderComponent extends Component {
|
|||||||
|
|
||||||
const addFolderChildren = (folders, pickerItems, indent) => {
|
const addFolderChildren = (folders, pickerItems, indent) => {
|
||||||
folders.sort((a, b) => {
|
folders.sort((a, b) => {
|
||||||
|
if (!a || !b) return -1; // No idea why "a" was undefined at one point
|
||||||
return a.title.toLowerCase() < b.title.toLowerCase() ? -1 : +1;
|
return a.title.toLowerCase() < b.title.toLowerCase() ? -1 : +1;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user