@boneframework/native-components 1.0.56 → 1.0.58
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/api/client.ts +7 -6
- package/api/notifications.ts +12 -0
- package/api/{ping.js → ping.ts} +9 -9
- package/api/users.ts +35 -0
- package/assets/animations/done.json +1 -0
- package/assets/animations/email.json +1 -0
- package/assets/animations/loader.json +1 -0
- package/assets/background.png +0 -0
- package/assets/logo.png +0 -0
- package/components/ActivityIndicator.tsx +2 -2
- package/components/{Animation.tsx → Animation.native.tsx} +3 -1
- package/components/Animation.web.tsx +24 -0
- package/components/ApiInterceptor.tsx +4 -3
- package/components/BoneNativeProvider.tsx +31 -0
- package/components/Button.tsx +26 -21
- package/components/Image.tsx +8 -2
- package/components/ImageInput.tsx +2 -1
- package/components/ListItemDeleteAction.tsx +12 -10
- package/components/ListItemFlipswitch.tsx +1 -2
- package/components/ListItemSwipable.tsx +3 -2
- package/components/OfflineNotice.tsx +17 -15
- package/components/Text.tsx +4 -4
- package/components/forms/FormImagePicker.tsx +36 -0
- package/contexts/api.ts +12 -0
- package/contexts/cache.ts +14 -0
- package/contexts/colors.ts +1 -1
- package/contexts/settings.ts +33 -0
- package/contexts/theme.ts +17 -15
- package/hooks/useColors.ts +1 -2
- package/hooks/useNotifications.web.ts +14 -0
- package/hooks/useSettings.ts +9 -0
- package/package.json +5 -2
- package/screens/ActivateUserScreen.tsx +3 -1
- package/screens/CheckEmailScreen.tsx +36 -32
- package/screens/EditProfileScreen.tsx +2 -3
- package/screens/MapScreen.web.tsx +33 -0
- package/screens/RegisterScreen.tsx +8 -4
- package/screens/ResendActivationlScreen.tsx +36 -31
- package/screens/SetPasswordScreen.tsx +6 -2
- package/screens/UploadScreen.tsx +3 -1
- package/screens/WelcomeScreen.tsx +13 -4
- package/api/notifications.js +0 -11
- package/api/users.js +0 -35
- package/components/ColorProvider.tsx +0 -14
- package/components/forms/FormImagePicker.js +0 -30
- /package/components/forms/{ErrorMessage.js → ErrorMessage.tsx} +0 -0
- /package/components/forms/{Form.js → Form.tsx} +0 -0
- /package/components/forms/{FormDateTimePicker.js → FormDateTimePicker.tsx} +0 -0
- /package/components/forms/{FormField.js → FormField.tsx} +0 -0
- /package/components/forms/{FormPicker.js → FormPicker.tsx} +0 -0
- /package/components/forms/{SubmitButton.js → SubmitButton.tsx} +0 -0
- /package/components/forms/{index.js → index.ts} +0 -0
- /package/hooks/{useNotifications.ts → useNotifications.native.ts} +0 -0
- /package/screens/{MapScreen.tsx → MapScreen.native.tsx} +0 -0
package/api/client.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import {ApisauceInstance, create} from 'apisauce';
|
|
2
2
|
|
|
3
3
|
import cache from '../utilities/cache';
|
|
4
|
-
|
|
5
|
-
import cacheSettings from '../../../../config/cache';
|
|
4
|
+
|
|
5
|
+
// import cacheSettings from '../../../../config/cache';
|
|
6
6
|
|
|
7
7
|
const apiClient: ApisauceInstance = create({
|
|
8
|
-
baseURL:
|
|
8
|
+
baseURL: process.env.EXPO_PUBLIC_API_URL
|
|
9
9
|
});
|
|
10
10
|
|
|
11
11
|
const get = apiClient.get;
|
|
@@ -14,9 +14,10 @@ apiClient.get = async (url, params, axiosConfig) => {
|
|
|
14
14
|
const response = await get(url, params, axiosConfig);
|
|
15
15
|
|
|
16
16
|
if (response.ok) {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
// @todo re-enable caching later
|
|
18
|
+
// if (cacheSettings.blacklist.includes(url) === false) {
|
|
19
|
+
// cache.store(url, response.data);
|
|
20
|
+
// }
|
|
20
21
|
|
|
21
22
|
return response;
|
|
22
23
|
}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import client from './client';
|
|
2
|
+
|
|
3
|
+
const register = (pushToken: string) => client.post('/api/notifications/register-token', { token: pushToken });
|
|
4
|
+
|
|
5
|
+
const send = (message: string, data: any) => {
|
|
6
|
+
return client.post('/api/notifications/send-notification', { message, data });
|
|
7
|
+
};
|
|
8
|
+
|
|
9
|
+
export default {
|
|
10
|
+
register,
|
|
11
|
+
send,
|
|
12
|
+
};
|
package/api/{ping.js → ping.ts}
RENAMED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import apiClient from './client'
|
|
2
|
-
|
|
3
|
-
const endpoint = '/ping';
|
|
4
|
-
|
|
5
|
-
const ping = () => apiClient.get(endpoint);
|
|
6
|
-
|
|
7
|
-
export default {
|
|
8
|
-
|
|
9
|
-
}
|
|
1
|
+
import apiClient from './client';
|
|
2
|
+
|
|
3
|
+
const endpoint = '/ping';
|
|
4
|
+
|
|
5
|
+
const ping = () => apiClient.get(endpoint);
|
|
6
|
+
|
|
7
|
+
export default {
|
|
8
|
+
ping,
|
|
9
|
+
};
|
package/api/users.ts
ADDED
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import client from './client';
|
|
2
|
+
|
|
3
|
+
const activateAccount = (email: string, token: string, clientId: string, password: string) => client.post('/api/user/activate', { email, token, clientId, password });
|
|
4
|
+
const getProfile = (token: string) => client.get('/api/user/profile', {}, {
|
|
5
|
+
headers: { Authorization: 'Bearer ' + token },
|
|
6
|
+
});
|
|
7
|
+
const register = (userInfo: any) => client.post('/api/user/register', userInfo);
|
|
8
|
+
const resendactivationEmail = (email: string) => client.post('/api/user/resend-activation-email', { email });
|
|
9
|
+
const updateProfile = (profileInfo: any) => client.put('/api/user/profile', profileInfo);
|
|
10
|
+
const validateEmailToken = (email: string, token: string) => client.post('/api/user/validate-email-token', { email, token });
|
|
11
|
+
const uploadUserImage = (formData: any) => client.post('/api/user/image', formData, {
|
|
12
|
+
headers: { 'Content-Type': 'multipart/form-data' },
|
|
13
|
+
});
|
|
14
|
+
const userImage = () => client.get('/api/user/image');
|
|
15
|
+
const userSettings = () => client.get('/api/user/settings');
|
|
16
|
+
const updateUserSettings = (settings: any) => client.put('/api/user/settings', settings);
|
|
17
|
+
const uploadUserBackgroundImage = (formData: any) => client.post('/api/user/background-image', formData, {
|
|
18
|
+
headers: { 'Content-Type': 'multipart/form-data' },
|
|
19
|
+
});
|
|
20
|
+
const userBackgroundImage = () => client.get('/api/user/background-image');
|
|
21
|
+
|
|
22
|
+
export default {
|
|
23
|
+
activateAccount,
|
|
24
|
+
getProfile,
|
|
25
|
+
register,
|
|
26
|
+
resendactivationEmail,
|
|
27
|
+
updateProfile,
|
|
28
|
+
uploadUserImage,
|
|
29
|
+
uploadUserBackgroundImage,
|
|
30
|
+
userBackgroundImage,
|
|
31
|
+
userImage,
|
|
32
|
+
userSettings,
|
|
33
|
+
updateUserSettings,
|
|
34
|
+
validateEmailToken,
|
|
35
|
+
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"v":"4.10.1","fr":48,"ip":0,"op":48,"w":56,"h":56,"nm":"录入声纹 tick","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"对勾","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[28,28,0],"ix":2},"a":{"a":0,"k":[0.988,5.188,0],"ix":1},"s":{"a":0,"k":[66.824,66.824,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-13.398,3.94],[-1.702,13.989],[20.038,-8.302]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":6,"ix":5},"lc":1,"lj":1,"ml":4,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"形状 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.446],"y":[1]},"o":{"x":[0.078],"y":[0.582]},"n":["0p446_1_0p078_0p582"],"t":19,"s":[0],"e":[86]},{"t":31}],"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":21,"s":[0],"e":[60]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":26,"s":[60],"e":[0]},{"t":31}],"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":12,"op":468,"st":-12,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"形状图层 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[28,28,0],"ix":2},"a":{"a":0,"k":[-0.121,0.371,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.706,0.706,0.333],"y":[0.004,0.004,0]},"n":["0p667_1_0p706_0p004","0p667_1_0p706_0p004","0p667_1_0p333_0"],"t":0,"s":[0,0,100],"e":[111.445,111.445,100]},{"i":{"x":[0.105,0.105,0.667],"y":[0.984,0.984,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"n":["0p105_0p984_0p333_0","0p105_0p984_0p333_0","0p667_1_0p333_0"],"t":12,"s":[111.445,111.445,100],"e":[100,100,100]},{"t":19}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[48.469,48.469],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.9882352941176471,0.3607843137254902,0.396078431372549,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-0.121,0.371],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":144,"st":0,"bm":0}]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"v":"5.5.8","fr":24,"ip":0,"op":72,"w":298,"h":304,"nm":"mail-send","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[151,100.5,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[80,80,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.5,-31.5],[-2,-91]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.980392156863,0.928692567115,0.49211841658,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.761307181564,0.828914926566,0.866666666667,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"rp","c":{"a":0,"k":7,"ix":1},"o":{"a":0,"k":0,"ix":2},"m":1,"ix":2,"tr":{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[-1,65],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":206,"ix":4},"so":{"a":0,"k":100,"ix":5},"eo":{"a":0,"k":100,"ix":6},"nm":"Transform"},"nm":"Repeater 1","mn":"ADBE Vector Filter - Repeater","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.038],"y":[0]},"t":35,"s":[0]},{"t":41,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.038],"y":[0]},"t":32,"s":[0]},{"t":38,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":3,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":-11,"op":229,"st":-11,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"mail","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[150,162,0],"ix":2},"a":{"a":0,"k":[535.5,452,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0,0,0.833],"y":[0.272,0.272,-6.619]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":21,"s":[0,0,100]},{"t":25,"s":[60,60,100]}],"ix":6,"x":"var $bm_rt;\nvar n, n, t, t, v, amp, freq, decay;\n$bm_rt = n = 0;\nif (numKeys > 0) {\n $bm_rt = n = nearestKey(time).index;\n if (key(n).time > time) {\n n--;\n }\n}\nif (n == 0) {\n $bm_rt = t = 0;\n} else {\n $bm_rt = t = $bm_sub(time, key(n).time);\n}\nif (n > 0 && t < 1) {\n v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n amp = 0.1;\n freq = 2;\n decay = 4;\n $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n} else {\n $bm_rt = value;\n}"}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[10.207,0],[0,0],[0,-10.207],[0,0],[-10.207,0],[0,0],[0,10.207],[0,0]],"o":[[0,0],[-10.207,0],[0,0],[0,10.207],[0,0],[10.207,0],[0,0],[0,-10.207]],"v":[[92.519,-71.5],[-92.518,-71.5],[-111,-53.019],[-111,53.019],[-92.518,71.5],[92.519,71.5],[111,53.019],[111,-53.019]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[0,-4.676],[0,0],[4.677,0],[0,0],[0,4.676],[0,0],[-4.677,0]],"o":[[4.677,0],[0,0],[0,4.676],[0,0],[-4.677,0],[0,0],[0,-4.676],[0,0]],"v":[[92.519,-61.5],[101,-53.019],[101,53.019],[92.519,61.5],[-92.518,61.5],[-101,53.019],[-101,-53.019],[-92.518,-61.5]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.21176470588235294,0.5529411764705883,0.5294117647058824,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[535.5,452],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[8.573,0],[0,0],[-0.113,-8.653],[0,0],[-4.807,0],[-4.178,2.758],[0,0],[0,0]],"o":[[0,0],[-8.652,0],[0,0],[4.183,2.766],[4.801,0],[0,0],[0,0],[0,-8.574]],"v":[[95.431,-42.017],[-95.318,-42.017],[-110.84,-26.289],[-13.831,37.867],[-0.034,42.017],[13.747,37.879],[110.953,-26.289],[110.953,-26.492]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[-0.988,-0.929],[0,0],[2.95,0],[2.464,1.63],[0,0],[-1.42,0]],"o":[[1.46,0],[0,0],[-2.462,1.625],[-2.954,0],[0,0],[1.028,-0.969],[0,0]],"v":[[95.431,-32.017],[99.208,-30.518],[8.239,29.533],[-0.034,32.017],[-8.315,29.526],[-99.102,-30.517],[-95.318,-32.017]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.21176470588235294,0.5529411764705883,0.5294117647058824,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[3.931,0],[3.285,2.173],[0,0],[-1.406,1.423],[-2.837,0],[0,0],[-1.058,-4.691],[0,0]],"o":[[-3.938,0],[0,0],[0.425,-1.902],[1.993,-2.019],[0,0],[5.007,0],[0,0],[-3.28,2.166]],"v":[[-0.032,37.017],[-11.073,33.696],[-105.588,-28.81],[-102.807,-33.885],[-95.318,-37.016],[95.431,-37.016],[105.697,-28.811],[10.992,33.705]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 2","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[533.671,389.392],"ix":2},"a":{"a":0,"k":[-1.875,-33.125],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833],"y":[1,0.833]},"o":{"x":[1,1],"y":[0,0]},"t":25,"s":[100,0]},{"t":33,"s":[100,100]}],"ix":3,"x":"var $bm_rt;\nvar n, n, t, t, v, amp, freq, decay;\n$bm_rt = n = 0;\nif (numKeys > 0) {\n $bm_rt = n = nearestKey(time).index;\n if (key(n).time > time) {\n n--;\n }\n}\nif (n == 0) {\n $bm_rt = t = 0;\n} else {\n $bm_rt = t = $bm_sub(time, key(n).time);\n}\nif (n > 0 && t < 1) {\n v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n amp = 0.1;\n freq = 2;\n decay = 4;\n $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n} else {\n $bm_rt = value;\n}"},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":6,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.112,8.658],[0,0],[-9.133,-6.163],[0,0],[0,0],[8.581,0],[0,0]],"o":[[0,0],[9.132,-6.163],[0,0],[0,0],[0,8.58],[0,0],[-8.659,0]],"v":[[-110.74,27.495],[-15.056,-37.07],[15.168,-37.07],[110.852,27.495],[110.852,27.697],[95.316,43.233],[-95.206,43.233]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.905999995213,0.948999980852,0.969000004787,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[535.444,480.267],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[97.046,97.046],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.931,0],[3.285,2.173],[0,0],[-1.406,1.423],[-2.837,0],[0,0],[-1.058,-4.691],[0,0]],"o":[[-3.938,0],[0,0],[0.425,-1.902],[1.993,-2.019],[0,0],[5.007,0],[0,0],[-3.28,2.166]],"v":[[-0.086,37.016],[-11.128,33.695],[-105.642,-28.811],[-102.862,-33.885],[-95.372,-37.017],[95.376,-37.017],[105.642,-28.812],[10.938,33.704]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.761307181564,0.828914926566,0.866666666667,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[535.6,422.517],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[210.938,131.25],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":20,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0.666666965859,0.682353001015,0.725489956725,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[535.969,451.062],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":237,"st":-3,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"send","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":1,"y":0},"t":0,"s":[143.721,162.929,0],"to":[80.667,-80,0],"ti":[-80.667,80,0]},{"t":12,"s":[627.721,-317.071,0]}],"ix":2},"a":{"a":0,"k":[229.921,451.765,0],"ix":1},"s":{"a":0,"k":[80,80,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[5.841,0],[1.329,-0.66],[0,0],[-7.405,-2.583],[0,0],[0,0],[-1.967,1.794],[0,0],[0,0],[-0.972,0],[-1.389,3.434],[0,0]],"o":[[-1.299,0],[0,0],[-7.022,3.493],[0,0],[0,0],[0.78,2.547],[0,0],[0,0],[0.967,0.338],[3.515,0],[0,0],[2.5,-6.183]],"v":[[74.783,-73.245],[70.807,-72.287],[-78.445,1.944],[-77.417,18.241],[-54.279,26.313],[-40.958,69.832],[-35.046,71.451],[-5.281,44.313],[26.745,55.522],[29.672,56.022],[37.886,50.481],[82.966,-61.034]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[1.107,0],[1.871,-1.706],[0,0],[0,0],[3.008,1.05],[0,0]],"o":[[0,0],[0,0],[-1.079,-0.378],[-2.455,0],[0,0],[0,0],[-0.933,-3.047],[0,0],[0,0]],"v":[[72.568,-61.994],[29.022,45.724],[-1.977,34.874],[-5.279,34.313],[-12.018,36.923],[-34.342,57.278],[-44.717,23.386],[-50.986,16.87],[-71.566,9.692]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[75.261,-63.333],[75.265,-63.333]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.21176470588235294,0.5529411764705883,0.5294117647058824,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[229.78,452.187],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 6","np":5,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-15.591,21.667],[19.834,-11.166],[-8.666,-21.666],[-19.834,21.667]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.638999968884,0.736999990426,0.769000004787,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[211.666,500.667],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 7","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[1.545,-1.672],[0,0],[0,0],[0.477,1.996]],"o":[[0,0],[1.724,-1.488],[0,0],[0,0],[-0.512,1.988],[0,0]],"v":[[-57.689,10.161],[53.637,-59.486],[56.144,-56.892],[-31.689,18.161],[-42.212,58.987],[-46.032,58.953]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.905999995213,0.948999980852,0.969000004787,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[234.689,460.839],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 8","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[1.504,0.525],[0,0],[0.038,0.599],[-2.129,1.059],[0,0],[-0.579,0],[-0.742,-1.1],[0.639,-1.579],[0,0],[1.58,0],[0,0],[0.415,0.145],[0,0],[0.553,0],[0.935,-0.854],[0,0]],"o":[[-0.466,-1.522],[0,0],[-2.245,-0.783],[-0.038,-0.6],[0,0],[0.58,-0.289],[1.24,0],[0.505,0.749],[0,0],[-0.593,1.467],[0,0],[-0.431,0],[0,0],[-0.539,-0.188],[-1.227,0],[0,0],[0,0]],"v":[[-49.79,25.824],[-52.924,22.567],[-76.061,14.496],[-78.641,11.095],[-76.508,7.396],[72.744,-66.834],[74.492,-67.27],[77.705,-65.487],[78.04,-61.933],[32.96,49.582],[29.382,51.996],[29.381,51.996],[28.107,51.778],[-3.919,40.568],[-5.57,40.288],[-8.939,41.594],[-37.102,67.27]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[230.071,451.212],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 9","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":240,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"send 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":15,"s":[-330.279,620.929,0],"to":[79,-76.333,0],"ti":[-79,76.333,0]},{"t":27,"s":[143.721,162.929,0]}],"ix":2},"a":{"a":0,"k":[229.921,451.765,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.728,0.728,0.667],"y":[1,1,1]},"o":{"x":[1,1,0.333],"y":[0,0,0]},"t":21,"s":[80,80,100]},{"t":26,"s":[40,40,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[5.841,0],[1.329,-0.66],[0,0],[-7.405,-2.583],[0,0],[0,0],[-1.967,1.794],[0,0],[0,0],[-0.972,0],[-1.389,3.434],[0,0]],"o":[[-1.299,0],[0,0],[-7.022,3.493],[0,0],[0,0],[0.78,2.547],[0,0],[0,0],[0.967,0.338],[3.515,0],[0,0],[2.5,-6.183]],"v":[[74.783,-73.245],[70.807,-72.287],[-78.445,1.944],[-77.417,18.241],[-54.279,26.313],[-40.958,69.832],[-35.046,71.451],[-5.281,44.313],[26.745,55.522],[29.672,56.022],[37.886,50.481],[82.966,-61.034]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[1.107,0],[1.871,-1.706],[0,0],[0,0],[3.008,1.05],[0,0]],"o":[[0,0],[0,0],[-1.079,-0.378],[-2.455,0],[0,0],[0,0],[-0.933,-3.047],[0,0],[0,0]],"v":[[72.568,-61.994],[29.022,45.724],[-1.977,34.874],[-5.279,34.313],[-12.018,36.923],[-34.342,57.278],[-44.717,23.386],[-50.986,16.87],[-71.566,9.692]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[75.261,-63.333],[75.265,-63.333]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.21176470588235294,0.5529411764705883,0.5294117647058824,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[229.78,452.187],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 6","np":5,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-15.591,21.667],[19.834,-11.166],[-8.666,-21.666],[-19.834,21.667]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.638999968884,0.736999990426,0.769000004787,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[211.666,500.667],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 7","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[1.545,-1.672],[0,0],[0,0],[0.477,1.996]],"o":[[0,0],[1.724,-1.488],[0,0],[0,0],[-0.512,1.988],[0,0]],"v":[[-57.689,10.161],[53.637,-59.486],[56.144,-56.892],[-31.689,18.161],[-42.212,58.987],[-46.032,58.953]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.905999995213,0.948999980852,0.969000004787,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[234.689,460.839],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 8","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[1.504,0.525],[0,0],[0.038,0.599],[-2.129,1.059],[0,0],[-0.579,0],[-0.742,-1.1],[0.639,-1.579],[0,0],[1.58,0],[0,0],[0.415,0.145],[0,0],[0.553,0],[0.935,-0.854],[0,0]],"o":[[-0.466,-1.522],[0,0],[-2.245,-0.783],[-0.038,-0.6],[0,0],[0.58,-0.289],[1.24,0],[0.505,0.749],[0,0],[-0.593,1.467],[0,0],[-0.431,0],[0,0],[-0.539,-0.188],[-1.227,0],[0,0],[0,0]],"v":[[-49.79,25.824],[-52.924,22.567],[-76.061,14.496],[-78.641,11.095],[-76.508,7.396],[72.744,-66.834],[74.492,-67.27],[77.705,-65.487],[78.04,-61.933],[32.96,49.582],[29.382,51.996],[29.381,51.996],[28.107,51.778],[-3.919,40.568],[-5.57,40.288],[-8.939,41.594],[-37.102,67.27]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[230.071,451.212],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 9","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false}],"ip":15,"op":27,"st":15,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Shape Layer 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[150,152,0],"ix":2},"a":{"a":0,"k":[18,30,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":6,"s":[{"i":[[-77.32,0],[-24.654,-21.676],[0,-41.912],[77.32,0],[25.56,27.451],[0,36.853]],"o":[[35.408,0],[29.183,25.657],[0,77.32],[-40.466,0],[-23.278,-25],[0,-77.32]],"v":[[0,-140],[92.4,-105.18],[140,0],[0,140],[-102.483,95.381],[-140,0]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":9,"s":[{"i":[[-77.32,0],[-24.654,-21.676],[0,-41.912],[77.32,0],[25.56,27.451],[0,36.853]],"o":[[35.408,0],[29.183,25.657],[0,77.32],[-40.466,0],[-23.278,-25],[0,-77.32]],"v":[[0,-140],[111.4,-125.18],[140,0],[0,140],[-102.483,95.381],[-140,0]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":12,"s":[{"i":[[-77.32,0],[-24.654,-21.676],[0,-41.912],[77.32,0],[25.56,27.451],[0,36.853]],"o":[[35.408,0],[29.183,25.657],[0,77.32],[-40.466,0],[-23.278,-25],[0,-77.32]],"v":[[0,-140],[79.4,-91.18],[140,0],[0,140],[-102.483,95.381],[-140,0]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":15,"s":[{"i":[[-77.32,0],[-24.654,-21.676],[0,-41.912],[77.32,0],[25.56,27.451],[0,36.853]],"o":[[35.408,0],[29.183,25.657],[0,77.32],[-40.466,0],[-23.278,-25],[0,-77.32]],"v":[[0,-140],[102.4,-112.18],[140,0],[0,140],[-102.483,95.381],[-140,0]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":18,"s":[{"i":[[-77.32,0],[-24.654,-21.676],[0,-41.912],[77.32,0],[25.56,27.451],[0,36.853]],"o":[[35.408,0],[29.183,25.657],[0,77.32],[-40.466,0],[-23.278,-25],[0,-77.32]],"v":[[0,-140],[92.4,-105.18],[140,0],[0,140],[-102.483,95.381],[-140,0]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":20,"s":[{"i":[[-77.32,0],[-24.654,-21.676],[0,-41.912],[77.32,0],[25.56,27.451],[0,36.853]],"o":[[35.408,0],[29.183,25.657],[0,77.32],[-40.466,0],[-23.278,-25],[0,-77.32]],"v":[[0,-140],[92.4,-105.18],[140,0],[0,140],[-89.483,87.381],[-140,0]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":23,"s":[{"i":[[-77.32,0],[-24.654,-21.676],[0,-41.912],[77.32,0],[25.56,27.451],[0,36.853]],"o":[[35.408,0],[29.183,25.657],[0,77.32],[-40.466,0],[-23.278,-25],[0,-77.32]],"v":[[0,-140],[92.4,-105.18],[140,0],[0,140],[-116.483,114.381],[-140,0]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":26,"s":[{"i":[[-77.32,0],[-24.654,-21.676],[0,-41.912],[77.32,0],[25.56,27.451],[0,36.853]],"o":[[35.408,0],[29.183,25.657],[0,77.32],[-40.466,0],[-23.278,-25],[0,-77.32]],"v":[[0,-140],[92.4,-105.18],[140,0],[0,140],[-95.483,86.381],[-140,0]],"c":true}]},{"t":29,"s":[{"i":[[-77.32,0],[-24.654,-21.676],[0,-41.912],[77.32,0],[25.56,27.451],[0,36.853]],"o":[[35.408,0],[29.183,25.657],[0,77.32],[-40.466,0],[-23.278,-25],[0,-77.32]],"v":[[0,-140],[92.4,-105.18],[140,0],[0,140],[-102.483,95.381],[-140,0]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.666666965859,0.682353001015,0.725489956725,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.3058823529411765,0.803921568627451,0.7686274509803922,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[18,30],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":240,"st":0,"bm":0}],"markers":[]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"v":"5.7.11","fr":29.9700012207031,"ip":0,"op":70.0000028511585,"w":1000,"h":1000,"nm":"v-3","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":3,"nm":"Null 1","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":20,"s":[720]},{"t":50.0000020365418,"s":[450]}],"ix":10},"p":{"a":0,"k":[500,500,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[14,18,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":70.0000028511585,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Left","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":-360,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[0,0,0],"to":[-130.952,-101.852,0],"ti":[130.952,101.852,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":20,"s":[-785.714,-611.111,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":50,"s":[-785.714,-611.111,0],"to":[130.952,101.852,0],"ti":[-130.952,-101.852,0]},{"t":69.0000028104276,"s":[0,0,0]}],"ix":2,"l":2},"a":{"a":0,"k":[-83.299,-61.299,0],"ix":1,"l":2},"s":{"a":0,"k":[2500.286,1944.667,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[10.881,0],[0,-10.881],[-10.881,0],[0,10.881]],"o":[[-10.881,0],[0,10.881],[10.881,0],[0,-10.881]],"v":[[0,-19.701],[-19.701,0],[0,19.701],[19.701,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.9882352941176471,0.3607843137254902,0.396078431372549,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-83.299,-61.299],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":70.0000028511585,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Shape Layer 6","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":-360,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[0,0,0],"to":[130.952,-101.852,0],"ti":[-130.952,101.852,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":20,"s":[785.714,-611.111,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":50,"s":[785.714,-611.111,0],"to":[-130.952,101.852,0],"ti":[130.952,-101.852,0]},{"t":69.0000028104276,"s":[0,0,0]}],"ix":2,"l":2},"a":{"a":0,"k":[-83.299,-61.299,0],"ix":1,"l":2},"s":{"a":0,"k":[2500.286,1944.667,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[10.881,0],[0,-10.881],[-10.881,0],[0,10.881]],"o":[[-10.881,0],[0,10.881],[10.881,0],[0,-10.881]],"v":[[0,-19.701],[-19.701,0],[0,19.701],[19.701,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.3058823529411765,0.803921568627451,0.7686274509803922,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-83.299,-61.299],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":70.0000028511585,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Shape Layer 5","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":-360,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[0,0,0],"to":[-130.952,101.852,0],"ti":[130.952,-101.852,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":20,"s":[-785.714,611.111,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":50,"s":[-785.714,611.111,0],"to":[130.952,-101.852,0],"ti":[-130.952,101.852,0]},{"t":69.0000028104276,"s":[0,0,0]}],"ix":2,"l":2},"a":{"a":0,"k":[-83.299,-61.299,0],"ix":1,"l":2},"s":{"a":0,"k":[2500.286,1944.667,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[10.881,0],[0,-10.881],[-10.881,0],[0,10.881]],"o":[[-10.881,0],[0,10.881],[10.881,0],[0,-10.881]],"v":[[0,-19.701],[-19.701,0],[0,19.701],[19.701,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.3058823529411765,0.803921568627451,0.7686274509803922,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-83.299,-61.299],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":70.0000028511585,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Shape Layer 4","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":-360,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[0,0,0],"to":[130.952,101.852,0],"ti":[-130.952,-101.852,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":20,"s":[785.714,611.111,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":50,"s":[785.714,611.111,0],"to":[-130.952,-101.852,0],"ti":[130.952,101.852,0]},{"t":69.0000028104276,"s":[0,0,0]}],"ix":2,"l":2},"a":{"a":0,"k":[-83.299,-61.299,0],"ix":1,"l":2},"s":{"a":0,"k":[2500.286,1944.667,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[10.881,0],[0,-10.881],[-10.881,0],[0,10.881]],"o":[[-10.881,0],[0,10.881],[10.881,0],[0,-10.881]],"v":[[0,-19.701],[-19.701,0],[0,19.701],[19.701,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.9882352941176471,0.3607843137254902,0.396078431372549,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-83.299,-61.299],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":70.0000028511585,"st":0,"bm":0}],"markers":[]}
|
|
Binary file
|
package/assets/logo.png
ADDED
|
Binary file
|
|
@@ -7,14 +7,14 @@ import Animation from "./Animation";
|
|
|
7
7
|
interface ActivityIndicatorProps {
|
|
8
8
|
visible?: boolean;
|
|
9
9
|
type?: 'default' | 'overlay';
|
|
10
|
-
animationSource
|
|
10
|
+
animationSource?: string | undefined;
|
|
11
11
|
}
|
|
12
12
|
|
|
13
13
|
function ActivityIndicator({ visible = false , type ="default", animationSource}: ActivityIndicatorProps) {
|
|
14
14
|
const defaultStyles = useStyle();
|
|
15
15
|
|
|
16
16
|
if (!animationSource) {
|
|
17
|
-
animationSource = require('
|
|
17
|
+
animationSource = require('../assets/animations/loader.json');
|
|
18
18
|
}
|
|
19
19
|
|
|
20
20
|
const styles = StyleSheet.create({
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import React, {useRef} from 'react';
|
|
2
|
+
// import { DotLottie } from '@lottiefiles/dotlottie-react-native';
|
|
2
3
|
import LottieView from "lottie-react-native";
|
|
3
4
|
|
|
4
5
|
function Animation({source, style = {}, onAnimationFinish = () => {}, autoPlay = true, loop = true, speed = 1.5}) {
|
|
5
|
-
|
|
6
|
+
|
|
6
7
|
const lottieRef = useRef(null);
|
|
7
8
|
|
|
9
|
+
|
|
8
10
|
return(
|
|
9
11
|
<LottieView
|
|
10
12
|
source={source}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import React, {useRef} from 'react';
|
|
2
|
+
import DotLottie, {} from '@lottiefiles/dotlottie-react';
|
|
3
|
+
|
|
4
|
+
function Animation({source, style = {}, onAnimationFinish = () => {}, autoPlay = true, loop = true, speed = 1.5}) {
|
|
5
|
+
|
|
6
|
+
const lottieRef = useRef<DotLottie>(null);
|
|
7
|
+
|
|
8
|
+
// @todo: Fix web DotLottie usage
|
|
9
|
+
// <DotLottie
|
|
10
|
+
// source={source}
|
|
11
|
+
// autoPlay={autoPlay}
|
|
12
|
+
// loop={loop}
|
|
13
|
+
// style={style}
|
|
14
|
+
// speed={speed}
|
|
15
|
+
// onAnimationFinish={onAnimationFinish}
|
|
16
|
+
// ref={lottieRef}
|
|
17
|
+
// />
|
|
18
|
+
|
|
19
|
+
return(<></>
|
|
20
|
+
|
|
21
|
+
);
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export default Animation;
|
|
@@ -2,11 +2,11 @@ import React, {useEffect} from 'react';
|
|
|
2
2
|
|
|
3
3
|
import apiClient from "../api/client";
|
|
4
4
|
import authStorage from "../utilities/authStorage";
|
|
5
|
-
import settings from "../../../../config/settings";
|
|
6
5
|
import useAuth from '../hooks/useAuth';
|
|
6
|
+
import useSettings from '@boneframework/native-components/hooks/useSettings';
|
|
7
7
|
|
|
8
8
|
// call to refresh an access token using our refresh token
|
|
9
|
-
const refreshToken = async (token) => {
|
|
9
|
+
const refreshToken = async (token, settings) => {
|
|
10
10
|
const formData = new FormData();
|
|
11
11
|
formData.append('client_id', settings.clientId);
|
|
12
12
|
formData.append('grant_type', 'refresh_token');
|
|
@@ -30,6 +30,7 @@ const refreshToken = async (token) => {
|
|
|
30
30
|
|
|
31
31
|
function ApiInterceptor(props) {
|
|
32
32
|
const {user, logout} = useAuth();
|
|
33
|
+
const settings = useSettings
|
|
33
34
|
let refreshing = null;
|
|
34
35
|
|
|
35
36
|
const addTransformers = () => {
|
|
@@ -74,7 +75,7 @@ function ApiInterceptor(props) {
|
|
|
74
75
|
if (token) {
|
|
75
76
|
// first request to refresh will call the method, all the other requests will await the promise
|
|
76
77
|
// so only one call to refresh will be made in the case of multile async 401s
|
|
77
|
-
refreshing = refreshing ? refreshing : refreshToken(token.refreshToken);
|
|
78
|
+
refreshing = refreshing ? refreshing : refreshToken(token.refreshToken, settings);
|
|
78
79
|
await refreshing;
|
|
79
80
|
refreshing = null;
|
|
80
81
|
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import ApiContext from "@boneframework/native-components/contexts/api";
|
|
2
|
+
import CacheContext from "@boneframework/native-components/contexts/cache";
|
|
3
|
+
import ColorContext from "@boneframework/native-components/contexts/colors";
|
|
4
|
+
import SettingsContext from "@boneframework/native-components/contexts/settings";
|
|
5
|
+
import { ThemeColors } from "@boneframework/native-components/contexts/theme";
|
|
6
|
+
import { useContext } from "react";
|
|
7
|
+
|
|
8
|
+
interface BoneNativeProviderProps {
|
|
9
|
+
api: any
|
|
10
|
+
cache: any;
|
|
11
|
+
colors: ThemeColors;
|
|
12
|
+
routes: any;
|
|
13
|
+
settings: any;
|
|
14
|
+
styles: any;
|
|
15
|
+
children: React.ReactNode;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
const BoneNativeProvider = ({api, cache, colors, settings, children}: BoneNativeProviderProps) => {
|
|
19
|
+
let apiContext = useContext(ApiContext);
|
|
20
|
+
apiContext = api;
|
|
21
|
+
let cacheContext = useContext(CacheContext);
|
|
22
|
+
cacheContext = cache;
|
|
23
|
+
let colorContext: ThemeColors = useContext(ColorContext);
|
|
24
|
+
colorContext = colors;
|
|
25
|
+
let settingsContext = useContext(SettingsContext);
|
|
26
|
+
settingsContext = settings;
|
|
27
|
+
|
|
28
|
+
return <>{children}</>;
|
|
29
|
+
};
|
|
30
|
+
|
|
31
|
+
export default BoneNativeProvider;
|
package/components/Button.tsx
CHANGED
|
@@ -2,10 +2,33 @@ import React from 'react';
|
|
|
2
2
|
import {View, StyleSheet, Platform, TouchableOpacity, TouchableHighlight} from "react-native";
|
|
3
3
|
|
|
4
4
|
import Text from '../components/Text'
|
|
5
|
-
import
|
|
6
|
-
import
|
|
5
|
+
import useStyle from '@boneframework/native-components/hooks/useStyle';
|
|
6
|
+
import useColors from '@boneframework/native-components/hooks/useColors';
|
|
7
7
|
|
|
8
8
|
function Button({title, onPress, color, textColor}) {
|
|
9
|
+
const defaultStyles = useStyle();
|
|
10
|
+
const colors = useColors();
|
|
11
|
+
|
|
12
|
+
const styles = StyleSheet.create({
|
|
13
|
+
roundbutton: {
|
|
14
|
+
width: '100%',
|
|
15
|
+
height: 70,
|
|
16
|
+
borderRadius: 35,
|
|
17
|
+
backgroundColor: colors.primary,
|
|
18
|
+
justifyContent: 'center',
|
|
19
|
+
alignItems: 'center',
|
|
20
|
+
marginVertical: 10,
|
|
21
|
+
color: colors.black
|
|
22
|
+
},
|
|
23
|
+
text: {
|
|
24
|
+
fontFamily: defaultStyles.text.fontFamily,
|
|
25
|
+
color: colors.white,
|
|
26
|
+
fontSize: 18,
|
|
27
|
+
textTransform: 'uppercase',
|
|
28
|
+
fontWeight: 'bold'
|
|
29
|
+
}
|
|
30
|
+
});
|
|
31
|
+
|
|
9
32
|
return (
|
|
10
33
|
<TouchableHighlight style={[styles.roundbutton, {
|
|
11
34
|
backgroundColor: color ? colors[color]: styles.roundbutton.color,
|
|
@@ -17,24 +40,6 @@ function Button({title, onPress, color, textColor}) {
|
|
|
17
40
|
);
|
|
18
41
|
}
|
|
19
42
|
|
|
20
|
-
|
|
21
|
-
roundbutton: {
|
|
22
|
-
width: '100%',
|
|
23
|
-
height: 70,
|
|
24
|
-
borderRadius: 35,
|
|
25
|
-
backgroundColor: colors.primary,
|
|
26
|
-
justifyContent: 'center',
|
|
27
|
-
alignItems: 'center',
|
|
28
|
-
marginVertical: 10,
|
|
29
|
-
color: colors.black
|
|
30
|
-
},
|
|
31
|
-
text: {
|
|
32
|
-
fontFamily: defaultStyles.text.fontFamily,
|
|
33
|
-
color: colors.white,
|
|
34
|
-
fontSize: 18,
|
|
35
|
-
textTransform: 'uppercase',
|
|
36
|
-
fontWeight: 'bold'
|
|
37
|
-
}
|
|
38
|
-
});
|
|
43
|
+
|
|
39
44
|
|
|
40
45
|
export default Button;
|
package/components/Image.tsx
CHANGED
|
@@ -2,13 +2,19 @@ import {StyleSheet, View} from "react-native";
|
|
|
2
2
|
import {Image as ExpoImage} from "expo-image";
|
|
3
3
|
|
|
4
4
|
import useAuth from "../hooks/useAuth";
|
|
5
|
-
import
|
|
5
|
+
import useColors from "@boneframework/native-components/hooks/useColors";
|
|
6
|
+
import settings from "../../../../config/settings";
|
|
7
|
+
import useSettings from "@boneframework/native-components/hooks/useSettings";
|
|
8
|
+
import { useContext } from "react";
|
|
9
|
+
import ApiContext from "@boneframework/native-components/contexts/api";
|
|
6
10
|
|
|
7
11
|
function Image({style, uri, onPress, handleError = error => console.error, source, ...rest}) {
|
|
8
12
|
const {user} = useAuth();
|
|
13
|
+
const colors = useColors();
|
|
14
|
+
const settings = useContext(ApiContext);
|
|
9
15
|
|
|
10
16
|
const tryAgain = async error => {
|
|
11
|
-
handleError();
|
|
17
|
+
handleError(error);
|
|
12
18
|
setTimeout(() => {}, 1000);
|
|
13
19
|
};
|
|
14
20
|
let imageSource;
|
|
@@ -1,17 +1,18 @@
|
|
|
1
1
|
import React, {useEffect} from 'react';
|
|
2
2
|
import {Alert, Image, StyleSheet, TouchableWithoutFeedback, View} from "react-native";
|
|
3
3
|
|
|
4
|
-
import colors from '../../../../config/colors'
|
|
5
4
|
import Icon from './Icon';
|
|
6
5
|
import useCamera from '../hooks/useCamera';
|
|
7
6
|
import usePhotos from '../hooks/usePhotos';
|
|
8
7
|
import useStyle from "../hooks/useStyle";
|
|
8
|
+
import useColors from '@boneframework/native-components/hooks/useColors';
|
|
9
9
|
|
|
10
10
|
function ImageInput({imageUri, onChangeImage, onCancel = () => {}, mode = 'both'}) {
|
|
11
11
|
|
|
12
12
|
const camera = useCamera();
|
|
13
13
|
const photos = usePhotos();
|
|
14
14
|
const style = useStyle();
|
|
15
|
+
const colors = useColors();
|
|
15
16
|
|
|
16
17
|
const styles = StyleSheet.create({
|
|
17
18
|
container: {
|
|
@@ -1,10 +1,19 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import {StyleSheet, TouchableWithoutFeedback, View} from "react-native";
|
|
3
3
|
import {MaterialCommunityIcons} from '@expo/vector-icons';
|
|
4
|
-
|
|
5
|
-
import colors from '../../../../config/colors'
|
|
4
|
+
import useColors from '@boneframework/native-components/hooks/useColors';
|
|
6
5
|
|
|
7
6
|
function ListItemDeleteAction({onPress}) {
|
|
7
|
+
const colors = useColors();
|
|
8
|
+
const styles = StyleSheet.create({
|
|
9
|
+
deleteBox: {
|
|
10
|
+
justifyContent: "center",
|
|
11
|
+
alignItems: "center",
|
|
12
|
+
backgroundColor: colors.danger,
|
|
13
|
+
width: 70
|
|
14
|
+
}
|
|
15
|
+
})
|
|
16
|
+
|
|
8
17
|
return (
|
|
9
18
|
<TouchableWithoutFeedback onPress={onPress}>
|
|
10
19
|
<View style={styles.deleteBox} >
|
|
@@ -18,13 +27,6 @@ function ListItemDeleteAction({onPress}) {
|
|
|
18
27
|
);
|
|
19
28
|
}
|
|
20
29
|
|
|
21
|
-
|
|
22
|
-
deleteBox: {
|
|
23
|
-
justifyContent: "center",
|
|
24
|
-
alignItems: "center",
|
|
25
|
-
backgroundColor: colors.danger,
|
|
26
|
-
width: 70
|
|
27
|
-
}
|
|
28
|
-
})
|
|
30
|
+
|
|
29
31
|
|
|
30
32
|
export default ListItemDeleteAction;
|
|
@@ -5,7 +5,6 @@ import Image from "./Image";
|
|
|
5
5
|
import {MaterialCommunityIcons} from "@expo/vector-icons";
|
|
6
6
|
|
|
7
7
|
import Text from '../components/Text'
|
|
8
|
-
import colors from '../../../../config/colors';
|
|
9
8
|
import useStyle from "../hooks/useStyle";
|
|
10
9
|
|
|
11
10
|
function ListItemFlipswitch({title, subtitle, IconComponent, isOn, onColor, offColor, onToggle = () => {}}) {
|
|
@@ -32,7 +31,7 @@ function ListItemFlipswitch({title, subtitle, IconComponent, isOn, onColor, offC
|
|
|
32
31
|
fontWeight: "500",
|
|
33
32
|
},
|
|
34
33
|
subtitle: {
|
|
35
|
-
color: colors.medium
|
|
34
|
+
color: style.colors.medium
|
|
36
35
|
}
|
|
37
36
|
});
|
|
38
37
|
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import {StyleSheet, TouchableHighlight, View} from "react-native";
|
|
3
|
-
import Swipeable from 'react-native-gesture-handler/
|
|
3
|
+
import Swipeable from 'react-native-gesture-handler/ReanimatedSwipeable';
|
|
4
4
|
|
|
5
5
|
import Image from '../components/Image'
|
|
6
6
|
import Text from '../components/Text'
|
|
7
|
-
import colors from '../../../../config/colors'
|
|
8
7
|
import {MaterialCommunityIcons} from "@expo/vector-icons";
|
|
9
8
|
import useStyle from "../hooks/useStyle";
|
|
9
|
+
import useColors from "../hooks/useColors";
|
|
10
10
|
|
|
11
11
|
function ListItemSwipable({title, subtitle, image, IconComponent, onPress, renderRightActions, displayCheverons, titleStyle, subtitleStyle}) {
|
|
12
|
+
const colors = useColors();
|
|
12
13
|
const style = useStyle();
|
|
13
14
|
|
|
14
15
|
if (!title && subtitle) {
|
|
@@ -1,12 +1,26 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import {StyleSheet, View} from "react-native";
|
|
3
3
|
import {useNetInfo} from "@react-native-community/netinfo";
|
|
4
|
-
|
|
5
|
-
import colors from '../../../../config/colors';
|
|
6
4
|
import Text from "./Text";
|
|
5
|
+
import useColors from '@boneframework/native-components/hooks/useColors';
|
|
7
6
|
|
|
8
7
|
function OfflineNotice(props) {
|
|
9
8
|
const netInfo = useNetInfo();
|
|
9
|
+
const colors = useColors();
|
|
10
|
+
|
|
11
|
+
const styles = StyleSheet.create({
|
|
12
|
+
container: {
|
|
13
|
+
backgroundColor: colors.primary,
|
|
14
|
+
color: colors.white,
|
|
15
|
+
alignItems: "center",
|
|
16
|
+
justifyContent: "center",
|
|
17
|
+
padding: 10,
|
|
18
|
+
paddingTop: 20
|
|
19
|
+
},
|
|
20
|
+
text: {
|
|
21
|
+
color: colors.white,
|
|
22
|
+
}
|
|
23
|
+
})
|
|
10
24
|
|
|
11
25
|
if (netInfo.type !== 'unkown' && netInfo.isInternetReachable === false) {
|
|
12
26
|
return(
|
|
@@ -19,18 +33,6 @@ function OfflineNotice(props) {
|
|
|
19
33
|
return null;
|
|
20
34
|
}
|
|
21
35
|
|
|
22
|
-
|
|
23
|
-
container: {
|
|
24
|
-
backgroundColor: colors.primary,
|
|
25
|
-
color: colors.white,
|
|
26
|
-
alignItems: "center",
|
|
27
|
-
justifyContent: "center",
|
|
28
|
-
padding: 10,
|
|
29
|
-
paddingTop: 20
|
|
30
|
-
},
|
|
31
|
-
text: {
|
|
32
|
-
color: colors.white,
|
|
33
|
-
}
|
|
34
|
-
})
|
|
36
|
+
|
|
35
37
|
|
|
36
38
|
export default OfflineNotice;
|
package/components/Text.tsx
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
+
import useStyle from '@boneframework/native-components/hooks/useStyle';
|
|
1
2
|
import React from 'react';
|
|
2
|
-
import {Text as NativeText
|
|
3
|
-
|
|
4
|
-
import defaultStyles from '../../../../config/styles'
|
|
5
|
-
import colors from "../../../../config/colors";
|
|
3
|
+
import {Text as NativeText} from "react-native";
|
|
6
4
|
|
|
7
5
|
function Text({children, style, ...otherProps}) {
|
|
6
|
+
const defaultStyles = useStyle();
|
|
7
|
+
|
|
8
8
|
return (
|
|
9
9
|
<NativeText style={[defaultStyles.text, style]} {...otherProps} >
|
|
10
10
|
{children}
|