Skip to content

Commit 5b43929

Browse files
DoTheBestMayBDoTheBestMayB
committed
Merge branch 'develop' into 96-fix-nav-graph-and-viewmodel
# Conflicts: # presentation/src/main/java/com/stop/ui/map/MapFragment.kt # presentation/src/main/java/com/stop/ui/route/RouteFragment.kt # presentation/src/main/res/values/strings.xml
2 parents 3fe0107 + 4f2da4e commit 5b43929

File tree

71 files changed

+1808
-944
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1808
-944
lines changed

โ€Žpresentation/src/main/AndroidManifest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
<uses-permission android:name="android.permission.INTERNET" />
77
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
88
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
9-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
9+
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
10+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
1011

1112
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
1213
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
@@ -33,6 +34,8 @@
3334

3435
<service android:name=".alarm.SoundService" />
3536

37+
<service android:name=".ui.mission.MissionService"/>
38+
3639
<service android:name=".alarm.SoundRestartService" />
3740

3841
<provider

โ€Žpresentation/src/main/assets/fail_animation2.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"v":"5.7.4","fr":30,"ip":0,"op":45,"w":500,"h":500,"nm":"Faild Icon","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Cross","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.214],"y":[1]},"o":{"x":[0.284],"y":[0]},"t":16,"s":[0]},{"t":33,"s":[90]}],"ix":10},"p":{"a":0,"k":[250.125,250,0],"ix":2,"l":2},"a":{"a":0,"k":[-3.875,7,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"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":[[-48.75,38.25],[35,-45.75]],"c":false},"ix":2},"nm":"Path 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":42,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.214],"y":[1]},"o":{"x":[0.284],"y":[0]},"t":16,"s":[100]},{"t":33,"s":[0]}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":4,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","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":-90,"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":"Line-2","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":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-45.75,49],[38,-35]],"c":false},"ix":2},"nm":"Path 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":42,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.214],"y":[1]},"o":{"x":[0.284],"y":[0]},"t":16,"s":[0]},{"t":33,"s":[0]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.214],"y":[1]},"o":{"x":[0.284],"y":[0]},"t":16,"s":[0]},{"t":33,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":4,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","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":"Line-1","np":4,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":300,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Red Circle","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,250,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.316,0.316,0.667],"y":[1,1,1]},"o":{"x":[0.742,0.742,0.333],"y":[0,0,0]},"t":0,"s":[0,0,100]},{"i":{"x":[0.283,0.283,0.667],"y":[1,1,1]},"o":{"x":[0.839,0.839,0.333],"y":[0,0,0]},"t":10,"s":[111,111,100]},{"t":15,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[8.783,21.204],[16.229,16.229],[21.204,8.783],[22.951,0],[28.741,-19.204],[13.229,-31.935],[-6.744,-33.902],[-24.442,-24.442],[-33.902,-6.744],[-31.935,13.229],[-19.204,28.741],[0,34.567]],"o":[[-8.783,-21.205],[-16.228,-16.228],[-21.204,-8.782],[-34.566,0],[-28.742,19.203],[-13.228,31.935],[6.744,33.902],[24.442,24.442],[33.902,6.743],[31.935,-13.228],[19.204,-28.741],[0,-22.951]],"v":[[161.467,-66.882],[123.581,-123.582],[66.882,-161.468],[0,-174.771],[-97.097,-145.316],[-161.467,-66.882],[-171.413,34.096],[-123.582,123.581],[-34.096,171.413],[66.882,161.467],[145.316,97.097],[174.771,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.874509803922,0.282352941176,0.349019607843,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":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":300,"st":0,"bm":0}],"markers":[]}

โ€Žpresentation/src/main/assets/moving_bus.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

