merge 8_Ap

src/Screens/Authen/Authen.js

@@ -8,13 +8,18 @@ import {
   StatusBar,
   TouchableWithoutFeedback,
   Keyboard,
+  ImageBackground,
+  Dimensions,
 } from 'react-native';
 import HeaderAuthen from '../../components/Header/HeaderAuthen';
 import {createMaterialTopTabNavigator} from '@react-navigation/material-top-tabs';
-import {getFontXD} from '../../Config/Functions';
+import {getFontXD, HEIGHTXD} from '../../Config/Functions';
 import Login from './Login';
 import Registor from './Registor';
 import {ScrollView} from 'react-native-gesture-handler';
+import R from '../../assets/R';
+
+const {width, height} = Dimensions.get('window');
 
 const Tab = createMaterialTopTabNavigator();
 const Authen = (props) => {
@@ -25,33 +30,36 @@ const Authen = (props) => {
       keyboardVerticalOffset={-50}>
       <TouchableWithoutFeedback onPress={Keyboard.dismiss}>
         <ScrollView showsVerticalScrollIndicator={false}>
-          <View style={{flex: 1}}>
-            <HeaderAuthen />
-            <View style={{flex: 1, backgroundColor: 'white'}}>
-              <Tab.Navigator
-                initialRouteName="Login"
-                tabBarOptions={{
-                  activeTintColor: '#0045C8',
-                  labelStyle: {fontSize: getFontXD(42), fontWeight: '700'},
-                  style: {
-                    justifyContent: 'center',
-                    marginHorizontal: 40,
-                    elevation: 0,
-                  },
-                }}>
-                <Tab.Screen
-                  name="LOGIN"
-                  component={Login}
-                  options={{tabBarLabel: 'Đăng nhập'}}
-                />
-                <Tab.Screen
-                  name="REGISTOR"
-                  component={Registor}
-                  options={{tabBarLabel: 'Đăng ký'}}
-                />
-              </Tab.Navigator>
-            </View>
-          </View>
+          <StatusBar backgroundColor="transparent" translucent={true} />
+
+          <ImageBackground
+            resizeMode={'stretch'}
+            style={{width: width, height}}
+            source={R.images.bgLogin}>
+            <Tab.Navigator
+              initialRouteName="Login"
+              tabBarOptions={{
+                activeTintColor: '#0045C8',
+                labelStyle: {fontSize: getFontXD(42), fontWeight: '700'},
+                style: {
+                  justifyContent: 'center',
+                  marginHorizontal: 40,
+                  elevation: 0,
+                  marginTop: HEIGHTXD(700),
+                },
+              }}>
+              <Tab.Screen
+                name="LOGIN"
+                component={Login}
+                options={{tabBarLabel: 'Đăng nhập'}}
+              />
+              <Tab.Screen
+                name="REGISTOR"
+                component={Registor}
+                options={{tabBarLabel: 'Đăng ký'}}
+              />
+            </Tab.Navigator>
+          </ImageBackground>
         </ScrollView>
       </TouchableWithoutFeedback>
     </KeyboardAvoidingView>

src/Screens/Authen/Registor.js

@@ -103,8 +103,7 @@ const Registor = (props) => {
 
       <View
         style={{
-          marginVertical: 20,
-
+          marginTop: 30,
           alignItems: 'center',
         }}>
         <TouchableOpacity onPress={registorClick} style={styles.wrapLogin}>

src/Screens/NewFeed/DetailNew.js

@@ -11,6 +11,7 @@ const DepositView = (props) => {
       <HeaderBack isWhite={true} title={'Chi tiết'} />
       <WebView
         androidHardwareAccelerationDisabled={true}
+        domStorageEnabled={false}
         source={{
           uri:
             root + 'api/v1/posts/detail/web-view?id=' + props.route.params.id,

src/Screens/NewFeed/Tab2/Tab2.js

@@ -13,6 +13,7 @@ const NewFeed = (props) => {
       }}>
       <WebView
         androidHardwareAccelerationDisabled={true}
+        domStorageEnabled={false}
         style={{height: '100%', width: '100%'}}
         source={{
           uri: 'http://api.dcvinvest.com/webview/tradingview/price',

src/Screens/NewFeed/Tradding/Tradding.js

@@ -8,6 +8,7 @@ const Trading = (props) => {
       <WebView
         androidHardwareAccelerationDisabled={true}
         style={{height: '100%', width: '100%'}}
+        domStorageEnabled={false}
         source={{
           uri:
             'http://api.dcvinvest.com/webview/tradingview/chart?height=' +

src/assets/images.js

@@ -62,7 +62,7 @@ const images = {
   iconBtnGreen: require('./images/iconBtnGreen.png'),
   iconCheck: require('./images/iconCheck.png'),
   bgmedia: require('./images/bgmedia.jpeg'),
-  login_bg: require('./images/login_bg.png'),
+  bgLogin: require('./images/bgLogin.png'),
 };
 
 export default images;