mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-03-26 08:55:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

FIX: better iphone8 support

Browse source
This commit is contained in:
Overtorment 2018-07-17 23:43:23 +01:00
parent d1f7b4912b
commit 57a083d52c
2 changed files with 32 additions and 7 deletions

16
BlueComponents.js
View file

@ -2,7 +2,7 @@
import React, { Component } from 'react';
import { SafeAreaView } from 'react-navigation';
import Ionicons from 'react-native-vector-icons/Ionicons';
import { LinearGradient } from 'expo';
import { LinearGradient, Constants } from 'expo';
import { Icon, Button, FormLabel, FormInput, Card, Text, Header, List, ListItem } from 'react-native-elements';
import { TouchableOpacity, ActivityIndicator, View, StyleSheet, Dimensions, Image } from 'react-native';
import { WatchOnlyWallet, LegacyWallet } from './class';
@ -221,7 +221,7 @@ export class BlueFormInput extends Component {
return (
<FormInput
{...this.props}
inputStyle={{ color: '#81868e' }}
inputStyle={{ color: BlueApp.settings.foregroundColor }}
containerStyle={{
marginTop: 5,
borderColor: '#d2d2d2',
@ -242,11 +242,15 @@ export class BlueFormInputAddress extends Component {
{...this.props}
inputStyle={{
color: BlueApp.settings.foregroundColor,
fontSize: (isIpad && 10) || 12,
fontSize: (isIpad && 10) || ((is.iphone8() && 12) || 14),
}}
containerStyle={{
borderBottomColor: BlueApp.settings.foregroundColor,
marginTop: 5,
borderColor: '#d2d2d2',
borderBottomColor: '#d2d2d2',
borderWidth: 0.5,
borderBottomWidth: 0.5,
backgroundColor: '#f5f5f5',
}}
/>
);
@ -383,6 +387,10 @@ export class is {
static ipad() {
return isIpad;
}
static iphone8() {
return Constants.platform.ios.platform === 'iPhone10,4';
}
}
export class BlueSpacing20 extends Component {

23
screen/about.js
View file

@ -1,10 +1,20 @@
import React, { Component } from 'react';
import { Constants } from 'expo';
import { ScrollView, Linking, Dimensions } from 'react-native';
import { BlueLoading, BlueSpacing20, BlueButton, SafeBlueArea, BlueCard, BlueText, BlueHeaderDefaultSub } from '../BlueComponents';
import {
BlueTextCentered,
BlueLoading,
BlueSpacing20,
BlueButton,
SafeBlueArea,
BlueCard,
BlueText,
BlueHeaderDefaultSub,
} from '../BlueComponents';
import PropTypes from 'prop-types';
/** @type {AppStorage} */
let BlueApp = require('../BlueApp');
const { height } = Dimensions.get('window');
const { width, height } = Dimensions.get('window');
export default class About extends Component {
static navigationOptions = {
@ -34,7 +44,7 @@ export default class About extends Component {
<BlueHeaderDefaultSub leftText={'about'} onClose={() => this.props.navigation.goBack()} />
<BlueCard>
<ScrollView maxHeight={height - 150}>
<ScrollView maxHeight={height - 100}>
<BlueText h4>BlueWallet is free and opensource Bitcoin wallet. Licensed MIT.</BlueText>
<BlueButton
@ -93,6 +103,13 @@ export default class About extends Component {
}}
title="Run self test"
/>
<BlueTextCentered />
<BlueTextCentered>
w, h = {width}, {height}
</BlueTextCentered>
<BlueTextCentered>
{Constants.platform.ios.model} ({Constants.platform.ios.platform})
</BlueTextCentered>
</ScrollView>
</BlueCard>
</SafeBlueArea>