From 77916cb965be35ab2802ad313021f832e4577253 Mon Sep 17 00:00:00 2001 From: Moktadir Date: Thu, 21 Sep 2023 05:06:56 +0600 Subject: [PATCH] new Ui with new rest api --- animations/apiError.json | 2075 ++++++++++++++++- ios/Runner/Info.plist | 4 +- .../global-widgets/network_image_box.dart | 4 +- .../global-widgets/splash_container.dart | 1 + lib/app/data/local/hive/hive_adapters.dart | 27 + lib/app/data/local/{ => hive}/my_hive.dart | 0 .../controllers/graphql_controller.dart | 4 +- .../controllers/home_controller.dart | 56 +- .../home-with-restAPI/views/home_view.dart | 218 +- lib/app/service/REST/api_header.dart | 12 +- lib/app/service/REST/api_urls.dart | 5 +- lib/app/service/REST/dio_client.dart | 66 +- .../service/handler/exception_handler.dart | 6 +- lib/app/service/helper/dialog_helper.dart | 34 +- lib/config/theme/light_theme_colors.dart | 2 +- lib/config/theme/my_fonts.dart | 3 +- lib/config/theme/my_styles.dart | 10 +- .../translations/ar_AR/ar_ar_translation.dart | 2 +- .../translations/en_US/en_us_translation.dart | 2 +- lib/config/translations/strings_enum.dart | 2 +- lib/main.dart | 26 +- 21 files changed, 2356 insertions(+), 203 deletions(-) create mode 100644 lib/app/data/local/hive/hive_adapters.dart rename lib/app/data/local/{ => hive}/my_hive.dart (100%) diff --git a/animations/apiError.json b/animations/apiError.json index 5918240..c3095b0 100755 --- a/animations/apiError.json +++ b/animations/apiError.json @@ -1 +1,2074 @@ -{"v":"5.4.1","fr":29.9700012207031,"ip":0,"op":150.000006109625,"w":150,"h":150,"nm":"Bag-anim","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":3,"nm":"ref","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p667_1_0p167_0p167"],"t":0,"s":[0],"e":[-21]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p667_1_0p167_0p167"],"t":8,"s":[-21],"e":[185.2]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":26,"s":[185.2],"e":[180]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":30,"s":[180],"e":[180]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p667_1_0p167_0p167"],"t":98.828,"s":[180],"e":[200]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p667_1_0p167_0p167"],"t":103.828,"s":[200],"e":[-5]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"n":["0p833_0p833_0p333_0"],"t":124.22,"s":[-5],"e":[0]},{"t":127.000005172816}],"ix":10},"p":{"a":0,"k":[75,75,0],"ix":2},"a":{"a":0,"k":[50,50,0],"ix":1},"s":{"a":0,"k":[30,30,100],"ix":6}},"ao":0,"ip":0,"op":152.000006191087,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Eye R","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[85.25,75,0],"ix":2},"a":{"a":0,"k":[0,0,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,0]],"o":[[0,0],[0,0]],"v":[[-5.625,-12.875],[-5.625,-4.25]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.917647058824,0.388235294118,0.4,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":2,"lj":2,"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":2,"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.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"n":["0p833_0p833_0p333_0"],"t":42,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":55,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0]},"n":["0p833_0p833_0p167_0"],"t":88.828,"s":[100],"e":[0]},{"t":98.8275040253266}],"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":42.0000017106951,"op":153.000006231818,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Eye L","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[75,75,0],"ix":2},"a":{"a":0,"k":[0,0,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,0]],"o":[[0,0],[0,0]],"v":[[-5.625,-12.875],[-5.625,-4.25]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.917647058824,0.388235294118,0.4,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":2,"lj":2,"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":2,"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.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"n":["0p833_0p833_0p333_0"],"t":42,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":49.99,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0]},"n":["0p833_0p833_0p167_0"],"t":86.828,"s":[100],"e":[0]},{"t":96.8275039438649}],"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":42.0000017106951,"op":152.000006191087,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"mouth","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50.313,-63.333,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[333.333,333.333,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-13.875],[0,14.625]],"o":[[0,13.875],[0,-14.625]],"v":[[-11.125,21],[11.25,21]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.917647063732,0.388235300779,0.40000000596,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":2,"lj":1,"ml":4,"ml2":{"a":0,"k":4,"ix":8},"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":true},{"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":"handle","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p667_1_0p167_0p167"],"t":36,"s":[100],"e":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p667_1_0p167_0"],"t":46.57,"s":[0],"e":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p667_1_0p167_0p167"],"t":86.828,"s":[0],"e":[100]},{"t":95.8275039031341}],"ix":1},"e":{"a":0,"k":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":152.000006191087,"st":-899.000036617021,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"bag-outside","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50.313,-63.333,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[333.333,333.333,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-13.875],[0,14.625]],"o":[[0,13.875],[0,-14.625]],"v":[[-11.125,21],[11.25,21]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.556862771511,0.556862771511,0.57647061348,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":2,"lj":1,"ml":4,"ml2":{"a":0,"k":4,"ix":8},"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":true},{"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":"handle","np":3,"cix":2,"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,-3.313],[0,0],[0,0],[0,2.75]],"o":[[0,0],[0,0],[0,3.313],[0,0],[0,0],[0,-2.75]],"v":[[23.938,15.938],[-24.097,15.975],[-24.125,53.438],[-21.109,57.375],[21.25,57.313],[23.938,54.375]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.556862771511,0.556862771511,0.57647061348,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":1,"lj":1,"ml":4,"ml2":{"a":0,"k":4,"ix":8},"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.976470588235,0.976470588235,0.976470588235,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"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":"bag","np":3,"cix":2,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":152.000006191087,"st":-899.000036617021,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"bag-inside","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,-63.333,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[333.333,333.333,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],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[16.625,10.5],[-16.75,10.5],[-23.875,15.75],[-14.875,36],[13.5,35.75],[24,15.625]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.556862771511,0.556862771511,0.57647061348,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":1,"lj":1,"ml":4,"ml2":{"a":0,"k":4,"ix":8},"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.733333333333,0.760784313725,0.788235294118,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"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,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":151.000006150356,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"BG","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[78,71,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[94.964,94.964,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[142,142],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.997878011068,0.819607962814,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"ml2":{"a":0,"k":4,"ix":8},"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.976470588235,0.976470588235,0.976470588235,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-3,4],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[103.512,103.512],"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,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":153.000006231818,"st":0,"bm":0}],"markers":[]} \ No newline at end of file +{ + "v": "4.6.3", + "fr": 24, + "ip": 0, + "op": 21, + "w": 320, + "h": 320, + "nm": "checklist", + "ddd": 0, + "assets": [], + "layers": [ + { + "ddd": 0, + "ind": 2, + "ty": 4, + "nm": "Shape Layer 13", + "ks": { + "o": { "a": 0, "k": 100 }, + "r": { "a": 0, "k": 300 }, + "p": { "a": 0, "k": [160, 159.5, 0] }, + "a": { "a": 0, "k": [0, -34, 0] }, + "s": { "a": 0, "k": [100, 100, 100] } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { + "a": 1, + "k": [ + { + "i": { "x": [0.667, 0.667], "y": [1, 1] }, + "o": { "x": [0.167, 0.167], "y": [0.167, 0.167] }, + "n": ["0p667_1_0p167_0p167", "0p667_1_0p167_0p167"], + "t": 6, + "s": [15.021, 15.021], + "e": [0, 0] + }, + { "t": 17 } + ] + }, + "p": { "a": 0, "k": [0, 0] }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse" + }, + { + "ty": "fl", + "c": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.333], "y": [0] }, + "n": ["0p667_1_0p333_0"], + "t": 6, + "s": [0.8274509, 0.1843137, 0.1843137, 1], + "e": [0.8274509, 0.1843137, 0.1843137, 1] + }, + { "t": 17 } + ] + }, + "o": { "a": 0, "k": 100 }, + "r": 1, + "nm": "Fill 1", + "mn": "ADBE Vector Graphic - Fill" + }, + { + "ty": "tr", + "p": { + "a": 1, + "k": [ + { + "i": { "x": 0.667, "y": 1 }, + "o": { "x": 0.167, "y": 0.167 }, + "n": "0p667_1_0p167_0p167", + "t": 6, + "s": [-8.142, -92.147], + "e": [-7.675, -162.544], + "to": [0.07779947668314, -11.7327470779419], + "ti": [-0.07779947668314, 11.7327470779419] + }, + { "t": 17 } + ], + "ix": 2 + }, + "a": { "a": 0, "k": [0, 0], "ix": 1 }, + "s": { "a": 0, "k": [83.981, 100], "ix": 3 }, + "r": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.167], "y": [0.167] }, + "n": ["0p667_1_0p167_0p167"], + "t": 6, + "s": [20.367], + "e": [6.367] + }, + { "t": 17 } + ], + "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 2", + "np": 3, + "cix": 2, + "ix": 1, + "mn": "ADBE Vector Group" + }, + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { + "a": 1, + "k": [ + { + "i": { "x": [0.833, 0.833], "y": [0.833, 0.833] }, + "o": { "x": [0.167, 0.167], "y": [0.167, 0.167] }, + "n": ["0p833_0p833_0p167_0p167", "0p833_0p833_0p167_0p167"], + "t": 6, + "s": [15.021, 15.021], + "e": [0, 0] + }, + { "t": 21 } + ] + }, + "p": { "a": 0, "k": [0, 0] }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse" + }, + { + "ty": "fl", + "c": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.333], "y": [0] }, + "n": ["0p667_1_0p333_0"], + "t": 6, + "s": [0.8274509, 0.1843137, 0.1843137, 1], + "e": [0.8274509, 0.1843137, 0.1843137, 1] + }, + { "t": 17 } + ] + }, + "o": { "a": 0, "k": 100 }, + "r": 1, + "nm": "Fill 1", + "mn": "ADBE Vector Graphic - Fill" + }, + { + "ty": "tr", + "p": { + "a": 1, + "k": [ + { + "i": { "x": 0.833, "y": 0.833 }, + "o": { "x": 0.167, "y": 0.167 }, + "n": "0p833_0p833_0p167_0p167", + "t": 6, + "s": [16.585, -99.759], + "e": [28.521, -187.495], + "to": [1.9892578125, -14.6227216720581], + "ti": [-1.9892578125, 14.6227216720581] + }, + { "t": 21 } + ], + "ix": 2 + }, + "a": { "a": 0, "k": [0, 0], "ix": 1 }, + "s": { "a": 0, "k": [97.419, 116], "ix": 3 }, + "r": { + "a": 1, + "k": [ + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "n": ["0p833_0p833_0p167_0p167"], + "t": 6, + "s": [14.733], + "e": [8.733] + }, + { "t": 21 } + ], + "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, + "ix": 2, + "mn": "ADBE Vector Group" + } + ], + "ip": 6, + "op": 22, + "st": -21, + "bm": 0, + "sr": 1 + }, + { + "ddd": 0, + "ind": 3, + "ty": 4, + "nm": "Shape Layer 12", + "ks": { + "o": { "a": 0, "k": 100 }, + "r": { "a": 0, "k": 250 }, + "p": { "a": 0, "k": [160, 159.5, 0] }, + "a": { "a": 0, "k": [0, -34, 0] }, + "s": { "a": 0, "k": [100, 100, 100] } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { + "a": 1, + "k": [ + { + "i": { "x": [0.667, 0.667], "y": [1, 1] }, + "o": { "x": [0.167, 0.167], "y": [0.167, 0.167] }, + "n": ["0p667_1_0p167_0p167", "0p667_1_0p167_0p167"], + "t": 6, + "s": [15.021, 15.021], + "e": [0, 0] + }, + { "t": 17 } + ] + }, + "p": { "a": 0, "k": [0, 0] }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse" + }, + { + "ty": "fl", + "c": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.333], "y": [0] }, + "n": ["0p667_1_0p333_0"], + "t": 6, + "s": [0.8274509, 0.1843137, 0.1843137, 1], + "e": [0.8274509, 0.1843137, 0.1843137, 1] + }, + { "t": 17 } + ] + }, + "o": { "a": 0, "k": 100 }, + "r": 1, + "nm": "Fill 1", + "mn": "ADBE Vector Graphic - Fill" + }, + { + "ty": "tr", + "p": { + "a": 1, + "k": [ + { + "i": { "x": 0.667, "y": 1 }, + "o": { "x": 0.167, "y": 0.167 }, + "n": "0p667_1_0p167_0p167", + "t": 6, + "s": [-8.142, -92.147], + "e": [-7.675, -162.544], + "to": [0.07779947668314, -11.7327470779419], + "ti": [-0.07779947668314, 11.7327470779419] + }, + { "t": 17 } + ], + "ix": 2 + }, + "a": { "a": 0, "k": [0, 0], "ix": 1 }, + "s": { "a": 0, "k": [83.981, 100], "ix": 3 }, + "r": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.167], "y": [0.167] }, + "n": ["0p667_1_0p167_0p167"], + "t": 6, + "s": [20.367], + "e": [6.367] + }, + { "t": 17 } + ], + "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 2", + "np": 3, + "cix": 2, + "ix": 1, + "mn": "ADBE Vector Group" + }, + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { + "a": 1, + "k": [ + { + "i": { "x": [0.833, 0.833], "y": [0.833, 0.833] }, + "o": { "x": [0.167, 0.167], "y": [0.167, 0.167] }, + "n": ["0p833_0p833_0p167_0p167", "0p833_0p833_0p167_0p167"], + "t": 6, + "s": [15.021, 15.021], + "e": [0, 0] + }, + { "t": 21 } + ] + }, + "p": { "a": 0, "k": [0, 0] }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse" + }, + { + "ty": "fl", + "c": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.333], "y": [0] }, + "n": ["0p667_1_0p333_0"], + "t": 6, + "s": [0.8274509, 0.1843137, 0.1843137, 1], + "e": [0.8274509, 0.1843137, 0.1843137, 1] + }, + { "t": 17 } + ] + }, + "o": { "a": 0, "k": 100 }, + "r": 1, + "nm": "Fill 1", + "mn": "ADBE Vector Graphic - Fill" + }, + { + "ty": "tr", + "p": { + "a": 1, + "k": [ + { + "i": { "x": 0.833, "y": 0.833 }, + "o": { "x": 0.167, "y": 0.167 }, + "n": "0p833_0p833_0p167_0p167", + "t": 6, + "s": [16.585, -99.759], + "e": [28.521, -187.495], + "to": [1.9892578125, -14.6227216720581], + "ti": [-1.9892578125, 14.6227216720581] + }, + { "t": 21 } + ], + "ix": 2 + }, + "a": { "a": 0, "k": [0, 0], "ix": 1 }, + "s": { "a": 0, "k": [97.419, 116], "ix": 3 }, + "r": { + "a": 1, + "k": [ + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "n": ["0p833_0p833_0p167_0p167"], + "t": 6, + "s": [14.733], + "e": [8.733] + }, + { "t": 21 } + ], + "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, + "ix": 2, + "mn": "ADBE Vector Group" + } + ], + "ip": 6, + "op": 22, + "st": -21, + "bm": 0, + "sr": 1 + }, + { + "ddd": 0, + "ind": 4, + "ty": 4, + "nm": "Shape Layer 11", + "ks": { + "o": { "a": 0, "k": 100 }, + "r": { "a": 0, "k": 200 }, + "p": { "a": 0, "k": [160, 159.5, 0] }, + "a": { "a": 0, "k": [0, -34, 0] }, + "s": { "a": 0, "k": [100, 100, 100] } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { + "a": 1, + "k": [ + { + "i": { "x": [0.667, 0.667], "y": [1, 1] }, + "o": { "x": [0.167, 0.167], "y": [0.167, 0.167] }, + "n": ["0p667_1_0p167_0p167", "0p667_1_0p167_0p167"], + "t": 6, + "s": [15.021, 15.021], + "e": [0, 0] + }, + { "t": 17 } + ] + }, + "p": { "a": 0, "k": [0, 0] }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse" + }, + { + "ty": "fl", + "c": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.333], "y": [0] }, + "n": ["0p667_1_0p333_0"], + "t": 6, + "s": [0.8274509, 0.1843137, 0.1843137, 1], + "e": [0.8274509, 0.1843137, 0.1843137, 1] + }, + { "t": 17 } + ] + }, + "o": { "a": 0, "k": 100 }, + "r": 1, + "nm": "Fill 1", + "mn": "ADBE Vector Graphic - Fill" + }, + { + "ty": "tr", + "p": { + "a": 1, + "k": [ + { + "i": { "x": 0.667, "y": 1 }, + "o": { "x": 0.167, "y": 0.167 }, + "n": "0p667_1_0p167_0p167", + "t": 6, + "s": [-8.142, -92.147], + "e": [-7.675, -162.544], + "to": [0.07779947668314, -11.7327470779419], + "ti": [-0.07779947668314, 11.7327470779419] + }, + { "t": 17 } + ], + "ix": 2 + }, + "a": { "a": 0, "k": [0, 0], "ix": 1 }, + "s": { "a": 0, "k": [83.981, 100], "ix": 3 }, + "r": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.167], "y": [0.167] }, + "n": ["0p667_1_0p167_0p167"], + "t": 6, + "s": [20.367], + "e": [6.367] + }, + { "t": 17 } + ], + "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 2", + "np": 3, + "cix": 2, + "ix": 1, + "mn": "ADBE Vector Group" + }, + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { + "a": 1, + "k": [ + { + "i": { "x": [0.833, 0.833], "y": [0.833, 0.833] }, + "o": { "x": [0.167, 0.167], "y": [0.167, 0.167] }, + "n": ["0p833_0p833_0p167_0p167", "0p833_0p833_0p167_0p167"], + "t": 6, + "s": [15.021, 15.021], + "e": [0, 0] + }, + { "t": 21 } + ] + }, + "p": { "a": 0, "k": [0, 0] }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse" + }, + { + "ty": "fl", + "c": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.333], "y": [0] }, + "n": ["0p667_1_0p333_0"], + "t": 6, + "s": [0.8274509, 0.1843137, 0.1843137, 1], + "e": [0.8274509, 0.1843137, 0.1843137, 1] + }, + { "t": 17 } + ] + }, + "o": { "a": 0, "k": 100 }, + "r": 1, + "nm": "Fill 1", + "mn": "ADBE Vector Graphic - Fill" + }, + { + "ty": "tr", + "p": { + "a": 1, + "k": [ + { + "i": { "x": 0.833, "y": 0.833 }, + "o": { "x": 0.167, "y": 0.167 }, + "n": "0p833_0p833_0p167_0p167", + "t": 6, + "s": [16.585, -99.759], + "e": [28.521, -187.495], + "to": [1.9892578125, -14.6227216720581], + "ti": [-1.9892578125, 14.6227216720581] + }, + { "t": 21 } + ], + "ix": 2 + }, + "a": { "a": 0, "k": [0, 0], "ix": 1 }, + "s": { "a": 0, "k": [97.419, 116], "ix": 3 }, + "r": { + "a": 1, + "k": [ + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "n": ["0p833_0p833_0p167_0p167"], + "t": 6, + "s": [14.733], + "e": [8.733] + }, + { "t": 21 } + ], + "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, + "ix": 2, + "mn": "ADBE Vector Group" + } + ], + "ip": 6, + "op": 22, + "st": -21, + "bm": 0, + "sr": 1 + }, + { + "ddd": 0, + "ind": 5, + "ty": 4, + "nm": "Shape Layer 10", + "ks": { + "o": { "a": 0, "k": 100 }, + "r": { "a": 0, "k": 150 }, + "p": { "a": 0, "k": [160, 159.5, 0] }, + "a": { "a": 0, "k": [0, -34, 0] }, + "s": { "a": 0, "k": [100, 100, 100] } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { + "a": 1, + "k": [ + { + "i": { "x": [0.667, 0.667], "y": [1, 1] }, + "o": { "x": [0.167, 0.167], "y": [0.167, 0.167] }, + "n": ["0p667_1_0p167_0p167", "0p667_1_0p167_0p167"], + "t": 6, + "s": [15.021, 15.021], + "e": [0, 0] + }, + { "t": 17 } + ] + }, + "p": { "a": 0, "k": [0, 0] }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse" + }, + { + "ty": "fl", + "c": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.333], "y": [0] }, + "n": ["0p667_1_0p333_0"], + "t": 6, + "s": [0.8274509, 0.1843137, 0.1843137, 1], + "e": [0.8274509, 0.1843137, 0.1843137, 1] + }, + { "t": 17 } + ] + }, + "o": { "a": 0, "k": 100 }, + "r": 1, + "nm": "Fill 1", + "mn": "ADBE Vector Graphic - Fill" + }, + { + "ty": "tr", + "p": { + "a": 1, + "k": [ + { + "i": { "x": 0.667, "y": 1 }, + "o": { "x": 0.167, "y": 0.167 }, + "n": "0p667_1_0p167_0p167", + "t": 6, + "s": [-8.142, -92.147], + "e": [-7.675, -162.544], + "to": [0.07779947668314, -11.7327470779419], + "ti": [-0.07779947668314, 11.7327470779419] + }, + { "t": 17 } + ], + "ix": 2 + }, + "a": { "a": 0, "k": [0, 0], "ix": 1 }, + "s": { "a": 0, "k": [83.981, 100], "ix": 3 }, + "r": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.167], "y": [0.167] }, + "n": ["0p667_1_0p167_0p167"], + "t": 6, + "s": [20.367], + "e": [6.367] + }, + { "t": 17 } + ], + "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 2", + "np": 3, + "cix": 2, + "ix": 1, + "mn": "ADBE Vector Group" + }, + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { + "a": 1, + "k": [ + { + "i": { "x": [0.833, 0.833], "y": [0.833, 0.833] }, + "o": { "x": [0.167, 0.167], "y": [0.167, 0.167] }, + "n": ["0p833_0p833_0p167_0p167", "0p833_0p833_0p167_0p167"], + "t": 6, + "s": [15.021, 15.021], + "e": [0, 0] + }, + { "t": 21 } + ] + }, + "p": { "a": 0, "k": [0, 0] }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse" + }, + { + "ty": "fl", + "c": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.333], "y": [0] }, + "n": ["0p667_1_0p333_0"], + "t": 6, + "s": [0.8274509, 0.1843137, 0.1843137, 1], + "e": [0.8274509, 0.1843137, 0.1843137, 1] + }, + { "t": 17 } + ] + }, + "o": { "a": 0, "k": 100 }, + "r": 1, + "nm": "Fill 1", + "mn": "ADBE Vector Graphic - Fill" + }, + { + "ty": "tr", + "p": { + "a": 1, + "k": [ + { + "i": { "x": 0.833, "y": 0.833 }, + "o": { "x": 0.167, "y": 0.167 }, + "n": "0p833_0p833_0p167_0p167", + "t": 6, + "s": [16.585, -99.759], + "e": [28.521, -187.495], + "to": [1.9892578125, -14.6227216720581], + "ti": [-1.9892578125, 14.6227216720581] + }, + { "t": 21 } + ], + "ix": 2 + }, + "a": { "a": 0, "k": [0, 0], "ix": 1 }, + "s": { "a": 0, "k": [97.419, 116], "ix": 3 }, + "r": { + "a": 1, + "k": [ + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "n": ["0p833_0p833_0p167_0p167"], + "t": 6, + "s": [14.733], + "e": [8.733] + }, + { "t": 21 } + ], + "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, + "ix": 2, + "mn": "ADBE Vector Group" + } + ], + "ip": 6, + "op": 22, + "st": -21, + "bm": 0, + "sr": 1 + }, + { + "ddd": 0, + "ind": 6, + "ty": 4, + "nm": "Shape Layer 9", + "ks": { + "o": { "a": 0, "k": 100 }, + "r": { "a": 0, "k": 100 }, + "p": { "a": 0, "k": [160, 159.5, 0] }, + "a": { "a": 0, "k": [0, -34, 0] }, + "s": { "a": 0, "k": [100, 100, 100] } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { + "a": 1, + "k": [ + { + "i": { "x": [0.667, 0.667], "y": [1, 1] }, + "o": { "x": [0.167, 0.167], "y": [0.167, 0.167] }, + "n": ["0p667_1_0p167_0p167", "0p667_1_0p167_0p167"], + "t": 6, + "s": [15.021, 15.021], + "e": [0, 0] + }, + { "t": 17 } + ] + }, + "p": { "a": 0, "k": [0, 0] }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse" + }, + { + "ty": "fl", + "c": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.333], "y": [0] }, + "n": ["0p667_1_0p333_0"], + "t": 6, + "s": [0.8274509, 0.1843137, 0.1843137, 1], + "e": [0.8274509, 0.1843137, 0.1843137, 1] + }, + { "t": 17 } + ] + }, + "o": { "a": 0, "k": 100 }, + "r": 1, + "nm": "Fill 1", + "mn": "ADBE Vector Graphic - Fill" + }, + { + "ty": "tr", + "p": { + "a": 1, + "k": [ + { + "i": { "x": 0.667, "y": 1 }, + "o": { "x": 0.167, "y": 0.167 }, + "n": "0p667_1_0p167_0p167", + "t": 6, + "s": [-8.142, -92.147], + "e": [-7.675, -162.544], + "to": [0.07779947668314, -11.7327470779419], + "ti": [-0.07779947668314, 11.7327470779419] + }, + { "t": 17 } + ], + "ix": 2 + }, + "a": { "a": 0, "k": [0, 0], "ix": 1 }, + "s": { "a": 0, "k": [83.981, 100], "ix": 3 }, + "r": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.167], "y": [0.167] }, + "n": ["0p667_1_0p167_0p167"], + "t": 6, + "s": [20.367], + "e": [6.367] + }, + { "t": 17 } + ], + "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 2", + "np": 3, + "cix": 2, + "ix": 1, + "mn": "ADBE Vector Group" + }, + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { + "a": 1, + "k": [ + { + "i": { "x": [0.833, 0.833], "y": [0.833, 0.833] }, + "o": { "x": [0.167, 0.167], "y": [0.167, 0.167] }, + "n": ["0p833_0p833_0p167_0p167", "0p833_0p833_0p167_0p167"], + "t": 6, + "s": [15.021, 15.021], + "e": [0, 0] + }, + { "t": 21 } + ] + }, + "p": { "a": 0, "k": [0, 0] }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse" + }, + { + "ty": "fl", + "c": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.333], "y": [0] }, + "n": ["0p667_1_0p333_0"], + "t": 6, + "s": [0.8274509, 0.1843137, 0.1843137, 1], + "e": [0.8274509, 0.1843137, 0.1843137, 1] + }, + { "t": 17 } + ] + }, + "o": { "a": 0, "k": 100 }, + "r": 1, + "nm": "Fill 1", + "mn": "ADBE Vector Graphic - Fill" + }, + { + "ty": "tr", + "p": { + "a": 1, + "k": [ + { + "i": { "x": 0.833, "y": 0.833 }, + "o": { "x": 0.167, "y": 0.167 }, + "n": "0p833_0p833_0p167_0p167", + "t": 6, + "s": [16.585, -99.759], + "e": [28.521, -187.495], + "to": [1.9892578125, -14.6227216720581], + "ti": [-1.9892578125, 14.6227216720581] + }, + { "t": 21 } + ], + "ix": 2 + }, + "a": { "a": 0, "k": [0, 0], "ix": 1 }, + "s": { "a": 0, "k": [97.419, 116], "ix": 3 }, + "r": { + "a": 1, + "k": [ + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "n": ["0p833_0p833_0p167_0p167"], + "t": 6, + "s": [14.733], + "e": [8.733] + }, + { "t": 21 } + ], + "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, + "ix": 2, + "mn": "ADBE Vector Group" + } + ], + "ip": 6, + "op": 22, + "st": -21, + "bm": 0, + "sr": 1 + }, + { + "ddd": 0, + "ind": 7, + "ty": 4, + "nm": "Shape Layer 8", + "ks": { + "o": { "a": 0, "k": 100 }, + "r": { "a": 0, "k": 50 }, + "p": { "a": 0, "k": [160, 159.5, 0] }, + "a": { "a": 0, "k": [0, -34, 0] }, + "s": { "a": 0, "k": [100, 100, 100] } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { + "a": 1, + "k": [ + { + "i": { "x": [0.667, 0.667], "y": [1, 1] }, + "o": { "x": [0.167, 0.167], "y": [0.167, 0.167] }, + "n": ["0p667_1_0p167_0p167", "0p667_1_0p167_0p167"], + "t": 6, + "s": [15.021, 15.021], + "e": [0, 0] + }, + { "t": 17 } + ] + }, + "p": { "a": 0, "k": [0, 0] }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse" + }, + { + "ty": "fl", + "c": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.333], "y": [0] }, + "n": ["0p667_1_0p333_0"], + "t": 6, + "s": [0.8274509, 0.1843137, 0.1843137, 1], + "e": [0.8274509, 0.1843137, 0.1843137, 1] + }, + { "t": 17 } + ] + }, + "o": { "a": 0, "k": 100 }, + "r": 1, + "nm": "Fill 1", + "mn": "ADBE Vector Graphic - Fill" + }, + { + "ty": "tr", + "p": { + "a": 1, + "k": [ + { + "i": { "x": 0.667, "y": 1 }, + "o": { "x": 0.167, "y": 0.167 }, + "n": "0p667_1_0p167_0p167", + "t": 6, + "s": [-8.142, -92.147], + "e": [-7.675, -162.544], + "to": [0.07779947668314, -11.7327470779419], + "ti": [-0.07779947668314, 11.7327470779419] + }, + { "t": 17 } + ], + "ix": 2 + }, + "a": { "a": 0, "k": [0, 0], "ix": 1 }, + "s": { "a": 0, "k": [83.981, 100], "ix": 3 }, + "r": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.167], "y": [0.167] }, + "n": ["0p667_1_0p167_0p167"], + "t": 6, + "s": [20.367], + "e": [6.367] + }, + { "t": 17 } + ], + "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 2", + "np": 3, + "cix": 2, + "ix": 1, + "mn": "ADBE Vector Group" + }, + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { + "a": 1, + "k": [ + { + "i": { "x": [0.833, 0.833], "y": [0.833, 0.833] }, + "o": { "x": [0.167, 0.167], "y": [0.167, 0.167] }, + "n": ["0p833_0p833_0p167_0p167", "0p833_0p833_0p167_0p167"], + "t": 6, + "s": [15.021, 15.021], + "e": [0, 0] + }, + { "t": 21 } + ] + }, + "p": { "a": 0, "k": [0, 0] }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse" + }, + { + "ty": "fl", + "c": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.333], "y": [0] }, + "n": ["0p667_1_0p333_0"], + "t": 6, + "s": [0.8274509, 0.1843137, 0.1843137, 1], + "e": [0.8274509, 0.1843137, 0.1843137, 1] + }, + { "t": 17 } + ] + }, + "o": { "a": 0, "k": 100 }, + "r": 1, + "nm": "Fill 1", + "mn": "ADBE Vector Graphic - Fill" + }, + { + "ty": "tr", + "p": { + "a": 1, + "k": [ + { + "i": { "x": 0.833, "y": 0.833 }, + "o": { "x": 0.167, "y": 0.167 }, + "n": "0p833_0p833_0p167_0p167", + "t": 6, + "s": [16.585, -99.759], + "e": [28.521, -187.495], + "to": [1.9892578125, -14.6227216720581], + "ti": [-1.9892578125, 14.6227216720581] + }, + { "t": 21 } + ], + "ix": 2 + }, + "a": { "a": 0, "k": [0, 0], "ix": 1 }, + "s": { "a": 0, "k": [97.419, 116], "ix": 3 }, + "r": { + "a": 1, + "k": [ + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "n": ["0p833_0p833_0p167_0p167"], + "t": 6, + "s": [14.733], + "e": [8.733] + }, + { "t": 21 } + ], + "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, + "ix": 2, + "mn": "ADBE Vector Group" + } + ], + "ip": 6, + "op": 22, + "st": -21, + "bm": 0, + "sr": 1 + }, + { + "ddd": 0, + "ind": 8, + "ty": 4, + "nm": "Shape Layer 7", + "ks": { + "o": { "a": 0, "k": 100 }, + "r": { "a": 0, "k": 0 }, + "p": { "a": 0, "k": [160, 159.5, 0] }, + "a": { "a": 0, "k": [0, -34, 0] }, + "s": { "a": 0, "k": [100, 100, 100] } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { + "a": 1, + "k": [ + { + "i": { "x": [0.667, 0.667], "y": [1, 1] }, + "o": { "x": [0.167, 0.167], "y": [0.167, 0.167] }, + "n": ["0p667_1_0p167_0p167", "0p667_1_0p167_0p167"], + "t": 6, + "s": [15.021, 15.021], + "e": [0, 0] + }, + { "t": 17 } + ] + }, + "p": { "a": 0, "k": [0, 0] }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse" + }, + { + "ty": "fl", + "c": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.333], "y": [0] }, + "n": ["0p667_1_0p333_0"], + "t": 6, + "s": [0.8274509, 0.1843137, 0.1843137, 1], + "e": [0.8274509, 0.1843137, 0.1843137, 1] + }, + { "t": 17 } + ] + }, + "o": { "a": 0, "k": 100 }, + "r": 1, + "nm": "Fill 1", + "mn": "ADBE Vector Graphic - Fill" + }, + { + "ty": "tr", + "p": { + "a": 1, + "k": [ + { + "i": { "x": 0.667, "y": 1 }, + "o": { "x": 0.167, "y": 0.167 }, + "n": "0p667_1_0p167_0p167", + "t": 6, + "s": [-8.142, -92.147], + "e": [-7.675, -162.544], + "to": [0.07779947668314, -11.7327470779419], + "ti": [-0.07779947668314, 11.7327470779419] + }, + { "t": 17 } + ], + "ix": 2 + }, + "a": { "a": 0, "k": [0, 0], "ix": 1 }, + "s": { "a": 0, "k": [83.981, 100], "ix": 3 }, + "r": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.167], "y": [0.167] }, + "n": ["0p667_1_0p167_0p167"], + "t": 6, + "s": [20.367], + "e": [6.367] + }, + { "t": 17 } + ], + "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 2", + "np": 3, + "cix": 2, + "ix": 1, + "mn": "ADBE Vector Group" + }, + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { + "a": 1, + "k": [ + { + "i": { "x": [0.833, 0.833], "y": [0.833, 0.833] }, + "o": { "x": [0.167, 0.167], "y": [0.167, 0.167] }, + "n": ["0p833_0p833_0p167_0p167", "0p833_0p833_0p167_0p167"], + "t": 6, + "s": [15.021, 15.021], + "e": [0, 0] + }, + { "t": 21 } + ] + }, + "p": { "a": 0, "k": [0, 0] }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse" + }, + { + "ty": "fl", + "c": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.333], "y": [0] }, + "n": ["0p667_1_0p333_0"], + "t": 6, + "s": [0.8274509, 0.1843137, 0.1843137, 1], + "e": [0.8274509, 0.1843137, 0.1843137, 1] + }, + { "t": 17 } + ] + }, + "o": { "a": 0, "k": 100 }, + "r": 1, + "nm": "Fill 1", + "mn": "ADBE Vector Graphic - Fill" + }, + { + "ty": "tr", + "p": { + "a": 1, + "k": [ + { + "i": { "x": 0.833, "y": 0.833 }, + "o": { "x": 0.167, "y": 0.167 }, + "n": "0p833_0p833_0p167_0p167", + "t": 6, + "s": [16.585, -99.759], + "e": [28.521, -187.495], + "to": [1.9892578125, -14.6227216720581], + "ti": [-1.9892578125, 14.6227216720581] + }, + { "t": 21 } + ], + "ix": 2 + }, + "a": { "a": 0, "k": [0, 0], "ix": 1 }, + "s": { "a": 0, "k": [97.419, 116], "ix": 3 }, + "r": { + "a": 1, + "k": [ + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "n": ["0p833_0p833_0p167_0p167"], + "t": 6, + "s": [14.733], + "e": [8.733] + }, + { "t": 21 } + ], + "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, + "ix": 2, + "mn": "ADBE Vector Group" + } + ], + "ip": 6, + "op": 22, + "st": -21, + "bm": 0, + "sr": 1 + }, + { + "ddd": 0, + "ind": 9, + "ty": 4, + "nm": "Shape Layer 5", + "parent": 11, + "ks": { + "o": { "a": 0, "k": 100 }, + "r": { "a": 0, "k": 0 }, + "p": { "a": 0, "k": [0.8, -0.641, 0] }, + "a": { "a": 0, "k": [0, 0, 0] }, + "s": { "a": 0, "k": [7.39, 7.39, 100] } + }, + "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": [ + [-6.977, 7], + [6.973, -7] + ], + "c": false + }, + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - 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": [ + [-6.977, 7], + [6.973, -7] + ], + "c": false + }, + "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": -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": "Group 1", + "np": 1, + "cix": 2, + "bm": 0, + "ix": 2, + "mn": "ADBE Vector Group", + "hd": false + }, + { + "ty": "mm", + "mm": 2, + "nm": "Merge Paths 1", + "mn": "ADBE Vector Filter - Merge", + "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": 4, + "ix": 5 + }, + "lc": 2, + "lj": 2, + "bm": 0, + "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": [200, 200], + "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": "Combined Shape", + "np": 4, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 7, + "op": 22, + "st": -21, + "bm": 0, + "sr": 1 + }, + { + "ddd": 0, + "ind": 10, + "ty": 4, + "nm": "Shape Layer 6", + "ks": { + "o": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.333], "y": [0] }, + "n": ["0p667_1_0p333_0"], + "t": 4, + "s": [50], + "e": [0] + }, + { "t": 14 } + ] + }, + "r": { "a": 0, "k": 0 }, + "p": { "a": 0, "k": [160, 160, 0] }, + "a": { "a": 0, "k": [0, 0, 0] }, + "s": { + "a": 1, + "k": [ + { + "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 0.667] }, + "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0.333] }, + "n": ["0p667_1_0p333_0", "0p667_1_0p333_0", "0p667_0p667_0p333_0p333"], + "t": 4, + "s": [100, 100, 100], + "e": [1085, 1085, 100] + }, + { "t": 14 } + ] + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { "a": 0, "k": [19.779, 19.779] }, + "p": { "a": 0, "k": [0, 0] }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse" + }, + { + "ty": "fl", + "c": { "a": 0, "k": [0.8274509, 0.1843137, 0.1843137, 1] }, + "o": { "a": 0, "k": 100 }, + "r": 1, + "nm": "Fill 1", + "mn": "ADBE Vector Graphic - Fill" + }, + { + "ty": "tr", + "p": { "a": 0, "k": [-0.068, 0.036], "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, + "ix": 1, + "mn": "ADBE Vector Group" + } + ], + "ip": 4, + "op": 22, + "st": -23, + "bm": 0, + "sr": 1 + }, + { + "ddd": 0, + "ind": 11, + "ty": 4, + "nm": "Shape Layer 4", + "ks": { + "o": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.333], "y": [0] }, + "n": ["0p667_1_0p333_0"], + "t": 6, + "s": [30], + "e": [100] + }, + { "t": 9 } + ] + }, + "r": { "a": 0, "k": 0 }, + "p": { "a": 0, "k": [160.312, 161.188, 0] }, + "a": { "a": 0, "k": [0.812, -0.562, 0] }, + "s": { + "a": 1, + "k": [ + { + "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 0.667] }, + "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0.333] }, + "n": ["0p667_1_0p333_0", "0p667_1_0p333_0", "0p667_0p667_0p333_0p333"], + "t": 6, + "s": [100, 100, 100], + "e": [1087, 1087, 100] + }, + { + "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 0.667] }, + "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0.333] }, + "n": ["0p667_1_0p333_0", "0p667_1_0p333_0", "0p667_0p667_0p333_0p333"], + "t": 11, + "s": [1087, 1087, 100], + "e": [866, 866, 100] + }, + { + "i": { "x": [0.833, 0.833, 0.833], "y": [0.833, 0.833, 0.833] }, + "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0.333] }, + "n": ["0p833_0p833_0p333_0", "0p833_0p833_0p333_0", "0p833_0p833_0p333_0p333"], + "t": 13, + "s": [866, 866, 100], + "e": [878, 878, 100] + }, + { "t": 16 } + ] + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { "a": 0, "k": [10.068, 10.068] }, + "p": { "a": 0, "k": [0, 0] }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse" + }, + { + "ty": "fl", + "c": { "a": 0, "k": [0.8274509, 0.1843137, 0.1843137, 1] }, + "o": { "a": 0, "k": 100 }, + "r": 1, + "nm": "Fill 1", + "mn": "ADBE Vector Graphic - Fill" + }, + { + "ty": "tr", + "p": { "a": 0, "k": [0.784, -0.716], "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, + "ix": 1, + "mn": "ADBE Vector Group" + } + ], + "ip": 6, + "op": 22, + "st": -19, + "bm": 0, + "sr": 1 + }, + { + "ddd": 0, + "ind": 12, + "ty": 4, + "nm": "Shape Layer 3", + "ks": { + "o": { "a": 0, "k": 100 }, + "r": { "a": 0, "k": 0 }, + "p": { "a": 0, "k": [161, 160, 0] }, + "a": { "a": 0, "k": [0, 0, 0] }, + "s": { + "a": 1, + "k": [ + { + "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 0.667] }, + "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0.333] }, + "n": ["0p667_1_0p333_0", "0p667_1_0p333_0", "0p667_0p667_0p333_0p333"], + "t": 3, + "s": [100, 100, 100], + "e": [224, 224, 100] + }, + { + "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 0.667] }, + "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0.333] }, + "n": ["0p667_1_0p333_0", "0p667_1_0p333_0", "0p667_0p667_0p333_0p333"], + "t": 4, + "s": [224, 224, 100], + "e": [476, 476, 100] + }, + { "t": 8 } + ] + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { "a": 0, "k": [6.009, 6.009] }, + "p": { "a": 0, "k": [0, 0] }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse" + }, + { + "ty": "st", + "c": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.333], "y": [0] }, + "n": ["0p667_1_0p333_0"], + "t": 4, + "s": [0.8274509, 0.1843137, 0.1843137, 1], + "e": [0.8274509, 0.1843137, 0.1843137, 1] + }, + { "t": 8 } + ] + }, + "o": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.333], "y": [0] }, + "n": ["0p667_1_0p333_0"], + "t": 4, + "s": [0], + "e": [100] + }, + { "t": 5 } + ] + }, + "w": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.333], "y": [0] }, + "n": ["0p667_1_0p333_0"], + "t": 4, + "s": [3], + "e": [0] + }, + { "t": 8 } + ] + }, + "lc": 1, + "lj": 1, + "ml": 4, + "nm": "Stroke 1", + "mn": "ADBE Vector Graphic - Stroke" + }, + { + "ty": "fl", + "c": { "a": 0, "k": [0.8274509, 0.1843137, 0.1843137, 1] }, + "o": { + "a": 1, + "k": [ + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.333], "y": [0] }, + "n": ["0p667_1_0p333_0"], + "t": 3, + "s": [100], + "e": [99] + }, + { + "i": { "x": [0.667], "y": [1] }, + "o": { "x": [0.333], "y": [0] }, + "n": ["0p667_1_0p333_0"], + "t": 4, + "s": [99], + "e": [0] + }, + { "t": 5 } + ] + }, + "r": 1, + "nm": "Fill 1", + "mn": "ADBE Vector Graphic - Fill" + }, + { + "ty": "tr", + "p": { "a": 0, "k": [-0.338, 0.065], "ix": 2 }, + "a": { "a": 0, "k": [0, 0], "ix": 1 }, + "s": { "a": 0, "k": [649.112, 649.112], "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 2", + "np": 3, + "cix": 2, + "ix": 1, + "mn": "ADBE Vector Group" + } + ], + "ip": 3, + "op": 22, + "st": -21, + "bm": 0, + "sr": 1 + }, + { + "ddd": 0, + "ind": 13, + "ty": 4, + "nm": "Shape Layer 2", + "ks": { + "o": { "a": 0, "k": 100 }, + "r": { "a": 0, "k": 0 }, + "p": { "a": 0, "k": [160.142, 159.987, 0] }, + "a": { "a": 0, "k": [0, 0, 0] }, + "s": { "a": 0, "k": [377.603, 377.603, 100] } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { "a": 0, "k": [22.315, 22.315] }, + "p": { "a": 0, "k": [0, 0] }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse" + }, + { + "ty": "st", + "c": { "a": 0, "k": [0.8352941, 0.8352941, 0.8352941, 1] }, + "o": { "a": 0, "k": 100 }, + "w": { "a": 0, "k": 1 }, + "lc": 1, + "lj": 1, + "ml": 4, + "nm": "Stroke 1", + "mn": "ADBE Vector Graphic - Stroke" + }, + { + "ty": "fl", + "c": { "a": 0, "k": [1, 1, 1, 1] }, + "o": { "a": 0, "k": 100 }, + "r": 1, + "nm": "Fill 1", + "mn": "ADBE Vector Graphic - Fill" + }, + { + "ty": "tr", + "p": { "a": 0, "k": [-0.038, 0.003], "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, + "ix": 1, + "mn": "ADBE Vector Group" + } + ], + "ip": -21, + "op": 22, + "st": -21, + "bm": 0, + "sr": 1 + } + ] +} diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index dd3bcee..739f3f3 100755 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - GetX Standard + GetX Standard CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - GetX Standard + GetX Standard CFBundlePackageType APPL CFBundleShortVersionString diff --git a/lib/app/components/global-widgets/network_image_box.dart b/lib/app/components/global-widgets/network_image_box.dart index e416e2e..fefda44 100644 --- a/lib/app/components/global-widgets/network_image_box.dart +++ b/lib/app/components/global-widgets/network_image_box.dart @@ -9,9 +9,11 @@ class NetworkImageBox extends StatelessWidget { const NetworkImageBox({ super.key, required this.url, + required this.radius, }); final String url; + final num radius; @override Widget build(BuildContext context) { @@ -23,7 +25,7 @@ class NetworkImageBox extends StatelessWidget { decoration: BoxDecoration( border: Border.all(color: Colors.white, width: 1), shape: BoxShape.rectangle, - borderRadius: BorderRadius.circular(18.r), + borderRadius: BorderRadius.circular(radius.r), image: DecorationImage( image: imageProvider, fit: BoxFit.cover, diff --git a/lib/app/components/global-widgets/splash_container.dart b/lib/app/components/global-widgets/splash_container.dart index 7630ca3..d1e2b09 100644 --- a/lib/app/components/global-widgets/splash_container.dart +++ b/lib/app/components/global-widgets/splash_container.dart @@ -23,6 +23,7 @@ class SplashContainer extends StatelessWidget { splashFactory: InkSplash.splashFactory, highlightColor: theme.primaryColor.withOpacity(.3), borderRadius: BorderRadius.circular(radius.r), + radius: 60.r, onTap: onPressed, child: Ink( decoration: BoxDecoration( diff --git a/lib/app/data/local/hive/hive_adapters.dart b/lib/app/data/local/hive/hive_adapters.dart new file mode 100644 index 0000000..f6d48eb --- /dev/null +++ b/lib/app/data/local/hive/hive_adapters.dart @@ -0,0 +1,27 @@ +import '../../../modules/example/home-with-restAPI/model/recipes_model.dart'; +import 'my_hive.dart'; + +class HiveAdapters { + static Future registerAll() async { + await MyHive.init(registerAdapters: (hive) { + hive.registerAdapter(RecipesAdapter()); + hive.registerAdapter(ResultsAdapter()); + hive.registerAdapter(TotalTimeTierAdapter()); + hive.registerAdapter(ShowAdapter()); + hive.registerAdapter(SectionsAdapter()); + hive.registerAdapter(ComponentsAdapter()); + hive.registerAdapter(MeasurementsAdapter()); + hive.registerAdapter(UnitAdapter()); + hive.registerAdapter(IngredientAdapter()); + hive.registerAdapter(CompilationsAdapter()); + hive.registerAdapter(TagsAdapter()); + hive.registerAdapter(RenditionsAdapter()); + hive.registerAdapter(NutritionAdapter()); + hive.registerAdapter(PriceAdapter()); + hive.registerAdapter(TopicsAdapter()); + hive.registerAdapter(UserRatingsAdapter()); + hive.registerAdapter(InstructionsAdapter()); + hive.registerAdapter(CreditsAdapter()); + }); + } +} diff --git a/lib/app/data/local/my_hive.dart b/lib/app/data/local/hive/my_hive.dart similarity index 100% rename from lib/app/data/local/my_hive.dart rename to lib/app/data/local/hive/my_hive.dart diff --git a/lib/app/modules/example/home-with-graphql/controllers/graphql_controller.dart b/lib/app/modules/example/home-with-graphql/controllers/graphql_controller.dart index eb837c8..a87e15f 100755 --- a/lib/app/modules/example/home-with-graphql/controllers/graphql_controller.dart +++ b/lib/app/modules/example/home-with-graphql/controllers/graphql_controller.dart @@ -1,4 +1,6 @@ +import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:getx_standard/app/modules/example/home-with-restAPI/controllers/home_controller.dart'; import 'package:getx_standard/app/service/handler/exception_handler.dart'; import '../../../../components/navbar/navbar_controller.dart'; @@ -62,7 +64,7 @@ class GraphQLController extends GetxController with ExceptionHandler { @override void onReady() async { await getAlbums(); - + Get.find().bottomPadding.value = 18.sp; super.onReady(); } } diff --git a/lib/app/modules/example/home-with-restAPI/controllers/home_controller.dart b/lib/app/modules/example/home-with-restAPI/controllers/home_controller.dart index 074d029..88f6c17 100755 --- a/lib/app/modules/example/home-with-restAPI/controllers/home_controller.dart +++ b/lib/app/modules/example/home-with-restAPI/controllers/home_controller.dart @@ -1,31 +1,53 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:getx_standard/app/modules/example/home-with-restAPI/model/recipes_model.dart'; import 'package:getx_standard/app/service/helper/network_connectivity.dart'; import '../../../../components/global-widgets/custom_snackbar.dart'; import '../../../../components/navbar/navbar_controller.dart'; -import '../../../../data/local/my_hive.dart'; +import '../../../../data/local/hive/my_hive.dart'; import '../../../../service/REST/api_urls.dart'; import '../../../../service/REST/dio_client.dart'; import '../../../../service/handler/exception_handler.dart'; class HomeController extends GetxController with ExceptionHandler { final navController = Get.put(NavbarController()); + final scrollController = ScrollController(); + + RxDouble bottomPadding = 18.sp.obs; RxString title = "".obs; RxString body = "".obs; final recipes = RxList(); + scrollPositionTracker() { + scrollController.addListener(() { + if (scrollController.position.pixels > + scrollController.position.minScrollExtent + 5) { + bottomPadding.value = 18.sp; + // position in Top + } + if (scrollController.position.pixels >= + scrollController.position.maxScrollExtent) { + bottomPadding.value = 130.sp; + // position in Bottom + } + }); + } + /// GET ALL RECIPES LIST 'HIVE IMPLEMENTED' getRecipes() async { showLoading(); if (await NetworkConnectivity.isNetworkAvailable()) { /// Fetch recipes from the API - var response = await DioClient().get( - url: ApiUrl.allRecipes, - params: {"from": 0, "size": 20}).catchError(handleError); + var response = await DioClient() + .get( + url: ApiUrl.allRecipes, + ) + .catchError(handleError); if (response == null) return; @@ -58,7 +80,31 @@ class HomeController extends GetxController with ExceptionHandler { @override void onReady() async { await getRecipes(); - + // scrollController.addListener(() { + // if (scrollController.position.atEdge) { + // bool isTop = scrollController.position.pixels == 0; + // if (isTop) { + // bottomPadding.value = 18.sp; + // print('At the top'); + // } else { + // bottomPadding.value = 50.sp; + // print('At the bottom'); + // } + // } + // }); super.onReady(); } + + @override + void onInit() { + super.onInit(); + + scrollPositionTracker(); + } + + @override + void dispose() { + scrollController.dispose(); + super.dispose(); + } } diff --git a/lib/app/modules/example/home-with-restAPI/views/home_view.dart b/lib/app/modules/example/home-with-restAPI/views/home_view.dart index 8138b70..45feb51 100755 --- a/lib/app/modules/example/home-with-restAPI/views/home_view.dart +++ b/lib/app/modules/example/home-with-restAPI/views/home_view.dart @@ -3,8 +3,8 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:getx_standard/app/components/global-widgets/splash_container.dart'; import 'package:iconly/iconly.dart'; +import 'package:iconsax/iconsax.dart'; -import '../../../../../config/theme/my_fonts.dart'; import '../../../../components/global-widgets/empty_widget.dart'; import '../../../../components/global-widgets/network_image_box.dart'; import '../controllers/home_controller.dart'; @@ -29,118 +29,142 @@ class HomeView extends GetView { ], centerTitle: true, ), - body: Obx(() => controller.isError.value == true - ? EmptyWidget(onPressed: () async => await controller.getRecipes()) - : RefreshIndicator( - color: theme.primaryColor, - onRefresh: () async => await controller.getRecipes(), - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - TweenAnimationBuilder( - tween: Tween(begin: 0, end: 1), - duration: const Duration(milliseconds: 1000), - builder: - (BuildContext context, double value, Widget? child) { - return Opacity( - opacity: value, - child: Padding( - padding: EdgeInsets.only(top: value * 18.r), - child: child, - ), - ); - }, - child: Text( - "GetX Standard", - style: theme.textTheme.displaySmall, - ), - ), - Expanded( - child: RawScrollbar( - thumbColor: theme.primaryColor, - radius: Radius.circular(100.r), - thickness: 5, - interactive: true, - child: Padding( - padding: EdgeInsets.all(18.r), - child: ListView.separated( - itemCount: controller.recipes.length, - physics: const BouncingScrollPhysics(), - padding: EdgeInsets.zero, - separatorBuilder: (_, __) => SizedBox( - height: 20.h, - ), - itemBuilder: (ctx, index) => SplashContainer( - radius: 15, - onPressed: () {}, - child: SizedBox( - height: 110.sp, - child: Padding( - padding: EdgeInsets.all(8.r), - child: Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - SplashContainer( - radius: 15, - onPressed: () {}, - child: NetworkImageBox( - url: controller - .recipes[index].thumbnailUrl ?? - "", + body: Obx( + () => controller.isError.value == true + ? EmptyWidget(onPressed: () async => await controller.getRecipes()) + : RefreshIndicator( + color: theme.primaryColor, + onRefresh: () async => await controller.getRecipes(), + child: Padding( + padding: EdgeInsets.fromLTRB( + 18.sp, 18.sp, 18.sp, controller.bottomPadding.value), + child: GridView.builder( + itemCount: controller.recipes.length, + physics: const BouncingScrollPhysics(), + padding: EdgeInsets.zero, + controller: controller.scrollController, + itemBuilder: (context, index) => Stack( + alignment: Alignment.topCenter, + children: [ + Column( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + SplashContainer( + radius: 15, + onPressed: () {}, + child: Container( + width: 150.sp, + height: 170.sp, + padding: EdgeInsets.fromLTRB( + 10.sp, 46.sp, 10.sp, 12.sp), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(15.r), + color: Colors.grey.shade200 + .withOpacity(0.5)), + child: Column( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + TweenAnimationBuilder( + tween: Tween(begin: 0, end: 1), + duration: + const Duration(milliseconds: 1500), + builder: (BuildContext context, + double value, Widget? child) { + return Opacity( + opacity: value, + child: Padding( + padding: EdgeInsets.only( + top: value * 18.r), + child: child, + ), + ); + }, + child: Text( + controller.recipes[index].name ?? "", + style: theme.textTheme.titleLarge, + textAlign: TextAlign.center, + maxLines: 2, + overflow: TextOverflow.ellipsis, + ), ), - ), - SizedBox(width: 10.sp), - Expanded( - child: Column( + Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: - CrossAxisAlignment.start, children: [ Text( - controller.recipes[index].name ?? - "", - textAlign: TextAlign.left, - style: TextStyle( - fontSize: - MyFonts.headline5TextSize, - fontWeight: FontWeight.w500, - color: theme.primaryColor, - ), - maxLines: 2, - overflow: TextOverflow.ellipsis, + "${controller.recipes[index].prepTimeMinutes ?? ""} Mins", + style: theme.textTheme.bodySmall, ), - Flexible( - child: Text( - controller.recipes[index] - .description ?? - "No description", - textAlign: TextAlign.left, - style: TextStyle( - fontSize: - MyFonts.headline6TextSize, - fontWeight: FontWeight.w400, - color: theme.hintColor, - ), - maxLines: 2, - overflow: TextOverflow.ellipsis, - ), + SizedBox( + height: 30.sp, + width: 30.sp, + child: SplashContainer( + radius: 100, + onPressed: () {}, + child: Icon( + Iconsax.save_add, + size: 16.sp, + color: theme.primaryColor, + )), ), ], ), - ), - ], + ], + ), + )), + ], + ), + Positioned( + top: 30.sp, + child: SizedBox( + height: 100.sp, + width: 100.sp, + child: NetworkImageBox( + url: controller.recipes[index].thumbnailUrl ?? "", + radius: 100, + ), + ), + ), + Positioned( + right: 10.sp, + top: 55.sp, + child: Container( + height: 28.sp, + width: 58.sp, + padding: EdgeInsets.symmetric(horizontal: 8.sp), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(50.r), + color: const Color(0xffFFE1B3), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Icon( + Icons.star, + color: const Color(0xffFFAD30), + size: 18.sp, ), - ), + Text(controller + .recipes[index].userRatings!.score! + .toStringAsFixed(1)), + ], ), ), ), - ), + ], + ), + gridDelegate: + const SliverGridDelegateWithFixedCrossAxisCount( + crossAxisCount: 2, + childAspectRatio: 2 / 3, ), ), - ], + ), ), - )), + ), ); } } diff --git a/lib/app/service/REST/api_header.dart b/lib/app/service/REST/api_header.dart index 399e25f..cfcaf5a 100755 --- a/lib/app/service/REST/api_header.dart +++ b/lib/app/service/REST/api_header.dart @@ -1,15 +1,11 @@ class Header { - // RAPID API HEADER - static Map rapidApiHeader = { - "X-RapidAPI-Key": "05741bc39bmsh35c797d07e59651p13baa5jsn936cd89ffe07", - "X-RapidAPI-Host": "tasty.p.rapidapi.com", - }; // SECURE HEADER static Map secureHeader = { "Authorization": "Bearer 'token'", 'Accept': 'application/json', 'Content-Type': 'application/json', }; + // DEFAULT HEADER static Map defaultHeader = { 'Accept': 'application/json', @@ -28,4 +24,10 @@ class Header { 'Accept': 'application/json', 'Content-Type': 'multipart/form-data', }; + + /// ***************** PERSONAL CUSTOM API HEADER ***************** /// + // RAPID API HEADER + static Map rapidApiHeader = { + "X-RapidAPI-Key": "05741bc39bmsh35c797d07e59651p13baa5jsn936cd89ffe07", + }; } diff --git a/lib/app/service/REST/api_urls.dart b/lib/app/service/REST/api_urls.dart index f18a89d..e933117 100755 --- a/lib/app/service/REST/api_urls.dart +++ b/lib/app/service/REST/api_urls.dart @@ -1,5 +1,6 @@ class ApiUrl { /// Base URL - static const baseUrl = "https://tasty.p.rapidapi.com/recipes"; - static const allRecipes = "$baseUrl/list"; + static const baseUrl = "https://tasty.p.rapidapi.com"; + static const allRecipes = "$baseUrl/recipes/list"; + static const allTags = "$baseUrl/tags/list"; } diff --git a/lib/app/service/REST/dio_client.dart b/lib/app/service/REST/dio_client.dart index 727a9a8..521e0f4 100755 --- a/lib/app/service/REST/dio_client.dart +++ b/lib/app/service/REST/dio_client.dart @@ -9,7 +9,12 @@ import 'package:dio/dio.dart'; import 'api_header.dart'; class DioClient { - static const int TIME_OUT_DURATION = 20; + static const int TIME_OUT_DURATION = 2000; + BaseOptions baseOptions = BaseOptions( + connectTimeout: const Duration(seconds: TIME_OUT_DURATION), + receiveTimeout: const Duration(seconds: TIME_OUT_DURATION), + sendTimeout: const Duration(seconds: TIME_OUT_DURATION), + ); //GET @@ -18,11 +23,9 @@ class DioClient { Map? params, }) async { try { - var response = await Dio() - .get(url, - options: Options(headers: Header.rapidApiHeader), - queryParameters: params) - .timeout(const Duration(seconds: TIME_OUT_DURATION)); + var response = await Dio(baseOptions).get(url, + options: Options(headers: Header.rapidApiHeader), + queryParameters: params); return response.data; } catch (e) { @@ -36,12 +39,10 @@ class DioClient { {required String url, Map? params, dynamic body}) async { var payload = json.encode(body); try { - var response = await Dio() - .post(url, - options: Options(headers: Header.defaultHeader), - queryParameters: params, - data: payload) - .timeout(const Duration(seconds: TIME_OUT_DURATION)); + var response = await Dio(baseOptions).post(url, + options: Options(headers: Header.defaultHeader), + queryParameters: params, + data: payload); return response.data; } catch (e) { @@ -55,12 +56,10 @@ class DioClient { {required String url, Map? params, dynamic body}) async { var payload = json.encode(body); try { - var response = await Dio() - .patch(url, - options: Options(headers: Header.defaultHeader), - queryParameters: params, - data: payload) - .timeout(const Duration(seconds: TIME_OUT_DURATION)); + var response = await Dio(baseOptions).patch(url, + options: Options(headers: Header.defaultHeader), + queryParameters: params, + data: payload); return response.data; } catch (e) { rethrow; @@ -73,12 +72,10 @@ class DioClient { {required String url, Map? params, dynamic body}) async { var payload = json.encode(body); try { - var response = await Dio() - .delete(url, - options: Options(headers: Header.defaultHeader), - queryParameters: params, - data: payload) - .timeout(const Duration(seconds: TIME_OUT_DURATION)); + var response = await Dio(baseOptions).delete(url, + options: Options(headers: Header.defaultHeader), + queryParameters: params, + data: payload); return response.data; } catch (e) { rethrow; @@ -88,6 +85,7 @@ class DioClient { //MULTIPART FOR MULTIPLE FILE UPLOAD List? docFileList = []; + Future multipartRequest({ required String url, Map? params, @@ -102,12 +100,10 @@ class DioClient { } try { - var response = await Dio() - .post(url, - options: Options(headers: Header.defaultMultipartHeader), - queryParameters: params, - data: formData) - .timeout(const Duration(seconds: TIME_OUT_DURATION)); + var response = await Dio(baseOptions).post(url, + options: Options(headers: Header.defaultMultipartHeader), + queryParameters: params, + data: formData); return response.data; } catch (e) { rethrow; @@ -128,12 +124,10 @@ class DioClient { } try { - var response = await Dio() - .post(url, - options: Options(headers: Header.defaultMultipartHeader), - queryParameters: params, - data: formData) - .timeout(const Duration(seconds: TIME_OUT_DURATION)); + var response = await Dio(baseOptions).post(url, + options: Options(headers: Header.defaultMultipartHeader), + queryParameters: params, + data: formData); return response.data; } catch (e) { rethrow; diff --git a/lib/app/service/handler/exception_handler.dart b/lib/app/service/handler/exception_handler.dart index f67e49f..7c28e08 100755 --- a/lib/app/service/handler/exception_handler.dart +++ b/lib/app/service/handler/exception_handler.dart @@ -19,7 +19,7 @@ mixin class ExceptionHandler { var errorText = DioExceptions.fromDioError(error).toString(); - showErrorDialog(Strings.oops.tr, errorText); + showErrorDialog(Strings.ohNo.tr, errorText); Logger().e(errorText); } @@ -31,10 +31,10 @@ mixin class ExceptionHandler { try { Map onlyMessage = jsonDecode(errorText); - showErrorDialog(Strings.oops.tr, onlyMessage["message"]); + showErrorDialog(Strings.ohNo.tr, onlyMessage["message"]); Logger().e(onlyMessage); } catch (e) { - showErrorDialog(Strings.oops.tr, errorText); + showErrorDialog(Strings.ohNo.tr, errorText); Logger().e(errorText); } } diff --git a/lib/app/service/helper/dialog_helper.dart b/lib/app/service/helper/dialog_helper.dart index 81fe931..c4b5778 100755 --- a/lib/app/service/helper/dialog_helper.dart +++ b/lib/app/service/helper/dialog_helper.dart @@ -16,46 +16,46 @@ class DialogHelper { Get.dialog( Dialog( elevation: 6, - shadowColor: LightThemeColors.primaryColor, + shadowColor: LightThemeColors.primaryColor.withOpacity(.5), + shape: + RoundedRectangleBorder(borderRadius: BorderRadius.circular(30.r)), child: Padding( padding: const EdgeInsets.all(16.0), child: Column( mainAxisSize: MainAxisSize.min, children: [ + Lottie.asset( + 'animations/apiError.json', + height: 120.sp, + repeat: true, + reverse: true, + fit: BoxFit.cover, + ), Text( title, style: TextStyle( color: Colors.redAccent, fontWeight: FontWeight.w400, - fontSize: 16.sp, + fontSize: 14.sp, ), - maxLines: 4, - overflow: TextOverflow.ellipsis, ), - SizedBox(height: 5.h), - Lottie.asset( - 'animations/apiError.json', - height: 120.h, - repeat: true, - reverse: true, - fit: BoxFit.cover, - ), - SizedBox(height: 20.h), + SizedBox(height: 20.sp), AnimatedTextKit(repeatForever: true, animatedTexts: [ ColorizeAnimatedText(description, - textStyle: Get.textTheme.headlineMedium as TextStyle, + textStyle: Get.textTheme.headlineSmall as TextStyle, textAlign: TextAlign.center, colors: [ - Colors.purple, + Colors.red, Colors.blue, Colors.yellow, Colors.red, ]), ]), - SizedBox(height: 30.h), + SizedBox(height: 30.sp), SizedBox( - width: 100.w, + width: 100.sp, child: ElevatedButton( + style: ElevatedButton.styleFrom(backgroundColor: Colors.red), onPressed: () { if (Get.isDialogOpen!) Get.back(); }, diff --git a/lib/config/theme/light_theme_colors.dart b/lib/config/theme/light_theme_colors.dart index 63b6056..baa2833 100755 --- a/lib/config/theme/light_theme_colors.dart +++ b/lib/config/theme/light_theme_colors.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; class LightThemeColors { //dark swatch - static const Color primaryColor = Colors.deepOrangeAccent; + static const Color primaryColor = Color(0xFF40A76A); static const Color accentColor = Color(0xFFD9EDE1); //APPBAR diff --git a/lib/config/theme/my_fonts.dart b/lib/config/theme/my_fonts.dart index 2299fd8..58154fc 100755 --- a/lib/config/theme/my_fonts.dart +++ b/lib/config/theme/my_fonts.dart @@ -29,8 +29,9 @@ class MyFonts { static double get appBarTittleSize => 18.sp; // body font size - static double get body1TextSize => 13.sp; + static double get body1TextSize => 15.sp; static double get body2TextSize => 13.sp; + static double get body3TextSize => 10.sp; // headlines font size static double get headline1TextSize => 50.sp; diff --git a/lib/config/theme/my_styles.dart b/lib/config/theme/my_styles.dart index b63cf02..701740d 100755 --- a/lib/config/theme/my_styles.dart +++ b/lib/config/theme/my_styles.dart @@ -47,6 +47,11 @@ class MyStyles { color: isLightTheme ? LightThemeColors.bodyTextColor : DarkThemeColors.bodyTextColor), + bodySmall: (MyFonts.bodyTextStyle).copyWith( + fontSize: MyFonts.body3TextSize, + color: isLightTheme + ? LightThemeColors.bodyTextColor + : DarkThemeColors.bodyTextColor), displayLarge: (MyFonts.headlineTextStyle).copyWith( fontSize: MyFonts.headline1TextSize, fontWeight: FontWeight.bold, @@ -83,11 +88,6 @@ class MyStyles { color: isLightTheme ? LightThemeColors.headlinesTextColor : DarkThemeColors.headlinesTextColor), - bodySmall: TextStyle( - color: isLightTheme - ? LightThemeColors.captionTextColor - : DarkThemeColors.captionTextColor, - fontSize: MyFonts.captionTextSize), ); static ChipThemeData getChipTheme({required bool isLightTheme}) { diff --git a/lib/config/translations/ar_AR/ar_ar_translation.dart b/lib/config/translations/ar_AR/ar_ar_translation.dart index 5ca4916..5cda6cb 100755 --- a/lib/config/translations/ar_AR/ar_ar_translation.dart +++ b/lib/config/translations/ar_AR/ar_ar_translation.dart @@ -17,7 +17,7 @@ final Map arAR = { /// Strings.changeTheme: 'تغيير الثيم', Strings.changeLanguage: 'تغيير اللغة', - Strings.oops: "أُووبس!", + Strings.ohNo: "أوه لا...", Strings.okay: "تمام", Strings.refresh: "ينعش!", Strings.empty: "فارغة أو لا توجد بيانات!", diff --git a/lib/config/translations/en_US/en_us_translation.dart b/lib/config/translations/en_US/en_us_translation.dart index 7de1a3d..0baa224 100755 --- a/lib/config/translations/en_US/en_us_translation.dart +++ b/lib/config/translations/en_US/en_us_translation.dart @@ -17,7 +17,7 @@ const Map enUs = { /// Strings.changeTheme: 'Change theme', Strings.changeLanguage: 'Change language', - Strings.oops: "Oops!", + Strings.ohNo: "Oh, no...", Strings.okay: "Okay", Strings.refresh: "refresh!", Strings.empty: "Empty or No data!", diff --git a/lib/config/translations/strings_enum.dart b/lib/config/translations/strings_enum.dart index 0b5b90e..062d6fb 100755 --- a/lib/config/translations/strings_enum.dart +++ b/lib/config/translations/strings_enum.dart @@ -15,7 +15,7 @@ class Strings { /// static const String changeTheme = 'change_theme'; static const String changeLanguage = 'change_language'; - static const String oops = "Oops!"; + static const String ohNo = "Oh, no..."; static const String okay = "Okay"; static const String refresh = "refresh!"; static const String empty = "Empty or No data!"; diff --git a/lib/main.dart b/lib/main.dart index 58e4326..0616682 100755 --- a/lib/main.dart +++ b/lib/main.dart @@ -2,10 +2,9 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:getx_standard/app/data/local/my_hive.dart'; +import 'package:getx_standard/app/data/local/hive/hive_adapters.dart'; import 'app/data/local/my_shared_pref.dart'; -import 'app/modules/example/home-with-restAPI/model/recipes_model.dart'; import 'app/routes/app_pages.dart'; import 'config/theme/my_theme.dart'; import 'config/translations/localization_service.dart'; @@ -18,26 +17,7 @@ Future main() async { ); // init hive and adapters - await MyHive.init(registerAdapters: (hive) { - hive.registerAdapter(RecipesAdapter()); - hive.registerAdapter(ResultsAdapter()); - hive.registerAdapter(TotalTimeTierAdapter()); - hive.registerAdapter(ShowAdapter()); - hive.registerAdapter(SectionsAdapter()); - hive.registerAdapter(ComponentsAdapter()); - hive.registerAdapter(MeasurementsAdapter()); - hive.registerAdapter(UnitAdapter()); - hive.registerAdapter(IngredientAdapter()); - hive.registerAdapter(CompilationsAdapter()); - hive.registerAdapter(TagsAdapter()); - hive.registerAdapter(RenditionsAdapter()); - hive.registerAdapter(NutritionAdapter()); - hive.registerAdapter(PriceAdapter()); - hive.registerAdapter(TopicsAdapter()); - hive.registerAdapter(UserRatingsAdapter()); - hive.registerAdapter(InstructionsAdapter()); - hive.registerAdapter(CreditsAdapter()); - }); + await HiveAdapters.registerAll(); // Device info // DeviceInfoHelper.initializeDeviceInfo(); @@ -74,7 +54,7 @@ Future main() async { ); }, - initialRoute: AppPages.ONBOARDING, + initialRoute: AppPages.NAV, // first screen to show when app is running defaultTransition: Transition.circularReveal,