From e8c850f5f0526a29cf3cc42a011b9ec539b2dd2c Mon Sep 17 00:00:00 2001 From: Myzel394 <50424412+Myzel394@users.noreply.github.com> Date: Thu, 18 Aug 2022 00:03:00 +0200 Subject: [PATCH] added empty screen; improvements & bugfixes --- assets/lottie/flying-astronaut.json | 1 + lib/foreign_types/memory.dart | 2 +- lib/locale/l10n/app_de.arb | 8 +- lib/locale/l10n/app_en.arb | 8 +- lib/main.dart | 2 + lib/managers/file_manager.dart | 4 +- lib/models/memories.dart | 6 +- lib/screens/empty_screen.dart | 68 +++ lib/screens/main_screen.dart | 428 +++++++++--------- .../main_screen/today_photo_button.dart | 8 + lib/screens/server_loading_screen.dart | 26 +- lib/screens/timeline_screen.dart | 13 + lib/screens/welcome_screen.dart | 4 +- lib/widgets/fade_and_move_in_animation.dart | 7 + pubspec.lock | 14 + pubspec.yaml | 2 + 16 files changed, 379 insertions(+), 222 deletions(-) create mode 100644 assets/lottie/flying-astronaut.json create mode 100644 lib/screens/empty_screen.dart diff --git a/assets/lottie/flying-astronaut.json b/assets/lottie/flying-astronaut.json new file mode 100644 index 0000000..e799c20 --- /dev/null +++ b/assets/lottie/flying-astronaut.json @@ -0,0 +1 @@ +{"v":"5.7.1","fr":60,"ip":0,"op":360,"w":231,"h":95,"nm":"astronautTamKemikli","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"yildizlar Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[120.277,45.662,0],"ix":2},"a":{"a":0,"k":[103.779,38.709,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":0,"k":{"i":[[0,0],[4.932,-4.565]],"o":[[-7.53,3.723],[0,0]],"v":[[14.143,-16.486],[-6.643,-3.014]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.685999971278,0.709999952129,0.736999990426,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1,"ix":5},"lc":2,"lj":1,"ml":10,"bm":0,"d":[{"n":"d","nm":"dash","v":{"a":0,"k":25,"ix":1}},{"n":"o","nm":"offset","v":{"a":1,"k":[{"i":{"x":[0.472],"y":[1]},"o":{"x":[0.287],"y":[0]},"t":111,"s":[-25]},{"t":153,"s":[-75]}],"ix":7}}],"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[69.562,91.92],"ix":2},"a":{"a":0,"k":[35.88,45.173],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.73],"y":[0]},"t":105,"s":[0]},{"t":178,"s":[-24.595]}],"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},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.793,0],[0,-0.793],[0.793,0],[0,0.793]],"o":[[0.793,0],[0,0.793],[-0.793,0],[0,-0.793]],"v":[[0,-1.436],[1.436,0],[0,1.436],[-1.436,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.685999971278,0.709999952129,0.736999990426,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":[21.939,70.597],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":65,"s":[0,0]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":91,"s":[100,100]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":96,"s":[100,100]},{"t":122,"s":[0,0]}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":61,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":4,"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.574,0],[0,-0.575],[0.575,0],[0,0.575]],"o":[[0.575,0],[0,0.575],[-0.574,0],[0,-0.575]],"v":[[0,-1.041],[1.041,0],[0,1.041],[-1.041,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.685999971278,0.709999952129,0.736999990426,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":[206.267,1.291],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":223,"s":[0,0]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":249,"s":[100,100]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":254,"s":[100,100]},{"t":280,"s":[0,0]}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":61,"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":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.851,0],[0,-0.851],[0.852,0],[0,0.851]],"o":[[0.852,0],[0,0.851],[-0.851,0],[0,-0.851]],"v":[[0,-1.541],[1.541,0],[0,1.541],[-1.541,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.685999971278,0.709999952129,0.736999990426,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":[172.767,24.602],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":21,"s":[0,0]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":47,"s":[100,100]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":52,"s":[100,100]},{"t":78,"s":[0,0]}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":61,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":4,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.851,0],[0,-0.851],[0.851,0],[0,0.851]],"o":[[0.851,0],[0,0.851],[-0.851,0],[0,-0.851]],"v":[[0,-1.541],[1.541,0],[0,1.541],[-1.541,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.685999971278,0.709999952129,0.736999990426,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":[35.767,12.602],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":134,"s":[0,0]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":160,"s":[100,100]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":165,"s":[100,100]},{"t":191,"s":[0,0]}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":61,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5","np":4,"cix":2,"bm":0,"ix":5,"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],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-0.001,-3.536],[1.249,-1.25],[3.535,0],[1.249,1.25],[-0.001,3.536],[-1.251,1.25],[-3.536,0],[-1.251,-1.25]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.685999971278,0.709999952129,0.736999990426,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":[192.937,73.633],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":105,"s":[0,0]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":135,"s":[100,100]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":150,"s":[100,100]},{"t":180,"s":[0,0]}],"ix":3},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":105,"s":[0]},{"t":180,"s":[180]}],"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":2,"cix":2,"bm":0,"ix":6,"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],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[0,-3.456],[1.222,-1.222],[3.456,0],[1.222,1.222],[0,3.456],[-1.222,1.222],[-3.456,0],[-1.222,-1.222]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.685999971278,0.709999952129,0.736999990426,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":[3.706,28.971],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":285,"s":[0,0]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":315,"s":[100,100]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":330,"s":[100,100]},{"t":359,"s":[0,0]}],"ix":3},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":285,"s":[0]},{"t":359,"s":[180]}],"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":7,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0}]},{"id":"comp_1","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"yildizlar Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[113.895,47.73,0],"ix":2},"a":{"a":0,"k":[100.367,31.507,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":0,"k":{"i":[[-0.793,0],[0,-0.793],[0.793,0],[0,0.793]],"o":[[0.793,0],[0,0.793],[-0.793,0],[0,-0.793]],"v":[[0,-1.436],[1.436,0],[0,1.436],[-1.436,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.685999971278,0.709999952129,0.736999990426,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":[3.332,61.327],"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":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":90,"s":[50]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":180,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":270,"s":[50]},{"t":359,"s":[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},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.575,0],[0,-0.575],[0.575,0],[0,0.575]],"o":[[0.575,0],[0,0.575],[-0.575,0],[0,-0.575]],"v":[[0,-1.041],[1.041,0],[0,1.041],[-1.041,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.685999971278,0.709999952129,0.736999990426,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":[41.319,43.181],"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":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[65]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":90,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":180,"s":[65]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":270,"s":[100]},{"t":359,"s":[65]}],"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","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.574,0],[0,-0.575],[0.575,0],[0,0.575]],"o":[[0.575,0],[0,0.575],[-0.574,0],[0,-0.575]],"v":[[0,-1.041],[1.041,0],[0,1.041],[-1.041,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.685999971278,0.709999952129,0.736999990426,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":[199.442,13.054],"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":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[30]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":90,"s":[50]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":180,"s":[30]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":270,"s":[50]},{"t":359,"s":[30]}],"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","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.851,0],[0,-0.852],[0.852,0],[0,0.851]],"o":[[0.852,0],[0,0.851],[-0.851,0],[0,-0.852]],"v":[[0,-1.541],[1.54,0],[0,1.541],[-1.54,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.685999971278,0.709999952129,0.736999990426,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":[179.484,53.659],"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":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[81]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":90,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":180,"s":[81]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":270,"s":[100]},{"t":359,"s":[81]}],"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":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.851,0],[0,-0.851],[0.852,0],[0,0.851]],"o":[[0.852,0],[0,0.851],[-0.851,0],[0,-0.851]],"v":[[0,-1.541],[1.54,0],[0,1.541],[-1.54,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.685999971278,0.709999952129,0.736999990426,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":[165.524,1.791],"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":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[60]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":90,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":180,"s":[60]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":270,"s":[100]},{"t":359,"s":[60]}],"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":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.851,0],[0,-0.851],[0.851,0],[0,0.851]],"o":[[0.851,0],[0,0.851],[-0.851,0],[0,-0.851]],"v":[[0,-1.541],[1.541,0],[0,1.541],[-1.541,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.685999971278,0.709999952129,0.736999990426,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":[1.791,4.873],"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":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[85]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":90,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":180,"s":[85]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":270,"s":[100]},{"t":359,"s":[85]}],"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 6","np":2,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"onBilek Outlines","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33.999,1.729,0],"ix":2},"a":{"a":0,"k":[2.632,8.25,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":0,"k":{"i":[[0,0],[-0.391,0.253],[-1.228,1.469],[0.014,-1.873],[-0.739,-0.312],[1.479,0.012],[0.614,-0.323],[1.009,-1.119],[0.34,0.326],[0.037,0.06]],"o":[[-0.249,-0.393],[1.634,-0.999],[1.59,-1.976],[-0.013,1.637],[0.882,0.373],[-0.752,-0.006],[-0.613,0.323],[-0.326,0.34],[-0.05,-0.049],[0,0]],"v":[[-5.258,1.368],[-5.004,0.202],[-0.682,-3.523],[3.867,-2.542],[4.626,-0.113],[3.882,1.898],[1.777,2.225],[-1.644,5.15],[-2.85,5.173],[-2.982,5.01]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.349000010771,0.380000005984,0.404000016755,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":[5.757,5.75],"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":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"onParkmakAlt Outlines","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":76,"s":[-13.21]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":170,"s":[8.158]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":264,"s":[-26.116]},{"t":359,"s":[0]}],"ix":10},"p":{"a":0,"k":[9.937,6.549,0],"ix":2},"a":{"a":0,"k":[1.542,1.443,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":0,"k":{"i":[[-0.567,-0.281],[0.506,-0.695],[0.559,0],[-0.341,0.646]],"o":[[1.621,0.801],[-0.381,0.525],[-0.637,0.001],[0.229,-0.437]],"v":[[-0.71,-0.975],[1.942,0.731],[-1.347,1.037],[-2.107,-0.444]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.349000010771,0.380000005984,0.404000016755,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":[2.698,1.506],"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":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"onParmakUst Outlines","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":76,"s":[22.093]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":170,"s":[-11.458]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":264,"s":[22.093]},{"t":359,"s":[0]}],"ix":10},"p":{"a":0,"k":[7.276,3.344,0],"ix":2},"a":{"a":0,"k":[3.33,6.926,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":0,"k":{"i":[[-0.944,1.734],[-0.828,-0.129],[-0.001,-2.134],[1.381,-0.094]],"o":[[0.944,-1.734],[0.8,0.125],[0,0.936],[-1.449,0.098]],"v":[[-1.854,1.104],[1.998,-4.328],[2.628,2.252],[0.25,4.359]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.349000010771,0.380000005984,0.404000016755,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":[3.049,4.707],"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":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"onKol Outlines","parent":7,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[16]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":90,"s":[-6]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":180,"s":[16]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":270,"s":[-6]},{"t":359,"s":[16]}],"ix":10},"p":{"a":0,"k":[18.105,29.056,0],"ix":2},"a":{"a":0,"k":[8.595,21.521,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":0,"k":{"i":[[0,0],[-0.008,0.309],[0,0],[0,0],[4.097,-2.491],[0.396,-2.433],[-3.825,-2.121]],"o":[[0,0],[0,0],[0,0],[0,0],[-1.449,0.88],[-0.238,1.46],[6.975,3.868]],"v":[[-1.18,10.577],[7.943,-0.391],[17.094,-11.792],[14.423,-15.771],[-14.09,-1.361],[-16.857,3.628],[-13.135,11.904]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.635000011968,0.670999983245,0.705999995213,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":[17.345,16.021],"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":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"onAyakKalca Outlines","parent":7,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[0.992]},"o":{"x":[0.412],"y":[0]},"t":0,"s":[-5]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[-0.009]},"t":167,"s":[10]},{"t":359,"s":[-5]}],"ix":10},"p":{"a":0,"k":[28.32,55.049,0],"ix":2},"a":{"a":0,"k":[12.912,15.937,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":0,"k":{"i":[[2.842,0.331],[3.03,-0.355],[4.888,-2.598],[-0.979,-1.61],[-4.734,1.638],[-7.77,1.233],[0,4.341]],"o":[[-5.686,-0.663],[-3.03,0.357],[-8.171,4.34],[3.534,5.812],[7.485,-2.589],[3.884,-0.615],[0,-4.085]],"v":[[16.911,-12.773],[1.656,-12.585],[-15.617,-7.764],[-20.494,6.419],[-7.156,11.799],[16.721,2.008],[23.788,-5.542]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.635000011968,0.670999983245,0.705999995213,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":[24.037,13.687],"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":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"onAyakUC Outlines","parent":5,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.713],"y":[1]},"o":{"x":[0.484],"y":[0.113]},"t":0,"s":[0]},{"i":{"x":[0.564],"y":[1]},"o":{"x":[0.286],"y":[0]},"t":167,"s":[32]},{"t":360,"s":[0]}],"ix":10},"p":{"a":0,"k":[38.83,8.344,0],"ix":2},"a":{"a":0,"k":[8.234,7.999,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":0,"k":{"i":[[1.187,0.838],[0,0],[0.174,-0.246],[0,0],[0,0],[-0.246,-0.175],[0,0],[-0.976,1.377],[0,0],[0,0],[0,0],[1.155,0.818],[0,0],[0.869,-0.506],[0,0]],"o":[[0,0],[-0.245,-0.174],[0,0],[0,0],[-0.174,0.246],[0,0],[1.377,0.974],[0,0],[0,0],[0,0],[0.82,-1.156],[0,-0.001],[-0.819,-0.582],[0,0],[-1.256,0.73]],"v":[[-1.027,-5.874],[-4.165,-8.096],[-4.925,-7.967],[-4.926,-7.965],[-10.856,0.406],[-10.726,1.167],[-1.826,7.469],[2.434,6.74],[6.349,1.214],[7.229,-0.027],[10.21,-4.238],[9.602,-7.812],[9.601,-7.813],[6.829,-7.937],[2.982,-5.697]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.349000010771,0.380000005984,0.404000016755,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":[32.689,17.305],"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":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":[[5.685,0.662],[0.683,-5.809],[-4.046,0.641],[0,0],[0,0]],"o":[[-2.726,-0.318],[-0.656,5.568],[7.771,-1.233],[0,0],[0,0]],"v":[[-3.912,-8.469],[-13.358,-1.73],[-5.302,6.593],[7.76,8.787],[14.014,0.449]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.635000011968,0.670999983245,0.705999995213,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":[14.264,9.037],"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 2","np":4,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"govde Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.092]},"t":0,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.335],"y":[0]},"t":90,"s":[-4]},{"i":{"x":[0.735],"y":[0.855]},"o":{"x":[0.333],"y":[0]},"t":270,"s":[4]},{"t":359,"s":[0]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.275,"y":0.402},"t":0,"s":[107.641,52.249,0],"to":[0,0.958,0],"ti":[0,0.708,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":105,"s":[107.641,57.999,0],"to":[0,-0.708,0],"ti":[0,0.958,0]},{"i":{"x":0.725,"y":0.482},"o":{"x":0.323,"y":0},"t":255,"s":[107.641,47.999,0],"to":[0,-0.958,0],"ti":[0,-0.708,0]},{"t":359,"s":[107.641,52.249,0]}],"ix":2},"a":{"a":0,"k":[28.921,41.814,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":0,"s":[{"i":[[12.562,10.319],[1.021,4.886],[0,0],[2.176,2.871],[4.097,-2.491],[-4.076,-13.929],[-7.484,2.59]],"o":[[-3.522,-2.894],[-0.067,-0.309],[0,0],[-2.993,-3.95],[-4.023,2.444],[4.074,13.929],[7.486,-2.589]],"v":[[9.704,-3.18],[2.873,-13.072],[-5.333,-9.365],[-6.223,-19.564],[-18.243,-21.303],[-18.15,3.643],[0.893,21.204]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[{"i":[[12.562,10.319],[1.021,4.886],[0,0],[2.176,2.871],[4.097,-2.491],[-4.076,-13.929],[-7.484,2.59]],"o":[[-3.522,-2.894],[-0.067,-0.309],[0,0],[-2.993,-3.95],[-4.023,2.444],[4.074,13.929],[7.486,-2.589]],"v":[[9.704,-3.18],[1.29,-16.023],[-5.333,-9.365],[-6.223,-19.564],[-18.243,-21.303],[-18.15,3.643],[0.893,21.204]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":180,"s":[{"i":[[12.562,10.319],[1.021,4.886],[0,0],[2.176,2.871],[4.097,-2.491],[-4.076,-13.929],[-7.484,2.59]],"o":[[-3.522,-2.894],[-0.067,-0.309],[0,0],[-2.993,-3.95],[-4.023,2.444],[4.074,13.929],[7.486,-2.589]],"v":[[9.704,-3.18],[2.873,-13.072],[-5.333,-9.365],[-6.223,-19.564],[-18.243,-21.303],[-18.15,3.643],[0.893,21.204]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":270,"s":[{"i":[[12.562,10.319],[1.021,4.886],[0,0],[2.176,2.871],[4.097,-2.491],[-4.076,-13.929],[-7.484,2.59]],"o":[[-3.522,-2.894],[-0.067,-0.309],[0,0],[-2.993,-3.95],[-4.023,2.444],[4.074,13.929],[7.486,-2.589]],"v":[[9.704,-3.18],[1.29,-16.023],[-5.333,-9.365],[-6.223,-19.564],[-18.243,-21.303],[-18.15,3.643],[0.893,21.204]],"c":true}]},{"t":359,"s":[{"i":[[12.562,10.319],[1.021,4.886],[0,0],[2.176,2.871],[4.097,-2.491],[-4.076,-13.929],[-7.484,2.59]],"o":[[-3.522,-2.894],[-0.067,-0.309],[0,0],[-2.993,-3.95],[-4.023,2.444],[4.074,13.929],[7.486,-2.589]],"v":[[9.704,-3.18],[2.873,-13.072],[-5.333,-9.365],[-6.223,-19.564],[-18.243,-21.303],[-18.15,3.643],[0.893,21.204]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.635000011968,0.670999983245,0.705999995213,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":[31.036,43.49],"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":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-0.391,-0.526],[-0.26,-0.588],[-0.117,-0.629],[0.011,-0.635],[0.079,-0.003],[0.002,0.079],[0,0],[0.143,0.595],[0.782,0.929],[0.483,0.344],[0,0],[-0.101,0.151],[-0.151,-0.101],[-0.003,-0.002]],"o":[[0.517,0.403],[0.391,0.511],[0.263,0.584],[0.118,0.624],[0.002,0.079],[-0.078,0.002],[0,0],[-0.02,-0.611],[-0.286,-1.18],[-0.377,-0.457],[0,0],[-0.151,-0.1],[0.101,-0.151],[0.002,0.002],[0,0]],"v":[[-1.257,-3.404],[0.112,-2.004],[1.092,-0.349],[1.664,1.476],[1.825,3.369],[1.687,3.516],[1.541,3.378],[1.541,3.369],[1.295,1.556],[-0.329,-1.651],[-1.624,-2.856],[-1.644,-2.87],[-1.735,-3.326],[-1.279,-3.417],[-1.271,-3.412]],"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":[25.205,7.727],"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 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],[1.933,-0.01],[0.002,1.937],[-1.436,0.476],[-0.375,0.002],[0,-1.933]],"o":[[-0.004,1.933],[-1.937,0.002],[-0.001,-1.513],[0.357,-0.116],[1.933,0],[0,0]],"v":[[3.506,-0.005],[0.005,3.506],[-3.505,0.002],[-1.101,-3.33],[0.005,-3.508],[3.506,-0.008]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.783999992819,0.808000033509,0.838999968884,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":[17.804,12.122],"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":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.08,-0.23],[0,0],[0.13,-0.26],[0,0],[0,0],[0.35,0.09],[0,0],[0.04,2.14],[-0.23,0.58],[-0.01,0],[0,0],[-0.09,0.16],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-0.01,-0.55],[-1.69,0.04],[0,0],[0,0],[0,0]],"o":[[-0.06,0.24],[0,0],[-0.1,0.27],[0,0],[0,0],[-0.38,0],[0,0],[-1.98,-0.49],[-0.01,-0.62],[0,0],[0,0],[0.06,-0.17],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-0.26,0.48],[0.04,1.73],[0,0],[0,0],[0,0],[0,0]],"v":[[6.19,5.76],[5.97,6.47],[5.95,6.47],[5.62,7.27],[-1.46,7.41],[-1.56,7.41],[-2.65,7.27],[-2.67,7.27],[-6.18,2.87],[-5.84,1.05],[-5.83,1.04],[-5.83,1.03],[-5.6,0.54],[-5.53,0.42],[-1.22,-7.41],[-0.42,-7.15],[-0.41,-7.15],[-0.08,-6.97],[-0.06,-6.96],[0.17,-6.83],[-3.9,0.57],[-4.29,1.27],[-4.68,2.84],[-1.48,5.91],[-1.38,5.91],[-1.1,5.9],[6.18,5.76]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.783999992819,0.808000033509,0.838999968884,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":[21.883,8.05],"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 4","np":4,"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.27],[0,0],[0.03,-0.28],[0.04,-0.24],[0.12,-0.42],[0.08,-0.23],[0,0],[0,0],[0,0],[0,0],[0,0],[0.04,2.14],[-0.33,0.6],[0,0],[0,0],[0,0],[-0.23,-0.1],[0,0],[-0.33,-4]],"o":[[0,0],[0,0.28],[-0.01,0.23],[-0.06,0.43],[-0.06,0.24],[0,0],[0,0],[0,0],[0,0],[0,0],[-2.14,0.04],[-0.02,-0.69],[0,0],[0,0],[0,0],[0.24,0.08],[0,0],[3.73,1.51],[0.02,0.26]],"v":[[6.165,3.135],[6.165,3.235],[6.125,4.065],[6.045,4.775],[5.775,6.045],[5.555,6.755],[5.535,6.755],[3.645,6.795],[-2.095,6.905],[-2.105,6.905],[-2.185,6.905],[-6.145,3.105],[-5.665,1.145],[-5.595,1.025],[-2.855,-3.965],[-1.205,-6.945],[-0.495,-6.685],[-0.475,-6.675],[6.135,2.335]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.349000010771,0.380000005984,0.404000016755,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":[22.298,7.765],"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":4,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-0.27],[0,0],[0.03,-0.28],[0.04,-0.24],[0.12,-0.41],[0.09,-0.23],[0.13,-0.26],[4.31,0],[0,5.89],[-5.88,0],[-0.91,-0.26],[0,0],[0,0],[-0.31,-4.24]],"o":[[0,0],[0,0.28],[-0.01,0.23],[-0.07,0.43],[-0.07,0.24],[-0.1,0.27],[-1.67,3.68],[-5.88,0],[0,-5.88],[0.99,0],[0,0],[0,0],[3.84,1.4],[0.02,0.26]],"v":[[10.66,-0.005],[10.66,0.095],[10.62,0.925],[10.54,1.635],[10.26,2.905],[10.03,3.615],[9.7,4.415],[0,10.655],[-10.66,-0.005],[0,-10.655],[2.86,-10.265],[3.66,-10.005],[3.67,-10.005],[10.63,-0.805]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.677999997606,0.713999968884,0.74900004069,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":[17.803,10.905],"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":4,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-0.27],[0,0],[0.03,-0.28],[0.04,-0.24],[0.12,-0.42],[0.08,-0.23],[0,0],[0,0],[0,0],[0,0],[0.19,-0.11],[0.09,-0.04],[0.05,-0.02],[0,0],[0.04,-0.02],[1.01,1.07],[0.07,0.75],[-0.83,0.77],[-0.1,0.08],[-0.08,0.04],[-0.03,0.02],[0,0],[-0.03,0.02],[-0.19,0.06],[0,0],[0,0],[-0.23,-0.1],[0,0],[-0.33,-4]],"o":[[0,0],[0,0.28],[-0.01,0.23],[-0.06,0.43],[-0.06,0.24],[0,0],[0,0],[0,0],[0,0],[-0.16,0.16],[-0.09,0.06],[-0.06,0.03],[0,0],[-0.05,0.02],[-1.3,0.5],[-0.55,-0.59],[-0.09,-1.04],[0.09,-0.08],[0.08,-0.06],[0.04,-0.02],[0,0],[0.04,-0.01],[0.17,-0.1],[0,0],[0,0],[0.24,0.08],[0,0],[3.73,1.51],[0.02,0.26]],"v":[[7.077,2.684],[7.077,2.784],[7.037,3.613],[6.957,4.324],[6.687,5.594],[6.467,6.303],[6.447,6.303],[4.557,6.344],[-1.183,6.454],[-1.193,6.454],[-1.723,6.863],[-2.003,7.023],[-2.163,7.104],[-2.173,7.104],[-2.303,7.163],[-6.133,6.284],[-7.063,4.214],[-5.953,1.333],[-5.673,1.094],[-5.433,0.934],[-5.333,0.874],[-5.333,0.863],[-5.233,0.814],[-4.683,0.574],[-1.933,-4.417],[-0.293,-7.396],[0.417,-7.137],[0.437,-7.126],[7.047,1.883]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.33300000359,0.352999997606,0.368999974868,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":[21.387,8.217],"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":4,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[18.148,11.315],"ix":2},"a":{"a":0,"k":[18.148,11.315],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":105,"s":[-12]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"t":255,"s":[10]},{"t":359,"s":[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":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,0],[2.042,-0.685],[0,0],[1.556,4.622],[0,0.001],[0,0],[-4.622,1.556],[-0.001,0],[0,0]],"o":[[0.611,2.065],[0,0],[-4.621,1.556],[-0.001,0],[0,0],[-1.556,-4.621],[0.001,0],[0,0],[0,0]],"v":[[14.519,18.051],[11.954,22.98],[7.843,24.357],[-3.343,18.807],[-3.344,18.805],[-13.574,-11.579],[-8.024,-22.766],[-8.022,-22.767],[1.511,-25.913]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.426999978458,0.477999997606,0.528999956916,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":[15.38,44.862],"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":4,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"arkaBacak Outlines","parent":7,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.538],"y":[0]},"t":0,"s":[25]},{"i":{"x":[0.907],"y":[1]},"o":{"x":[0.189],"y":[0]},"t":145,"s":[-10]},{"t":359,"s":[25]}],"ix":10},"p":{"a":0,"k":[43.819,54.408,0],"ix":2},"a":{"a":0,"k":[13.351,8.202,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":0,"k":{"i":[[0.113,0.672],[0,0],[0.298,-0.051],[0,0],[-0.05,-0.296],[0,0],[0,0],[-0.781,0.133],[0,0],[0,0],[0,0],[0.109,0.654],[0,0.003],[0.456,0.119],[0,0]],"o":[[0,0],[-0.052,-0.297],[0,0],[-0.297,0.051],[0,0],[0,0],[0.134,0.781],[0,0],[0,0],[0,0],[0.653,-0.109],[0,-0.002],[-0.079,-0.466],[0,0],[-0.66,-0.176]],"v":[[0.641,-1.74],[0.386,-3.236],[-0.246,-3.682],[-4.423,-2.969],[-4.87,-2.34],[-4.87,-2.34],[-4.056,2.426],[-2.399,3.6],[0.737,3.064],[1.437,2.945],[3.826,2.536],[4.811,1.156],[4.81,1.148],[3.93,0.186],[1.909,-0.348]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.349000010771,0.380000005984,0.404000016755,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":[31.032,26.921],"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":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":[[-4.018,-1.209],[-3.45,-3.781],[0,0],[1.56,2.418],[9.477,-3.43]],"o":[[4.018,1.209],[0,0],[-0.801,-4.157],[-1.559,-2.418],[-9.477,3.431]],"v":[[-5.965,3.317],[10.578,11.926],[15.442,11.168],[9.442,-3.487],[-5.965,-8.496]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.517999985639,0.552999997606,0.592000026329,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":[15.692,12.176],"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 2","np":4,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"arkaBilek Outlines","parent":12,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33.029,4.707,0],"ix":2},"a":{"a":0,"k":[1.455,2.644,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":0,"k":{"i":[[0,0],[-0.301,-0.016],[-0.841,0.158],[0.723,-0.976],[-0.269,-0.445],[0.772,0.571],[0.445,0.064],[0.878,-0.223],[0.053,0.301],[-0.003,0.045]],"o":[[0.02,-0.301],[1.251,0.253],[1.868,-0.351],[-0.631,0.854],[0.32,0.533],[-0.391,-0.291],[-0.445,-0.065],[-0.301,0.054],[-0.008,-0.045],[0,0]],"v":[[-3.486,-2.13],[-2.909,-2.644],[0.996,-2.449],[2.764,-0.105],[2.234,1.458],[1.076,2.229],[-0.152,1.598],[-2.562,1.891],[-3.202,1.443],[-3.211,1.308]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.349000010771,0.380000005984,0.404000016755,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":[3.736,3.05],"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":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"arkPrmkUst Outlines","parent":9,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[23.823]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":81,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":175,"s":[23.823]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":256,"s":[-7.891]},{"t":359,"s":[23.823]}],"ix":10},"p":{"a":0,"k":[5.178,2.116,0],"ix":2},"a":{"a":0,"k":[2.062,3.406,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":0,"k":{"i":[[-1.157,0.548],[-0.385,-0.384],[0.815,-1.119],[0.759,0.478]],"o":[[1.156,-0.548],[0.372,0.371],[-0.357,0.492],[-0.798,-0.502]],"v":[[-1.654,-0.614],[2.439,-1.991],[0.257,1.7],[-1.794,1.896]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.349000010771,0.380000005984,0.404000016755,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":[3.061,2.625],"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":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":"arkPrmkAlt Outlines","parent":9,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[-18.606]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":84,"s":[23.621]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":175,"s":[-18.606]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":258,"s":[23.621]},{"t":359,"s":[-18.606]}],"ix":10},"p":{"a":0,"k":[5.317,4.798,0],"ix":2},"a":{"a":0,"k":[1.033,0.935,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":0,"k":{"i":[[-0.19,-0.363],[0.531,-0.171],[0.294,0.213],[-0.424,0.209]],"o":[[0.544,1.039],[-0.4,0.13],[-0.334,-0.243],[0.288,-0.141]],"v":[[0.084,-0.82],[0.823,1.087],[-1.02,-0.008],[-0.852,-1.076]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.349000010771,0.380000005984,0.404000016755,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":[1.603,1.467],"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":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":12,"ty":4,"nm":"arkaKol Outlines","parent":7,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[-6]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":90,"s":[10]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":180,"s":[-6]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":270,"s":[12]},{"t":359,"s":[-6]}],"ix":10},"p":{"a":0,"k":[19.477,29.316,0],"ix":2},"a":{"a":0,"k":[6.726,6.532,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":0,"k":{"i":[[-2.298,0],[0,0],[0,0],[2.51,-0.399],[-0.624,3.866]],"o":[[2.298,0],[0,0],[0,0],[-3.909,0.623],[0.755,-4.678]],"v":[[-8.01,-6.532],[15.428,-4.138],[16.477,-0.159],[-8.824,5.909],[-15.853,-0.981]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.517999985639,0.552999997606,0.592000026329,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":[16.726,6.782],"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":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":13,"ty":0,"nm":"yildizlar","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[115.5,47.5,0],"ix":2},"a":{"a":0,"k":[115.5,47.5,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":231,"h":95,"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":14,"ty":0,"nm":"yildiz","refId":"comp_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[115.5,47.5,0],"ix":2},"a":{"a":0,"k":[115.5,47.5,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":231,"h":95,"ip":0,"op":360,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/lib/foreign_types/memory.dart b/lib/foreign_types/memory.dart index 970eb36..7f23ecd 100644 --- a/lib/foreign_types/memory.dart +++ b/lib/foreign_types/memory.dart @@ -25,7 +25,7 @@ class Memory { creationDate: DateTime.parse(jsonData['created_at']), location: jsonData['location'], isPublic: jsonData['is_public'], - userID: jsonData['user'], + userID: jsonData['user_id'], ); } diff --git a/lib/locale/l10n/app_de.arb b/lib/locale/l10n/app_de.arb index 1d86ced..92b13a2 100644 --- a/lib/locale/l10n/app_de.arb +++ b/lib/locale/l10n/app_de.arb @@ -52,5 +52,11 @@ "memorySheetDownloadMemory": "In Gallerie speichern", "memorySheetUpdateMemoryMakePublic": "Veröffentlichen", "memorySheetUpdateMemoryMakePrivate": "Privat machen", - "memorySheetDeleteMemory": "Erinnerung löschen" + "memorySheetDeleteMemory": "Erinnerung löschen", + + + "emptyScreenTitle": "Houston, wir haben ein Problem", + "emptyScreenSubtitle": "Der Benutzer hat noch keine Erinnerungen erstellt!", + "emptyScreenDescription": "Um deinen Zeitstrahl sehen zu können musst du zuerst ein paar Erinnerungen erstellen! :)", + "emptyScreenCreateMemory": "Erinnerung erstellen" } \ No newline at end of file diff --git a/lib/locale/l10n/app_en.arb b/lib/locale/l10n/app_en.arb index 93b0161..b020f96 100644 --- a/lib/locale/l10n/app_en.arb +++ b/lib/locale/l10n/app_en.arb @@ -52,5 +52,11 @@ "memorySheetDownloadMemory": "Download to Gallery", "memorySheetUpdateMemoryMakePublic": "Make Public", "memorySheetUpdateMemoryMakePrivate": "Make Private", - "memorySheetDeleteMemory": "Delete Memory" + "memorySheetDeleteMemory": "Delete Memory", + + + "emptyScreenTitle": "Houston, we have a problem", + "emptyScreenSubtitle": "The user hasn't created any memories yet!", + "emptyScreenDescription": "To view your timeline you need to create some memories first! :)", + "emptyScreenCreateMemory": "Create a Memory" } \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index ca5f638..d6660e5 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -15,6 +15,7 @@ import 'package:quid_faciam_hodie/screens/welcome_screen.dart'; import 'managers/global_values_manager.dart'; import 'models/memories.dart'; +import 'screens/empty_screen.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); @@ -62,6 +63,7 @@ class _MyAppState extends State { GrantPermissionScreen.ID: (context) => const GrantPermissionScreen(), CalendarScreen.ID: (context) => const CalendarScreen(), ServerLoadingScreen.ID: (context) => const ServerLoadingScreen(), + EmptyScreen.ID: (context) => const EmptyScreen(), }, initialRoute: ServerLoadingScreen.ID, ), diff --git a/lib/managers/file_manager.dart b/lib/managers/file_manager.dart index d0dc867..60917c9 100644 --- a/lib/managers/file_manager.dart +++ b/lib/managers/file_manager.dart @@ -47,7 +47,7 @@ class FileManager { } final memoryResponse = await supabase.from('memories').insert({ - 'user': user.id, + 'user_id': user.id, 'location': path, }).execute(); @@ -60,7 +60,7 @@ class FileManager { final response = await supabase .from('memories') .select() - .eq('user', user.id) + .eq('user_id', user.id) .order('created_at', ascending: false) .limit(1) .single() diff --git a/lib/models/memories.dart b/lib/models/memories.dart index 29391f6..3bc3db3 100644 --- a/lib/models/memories.dart +++ b/lib/models/memories.dart @@ -39,7 +39,6 @@ class Memories extends PropertyChangeNotifier { } void removeMemoryByID(final String id) { - print("remooooooved"); _memories.removeWhere((memory) => memory.id == id); notifyListeners('memories'); } @@ -93,8 +92,9 @@ class Memories extends PropertyChangeNotifier { final memory = Memory.parse(response.newRecord!); final id = response.oldRecord!['id']; - removeMemoryByID(id); - addMemory(memory); + _memories.removeWhere((memory) => memory.id == id); + memories.add(memory); + break; } diff --git a/lib/screens/empty_screen.dart b/lib/screens/empty_screen.dart new file mode 100644 index 0000000..4af4282 --- /dev/null +++ b/lib/screens/empty_screen.dart @@ -0,0 +1,68 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; +import 'package:flutter_platform_widgets/flutter_platform_widgets.dart'; +import 'package:lottie/lottie.dart'; +import 'package:quid_faciam_hodie/constants/spacing.dart'; +import 'package:quid_faciam_hodie/screens/main_screen.dart'; +import 'package:quid_faciam_hodie/utils/theme.dart'; + +import '../widgets/icon_button_child.dart'; + +class EmptyScreen extends StatelessWidget { + static const ID = '/empty'; + + const EmptyScreen({Key? key}) : super(key: key); + + @override + Widget build(BuildContext context) { + final localizations = AppLocalizations.of(context)!; + + return PlatformScaffold( + body: Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Lottie.asset('assets/lottie/flying-astronaut.json'), + const SizedBox(height: LARGE_SPACE), + Padding( + padding: const EdgeInsets.all(MEDIUM_SPACE), + child: Column( + children: [ + Text( + localizations.emptyScreenTitle, + textAlign: TextAlign.center, + style: getTitleTextStyle(context), + ), + const SizedBox(height: MEDIUM_SPACE), + Text( + localizations.emptyScreenSubtitle, + textAlign: TextAlign.center, + style: getSubTitleTextStyle(context), + ), + const SizedBox(height: SMALL_SPACE), + Text( + textAlign: TextAlign.center, + localizations.emptyScreenDescription, + style: getBodyTextTextStyle(context), + ), + ], + ), + ), + const SizedBox(height: MEDIUM_SPACE), + PlatformElevatedButton( + child: IconButtonChild( + icon: Icon(context.platformIcons.back), + label: Text(localizations.emptyScreenCreateMemory), + ), + onPressed: () { + Navigator.pushNamedAndRemoveUntil( + context, MainScreen.ID, (_) => false); + }, + ), + ], + ), + ), + ); + } +} diff --git a/lib/screens/main_screen.dart b/lib/screens/main_screen.dart index 6d88eed..0dc4c38 100644 --- a/lib/screens/main_screen.dart +++ b/lib/screens/main_screen.dart @@ -4,6 +4,7 @@ import 'dart:typed_data'; import 'package:camera/camera.dart'; import 'package:expandable_bottom_sheet/expandable_bottom_sheet.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_platform_widgets/flutter_platform_widgets.dart'; import 'package:quid_faciam_hodie/constants/spacing.dart'; @@ -270,233 +271,244 @@ class _MainScreenState extends AuthRequiredState with Loadable { Widget build(BuildContext context) { final localizations = AppLocalizations.of(context)!; - return PlatformScaffold( - backgroundColor: Colors.black, - body: () { - if (isLoading) { - return Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - PlatformCircularProgressIndicator(), - const SizedBox(height: MEDIUM_SPACE), - Text( - localizations.mainScreenLoadingCamera, - style: platformThemeData( - context, - material: (data) => data.textTheme.bodyText1, - cupertino: (data) => data.textTheme.textStyle, - ), - ), - ], - ), - ); - } - - return Container( - color: Colors.black, - child: ExpandableBottomSheet( - background: SafeArea( - child: Align( - alignment: Alignment.topCenter, - child: AnimateInBuilder( - builder: (showPreview) => AnimatedOpacity( - opacity: showPreview ? 1.0 : 0.0, - duration: const Duration(milliseconds: 1100), - curve: Curves.easeOutQuad, - child: ClipRRect( - borderRadius: BorderRadius.circular(SMALL_SPACE), - child: AspectRatio( - aspectRatio: 1 / controller!.value.aspectRatio, - child: Stack( - fit: StackFit.expand, - children: [ - controller!.buildPreview(), - if (isRecording) - RecordingOverlay(controller: controller!), - if (uploadingPhotoAnimation != null) - UploadingPhoto( - data: uploadingPhotoAnimation!, - ), - ], - ), - ), - ), - ), - ), - ), - ), - persistentHeader: Container( - decoration: const BoxDecoration( - color: Colors.black, - borderRadius: BorderRadius.only( - topLeft: Radius.circular(LARGE_SPACE), - topRight: Radius.circular(LARGE_SPACE), - ), - ), + return WillPopScope( + onWillPop: () async { + SystemChannels.platform.invokeMethod('SystemNavigator.pop'); + SystemNavigator.pop(); + exit(0); + }, + child: PlatformScaffold( + backgroundColor: Colors.black, + body: () { + if (isLoading) { + return Center( child: Column( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ - const Padding( - padding: EdgeInsets.symmetric( - vertical: MEDIUM_SPACE, - horizontal: MEDIUM_SPACE, - ), - child: SheetIndicator(), - ), - Padding( - padding: const EdgeInsets.symmetric(vertical: SMALL_SPACE), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - Expanded( - child: FadeAndMoveInAnimation( - translationDuration: DEFAULT_TRANSLATION_DURATION * - SECONDARY_BUTTONS_DURATION_MULTIPLIER, - opacityDuration: DEFAULT_OPACITY_DURATION * - SECONDARY_BUTTONS_DURATION_MULTIPLIER, - child: ChangeCameraButton( - disabled: lockCamera || isRecording, - onChangeCamera: () { - final currentCameraIndex = GlobalValuesManager - .cameras - .indexOf(controller!.description); - final availableCameras = - GlobalValuesManager.cameras.length; - - onNewCameraSelected( - GlobalValuesManager.cameras[ - (currentCameraIndex + 1) % - availableCameras], - ); - }, - ), - ), - ), - Expanded( - child: FadeAndMoveInAnimation( - child: RecordButton( - disabled: lockCamera, - active: isRecording, - onVideoBegin: () async { - setState(() { - isRecording = true; - }); - - if (controller!.value.isRecordingVideo) { - // A recording has already started, do nothing. - return; - } - - await controller!.startVideoRecording(); - }, - onVideoEnd: takeVideo, - onPhotoShot: takePhoto, - ), - ), - ), - Expanded( - child: FadeAndMoveInAnimation( - translationDuration: DEFAULT_TRANSLATION_DURATION * - SECONDARY_BUTTONS_DURATION_MULTIPLIER, - opacityDuration: DEFAULT_OPACITY_DURATION * - SECONDARY_BUTTONS_DURATION_MULTIPLIER, - child: TodayPhotoButton( - onLeave: () { - controller!.setFlashMode(FlashMode.off); - }, - onComeBack: () { - if (isTorchEnabled) { - controller!.setFlashMode(FlashMode.torch); - } - }, - ), - ), - ), - ], + PlatformCircularProgressIndicator(), + const SizedBox(height: MEDIUM_SPACE), + Text( + localizations.mainScreenLoadingCamera, + style: platformThemeData( + context, + material: (data) => data.textTheme.bodyText1, + cupertino: (data) => data.textTheme.textStyle, ), ), ], ), - ), - expandableContent: Container( - color: Colors.black, - child: Padding( - padding: const EdgeInsets.only( - left: LARGE_SPACE, - right: LARGE_SPACE, - bottom: MEDIUM_SPACE, - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - ElevatedButton( - style: ButtonStyle( - backgroundColor: - MaterialStateProperty.resolveWith( - (_) => isTorchEnabled ? Colors.white : Colors.black, - ), - foregroundColor: - MaterialStateProperty.resolveWith( - (_) => isTorchEnabled ? Colors.black : Colors.white, - ), - ), - onPressed: () { - setState(() { - isTorchEnabled = !isTorchEnabled; + ); + } - if (isTorchEnabled) { - controller!.setFlashMode(FlashMode.torch); - } else { - controller!.setFlashMode(FlashMode.off); - } - }); - }, - child: IconButtonChild( - icon: const Icon(Icons.flashlight_on_rounded), - label: Text(localizations.mainScreenActionsTorchButton), + return Container( + color: Colors.black, + child: ExpandableBottomSheet( + background: SafeArea( + child: Align( + alignment: Alignment.topCenter, + child: AnimateInBuilder( + builder: (showPreview) => AnimatedOpacity( + opacity: showPreview ? 1.0 : 0.0, + duration: const Duration(milliseconds: 1100), + curve: Curves.easeOutQuad, + child: ClipRRect( + borderRadius: BorderRadius.circular(SMALL_SPACE), + child: AspectRatio( + aspectRatio: 1 / controller!.value.aspectRatio, + child: Stack( + fit: StackFit.expand, + children: [ + controller!.buildPreview(), + if (isRecording) + RecordingOverlay(controller: controller!), + if (uploadingPhotoAnimation != null) + UploadingPhoto( + data: uploadingPhotoAnimation!, + ), + ], + ), + ), ), ), - ElevatedButton( - style: ButtonStyle( - backgroundColor: - MaterialStateProperty.resolveWith( - (_) => Colors.white10, - ), - foregroundColor: - MaterialStateProperty.resolveWith( - (_) => Colors.white, - ), + ), + ), + ), + persistentHeader: Container( + decoration: const BoxDecoration( + color: Colors.black, + borderRadius: BorderRadius.only( + topLeft: Radius.circular(LARGE_SPACE), + topRight: Radius.circular(LARGE_SPACE), + ), + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + const Padding( + padding: EdgeInsets.symmetric( + vertical: MEDIUM_SPACE, + horizontal: MEDIUM_SPACE, ), - onPressed: zoomLevels == null - ? null - : () { - final newZoomLevelIndex = - ((currentZoomLevelIndex + 1) % - zoomLevels!.length); + child: SheetIndicator(), + ), + Padding( + padding: + const EdgeInsets.symmetric(vertical: SMALL_SPACE), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Expanded( + child: FadeAndMoveInAnimation( + translationDuration: + DEFAULT_TRANSLATION_DURATION * + SECONDARY_BUTTONS_DURATION_MULTIPLIER, + opacityDuration: DEFAULT_OPACITY_DURATION * + SECONDARY_BUTTONS_DURATION_MULTIPLIER, + child: ChangeCameraButton( + disabled: lockCamera || isRecording, + onChangeCamera: () { + final currentCameraIndex = GlobalValuesManager + .cameras + .indexOf(controller!.description); + final availableCameras = + GlobalValuesManager.cameras.length; - controller! - .setZoomLevel(zoomLevels![newZoomLevelIndex]); - - setState(() { - currentZoomLevelIndex = newZoomLevelIndex; - }); - }, - child: zoomLevels == null - ? const Text('1x') - : Text( - formatZoomLevel(currentZoomLevel), + onNewCameraSelected( + GlobalValuesManager.cameras[ + (currentCameraIndex + 1) % + availableCameras], + ); + }, + ), ), + ), + Expanded( + child: FadeAndMoveInAnimation( + child: RecordButton( + disabled: lockCamera, + active: isRecording, + onVideoBegin: () async { + setState(() { + isRecording = true; + }); + + if (controller!.value.isRecordingVideo) { + // A recording has already started, do nothing. + return; + } + + await controller!.startVideoRecording(); + }, + onVideoEnd: takeVideo, + onPhotoShot: takePhoto, + ), + ), + ), + Expanded( + child: FadeAndMoveInAnimation( + translationDuration: + DEFAULT_TRANSLATION_DURATION * + SECONDARY_BUTTONS_DURATION_MULTIPLIER, + opacityDuration: DEFAULT_OPACITY_DURATION * + SECONDARY_BUTTONS_DURATION_MULTIPLIER, + child: TodayPhotoButton( + onLeave: () { + controller!.setFlashMode(FlashMode.off); + }, + onComeBack: () { + if (isTorchEnabled) { + controller!.setFlashMode(FlashMode.torch); + } + }, + ), + ), + ), + ], + ), ), ], ), ), + expandableContent: Container( + color: Colors.black, + child: Padding( + padding: const EdgeInsets.only( + left: LARGE_SPACE, + right: LARGE_SPACE, + bottom: MEDIUM_SPACE, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + ElevatedButton( + style: ButtonStyle( + backgroundColor: + MaterialStateProperty.resolveWith( + (_) => isTorchEnabled ? Colors.white : Colors.black, + ), + foregroundColor: + MaterialStateProperty.resolveWith( + (_) => isTorchEnabled ? Colors.black : Colors.white, + ), + ), + onPressed: () { + setState(() { + isTorchEnabled = !isTorchEnabled; + + if (isTorchEnabled) { + controller!.setFlashMode(FlashMode.torch); + } else { + controller!.setFlashMode(FlashMode.off); + } + }); + }, + child: IconButtonChild( + icon: const Icon(Icons.flashlight_on_rounded), + label: + Text(localizations.mainScreenActionsTorchButton), + ), + ), + ElevatedButton( + style: ButtonStyle( + backgroundColor: + MaterialStateProperty.resolveWith( + (_) => Colors.white10, + ), + foregroundColor: + MaterialStateProperty.resolveWith( + (_) => Colors.white, + ), + ), + onPressed: zoomLevels == null + ? null + : () { + final newZoomLevelIndex = + ((currentZoomLevelIndex + 1) % + zoomLevels!.length); + + controller!.setZoomLevel( + zoomLevels![newZoomLevelIndex]); + + setState(() { + currentZoomLevelIndex = newZoomLevelIndex; + }); + }, + child: zoomLevels == null + ? const Text('1x') + : Text( + formatZoomLevel(currentZoomLevel), + ), + ), + ], + ), + ), + ), ), - ), - ); - }(), + ); + }(), + ), ); } } diff --git a/lib/screens/main_screen/today_photo_button.dart b/lib/screens/main_screen/today_photo_button.dart index 617705d..2aa4ab7 100644 --- a/lib/screens/main_screen/today_photo_button.dart +++ b/lib/screens/main_screen/today_photo_button.dart @@ -57,6 +57,14 @@ class _TodayPhotoButtonState extends State { final memories = context.read(); + if (memories.memories.isEmpty) { + setState(() { + data = null; + type = null; + }); + return; + } + final lastMemory = memories.memories.first; final file = await lastMemory.downloadToFile(); diff --git a/lib/screens/server_loading_screen.dart b/lib/screens/server_loading_screen.dart index d490cef..753b7b2 100644 --- a/lib/screens/server_loading_screen.dart +++ b/lib/screens/server_loading_screen.dart @@ -7,12 +7,13 @@ import 'package:quid_faciam_hodie/managers/global_values_manager.dart'; import 'package:quid_faciam_hodie/models/memories.dart'; import 'package:supabase_flutter/supabase_flutter.dart'; +import 'empty_screen.dart'; import 'main_screen.dart'; import 'server_loading_screen/dot_animation.dart'; import 'welcome_screen.dart'; class ServerLoadingScreen extends StatefulWidget { - static const ID = '/server_loading'; + static const ID = '/'; final String? nextScreen; @@ -44,12 +45,29 @@ class _ServerLoadingScreenState extends State { await memories.initialize(); } + if (widget.nextScreen == null) { + Navigator.pushNamed( + context, + MainScreen.ID, + ); + } else { + if (memories.memories.isEmpty) { + Navigator.pushReplacementNamed( + context, + EmptyScreen.ID, + ); + } else { + Navigator.pushReplacementNamed( + context, + widget.nextScreen!, + ); + } + } + } else { Navigator.pushReplacementNamed( context, - widget.nextScreen ?? MainScreen.ID, + WelcomeScreen.ID, ); - } else { - Navigator.pushReplacementNamed(context, WelcomeScreen.ID); } } diff --git a/lib/screens/timeline_screen.dart b/lib/screens/timeline_screen.dart index 0d0c521..4b19679 100644 --- a/lib/screens/timeline_screen.dart +++ b/lib/screens/timeline_screen.dart @@ -8,6 +8,7 @@ import 'package:quid_faciam_hodie/utils/loadable.dart'; import 'package:supabase_flutter/supabase_flutter.dart'; import 'calendar_screen.dart'; +import 'empty_screen.dart'; import 'timeline_screen/timeline_page.dart'; final supabase = Supabase.instance.client; @@ -49,6 +50,18 @@ class _TimelineScreenState extends State with Loadable { timeline.setCurrentIndex(initialIndex); memoriesModel.addListener(() { + if (!mounted) { + return; + } + + if (memoriesModel.memories.isEmpty) { + Navigator.pushReplacementNamed( + context, + EmptyScreen.ID, + ); + return; + } + timeline.refresh(memoriesModel.memories); setState(() {}); diff --git a/lib/screens/welcome_screen.dart b/lib/screens/welcome_screen.dart index 784b25b..3141dbb 100644 --- a/lib/screens/welcome_screen.dart +++ b/lib/screens/welcome_screen.dart @@ -8,7 +8,7 @@ import 'package:quid_faciam_hodie/widgets/logo.dart'; import 'grant_permission_screen.dart'; class WelcomeScreen extends StatelessWidget { - static const ID = '/'; + static const ID = '/welcome'; const WelcomeScreen({Key? key}) : super(key: key); @@ -60,7 +60,7 @@ class WelcomeScreen extends StatelessWidget { label: Text(localizations.welcomeScreenStartButtonTitle), ), onPressed: () { - Navigator.pushReplacementNamed( + Navigator.pushNamed( context, GrantPermissionScreen.ID, ); diff --git a/lib/widgets/fade_and_move_in_animation.dart b/lib/widgets/fade_and_move_in_animation.dart index d3c184f..4566f4c 100644 --- a/lib/widgets/fade_and_move_in_animation.dart +++ b/lib/widgets/fade_and_move_in_animation.dart @@ -55,6 +55,13 @@ class _FadeAndMoveInAnimationState extends State ); } + @override + void dispose() { + translationController.dispose(); + + super.dispose(); + } + @override void didChangeDependencies() { super.didChangeDependencies(); diff --git a/pubspec.lock b/pubspec.lock index 3228c27..99f241e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,6 +1,13 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + archive: + dependency: transitive + description: + name: archive + url: "https://pub.dartlang.org" + source: hosted + version: "3.3.1" async: dependency: transitive description: @@ -329,6 +336,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.0" + lottie: + dependency: "direct main" + description: + name: lottie + url: "https://pub.dartlang.org" + source: hosted + version: "1.4.1" matcher: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index ac36d10..1783dae 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -54,6 +54,7 @@ dependencies: flutter_sticky_header: ^0.6.4 flutter_calendar_widget: ^0.0.2 flutter_platform_widgets: ^2.0.0 + lottie: ^1.4.1 dev_dependencies: flutter_test: @@ -80,6 +81,7 @@ flutter: assets: - assets/ + - assets/lottie/flying-astronaut.json # To add assets to your application, add an assets section, like this: # assets: