Skip to content

S
safetcut-app
Commit a5b4cdf3 by OuiAtichat
Options

add loading to onboardingpage

parent 7d330e89
Showing with 34 additions and 17 deletions
android/.idea/workspace.xml
......@@ -14,18 +14,16 @@
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/taskHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/file-input-save-data.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/file-input-save-data.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/I8EShDaqyxK6XZkB_f28C4N2NNU=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/I8EShDaqyxK6XZkB_f28C4N2NNU=" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/mergeJavaRes/debug/0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/mergeJavaRes/debug/0.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../package.json" beforeDir="false" afterPath="$PROJECT_DIR$/../package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../screens/Private/CameraScreen.js" beforeDir="false" afterPath="$PROJECT_DIR$/../screens/Private/CameraScreen.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../yarn.lock" beforeDir="false" afterPath="$PROJECT_DIR$/../yarn.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../screens/Public/AuthLoadingScreen.js" beforeDir="false" afterPath="$PROJECT_DIR$/../screens/Public/AuthLoadingScreen.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../screens/Public/OnboardingScreen.js" beforeDir="false" afterPath="$PROJECT_DIR$/../screens/Public/OnboardingScreen.js" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
......@@ -186,8 +184,8 @@
<window_info anchor="bottom" id="Logcat" order="1" />
<window_info anchor="bottom" id="TODO" order="2" />
<window_info anchor="bottom" id="Terminal" order="3" />
<window_info anchor="bottom" id="Event Log" order="4" sideWeight="0.5005507" side_tool="true" weight="0.3297062" />
<window_info anchor="bottom" id="Build" order="5" sideWeight="0.49944934" visible="true" weight="0.3304253" />
<window_info anchor="bottom" id="Event Log" order="4" sideWeight="0.5011013" side_tool="true" weight="0.3304253" />
<window_info anchor="bottom" id="Build" order="5" sideWeight="0.49889868" visible="true" weight="0.3304253" />
<window_info anchor="bottom" id="Android Profiler" order="6" show_stripe_button="false" />
<window_info anchor="right" id="Device File Explorer" order="0" side_tool="true" />
<window_info anchor="right" id="Capture Analysis" order="1" />
......
android/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
#Sun Jul 21 15:48:25 ICT 2019
#Sun Jul 21 16:59:01 ICT 2019
/home/haouiha/.gradle/caches/transforms-2/files-2.1/7b0e6e84d2018f3e83f55bfd3825156f/res/drawable-xxhdpi-v4/abc_list_longpressed_holo.9.png=/home/haouiha/Documents/safetcut-app/android/app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_list_longpressed_holo.9.png.flat
/home/haouiha/.gradle/caches/transforms-2/files-2.1/7b0e6e84d2018f3e83f55bfd3825156f/res/drawable-xhdpi-v4/abc_text_select_handle_right_mtrl_dark.png=/home/haouiha/Documents/safetcut-app/android/app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_text_select_handle_right_mtrl_dark.png.flat
/home/haouiha/.gradle/caches/transforms-2/files-2.1/7b0e6e84d2018f3e83f55bfd3825156f/res/drawable-mdpi-v4/abc_ic_star_black_16dp.png=/home/haouiha/Documents/safetcut-app/android/app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_ic_star_black_16dp.png.flat
......
android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
#Sun Jul 21 15:48:30 ICT 2019
#Sun Jul 21 16:59:08 ICT 2019
base.0=/home/haouiha/Documents/safetcut-app/android/app/build/intermediates/transforms/dexMerger/debug/0
path.0=classes.dex
renamed.0=classes.dex
android/app/build/intermediates/incremental/packageDebug/tmp/debug/file-input-save-data.txt
#Internal package file, do not edit.
#Sun Jul 21 15:48:31 ICT 2019
#Sun Jul 21 16:59:08 ICT 2019
60.set=NATIVE_RESOURCE
52.set=NATIVE_RESOURCE
53.base=/home/haouiha/Documents/safetcut-app/android/app/build/intermediates/merged_assets/debug/out
......
screens/Private/CameraScreen.js
......@@ -35,10 +35,9 @@ class CameraScreen extends Component {
alert(`Bar code with type ${type} and data ${data} has been scanned!`);
};
requestPermission = () => {
Permissions.request('camera').then(response => {
this.setState({ cameraPermission: response });
});
requestPermission = async () => {
const response = await Permissions.request('camera');
this.setState({ cameraPermission: response });
};
renderCamera = () => (
......
screens/Public/AuthLoadingScreen.js
......@@ -26,7 +26,7 @@ export default class AuthLoadingScreen extends Component {
const alreadyLaunched = await AsyncStorage.getItem('alreadyLaunched');
const RememberedLogin = await AsyncStorage.getItem('RememberedLogin');
console.log(alreadyLaunched, RememberedLogin);
// console.log(alreadyLaunched, RememberedLogin);
const loading = await this.performTimeConsumingTask();
if (loading) {
......
screens/Public/OnboardingScreen.js
import React, { Component } from 'react';
import { StyleSheet, Text, Image } from 'react-native';
import { StyleSheet, Text, Image, View, ActivityIndicator } from 'react-native';
import Swiper from '../../components/Onboarding/Swiper';
// import { LinearGradient } from 'expo-linear-gradient';
import LinearGradient from 'react-native-linear-gradient';
......@@ -27,6 +27,26 @@ const pages = [
},
];
export default class OnboardingScreen extends Component {
state = {
loading: true,
};
_onLoadEnd = () => {
this.setState({
loading: true,
});
};
imgPrefetth = async () => {
await Image.prefetch('https://www.tunnelbear.com/static/img/android@2x.b83f4df.png');
this.setState({
loading: false,
});
};
componentDidMount() {
this.imgPrefetth();
}
render() {
return (
<Swiper>
......@@ -36,11 +56,11 @@ export default class OnboardingScreen extends Component {
colors={['#f66969', '#f44c4c']}
start={{ x: 0.0, y: 0.25 }}
end={{ x: 1.0, y: 0.0 }}
// start={[0, 0]}
// end={[1, 0]}
style={[styles.slide]}
>
<ActivityIndicator style={[styles.img]} color="#fff" animating={this.state.loading} />
<Image source={{ uri: page.img }} style={[styles.img]} />
<Text style={styles.text}>{page.description}</Text>
</LinearGradient>
))}
......
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