Commit 733d2536 authored by YJ's avatar YJ
Browse files

fix: wrap screens in appcontianer

parent 926c16ad
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -27,7 +27,6 @@
"react-native": "0.60.3",
"react-native-camera": "^2.1.1",
"react-native-gesture-handler": "^1.3.0",
"react-native-keyboard-aware-scroll-view": "^0.8.0",
"react-native-markdown-renderer": "^3.2.8",
"react-native-popup-menu": "^0.15.6",
"react-native-secure-storage": "git+https://github.com/debris/react-native-secure-storage.git",
......
......@@ -20,6 +20,7 @@
import React, { Component } from 'react';
import { StatusBar } from 'react-native';
import {
createAppContainer,
createStackNavigator,
HeaderBackButton,
withNavigation
......@@ -59,7 +60,7 @@ export default class App extends Component {
<MenuProvider backHandler={true}>
<StatusBar barStyle="light-content" />
<Background />
<Screens />
<ScreensContainer />
</MenuProvider>
</UnstatedProvider>
);
......@@ -219,3 +220,5 @@ const Screens = createStackNavigator(
mode: 'card'
}
);
const ScreensContainer = createAppContainer(Screens);
......@@ -17,8 +17,7 @@
'use strict';
import React from 'react';
import { StyleSheet, Text, View } from 'react-native';
import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
import { StyleSheet, ScrollView, Text, View } from 'react-native';
import { Subscribe } from 'unstated';
import colors from '../colors';
import AccountIconChooser from '../components/AccountIconChooser';
......@@ -55,8 +54,9 @@ class AccountNewView extends React.Component {
return (
<View style={styles.body}>
<Background />
<KeyboardAwareScrollView
<ScrollView
style={{ padding: 20 }}
keyboardDismissMode="on-drag"
keyboardShouldPersistTaps="handled"
containerStyle={styles.bodyContainer}
>
......@@ -122,7 +122,7 @@ class AccountNewView extends React.Component {
}}
/>
</View>
</KeyboardAwareScrollView>
</ScrollView>
</View>
);
}
......
......@@ -17,8 +17,7 @@
'use strict';
import React from 'react';
import { Alert, findNodeHandle, StyleSheet, Text, View } from 'react-native';
import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
import { Alert, findNodeHandle, StyleSheet, ScrollView, Text, View } from 'react-native';
import { Subscribe } from 'unstated';
import colors from '../colors';
import AccountCard from '../components/AccountCard';
......@@ -58,7 +57,7 @@ class AccountRecoverView extends React.Component {
return (
<View style={styles.body}>
<Background />
<KeyboardAwareScrollView
<ScrollView
style={{ padding: 20 }}
containerStyle={styles.bodyContainer}
enableOnAndroid
......@@ -159,7 +158,7 @@ class AccountRecoverView extends React.Component {
});
}}
/>
</KeyboardAwareScrollView>
</ScrollView>
</View>
);
}
......
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