Skip to content
GitLab
Commit a7518abe authored by Thibaut Sardan's avatar Thibaut Sardan
Browse files

fix(): fix conflicts

parents 7c15ca91 cf738418
Show whitespace changes
Inline Side-by-side
.gitignore
View file @ a7518abe
yarn-error.log
yarn.lock
package-lock.json
# NDK
NDK/
......
android/app/build.gradle
View file @ a7518abe
......@@ -162,7 +162,11 @@ android {
}
dependencies {
<<<<<<< HEAD
implementation project(':@react-native-community_netinfo')
=======
implementation project(':react-native-camera')
>>>>>>> yj-bump-reactnative
implementation project(':react-native-secure-storage')
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation 'androidx.appcompat:appcompat:1.0.0'
......
android/app/src/main/assets/index.android.bundle 0 → 100644
View file @ a7518abe
This source diff could not be displayed because it is too large. You can view the blob instead.
android/app/src/main/java/io/parity/signer/MainApplication.java
View file @ a7518abe
......@@ -4,6 +4,7 @@ import android.app.Application;
import com.facebook.react.ReactApplication;
import com.reactnativecommunity.netinfo.NetInfoPackage;
import org.reactnative.camera.RNCameraPackage;
import com.reactlibrary.RNSecureStoragePackage;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
......@@ -28,6 +29,7 @@ public class MainApplication extends Application implements ReactApplication {
return Arrays.<ReactPackage>asList(
new MainReactPackage(),
new NetInfoPackage(),
new RNCameraPackage(),
new RNSecureStoragePackage(),
new EthkeyBridgePackage(),
new RNGestureHandlerPackage()
......
android/settings.gradle
View file @ a7518abe
rootProject.name = 'Parity Signer'
include ':@react-native-community_netinfo'
project(':@react-native-community_netinfo').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/netinfo/android')
include ':react-native-camera'
project(':react-native-camera').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-camera/android')
include ':react-native-secure-storage'
project(':react-native-secure-storage').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-secure-storage/android')
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
......
ios/NativeSigner.xcodeproj/project.pbxproj
View file @ a7518abe
......@@ -32,6 +32,7 @@
1F73EE2721777A1D00706E91 /* libsigner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F426F39208B7CC000CA43DB /* libsigner.a */; };
399D1B0E22DDDE1B00A815EB /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 399D1B0D22DDDE1B00A815EB /* JavaScriptCore.framework */; };
39D32408FC4A464384BA5A5C /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E8E0FEBC36F54D78A81C1639 /* SimpleLineIcons.ttf */; };
39DA351122DDFE0300334898 /* libRNGestureHandler.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 39DA350E22DDFDF200334898 /* libRNGestureHandler.a */; };
3C31DDCB4CD0465084344D5F /* Manifold-CF-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 624E6C0FF4A64A97A7D51BEF /* Manifold-CF-Bold.otf */; };
3D7A98D07DE443E381067D3A /* Roboto-BlackItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 183C9D1307934735A4129705 /* Roboto-BlackItalic.ttf */; };
423E02567C044AF6832B2388 /* Roboto-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 53880E8FF84C419EB11ACA5C /* Roboto-Light.ttf */; };
......@@ -62,6 +63,7 @@
EE896FB251B94030AC713B6F /* Roboto-LightItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8C99AB759A004CEB88AC4455 /* Roboto-LightItalic.ttf */; };
F1569210427145DEBBB5B898 /* Manifold-CF-Extra-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = F198D2DE15BC4461B2308E3C /* Manifold-CF-Extra-Bold.otf */; };
BC281020BE04470E86371E16 /* libRNCNetInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F78A5174AF744169974591A9 /* libRNCNetInfo.a */; };
A174652260CA4A7785BEC78B /* libRNCamera.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 756B74B1A2EC494B84EF8056 /* libRNCamera.a */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
......@@ -219,6 +221,20 @@
remoteGlobalIDString = 134814201AA4EA6300B7C361;
remoteInfo = RNSecureStorage;
};
39DA350D22DDFDF200334898 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 39DA350822DDFDF200334898 /* RNGestureHandler.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 134814201AA4EA6300B7C361;
remoteInfo = RNGestureHandler;
};
39DA350F22DDFDF200334898 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 39DA350822DDFDF200334898 /* RNGestureHandler.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = B5C32A36220C603B000FFB8D;
remoteInfo = "RNGestureHandler-tvOS";
};
3DAD3E831DF850E9000B6D8A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
......@@ -360,6 +376,7 @@
2EC5DDFE054D4A68B1B7D900 /* Manifold-CF.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Manifold-CF.otf"; path = "../res/fonts/Manifold-CF.otf"; sourceTree = "<group>"; };
31AAF2CB51C04377BFC79634 /* Manifold-CF-Light.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Manifold-CF-Light.otf"; path = "../res/fonts/Manifold-CF-Light.otf"; sourceTree = "<group>"; };
399D1B0D22DDDE1B00A815EB /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
39DA350822DDFDF200334898 /* RNGestureHandler.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNGestureHandler.xcodeproj; path = "../node_modules/react-native-gesture-handler/ios/RNGestureHandler.xcodeproj"; sourceTree = "<group>"; };
3DB51A3702D94B6BA025DDE6 /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Brands.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = "<group>"; };
42D126E4D4D84C4784E2377B /* Roboto-Italic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Italic.ttf"; path = "../res/fonts/Roboto-Italic.ttf"; sourceTree = "<group>"; };
431C560691184DF8B5347066 /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Solid.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf"; sourceTree = "<group>"; };
......@@ -394,6 +411,8 @@
FAE70C1AAEEA45159C8CB0EA /* Roboto-ThinItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-ThinItalic.ttf"; path = "../res/fonts/Roboto-ThinItalic.ttf"; sourceTree = "<group>"; };
28E4C30CA68041C98EE1012E /* RNCNetInfo.xcodeproj */ = {isa = PBXFileReference; name = "RNCNetInfo.xcodeproj"; path = "../node_modules/@react-native-community/netinfo/ios/RNCNetInfo.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
F78A5174AF744169974591A9 /* libRNCNetInfo.a */ = {isa = PBXFileReference; name = "libRNCNetInfo.a"; path = "libRNCNetInfo.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
8A220E0ECC914D32B35EF7FC /* RNCamera.xcodeproj */ = {isa = PBXFileReference; name = "RNCamera.xcodeproj"; path = "../node_modules/react-native-camera/ios/RNCamera.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
756B74B1A2EC494B84EF8056 /* libRNCamera.a */ = {isa = PBXFileReference; name = "libRNCamera.a"; path = "libRNCamera.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -409,6 +428,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
39DA351122DDFE0300334898 /* libRNGestureHandler.a in Frameworks */,
399D1B0E22DDDE1B00A815EB /* JavaScriptCore.framework in Frameworks */,
1F73EE2721777A1D00706E91 /* libsigner.a in Frameworks */,
1F426F95208D334200CA43DB /* libReact.a in Frameworks */,
......@@ -423,6 +443,7 @@
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
BB1BF6E8C2204EDEA0DEFB71 /* libRNSecureStorage.a in Frameworks */,
BC281020BE04470E86371E16 /* libRNCNetInfo.a in Frameworks */,
A174652260CA4A7785BEC78B /* libRNCamera.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -576,6 +597,15 @@
name = Products;
sourceTree = "<group>";
};
39DA350922DDFDF200334898 /* Products */ = {
isa = PBXGroup;
children = (
39DA350E22DDFDF200334898 /* libRNGestureHandler.a */,
39DA351022DDFDF200334898 /* libRNGestureHandler-tvOS.a */,
);
name = Products;
sourceTree = "<group>";
};
5E91572E1DD0AC6500FF2AA8 /* Products */ = {
isa = PBXGroup;
children = (
......@@ -637,6 +667,7 @@
832341AE1AAA6A7D00B99B32 /* Libraries */ = {
isa = PBXGroup;
children = (
39DA350822DDFDF200334898 /* RNGestureHandler.xcodeproj */,
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */,
146833FF1AC3E56700842450 /* React.xcodeproj */,
00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */,
......@@ -650,6 +681,7 @@
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
8CC63279C525400CA35EAF96 /* RNSecureStorage.xcodeproj */,
28E4C30CA68041C98EE1012E /* RNCNetInfo.xcodeproj */,
8A220E0ECC914D32B35EF7FC /* RNCamera.xcodeproj */,
);
name = Libraries;
sourceTree = "<group>";
......@@ -804,6 +836,10 @@
ProductGroup = 146834001AC3E56700842450 /* Products */;
ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */;
},
{
ProductGroup = 39DA350922DDFDF200334898 /* Products */;
ProjectRef = 39DA350822DDFDF200334898 /* RNGestureHandler.xcodeproj */;
},
{
ProductGroup = 399D1B0822DDD09600A815EB /* Products */;
ProjectRef = 8CC63279C525400CA35EAF96 /* RNSecureStorage.xcodeproj */;
......@@ -965,6 +1001,20 @@
remoteRef = 399D1B0B22DDD09700A815EB /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
39DA350E22DDFDF200334898 /* libRNGestureHandler.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libRNGestureHandler.a;
remoteRef = 39DA350D22DDFDF200334898 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
39DA351022DDFDF200334898 /* libRNGestureHandler-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libRNGestureHandler-tvOS.a";
remoteRef = 39DA350F22DDFDF200334898 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
3DAD3E841DF850E9000B6D8A /* libRCTImage-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
......@@ -1252,6 +1302,7 @@
"$(SRCROOT)/../rust/signer",
"$(SRCROOT)/../node_modules/react-native-secure-storage/ios/**",
"$(SRCROOT)/../node_modules/@react-native-community/netinfo/ios",
"$(SRCROOT)/../node_modules/react-native-camera/ios/**",
);
INFOPLIST_FILE = NativeSigner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
......@@ -1287,6 +1338,7 @@
"$(SRCROOT)/../rust/signer",
"$(SRCROOT)/../node_modules/react-native-secure-storage/ios/**",
"$(SRCROOT)/../node_modules/@react-native-community/netinfo/ios",
"$(SRCROOT)/../node_modules/react-native-camera/ios/**",
);
INFOPLIST_FILE = NativeSigner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
......
ios/NativeSigner/AppDelegate.m
View file @ a7518abe
......@@ -18,7 +18,7 @@
{
RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge
moduleName:@"RnDiffApp"
moduleName:@"NativeSigner"
initialProperties:nil];
rootView.backgroundColor = [[UIColor alloc] initWithRed:1.0f green:1.0f blue:1.0f alpha:1];
......
src/screens/QrScanner.js
View file @ a7518abe
......@@ -113,7 +113,11 @@ export class QrScannerView extends React.PureComponent {
return <View style={styles.inactive} />;
}
return (
<RNCamera onBarCodeRead={this.props.onBarCodeRead} style={styles.view}>
<RNCamera
captureAudio={false}
onBarCodeRead={this.props.onBarCodeRead}
style={styles.view}
>
<View style={styles.body}>
<View style={styles.top}>
<Text style={styles.titleTop}>SCANNER</Text>
......
yarn.lock 0 → 100644
View file @ a7518abe
This source diff could not be displayed because it is too large. You can view the blob instead.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment