Commit 8af3d121 by Nguyễn Thị Thúy

merge 8_Ap

parents 703e7285 4b9177f2
...@@ -8,13 +8,18 @@ import { ...@@ -8,13 +8,18 @@ import {
StatusBar, StatusBar,
TouchableWithoutFeedback, TouchableWithoutFeedback,
Keyboard, Keyboard,
ImageBackground,
Dimensions,
} from 'react-native'; } from 'react-native';
import HeaderAuthen from '../../components/Header/HeaderAuthen'; import HeaderAuthen from '../../components/Header/HeaderAuthen';
import {createMaterialTopTabNavigator} from '@react-navigation/material-top-tabs'; import {createMaterialTopTabNavigator} from '@react-navigation/material-top-tabs';
import {getFontXD} from '../../Config/Functions'; import {getFontXD, HEIGHTXD} from '../../Config/Functions';
import Login from './Login'; import Login from './Login';
import Registor from './Registor'; import Registor from './Registor';
import {ScrollView} from 'react-native-gesture-handler'; import {ScrollView} from 'react-native-gesture-handler';
import R from '../../assets/R';
const {width, height} = Dimensions.get('window');
const Tab = createMaterialTopTabNavigator(); const Tab = createMaterialTopTabNavigator();
const Authen = (props) => { const Authen = (props) => {
...@@ -25,9 +30,12 @@ const Authen = (props) => { ...@@ -25,9 +30,12 @@ const Authen = (props) => {
keyboardVerticalOffset={-50}> keyboardVerticalOffset={-50}>
<TouchableWithoutFeedback onPress={Keyboard.dismiss}> <TouchableWithoutFeedback onPress={Keyboard.dismiss}>
<ScrollView showsVerticalScrollIndicator={false}> <ScrollView showsVerticalScrollIndicator={false}>
<View style={{flex: 1}}> <StatusBar backgroundColor="transparent" translucent={true} />
<HeaderAuthen />
<View style={{flex: 1, backgroundColor: 'white'}}> <ImageBackground
resizeMode={'stretch'}
style={{width: width, height}}
source={R.images.bgLogin}>
<Tab.Navigator <Tab.Navigator
initialRouteName="Login" initialRouteName="Login"
tabBarOptions={{ tabBarOptions={{
...@@ -37,6 +45,7 @@ const Authen = (props) => { ...@@ -37,6 +45,7 @@ const Authen = (props) => {
justifyContent: 'center', justifyContent: 'center',
marginHorizontal: 40, marginHorizontal: 40,
elevation: 0, elevation: 0,
marginTop: HEIGHTXD(700),
}, },
}}> }}>
<Tab.Screen <Tab.Screen
...@@ -50,8 +59,7 @@ const Authen = (props) => { ...@@ -50,8 +59,7 @@ const Authen = (props) => {
options={{tabBarLabel: 'Đăng ký'}} options={{tabBarLabel: 'Đăng ký'}}
/> />
</Tab.Navigator> </Tab.Navigator>
</View> </ImageBackground>
</View>
</ScrollView> </ScrollView>
</TouchableWithoutFeedback> </TouchableWithoutFeedback>
</KeyboardAvoidingView> </KeyboardAvoidingView>
......
...@@ -103,8 +103,7 @@ const Registor = (props) => { ...@@ -103,8 +103,7 @@ const Registor = (props) => {
<View <View
style={{ style={{
marginVertical: 20, marginTop: 30,
alignItems: 'center', alignItems: 'center',
}}> }}>
<TouchableOpacity onPress={registorClick} style={styles.wrapLogin}> <TouchableOpacity onPress={registorClick} style={styles.wrapLogin}>
......
...@@ -11,6 +11,7 @@ const DepositView = (props) => { ...@@ -11,6 +11,7 @@ const DepositView = (props) => {
<HeaderBack isWhite={true} title={'Chi tiết'} /> <HeaderBack isWhite={true} title={'Chi tiết'} />
<WebView <WebView
androidHardwareAccelerationDisabled={true} androidHardwareAccelerationDisabled={true}
domStorageEnabled={false}
source={{ source={{
uri: uri:
root + 'api/v1/posts/detail/web-view?id=' + props.route.params.id, root + 'api/v1/posts/detail/web-view?id=' + props.route.params.id,
......
...@@ -13,6 +13,7 @@ const NewFeed = (props) => { ...@@ -13,6 +13,7 @@ const NewFeed = (props) => {
}}> }}>
<WebView <WebView
androidHardwareAccelerationDisabled={true} androidHardwareAccelerationDisabled={true}
domStorageEnabled={false}
style={{height: '100%', width: '100%'}} style={{height: '100%', width: '100%'}}
source={{ source={{
uri: 'http://api.dcvinvest.com/webview/tradingview/price', uri: 'http://api.dcvinvest.com/webview/tradingview/price',
......
...@@ -8,6 +8,7 @@ const Trading = (props) => { ...@@ -8,6 +8,7 @@ const Trading = (props) => {
<WebView <WebView
androidHardwareAccelerationDisabled={true} androidHardwareAccelerationDisabled={true}
style={{height: '100%', width: '100%'}} style={{height: '100%', width: '100%'}}
domStorageEnabled={false}
source={{ source={{
uri: uri:
'http://api.dcvinvest.com/webview/tradingview/chart?height=' + 'http://api.dcvinvest.com/webview/tradingview/chart?height=' +
......
...@@ -62,7 +62,7 @@ const images = { ...@@ -62,7 +62,7 @@ const images = {
iconBtnGreen: require('./images/iconBtnGreen.png'), iconBtnGreen: require('./images/iconBtnGreen.png'),
iconCheck: require('./images/iconCheck.png'), iconCheck: require('./images/iconCheck.png'),
bgmedia: require('./images/bgmedia.jpeg'), bgmedia: require('./images/bgmedia.jpeg'),
login_bg: require('./images/login_bg.png'), bgLogin: require('./images/bgLogin.png'),
}; };
export default images; export default images;
Markdown is supported
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