@boneframework/native-components 1.0.36 → 1.0.38

package/components/ActivityIndicator.tsx

@@ -8,7 +8,7 @@ function ActivityIndicator({ visible = false , type="default", animationSource})
     const defaultStyles = useStyle();
 
     if (!animationSource) {
-        animationSource = '../../../../assets/animations/loader.json'
+        animationSource = require('../../../../assets/animations/loader.json');
     }
 
     const styles = StyleSheet.create({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boneframework/native-components",
-  "version": "1.0.36",
+  "version": "1.0.38",
   "description": "Expo Components for Bone Framework",
   "main": "src/Bone.ts",
   "scripts": {

package/screens/ActivateUserScreen.tsx

@@ -10,10 +10,7 @@ import useApi from "../hooks/useApi";
 import useAuth from "../hooks/useAuth";
 import userApi from "../api/users";
 
-import settings from "../../../../config/settings";
-import routes from "../../../../config/routes";
-
-function ActivateUserScreen() {
+function ActivateUserScreen({settings, loginRedirect}) {
     const STATUS_BEGIN = 'start_validating';
     const STATUS_VALIDATE = 'validate_email_token';
     const STATUS_RESEND = 'resend_email_token';
@@ -83,7 +80,7 @@ function ActivateUserScreen() {
                 return;
             }
 
-            login(convertResponse(result.data)).then(router.navigate(routes.HOME));
+            login(convertResponse(result.data)).then(router.navigate(loginRedirect));
         } catch (error) {
             setError(error);
             console.error(error);
@@ -95,8 +92,8 @@ function ActivateUserScreen() {
         resendActivationApi
             .request(email)
             .then(setStatus(STATUS_VALIDATE))
-            .then(navigation.goBack())
-            .then(navigation.navigate(routes.USER_ACTIVATION_CHECK_EMAIL))
+            .then(router.back())
+            .then(router.navigate(routes.USER_ACTIVATION_CHECK_EMAIL))
             .catch(console.error);
     }
 

package/screens/EditProfileScreen.tsx

@@ -1,7 +1,6 @@
 import React, {useEffect, useState} from 'react';
 import {
     Alert,
-    Button,
     KeyboardAvoidingView,
     Platform,
     ScrollView,
@@ -9,27 +8,21 @@ import {
     TouchableWithoutFeedback,
     View
 } from "react-native"
-import {Field} from "formik";
-import * as FileSystem from 'expo-file-system';
-import {useAsyncStorage} from "@react-native-async-storage/async-storage";
 import * as Yup from "yup";
 
-import colors from '../../../../config/colors';
-import ImageInput from '../components/ImageInput';
 import Image from '../components/Image';
-import Screen from '../components/Screen';
-import Text from '../components/Text';
 import {Form, FormDateTimePicker, FormField, SubmitButton} from "../components/forms";
 import ActivityIndicator from "../components/ActivityIndicator";
 import UploadScreen from "./UploadScreen";
 import useApi from "../hooks/useApi";
 import userApi from "../api/users";
 import useAuth from "../hooks/useAuth";
-import useCache from "../hooks/useCache";
 import useCamera from "../hooks/useCamera";
 import usePhotos from "../hooks/usePhotos";
 import useStyle from "../hooks/useStyle";
 
+import colors from '../../../../config/colors';
+
 const validationSchema = Yup.object().shape({
     firstname: Yup.string().required().min(2).max(60).label('First name'),
     middlename: Yup.string().min(1).max(60).label('Middle name'),

package/screens/SetPasswordScreen.tsx

@@ -1,12 +1,10 @@
-import React, {useState} from 'react';
+import React from 'react';
 import {StyleSheet, View} from "react-native";
 import * as Yup from "yup";
 
 import {ErrorMessage, Form, FormField, SubmitButton} from "../components/forms";
 import Image from "../components/Image";
 
-import settings from "../../../../config/settings";
-
 const validationSchema = Yup.object().shape({
     password: Yup.string().required().min(4).label('Password'),
     confirm: Yup.string().required().oneOf([Yup.ref('password'), null], 'Passwords must match').label('Confirm')

package/screens/WelcomeScreen.tsx

@@ -3,8 +3,9 @@ import {exchangeCodeAsync, makeRedirectUri, useAuthRequest} from "expo-auth-sess
 import React from 'react';
 import {Image, ImageBackground, StyleSheet, Text, View} from "react-native";
 
-import Button from '../components/Button'
-import colors from '../../../../config/colors'
+import Button from '../components/Button';
+
+import colors from '../../../../config/colors';
 
 function WelcomeScreen({loginOnPress = () => {}, registerOnPress = () => {}, title = 'BONE FRAMEWORK', isLoading = false}) {
     return (