Unverified Commit 3813d483 authored by YJ's avatar YJ Committed by GitHub
Browse files

Merge pull request #251 from paritytech/tbaut-netinfo-and-status-bar

Status bar fixes
parents cf738418 7f59f773
......@@ -162,6 +162,7 @@ android {
}
dependencies {
implementation project(':@react-native-community_netinfo')
implementation project(':react-native-camera')
implementation project(':react-native-secure-storage')
implementation fileTree(dir: "libs", include: ["*.jar"])
......
......@@ -3,6 +3,7 @@ package io.parity.signer;
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;
......@@ -27,6 +28,7 @@ public class MainApplication extends Application implements ReactApplication {
protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList(
new MainReactPackage(),
new NetInfoPackage(),
new RNCameraPackage(),
new RNSecureStoragePackage(),
new EthkeyBridgePackage(),
......
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'
......
......@@ -62,6 +62,7 @@
EDCE1EC0CA1249279F03F2E2 /* Roboto-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E3DA81F74A0847378E71E280 /* Roboto-Medium.ttf */; };
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 */
......@@ -408,6 +409,8 @@
F198D2DE15BC4461B2308E3C /* Manifold-CF-Extra-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Manifold-CF-Extra-Bold.otf"; path = "../res/fonts/Manifold-CF-Extra-Bold.otf"; sourceTree = "<group>"; };
F2FB2DDD90964B3BB1FC813C /* 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 = "<group>"; };
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 */
......@@ -439,6 +442,7 @@
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
BB1BF6E8C2204EDEA0DEFB71 /* libRNSecureStorage.a in Frameworks */,
BC281020BE04470E86371E16 /* libRNCNetInfo.a in Frameworks */,
A174652260CA4A7785BEC78B /* libRNCamera.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -676,6 +680,7 @@
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
8CC63279C525400CA35EAF96 /* RNSecureStorage.xcodeproj */,
28E4C30CA68041C98EE1012E /* RNCNetInfo.xcodeproj */,
8A220E0ECC914D32B35EF7FC /* RNCamera.xcodeproj */,
);
name = Libraries;
......@@ -1296,6 +1301,7 @@
"$(SRCROOT)/../node_modules/react-native-camera/ios",
"$(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;
......@@ -1331,6 +1337,7 @@
"$(SRCROOT)/../node_modules/react-native-camera/ios",
"$(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;
......
......@@ -19,6 +19,7 @@
"commit": "commit-wizard"
},
"dependencies": {
"@react-native-community/netinfo": "^4.1.1",
"bignumber.js": "^4.0.0",
"debounce": "^1.0.0",
"hoist-non-react-statics": "^2.5.0",
......
......@@ -75,12 +75,11 @@ const globalStackNavigationOptions = {
height: 60,
paddingTop: 0,
paddingBottom: 0,
padding: 14,
borderBottomWidth: 0.5,
borderBottomColor: colors.bg_text_sec
},
headerTitleStyle: {
display: 'none'
display: 'none',
},
headerBackTitleStyle: {
fontSize: 20,
......@@ -118,17 +117,16 @@ const Screens = createStackNavigator(
Security: {
screen: Security,
navigationOptions: {
headerTintColor: colors.card_bg,
headerLeft: <SecurityHeaderBackButton />,
headerLeft: <SecurityHeaderBackButton/>,
headerRight: null
}
}
},
{
{
defaultNavigationOptions: globalStackNavigationOptions,
headerMode: 'screen',
navigationOptions: globalStackNavigationOptions
}
)
),
},
TocAndPrivacyPolicy: {
screen: createStackNavigator(
......@@ -144,7 +142,6 @@ const Screens = createStackNavigator(
}
},
{
navigationOptions: globalStackNavigationOptions,
initialRouteParams: {
isWelcome: true
}
......@@ -206,8 +203,8 @@ const Screens = createStackNavigator(
screen: AccountEdit
}
},
{
navigationOptions: globalStackNavigationOptions,
{
defaultNavigationOptions: globalStackNavigationOptions,
initialRouteParams: {
isWelcome: true
}
......
......@@ -6,7 +6,7 @@ export default class HeaderLeftHome extends React.PureComponent {
render() {
return (
<View
style={{ flexDirection: 'row', alignItems: 'center' }}
style={{ flexDirection: 'row', alignItems: 'center', paddingLeft: 14 }}
accessibilityComponentType="button"
accessibilityTraits="button"
testID="header-back"
......@@ -26,7 +26,6 @@ const styles = StyleSheet.create({
height: 60,
flexDirection: 'row',
alignItems: 'center',
padding: 14,
borderBottomWidth: 0.5,
borderBottomColor: colors.bg_text_sec
},
......@@ -39,7 +38,6 @@ const styles = StyleSheet.create({
paddingLeft: 10,
fontSize: 25,
fontFamily: 'Manifold CF',
fontWeight: 'bold',
color: colors.bg_text
}
});
......@@ -27,7 +27,7 @@ export default class SecurityHeader extends React.Component {
render() {
return (
<Subscribe to={[SecurityStore]}>
{securityStore => (
{securityStore => (
<SecurityHeaderView level={securityStore.getLevel()} />
)}
</Subscribe>
......@@ -72,7 +72,8 @@ const styles = StyleSheet.create({
fontSize: 17,
fontFamily: 'Roboto',
fontWeight: 'bold',
color: colors.bg_text_positive
color: colors.bg_text_positive,
paddingRight: 14,
}
});
......
......@@ -15,7 +15,7 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
// @flow
import { NetInfo } from 'react-native';
import NetInfo from '@react-native-community/netinfo';
import { Container } from 'unstated';
type SecurityState = {
......
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