diff --git a/ReactNativeClient/.flowconfig b/ReactNativeClient/.flowconfig index f83105573..1319ea127 100644 --- a/ReactNativeClient/.flowconfig +++ b/ReactNativeClient/.flowconfig @@ -11,21 +11,54 @@ ; Ignore duplicate module providers ; For RN Apps installed via npm, "Libraries" folder is inside ; "node_modules/react-native" but in the source repo it is in the root -.*/Libraries/react-native/React.js -.*/Libraries/react-native/ReactNative.js +node_modules/react-native/Libraries/react-native/React.js + +; Ignore polyfills +node_modules/react-native/Libraries/polyfills/.* + +; These should not be required directly +; require from fbjs/lib instead: require('fbjs/lib/warning') +node_modules/warning/.* + +; Flow doesn't support platforms +.*/Libraries/Utilities/HMRLoadingView.js + +[untyped] +.*/node_modules/@react-native-community/cli/.*/.* [include] [libs] node_modules/react-native/Libraries/react-native/react-native-interface.js -node_modules/react-native/flow +node_modules/react-native/flow/ [options] emoji=true -module.system=haste +esproposal.optional_chaining=enable +esproposal.nullish_coalescing=enable -experimental.strict_type_args=true +module.file_ext=.js +module.file_ext=.json +module.file_ext=.ios.js + +module.system=haste +module.system.haste.use_name_reducers=true +# get basename +module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1' +# strip .js or .js.flow suffix +module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1' +# strip .ios suffix +module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1' +module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1' +module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1' +module.system.haste.paths.blacklist=.*/__tests__/.* +module.system.haste.paths.blacklist=.*/__mocks__/.* +module.system.haste.paths.whitelist=/node_modules/react-native/Libraries/.* +module.system.haste.paths.whitelist=/node_modules/react-native/RNTester/.* +module.system.haste.paths.whitelist=/node_modules/react-native/IntegrationTests/.* +module.system.haste.paths.blacklist=/node_modules/react-native/Libraries/react-native/react-native-implementation.js +module.system.haste.paths.blacklist=/node_modules/react-native/Libraries/Animated/src/polyfills/.* munge_underscores=true @@ -33,14 +66,34 @@ module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|we suppress_type=$FlowIssue suppress_type=$FlowFixMe -suppress_type=$FixMe +suppress_type=$FlowFixMeProps +suppress_type=$FlowFixMeState -suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-2]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\) -suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-2]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+ -suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy +suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\) +suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+ suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError -unsafe.enable_getters_and_setters=true +[lints] +sketchy-null-number=warn +sketchy-null-mixed=warn +sketchy-number=warn +untyped-type-import=warn +nonstrict-import=warn +deprecated-type=warn +unsafe-getters-setters=warn +inexact-spread=warn +unnecessary-invariant=warn +signature-verification-failure=warn +deprecated-utility=error + +[strict] +deprecated-type +nonstrict-import +sketchy-null +unclear-type +unsafe-getters-setters +untyped-import +untyped-type-import [version] -^0.92.0 +^0.98.0 diff --git a/ReactNativeClient/.gitignore b/ReactNativeClient/.gitignore index 9cae9b1d1..bd31af8e6 100644 --- a/ReactNativeClient/.gitignore +++ b/ReactNativeClient/.gitignore @@ -41,6 +41,9 @@ buck-out/ \.buckd/ *.keystore +# CocoaPods +ios/Pods/ + # fastlane # # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the diff --git a/ReactNativeClient/android/app/build.gradle b/ReactNativeClient/android/app/build.gradle index 7531416cf..470edb7eb 100644 --- a/ReactNativeClient/android/app/build.gradle +++ b/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:+" diff --git a/ReactNativeClient/android/app/proguard-rules.pro b/ReactNativeClient/android/app/proguard-rules.pro index a92fa177e..11b025724 100644 --- a/ReactNativeClient/android/app/proguard-rules.pro +++ b/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 *; -#} diff --git a/ReactNativeClient/android/app/src/main/assets/fonts/Entypo.ttf b/ReactNativeClient/android/app/src/main/assets/fonts/Entypo.ttf deleted file mode 100644 index 1c8f5e910..000000000 Binary files a/ReactNativeClient/android/app/src/main/assets/fonts/Entypo.ttf and /dev/null differ diff --git a/ReactNativeClient/android/app/src/main/assets/fonts/EvilIcons.ttf b/ReactNativeClient/android/app/src/main/assets/fonts/EvilIcons.ttf deleted file mode 100644 index b270f9851..000000000 Binary files a/ReactNativeClient/android/app/src/main/assets/fonts/EvilIcons.ttf and /dev/null differ diff --git a/ReactNativeClient/android/app/src/main/assets/fonts/Feather.ttf b/ReactNativeClient/android/app/src/main/assets/fonts/Feather.ttf deleted file mode 100755 index 244854c54..000000000 Binary files a/ReactNativeClient/android/app/src/main/assets/fonts/Feather.ttf and /dev/null differ diff --git a/ReactNativeClient/android/app/src/main/assets/fonts/FontAwesome.ttf b/ReactNativeClient/android/app/src/main/assets/fonts/FontAwesome.ttf deleted file mode 100644 index 35acda2fa..000000000 Binary files a/ReactNativeClient/android/app/src/main/assets/fonts/FontAwesome.ttf and /dev/null differ diff --git a/ReactNativeClient/android/app/src/main/assets/fonts/Foundation.ttf b/ReactNativeClient/android/app/src/main/assets/fonts/Foundation.ttf deleted file mode 100644 index 6cce217dd..000000000 Binary files a/ReactNativeClient/android/app/src/main/assets/fonts/Foundation.ttf and /dev/null differ diff --git a/ReactNativeClient/android/app/src/main/assets/fonts/Ionicons.ttf b/ReactNativeClient/android/app/src/main/assets/fonts/Ionicons.ttf deleted file mode 100644 index 307ad889a..000000000 Binary files a/ReactNativeClient/android/app/src/main/assets/fonts/Ionicons.ttf and /dev/null differ diff --git a/ReactNativeClient/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf b/ReactNativeClient/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf deleted file mode 100644 index 69404e3d9..000000000 Binary files a/ReactNativeClient/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf and /dev/null differ diff --git a/ReactNativeClient/android/app/src/main/assets/fonts/MaterialIcons.ttf b/ReactNativeClient/android/app/src/main/assets/fonts/MaterialIcons.ttf deleted file mode 100644 index 7015564ad..000000000 Binary files a/ReactNativeClient/android/app/src/main/assets/fonts/MaterialIcons.ttf and /dev/null differ diff --git a/ReactNativeClient/android/app/src/main/assets/fonts/Octicons.ttf b/ReactNativeClient/android/app/src/main/assets/fonts/Octicons.ttf deleted file mode 100644 index 09e2b2d79..000000000 Binary files a/ReactNativeClient/android/app/src/main/assets/fonts/Octicons.ttf and /dev/null differ diff --git a/ReactNativeClient/android/app/src/main/assets/fonts/SimpleLineIcons.ttf b/ReactNativeClient/android/app/src/main/assets/fonts/SimpleLineIcons.ttf deleted file mode 100644 index 6ecb68683..000000000 Binary files a/ReactNativeClient/android/app/src/main/assets/fonts/SimpleLineIcons.ttf and /dev/null differ diff --git a/ReactNativeClient/android/app/src/main/assets/fonts/Zocial.ttf b/ReactNativeClient/android/app/src/main/assets/fonts/Zocial.ttf deleted file mode 100644 index e4ae46c62..000000000 Binary files a/ReactNativeClient/android/app/src/main/assets/fonts/Zocial.ttf and /dev/null differ diff --git a/ReactNativeClient/android/app/src/main/java/net/cozic/joplin/MainApplication.java b/ReactNativeClient/android/app/src/main/java/net/cozic/joplin/MainApplication.java index a4350a90d..31e027eeb 100644 --- a/ReactNativeClient/android/app/src/main/java/net/cozic/joplin/MainApplication.java +++ b/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 getPackages() { + + // Was added in RN 60.x: + // + // @SuppressWarnings("UnnecessaryLocalVariable") + // List 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.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() ); diff --git a/ReactNativeClient/android/app/src/main/java/net/cozic/joplin/share/ShareApplication.java b/ReactNativeClient/android/app/src/main/java/net/cozic/joplin/share/ShareApplication.java index 4890e88ca..04e8a5ce8 100644 --- a/ReactNativeClient/android/app/src/main/java/net/cozic/joplin/share/ShareApplication.java +++ b/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 getPackages() { return Arrays.asList( - new MainReactPackage(), - new SharePackage() + new MainReactPackage() + // new SharePackage() ); } }; diff --git a/ReactNativeClient/android/app/src/main/res/values/styles.xml b/ReactNativeClient/android/app/src/main/res/values/styles.xml index 319eb0ca1..62fe59fa4 100644 --- a/ReactNativeClient/android/app/src/main/res/values/styles.xml +++ b/ReactNativeClient/android/app/src/main/res/values/styles.xml @@ -3,6 +3,7 @@ diff --git a/ReactNativeClient/android/build.gradle b/ReactNativeClient/android/build.gradle index c788fba00..d3f556b40 100644 --- a/ReactNativeClient/android/build.gradle +++ b/ReactNativeClient/android/build.gradle @@ -13,7 +13,7 @@ buildscript { google() } dependencies { - classpath("com.android.tools.build:gradle:3.4.0") + classpath("com.android.tools.build:gradle:3.4.1") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -23,19 +23,20 @@ buildscript { allprojects { repositories { mavenLocal() - google() - jcenter() // Was added by me - still needed? maven { url "https://jitpack.io" } maven { url "https://maven.google.com" } maven { // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm - url "$rootDir/../node_modules/react-native/android" + url("$rootDir/../node_modules/react-native/android") } maven { - url "$rootDir/../node_modules/jsc-android/dist" + // Android JSC is installed from npm + url("$rootDir/../node_modules/jsc-android/dist") } + google() + jcenter() } } diff --git a/ReactNativeClient/android/keystores/BUCK b/ReactNativeClient/android/keystores/BUCK deleted file mode 100644 index 88e4c31b2..000000000 --- a/ReactNativeClient/android/keystores/BUCK +++ /dev/null @@ -1,8 +0,0 @@ -keystore( - name = "debug", - properties = "debug.keystore.properties", - store = "debug.keystore", - visibility = [ - "PUBLIC", - ], -) diff --git a/ReactNativeClient/android/keystores/debug.keystore.properties b/ReactNativeClient/android/keystores/debug.keystore.properties deleted file mode 100644 index 121bfb49f..000000000 --- a/ReactNativeClient/android/keystores/debug.keystore.properties +++ /dev/null @@ -1,4 +0,0 @@ -key.store=debug.keystore -key.alias=androiddebugkey -key.store.password=android -key.alias.password=android diff --git a/ReactNativeClient/android/settings.gradle b/ReactNativeClient/android/settings.gradle index 0a5f8d31e..3634bd74f 100644 --- a/ReactNativeClient/android/settings.gradle +++ b/ReactNativeClient/android/settings.gradle @@ -1,38 +1,14 @@ rootProject.name = 'Joplin' -include ':@react-native-community_slider' -project(':@react-native-community_slider').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/slider/android') -include ':react-native-webview' -project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android') -include ':react-native-file-viewer' -project(':react-native-file-viewer').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-file-viewer/android') -include ':react-native-securerandom' -project(':react-native-securerandom').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-securerandom/android') -include ':react-native-fs' -project(':react-native-fs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fs/android') -include ':react-native-image-picker' -project(':react-native-image-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-image-picker/android') -include ':react-native-vector-icons' -project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android') -include ':react-native-image-resizer' -project(':react-native-image-resizer').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-image-resizer/android') +apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) include ':react-native-fs' project(':react-native-fs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fs/android') include ':app' -include ':react-native-sqlite-storage' -project(':react-native-sqlite-storage').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-sqlite-storage/src/android') -include ':rn-fetch-blob' -project(':rn-fetch-blob').projectDir = new File(rootProject.projectDir, '../node_modules/rn-fetch-blob/android') -include ':react-native-document-picker' -project(':react-native-document-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-document-picker/android') -include ':app', ':react-native-share-extension' - -project(':react-native-share-extension').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-share-extension/android') -include ':react-native-version-info' -project(':react-native-version-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-version-info/android') +//include ':app', ':react-native-share-extension' +//project(':react-native-share-extension').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-share-extension/android') include ':react-native-push-notification' project(':react-native-push-notification').projectDir = file('../node_modules/react-native-push-notification/android') diff --git a/ReactNativeClient/ios/Joplin.xcodeproj/project.pbxproj b/ReactNativeClient/ios/Joplin.xcodeproj/project.pbxproj index 45bd46732..b1f85a095 100644 --- a/ReactNativeClient/ios/Joplin.xcodeproj/project.pbxproj +++ b/ReactNativeClient/ios/Joplin.xcodeproj/project.pbxproj @@ -7,439 +7,21 @@ objects = { /* Begin PBXBuildFile section */ - 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; }; - 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; }; - 00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; }; - 00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; }; - 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; }; - 065B3D792187B61200002863 /* libRNVersionInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 065B3D772187B5E300002863 /* libRNVersionInfo.a */; }; - 0DAD2E67F6A14BDC8250B927 /* libRNDocumentPicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 82214D3345D846709A314868 /* libRNDocumentPicker.a */; }; - 133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; }; - 139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; }; - 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; - 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; - 1E71C4672AEC47CE94DFF507 /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FD370E24D76E461D960DD85D /* Feather.ttf */; }; - 350318CF7C9E4BD68821EBE9 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FF411B45E68B4A8CBCC35777 /* Ionicons.ttf */; }; - 45E8D3F9FBA0410E82E28A0D /* libRNCWebView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C7A5EE79128470A920D4971 /* libRNCWebView.a */; }; - 4D05897622B446600072ECCC /* libRNCamera.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D05896A22B4464B0072ECCC /* libRNCamera.a */; }; - 4DDA31241FC88F2400B5A80D /* libRCTPushNotification.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DDA310F1FC88EEB00B5A80D /* libRCTPushNotification.a */; }; - 5AFCE00CC1414FE6BD618F0D /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 15FD7D2C8F0A445BBA807A9D /* MaterialIcons.ttf */; }; - 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; }; - 65B672EE2B5A43E0919683EA /* libRNCSlider.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 090D1FCD537D494CBC153ED6 /* libRNCSlider.a */; }; - 725A77EC604947A0AFF12C2B /* libRNFetchBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5E37D05726A4A08B2EE323A /* libRNFetchBlob.a */; }; - 73F8D08845494D1396B6CD0B /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1F79F2CD7CED446B986A6252 /* Entypo.ttf */; }; - 82C61D3DAE0A4666883001E9 /* libRNFileViewer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CCDC2774CD86466F897D88E2 /* libRNFileViewer.a */; }; - 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; - 929CA5ABC80E4D398AFC4E44 /* libSQLite.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 87BABCF4ED0A406B9546CCE9 /* libSQLite.a */; }; - A47605BC216B4DB3B3C2ED42 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E2638D52624B477FABB52B8F /* FontAwesome.ttf */; }; - A6F5DFAC928B4DBCADFB5D65 /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3FFC0F5EFDC54862B1F998DD /* Foundation.ttf */; }; - AA484D3B3E0F4588A7687313 /* libRNFS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F098E1ACCB594C828C851A57 /* libRNFS.a */; }; - ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; }; + 9E1B958F73B0E37D15AA9B24 /* libPods-Joplin.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DDE6F1BE6285C68A2DA17BE9 /* libPods-Joplin.a */; }; AE6BB3A2FDA34D01864A721A /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 381C047F2739439CB3E6452A /* libRNVectorIcons.a */; }; - AE98927FE9BF483FB24D229F /* libRCTImageResizer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 508DD20D1EA341CA8F730F22 /* libRCTImageResizer.a */; }; - AF99EEC6C55042F7BFC87583 /* libRNImagePicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 44A39642217548C8ADA91CBA /* libRNImagePicker.a */; }; - C8DD987A30F740F1B8EF6D3D /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CC3CF4044A914711B8D30D1A /* Zocial.ttf */; }; - E75DD6E04D0441D5BF8EB841 /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C77F905EF22646F39B673572 /* MaterialCommunityIcons.ttf */; }; - E8DD8252C0DD4CF1B53590E9 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 69B8EE98BFBC4AABA4885BB0 /* SimpleLineIcons.ttf */; }; - EA501DCDCF4745E9B63ECE98 /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7D46CBDF8846409890AD7A84 /* Octicons.ttf */; }; - EC11356C90E9419799A2626F /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 51BCEC3BC28046C8BB19531F /* EvilIcons.ttf */; }; ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED297162215061F000B7C4FE /* JavaScriptCore.framework */; }; ED2971652150620600B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2971642150620600B7C4FE /* JavaScriptCore.framework */; }; F3D0BB525E6C490294D73075 /* libRNSecureRandom.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22647ACF9A4C45918C44C599 /* libRNSecureRandom.a */; }; FBF57CE2F0F448FA9A8985E2 /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EB8BCAEA9AA41CAAE460443 /* libsqlite3.0.tbd */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 00C302AB1ABCB8CE00DB3ED1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 134814201AA4EA6300B7C361; - remoteInfo = RCTActionSheet; - }; - 00C302B91ABCB90400DB3ED1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 134814201AA4EA6300B7C361; - remoteInfo = RCTGeolocation; - }; - 00C302BF1ABCB91800DB3ED1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 58B5115D1A9E6B3D00147676; - remoteInfo = RCTImage; - }; - 00C302DB1ABCB9D200DB3ED1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 58B511DB1A9E6C8500147676; - remoteInfo = RCTNetwork; - }; - 00C302E31ABCB9EE00DB3ED1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 832C81801AAF6DEF007FA2F7; - remoteInfo = RCTVibration; - }; - 065B3D762187B5E300002863 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 065B3D412187B5E300002863 /* RNVersionInfo.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 134814201AA4EA6300B7C361; - remoteInfo = RNVersionInfo; - }; - 139105C01AF99BAD00B5F7CC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 134814201AA4EA6300B7C361; - remoteInfo = RCTSettings; - }; - 139FDEF31B06529B00C62182 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 3C86DF461ADF2C930047B81A; - remoteInfo = RCTWebSocket; - }; - 146834031AC3E56700842450 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; - remoteInfo = React; - }; - 3DAD3EA41DF850E9000B6D8A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 3D3C059A1DE3340900C268FA; - remoteInfo = yoga; - }; - 3DAD3EA81DF850E9000B6D8A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 3D3CD9251DE5FBEC00167DC4; - remoteInfo = cxxreact; - }; - 4D0588F522B444490072ECCC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = EDEBC6D6214B3E7000DD5AC8; - remoteInfo = jsi; - }; - 4D0588F722B444490072ECCC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = EDEBC73B214B45A300DD5AC8; - remoteInfo = jsiexecutor; - }; - 4D0588F922B444490072ECCC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = ED296FB6214C9A0900B7C4FE; - remoteInfo = "jsi-tvOS"; - }; - 4D0588FB22B444490072ECCC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = ED296FEE214C9CF800B7C4FE; - remoteInfo = "jsiexecutor-tvOS"; - }; - 4D05890B22B444490072ECCC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = DECA9B559982480BBD8F9E84 /* RNCWebView.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 134814201AA4EA6300B7C361; - remoteInfo = RNCWebView; - }; - 4D05896922B4464B0072ECCC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4D05893D22B4464B0072ECCC /* RNCamera.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4107012F1ACB723B00C6AA39; - remoteInfo = RNCamera; - }; - 4D2A44E7200015A2001CA388 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 252BD7B86BF7435B960DA901 /* RNSecureRandom.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 134814201AA4EA6300B7C361; - remoteInfo = RNSecureRandom; - }; - 4D2A85A91FBCE3AC0028537D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 3DBE0D001F3B181A0099AA32; - remoteInfo = fishhook; - }; - 4D2A85BA1FBCE3AD0028537D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = DF1C50EBC11E46A3AF87F80A /* RCTImageResizer.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 5D72D2E81C16249000E22EC1; - remoteInfo = RCTImageResizer; - }; - 4D2A85BD1FBCE3AD0028537D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 02C42EA98156482DB00BF86D /* RNDocumentPicker.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = E01DD9DB1D2311A600C39062; - remoteInfo = RNDocumentPicker; - }; - 4D2A85C01FBCE3AD0028537D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B8C44254005A4B80AD5CA558 /* RNFetchBlob.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A15C300E1CD25C330074CB35; - remoteInfo = RNFetchBlob; - }; - 4D2A85C41FBCE3AD0028537D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9D8705D0D07C4A098FD912EB /* RNFS.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F12AFB9B1ADAF8F800E0535D; - remoteInfo = RNFS; - }; - 4D2A85C61FBCE3AD0028537D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9D8705D0D07C4A098FD912EB /* RNFS.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 6456441F1EB8DA9100672408; - remoteInfo = "RNFS-tvOS"; - }; - 4D2A85C91FBCE3AD0028537D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 711CBD21F0894B83A2D8E234 /* RNVectorIcons.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 5DBEB1501B18CEA900B34395; - remoteInfo = RNVectorIcons; - }; - 4D2A85CC1FBCE3AD0028537D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = CCDE9E9AF09B45F391B1C2AF /* SQLite.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = E23D7B471ACEFE2A00C59171; - remoteInfo = SQLite; - }; - 4D2AFF551FDA002000599716 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 2D2A28201D9B03D100D4039D; - remoteInfo = "RCTAnimation-tvOS"; - }; - 4D2AFF591FDA002000599716 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = ADD01A681E09402E00F6D226; - remoteInfo = "RCTBlob-tvOS"; - }; - 4D2AFF5E1FDA002000599716 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 2D2A283A1D9B042B00D4039D; - remoteInfo = "RCTImage-tvOS"; - }; - 4D2AFF631FDA002000599716 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 2D2A28471D9B043800D4039D; - remoteInfo = "RCTLinking-tvOS"; - }; - 4D2AFF671FDA002000599716 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 2D2A28541D9B044C00D4039D; - remoteInfo = "RCTNetwork-tvOS"; - }; - 4D2AFF6D1FDA002000599716 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 2D2A28611D9B046600D4039D; - remoteInfo = "RCTSettings-tvOS"; - }; - 4D2AFF711FDA002000599716 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 2D2A287B1D9B048500D4039D; - remoteInfo = "RCTText-tvOS"; - }; - 4D2AFF781FDA002000599716 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 2D2A28881D9B049200D4039D; - remoteInfo = "RCTWebSocket-tvOS"; - }; - 4D2AFF7A1FDA002000599716 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 3DBE0D0D1F3B181C0099AA32; - remoteInfo = "fishhook-tvOS"; - }; - 4D2AFF881FDA002000599716 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 2D2A28131D9B038B00D4039D; - remoteInfo = "React-tvOS"; - }; - 4D2AFF8A1FDA002000599716 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 3D3C06751DE3340C00C268FA; - remoteInfo = "yoga-tvOS"; - }; - 4D2AFF8C1FDA002000599716 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 3D3CD9321DE5FBEE00167DC4; - remoteInfo = "cxxreact-tvOS"; - }; - 4D2AFF901FDA002000599716 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 3D383D3C1EBD27B6005632C8; - remoteInfo = "third-party-tvOS"; - }; - 4D2AFF921FDA002000599716 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 3D383D621EBD27B9005632C8; - remoteInfo = "double-conversion-tvOS"; - }; - 4D3A19261FBDDA9400457703 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 139D7ECE1E25DB7D00323FB7; - remoteInfo = "third-party"; - }; - 4D3A192A1FBDDA9400457703 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 139D7E881E25C6D100323FB7; - remoteInfo = "double-conversion"; - }; - 4D7F8DA020A32BA0008B757D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = EBF21BDC1FC498900052F4D5; - remoteInfo = jsinspector; - }; - 4D7F8DA220A32BA0008B757D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = EBF21BFA1FC4989A0052F4D5; - remoteInfo = "jsinspector-tvOS"; - }; - 4D8B719B2163E8C500136BBC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 59F5448FAF7345F8B568BD00 /* RNFileViewer.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 134814201AA4EA6300B7C361; - remoteInfo = RNFileViewer; - }; - 4DA7F80C1FC1DA9C00353191 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = A4716DB8654B431D894F89E1 /* RNImagePicker.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 014A3B5C1C6CF33500B6D375; - remoteInfo = RNImagePicker; - }; - 4DC3B74E22B44EC300447A39 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E839F3056BD643A7B4377288 /* RNCSlider.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 28C79A09220DC4CC0061DE82; - remoteInfo = RNCSlider; - }; - 4DDA310E1FC88EEB00B5A80D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4DDA31011FC88EEA00B5A80D /* RCTPushNotification.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 134814201AA4EA6300B7C361; - remoteInfo = RCTPushNotification; - }; - 4DDA31101FC88EEB00B5A80D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4DDA31011FC88EEA00B5A80D /* RCTPushNotification.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 3D05745F1DE6004600184BB4; - remoteInfo = "RCTPushNotification-tvOS"; - }; - 5E9157321DD0AC6500FF2AA8 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 134814201AA4EA6300B7C361; - remoteInfo = RCTAnimation; - }; - 78C398B81ACF4ADC00677621 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 134814201AA4EA6300B7C361; - remoteInfo = RCTLinking; - }; - 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 58B5119B1A9E6C1200147676; - remoteInfo = RCTText; - }; - ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 358F4ED71D1E81A9004DF814; - remoteInfo = RCTBlob; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ 008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = ""; }; - 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = "../node_modules/react-native/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj"; sourceTree = ""; }; - 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTGeolocation.xcodeproj; path = "../node_modules/react-native/Libraries/Geolocation/RCTGeolocation.xcodeproj"; sourceTree = ""; }; - 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = "../node_modules/react-native/Libraries/Image/RCTImage.xcodeproj"; sourceTree = ""; }; - 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = "../node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj"; sourceTree = ""; }; - 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = "../node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj"; sourceTree = ""; }; - 02C42EA98156482DB00BF86D /* RNDocumentPicker.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNDocumentPicker.xcodeproj; path = "../node_modules/react-native-document-picker/ios/RNDocumentPicker.xcodeproj"; sourceTree = ""; }; - 065B3D412187B5E300002863 /* RNVersionInfo.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNVersionInfo.xcodeproj; path = "../node_modules/react-native-version-info/ios/RNVersionInfo.xcodeproj"; sourceTree = ""; }; - 090D1FCD537D494CBC153ED6 /* libRNCSlider.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNCSlider.a; sourceTree = ""; }; 0EB8BCAEA9AA41CAAE460443 /* libsqlite3.0.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; }; - 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = "../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj"; sourceTree = ""; }; - 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = "../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj"; sourceTree = ""; }; 13B07F961A680F5B00A75B9A /* Joplin.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Joplin.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Joplin/AppDelegate.h; sourceTree = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Joplin/AppDelegate.m; sourceTree = ""; }; @@ -447,47 +29,15 @@ 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Joplin/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Joplin/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Joplin/main.m; sourceTree = ""; }; - 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = ""; }; - 15FD7D2C8F0A445BBA807A9D /* MaterialIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = ""; }; - 1F79F2CD7CED446B986A6252 /* Entypo.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = ""; }; 22647ACF9A4C45918C44C599 /* libRNSecureRandom.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNSecureRandom.a; sourceTree = ""; }; - 252BD7B86BF7435B960DA901 /* RNSecureRandom.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNSecureRandom.xcodeproj; path = "../node_modules/react-native-securerandom/ios/RNSecureRandom.xcodeproj"; sourceTree = ""; }; 381C047F2739439CB3E6452A /* libRNVectorIcons.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNVectorIcons.a; sourceTree = ""; }; - 3FFC0F5EFDC54862B1F998DD /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = ""; }; - 44A39642217548C8ADA91CBA /* libRNImagePicker.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNImagePicker.a; sourceTree = ""; }; - 4C7A5EE79128470A920D4971 /* libRNCWebView.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNCWebView.a; sourceTree = ""; }; - 4D05893D22B4464B0072ECCC /* RNCamera.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNCamera.xcodeproj; path = "../node_modules/react-native-camera/ios/RNCamera.xcodeproj"; sourceTree = ""; }; 4DA7F7A61FC1196F00353191 /* Joplin.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = Joplin.entitlements; path = Joplin/Joplin.entitlements; sourceTree = ""; }; - 4DDA31011FC88EEA00B5A80D /* RCTPushNotification.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTPushNotification.xcodeproj; path = "../node_modules/react-native/Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj"; sourceTree = ""; }; - 508DD20D1EA341CA8F730F22 /* libRCTImageResizer.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRCTImageResizer.a; sourceTree = ""; }; - 51BCEC3BC28046C8BB19531F /* EvilIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = ""; }; - 59F5448FAF7345F8B568BD00 /* RNFileViewer.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNFileViewer.xcodeproj; path = "../node_modules/react-native-file-viewer/ios/RNFileViewer.xcodeproj"; sourceTree = ""; }; - 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = ""; }; - 69B8EE98BFBC4AABA4885BB0 /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = SimpleLineIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = ""; }; - 711CBD21F0894B83A2D8E234 /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = ""; }; - 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; - 7D46CBDF8846409890AD7A84 /* Octicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Octicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = ""; }; - 82214D3345D846709A314868 /* libRNDocumentPicker.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNDocumentPicker.a; sourceTree = ""; }; - 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; - 87BABCF4ED0A406B9546CCE9 /* libSQLite.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libSQLite.a; sourceTree = ""; }; - 9D8705D0D07C4A098FD912EB /* RNFS.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNFS.xcodeproj; path = "../node_modules/react-native-fs/RNFS.xcodeproj"; sourceTree = ""; }; - A4716DB8654B431D894F89E1 /* RNImagePicker.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNImagePicker.xcodeproj; path = "../node_modules/react-native-image-picker/ios/RNImagePicker.xcodeproj"; sourceTree = ""; }; - ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = ""; }; - B8C44254005A4B80AD5CA558 /* RNFetchBlob.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNFetchBlob.xcodeproj; path = "../node_modules/rn-fetch-blob/ios/RNFetchBlob.xcodeproj"; sourceTree = ""; }; - C77F905EF22646F39B673572 /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialCommunityIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = ""; }; - CC3CF4044A914711B8D30D1A /* Zocial.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Zocial.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = ""; }; - CCDC2774CD86466F897D88E2 /* libRNFileViewer.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNFileViewer.a; sourceTree = ""; }; - CCDE9E9AF09B45F391B1C2AF /* SQLite.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = SQLite.xcodeproj; path = "../node_modules/react-native-sqlite-storage/src/ios/SQLite.xcodeproj"; sourceTree = ""; }; - DECA9B559982480BBD8F9E84 /* RNCWebView.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNCWebView.xcodeproj; path = "../node_modules/react-native-webview/ios/RNCWebView.xcodeproj"; sourceTree = ""; }; - DF1C50EBC11E46A3AF87F80A /* RCTImageResizer.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RCTImageResizer.xcodeproj; path = "../node_modules/react-native-image-resizer/ios/RCTImageResizer.xcodeproj"; sourceTree = ""; }; - E2638D52624B477FABB52B8F /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = ""; }; - E839F3056BD643A7B4377288 /* RNCSlider.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNCSlider.xcodeproj; path = "../node_modules/@react-native-community/slider/ios/RNCSlider.xcodeproj"; sourceTree = ""; }; + 6CFFC13990302AAE61F81DB1 /* Pods-Joplin.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Joplin.release.xcconfig"; path = "Target Support Files/Pods-Joplin/Pods-Joplin.release.xcconfig"; sourceTree = ""; }; + 756FF6C78FB548317DAD12C0 /* Pods-Joplin.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Joplin.debug.xcconfig"; path = "Target Support Files/Pods-Joplin/Pods-Joplin.debug.xcconfig"; sourceTree = ""; }; + DDE6F1BE6285C68A2DA17BE9 /* libPods-Joplin.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Joplin.a"; sourceTree = BUILT_PRODUCTS_DIR; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; }; - F098E1ACCB594C828C851A57 /* libRNFS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNFS.a; sourceTree = ""; }; F5E37D05726A4A08B2EE323A /* libRNFetchBlob.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNFetchBlob.a; sourceTree = ""; }; - FD370E24D76E461D960DD85D /* Feather.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Feather.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = ""; }; - FF411B45E68B4A8CBCC35777 /* Ionicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Ionicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -496,121 +46,28 @@ buildActionMask = 2147483647; files = ( ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */, - 065B3D792187B61200002863 /* libRNVersionInfo.a in Frameworks */, - 4DDA31241FC88F2400B5A80D /* libRCTPushNotification.a in Frameworks */, - ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */, - 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */, ED2971652150620600B7C4FE /* JavaScriptCore.framework in Frameworks */, - 146834051AC3E58100842450 /* libReact.a in Frameworks */, - 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */, - 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */, - 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */, - 00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */, - 133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */, - 00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */, - 139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */, - 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */, - 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */, - 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */, - 0DAD2E67F6A14BDC8250B927 /* libRNDocumentPicker.a in Frameworks */, - 725A77EC604947A0AFF12C2B /* libRNFetchBlob.a in Frameworks */, - AA484D3B3E0F4588A7687313 /* libRNFS.a in Frameworks */, - AE98927FE9BF483FB24D229F /* libRCTImageResizer.a in Frameworks */, - 929CA5ABC80E4D398AFC4E44 /* libSQLite.a in Frameworks */, FBF57CE2F0F448FA9A8985E2 /* libsqlite3.0.tbd in Frameworks */, AE6BB3A2FDA34D01864A721A /* libRNVectorIcons.a in Frameworks */, - AF99EEC6C55042F7BFC87583 /* libRNImagePicker.a in Frameworks */, F3D0BB525E6C490294D73075 /* libRNSecureRandom.a in Frameworks */, - 82C61D3DAE0A4666883001E9 /* libRNFileViewer.a in Frameworks */, - 45E8D3F9FBA0410E82E28A0D /* libRNCWebView.a in Frameworks */, - 4D05897622B446600072ECCC /* libRNCamera.a in Frameworks */, - 65B672EE2B5A43E0919683EA /* libRNCSlider.a in Frameworks */, + 9E1B958F73B0E37D15AA9B24 /* libPods-Joplin.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 00C302A81ABCB8CE00DB3ED1 /* Products */ = { - isa = PBXGroup; - children = ( - 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */, - ); - name = Products; - sourceTree = ""; - }; - 00C302B61ABCB90400DB3ED1 /* Products */ = { - isa = PBXGroup; - children = ( - 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */, - ); - name = Products; - sourceTree = ""; - }; - 00C302BC1ABCB91800DB3ED1 /* Products */ = { - isa = PBXGroup; - children = ( - 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */, - 4D2AFF5F1FDA002000599716 /* libRCTImage-tvOS.a */, - ); - name = Products; - sourceTree = ""; - }; - 00C302D41ABCB9D200DB3ED1 /* Products */ = { - isa = PBXGroup; - children = ( - 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */, - 4D2AFF681FDA002000599716 /* libRCTNetwork-tvOS.a */, - ); - name = Products; - sourceTree = ""; - }; - 00C302E01ABCB9EE00DB3ED1 /* Products */ = { - isa = PBXGroup; - children = ( - 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */, - ); - name = Products; - sourceTree = ""; - }; 04FA5E9085024E3A9DAF0E03 /* Frameworks */ = { isa = PBXGroup; children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, ED2971642150620600B7C4FE /* JavaScriptCore.framework */, 0EB8BCAEA9AA41CAAE460443 /* libsqlite3.0.tbd */, + DDE6F1BE6285C68A2DA17BE9 /* libPods-Joplin.a */, ); name = Frameworks; sourceTree = ""; }; - 065B3D422187B5E300002863 /* Products */ = { - isa = PBXGroup; - children = ( - 065B3D772187B5E300002863 /* libRNVersionInfo.a */, - ); - name = Products; - sourceTree = ""; - }; - 139105B71AF99BAD00B5F7CC /* Products */ = { - isa = PBXGroup; - children = ( - 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */, - 4D2AFF6E1FDA002000599716 /* libRCTSettings-tvOS.a */, - ); - name = Products; - sourceTree = ""; - }; - 139FDEE71B06529A00C62182 /* Products */ = { - isa = PBXGroup; - children = ( - 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */, - 4D2AFF791FDA002000599716 /* libRCTWebSocket-tvOS.a */, - 4D2A85AA1FBCE3AC0028537D /* libfishhook.a */, - 4D2AFF7B1FDA002000599716 /* libfishhook-tvOS.a */, - ); - name = Products; - sourceTree = ""; - }; 13B07FAE1A68108700A75B9A /* Joplin */ = { isa = PBXGroup; children = ( @@ -626,185 +83,28 @@ name = Joplin; sourceTree = ""; }; - 146834001AC3E56700842450 /* Products */ = { - isa = PBXGroup; - children = ( - 146834041AC3E56700842450 /* libReact.a */, - 4D2AFF891FDA002000599716 /* libReact.a */, - 3DAD3EA51DF850E9000B6D8A /* libyoga.a */, - 4D2AFF8B1FDA002000599716 /* libyoga.a */, - 3DAD3EA91DF850E9000B6D8A /* libcxxreact.a */, - 4D2AFF8D1FDA002000599716 /* libcxxreact.a */, - 4D7F8DA120A32BA0008B757D /* libjsinspector.a */, - 4D7F8DA320A32BA0008B757D /* libjsinspector-tvOS.a */, - 4D3A19271FBDDA9400457703 /* libthird-party.a */, - 4D2AFF911FDA002000599716 /* libthird-party.a */, - 4D3A192B1FBDDA9400457703 /* libdouble-conversion.a */, - 4D2AFF931FDA002000599716 /* libdouble-conversion.a */, - 4D0588F622B444490072ECCC /* libjsi.a */, - 4D0588F822B444490072ECCC /* libjsiexecutor.a */, - 4D0588FA22B444490072ECCC /* libjsi-tvOS.a */, - 4D0588FC22B444490072ECCC /* libjsiexecutor-tvOS.a */, - ); - name = Products; - sourceTree = ""; - }; - 4D05890822B444490072ECCC /* Products */ = { - isa = PBXGroup; - children = ( - 4D05890C22B444490072ECCC /* libRNCWebView.a */, - ); - name = Products; - sourceTree = ""; - }; - 4D05893E22B4464B0072ECCC /* Products */ = { - isa = PBXGroup; - children = ( - 4D05896A22B4464B0072ECCC /* libRNCamera.a */, - ); - name = Products; - sourceTree = ""; - }; - 4D2A44E4200015A2001CA388 /* Products */ = { - isa = PBXGroup; - children = ( - 4D2A44E8200015A2001CA388 /* libRNSecureRandom.a */, - ); - name = Products; - sourceTree = ""; - }; 4D2A85911FBCE3950028537D /* Recovered References */ = { isa = PBXGroup; children = ( - 82214D3345D846709A314868 /* libRNDocumentPicker.a */, F5E37D05726A4A08B2EE323A /* libRNFetchBlob.a */, - F098E1ACCB594C828C851A57 /* libRNFS.a */, - 508DD20D1EA341CA8F730F22 /* libRCTImageResizer.a */, - 87BABCF4ED0A406B9546CCE9 /* libSQLite.a */, 381C047F2739439CB3E6452A /* libRNVectorIcons.a */, - 44A39642217548C8ADA91CBA /* libRNImagePicker.a */, 22647ACF9A4C45918C44C599 /* libRNSecureRandom.a */, - CCDC2774CD86466F897D88E2 /* libRNFileViewer.a */, - 4C7A5EE79128470A920D4971 /* libRNCWebView.a */, - 090D1FCD537D494CBC153ED6 /* libRNCSlider.a */, ); name = "Recovered References"; sourceTree = ""; }; - 4D2A85AD1FBCE3AC0028537D /* Products */ = { + 5F0B55ADB94AB5BB22C598AC /* Pods */ = { isa = PBXGroup; children = ( - 4D2A85BE1FBCE3AD0028537D /* libRNDocumentPicker.a */, + 756FF6C78FB548317DAD12C0 /* Pods-Joplin.debug.xcconfig */, + 6CFFC13990302AAE61F81DB1 /* Pods-Joplin.release.xcconfig */, ); - name = Products; - sourceTree = ""; - }; - 4D2A85AF1FBCE3AC0028537D /* Products */ = { - isa = PBXGroup; - children = ( - 4D2A85C11FBCE3AD0028537D /* libRNFetchBlob.a */, - ); - name = Products; - sourceTree = ""; - }; - 4D2A85B11FBCE3AC0028537D /* Products */ = { - isa = PBXGroup; - children = ( - 4D2A85C51FBCE3AD0028537D /* libRNFS.a */, - 4D2A85C71FBCE3AD0028537D /* libRNFS.a */, - ); - name = Products; - sourceTree = ""; - }; - 4D2A85B31FBCE3AC0028537D /* Products */ = { - isa = PBXGroup; - children = ( - 4D2A85BB1FBCE3AD0028537D /* libRCTImageResizer.a */, - ); - name = Products; - sourceTree = ""; - }; - 4D2A85B51FBCE3AC0028537D /* Products */ = { - isa = PBXGroup; - children = ( - 4D2A85CD1FBCE3AD0028537D /* libSQLite.a */, - ); - name = Products; - sourceTree = ""; - }; - 4D2A85B71FBCE3AC0028537D /* Products */ = { - isa = PBXGroup; - children = ( - 4D2A85CA1FBCE3AD0028537D /* libRNVectorIcons.a */, - ); - name = Products; - sourceTree = ""; - }; - 4D8B71982163E8C500136BBC /* Products */ = { - isa = PBXGroup; - children = ( - 4D8B719C2163E8C500136BBC /* libRNFileViewer.a */, - ); - name = Products; - sourceTree = ""; - }; - 4DA7F8091FC1DA9C00353191 /* Products */ = { - isa = PBXGroup; - children = ( - 4DA7F80D1FC1DA9C00353191 /* libRNImagePicker.a */, - ); - name = Products; - sourceTree = ""; - }; - 4DC3B74B22B44EC300447A39 /* Products */ = { - isa = PBXGroup; - children = ( - 4DC3B74F22B44EC300447A39 /* libRNCSlider.a */, - ); - name = Products; - sourceTree = ""; - }; - 4DDA31021FC88EEA00B5A80D /* Products */ = { - isa = PBXGroup; - children = ( - 4DDA310F1FC88EEB00B5A80D /* libRCTPushNotification.a */, - 4DDA31111FC88EEB00B5A80D /* libRCTPushNotification-tvOS.a */, - ); - name = Products; - sourceTree = ""; - }; - 5E91572E1DD0AC6500FF2AA8 /* Products */ = { - isa = PBXGroup; - children = ( - 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */, - 4D2AFF561FDA002000599716 /* libRCTAnimation.a */, - ); - name = Products; - sourceTree = ""; - }; - 78C398B11ACF4ADC00677621 /* Products */ = { - isa = PBXGroup; - children = ( - 78C398B91ACF4ADC00677621 /* libRCTLinking.a */, - 4D2AFF641FDA002000599716 /* libRCTLinking-tvOS.a */, - ); - name = Products; + path = Pods; sourceTree = ""; }; 7FDFE2A137C24ED08645158D /* Resources */ = { isa = PBXGroup; children = ( - 1F79F2CD7CED446B986A6252 /* Entypo.ttf */, - 51BCEC3BC28046C8BB19531F /* EvilIcons.ttf */, - FD370E24D76E461D960DD85D /* Feather.ttf */, - E2638D52624B477FABB52B8F /* FontAwesome.ttf */, - 3FFC0F5EFDC54862B1F998DD /* Foundation.ttf */, - FF411B45E68B4A8CBCC35777 /* Ionicons.ttf */, - C77F905EF22646F39B673572 /* MaterialCommunityIcons.ttf */, - 15FD7D2C8F0A445BBA807A9D /* MaterialIcons.ttf */, - 7D46CBDF8846409890AD7A84 /* Octicons.ttf */, - 69B8EE98BFBC4AABA4885BB0 /* SimpleLineIcons.ttf */, - CC3CF4044A914711B8D30D1A /* Zocial.ttf */, ); name = Resources; sourceTree = ""; @@ -812,45 +112,10 @@ 832341AE1AAA6A7D00B99B32 /* Libraries */ = { isa = PBXGroup; children = ( - 4D05893D22B4464B0072ECCC /* RNCamera.xcodeproj */, - 065B3D412187B5E300002863 /* RNVersionInfo.xcodeproj */, - 4DDA31011FC88EEA00B5A80D /* RCTPushNotification.xcodeproj */, - 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */, - 146833FF1AC3E56700842450 /* React.xcodeproj */, - 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */, - ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */, - 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */, - 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */, - 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */, - 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */, - 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */, - 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */, - 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */, - 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */, - 02C42EA98156482DB00BF86D /* RNDocumentPicker.xcodeproj */, - B8C44254005A4B80AD5CA558 /* RNFetchBlob.xcodeproj */, - 9D8705D0D07C4A098FD912EB /* RNFS.xcodeproj */, - DF1C50EBC11E46A3AF87F80A /* RCTImageResizer.xcodeproj */, - CCDE9E9AF09B45F391B1C2AF /* SQLite.xcodeproj */, - 711CBD21F0894B83A2D8E234 /* RNVectorIcons.xcodeproj */, - A4716DB8654B431D894F89E1 /* RNImagePicker.xcodeproj */, - 252BD7B86BF7435B960DA901 /* RNSecureRandom.xcodeproj */, - 59F5448FAF7345F8B568BD00 /* RNFileViewer.xcodeproj */, - DECA9B559982480BBD8F9E84 /* RNCWebView.xcodeproj */, - E839F3056BD643A7B4377288 /* RNCSlider.xcodeproj */, ); name = Libraries; sourceTree = ""; }; - 832341B11AAA6A8300B99B32 /* Products */ = { - isa = PBXGroup; - children = ( - 832341B51AAA6A8300B99B32 /* libRCTText.a */, - 4D2AFF721FDA002000599716 /* libRCTText-tvOS.a */, - ); - name = Products; - sourceTree = ""; - }; 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( @@ -860,6 +125,7 @@ 04FA5E9085024E3A9DAF0E03 /* Frameworks */, 7FDFE2A137C24ED08645158D /* Resources */, 4D2A85911FBCE3950028537D /* Recovered References */, + 5F0B55ADB94AB5BB22C598AC /* Pods */, ); indentWidth = 2; sourceTree = ""; @@ -874,15 +140,6 @@ name = Products; sourceTree = ""; }; - ADBDB9201DFEBF0600ED6528 /* Products */ = { - isa = PBXGroup; - children = ( - ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */, - 4D2AFF5A1FDA002000599716 /* libRCTBlob-tvOS.a */, - ); - name = Products; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -890,10 +147,12 @@ isa = PBXNativeTarget; buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "Joplin" */; buildPhases = ( + 071815849A41B8B427FC87DC /* [CP] Check Pods Manifest.lock */, 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, + B4AFEC44AA65E5E06375BA82 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -939,112 +198,6 @@ mainGroup = 83CBB9F61A601CBA00E9B192; productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */; - ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */; - }, - { - ProductGroup = 5E91572E1DD0AC6500FF2AA8 /* Products */; - ProjectRef = 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */; - }, - { - ProductGroup = ADBDB9201DFEBF0600ED6528 /* Products */; - ProjectRef = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */; - }, - { - ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */; - ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */; - }, - { - ProductGroup = 00C302BC1ABCB91800DB3ED1 /* Products */; - ProjectRef = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */; - }, - { - ProductGroup = 4D2A85B31FBCE3AC0028537D /* Products */; - ProjectRef = DF1C50EBC11E46A3AF87F80A /* RCTImageResizer.xcodeproj */; - }, - { - ProductGroup = 78C398B11ACF4ADC00677621 /* Products */; - ProjectRef = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */; - }, - { - ProductGroup = 00C302D41ABCB9D200DB3ED1 /* Products */; - ProjectRef = 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */; - }, - { - ProductGroup = 4DDA31021FC88EEA00B5A80D /* Products */; - ProjectRef = 4DDA31011FC88EEA00B5A80D /* RCTPushNotification.xcodeproj */; - }, - { - ProductGroup = 139105B71AF99BAD00B5F7CC /* Products */; - ProjectRef = 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */; - }, - { - ProductGroup = 832341B11AAA6A8300B99B32 /* Products */; - ProjectRef = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */; - }, - { - ProductGroup = 00C302E01ABCB9EE00DB3ED1 /* Products */; - ProjectRef = 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */; - }, - { - ProductGroup = 139FDEE71B06529A00C62182 /* Products */; - ProjectRef = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */; - }, - { - ProductGroup = 146834001AC3E56700842450 /* Products */; - ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */; - }, - { - ProductGroup = 4D05893E22B4464B0072ECCC /* Products */; - ProjectRef = 4D05893D22B4464B0072ECCC /* RNCamera.xcodeproj */; - }, - { - ProductGroup = 4DC3B74B22B44EC300447A39 /* Products */; - ProjectRef = E839F3056BD643A7B4377288 /* RNCSlider.xcodeproj */; - }, - { - ProductGroup = 4D05890822B444490072ECCC /* Products */; - ProjectRef = DECA9B559982480BBD8F9E84 /* RNCWebView.xcodeproj */; - }, - { - ProductGroup = 4D2A85AD1FBCE3AC0028537D /* Products */; - ProjectRef = 02C42EA98156482DB00BF86D /* RNDocumentPicker.xcodeproj */; - }, - { - ProductGroup = 4D2A85AF1FBCE3AC0028537D /* Products */; - ProjectRef = B8C44254005A4B80AD5CA558 /* RNFetchBlob.xcodeproj */; - }, - { - ProductGroup = 4D8B71982163E8C500136BBC /* Products */; - ProjectRef = 59F5448FAF7345F8B568BD00 /* RNFileViewer.xcodeproj */; - }, - { - ProductGroup = 4D2A85B11FBCE3AC0028537D /* Products */; - ProjectRef = 9D8705D0D07C4A098FD912EB /* RNFS.xcodeproj */; - }, - { - ProductGroup = 4DA7F8091FC1DA9C00353191 /* Products */; - ProjectRef = A4716DB8654B431D894F89E1 /* RNImagePicker.xcodeproj */; - }, - { - ProductGroup = 4D2A44E4200015A2001CA388 /* Products */; - ProjectRef = 252BD7B86BF7435B960DA901 /* RNSecureRandom.xcodeproj */; - }, - { - ProductGroup = 4D2A85B71FBCE3AC0028537D /* Products */; - ProjectRef = 711CBD21F0894B83A2D8E234 /* RNVectorIcons.xcodeproj */; - }, - { - ProductGroup = 065B3D422187B5E300002863 /* Products */; - ProjectRef = 065B3D412187B5E300002863 /* RNVersionInfo.xcodeproj */; - }, - { - ProductGroup = 4D2A85B51FBCE3AC0028537D /* Products */; - ProjectRef = CCDE9E9AF09B45F391B1C2AF /* SQLite.xcodeproj */; - }, - ); projectRoot = ""; targets = ( 13B07F861A680F5B00A75B9A /* Joplin */, @@ -1052,380 +205,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRCTActionSheet.a; - remoteRef = 00C302AB1ABCB8CE00DB3ED1 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRCTGeolocation.a; - remoteRef = 00C302B91ABCB90400DB3ED1 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRCTImage.a; - remoteRef = 00C302BF1ABCB91800DB3ED1 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRCTNetwork.a; - remoteRef = 00C302DB1ABCB9D200DB3ED1 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRCTVibration.a; - remoteRef = 00C302E31ABCB9EE00DB3ED1 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 065B3D772187B5E300002863 /* libRNVersionInfo.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRNVersionInfo.a; - remoteRef = 065B3D762187B5E300002863 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRCTSettings.a; - remoteRef = 139105C01AF99BAD00B5F7CC /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRCTWebSocket.a; - remoteRef = 139FDEF31B06529B00C62182 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 146834041AC3E56700842450 /* libReact.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libReact.a; - remoteRef = 146834031AC3E56700842450 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 3DAD3EA51DF850E9000B6D8A /* libyoga.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libyoga.a; - remoteRef = 3DAD3EA41DF850E9000B6D8A /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 3DAD3EA91DF850E9000B6D8A /* libcxxreact.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libcxxreact.a; - remoteRef = 3DAD3EA81DF850E9000B6D8A /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D0588F622B444490072ECCC /* libjsi.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libjsi.a; - remoteRef = 4D0588F522B444490072ECCC /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D0588F822B444490072ECCC /* libjsiexecutor.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libjsiexecutor.a; - remoteRef = 4D0588F722B444490072ECCC /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D0588FA22B444490072ECCC /* libjsi-tvOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libjsi-tvOS.a"; - remoteRef = 4D0588F922B444490072ECCC /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D0588FC22B444490072ECCC /* libjsiexecutor-tvOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libjsiexecutor-tvOS.a"; - remoteRef = 4D0588FB22B444490072ECCC /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D05890C22B444490072ECCC /* libRNCWebView.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRNCWebView.a; - remoteRef = 4D05890B22B444490072ECCC /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D05896A22B4464B0072ECCC /* libRNCamera.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRNCamera.a; - remoteRef = 4D05896922B4464B0072ECCC /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2A44E8200015A2001CA388 /* libRNSecureRandom.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRNSecureRandom.a; - remoteRef = 4D2A44E7200015A2001CA388 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2A85AA1FBCE3AC0028537D /* libfishhook.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libfishhook.a; - remoteRef = 4D2A85A91FBCE3AC0028537D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2A85BB1FBCE3AD0028537D /* libRCTImageResizer.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRCTImageResizer.a; - remoteRef = 4D2A85BA1FBCE3AD0028537D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2A85BE1FBCE3AD0028537D /* libRNDocumentPicker.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRNDocumentPicker.a; - remoteRef = 4D2A85BD1FBCE3AD0028537D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2A85C11FBCE3AD0028537D /* libRNFetchBlob.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRNFetchBlob.a; - remoteRef = 4D2A85C01FBCE3AD0028537D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2A85C51FBCE3AD0028537D /* libRNFS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRNFS.a; - remoteRef = 4D2A85C41FBCE3AD0028537D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2A85C71FBCE3AD0028537D /* libRNFS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRNFS.a; - remoteRef = 4D2A85C61FBCE3AD0028537D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2A85CA1FBCE3AD0028537D /* libRNVectorIcons.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRNVectorIcons.a; - remoteRef = 4D2A85C91FBCE3AD0028537D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2A85CD1FBCE3AD0028537D /* libSQLite.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libSQLite.a; - remoteRef = 4D2A85CC1FBCE3AD0028537D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2AFF561FDA002000599716 /* libRCTAnimation.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRCTAnimation.a; - remoteRef = 4D2AFF551FDA002000599716 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2AFF5A1FDA002000599716 /* libRCTBlob-tvOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libRCTBlob-tvOS.a"; - remoteRef = 4D2AFF591FDA002000599716 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2AFF5F1FDA002000599716 /* libRCTImage-tvOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libRCTImage-tvOS.a"; - remoteRef = 4D2AFF5E1FDA002000599716 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2AFF641FDA002000599716 /* libRCTLinking-tvOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libRCTLinking-tvOS.a"; - remoteRef = 4D2AFF631FDA002000599716 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2AFF681FDA002000599716 /* libRCTNetwork-tvOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libRCTNetwork-tvOS.a"; - remoteRef = 4D2AFF671FDA002000599716 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2AFF6E1FDA002000599716 /* libRCTSettings-tvOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libRCTSettings-tvOS.a"; - remoteRef = 4D2AFF6D1FDA002000599716 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2AFF721FDA002000599716 /* libRCTText-tvOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libRCTText-tvOS.a"; - remoteRef = 4D2AFF711FDA002000599716 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2AFF791FDA002000599716 /* libRCTWebSocket-tvOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libRCTWebSocket-tvOS.a"; - remoteRef = 4D2AFF781FDA002000599716 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2AFF7B1FDA002000599716 /* libfishhook-tvOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libfishhook-tvOS.a"; - remoteRef = 4D2AFF7A1FDA002000599716 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2AFF891FDA002000599716 /* libReact.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libReact.a; - remoteRef = 4D2AFF881FDA002000599716 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2AFF8B1FDA002000599716 /* libyoga.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libyoga.a; - remoteRef = 4D2AFF8A1FDA002000599716 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2AFF8D1FDA002000599716 /* libcxxreact.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libcxxreact.a; - remoteRef = 4D2AFF8C1FDA002000599716 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2AFF911FDA002000599716 /* libthird-party.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libthird-party.a"; - remoteRef = 4D2AFF901FDA002000599716 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D2AFF931FDA002000599716 /* libdouble-conversion.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libdouble-conversion.a"; - remoteRef = 4D2AFF921FDA002000599716 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D3A19271FBDDA9400457703 /* libthird-party.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libthird-party.a"; - remoteRef = 4D3A19261FBDDA9400457703 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D3A192B1FBDDA9400457703 /* libdouble-conversion.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libdouble-conversion.a"; - remoteRef = 4D3A192A1FBDDA9400457703 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D7F8DA120A32BA0008B757D /* libjsinspector.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libjsinspector.a; - remoteRef = 4D7F8DA020A32BA0008B757D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D7F8DA320A32BA0008B757D /* libjsinspector-tvOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libjsinspector-tvOS.a"; - remoteRef = 4D7F8DA220A32BA0008B757D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4D8B719C2163E8C500136BBC /* libRNFileViewer.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRNFileViewer.a; - remoteRef = 4D8B719B2163E8C500136BBC /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4DA7F80D1FC1DA9C00353191 /* libRNImagePicker.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRNImagePicker.a; - remoteRef = 4DA7F80C1FC1DA9C00353191 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4DC3B74F22B44EC300447A39 /* libRNCSlider.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRNCSlider.a; - remoteRef = 4DC3B74E22B44EC300447A39 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4DDA310F1FC88EEB00B5A80D /* libRCTPushNotification.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRCTPushNotification.a; - remoteRef = 4DDA310E1FC88EEB00B5A80D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4DDA31111FC88EEB00B5A80D /* libRCTPushNotification-tvOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libRCTPushNotification-tvOS.a"; - remoteRef = 4DDA31101FC88EEB00B5A80D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRCTAnimation.a; - remoteRef = 5E9157321DD0AC6500FF2AA8 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 78C398B91ACF4ADC00677621 /* libRCTLinking.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRCTLinking.a; - remoteRef = 78C398B81ACF4ADC00677621 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 832341B51AAA6A8300B99B32 /* libRCTText.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRCTText.a; - remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRCTBlob.a; - remoteRef = ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 13B07F8E1A680F5B00A75B9A /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -1433,17 +212,6 @@ files = ( 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */, - 73F8D08845494D1396B6CD0B /* Entypo.ttf in Resources */, - EC11356C90E9419799A2626F /* EvilIcons.ttf in Resources */, - 1E71C4672AEC47CE94DFF507 /* Feather.ttf in Resources */, - A47605BC216B4DB3B3C2ED42 /* FontAwesome.ttf in Resources */, - A6F5DFAC928B4DBCADFB5D65 /* Foundation.ttf in Resources */, - 350318CF7C9E4BD68821EBE9 /* Ionicons.ttf in Resources */, - E75DD6E04D0441D5BF8EB841 /* MaterialCommunityIcons.ttf in Resources */, - 5AFCE00CC1414FE6BD618F0D /* MaterialIcons.ttf in Resources */, - EA501DCDCF4745E9B63ECE98 /* Octicons.ttf in Resources */, - E8DD8252C0DD4CF1B53590E9 /* SimpleLineIcons.ttf in Resources */, - C8DD987A30F740F1B8EF6D3D /* Zocial.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1464,6 +232,76 @@ shellPath = /bin/sh; shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh"; }; + 071815849A41B8B427FC87DC /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Joplin-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + B4AFEC44AA65E5E06375BA82 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Joplin/Pods-Joplin-resources.sh", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Feather.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Foundation.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf", + ); + name = "[CP] Copy Pods Resources"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Feather.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Brands.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Regular.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Solid.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Fontisto.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Foundation.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Ionicons.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialCommunityIcons.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialIcons.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Octicons.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Joplin/Pods-Joplin-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -1493,6 +331,7 @@ /* Begin XCBuildConfiguration section */ 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 756FF6C78FB548317DAD12C0 /* Pods-Joplin.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements; @@ -1503,11 +342,7 @@ DEVELOPMENT_TEAM = A9BXAFS6CT; HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/../node_modules/react-native-document-picker/ios/RNDocumentPicker", "$(SRCROOT)/../node_modules/rn-fetch-blob/ios/**", - "$(SRCROOT)/../node_modules/react-native-fs/**", - "$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer", - "$(SRCROOT)/../node_modules/react-native-sqlite-storage/src/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)..", ode_modules, @@ -1518,15 +353,10 @@ "$(SRCROOT)..", ode_modules, "eact-native-file-viewerios", - "$(SRCROOT)/../node_modules/react-native-webview/ios", - "$(SRCROOT)/../node_modules/@react-native-community/slider/ios", ); INFOPLIST_FILE = Joplin/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/Joplin\"", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; MARKETING_VERSION = 10.0.43; OTHER_LDFLAGS = ( "$(inherited)", @@ -1544,6 +374,7 @@ }; 13B07F951A680F5B00A75B9A /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 6CFFC13990302AAE61F81DB1 /* Pods-Joplin.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements; @@ -1553,24 +384,15 @@ DEVELOPMENT_TEAM = A9BXAFS6CT; HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/../node_modules/react-native-document-picker/ios/RNDocumentPicker", "$(SRCROOT)/../node_modules/rn-fetch-blob/ios/**", - "$(SRCROOT)/../node_modules/react-native-fs/**", - "$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer", - "$(SRCROOT)/../node_modules/react-native-sqlite-storage/src/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)..\node_modules\neact-native-image-pickerios", "$(SRCROOT)..\node_modules\neact-native-securerandomios", "$(SRCROOT)..\node_modules\neact-native-file-viewerios", - "$(SRCROOT)/../node_modules/react-native-webview/ios", - "$(SRCROOT)/../node_modules/@react-native-community/slider/ios", ); INFOPLIST_FILE = Joplin/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/Joplin\"", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; MARKETING_VERSION = 10.0.43; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/ReactNativeClient/ios/Joplin.xcworkspace/contents.xcworkspacedata b/ReactNativeClient/ios/Joplin.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..965dc6aa4 --- /dev/null +++ b/ReactNativeClient/ios/Joplin.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + \ No newline at end of file diff --git a/ReactNativeClient/ios/Joplin.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ReactNativeClient/ios/Joplin.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/ReactNativeClient/ios/Joplin.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ReactNativeClient/ios/Joplin/AppDelegate.m b/ReactNativeClient/ios/Joplin/AppDelegate.m index 745256127..6185670f9 100644 --- a/ReactNativeClient/ios/Joplin/AppDelegate.m +++ b/ReactNativeClient/ios/Joplin/AppDelegate.m @@ -12,7 +12,7 @@ #import #import #import -#import +// #import @implementation AppDelegate @@ -34,11 +34,11 @@ } // Required to register for notifications -- (void)application:(UIApplication *)application didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings { [RCTPushNotificationManager didRegisterUserNotificationSettings:notificationSettings]; } // Required for the register event. -- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken { [RCTPushNotificationManager didRegisterForRemoteNotificationsWithDeviceToken:deviceToken]; } // Required for the notification event. You must call the completion handler after handling the remote notification. -- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler { [RCTPushNotificationManager didReceiveRemoteNotification:userInfo fetchCompletionHandler:completionHandler]; } // Required for the registrationError event. -- (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error { [RCTPushNotificationManager didFailToRegisterForRemoteNotificationsWithError:error]; } // Required for the localNotification event. -- (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification { [RCTPushNotificationManager didReceiveLocalNotification:notification]; } +// - (void)application:(UIApplication *)application didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings { [RCTPushNotificationManager didRegisterUserNotificationSettings:notificationSettings]; } // Required for the register event. +// - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken { [RCTPushNotificationManager didRegisterForRemoteNotificationsWithDeviceToken:deviceToken]; } // Required for the notification event. You must call the completion handler after handling the remote notification. +// - (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler { [RCTPushNotificationManager didReceiveRemoteNotification:userInfo fetchCompletionHandler:completionHandler]; } // Required for the registrationError event. +// - (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error { [RCTPushNotificationManager didFailToRegisterForRemoteNotificationsWithError:error]; } // Required for the localNotification event. +// - (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification { [RCTPushNotificationManager didReceiveLocalNotification:notification]; } - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge { diff --git a/ReactNativeClient/ios/Joplin/Info.plist b/ReactNativeClient/ios/Joplin/Info.plist index 89147e25c..3ada9c3d1 100644 --- a/ReactNativeClient/ios/Joplin/Info.plist +++ b/ReactNativeClient/ios/Joplin/Info.plist @@ -46,19 +46,7 @@ NSPhotoLibraryUsageDescription To allow attaching images to a note UIAppFonts - - Entypo.ttf - EvilIcons.ttf - Feather.ttf - FontAwesome.ttf - Foundation.ttf - Ionicons.ttf - MaterialCommunityIcons.ttf - MaterialIcons.ttf - Octicons.ttf - SimpleLineIcons.ttf - Zocial.ttf - + UILaunchStoryboardName LaunchScreen UIRequiredDeviceCapabilities diff --git a/ReactNativeClient/ios/Podfile b/ReactNativeClient/ios/Podfile new file mode 100644 index 000000000..c00feffec --- /dev/null +++ b/ReactNativeClient/ios/Podfile @@ -0,0 +1,36 @@ +platform :ios, '9.0' +require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' +target 'Joplin' do + # Pods for Joplin + pod 'React', :path => '../node_modules/react-native/' + pod 'React-Core', :path => '../node_modules/react-native/React' + pod 'React-DevSupport', :path => '../node_modules/react-native/React' + pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS' + pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation' + pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob' + pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image' + pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS' + pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network' + pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings' + pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text' + pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration' + pod 'React-RCTWebSocket', :path => '../node_modules/react-native/Libraries/WebSocket' + pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact' + pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi' + pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor' + pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector' + pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga' + pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec' + pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec' + pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec' + pod 'rn-fetch-blob', :path => '../node_modules/rn-fetch-blob' + use_native_modules! +end + +# target 'Joplin-tvOS' do +# # Pods for Joplin-tvOS +# target 'Joplin-tvOSTests' do +# inherit! :search_paths +# # Pods for testing +# end +# end \ No newline at end of file diff --git a/ReactNativeClient/ios/Podfile.lock b/ReactNativeClient/ios/Podfile.lock new file mode 100644 index 000000000..a01d9631c --- /dev/null +++ b/ReactNativeClient/ios/Podfile.lock @@ -0,0 +1,265 @@ +PODS: + - boost-for-react-native (1.63.0) + - DoubleConversion (1.1.6) + - Folly (2018.10.22.00): + - boost-for-react-native + - DoubleConversion + - Folly/Default (= 2018.10.22.00) + - glog + - Folly/Default (2018.10.22.00): + - boost-for-react-native + - DoubleConversion + - glog + - glog (0.3.5) + - React (0.60.6): + - React-Core (= 0.60.6) + - React-DevSupport (= 0.60.6) + - React-RCTActionSheet (= 0.60.6) + - React-RCTAnimation (= 0.60.6) + - React-RCTBlob (= 0.60.6) + - React-RCTImage (= 0.60.6) + - React-RCTLinking (= 0.60.6) + - React-RCTNetwork (= 0.60.6) + - React-RCTSettings (= 0.60.6) + - React-RCTText (= 0.60.6) + - React-RCTVibration (= 0.60.6) + - React-RCTWebSocket (= 0.60.6) + - React-Core (0.60.6): + - Folly (= 2018.10.22.00) + - React-cxxreact (= 0.60.6) + - React-jsiexecutor (= 0.60.6) + - yoga (= 0.60.6.React) + - React-cxxreact (0.60.6): + - boost-for-react-native (= 1.63.0) + - DoubleConversion + - Folly (= 2018.10.22.00) + - glog + - React-jsinspector (= 0.60.6) + - React-DevSupport (0.60.6): + - React-Core (= 0.60.6) + - React-RCTWebSocket (= 0.60.6) + - React-jsi (0.60.6): + - boost-for-react-native (= 1.63.0) + - DoubleConversion + - Folly (= 2018.10.22.00) + - glog + - React-jsi/Default (= 0.60.6) + - React-jsi/Default (0.60.6): + - boost-for-react-native (= 1.63.0) + - DoubleConversion + - Folly (= 2018.10.22.00) + - glog + - React-jsiexecutor (0.60.6): + - DoubleConversion + - Folly (= 2018.10.22.00) + - glog + - React-cxxreact (= 0.60.6) + - React-jsi (= 0.60.6) + - React-jsinspector (0.60.6) + - react-native-camera (2.10.2): + - React + - react-native-camera/RCT (= 2.10.2) + - react-native-camera/RN (= 2.10.2) + - react-native-camera/RCT (2.10.2): + - React + - react-native-camera/RN (2.10.2): + - React + - react-native-document-picker (2.3.0): + - React + - react-native-image-picker (0.14.3): + - React + - react-native-image-resizer (1.0.0): + - React + - react-native-slider (2.0.8): + - React + - react-native-sqlite-storage (3.3.11): + - React + - react-native-version-info (0.5.1): + - React + - react-native-webview (5.12.0): + - React + - React-RCTActionSheet (0.60.6): + - React-Core (= 0.60.6) + - React-RCTAnimation (0.60.6): + - React-Core (= 0.60.6) + - React-RCTBlob (0.60.6): + - React-Core (= 0.60.6) + - React-RCTNetwork (= 0.60.6) + - React-RCTWebSocket (= 0.60.6) + - React-RCTImage (0.60.6): + - React-Core (= 0.60.6) + - React-RCTNetwork (= 0.60.6) + - React-RCTLinking (0.60.6): + - React-Core (= 0.60.6) + - React-RCTNetwork (0.60.6): + - React-Core (= 0.60.6) + - React-RCTSettings (0.60.6): + - React-Core (= 0.60.6) + - React-RCTText (0.60.6): + - React-Core (= 0.60.6) + - React-RCTVibration (0.60.6): + - React-Core (= 0.60.6) + - React-RCTWebSocket (0.60.6): + - React-Core (= 0.60.6) + - rn-fetch-blob (0.12.0): + - React-Core + - RNFileViewer (1.0.1): + - React + - RNFS (2.11.17): + - React + - RNSecureRandom (1.0.0-rc.0): + - React + - RNVectorIcons (6.6.0): + - React + - yoga (0.60.6.React) + +DEPENDENCIES: + - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) + - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`) + - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) + - React (from `../node_modules/react-native/`) + - React-Core (from `../node_modules/react-native/React`) + - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`) + - React-DevSupport (from `../node_modules/react-native/React`) + - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`) + - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) + - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) + - react-native-camera (from `../node_modules/react-native-camera`) + - react-native-document-picker (from `../node_modules/react-native-document-picker`) + - react-native-image-picker (from `../node_modules/react-native-image-picker`) + - react-native-image-resizer (from `../node_modules/react-native-image-resizer`) + - "react-native-slider (from `../node_modules/@react-native-community/slider`)" + - react-native-sqlite-storage (from `../node_modules/react-native-sqlite-storage`) + - react-native-version-info (from `../node_modules/react-native-version-info`) + - react-native-webview (from `../node_modules/react-native-webview`) + - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`) + - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`) + - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`) + - React-RCTImage (from `../node_modules/react-native/Libraries/Image`) + - React-RCTLinking (from `../node_modules/react-native/Libraries/LinkingIOS`) + - React-RCTNetwork (from `../node_modules/react-native/Libraries/Network`) + - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`) + - React-RCTText (from `../node_modules/react-native/Libraries/Text`) + - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) + - React-RCTWebSocket (from `../node_modules/react-native/Libraries/WebSocket`) + - rn-fetch-blob (from `../node_modules/rn-fetch-blob`) + - RNFileViewer (from `../node_modules/react-native-file-viewer/ios`) + - RNFS (from `../node_modules/react-native-fs`) + - RNSecureRandom (from `../node_modules/react-native-securerandom`) + - RNVectorIcons (from `../node_modules/react-native-vector-icons`) + - yoga (from `../node_modules/react-native/ReactCommon/yoga`) + +SPEC REPOS: + trunk: + - boost-for-react-native + +EXTERNAL SOURCES: + DoubleConversion: + :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec" + Folly: + :podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec" + glog: + :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" + React: + :path: "../node_modules/react-native/" + React-Core: + :path: "../node_modules/react-native/React" + React-cxxreact: + :path: "../node_modules/react-native/ReactCommon/cxxreact" + React-DevSupport: + :path: "../node_modules/react-native/React" + React-jsi: + :path: "../node_modules/react-native/ReactCommon/jsi" + React-jsiexecutor: + :path: "../node_modules/react-native/ReactCommon/jsiexecutor" + React-jsinspector: + :path: "../node_modules/react-native/ReactCommon/jsinspector" + react-native-camera: + :path: "../node_modules/react-native-camera" + react-native-document-picker: + :path: "../node_modules/react-native-document-picker" + react-native-image-picker: + :path: "../node_modules/react-native-image-picker" + react-native-image-resizer: + :path: "../node_modules/react-native-image-resizer" + react-native-slider: + :path: "../node_modules/@react-native-community/slider" + react-native-sqlite-storage: + :path: "../node_modules/react-native-sqlite-storage" + react-native-version-info: + :path: "../node_modules/react-native-version-info" + react-native-webview: + :path: "../node_modules/react-native-webview" + React-RCTActionSheet: + :path: "../node_modules/react-native/Libraries/ActionSheetIOS" + React-RCTAnimation: + :path: "../node_modules/react-native/Libraries/NativeAnimation" + React-RCTBlob: + :path: "../node_modules/react-native/Libraries/Blob" + React-RCTImage: + :path: "../node_modules/react-native/Libraries/Image" + React-RCTLinking: + :path: "../node_modules/react-native/Libraries/LinkingIOS" + React-RCTNetwork: + :path: "../node_modules/react-native/Libraries/Network" + React-RCTSettings: + :path: "../node_modules/react-native/Libraries/Settings" + React-RCTText: + :path: "../node_modules/react-native/Libraries/Text" + React-RCTVibration: + :path: "../node_modules/react-native/Libraries/Vibration" + React-RCTWebSocket: + :path: "../node_modules/react-native/Libraries/WebSocket" + rn-fetch-blob: + :path: "../node_modules/rn-fetch-blob" + RNFileViewer: + :path: "../node_modules/react-native-file-viewer/ios" + RNFS: + :path: "../node_modules/react-native-fs" + RNSecureRandom: + :path: "../node_modules/react-native-securerandom" + RNVectorIcons: + :path: "../node_modules/react-native-vector-icons" + yoga: + :path: "../node_modules/react-native/ReactCommon/yoga" + +SPEC CHECKSUMS: + boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c + DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 + Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 + glog: 1f3da668190260b06b429bb211bfbee5cd790c28 + React: 68e7f8dfc27729eade18423072a143120f2f32ab + React-Core: fc9dace551f6c8c1007dd2d3cb1bc10c90a01d3e + React-cxxreact: abe59014fce932d41a08bf1aa5dcad9ca8f0a2c5 + React-DevSupport: b0da2fd9ad4ffb25561bf2a328ab84f78f871bdd + React-jsi: 1a4248256b96fa453536a8dafe11b784e24e789d + React-jsiexecutor: 2279e559b921d02dfc6253ebef3dcb3a9dc6c07e + React-jsinspector: a58b86545a0185f69768e78ac96ca9fe43fa3694 + react-native-camera: ea85f74cf2e501d2a91a3da7092ecdac082f18df + react-native-document-picker: 8508bfda34be6c24a2cbecbe515b15108658c183 + react-native-image-picker: 3693786b3d5958c8f71deed66ec068b323565e0d + react-native-image-resizer: aa1600566fd336a044daf9273dcec5033c1d41ca + react-native-slider: b2f361499888302147205f17f6fffa921a7bda70 + react-native-sqlite-storage: 3cfa904d9750f7e846c9a14c47951583ee99dbf4 + react-native-version-info: 8905d01e64f8444ab6842b3fff89886b3191e732 + react-native-webview: 26d8993b090ca5d59eb9a9466dcb8291baa3223e + React-RCTActionSheet: 49f6a67a7efa6688f637296383d453b97ef13645 + React-RCTAnimation: e8047438b2927ebbe630bbf600c7309374075df3 + React-RCTBlob: 2c4b28daca5b3e6e356706d8e0c7436a0e8ef492 + React-RCTImage: 273501f0529775962551613259c20ccdf1a87cd2 + React-RCTLinking: 76c88b3cc98657915a2ba2f20d208e44d0530a43 + React-RCTNetwork: 77c11e672ccdcc33da5d047705f100b016497b15 + React-RCTSettings: f727c25ad26a8a9bd7272a8ba93781bd1f53952a + React-RCTText: d91537e29e38dc69cf09cbca0875cf5dc7402da6 + React-RCTVibration: 7655d72dfb919dd6d8e135ca108a5a2bd9fcd7b4 + React-RCTWebSocket: 7cd2c8d0f8ddd680dc76404defba7ab1f56b83af + rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba + RNFileViewer: 5047ecf40477339723cc08abd55b5ebcefcef4b5 + RNFS: 416676c3a9ae404454bade10e3d78147c7c33a40 + RNSecureRandom: 1f19ad1492f7ed416b8fc79e92216a1f73f13a4c + RNVectorIcons: 0bb4def82230be1333ddaeee9fcba45f0b288ed4 + yoga: 5079887aa3e4c62142d6bcee493022643ee4d730 + +PODFILE CHECKSUM: f181745e3dfb6ceb34ab39c6406155aa68a75c7c + +COCOAPODS: 1.8.4 diff --git a/ReactNativeClient/lib/components/CameraView.js b/ReactNativeClient/lib/components/CameraView.js index 9daf881ad..9f7c3b577 100644 --- a/ReactNativeClient/lib/components/CameraView.js +++ b/ReactNativeClient/lib/components/CameraView.js @@ -10,6 +10,8 @@ const { _ } = require('lib/locale.js'); const { shim } = require('lib/shim'); const Setting = require('lib/models/Setting'); +Icon.loadFont(); + class CameraView extends Component { constructor() { super(); diff --git a/ReactNativeClient/lib/components/action-button.js b/ReactNativeClient/lib/components/action-button.js index 32dee63c8..a616aad6f 100644 --- a/ReactNativeClient/lib/components/action-button.js +++ b/ReactNativeClient/lib/components/action-button.js @@ -8,6 +8,8 @@ const ReactNativeActionButton = require('react-native-action-button').default; const { connect } = require('react-redux'); const { _ } = require('lib/locale.js'); +Icon.loadFont(); + const styles = StyleSheet.create({ actionButtonIcon: { fontSize: 20, diff --git a/ReactNativeClient/lib/components/checkbox.js b/ReactNativeClient/lib/components/checkbox.js index 3f81a18a6..9c0175918 100644 --- a/ReactNativeClient/lib/components/checkbox.js +++ b/ReactNativeClient/lib/components/checkbox.js @@ -4,6 +4,7 @@ const React = require('react'); const Component = React.Component; const { View, TouchableHighlight } = require('react-native'); const Icon = require('react-native-vector-icons/Ionicons').default; +Icon.loadFont(); const styles = { checkboxIcon: { diff --git a/ReactNativeClient/lib/components/note-list.js b/ReactNativeClient/lib/components/note-list.js index cf7a1d272..df2205935 100644 --- a/ReactNativeClient/lib/components/note-list.js +++ b/ReactNativeClient/lib/components/note-list.js @@ -3,7 +3,7 @@ const React = require('react'); const Component = React.Component; const { connect } = require('react-redux'); -const { ListView, Text, StyleSheet, Button, View } = require('react-native'); +const { FlatList, Text, StyleSheet, Button, View } = require('react-native'); const { _ } = require('lib/locale.js'); const { NoteItem } = require('lib/components/note-item.js'); const { time } = require('lib/time-utils.js'); @@ -12,13 +12,8 @@ const { themeStyle } = require('lib/components/global-style.js'); class NoteListComponent extends Component { constructor() { super(); - const ds = new ListView.DataSource({ - rowHasChanged: (r1, r2) => { - return r1 !== r2; - }, - }); + this.state = { - dataSource: ds, items: [], selectedItemIds: [], }; @@ -82,37 +77,23 @@ class NoteListComponent extends Component { return output; } - UNSAFE_componentWillMount() { - const newDataSource = this.state.dataSource.cloneWithRows(this.filterNotes(this.props.items)); - this.setState({ dataSource: newDataSource }); - } - UNSAFE_componentWillReceiveProps(newProps) { - // https://stackoverflow.com/questions/38186114/react-native-redux-and-listview - this.setState({ - dataSource: this.state.dataSource.cloneWithRows(this.filterNotes(newProps.items)), - }); - // Make sure scroll position is reset when switching from one folder to another or to a tag list. if (this.rootRef_ && newProps.notesSource != this.props.notesSource) { - this.rootRef_.scrollTo({ x: 0, y: 0, animated: false }); + this.rootRef_.scrollToOffset({ offset: 0, animated: false }); } } render() { // `enableEmptySections` is to fix this warning: https://github.com/FaridSafi/react-native-gifted-listview/issues/39 - if (this.state.dataSource.getRowCount()) { - return ( - (this.rootRef_ = ref)} - dataSource={this.state.dataSource} - renderRow={note => { - return ; - }} - enableEmptySections={true} - /> - ); + if (this.props.items.length) { + return (this.rootRef_ = ref)} + data={this.props.items} + renderItem={({ item }) => } + keyExtractor={item => item.id} + />; } else { if (!this.props.folders.length) { const noItemMessage = _('You currently have no notebooks.'); diff --git a/ReactNativeClient/lib/components/screen-header.js b/ReactNativeClient/lib/components/screen-header.js index 74bec9986..44b05c798 100644 --- a/ReactNativeClient/lib/components/screen-header.js +++ b/ReactNativeClient/lib/components/screen-header.js @@ -17,6 +17,8 @@ const { Dropdown } = require('lib/components/Dropdown.js'); const { dialogs } = require('lib/dialogs.js'); const DialogBox = require('react-native-dialogbox').default; +Icon.loadFont(); + // Rather than applying a padding to the whole bar, it is applied to each // individual component (button, picker, etc.) so that the touchable areas // are widder and to give more room to the picker component which has a larger diff --git a/ReactNativeClient/lib/components/screens/NoteTagsDialog.js b/ReactNativeClient/lib/components/screens/NoteTagsDialog.js index db21ce6b1..12ccffbd1 100644 --- a/ReactNativeClient/lib/components/screens/NoteTagsDialog.js +++ b/ReactNativeClient/lib/components/screens/NoteTagsDialog.js @@ -11,6 +11,8 @@ const Icon = require('react-native-vector-icons/Ionicons').default; const ModalDialog = require('lib/components/ModalDialog'); const naturalCompare = require('string-natural-compare'); +Icon.loadFont(); + class NoteTagsDialogComponent extends React.Component { constructor() { super(); diff --git a/ReactNativeClient/lib/components/screens/log.js b/ReactNativeClient/lib/components/screens/log.js index efa6c3e25..84222d22f 100644 --- a/ReactNativeClient/lib/components/screens/log.js +++ b/ReactNativeClient/lib/components/screens/log.js @@ -2,7 +2,7 @@ const React = require('react'); -const { ListView, View, Text, Button, StyleSheet, Platform } = require('react-native'); +const { FlatList, View, Text, Button, StyleSheet, Platform } = require('react-native'); const { connect } = require('react-redux'); const { reg } = require('lib/registry.js'); const { ScreenHeader } = require('lib/components/screen-header.js'); @@ -19,13 +19,9 @@ class LogScreenComponent extends BaseScreenComponent { constructor() { super(); - const ds = new ListView.DataSource({ - rowHasChanged: (r1, r2) => { - return r1 !== r2; - }, - }); + this.state = { - dataSource: ds, + logEntries: [], showErrorsOnly: false, }; this.styles_ = {}; @@ -70,29 +66,24 @@ class LogScreenComponent extends BaseScreenComponent { this.resfreshLogEntries(); } - resfreshLogEntries(showErrorsOnly = null) { + async resfreshLogEntries(showErrorsOnly = null) { if (showErrorsOnly === null) showErrorsOnly = this.state.showErrorsOnly; let levels = [Logger.LEVEL_DEBUG, Logger.LEVEL_INFO, Logger.LEVEL_WARN, Logger.LEVEL_ERROR]; if (showErrorsOnly) levels = [Logger.LEVEL_WARN, Logger.LEVEL_ERROR]; - reg - .logger() - .lastEntries(1000, { levels: levels }) - .then(entries => { - const newDataSource = this.state.dataSource.cloneWithRows(entries); - this.setState({ dataSource: newDataSource }); - }); + this.setState({ + logEntries: await reg.logger().lastEntries(1000, { levels: levels }), + showErrorsOnly: showErrorsOnly, + }); } toggleErrorsOnly() { - const showErrorsOnly = !this.state.showErrorsOnly; - this.setState({ showErrorsOnly: showErrorsOnly }); - this.resfreshLogEntries(showErrorsOnly); + this.resfreshLogEntries(!this.state.showErrorsOnly); } render() { - let renderRow = item => { + let renderRow = ({ item }) => { let textStyle = this.styles().rowText; if (item.level == Logger.LEVEL_WARN) textStyle = this.styles().rowTextWarn; if (item.level == Logger.LEVEL_ERROR) textStyle = this.styles().rowTextError; @@ -105,10 +96,15 @@ class LogScreenComponent extends BaseScreenComponent { }; // `enableEmptySections` is to fix this warning: https://github.com/FaridSafi/react-native-gifted-listview/issues/39 + return ( - + { return `${item.id}`; }} + />