[fix #4819] update react-native to 0.56
Fix figwheel-bridge path in clj-rn.conf.edn update SplashScreen update ios to 9.0 updated Podfile.lock downgrade cocoapods to 1.5.2 update package-lock.json update pod repo when installing update appcompat to v27 Signed-off-by: Dmitry Novotochinov <dmitry.novot@gmail.com>
This commit is contained in:
Eric Dvorsak
Dmitry Novotochinov
parent
481327fcf4
commit
8eb5047d7a
|
|
@ -126,12 +126,14 @@ def getBuildUrl = { ->
|
|||
}
|
||||
|
||||
android {
|
||||
compileSdkVersion 27
|
||||
compileSdkVersion 26
|
||||
buildToolsVersion "26.0.2"
|
||||
|
||||
|
||||
defaultConfig {
|
||||
applicationId "im.status.ethereum"
|
||||
minSdkVersion 23
|
||||
targetSdkVersion 27
|
||||
targetSdkVersion 26
|
||||
multiDexEnabled true
|
||||
versionCode getVersionCode()
|
||||
versionName getVersionName()
|
||||
|
|
@ -217,7 +219,6 @@ configurations.all {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
implementation project(':react-native-firebase')
|
||||
implementation project(':react-native-background-timer')
|
||||
implementation project(':react-native-svg')
|
||||
implementation 'com.android.support:multidex:1.0.2'
|
||||
|
|
@ -234,16 +235,22 @@ dependencies {
|
|||
//compile ("com.facebook.react:react-native:0.55.4") { force = true } // From node_modules
|
||||
implementation project(':react-native-android')
|
||||
implementation project(':react-native-i18n')
|
||||
implementation project(':react-native-camera')
|
||||
implementation project(':react-native-status')
|
||||
implementation project(':react-native-fs')
|
||||
implementation project(':react-native-image-crop-picker')
|
||||
implementation project(':react-native-securerandom')
|
||||
implementation project(':react-native-webview-bridge')
|
||||
implementation project(':react-native-config')
|
||||
implementation 'com.google.android.gms:play-services-base:15.0.0'
|
||||
implementation 'com.google.firebase:firebase-core:15.0.2' //this decides your firebase SDK version
|
||||
implementation 'com.google.firebase:firebase-messaging:15.0.2'
|
||||
implementation project(':react-native-firebase')
|
||||
compile ('com.google.android.gms:play-services-base:15.0.1') {
|
||||
force = true
|
||||
}
|
||||
compile (project(':react-native-camera')) {
|
||||
exclude group: "com.google.android.gms"
|
||||
compile 'com.android.support:exifinterface:27.+'
|
||||
}
|
||||
implementation 'com.google.firebase:firebase-core:16.0.3' //this decides your firebase SDK version
|
||||
implementation 'com.google.firebase:firebase-messaging:17.1.0'
|
||||
implementation project(':react-native-testfairy')
|
||||
implementation project(':react-native-keychain')
|
||||
implementation project(':instabug-reactnative')
|
||||
|
|
@ -251,6 +258,7 @@ dependencies {
|
|||
implementation 'status-im:function:0.0.1'
|
||||
implementation fileTree(dir: "node_modules/realm/android/libs", include: ["*.jar"])
|
||||
}
|
||||
|
||||
// Run this once to be able to run the application with BUCK
|
||||
// puts all compile dependencies into folder libs for BUCK to use
|
||||
task copyDownloadableDepsToLibs(type: Copy) {
|
||||
|
|
@ -277,3 +285,4 @@ preBuild.dependsOn hemroidBuild
|
|||
|
||||
// Must be at bottom to avoid dependency collision
|
||||
apply plugin: "com.google.gms.google-services"
|
||||
com.google.gms.googleservices.GoogleServicesPlugin.config.disableVersionCheck = true
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ public class MainActivity extends ReactActivity
|
|||
Log.v("RNBootstrap", "Available system memory "+getAvailableMemory(activityManager).availMem + ", maximum usable application memory " + activityManager.getLargeMemoryClass()+"M");
|
||||
|
||||
|
||||
SplashScreen.show(this);
|
||||
SplashScreen.show(this, true);
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
Instabug.setIntroMessageEnabled(false);
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ import com.facebook.react.shell.MainReactPackage;
|
|||
import com.facebook.soloader.SoLoader;
|
||||
import com.github.alinz.reactnativewebviewbridge.WebViewBridgePackage;
|
||||
import com.AlexanderZaytsev.RNI18n.RNI18nPackage;
|
||||
import com.lwansbrough.RCTCamera.RCTCameraPackage;
|
||||
import org.reactnative.camera.RNCameraPackage;
|
||||
import com.reactnative.ivpusic.imagepicker.PickerPackage;
|
||||
import com.rnfs.RNFSPackage;
|
||||
import fr.bamlab.rnimageresizer.ImageResizerPackage;
|
||||
|
|
@ -68,7 +68,7 @@ public class MainApplication extends MultiDexApplication implements ReactApplica
|
|||
statusPackage,
|
||||
new RealmReactPackage(),
|
||||
new RNI18nPackage(),
|
||||
new RCTCameraPackage(),
|
||||
new RNCameraPackage(),
|
||||
new RNFSPackage(),
|
||||
new ReactNativeDialogsPackage(),
|
||||
new ImageResizerPackage(),
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ buildscript {
|
|||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.0.1'
|
||||
classpath 'com.google.gms:google-services:3.0.0'
|
||||
classpath 'com.google.gms:google-services:4.1.0'
|
||||
classpath 'de.undercouch:gradle-download-task:3.1.2'
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
pipeline {
|
||||
agent { label 'macos' }
|
||||
agent { label 'linux' }
|
||||
|
||||
options {
|
||||
buildDiscarder(logRotator(
|
||||
|
|
@ -16,10 +16,10 @@ pipeline {
|
|||
FASTLANE_DISABLE_COLORS = 1
|
||||
REALM_DISABLE_ANALYTICS = 1
|
||||
BUNDLE_PATH = "${HOME}/.bundle"
|
||||
ANDROID_HOME = '/usr/local/share/android-sdk'
|
||||
ANDROID_SDK_ROOT = '/usr/local/share/android-sdk'
|
||||
ANDROID_NDK = '/Users/jenkins/android-ndk-r10e'
|
||||
ANDROID_NDK_HOME = '/Users/jenkins/android-ndk-r10e'
|
||||
ANDROID_HOME = '/usr/lib/android-sdk'
|
||||
ANDROID_SDK_ROOT = '/usr/lib/android-sdk'
|
||||
ANDROID_NDK = '/usr/lib/android-ndk'
|
||||
ANDROID_NDK_HOME = '/usr/lib/android-ndk'
|
||||
}
|
||||
|
||||
stages {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
:run-options {:android {"appIdSuffix" "debug"}}
|
||||
|
||||
:figwheel-bridge "figwheel-bridge.js"
|
||||
:figwheel-bridge "./figwheel-bridge.js"
|
||||
;; JS modules
|
||||
:js-modules ["realm"
|
||||
"react-native-i18n"
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
"cemerick.piggieback/wrap-cljs-repl"]}
|
||||
|
||||
:builds [{:id :desktop
|
||||
:source-paths ["react-native/src" "src" "env/dev"]
|
||||
:source-paths ["react-native/src/desktop" "src" "env/dev"]
|
||||
:compiler {:output-to "target/ios/desktop.js"
|
||||
:main "env.desktop.main"
|
||||
:output-dir "target/desktop"
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
:optimizations :none}
|
||||
:figwheel true}
|
||||
{:id :ios
|
||||
:source-paths ["react-native/src" "src" "env/dev"]
|
||||
:source-paths ["react-native/src/mobile" "src" "env/dev"]
|
||||
:compiler {:output-to "target/ios/app.js"
|
||||
:main "env.ios.main"
|
||||
:output-dir "target/ios"
|
||||
|
|
@ -63,7 +63,7 @@
|
|||
:optimizations :none}
|
||||
:figwheel true}
|
||||
{:id :android
|
||||
:source-paths ["react-native/src" "src" "env/dev"]
|
||||
:source-paths ["react-native/src/mobile" "src" "env/dev"]
|
||||
:compiler {:output-to "target/android/app.js"
|
||||
:main "env.android.main"
|
||||
:output-dir "target/android"
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
# Uncomment the next line to define a global platform for your project
|
||||
# platform :ios, '9.0'
|
||||
|
||||
source 'https://github.com/CocoaPods/Specs.git'
|
||||
|
||||
target 'StatusIm' do
|
||||
platform :ios, '8.0'
|
||||
platform :ios, '9.0'
|
||||
# Uncomment the next line if you're using Swift or would like to use dynamic frameworks
|
||||
# use_frameworks!
|
||||
|
||||
|
|
@ -14,6 +16,7 @@ target 'StatusIm' do
|
|||
pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
|
||||
pod 'react-native-background-timer', :path => '../node_modules/react-native-background-timer'
|
||||
pod 'RNKeychain', :path => '../node_modules/react-native-keychain'
|
||||
pod 'react-native-camera', path: '../node_modules/react-native-camera'
|
||||
|
||||
target 'StatusImTests' do
|
||||
inherit! :search_paths
|
||||
|
|
|
|||
124
ios/Podfile.lock
124
ios/Podfile.lock
|
|
@ -1,88 +1,126 @@
|
|||
PODS:
|
||||
- Firebase/Core (5.0.1):
|
||||
- Firebase/Core (5.7.0):
|
||||
- Firebase/CoreOnly
|
||||
- FirebaseAnalytics (= 5.0.0)
|
||||
- Firebase/CoreOnly (5.0.1):
|
||||
- FirebaseCore (= 5.0.1)
|
||||
- Firebase/Messaging (5.0.1):
|
||||
- FirebaseAnalytics (= 5.1.1)
|
||||
- Firebase/CoreOnly (5.7.0):
|
||||
- FirebaseCore (= 5.1.2)
|
||||
- Firebase/Messaging (5.7.0):
|
||||
- Firebase/CoreOnly
|
||||
- FirebaseMessaging (= 3.0.0)
|
||||
- FirebaseAnalytics (5.0.0):
|
||||
- FirebaseCore (~> 5.0)
|
||||
- FirebaseInstanceID (~> 3.0)
|
||||
- GoogleToolboxForMac/NSData+zlib (~> 2.1)
|
||||
- FirebaseMessaging (= 3.1.1)
|
||||
- FirebaseAnalytics (5.1.1):
|
||||
- FirebaseCore (~> 5.1)
|
||||
- FirebaseInstanceID (~> 3.2)
|
||||
- GoogleAppMeasurement (~> 5.1)
|
||||
- GoogleUtilities/AppDelegateSwizzler (~> 5.2.0)
|
||||
- GoogleUtilities/MethodSwizzler (~> 5.2.0)
|
||||
- GoogleUtilities/Network (~> 5.2)
|
||||
- "GoogleUtilities/NSData+zlib (~> 5.2)"
|
||||
- nanopb (~> 0.3)
|
||||
- FirebaseCore (5.0.1):
|
||||
- GoogleToolboxForMac/NSData+zlib (~> 2.1)
|
||||
- FirebaseInstanceID (3.0.0):
|
||||
- FirebaseCore (~> 5.0)
|
||||
- FirebaseMessaging (3.0.0):
|
||||
- FirebaseCore (5.1.2):
|
||||
- GoogleUtilities/Logger (~> 5.2)
|
||||
- FirebaseInstanceID (3.2.1):
|
||||
- FirebaseCore (~> 5.1)
|
||||
- GoogleUtilities/Environment (~> 5.2)
|
||||
- FirebaseMessaging (3.1.1):
|
||||
- FirebaseCore (~> 5.0)
|
||||
- FirebaseInstanceID (~> 3.0)
|
||||
- GoogleToolboxForMac/Logger (~> 2.1)
|
||||
- GoogleUtilities/Reachability (~> 5.2)
|
||||
- Protobuf (~> 3.1)
|
||||
- GoogleToolboxForMac/Defines (2.1.4)
|
||||
- GoogleToolboxForMac/Logger (2.1.4):
|
||||
- GoogleToolboxForMac/Defines (= 2.1.4)
|
||||
- GoogleToolboxForMac/NSData+zlib (2.1.4):
|
||||
- GoogleToolboxForMac/Defines (= 2.1.4)
|
||||
- GoogleAppMeasurement (5.1.1):
|
||||
- GoogleUtilities/AppDelegateSwizzler (~> 5.2.0)
|
||||
- GoogleUtilities/MethodSwizzler (~> 5.2.0)
|
||||
- GoogleUtilities/Network (~> 5.2)
|
||||
- "GoogleUtilities/NSData+zlib (~> 5.2)"
|
||||
- nanopb (~> 0.3)
|
||||
- GoogleUtilities/AppDelegateSwizzler (5.2.2):
|
||||
- GoogleUtilities/Environment
|
||||
- GoogleUtilities/Logger
|
||||
- GoogleUtilities/Network
|
||||
- GoogleUtilities/Environment (5.2.2)
|
||||
- GoogleUtilities/Logger (5.2.2):
|
||||
- GoogleUtilities/Environment
|
||||
- GoogleUtilities/MethodSwizzler (5.2.2):
|
||||
- GoogleUtilities/Logger
|
||||
- GoogleUtilities/Network (5.2.2):
|
||||
- GoogleUtilities/Logger
|
||||
- "GoogleUtilities/NSData+zlib"
|
||||
- GoogleUtilities/Reachability
|
||||
- "GoogleUtilities/NSData+zlib (5.2.2)"
|
||||
- GoogleUtilities/Reachability (5.2.2):
|
||||
- GoogleUtilities/Logger
|
||||
- nanopb (0.3.8):
|
||||
- nanopb/decode (= 0.3.8)
|
||||
- nanopb/encode (= 0.3.8)
|
||||
- nanopb/decode (0.3.8)
|
||||
- nanopb/encode (0.3.8)
|
||||
- Protobuf (3.5.0)
|
||||
- React (0.55.4):
|
||||
- React/Core (= 0.55.4)
|
||||
- react-native-background-timer (2.0.0):
|
||||
- Protobuf (3.6.1)
|
||||
- React (0.56.0):
|
||||
- React/Core (= 0.56.0)
|
||||
- react-native-background-timer (2.1.0-alpha.6):
|
||||
- React
|
||||
- React/Core (0.55.4):
|
||||
- yoga (= 0.55.4.React)
|
||||
- react-native-camera (1.2.0):
|
||||
- React
|
||||
- react-native-camera/RCT (= 1.2.0)
|
||||
- react-native-camera/RN (= 1.2.0)
|
||||
- react-native-camera/RCT (1.2.0):
|
||||
- React
|
||||
- react-native-camera/RN (1.2.0):
|
||||
- React
|
||||
- React/Core (0.56.0):
|
||||
- yoga (= 0.56.0.React)
|
||||
- RNKeychain (3.0.0):
|
||||
- React
|
||||
- yoga (0.55.4.React)
|
||||
- yoga (0.56.0.React)
|
||||
|
||||
DEPENDENCIES:
|
||||
- Firebase/Core
|
||||
- Firebase/Messaging
|
||||
- React (from `../node_modules/react-native`)
|
||||
- react-native-background-timer (from `../node_modules/react-native-background-timer`)
|
||||
- react-native-camera (from `../node_modules/react-native-camera`)
|
||||
- RNKeychain (from `../node_modules/react-native-keychain`)
|
||||
- yoga (from `../node_modules/react-native/ReactCommon/yoga`)
|
||||
|
||||
SPEC REPOS:
|
||||
https://github.com/cocoapods/specs.git:
|
||||
- Firebase
|
||||
- FirebaseAnalytics
|
||||
- FirebaseCore
|
||||
- FirebaseInstanceID
|
||||
- FirebaseMessaging
|
||||
- GoogleToolboxForMac
|
||||
- GoogleAppMeasurement
|
||||
- GoogleUtilities
|
||||
- nanopb
|
||||
- Protobuf
|
||||
|
||||
EXTERNAL SOURCES:
|
||||
React:
|
||||
:path: "../node_modules/react-native"
|
||||
react-native-background-timer:
|
||||
:path: ../node_modules/react-native-background-timer
|
||||
:path: "../node_modules/react-native-background-timer"
|
||||
react-native-camera:
|
||||
:path: "../node_modules/react-native-camera"
|
||||
RNKeychain:
|
||||
:path: ../node_modules/react-native-keychain
|
||||
:path: "../node_modules/react-native-keychain"
|
||||
yoga:
|
||||
:path: "../node_modules/react-native/ReactCommon/yoga"
|
||||
|
||||
SPEC CHECKSUMS:
|
||||
Firebase: d6861c2059d8c32d1e6dd8932e22ada346d90a3a
|
||||
FirebaseAnalytics: 19812b49fa5f283dd6b23edf8a14b5d477029ab8
|
||||
FirebaseCore: cafc814b2d84fc8733f09e653041cc2165332ad7
|
||||
FirebaseInstanceID: 83e0040351565df711a5db3d8ebe5ea21aca998a
|
||||
FirebaseMessaging: f2360a966ecfb0d14facf0fbdf306efc2df0ddbe
|
||||
GoogleToolboxForMac: 91c824d21e85b31c2aae9bb011c5027c9b4e738f
|
||||
Firebase: 734a4f92957aa6c40e7ae3fda3d9359e1890aa87
|
||||
FirebaseAnalytics: 993577e91157feb40945abedd6ab346d8a4b6ac8
|
||||
FirebaseCore: 3a97432acb324b439fbed338e642f9cbb516a63d
|
||||
FirebaseInstanceID: ea5af6920d0a4a29b40459d055bebe4a6c1333c4
|
||||
FirebaseMessaging: 698c94dd1e3436346c29bb9c85dcdca4c4a0c30b
|
||||
GoogleAppMeasurement: f7507b39b70ad0bd80b3d81518b2f43868974307
|
||||
GoogleUtilities: 06b66f9567769a7958db20a92f0128b2843e49d5
|
||||
nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3
|
||||
Protobuf: 8a9838fba8dae3389230e1b7f8c104aa32389c03
|
||||
React: aa2040dbb6f317b95314968021bd2888816e03d5
|
||||
react-native-background-timer: 63dcbf37dbcf294b5c6c071afcdc661fa06a7594
|
||||
Protobuf: 1eb9700044745f00181c136ef21b8ff3ad5a0fd5
|
||||
React: 1fe0eb13d90b625d94c3b117c274dcfd2e760e11
|
||||
react-native-background-timer: bb7a98c8e97fc7c290de2d423dd09ddb73dcbcbb
|
||||
react-native-camera: 68ad5143d2d0636236d46c7de8d2a6455ca52a36
|
||||
RNKeychain: 627c6095cef215dd3d9804a9a9cf45ab96aa3997
|
||||
yoga: a23273df0088bf7f2bb7e5d7b00044ea57a2a54a
|
||||
yoga: b1ce48b6cf950b98deae82838f5173ea7cf89e85
|
||||
|
||||
PODFILE CHECKSUM: e5ecd57d8448253eb06b209c4e1c5230a2634a1d
|
||||
PODFILE CHECKSUM: 7636f960a0dbec2dd55b8b20e244befa3fdb4438
|
||||
|
||||
COCOAPODS: 1.4.0
|
||||
COCOAPODS: 1.5.2
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@
|
|||
98482A6F2065257B00263651 /* libReactNativeTestFairy.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9880471C20650CBC00CEBFE0 /* libReactNativeTestFairy.a */; };
|
||||
9E0B01A11DDC5DA7002B0359 /* SF-UI-Text-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9E0B01A01DDC5DA7002B0359 /* SF-UI-Text-Light.otf */; };
|
||||
9E3AB6D01D87DB2B008846B4 /* libReact-Native-Webview-Bridge.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E3AB6C61D87DA2B008846B4 /* libReact-Native-Webview-Bridge.a */; };
|
||||
9E7C64731E03FDDE004C7042 /* libRCTCamera.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 20B7D1151D3F74CD00B70F14 /* libRCTCamera.a */; };
|
||||
9ED2F45E1D9D535A00B36508 /* SF-UI-Text-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9ED2F45D1D9D52DD00B36508 /* SF-UI-Text-Regular.otf */; };
|
||||
9ED2F45F1D9D535A00B36508 /* SF-UI-Text-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9ED2F45C1D9D52C100B36508 /* SF-UI-Text-Medium.otf */; };
|
||||
9ED2F4611D9D579900B36508 /* SF-UI-Text-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9ED2F4601D9D577B00B36508 /* SF-UI-Text-Bold.otf */; };
|
||||
|
|
@ -164,13 +163,6 @@
|
|||
remoteGlobalIDString = CDD7BF781B2D5125006FDA75;
|
||||
remoteInfo = RNI18n;
|
||||
};
|
||||
20B7D1141D3F74CD00B70F14 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 9F1854E6D9654226B1FC8308 /* RCTCamera.xcodeproj */;
|
||||
proxyType = 2;
|
||||
remoteGlobalIDString = 4107012F1ACB723B00C6AA39;
|
||||
remoteInfo = RCTCamera;
|
||||
};
|
||||
20B7D1191D3F74CD00B70F14 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 305F194186D848FDB07AF34C /* RNFS.xcodeproj */;
|
||||
|
|
@ -595,7 +587,6 @@
|
|||
9ED2F45D1D9D52DD00B36508 /* SF-UI-Text-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SF-UI-Text-Regular.otf"; sourceTree = "<group>"; };
|
||||
9ED2F4601D9D577B00B36508 /* SF-UI-Text-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SF-UI-Text-Bold.otf"; sourceTree = "<group>"; };
|
||||
9EF083381F3B538A00876A8F /* ReactNativeConfig.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactNativeConfig.xcodeproj; path = "../node_modules/react-native-config/ios/ReactNativeConfig.xcodeproj"; sourceTree = "<group>"; };
|
||||
9F1854E6D9654226B1FC8308 /* RCTCamera.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RCTCamera.xcodeproj; path = "../node_modules/react-native-camera/ios/RCTCamera.xcodeproj"; sourceTree = "<group>"; };
|
||||
ACA66A8F16CD2FE21F38738B /* Pods-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StatusIm.debug.xcconfig"; path = "Pods/Target Support Files/Pods-StatusIm/Pods-StatusIm.debug.xcconfig"; sourceTree = "<group>"; };
|
||||
ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
|
||||
AF2BF381BC7B4EB0887F0091 /* libRNSVG.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNSVG.a; sourceTree = "<group>"; };
|
||||
|
|
@ -658,7 +649,6 @@
|
|||
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
|
||||
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
|
||||
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
|
||||
9E7C64731E03FDDE004C7042 /* libRCTCamera.a in Frameworks */,
|
||||
FD4F213C3873473CB703B1D2 /* libRNFS.a in Frameworks */,
|
||||
213311F38CA74CE280FD09AD /* libRNI18n.a in Frameworks */,
|
||||
22118DE1207A419FBFE7B62D /* libRealmReact.a in Frameworks */,
|
||||
|
|
@ -854,14 +844,6 @@
|
|||
name = Products;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
20B7D1111D3F74CD00B70F14 /* Products */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
20B7D1151D3F74CD00B70F14 /* libRCTCamera.a */,
|
||||
);
|
||||
name = Products;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
20B7D1161D3F74CD00B70F14 /* Products */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
|
|
@ -938,7 +920,6 @@
|
|||
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
|
||||
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
|
||||
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
|
||||
9F1854E6D9654226B1FC8308 /* RCTCamera.xcodeproj */,
|
||||
305F194186D848FDB07AF34C /* RNFS.xcodeproj */,
|
||||
46E2F6052EB44C698C680894 /* RNI18n.xcodeproj */,
|
||||
F090E261B9854867A728CE4F /* RealmReact.xcodeproj */,
|
||||
|
|
@ -1237,10 +1218,6 @@
|
|||
ProductGroup = ADBDB9201DFEBF0600ED6528 /* Products */;
|
||||
ProjectRef = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */;
|
||||
},
|
||||
{
|
||||
ProductGroup = 20B7D1111D3F74CD00B70F14 /* Products */;
|
||||
ProjectRef = 9F1854E6D9654226B1FC8308 /* RCTCamera.xcodeproj */;
|
||||
},
|
||||
{
|
||||
ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */;
|
||||
ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */;
|
||||
|
|
@ -1435,13 +1412,6 @@
|
|||
remoteRef = 20B7D10D1D3F74CD00B70F14 /* PBXContainerItemProxy */;
|
||||
sourceTree = BUILT_PRODUCTS_DIR;
|
||||
};
|
||||
20B7D1151D3F74CD00B70F14 /* libRCTCamera.a */ = {
|
||||
isa = PBXReferenceProxy;
|
||||
fileType = archive.ar;
|
||||
path = libRCTCamera.a;
|
||||
remoteRef = 20B7D1141D3F74CD00B70F14 /* PBXContainerItemProxy */;
|
||||
sourceTree = BUILT_PRODUCTS_DIR;
|
||||
};
|
||||
20B7D11A1D3F74CD00B70F14 /* libRNFS.a */ = {
|
||||
isa = PBXReferenceProxy;
|
||||
fileType = archive.ar;
|
||||
|
|
@ -2201,7 +2171,7 @@
|
|||
"$(SRCROOT)/../modules/react-native-status/ios/RCTStatus/**",
|
||||
"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
|
||||
"$(SRCROOT)/../node_modules/instabug-reactnative/ios/RNInstabug",
|
||||
"$(SRCROOT)/../node_modules/react-native-splash-screen/ios",
|
||||
"$(SRCROOT)/../node_modules/react-native-splash-screen/ios/**",
|
||||
);
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
|
||||
MTL_ENABLE_DEBUG_INFO = YES;
|
||||
|
|
@ -2263,7 +2233,7 @@
|
|||
"$(SRCROOT)/../modules/react-native-status/ios/RCTStatus/**",
|
||||
"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
|
||||
"$(SRCROOT)/../node_modules/instabug-reactnative/ios/RNInstabug",
|
||||
"$(SRCROOT)/../node_modules/react-native-splash-screen/ios",
|
||||
"$(SRCROOT)/../node_modules/react-native-splash-screen/ios/**",
|
||||
);
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
#import "React/RCTLog.h"
|
||||
#import "RCTBundleURLProvider.h"
|
||||
#import "RCTRootView.h"
|
||||
#import "SplashScreen.h"
|
||||
#import "RNSplashScreen.h"
|
||||
#import "TestFairy.h"
|
||||
#import "RCTLinkingManager.h"
|
||||
#import <Firebase.h>
|
||||
|
|
@ -100,7 +100,7 @@ RCTLogFunction RCTTestFairyLogFunction = ^(
|
|||
rootViewController.view = rootView;
|
||||
self.window.rootViewController = rootViewController;
|
||||
[self.window makeKeyAndVisible];
|
||||
[SplashScreen show];
|
||||
[RNSplashScreen show];
|
||||
|
||||
return YES;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -121,5 +121,7 @@
|
|||
<true/>
|
||||
<key>ITSEncryptionExportComplianceCode</key>
|
||||
<string>1aa92c4d-6194-4d7d-b70a-16b48256b87e</string>
|
||||
<key>NSCameraUsageDescription</key>
|
||||
<string>Please allow Status to use your phone camera</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -6,15 +6,14 @@
|
|||
"start": "node node_modules/react-native/local-cli/cli.js start"
|
||||
},
|
||||
"dependencies": {
|
||||
"@tradle/react-native-http": "^2.0.1",
|
||||
"@babel/generator": "7.0.0-rc.2",
|
||||
"@babel/helper-builder-react-jsx": "7.0.0-rc.2",
|
||||
"@babel/plugin-transform-block-scoping": "7.0.0-rc.2",
|
||||
"@babel/register": "7.0.0-rc.2",
|
||||
"@tradle/react-native-http": "2.0.1",
|
||||
"assert": "1.4.1",
|
||||
"asyncstorage-down": "4.0.1",
|
||||
"babel-core": "6.24.1",
|
||||
"babel-generator": "6.24.1",
|
||||
"babel-helper-builder-react-jsx": "6.18.0",
|
||||
"babel-plugin-transform-es2015-block-scoping": "6.15.0",
|
||||
"babel-preset-react-native": "4.0.0",
|
||||
"babel-register": "6.18.0",
|
||||
"babel-preset-react-native": "5.0.2",
|
||||
"bignumber.js": "https://github.com/status-im/bignumber.js.git",
|
||||
"buffer": "3.6.0",
|
||||
"chance": "1.0.12",
|
||||
|
|
@ -30,33 +29,34 @@
|
|||
"prop-types": "15.6.0",
|
||||
"punycode": "1.4.1",
|
||||
"querystring-es3": "0.2.1",
|
||||
"react": "16.2.0",
|
||||
"react": "16.4.1",
|
||||
"react-dom": "16.2.0",
|
||||
"react-native": "github:status-im/react-native#status-0.55.4",
|
||||
"react-native-background-timer": "2.0.0",
|
||||
"react-native-camera": "0.10.0",
|
||||
"react-native-config": "0.9.0",
|
||||
"react-native": "github:status-im/react-native#status-0.56-1",
|
||||
"react-native-background-timer": "2.1.0-alpha.6",
|
||||
"react-native-camera": "https://github.com/status-im/react-native-camera#1.2.0-7",
|
||||
"react-native-config": "https://github.com/status-im/react-native-config#0.11.2-1",
|
||||
"react-native-crypto": "2.1.1",
|
||||
"react-native-dialogs": "0.0.20",
|
||||
"react-native-dialogs": "1.0.2",
|
||||
"react-native-fetch-polyfill": "1.1.2",
|
||||
"react-native-firebase": "4.2.0",
|
||||
"react-native-fs": "2.8.1",
|
||||
"react-native-http-bridge": "0.5.2",
|
||||
"react-native-i18n": "2.0.9",
|
||||
"react-native-firebase": "https://github.com/status-im/react-native-firebase#5.0.0-rc1",
|
||||
"react-native-fs": "2.11.15",
|
||||
"react-native-http-bridge": "https://github.com/status-im/react-native-http-bridge.git#0.5.2-1",
|
||||
"react-native-i18n": "2.0.15",
|
||||
"react-native-image-crop-picker": "0.18.1",
|
||||
"react-native-image-resizer": "1.0.0",
|
||||
"react-native-image-resizer": "https://github.com/status-im/react-native-image-resizer.git#1.0.0-1",
|
||||
"react-native-invertible-scroll-view": "1.1.0",
|
||||
"react-native-keychain": "^3.0.0",
|
||||
"react-native-level-fs": "3.0.0",
|
||||
"react-native-os": "1.1.0",
|
||||
"react-native-qrcode": "0.2.6",
|
||||
"react-native-securerandom": "0.1.1",
|
||||
"react-native-splash-screen": "3.0.6",
|
||||
"react-native-svg": "6.3.1",
|
||||
"react-native-tcp": "3.3.0",
|
||||
"react-native-testfairy": "2.14.1",
|
||||
"react-native-udp": "2.2.1",
|
||||
"react-native-webview-bridge": "git+https://github.com/status-im/react-native-webview-bridge.git#fix/cookies",
|
||||
"react-native-keychain": "3.0.0",
|
||||
"react-native-level-fs": "3.0.1",
|
||||
"react-native-os": "https://github.com/status-im/react-native-os.git#1.1.0-1",
|
||||
"react-native-qrcode": "0.2.7",
|
||||
"react-native-randombytes": "3.5.0",
|
||||
"react-native-securerandom": "https://github.com/status-im/react-native-securerandom#0.1.1-1",
|
||||
"react-native-splash-screen": "3.1.1",
|
||||
"react-native-svg": "6.5.2",
|
||||
"react-native-tcp": "https://github.com/status-im/react-native-tcp.git#3.3.0-1",
|
||||
"react-native-testfairy": "https://github.com/status-im/react-native-testfairy.git#2.14.1-1",
|
||||
"react-native-udp": "https://github.com/status-im/react-native-udp.git#2.3.1-1",
|
||||
"react-native-webview-bridge": "git+https://github.com/status-im/react-native-webview-bridge.git#0.33.16-1",
|
||||
"realm": "2.15.3",
|
||||
"rn-snoopy": "https://github.com/status-im/rn-snoopy.git",
|
||||
"string_decoder": "0.10.31",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
apply plugin: 'com.android.library'
|
||||
|
||||
android {
|
||||
compileSdkVersion 24
|
||||
compileSdkVersion 26
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion 18
|
||||
|
|
|
|||
|
|
@ -402,4 +402,9 @@ RCT_EXPORT_METHOD(getDeviceUUID:(RCTResponseSenderBlock)callback) {
|
|||
};
|
||||
}
|
||||
|
||||
+ (BOOL)requiresMainQueueSetup
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
(def fetch (.-default (js/require "react-native-fetch-polyfill")))
|
||||
(def i18n (js/require "react-native-i18n"))
|
||||
(def react-native-firebase #js {})
|
||||
(def camera #js {:constants {:Aspect "Portrait"}})
|
||||
(def camera #js {:default #js {:constants {:Aspect "Portrait"}}})
|
||||
(def dialogs #js {})
|
||||
(def dismiss-keyboard #js {})
|
||||
(def image-crop-picker #js {})
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
const blacklist = require('metro').createBlacklist;
|
||||
|
||||
module.exports = {
|
||||
getBlacklistRE: function() {
|
||||
return blacklist([/desktop_files\/.*/]);
|
||||
}
|
||||
};
|
||||
|
|
@ -53,7 +53,8 @@
|
|||
cofx))))))
|
||||
|
||||
(defn ens? [host]
|
||||
(string/ends-with? host ".eth"))
|
||||
(and (string? host)
|
||||
(string/ends-with? host ".eth")))
|
||||
|
||||
(defn ens-multihash-callback [hex]
|
||||
(let [hash (when hex (multihash/base58 (multihash/create :sha2-256 (subs hex 2))))]
|
||||
|
|
|
|||
|
|
@ -1,10 +1,7 @@
|
|||
(ns status-im.notifications.core
|
||||
(:require [goog.object :as object]
|
||||
[re-frame.core :as re-frame]
|
||||
[status-im.utils.handlers-macro :as handlers-macro]
|
||||
[status-im.utils.handlers :as handlers]
|
||||
[status-im.react-native.js-dependencies :as rn]
|
||||
[status-im.ui.components.react :refer [copy-to-clipboard]]
|
||||
[taoensso.timbre :as log]
|
||||
[status-im.utils.platform :as platform]))
|
||||
|
||||
|
|
@ -123,10 +120,15 @@
|
|||
notifications
|
||||
(onNotificationOpened handle-notification-event)))
|
||||
|
||||
(def notification (firebase.notifications.Notification.))
|
||||
(defn init []
|
||||
(on-refresh-fcm-token)
|
||||
(on-notification)
|
||||
(on-notification-opened)
|
||||
(when platform/android?
|
||||
(create-notification-channel)))
|
||||
|
||||
;; API reference https://rnfirebase.io/docs/v4.2.x/notifications/reference/AndroidNotification
|
||||
(defn display-notification [{:keys [title body from to]}]
|
||||
(let [notification (firebase.notifications.Notification.)]
|
||||
(.. notification
|
||||
(setTitle title)
|
||||
(setBody body)
|
||||
|
|
@ -143,14 +145,7 @@
|
|||
notifications
|
||||
(displayNotification notification)
|
||||
(then #(log/debug "Display Notification" title body))
|
||||
(then #(log/debug "Display Notification error" title body))))
|
||||
|
||||
(defn init []
|
||||
(on-refresh-fcm-token)
|
||||
(on-notification)
|
||||
(on-notification-opened)
|
||||
(when platform/android?
|
||||
(create-notification-channel))))
|
||||
(then #(log/debug "Display Notification error" title body))))))
|
||||
|
||||
(defn process-stored-event [address cofx]
|
||||
(when-not platform/desktop?
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
(def default-camera (.-default js-dependecies/camera))
|
||||
|
||||
(defn constants [t]
|
||||
(-> js-dependecies/camera
|
||||
(-> default-camera
|
||||
(object/get "constants")
|
||||
(object/get t)
|
||||
(js->clj)
|
||||
|
|
|
|||
|
|
@ -1,16 +1,19 @@
|
|||
(ns status-im.ui.components.dialog
|
||||
(:require [status-im.react-native.js-dependencies :as rn-dependencies]))
|
||||
|
||||
(defn- callback [options]
|
||||
(fn [index]
|
||||
(when (< index (count options))
|
||||
(when-let [handler (:action (nth options index))]
|
||||
(handler)))))
|
||||
(def dialogs (.-default rn-dependencies/dialogs))
|
||||
|
||||
(defn- show [{:keys [title options cancel-text]}]
|
||||
(let [dialog (new rn-dependencies/dialogs)]
|
||||
(.set dialog (clj->js {:title title
|
||||
(defn show [{:keys [title options cancel-text]}]
|
||||
(.. dialogs
|
||||
(showPicker title nil (clj->js {:items (mapv #(select-keys % [:label])
|
||||
options)
|
||||
:negativeText cancel-text
|
||||
:items (mapv :label options)
|
||||
:itemsCallback (callback options)}))
|
||||
(.show dialog)))
|
||||
:positiveText nil}))
|
||||
(then (fn [selected]
|
||||
(when-let [label (get-in (js->clj selected :keywordize-keys true)
|
||||
[:selectedItem :label])]
|
||||
(when-let [action (->> options
|
||||
(filter #(= label (:label %)))
|
||||
first
|
||||
:action)]
|
||||
(action)))))))
|
||||
|
|
|
|||
|
|
@ -50,4 +50,5 @@
|
|||
:bounces false
|
||||
:scales-page-to-fit platform/android?
|
||||
:style {:width @width :height (* @width k) :background-color :transparent}
|
||||
:origin-whitelist #js ["*"]
|
||||
:source {:html (html uri @width (* @width k))}}]]))))
|
||||
|
|
@ -27,9 +27,7 @@
|
|||
:bottom 0})
|
||||
|
||||
(def preview
|
||||
{:flex 1
|
||||
:justify-content :flex-end
|
||||
:align-items :center})
|
||||
{:flex 1})
|
||||
|
||||
(def corner-dimensions
|
||||
{:position :absolute
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
(def action-button #js {:default #js {:Item #js {}}})
|
||||
(def config #js {:default #js {}})
|
||||
(def camera #js {:constants #js {}})
|
||||
(def camera #js {:default #js {:constants #js {}}})
|
||||
(def dialogs #js {})
|
||||
(def dismiss-keyboard #js {})
|
||||
(def emoji-picker #js {:default #js {}})
|
||||
|
|
|
|||
Loading…
Reference in New Issue