mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-01-18 21:35:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Statusbar barstyle

Browse Source
This commit is contained in:
Marcos Rodriguez Vélez 2021-09-27 12:40:58 -04:00
parent 4f45ad1147
commit 395430fdb4
No known key found for this signature in database
GPG Key ID: 0D64671698D11C5C
12 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/themes.ts
View File

@ -4,6 +4,7 @@ import { Appearance } from 'react-native';
export const BlueDefaultTheme = {
...DefaultTheme,
closeImage: require('../img/close.png'),
barStyle: 'dark-content',
scanImage: require('../img/scan.png'),
colors: {
...DefaultTheme.colors,
@ -73,6 +74,7 @@ export const BlueDarkTheme: Theme = {
...DarkTheme,
closeImage: require('../img/close-white.png'),
scanImage: require('../img/scan-white.png'),
barStyle: 'light-content',
colors: {
...BlueDefaultTheme.colors,
...DarkTheme.colors,

3
screen/settings/settings.js
View File

@ -1,5 +1,5 @@
import React, { useContext } from 'react';
import { ScrollView, StyleSheet, StatusBar, Platform, View } from 'react-native';
import { ScrollView, StyleSheet, Platform, View } from 'react-native';
import { useNavigation } from '@react-navigation/native';
import navigationStyle from '../../components/navigationStyle';
@ -22,7 +22,6 @@ const Settings = () => {
return (
<>
<View />
<StatusBar barStyle="default" />
<ScrollView style={styles.root}>
{Platform.OS === 'android' ? <BlueHeaderDefaultSub leftText={loc.settings.header} /> : <></>}
<BlueListItem title={loc.settings.general} onPress={() => navigate('GeneralSettings')} testID="GeneralSettings" chevron />

2
screen/wallets/add.js
View File

@ -258,7 +258,7 @@ const WalletsAdd = () => {
return (
<ScrollView style={stylesHook.root}>
<StatusBar barStyle="light-content" />
<StatusBar barStyle={Platform.select({ ios: 'light-content', default: 'dark-content' })} />
<BlueSpacing20 />
<KeyboardAvoidingView enabled behavior={Platform.OS === 'ios' ? 'padding' : null} keyboardVerticalOffset={62}>
<BlueFormLabel>{loc.wallets.add_wallet_name}</BlueFormLabel>

3
screen/wallets/addMultisig.js
View File

@ -1,5 +1,5 @@
import React, { useState, useRef, useEffect, useContext } from 'react';
import { Keyboard, KeyboardAvoidingView, Platform, StatusBar, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
import { Keyboard, KeyboardAvoidingView, Platform, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
import LottieView from 'lottie-react-native';
import { Icon } from 'react-native-elements';
import { useNavigation, useRoute, useTheme } from '@react-navigation/native';
@ -185,7 +185,6 @@ const WalletsAddMultisig = () => {
return (
<SafeAreaView style={stylesHook.root}>
<StatusBar barStyle="light-content" />
<View style={styles.descriptionContainer}>
<View style={styles.imageWrapper}>
<LottieView source={require('../../img/msvault.json')} autoPlay ref={loadingAnimation} loop={false} />

3
screen/wallets/addMultisigHelp.js
View File

@ -1,5 +1,5 @@
import React, { useState, useEffect } from 'react';
import { Image, View, Text, ScrollView, StyleSheet } from 'react-native';
import { Image, View, Text, ScrollView, StyleSheet, StatusBar } from 'react-native';
import { useTheme } from '@react-navigation/native';
import { SafeBlueArea, BlueLoading } from '../../BlueComponents';
import navigationStyle from '../../components/navigationStyle';
@ -39,6 +39,7 @@ const WalletsAddMultisigHelp = () => {
<BlueLoading />
) : (
<SafeBlueArea style={stylesHook.root}>
<StatusBar barStyle="light-content" />
<ScrollView>
<View style={[styles.intro, stylesHook.intro]}>
<Text style={[styles.introTitle, stylesHook.introTitle]}>{loc.multisig.ms_help_title}</Text>

3
screen/wallets/addMultisigStep2.js
View File

@ -8,7 +8,6 @@ import {
KeyboardAvoidingView,
LayoutAnimation,
Platform,
StatusBar,
StyleSheet,
Text,
TouchableOpacity,
@ -628,8 +627,6 @@ const WalletsAddMultisigStep2 = () => {
return (
<View style={[styles.root, stylesHook.root]}>
<StatusBar barStyle="light-content" />
{renderHelp()}
<View style={[styles.wrapBox]}>
<FlatList data={data.current} renderItem={_renderKeyItem} keyExtractor={(_item, index) => `${index}`} />

3
screen/wallets/import.js
View File

@ -1,5 +1,5 @@
import React, { useEffect, useState, useContext } from 'react';
import { Platform, View, Keyboard, StatusBar, StyleSheet, Switch, TouchableWithoutFeedback } from 'react-native';
import { Platform, View, Keyboard, StyleSheet, Switch, TouchableWithoutFeedback } from 'react-native';
import { useNavigation, useRoute, useTheme } from '@react-navigation/native';
import {
@ -112,7 +112,6 @@ const WalletsImport = () => {
return (
<SafeBlueArea style={styles.root}>
<StatusBar barStyle="light-content" />
<BlueSpacing20 />
<TouchableWithoutFeedback onPress={speedBackdoorTap} testID="SpeedBackdoor">
<BlueFormLabel>{loc.wallets.import_explanation}</BlueFormLabel>

3
screen/wallets/importDiscovery.js
View File

@ -1,5 +1,5 @@
import React, { useContext, useEffect, useState, useRef, useMemo } from 'react';
import { ActivityIndicator, Alert, LayoutAnimation, StatusBar, StyleSheet, Text, View, FlatList } from 'react-native';
import { ActivityIndicator, Alert, LayoutAnimation, StyleSheet, Text, View, FlatList } from 'react-native';
import IdleTimerManager from 'react-native-idle-timer';
import { useNavigation, useRoute, useTheme } from '@react-navigation/native';
import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
@ -121,7 +121,6 @@ const ImportWalletDiscovery = () => {
return (
<SafeBlueArea style={[styles.root, stylesHook.root]}>
<StatusBar barStyle="light-content" />
<BlueSpacing20 />
<BlueFormLabel>{loc.wallets.import_discovery_subtitle}</BlueFormLabel>
<BlueSpacing20 />

6
screen/wallets/list.js
View File

@ -11,7 +11,6 @@ import {
Dimensions,
useWindowDimensions,
findNodeHandle,
useColorScheme,
I18nManager,
} from 'react-native';
import { BlueHeaderDefaultMain } from '../../BlueComponents';
@ -37,12 +36,11 @@ const WalletsListSections = { CAROUSEL: 'CAROUSEL', TRANSACTIONS: 'TRANSACTIONS'
const WalletsList = () => {
const walletsCarousel = useRef();
const currentWalletIndex = useRef(0);
const colorScheme = useColorScheme();
const { wallets, getTransactions, getBalance, refreshAllWalletTransactions, setSelectedWallet, isElectrumDisabled } = useContext(
BlueStorageContext,
);
const { width } = useWindowDimensions();
const { colors, scanImage } = useTheme();
const { colors, scanImage, barStyle } = useTheme();
const { navigate, setOptions } = useNavigation();
const isFocused = useIsFocused();
const routeName = useRoute().name;
@ -376,7 +374,7 @@ const WalletsList = () => {
return (
<View style={styles.root} onLayout={onLayout}>
<StatusBar barStyle={colorScheme === 'dark' ? 'light-content' : 'dark-content'} backgroundColor="transparent" translucent animated />
<StatusBar barStyle={barStyle} backgroundColor="transparent" translucent animated />
<View style={[styles.walletsListWrapper, stylesHook.walletsListWrapper]}>
<SectionList
contentInsetAdjustmentBehavior="automatic"

3
screen/wallets/pleaseBackup.js
View File

@ -1,5 +1,5 @@
import React, { useEffect, useState, useCallback, useContext } from 'react';
import { ActivityIndicator, View, BackHandler, Text, ScrollView, StyleSheet, StatusBar, I18nManager } from 'react-native';
import { ActivityIndicator, View, BackHandler, Text, ScrollView, StyleSheet, I18nManager } from 'react-native';
import { useNavigation, useRoute, useTheme } from '@react-navigation/native';
import { SafeBlueArea, BlueButton } from '../../BlueComponents';
@ -71,7 +71,6 @@ const PleaseBackup = () => {
</View>
) : (
<SafeBlueArea style={stylesHook.flex}>
<StatusBar barStyle="light-content" />
<ScrollView contentContainerStyle={styles.flex} testID="PleaseBackupScrollView">
<View style={styles.please}>
<Text style={[styles.pleaseText, stylesHook.pleaseText]}>{loc.pleasebackup.text}</Text>

3
screen/wallets/pleaseBackupLNDHub.js
View File

@ -1,6 +1,6 @@
import React, { useCallback, useContext, useEffect, useState } from 'react';
import { useNavigation, useRoute, useTheme } from '@react-navigation/native';
import { View, StyleSheet, ScrollView, BackHandler, StatusBar } from 'react-native';
import { View, StyleSheet, ScrollView, BackHandler } from 'react-native';
import { BlueButton, BlueCopyTextToClipboard, BlueSpacing20, BlueTextCentered, SafeBlueArea } from '../../BlueComponents';
import navigationStyle from '../../components/navigationStyle';
@ -51,7 +51,6 @@ const PleaseBackupLNDHub = () => {
};
return (
<SafeBlueArea style={styles.root} onLayout={onLayout}>
<StatusBar barStyle="light-content" />
<ScrollView centerContent contentContainerStyle={styles.scrollViewContent}>
<View>
<BlueTextCentered>{loc.pleasebackup.text_lnd}</BlueTextCentered>

3
screen/wallets/pleaseBackupLdk.js
View File

@ -1,6 +1,6 @@
import React, { useCallback, useContext, useEffect } from 'react';
import { useNavigation, useRoute, useTheme } from '@react-navigation/native';
import { View, useWindowDimensions, StyleSheet, BackHandler, StatusBar, ScrollView } from 'react-native';
import { View, useWindowDimensions, StyleSheet, BackHandler, ScrollView } from 'react-native';
import QRCode from 'react-native-qrcode-svg';
import { BlueButton, BlueCopyTextToClipboard, BlueSpacing20, BlueTextCentered, SafeBlueArea } from '../../BlueComponents';
import navigationStyle from '../../components/navigationStyle';
@ -49,7 +49,6 @@ const PleaseBackupLdk = () => {
const pop = () => navigation.dangerouslyGetParent().pop();
return (
<SafeBlueArea style={styles.root}>
<StatusBar barStyle="light-content" />
<ScrollView centerContent contentContainerStyle={styles.scrollViewContent}>
<View>
<BlueTextCentered>Please save this wallet backup. It allows you to restore all your channels on other device.</BlueTextCentered>