โ€Žpresentation/src/main/assets/timer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.21","a":"","k":"","d":"","tc":""},"fr":24,"ip":0,"op":48,"w":120,"h":120,"nm":"sand timer","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":3,"nm":"Null 3","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.742],"y":[0]},"t":16,"s":[0]},{"t":43,"s":[-180]}],"ix":10},"p":{"a":0,"k":[60,60,0],"ix":2},"a":{"a":0,"k":[50,50,0],"ix":1},"s":{"a":0,"k":[73,73,100],"ix":6}},"ao":0,"ip":0,"op":240,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"top sand","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,35.334,0],"ix":2},"a":{"a":0,"k":[-388.008,75.466,0],"ix":1},"s":{"a":0,"k":[136.986,136.986,100],"ix":6}},"ao":0,"hasMask":true,"masksProperties":[{"inv":false,"mode":"a","pt":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":-4,"s":[{"i":[[0,0],[8.5,-3],[0,0],[0,0],[0,0]],"o":[[0,0],[-8.896,3.14],[0,0],[0,0],[0,0]],"v":[[-371.449,64.5],[-389.008,58.5],[-404,64.5],[-404,87.25],[-371.449,87.25]],"c":true}]},{"i":{"x":0.557,"y":1},"o":{"x":0.167,"y":0.167},"t":19,"s":[{"i":[[0,0],[3.516,5.35],[0,0],[0,0],[0,0]],"o":[[0,0],[-4.234,-6.15],[0,0],[0,0],[0,0]],"v":[[-379.199,83.761],[-392.024,74.823],[-404,75.511],[-404,87.601],[-371.449,87.601]],"c":true}]},{"t":39.2138671875,"s":[{"i":[[0,0],[9.25,0],[0,0],[0,0],[0,0]],"o":[[0,0],[-8.974,0],[0,0],[0,0],[0,0]],"v":[[-371.449,88],[-388.508,88],[-404,88],[-404,88],[-371.449,88]],"c":true}]}],"ix":1},"o":{"a":0,"k":100,"ix":3},"x":{"a":0,"k":0,"ix":4},"nm":"top mask"}],"shapes":[{"ty":"gr","it":[{"ty":"fl","c":{"a":0,"k":[1,0.7804,0.4,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 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"fl","c":{"a":0,"k":[1,0.7804,0.4,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":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":[[3.507,3.571],[0,0],[0,0],[0,2.437],[0,0],[-0.43,0],[0,0],[0,-0.43],[0,0],[1.489,-1.691],[0,0]],"o":[[0,0],[0,0],[-1.707,-1.739],[0,0],[0,-0.43],[0,0],[0.43,0],[0,0],[0,2.251],[0,0],[0,0]],"v":[[-390.332,80.46],[-392.903,77.973],[-397.727,73.057],[-400.374,66.58],[-400.374,65.02],[-399.595,64.241],[-376.422,64.241],[-375.643,65.02],[-375.643,67.039],[-377.952,73.151],[-382.162,77.929]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.7804,0.4,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":"Group 1","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"bottom sand 2","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,64.443,0],"ix":2},"a":{"a":0,"k":[-388.008,75.466,0],"ix":1},"s":{"a":0,"k":[136.986,-136.986,100],"ix":6}},"ao":0,"hasMask":true,"masksProperties":[{"inv":false,"mode":"a","pt":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[{"i":[[0,0],[-8.5,0.021],[0,0],[0,0],[0,0]],"o":[[0,0],[8.896,-0.022],[0,0],[0,0],[0,0]],"v":[[-404,62.26],[-386.382,62.199],[-371.449,62.26],[-371.39,62],[-403.941,62]],"c":true}]},{"t":39,"s":[{"i":[[0,0],[-8.5,3],[0,0],[0,0],[0,0]],"o":[[0,0],[8.896,-3.14],[0,0],[0,0],[0,0]],"v":[[-404,95.75],[-386.382,87],[-371.449,95.75],[-371.39,58.25],[-403.941,58.25]],"c":true}]}],"ix":1},"o":{"a":0,"k":100,"ix":3},"x":{"a":0,"k":0,"ix":4},"nm":"top mask"}],"shapes":[{"ty":"gr","it":[{"ty":"fl","c":{"a":0,"k":[1,0.7804,0.4,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 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"fl","c":{"a":0,"k":[1,0.7804,0.4,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":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],[0,2.437],[0,0],[-0.43,0],[0,0],[0,-0.43],[0,0],[1.489,-1.691],[0,0],[0,0]],"o":[[0,0],[-1.707,-1.739],[0,0],[0,-0.43],[0,0],[0.43,0],[0,0],[0,2.251],[0,0],[0,0],[-3.071,3.486]],"v":[[-392.102,78.79],[-397.727,73.057],[-400.374,66.58],[-400.374,65.02],[-399.595,64.241],[-376.422,64.241],[-375.643,65.02],[-375.643,67.039],[-377.952,73.151],[-383.095,78.988],[-384.631,80.511]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.7804,0.4,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":"Group 1","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"filler path","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50.685,50,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[136.986,136.986,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":[[0,-18.312],[0.041,19]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.7804,0.4,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":2,"lj":2,"bm":0,"d":[{"n":"d","nm":"dash","v":{"a":0,"k":0,"ix":1}},{"n":"o","nm":"offset","v":{"a":0,"k":0,"ix":7}}],"nm":"Stroke 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":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.569],"y":[1]},"o":{"x":[0.37],"y":[0]},"t":1,"s":[0]},{"t":46,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.363],"y":[1]},"o":{"x":[0.613],"y":[-0.021]},"t":-4,"s":[28]},{"t":15.642578125,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":115,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"botter","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,50,0],"ix":2},"a":{"a":0,"k":[-388.008,86.539,0],"ix":1},"s":{"a":0,"k":[136.986,136.986,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,3.284],[0,0],[0,0],[0,0],[-2.475,-2.522],[0,0],[1.626,-1.657],[0,0],[0,-3.534],[0,0],[0,0],[0,0],[2.171,2.464],[0,0],[-1.419,1.61],[0,0]],"o":[[0,0],[0,0],[0,0],[0,3.534],[0,0],[1.626,1.657],[0,0],[-2.475,2.522],[0,0],[0,0],[0,0],[0,-3.284],[0,0],[-1.419,-1.61],[0,0],[2.171,-2.464]],"v":[[-371.674,68.761],[-371.674,59.435],[-404.342,59.435],[-404.342,68.343],[-400.481,77.792],[-394.803,83.578],[-394.803,89.547],[-400.481,95.333],[-404.342,104.782],[-404.342,113.642],[-371.674,113.642],[-371.674,104.364],[-375.043,95.445],[-380.388,89.379],[-380.388,83.745],[-375.043,77.68]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.7804,0.4,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.9575,0.952,0.9425,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":"Group 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":240,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"top fill","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[49.985,7.498,0],"ix":2},"a":{"a":0,"k":[-388.008,58.473,0],"ix":1},"s":{"a":0,"k":[136.986,136.986,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.981,0],[0,0],[0,0.981],[0,0],[-0.981,0],[0,0],[0,-0.981],[0,0]],"o":[[0,0],[-0.981,0],[0,0],[0,-0.981],[0,0],[0.981,0],[0,0],[0,0.981]],"v":[[-369.606,60.249],[-406.411,60.249],[-408.187,58.473],[-408.187,58.473],[-406.411,56.698],[-369.606,56.698],[-367.83,58.473],[-367.83,58.473]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.7804,0.4,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":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":240,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"bottom fill","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50.015,92.116,0],"ix":2},"a":{"a":0,"k":[-388.008,114.495,0],"ix":1},"s":{"a":0,"k":[136.986,136.986,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.981,0],[0,0],[0,0.981],[0,0],[-0.981,0],[0,0],[0,-0.981],[0,0]],"o":[[0,0],[-0.981,0],[0,0],[0,-0.981],[0,0],[0.981,0],[0,0],[0,0.981]],"v":[[-369.606,116.27],[-406.411,116.27],[-408.187,114.495],[-408.187,114.495],[-406.411,112.719],[-369.606,112.719],[-367.83,114.495],[-367.83,114.495]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.7804,0.4,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":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":240,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"cristal","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,50,0],"ix":2},"a":{"a":0,"k":[-388.008,87.579,0],"ix":1},"s":{"a":0,"k":[136.986,136.986,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0.43],[0,0],[-1.706,1.741],[0,0],[3.507,3.571],[0,0],[0,2.437],[0,0],[-0.43,0],[0,0],[0,-0.43],[0,0],[1.489,-1.691],[0,0],[-3.071,-3.486],[0,0],[0,-2.252],[0,0],[0.43,0]],"o":[[-0.43,0],[0,0],[0,-2.437],[0,0],[3.506,-3.569],[0,0],[-1.707,-1.739],[0,0],[0,-0.43],[0,0],[0.43,0],[0,0],[0,2.251],[0,0],[-3.071,3.486],[0,0],[1.489,1.691],[0,0],[0,0.43],[0,0]],"v":[[-399.595,110.917],[-400.374,110.138],[-400.374,106.544],[-397.728,100.067],[-390.83,93.037],[-390.832,80.085],[-397.727,73.057],[-400.374,66.58],[-400.374,65.02],[-399.595,64.241],[-376.422,64.241],[-375.643,65.02],[-375.643,67.039],[-377.952,73.151],[-384.381,80.448],[-384.381,92.676],[-377.952,99.973],[-375.643,106.087],[-375.643,110.138],[-376.422,110.917]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","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":"Group 1","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":240,"st":0,"bm":0}],"markers":[]}

0 commit comments

Comments
ย (0)