From c2977e468f37e4e615924338b128f89a280f9683 Mon Sep 17 00:00:00 2001 From: Alexandra Betouni Date: Fri, 4 Mar 2022 00:50:53 +0200 Subject: [PATCH] feat(onboarding): Added SplashScreen - Added SplashScreen as initial screen before onboard as per new designs. - Also moved all onboarding related code from main to onboarding section and switched to import this and all other sections as qml modules, exposing this way only necessary files. - Cleaned up unecessary qmldir files and imports. Closes #4954 --- src-cpp/main.cpp | 1 + src/nim_status_client.nim | 1 + ui/app/AppLayouts/Browser/qmldir | 1 + ui/app/AppLayouts/Chat/controls/qmldir | 1 + ui/app/AppLayouts/Chat/panels/qmldir | 1 + ui/app/AppLayouts/Chat/popups/qmldir | 5 + ui/app/AppLayouts/Chat/qmldir | 1 + ui/app/AppLayouts/Chat/stores/qmldir | 2 + ui/app/AppLayouts/Node/qmldir | 1 + .../Onboarding/OnboardingLayout.qml | 183 +++++++++++++++++ ui/app/AppLayouts/Onboarding/qmldir | 1 + ui/app/AppLayouts/Profile/popups/qmldir | 2 + ui/app/AppLayouts/Profile/qmldir | 2 +- ui/app/AppLayouts/Wallet/qmldir | 1 + ui/app/AppLayouts/qmldir | 6 - ui/app/AppLayouts/stores/qmldir | 1 + ui/app/{ => mainui}/AppMain.qml | 22 ++- ui/app/{ => mainui}/AppSearch.qml | 0 ui/app/mainui/SplashScreen.qml | 40 ++++ ui/app/mainui/qmldir | 2 + ui/app/qmldir | 1 - ui/imports/assets/lottie/status_splash.json | 1 + .../shared/popups/SignTransactionModal.qml | 2 +- ui/imports/shared/status/StatusChatInput.qml | 2 +- .../shared/status/StatusStickerMarket.qml | 2 +- .../status/StatusStickerPackClickPopup.qml | 2 - .../shared/status/StatusStickersPopup.qml | 2 +- ui/imports/shared/views/ExistingContacts.qml | 2 +- ui/imports/shared/views/SearchResults.qml | 2 - ui/imports/utils/Global.qml | 2 +- ui/imports/utils/Style.qml | 3 + ui/main.qml | 184 ++---------------- 32 files changed, 283 insertions(+), 196 deletions(-) create mode 100644 ui/app/AppLayouts/Browser/qmldir create mode 100644 ui/app/AppLayouts/Chat/controls/qmldir create mode 100644 ui/app/AppLayouts/Chat/panels/qmldir create mode 100644 ui/app/AppLayouts/Chat/popups/qmldir create mode 100644 ui/app/AppLayouts/Chat/qmldir create mode 100644 ui/app/AppLayouts/Chat/stores/qmldir create mode 100644 ui/app/AppLayouts/Node/qmldir create mode 100644 ui/app/AppLayouts/Onboarding/OnboardingLayout.qml create mode 100644 ui/app/AppLayouts/Onboarding/qmldir create mode 100644 ui/app/AppLayouts/Profile/popups/qmldir delete mode 100644 ui/app/AppLayouts/qmldir create mode 100644 ui/app/AppLayouts/stores/qmldir rename ui/app/{ => mainui}/AppMain.qml (99%) rename ui/app/{ => mainui}/AppSearch.qml (100%) create mode 100644 ui/app/mainui/SplashScreen.qml create mode 100644 ui/app/mainui/qmldir delete mode 100644 ui/app/qmldir create mode 100644 ui/imports/assets/lottie/status_splash.json diff --git a/src-cpp/main.cpp b/src-cpp/main.cpp index f6240db80a..ef3cd8b756 100644 --- a/src-cpp/main.cpp +++ b/src-cpp/main.cpp @@ -63,6 +63,7 @@ int main(int argc, char* argv[]) Global::Singleton::instance()->engine()->addImportPath("qrc:/./StatusQ/src"); Global::Singleton::instance()->engine()->addImportPath("qrc:/./imports"); + Global::Singleton::instance()->engine()->addImportPath("qrc:/./app"); const QUrl url(QStringLiteral("qrc:/main.qml")); QObject::connect( diff --git a/src/nim_status_client.nim b/src/nim_status_client.nim index 2cd1be9724..fb138071fd 100644 --- a/src/nim_status_client.nim +++ b/src/nim_status_client.nim @@ -104,6 +104,7 @@ proc mainProc() = singletonInstance.engine.addImportPath("qrc:/./StatusQ/src") singletonInstance.engine.addImportPath("qrc:/./imports") + singletonInstance.engine.addImportPath("qrc:/./app"); singletonInstance.engine.setNetworkAccessManagerFactory(networkAccessFactory) singletonInstance.engine.setRootContextProperty("uiScaleFilePath", newQVariant(uiScaleFilePath)) singletonInstance.engine.setRootContextProperty("singleInstance", newQVariant(singleInstance)) diff --git a/ui/app/AppLayouts/Browser/qmldir b/ui/app/AppLayouts/Browser/qmldir new file mode 100644 index 0000000000..b0b245e68f --- /dev/null +++ b/ui/app/AppLayouts/Browser/qmldir @@ -0,0 +1 @@ +BrowserLayout 1.0 BrowserLayout.qml diff --git a/ui/app/AppLayouts/Chat/controls/qmldir b/ui/app/AppLayouts/Chat/controls/qmldir new file mode 100644 index 0000000000..b6a2fb27f4 --- /dev/null +++ b/ui/app/AppLayouts/Chat/controls/qmldir @@ -0,0 +1 @@ +Contact 1.0 Contact.qml diff --git a/ui/app/AppLayouts/Chat/panels/qmldir b/ui/app/AppLayouts/Chat/panels/qmldir new file mode 100644 index 0000000000..fb8721e1df --- /dev/null +++ b/ui/app/AppLayouts/Chat/panels/qmldir @@ -0,0 +1 @@ +SuggestionBoxPanel 1.0 SuggestionBoxPanel.qml diff --git a/ui/app/AppLayouts/Chat/popups/qmldir b/ui/app/AppLayouts/Chat/popups/qmldir new file mode 100644 index 0000000000..27ec9d2b63 --- /dev/null +++ b/ui/app/AppLayouts/Chat/popups/qmldir @@ -0,0 +1,5 @@ +PinnedMessagesPopup 1.0 PinnedMessagesPopup.qml +ChooseBrowserPopup 1.0 ChooseBrowserPopup.qml +InviteFriendsToCommunityPopup 1.0 community/InviteFriendsToCommunityPopup.qml +CommunityProfilePopup 1.0 community/CommunityProfilePopup.qml +CreateCommunityPopup 1.0 community/CreateCommunityPopup.qml diff --git a/ui/app/AppLayouts/Chat/qmldir b/ui/app/AppLayouts/Chat/qmldir new file mode 100644 index 0000000000..62266f191b --- /dev/null +++ b/ui/app/AppLayouts/Chat/qmldir @@ -0,0 +1 @@ +ChatLayout 1.0 ChatLayout.qml diff --git a/ui/app/AppLayouts/Chat/stores/qmldir b/ui/app/AppLayouts/Chat/stores/qmldir new file mode 100644 index 0000000000..329c6b3b8f --- /dev/null +++ b/ui/app/AppLayouts/Chat/stores/qmldir @@ -0,0 +1,2 @@ +StickerData 1.0 StickerData.qml +StickerPackData 1.0 StickerPackData.qml diff --git a/ui/app/AppLayouts/Node/qmldir b/ui/app/AppLayouts/Node/qmldir new file mode 100644 index 0000000000..62e5cf9320 --- /dev/null +++ b/ui/app/AppLayouts/Node/qmldir @@ -0,0 +1 @@ +NodeLayout 1.0 NodeLayout.qml diff --git a/ui/app/AppLayouts/Onboarding/OnboardingLayout.qml b/ui/app/AppLayouts/Onboarding/OnboardingLayout.qml new file mode 100644 index 0000000000..2223bb7f17 --- /dev/null +++ b/ui/app/AppLayouts/Onboarding/OnboardingLayout.qml @@ -0,0 +1,183 @@ +import QtQuick 2.12 +import QtQml.StateMachine 1.14 as DSM +import utils 1.0 + +import "views" +import "stores" + +QtObject { + id: root + property bool hasAccounts + signal loadApp() + signal onBoardingStepChanged(var view) + + property var stateMachine: DSM.StateMachine { + id: stateMachine + initialState: onboardingState + running: true + + DSM.State { + id: onboardingState + initialState: root.hasAccounts ? stateLogin : keysMainState + + DSM.State { + id: keysMainState + onEntered: { onBoardingStepChanged(keysMain); } + + DSM.SignalTransition { + targetState: genKeyState + signal: Global.applicationWindow.navigateTo + guard: path === "GenKey" + } + } + + DSM.State { + id: existingKeyState + onEntered: { onBoardingStepChanged(existingKey); } + + DSM.SignalTransition { + targetState: appState + signal: startupModule.appStateChanged + guard: state === Constants.appState.main + } + } + + DSM.State { + id: genKeyState + onEntered: { onBoardingStepChanged(genKey); } + + DSM.SignalTransition { + targetState: appState + signal: startupModule.appStateChanged + guard: state === Constants.appState.main + } + } + + DSM.State { + id: keycardState + onEntered: { onBoardingStepChanged(keycardFlowSelection); } + + DSM.SignalTransition { + targetState: appState + signal: startupModule.appStateChanged + guard: state === Constants.appState.main + } + } + + DSM.State { + id: stateLogin + onEntered: { onBoardingStepChanged(login); } + + DSM.SignalTransition { + targetState: appState + signal: startupModule.appStateChanged + guard: state === Constants.appState.main + } + + DSM.SignalTransition { + targetState: genKeyState + signal: Global.applicationWindow.navigateTo + guard: path === "GenKey" + } + } + + DSM.SignalTransition { + targetState: root.hasAccounts ? stateLogin : keysMainState + signal: Global.applicationWindow.navigateTo + guard: path === "InitialState" + } + + DSM.SignalTransition { + targetState: existingKeyState + signal: Global.applicationWindow.navigateTo + guard: path === "ExistingKey" + } + + DSM.SignalTransition { + targetState: keysMainState + signal: Global.applicationWindow.navigateTo + guard: path === "KeysMain" + } + + DSM.SignalTransition { + targetState: keycardState + signal: Global.applicationWindow.navigateTo + guard: path === "KeycardFlowSelection" + } + + DSM.FinalState { + id: onboardingDoneState + } + } + + DSM.State { + id: appState + onEntered: loadApp(); + + DSM.SignalTransition { + targetState: stateLogin + signal: startupModule.logOut + } + } + } + + property var keysMainComponent: Component { + id: keysMain + KeysMainView { + btnGenKey.onClicked: Global.applicationWindow.navigateTo("GenKey") + btnExistingKey.onClicked: Global.applicationWindow.navigateTo("ExistingKey") + btnKeycard.onClicked: Global.applicationWindow.navigateTo("KeycardFlowSelection") + } + } + + property var existingKeyComponent: Component { + id: existingKey + ExistingKeyView { + onClosed: function () { + if (root.hasAccounts) { + Global.applicationWindow.navigateTo("InitialState") + } else { + Global.applicationWindow.navigateTo("KeysMain") + } + } + } + } + + property var genKeyComponent: Component { + id: genKey + GenKeyView { + onClosed: function () { + if (root.hasAccounts) { + Global.applicationWindow.navigateTo("InitialState") + } else { + Global.applicationWindow.navigateTo("KeysMain") + } + } + } + } + + property var keycardFlowSelectionComponent: Component { + id: keycardFlowSelection + KeycardFlowSelectionView { + onClosed: function () { + if (root.hasAccounts) { + Global.applicationWindow.navigateTo("InitialState") + } else { + Global.applicationWindow.navigateTo("KeysMain") + } + } + } + } + + property var loginComponent: Component { + id: login + LoginView { + onGenKeyClicked: function () { + Global.applicationWindow.navigateTo("GenKey") + } + onExistingKeyClicked: function () { + Global.applicationWindow.navigateTo("ExistingKey") + } + } + } +} diff --git a/ui/app/AppLayouts/Onboarding/qmldir b/ui/app/AppLayouts/Onboarding/qmldir new file mode 100644 index 0000000000..ac7c41394a --- /dev/null +++ b/ui/app/AppLayouts/Onboarding/qmldir @@ -0,0 +1 @@ +OnboardingLayout 1.0 OnboardingLayout.qml diff --git a/ui/app/AppLayouts/Profile/popups/qmldir b/ui/app/AppLayouts/Profile/popups/qmldir new file mode 100644 index 0000000000..dc6b65595a --- /dev/null +++ b/ui/app/AppLayouts/Profile/popups/qmldir @@ -0,0 +1,2 @@ +ChangeProfilePicModal 1.0 ChangeProfilePicModal.qml +BackupSeedModal 1.0 BackupSeedModal.qml diff --git a/ui/app/AppLayouts/Profile/qmldir b/ui/app/AppLayouts/Profile/qmldir index ce3b215312..2df4560442 100644 --- a/ui/app/AppLayouts/Profile/qmldir +++ b/ui/app/AppLayouts/Profile/qmldir @@ -1 +1 @@ -LeftTab 1.0 LeftTab.qml +ProfileLayout 1.0 ProfileLayout.qml diff --git a/ui/app/AppLayouts/Wallet/qmldir b/ui/app/AppLayouts/Wallet/qmldir index 4e2830afe1..23a179a35e 100644 --- a/ui/app/AppLayouts/Wallet/qmldir +++ b/ui/app/AppLayouts/Wallet/qmldir @@ -2,3 +2,4 @@ LeftTabView 1.0 LeftTabView.qml WalletHeader 1.0 WalletHeader.qml AssetsView 1.0 AssetsView.qml CollectiblesView 1.0 CollectiblesView.qml +WalletLayout 1.0 WalletLayout.qml diff --git a/ui/app/AppLayouts/qmldir b/ui/app/AppLayouts/qmldir deleted file mode 100644 index d5c89add08..0000000000 --- a/ui/app/AppLayouts/qmldir +++ /dev/null @@ -1,6 +0,0 @@ -BrowserLayout 1.0 Browser/BrowserLayout.qml -ChatLayout 1.0 Chat/ChatLayout.qml -NodeLayout 1.0 Node/NodeLayout.qml -ProfileLayout 1.0 Profile/ProfileLayout.qml -WalletLayout 1.0 Wallet/WalletLayout.qml -UIComponents 1.0 UIComponents/UIComponents.qml diff --git a/ui/app/AppLayouts/stores/qmldir b/ui/app/AppLayouts/stores/qmldir new file mode 100644 index 0000000000..4efbc79d9b --- /dev/null +++ b/ui/app/AppLayouts/stores/qmldir @@ -0,0 +1 @@ +RootStore 1.0 RootStore.qml diff --git a/ui/app/AppMain.qml b/ui/app/mainui/AppMain.qml similarity index 99% rename from ui/app/AppMain.qml rename to ui/app/mainui/AppMain.qml index dbe8789c49..17336a6733 100644 --- a/ui/app/AppMain.qml +++ b/ui/app/mainui/AppMain.qml @@ -3,22 +3,22 @@ import QtQuick.Controls 2.13 import QtQuick.Layouts 1.13 import QtMultimedia 5.13 import Qt.labs.qmlmodels 1.0 +import Qt.labs.platform 1.1 +import Qt.labs.settings 1.0 + +import applayouts.Wallet 1.0 +import applayouts.Node 1.0 +import applayouts.Browser 1.0 +import applayouts.Chat 1.0 +import applayouts.Chat.popups 1.0 +import applayouts.Profile 1.0 +import applayouts.Profile.popups 1.0 import utils 1.0 import shared 1.0 import shared.panels 1.0 import shared.popups 1.0 import shared.status 1.0 -import "./AppLayouts" -import "./AppLayouts/Wallet" -import "./AppLayouts/Chat/popups" -import "./AppLayouts/Chat/popups/community" -import "./AppLayouts/Profile/popups" -import "./AppLayouts/stores" -import "./AppLayouts/Browser/stores" as BrowserStores - -import Qt.labs.platform 1.1 -import Qt.labs.settings 1.0 import StatusQ.Core.Theme 0.1 import StatusQ.Components 0.1 @@ -27,6 +27,8 @@ import StatusQ.Layout 0.1 import StatusQ.Popups 0.1 import StatusQ.Core 0.1 +import applayouts.stores 1.0 + Item { id: appMain anchors.fill: parent diff --git a/ui/app/AppSearch.qml b/ui/app/mainui/AppSearch.qml similarity index 100% rename from ui/app/AppSearch.qml rename to ui/app/mainui/AppSearch.qml diff --git a/ui/app/mainui/SplashScreen.qml b/ui/app/mainui/SplashScreen.qml new file mode 100644 index 0000000000..9d93079eca --- /dev/null +++ b/ui/app/mainui/SplashScreen.qml @@ -0,0 +1,40 @@ +import QtQuick 2.12 + +import utils 1.0 +import Qt.labs.lottieqt 1.0 + +Item { + id: root + anchors.fill: parent + visible: (opacity > 0.0001) + Behavior on opacity { NumberAnimation { duration: 250 }} + + Timer { + running: true + interval: 2000 + onTriggered: { + root.opacity = 0.0; + } + } + + Image { + width: 150 + height: 150 + fillMode: Image.PreserveAspectFit + anchors.centerIn: parent + source: Style.svg("status-logo-circle") + } + + LottieAnimation { + anchors.centerIn: parent + autoPlay: false + loops: LottieAnimation.Infinite + quality: LottieAnimation.MediumQuality + source: Style.lottie("status_splash") + onStatusChanged: { + if (status === LottieAnimation.Ready) { + start(); + } + } + } +} diff --git a/ui/app/mainui/qmldir b/ui/app/mainui/qmldir new file mode 100644 index 0000000000..7b9fdcbf4d --- /dev/null +++ b/ui/app/mainui/qmldir @@ -0,0 +1,2 @@ +AppMain 1.0 AppMain.qml +SplashScreen 1.0 SplashScreen.qml diff --git a/ui/app/qmldir b/ui/app/qmldir deleted file mode 100644 index bf938e4e85..0000000000 --- a/ui/app/qmldir +++ /dev/null @@ -1 +0,0 @@ -AppMain 1.0 AppMain.qml \ No newline at end of file diff --git a/ui/imports/assets/lottie/status_splash.json b/ui/imports/assets/lottie/status_splash.json new file mode 100644 index 0000000000..48848ae54c --- /dev/null +++ b/ui/imports/assets/lottie/status_splash.json @@ -0,0 +1 @@ +{"v":"5.7.8","fr":60,"ip":0,"op":91,"w":1000,"h":1000,"nm":"!!LOGO_lottie","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Merged Shape Layer 6","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[3.789]},"o":{"x":[0.167],"y":[0]},"t":0,"s":[-192.857]},{"i":{"x":[0.833],"y":[0.762]},"o":{"x":[0.167],"y":[0.167]},"t":6.545,"s":[-193.857]},{"i":{"x":[0.833],"y":[0.691]},"o":{"x":[0.167],"y":[0.155]},"t":7.363,"s":[-191.765]},{"i":{"x":[0.833],"y":[0.797]},"o":{"x":[0.167],"y":[0.122]},"t":10.637,"s":[-178.897]},{"i":{"x":[0.833],"y":[0.855]},"o":{"x":[0.167],"y":[0.153]},"t":14.727,"s":[-138.079]},{"i":{"x":[0.833],"y":[0.814]},"o":{"x":[0.167],"y":[0.224]},"t":22.908,"s":[-29.589]},{"i":{"x":[0.833],"y":[0.801]},"o":{"x":[0.167],"y":[0.162]},"t":27.818,"s":[12.5]},{"i":{"x":[0.833],"y":[0.873]},"o":{"x":[0.167],"y":[0.107]},"t":45,"s":[181.996]},{"i":{"x":[0.833],"y":[0.923]},"o":{"x":[0.167],"y":[0.227]},"t":49.908,"s":[272.04]},{"i":{"x":[0.833],"y":[0.94]},"o":{"x":[0.167],"y":[0.514]},"t":55.637,"s":[330.762]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[-2.596]},"t":65.455,"s":[345.875]},{"t":81.818359375,"s":[345.292]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.791,"y":0.712},"o":{"x":0.652,"y":0.344},"t":8.182,"s":[-57.414,88.804,0],"to":[-266.586,66.696,0],"ti":[-471.296,0.211,0]},{"i":{"x":0.672,"y":0.664},"o":{"x":0.291,"y":0.351},"t":26.613,"s":[44.704,-314.789,0],"to":[74.296,1.789,0],"ti":[-24.095,-183.222,0]},{"i":{"x":0.414,"y":0.331},"o":{"x":0.136,"y":0.106},"t":34.889,"s":[318.5,-68,0],"to":[29.675,225.652,0],"ti":[174.57,-11.464,0]},{"i":{"x":0.288,"y":1},"o":{"x":0.288,"y":1},"t":44.047,"s":[-7.935,330.275,0],"to":[-375.415,-24.719,0],"ti":[-390,21,0]},{"t":81.818359375,"s":[53.652,-82.594,0]}],"ix":2,"l":2},"a":{"a":0,"k":[560,410.25,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.623,0.623,0.833],"y":[0.806,0.806,1.942]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":8.182,"s":[100,100,100]},{"i":{"x":[0.615,0.615,0.833],"y":[-9.004,-9.004,-0.939]},"o":{"x":[0.32,0.32,0.167],"y":[-6.872,-6.872,-1.07]},"t":23.283,"s":[63.265,63.265,100]},{"i":{"x":[0.532,0.532,0.667],"y":[1,1,1]},"o":{"x":[0.407,0.407,0.167],"y":[0.429,0.429,3.289]},"t":40.443,"s":[63.265,63.265,100]},{"t":69.544921875,"s":[105,105,100]}],"ix":6,"l":2}},"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":8.182,"s":[{"i":[[29.256,-1.636],[12.654,-5.359],[8.617,-28.501],[-28.968,-8.636],[-24.783,-3.988],[-20.286,7.565],[3.491,32.586],[22.957,14.401]],"o":[[-19.802,1.107],[-62.447,26.447],[28.952,1.188],[19.806,5.905],[23.203,3.734],[32.599,-12.156],[-2.92,-27.253],[-17.795,-11.163]],"v":[[552.771,323.203],[505.624,334.015],[404.252,446.909],[473.294,460.187],[557.264,486.313],[622.075,480.875],[668.525,402.251],[624.928,339.765]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10.637,"s":[{"i":[[35.646,-6.61],[29.714,-25.56],[-5.458,-8.042],[-24.339,-5.662],[-31.956,-1.833],[-22.776,10.595],[3.231,33.642],[29.445,12.037]],"o":[[-29.737,6.28],[-33.566,28.873],[5.468,8.056],[24.339,5.662],[31.956,1.833],[30.472,-13.464],[-4.304,-33.253],[-24.528,-9.336]],"v":[[515.251,324.945],[432.694,362.132],[374.686,460.302],[435.7,469.78],[534.564,489.883],[624.004,480.477],[668.476,402.398],[607.104,332.181]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":14.727,"s":[{"i":[[46.296,-14.902],[24.146,-47.639],[-14.286,-9.646],[-32.343,13.44],[-30.439,13.873],[-26.928,15.644],[2.798,35.403],[40.258,8.096]],"o":[[-46.296,14.902],[-32.901,64.912],[7.844,5.296],[32.343,-13.44],[41.324,-15.99],[26.928,-15.644],[-6.611,-43.252],[-35.748,-6.292]],"v":[[452.248,330.653],[340.333,427.05],[331.295,569.328],[388.653,559.038],[494.121,516.795],[621.12,482.157],[663.333,400.633],[576.423,320.768]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":18,"s":[{"i":[[46.329,-30.799],[9.206,-101.382],[-26.527,-8.11],[-23.981,21.663],[-27.026,18.669],[-27.972,10.72],[0.825,47.829],[49.937,10.873]],"o":[[-46.329,30.799],[-6.708,73.874],[23.569,6.669],[25.302,-22.856],[25.053,-17.306],[29.125,-11.006],[-2.651,-57.164],[-45.744,-9.256]],"v":[[379.868,359.18],[255.626,543.131],[308.895,689.081],[385.909,642.222],[491.706,538.051],[592.014,497.121],[656.681,411.345],[564.93,316.12]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":20.455,"s":[{"i":[[64.565,-52.319],[10.188,-103.027],[-34.457,-9.254],[-24.784,40.268],[-45.418,34.675],[-26.649,9.512],[2.702,63.401],[53.773,2.903]],"o":[[-51.36,40.959],[-9.005,86.228],[32.953,8.587],[25.24,-40.488],[36.098,-27.559],[28.678,-10.033],[-3.84,-69.666],[-53.609,-2.058]],"v":[[318.842,389.727],[195.107,601.075],[271.374,775.287],[373.46,679.376],[465.38,554.672],[571.854,508.306],[654.682,407.541],[535.788,310.26]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":22.092,"s":[{"i":[[79.222,-63.486],[15.85,-103.554],[-39.269,-11.688],[-27.26,51.436],[-59.282,43.184],[-26.212,7.402],[0.865,73.868],[56.15,0.205]],"o":[[-56.671,45.204],[-14.727,93.965],[38.768,11.464],[27.152,-50.985],[44.777,-32.618],[28.849,-7.981],[-1.239,-78.137],[-58.715,0.133]],"v":[[278.98,398.976],[145.383,622.417],[219.236,827.081],[321.65,722.651],[438.056,558.321],[546.812,508.94],[653.065,410.221],[527.368,313.788]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":22.908,"s":[{"i":[[88.24,-66.875],[21.23,-103.3],[-41.334,-13.936],[-29.916,56.289],[-67.396,45.724],[-26.133,5.706],[-2.025,79.062],[57.349,0.274]],"o":[[-60.475,45.833],[-20.006,97.346],[41.334,13.936],[29.504,-55.514],[49.972,-33.903],[29.088,-6.239],[2.109,-82.33],[-61.277,-0.292]],"v":[[261.383,400.535],[115.172,622.607],[185.068,841.779],[296.59,729.919],[419.424,554.344],[533.802,511.454],[652.175,414.378],[525.102,315.747]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":24,"s":[{"i":[[79.206,-55.07],[34.985,-104.299],[-42.561,-16.337],[-35.547,56.801],[-74.269,39.628],[-26.803,6.098],[-2.508,70.574],[53.383,2.857]],"o":[[-71.711,40.918],[-33.75,99.227],[42.561,16.337],[44.194,-81.881],[51.209,-28.805],[29.168,-6.524],[2.444,-72.114],[-61.034,-4.458]],"v":[[259.091,379.56],[62.788,598.549],[117.611,837.642],[244.281,713.451],[395.457,545.595],[544.293,507.648],[652.581,414.871],[538.559,317.657]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":25,"s":[{"i":[[88.573,-35.243],[54.717,-109.178],[-44.347,-19.446],[-41.907,58.686],[-84.031,29.734],[-27.837,6.159],[-4.542,61.804],[47.75,7.066]],"o":[[-87.545,32.48],[-52.212,102.123],[44.346,19.446],[63.83,-104.145],[53.421,-18.892],[29.386,-6.448],[3.563,-57.999],[-60.415,-11.137]],"v":[[284.722,355.414],[25.649,572.493],[47.058,813.868],[189.834,694.714],[402.92,527.491],[557.36,502.833],[653.024,417.228],[562.218,320.949]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":26.182,"s":[{"i":[[52.752,-17.839],[78.034,-114.944],[-46.456,-23.119],[-49.422,60.915],[-95.568,18.043],[-29.058,6.232],[-6.946,51.442],[41.094,12.038]],"o":[[-106.257,22.509],[-74.028,105.546],[46.456,23.119],[63.258,-77.968],[55.352,-11.602],[29.644,-6.358],[4.885,-41.321],[-59.684,-19.031]],"v":[[343.855,339.288],[0.542,548.387],[-20.386,790.87],[141.422,677.669],[416.79,520.423],[572.801,497.145],[653.549,420.013],[584.566,330.441]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":27,"s":[{"i":[[43.07,-7.849],[90.005,-108.293],[-47.472,-25.94],[-58.072,58.848],[-101.759,15.243],[-29.485,7.665],[-4.439,36.618],[37.52,13.193]],"o":[[-116.65,21.257],[-88.725,106.752],[47.472,25.94],[55.225,-55.962],[56.154,-8.412],[29.485,-7.665],[3.788,-31.249],[-60.064,-21.119]],"v":[[386.723,335.167],[7.232,529.027],[-44.498,775.809],[130.381,668.23],[427.379,517.498],[586.257,492.426],[654.202,416.845],[592.878,332.108]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":28,"s":[{"i":[[44.276,-9.501],[92.678,-97.204],[-43.839,-29.268],[-63.11,53.812],[-96.226,16.884],[-30.135,8.192],[-3.931,36.439],[39.485,12.843]],"o":[[-113.609,22.765],[-90.624,94.765],[43.702,29.176],[59.471,-50.709],[57.153,-11.132],[30.135,-8.192],[3.354,-31.081],[-60.976,-20.193]],"v":[[379.087,333.684],[21.384,525.463],[-45.868,757.813],[132.646,666.302],[426.199,511.645],[586.778,490.796],[654.789,415.852],[590.825,332.473]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":34.363,"s":[{"i":[[51.95,-20.013],[47.111,-81.464],[-37.667,-22.586],[-60.422,59.227],[-61.018,27.321],[-34.269,11.551],[-0.7,35.297],[51.989,10.621]],"o":[[-94.257,32.363],[-41.697,72.103],[36.628,21.963],[53.557,-52.765],[63.512,-28.438],[34.269,-11.551],[0.595,-30.014],[-66.778,-14.296]],"v":[[345.105,371.328],[91.668,574.153],[71.198,750.239],[211.554,652.871],[394.335,520.673],[590.09,480.427],[658.524,409.528],[577.761,334.795]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":45,"s":[{"i":[[60.597,-17.144],[55.738,-88.07],[-35.721,-21.835],[-52.845,48.263],[-52.868,16.415],[-40.067,1.439],[-7.978,34.246],[60.029,22.238]],"o":[[-79.624,19.63],[-59.491,90.469],[31.596,14.564],[59.618,-57.163],[53.386,-16.576],[43.14,-1.659],[7.69,-33.012],[-63.674,-23.588]],"v":[[375.49,339.43],[98.306,541.725],[47.861,762.978],[201.734,605.95],[401.05,491.915],[577.877,488.873],[660.255,431.731],[585.708,338.375]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":45.818,"s":[{"i":[[59.539,-20.244],[47.714,-88.677],[-35.756,-18.463],[-47.228,49.234],[-57.954,15.189],[-40.35,2.243],[-7.563,34.736],[60.472,20.586]],"o":[[-104.048,33.408],[-52.426,93.275],[31.389,12.094],[52.583,-56.964],[52.241,-19.065],[43.423,-2.311],[7.257,-33.199],[-68.206,-22.475]],"v":[[373.478,351.274],[112.92,565.233],[83.609,785.614],[222.477,620.276],[408.233,501.25],[578.764,490.053],[661.094,430.613],[583.469,337.255]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":46.637,"s":[{"i":[[57.712,-25.504],[36.433,-90.98],[-36.447,-13.777],[-39.793,51.902],[-62.468,19.926],[-40.634,3.047],[-7.148,35.225],[60.914,18.933]],"o":[[-94.357,38.947],[-41.933,97.946],[31.607,8.473],[43.446,-58.655],[52.271,-21.234],[43.705,-2.964],[6.824,-33.386],[-72.737,-21.362]],"v":[[369.092,363.635],[139.739,595.719],[129.151,823.514],[250.732,640.492],[419.312,512],[579.65,491.233],[661.932,429.495],[581.231,336.135]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":47.455,"s":[{"i":[[55.886,-30.764],[25.152,-93.284],[-37.137,-9.091],[-32.357,54.571],[-54.109,23.906],[-40.917,3.851],[-6.733,35.714],[61.356,17.281]],"o":[[-84.667,44.486],[-31.441,102.617],[31.825,4.853],[34.308,-60.345],[49.456,-26.726],[43.987,-3.616],[6.391,-33.574],[-77.269,-20.249]],"v":[[364.707,375.996],[166.557,626.204],[179.604,848.983],[278.987,660.708],[431.33,522.675],[580.537,492.412],[662.77,428.377],[578.992,335.014]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":48.273,"s":[{"i":[[54.06,-36.024],[13.871,-95.586],[-37.828,-4.406],[-24.921,57.239],[-45.75,27.885],[-41.201,4.654],[-6.318,36.204],[61.799,15.629]],"o":[[-74.977,50.025],[-20.948,107.289],[32.043,1.232],[25.17,-62.036],[46.641,-32.218],[44.269,-4.268],[5.958,-33.761],[-81.8,-19.136]],"v":[[360.321,388.358],[193.375,656.689],[235.527,864.013],[307.241,680.924],[439.013,526.779],[581.423,493.592],[663.609,427.259],[576.753,333.894]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":49.092,"s":[{"i":[[54.229,-36.905],[5.57,-101.387],[-36.641,-0.768],[-18.517,56.284],[-43.774,26.557],[-41.347,4.599],[-6.649,36.331],[63.855,15.952]],"o":[[-72.741,49.715],[-9.702,103.79],[30.91,-1.363],[17.66,-59.396],[43.888,-30.122],[44.357,-3.993],[6.15,-33.603],[-80.543,-18.707]],"v":[[362.232,386.897],[219.032,657.044],[282.368,849.948],[335.912,674.032],[446.191,523.631],[581.228,494.34],[664.433,427.968],[577.151,334.124]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":49.908,"s":[{"i":[[55.851,-35.639],[1.081,-106.649],[-35.286,1.356],[-14.408,54.346],[-42.927,23.411],[-41.691,2.902],[-8.386,36.225],[65.306,18.743]],"o":[[-72.524,46.428],[-2.751,99.475],[29.734,-2.677],[12.638,-55.763],[42.437,-26.174],[44.627,-1.954],[7.69,-33.217],[-78.547,-21.547]],"v":[[366.116,380.681],[232.937,642.825],[309.173,823.03],[351.888,657.114],[446.876,515.689],[575.915,495.971],[662.811,432.816],[578.799,335.002]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":50.727,"s":[{"i":[[60.314,-29.713],[5.377,-111.641],[-33.983,0.571],[-14.751,51.127],[-43.936,16.689],[-42.203,-2.234],[-13.085,35.369],[65.102,26.881]],"o":[[-76.009,37.087],[-3.991,94.765],[28.729,-1.537],[12.189,-50.993],[43.07,-18.685],[44.984,3.765],[11.954,-32.141],[-74.643,-30.821]],"v":[[376.485,357.42],[231.958,600.145],[306.12,773.627],[351.602,621.51],[442.789,497.128],[567.236,497.647],[662.876,444.974],[590.334,336.436]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":51.545,"s":[{"i":[[58.454,-25.382],[12.681,-98.321],[-31.559,-2.887],[-18.537,44.967],[-43.332,12.958],[-41.167,-3.588],[-14.185,34.151],[58.033,30.328]],"o":[[-69.015,30.489],[-12.424,86.472],[26.845,1.924],[15.157,-43.44],[43.664,-17.851],[43.766,5.393],[12.87,-30.749],[-63.143,-32.099]],"v":[[384.844,342.58],[232.615,547.383],[290,720.149],[345.565,591.838],[431.399,489.858],[566.257,498.124],[662.432,448.126],[599.974,337.45]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":52.363,"s":[{"i":[[60.624,-26.033],[15.363,-79.978],[-27.604,-4.648],[-19.302,37.316],[-42.727,9.226],[-40.356,-0.588],[-11.64,34.294],[53.659,27.394]],"o":[[-83.841,33.567],[-16.149,74.105],[23.706,3.945],[15.658,-34.2],[41.582,-11.502],[42.942,2.391],[10.487,-30.583],[-54.449,-26.153]],"v":[[384.655,338.807],[231.988,523.839],[277.919,673.482],[335.725,573.116],[426.23,485.259],[573.209,496.029],[662.821,442.929],[599.313,337.255]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":53.182,"s":[{"i":[[60.048,-18.04],[30.218,-72.336],[-23.744,-10.961],[-26.815,27.74],[-59.275,9.159],[-41.895,-4.369],[-10.342,34.691],[48.819,25.855]],"o":[[-55.027,17.293],[-26.75,64.032],[20.738,9.824],[22.695,-23.478],[54.694,-8.451],[42.8,0.661],[9.135,-30.641],[-45.428,-20.735]],"v":[[400.303,331.387],[248.699,467.457],[260.73,611.694],[340.25,545.13],[442.156,481.453],[576.562,497.201],[665.233,438.89],[603.252,335.098]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":54,"s":[{"i":[[56.897,-17.397],[38.265,-58.304],[-18.542,-13.031],[-28.19,18.585],[-56.997,10.729],[-39.901,-2.575],[-9.289,34.498],[47.944,23.807]],"o":[[-52.871,17.484],[-34.393,52.086],[16.577,12.127],[23.802,-15.741],[50.309,-5.992],[41.897,-0.884],[8.223,-30.629],[-44.847,-19.267]],"v":[[413.774,330.395],[284.179,421.614],[274.821,546.65],[356.095,516.769],[450.839,480.228],[580.534,495.137],[667.25,435.326],[606.323,335.728]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":54.818,"s":[{"i":[[54.245,-16.24],[32.598,-43.781],[-13.881,-13.328],[-27.245,10.844],[-52.193,8.882],[-38.212,-1.181],[-8.763,34.48],[51.03,23.553]],"o":[[-51.284,17.177],[-34.856,42.266],[12.833,12.969],[22.946,-9.211],[46.029,-3.066],[41.384,-1.933],[7.793,-30.777],[-48.137,-21.126]],"v":[[428.16,331.264],[318.256,403.889],[293.813,516.44],[369.963,507.474],[462.486,480.365],[584.382,494.182],[667.934,433.567],[608.325,336.102]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":58.092,"s":[{"i":[[43.639,-11.614],[19.055,-21.071],[-3.889,-4.135],[-14.525,-1.576],[-29.412,-8.791],[-31.456,4.392],[-6.661,34.408],[44.084,17.289]],"o":[[-44.939,15.949],[-19.81,21.906],[6.308,6.708],[11.937,1.295],[28.909,8.641],[39.333,-6.127],[6.072,-31.368],[-42.526,-15.47]],"v":[[485.056,328.469],[396.287,387.701],[369.078,452.515],[403.714,458.848],[495.883,475.935],[599.772,490.363],[670.673,426.531],[607.6,332.794]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":60.545,"s":[{"i":[[28.22,0.324],[12.906,-4.721],[9.327,-29.791],[-28.742,-9.153],[-24.553,-5.22],[-20.638,6.542],[2.522,32.675],[22.21,15.529]],"o":[[-19.831,-0.228],[-63.69,23.297],[28.857,2.631],[19.693,6.271],[22.988,4.887],[33.165,-10.514],[-1.99,-25.781],[-17.216,-12.037]],"v":[[557.533,321.811],[498.304,333.119],[393.386,442.624],[471.037,459.143],[553.818,485.938],[618.82,483.742],[668.474,407.752],[628.809,344.92]],"c":true}]},{"t":65.455078125,"s":[{"i":[[29.256,-1.636],[12.654,-5.359],[8.617,-28.501],[-28.968,-8.636],[-24.783,-3.988],[-20.286,7.565],[3.491,32.586],[22.957,14.401]],"o":[[-19.802,1.107],[-62.447,26.447],[28.952,1.188],[19.806,5.905],[23.203,3.734],[32.599,-12.156],[-2.92,-27.253],[-17.795,-11.163]],"v":[[552.771,323.203],[505.624,334.015],[404.252,446.909],[473.294,460.187],[557.264,486.313],[622.075,480.875],[668.525,402.251],[624.928,339.765]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.250979988248,0.721568986481,0.588234994926,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":91,"st":-11,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"new_drop1","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.689]},"o":{"x":[0.167],"y":[0.167]},"t":6.545,"s":[-14.347]},{"i":{"x":[0.833],"y":[0.789]},"o":{"x":[0.167],"y":[0.114]},"t":10.637,"s":[0.326]},{"i":{"x":[0.833],"y":[0.87]},"o":{"x":[0.167],"y":[0.151]},"t":14.727,"s":[40.484]},{"i":{"x":[0.833],"y":[0.806]},"o":{"x":[0.167],"y":[0.186]},"t":22.908,"s":[153.117]},{"i":{"x":[0.833],"y":[0.873]},"o":{"x":[0.167],"y":[0.102]},"t":45,"s":[366.201]},{"i":{"x":[0.833],"y":[0.924]},"o":{"x":[0.167],"y":[0.228]},"t":49.908,"s":[456.075]},{"i":{"x":[0.833],"y":[0.945]},"o":{"x":[0.167],"y":[0.561]},"t":55.637,"s":[514.342]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[-1.414]},"t":65.455,"s":[527.802]},{"t":83.455078125,"s":[526.848]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.791,"y":0.711},"o":{"x":0.652,"y":0.346},"t":8.182,"s":[53.414,-82.804,0],"to":[266.586,-66.696,0],"ti":[471.296,-0.211,0]},{"i":{"x":0.672,"y":0.664},"o":{"x":0.291,"y":0.35},"t":26.613,"s":[-44.704,314.789,0],"to":[-74.296,-1.789,0],"ti":[24.095,183.222,0]},{"i":{"x":0.414,"y":0.331},"o":{"x":0.136,"y":0.106},"t":34.889,"s":[-318.5,68,0],"to":[-29.675,-225.652,0],"ti":[-174.57,11.464,0]},{"i":{"x":0.288,"y":1},"o":{"x":0.29,"y":1},"t":44.047,"s":[7.935,-330.275,0],"to":[375.415,24.719,0],"ti":[390,-21,0]},{"t":81.818359375,"s":[-57.824,89.667,0]}],"ix":2,"l":2},"a":{"a":0,"k":[560,410.25,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.623,0.623,0.833],"y":[0.793,0.793,1.942]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":8.182,"s":[105,105,100]},{"i":{"x":[0.615,0.615,0.833],"y":[-9.004,-9.004,-0.939]},"o":{"x":[0.32,0.32,0.167],"y":[-6.872,-6.872,-1.07]},"t":23.283,"s":[70.547,70.547,100]},{"i":{"x":[0.532,0.532,0.667],"y":[1,1,1]},"o":{"x":[0.407,0.407,0.167],"y":[0.591,0.591,3.196]},"t":40.443,"s":[70.547,70.547,100]},{"t":68.7265625,"s":[100,100,100]}],"ix":6,"l":2}},"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":8.182,"s":[{"i":[[29.256,-1.636],[12.654,-5.359],[8.617,-28.501],[-28.968,-8.636],[-24.783,-3.988],[-20.286,7.565],[3.491,32.586],[22.957,14.401]],"o":[[-19.802,1.107],[-62.447,26.447],[28.952,1.188],[19.806,5.905],[23.203,3.734],[32.599,-12.156],[-2.92,-27.253],[-17.795,-11.163]],"v":[[552.771,323.203],[505.624,334.015],[404.252,446.909],[473.294,460.187],[557.264,486.313],[622.075,480.875],[668.525,402.251],[624.928,339.765]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10.637,"s":[{"i":[[35.646,-6.61],[29.714,-25.56],[-5.458,-8.042],[-24.339,-5.662],[-31.956,-1.833],[-22.776,10.595],[3.231,33.642],[29.445,12.037]],"o":[[-29.737,6.28],[-33.566,28.873],[5.468,8.056],[24.339,5.662],[31.956,1.833],[30.472,-13.464],[-4.304,-33.253],[-24.528,-9.336]],"v":[[515.251,324.945],[435.35,364.682],[379.454,457.143],[436.661,468.177],[538.465,491.522],[618.412,480.135],[662.46,401.018],[603.745,333.35]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":14.727,"s":[{"i":[[46.296,-14.902],[25.654,-41.975],[-12.411,-9.901],[-30.679,9.975],[-36.109,12.657],[-26.928,15.644],[2.798,35.403],[40.258,8.096]],"o":[[-46.296,14.902],[-34.955,57.193],[6.815,5.436],[30.679,-9.975],[41.324,-15.99],[26.928,-15.644],[-6.611,-43.252],[-35.748,-6.292]],"v":[[452.248,330.653],[349.544,418.17],[334.02,549.151],[385.979,543.95],[494.712,516.604],[609.938,480.878],[652.352,398.963],[565.911,321.557]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":15,"s":[{"i":[[46.299,-16.229],[25.223,-44.785],[-14.312,-8.764],[-29.132,13.264],[-35.087,17.189],[-26.668,15.692],[3.512,36.17],[41.001,7.348]],"o":[[-46.299,16.23],[-33.63,58.297],[8.585,5.04],[29.364,-13.44],[47.516,-22.057],[26.753,-15.736],[-7.266,-43.807],[-36.51,-5.645]],"v":[[446.17,335.328],[343.935,425.06],[336.74,568.517],[390.433,555.664],[494.669,518.468],[615.02,483.177],[658.058,401.022],[569.847,323.672]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":16,"s":[{"i":[[46.309,-21.086],[23.647,-55.061],[-29.449,-15.295],[-26.095,17.291],[-25.89,21.87],[-25.717,15.868],[6.123,38.977],[43.717,4.612]],"o":[[-46.309,21.086],[-28.781,62.334],[13.711,5.156],[27.142,-18.146],[56.674,-32.922],[26.112,-16.071],[-9.659,-45.837],[-39.296,-3.281]],"v":[[427.552,344.658],[320.257,451.253],[335.779,615.638],[396.852,587.851],[494.511,525.284],[614.116,480.305],[653.219,395.451],[554.114,323.076]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":18,"s":[{"i":[[50.874,-30.153],[20.495,-75.614],[-27.143,-14.724],[-23.602,18.606],[-16.627,16.893],[-31.675,11.482],[11.345,44.591],[55.689,-3.223]],"o":[[-47.858,28.366],[-19.084,70.409],[25.466,10.945],[27.119,-21.379],[29.344,-29.813],[29.775,-15.339],[-14.445,-49.896],[-41.559,5.601]],"v":[[392.332,367.062],[286.273,507.681],[328.632,672.3],[405.833,628.449],[494.195,538.917],[595.274,490.855],[646.745,388.536],[522.648,321.886]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":21,"s":[{"i":[[47.876,-39.067],[-1.493,-87.716],[-33.186,-6.385],[-20.836,38.763],[-32.797,26.281],[-22.697,14.619],[14.746,51.862],[55.358,-4.207]],"o":[[-47.876,39.067],[1.506,88.468],[31.64,5.908],[26.52,-39.942],[41.687,-43.224],[24.486,-15.507],[-16.763,-55.537],[-51.359,4.227]],"v":[[340.188,395.388],[225.533,612.286],[306.086,765.697],[392.682,674.77],[469.386,553.989],[593.181,490.089],[642.817,387.036],[511.322,321.364]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":22,"s":[{"i":[[51.265,-39.755],[0.551,-90.546],[-35.981,-6.35],[-20.3,47.041],[-41.532,29.872],[-23.105,12.196],[12.781,56.402],[58.621,-1.996]],"o":[[-51.265,39.755],[0.113,88.161],[35.176,6.272],[22.773,-47.833],[45.977,-38.344],[25.338,-13.139],[-13.994,-59.394],[-54.774,2.012]],"v":[[321.939,399.283],[196.493,623.914],[282.356,788.609],[369.309,686.696],[459.573,545.854],[579.65,494.411],[643.311,393.539],[509.611,324.553]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":23,"s":[{"i":[[54.655,-40.444],[21.671,-95.144],[-37.963,-13.705],[-28.782,51.483],[-50.267,33.464],[-23.513,9.772],[10.816,60.942],[61.884,0.215]],"o":[[-54.655,40.444],[-20.422,89.659],[37.963,13.705],[28.385,-50.774],[50.267,-33.464],[26.19,-10.771],[-11.226,-63.251],[-58.189,-0.202]],"v":[[296.919,402.702],[168.072,605.071],[227.024,801.31],[335.872,705.635],[436.307,547.324],[565.885,497.106],[643.57,398.416],[507.666,326.116]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":24,"s":[{"i":[[51.352,-33.861],[27.009,-88.13],[-39.938,-14.519],[-33.749,52.795],[-62.301,32.617],[-23.737,9.926],[8.332,53.733],[54.243,1.817]],"o":[[-69.052,39.888],[-31.555,92.567],[39.938,14.519],[30.003,-66.106],[51.275,-29.247],[25.745,-10.674],[-8.607,-54.288],[-57.202,-3.019]],"v":[[310.318,383.13],[130.903,588.955],[171.032,802.299],[289.305,702.667],[433.374,531.562],[573.674,492.141],[643.853,398.494],[525.74,328.775]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":25,"s":[{"i":[[48.049,-27.278],[32.346,-81.117],[-41.913,-15.333],[-38.716,54.106],[-74.334,31.77],[-23.962,10.079],[5.847,46.524],[46.602,3.419]],"o":[[-83.448,39.332],[-42.688,95.476],[41.913,15.333],[69.784,-113.901],[52.284,-25.031],[25.3,-10.578],[-5.987,-45.325],[-56.214,-5.836]],"v":[[325.781,370.853],[100.33,581.377],[121.894,802.211],[246.691,696.362],[431.548,522.436],[581.464,487.175],[644.135,398.573],[543.815,331.435]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":26,"s":[{"i":[[44.745,-20.695],[37.684,-74.103],[-43.889,-16.146],[-43.683,55.418],[-86.367,30.923],[-24.186,10.232],[3.362,39.315],[38.961,5.021]],"o":[[-119.264,43.039],[-53.821,98.384],[43.889,16.146],[53.717,-78.902],[53.292,-20.814],[24.855,-10.482],[-3.368,-36.362],[-55.227,-8.653]],"v":[[351.853,367.665],[83.444,578.458],[83.037,797.956],[218.71,689.28],[440.332,522.4],[589.253,482.21],[644.417,398.652],[561.889,334.094]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":27,"s":[{"i":[[41.442,-14.112],[43.022,-67.09],[-45.864,-16.96],[-48.65,56.729],[-98.4,30.077],[-24.41,10.386],[0.877,32.106],[31.32,6.623]],"o":[[-112.242,38.22],[-64.954,101.292],[45.864,16.96],[37.651,-43.904],[54.3,-16.598],[24.41,-10.386],[-0.749,-27.399],[-54.239,-11.47]],"v":[[377.924,364.478],[86.477,578.389],[64.098,796.551],[210.646,685.049],[449.115,522.363],[597.042,477.244],[644.699,398.73],[579.964,336.754]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":34,"s":[{"i":[[44.513,-23.712],[27.482,-56.256],[-37.784,-12.866],[-50.63,58.126],[-58.35,29.482],[-29.403,14.275],[3.378,32.034],[47.465,3.666]],"o":[[-83.032,40.247],[-28.361,58.056],[37.359,12.721],[44.616,-51.418],[56.174,-28.817],[29.403,-14.275],[-2.873,-27.245],[-61.731,-5.418]],"v":[[360.522,399.512],[167.659,595.984],[159.499,760.219],[281.433,660.858],[421.356,527.51],[592.399,468.7],[643.096,401.03],[557.766,341.618]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":34.363,"s":[{"i":[[44.672,-24.21],[31.158,-53.285],[-36.18,-15.729],[-55.363,53.834],[-56.271,29.451],[-29.662,14.476],[3.508,32.03],[48.303,3.512]],"o":[[-81.516,40.352],[-31.158,53.285],[35.747,15.541],[49.074,-47.961],[56.271,-29.451],[29.662,-14.476],[-2.983,-27.237],[-62.12,-5.104]],"v":[[353.995,392.968],[165.032,568.445],[141.322,727.462],[269.779,639.11],[419.915,527.777],[566.624,471.102],[623.232,402.797],[535.507,347.324]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":35,"s":[{"i":[[45.26,-24.45],[27.597,-58.817],[-37.262,-10.276],[-47.761,60.94],[-55.381,28.571],[-42.375,15.472],[3.29,32.053],[49.693,3.91]],"o":[[-79.368,39.383],[-29.194,62.221],[36.766,10.14],[42.806,-54.803],[55.381,-28.571],[31.516,-11.507],[-2.797,-27.247],[-62.693,-5.411]],"v":[[360.281,400.125],[170.977,597.431],[166.909,762.505],[282.798,653.18],[419.132,529.165],[591.161,470.697],[644.403,400.507],[556.486,342.254]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":43,"s":[{"i":[[52.639,-27.461],[57.444,-90.469],[-27.818,-6.701],[-52.811,60.226],[-44.19,17.504],[-43.428,1.434],[0.576,34.149],[70.929,9.404]],"o":[[-52.383,27.204],[-61.648,97.089],[26.814,6.459],[53.554,-61.074],[44.19,-17.504],[39.724,-1.312],[-0.488,-28.916],[-73.81,-9.786]],"v":[[337.627,393.675],[150.938,571.051],[113.78,790.198],[241.183,630.489],[415.018,508.533],[567.036,477.673],[651.931,411.796],[560.242,337.699]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":43.363,"s":[{"i":[[52.975,-27.598],[71.449,-82.568],[-26.119,-10.549],[-61.267,51.896],[-43.682,17.002],[-38.66,13.544],[0.42,32.348],[67.954,9.137]],"o":[[-51.157,26.651],[-76.706,88.642],[25.139,10.153],[62.435,-52.885],[43.681,-17.002],[38.66,-13.544],[-0.356,-27.386],[-70.216,-9.441]],"v":[[336.43,389.985],[165.007,532.087],[94.633,745.987],[244.636,604.296],[414.831,507.596],[559.622,473.279],[630.986,414.799],[536.565,346.563]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":44,"s":[{"i":[[52.475,-26.235],[56.355,-88.221],[-30.185,-10.492],[-53.423,57.161],[-42.414,16.625],[-57.784,7.045],[0.205,34.313],[70.43,10.482]],"o":[[-50.402,25.322],[-58.909,92.218],[26.307,6.588],[53.501,-59.257],[42.414,-16.625],[46.26,-10.266],[-0.174,-29.039],[-72.558,-10.799]],"v":[[337.76,388.794],[151.526,564.444],[110.692,784.489],[240.195,625.592],[405.777,506.621],[582.34,476.23],[653.568,408.95],[561.786,333.748]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":45,"s":[{"i":[[51.577,-25.66],[52.706,-87.785],[-30.618,-13.006],[-53.379,56.684],[-40.59,21.111],[-40.211,4.323],[-2.249,33.805],[67.004,15.657]],"o":[[-49.263,24.751],[-53.471,89.059],[27.013,6.224],[52.454,-59.802],[65.198,-33.909],[42.937,-6.667],[1.902,-28.598],[-67.829,-17.238]],"v":[[334.232,376.664],[151.617,546.553],[111.829,770.102],[245.559,611.006],[396.481,500.734],[579.493,475.824],[655.106,416.229],[569.69,335.104]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":46,"s":[{"i":[[50.679,-25.085],[44.071,-89.098],[-46.758,-23.261],[-50.159,58.35],[-39.774,16.193],[-40.206,5.305],[-1.298,33.563],[65.247,13.992]],"o":[[-48.123,24.179],[-43.227,87.392],[27.813,4.434],[47.993,-62.401],[64.986,-26.457],[43.11,-5.688],[1.098,-28.382],[-66.847,-14.049]],"v":[[349.01,382.282],[168.344,569.255],[155.055,803.191],[267.079,623.072],[416.579,501.275],[580.869,477.737],[655.02,412.524],[562.755,331.998]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":47,"s":[{"i":[[54.013,-35.45],[31.181,-97.419],[-43.069,-14.713],[-37.982,58.176],[-41.046,21.571],[-38.634,6.618],[0.037,33.154],[68.455,8.382]],"o":[[-46.017,33.376],[-31.464,101.162],[28.623,2.354],[45.782,-83.993],[58.103,-28.516],[47.059,-7.74],[-0.03,-28.022],[-64.25,-11.676]],"v":[[366.929,388.677],[191.905,611.177],[209.588,831.886],[294.473,653.961],[432.216,517.603],[579.867,478.292],[654.7,408.047],[561.596,330.44]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":49,"s":[{"i":[[54.111,-39.519],[6.329,-91.851],[-34.642,-2.992],[-18.209,52.194],[-43.589,32.329],[-36.365,1.728],[-0.196,32.447],[58.26,10.274]],"o":[[-71.666,47.302],[-8.274,120.077],[29.825,-0.297],[15.222,-53.379],[44.337,-32.634],[36.365,-1.728],[0.219,-36.155],[-58.627,-9.934]],"v":[[382.759,383.444],[250.15,636.941],[316.407,845.175],[356.09,671.488],[449.132,517.315],[581.972,480.508],[654.091,410.744],[567.259,331.944]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":50,"s":[{"i":[[55.613,-33.605],[-2.319,-104.947],[-33.372,0.013],[-11.332,50.116],[-43.975,27.16],[-36.725,3.231],[-1.296,32.438],[55.896,12.299]],"o":[[-67.316,38.794],[4.746,115.08],[28.468,-2.037],[9.012,-50.107],[44.439,-27.35],[37.425,-2.764],[1.183,-33.435],[-55.206,-10.869]],"v":[[391.276,368.929],[259.131,617.547],[343.337,809.45],[372.16,648.668],[449.357,507.798],[583.942,482.065],[655.642,413.828],[572.354,331.966]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":52,"s":[{"i":[[58.617,-21.778],[22.296,-90.194],[-29.972,-7.107],[-17,40.204],[-44.746,16.822],[-37.445,6.235],[-3.495,32.42],[51.168,16.349]],"o":[[-58.617,21.777],[-19.12,77.346],[25.817,5.735],[16.073,-38.719],[44.641,-16.782],[39.547,-4.836],[3.113,-27.994],[-48.364,-12.74]],"v":[[408.309,339.9],[251.256,509.005],[293.679,696.402],[351.615,577.292],[435.223,487.628],[587.884,485.178],[658.745,419.996],[582.544,332.009]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":53,"s":[{"i":[[53.658,-20.108],[35.383,-73.197],[-35.581,-11.521],[-21.277,28.439],[-40.437,12.211],[-35.307,6.585],[-3.296,32.76],[49.209,15.135]],"o":[[-53.978,20.738],[-31.828,64.285],[21.645,9.878],[26.197,-35.015],[40.361,-12.183],[38.856,-6.256],[2.951,-28.734],[-46.713,-12.085]],"v":[[416.241,335.883],[263.276,463.833],[273.739,629.436],[344.978,550.671],[443.616,481.103],[590.437,484.338],[658.853,418.224],[583.644,332.145]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":55.637,"s":[{"i":[[40.583,-15.705],[32.277,-43.48],[-9.048,-5.922],[-22.454,4.257],[-29.076,0.054],[-29.671,7.508],[-2.769,33.659],[44.042,11.934]],"o":[[-41.749,17.998],[-32.277,43.48],[14.817,9.699],[22.454,-4.257],[29.076,-0.054],[37.034,-9.997],[2.525,-30.685],[-42.359,-10.356]],"v":[[447.449,340.537],[353.348,411.355],[338.562,501.49],[403.265,496.366],[487.812,484.877],[597.168,482.124],[659.137,413.552],[586.547,332.506]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":58.092,"s":[{"i":[[41.14,-14.181],[16.857,-21.57],[-4.024,-3.706],[-14.07,-0.51],[-28.878,-6.415],[-29.93,6.397],[-4.022,33.532],[43.567,13.567]],"o":[[-42.09,18.438],[-17.525,22.426],[6.527,6.011],[11.563,0.419],[28.384,6.305],[37.381,-8.61],[3.666,-30.569],[-41.944,-11.927]],"v":[[481.538,335.535],[400.029,396.959],[378.702,461.784],[412.431,465.475],[500.339,477.428],[600.398,484.818],[664.879,418.602],[595.533,332.495]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":60.545,"s":[{"i":[[28.201,-1.085],[12.654,-5.359],[7.828,-30.219],[-29.163,-7.707],[-24.783,-3.988],[-20.286,7.565],[4.15,32.508],[22.957,14.401]],"o":[[-19.818,0.762],[-62.447,26.447],[28.952,1.188],[19.981,5.281],[23.203,3.734],[32.599,-12.156],[-3.274,-25.65],[-17.795,-11.163]],"v":[[552.771,323.203],[494.19,336.456],[394.869,451.062],[473.248,463.684],[557.264,486.313],[622.075,480.875],[667.874,402.501],[624.119,342.216]],"c":true}]},{"t":65.455078125,"s":[{"i":[[29.256,-1.636],[12.654,-5.359],[8.617,-28.501],[-28.968,-8.636],[-24.783,-3.988],[-20.286,7.565],[3.491,32.586],[22.957,14.401]],"o":[[-19.802,1.107],[-62.447,26.447],[28.952,1.188],[19.806,5.905],[23.203,3.734],[32.599,-12.156],[-2.92,-27.253],[-17.795,-11.163]],"v":[[552.771,323.203],[505.624,334.015],[404.252,446.909],[473.294,460.187],[557.264,486.313],[622.075,480.875],[668.525,402.251],[624.928,339.765]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.250979988248,0.721568986481,0.588234994926,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":91,"st":-11,"bm":0},{"ddd":0,"ind":3,"ty":3,"nm":"Null 6","hd":true,"sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.11],"y":[1.253]},"o":{"x":[0.234],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.619],"y":[1.175]},"o":{"x":[0.466],"y":[0.235]},"t":16.363,"s":[-23.464]},{"i":{"x":[0.495],"y":[1]},"o":{"x":[0.367],"y":[0.239]},"t":63.818,"s":[14.851]},{"t":90,"s":[0]}],"ix":10},"p":{"a":0,"k":[500,500,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.517,0.517,0.833],"y":[1.074,1.074,1.173]},"o":{"x":[0.571,0.571,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.636,0.636,0.667],"y":[0.588,0.588,0.493]},"o":{"x":[0.428,0.428,0.167],"y":[0.065,0.065,-0.129]},"t":31.908,"s":[80.652,80.652,100]},{"i":{"x":[0.472,0.472,0.667],"y":[1.033,1.033,1]},"o":{"x":[0.23,0.23,0.333],"y":[1.161,1.161,0.734]},"t":55.637,"s":[95.256,95.256,100]},{"t":90,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"ip":0,"op":91,"st":-10,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Layer 4 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[499.991,500,0],"ix":2,"l":2},"a":{"a":0,"k":[20.25,20.25,0],"ix":1,"l":2},"s":{"a":0,"k":[2000,2000,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[11.045,0],[0,-11.046],[-11.046,0],[0,11.045]],"o":[[-11.046,0],[0,11.046],[11.045,0],[0,-11.046]],"v":[[0,-20],[-20,0],[0,20],[20,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.262745098039,0.376470618154,0.87450986376,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":[20.25,20.25],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":91,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/ui/imports/shared/popups/SignTransactionModal.qml b/ui/imports/shared/popups/SignTransactionModal.qml index 2bcdf3a349..508b591e04 100644 --- a/ui/imports/shared/popups/SignTransactionModal.qml +++ b/ui/imports/shared/popups/SignTransactionModal.qml @@ -12,7 +12,7 @@ import StatusQ.Controls 0.1 import shared.views 1.0 import shared.panels 1.0 import shared.popups 1.0 -import "../../../app/AppLayouts/Wallet" +import applayouts.Wallet 1.0 StatusModal { id: root diff --git a/ui/imports/shared/status/StatusChatInput.qml b/ui/imports/shared/status/StatusChatInput.qml index c7ad25a008..4d2b569ede 100644 --- a/ui/imports/shared/status/StatusChatInput.qml +++ b/ui/imports/shared/status/StatusChatInput.qml @@ -14,7 +14,7 @@ import shared.popups 1.0 import shared.stores 1.0 //TODO remove this dependency -import "../../../app/AppLayouts/Chat/panels" +import applayouts.Chat.panels 1.0 import "./emojiList.js" as EmojiJSON import StatusQ.Core.Theme 0.1 diff --git a/ui/imports/shared/status/StatusStickerMarket.qml b/ui/imports/shared/status/StatusStickerMarket.qml index acd07b8ace..9a79fafaa6 100644 --- a/ui/imports/shared/status/StatusStickerMarket.qml +++ b/ui/imports/shared/status/StatusStickerMarket.qml @@ -9,7 +9,7 @@ import shared.panels 1.0 import shared.popups 1.0 import shared.status 1.0 //TODO remove this dependency! -import "../../../app/AppLayouts/Chat/stores" +import applayouts.Chat.stores 1.0 Item { id: root diff --git a/ui/imports/shared/status/StatusStickerPackClickPopup.qml b/ui/imports/shared/status/StatusStickerPackClickPopup.qml index ec9e283c29..b7ac0a434e 100644 --- a/ui/imports/shared/status/StatusStickerPackClickPopup.qml +++ b/ui/imports/shared/status/StatusStickerPackClickPopup.qml @@ -7,8 +7,6 @@ import utils 1.0 import shared 1.0 import shared.popups 1.0 import shared.status 1.0 -//TODO remove this dependency! -import "../../../app/AppLayouts/Chat/stores" // TODO: replace with StatusModal ModalPopup { diff --git a/ui/imports/shared/status/StatusStickersPopup.qml b/ui/imports/shared/status/StatusStickersPopup.qml index 508453cb35..f9314c027c 100644 --- a/ui/imports/shared/status/StatusStickersPopup.qml +++ b/ui/imports/shared/status/StatusStickersPopup.qml @@ -9,7 +9,7 @@ import shared.panels 1.0 import StatusQ.Controls 0.1 as StatusQControls import StatusQ.Components 0.1 //TODO improve this! -import "../../../app/AppLayouts/Chat/stores" +import applayouts.Chat.stores 1.0 Popup { id: root diff --git a/ui/imports/shared/views/ExistingContacts.qml b/ui/imports/shared/views/ExistingContacts.qml index 85753752a6..5f618f5a3e 100644 --- a/ui/imports/shared/views/ExistingContacts.qml +++ b/ui/imports/shared/views/ExistingContacts.qml @@ -6,7 +6,7 @@ import utils 1.0 import shared.status 1.0 import shared.stores 1.0 // TODO move Contact into shared to get rid of that import -import "../../../app/AppLayouts/Chat/controls" +import applayouts.Chat.controls 1.0 Item { id: root diff --git a/ui/imports/shared/views/SearchResults.qml b/ui/imports/shared/views/SearchResults.qml index 29f6e2360a..87138571dc 100644 --- a/ui/imports/shared/views/SearchResults.qml +++ b/ui/imports/shared/views/SearchResults.qml @@ -10,8 +10,6 @@ import StatusQ.Controls 0.1 import "../" import "../status" import "../panels" -// TODO move Contact into shared to get rid of that import -import "../../../app/AppLayouts/Chat/controls" import "./" import StatusQ.Components 0.1 diff --git a/ui/imports/utils/Global.qml b/ui/imports/utils/Global.qml index ac251ed6e4..8b42e5f70d 100644 --- a/ui/imports/utils/Global.qml +++ b/ui/imports/utils/Global.qml @@ -1,7 +1,7 @@ pragma Singleton import QtQuick 2.13 -import "../../app/AppLayouts/Chat/popups" +import applayouts.Chat.popups 1.0 QtObject { id: root diff --git a/ui/imports/utils/Style.qml b/ui/imports/utils/Style.qml index 338c6a28f9..064123656d 100644 --- a/ui/imports/utils/Style.qml +++ b/ui/imports/utils/Style.qml @@ -52,4 +52,7 @@ QtObject { function emoji(name) { return assetPath + "twemoji/" +name + ".png"; } + function lottie(name) { + return assetPath + "lottie/" +name + ".json"; + } } diff --git a/ui/main.qml b/ui/main.qml index 8be55bc6a4..9768e6add5 100644 --- a/ui/main.qml +++ b/ui/main.qml @@ -2,7 +2,6 @@ import QtQuick 2.13 import QtQuick.Controls 2.13 import QtQuick.Layouts 1.13 import Qt.labs.platform 1.1 -import QtQml.StateMachine 1.14 as DSM import Qt.labs.settings 1.0 import QtQuick.Window 2.12 import QtQml 2.13 @@ -16,8 +15,8 @@ import shared 1.0 import shared.panels 1.0 import shared.popups 1.0 -import "./app/AppLayouts/Onboarding/views" -import "./app" +import mainui 1.0 +import applayouts.Onboarding 1.0 StatusWindow { property bool hasAccounts: startupModule.appState !== Constants.appState.onboarding @@ -298,119 +297,13 @@ StatusWindow { } } - DSM.StateMachine { - id: stateMachine - initialState: onboardingState - running: true - - DSM.State { - id: onboardingState - initialState: hasAccounts ? stateLogin : keysMainState - - DSM.State { - id: keysMainState - onEntered: loader.sourceComponent = keysMain - - DSM.SignalTransition { - targetState: genKeyState - signal: applicationWindow.navigateTo - guard: path === "GenKey" - } - } - - DSM.State { - id: existingKeyState - onEntered: loader.sourceComponent = existingKey - - DSM.SignalTransition { - targetState: appState - signal: startupModule.appStateChanged - guard: state == Constants.appState.main - } - } - - DSM.State { - id: genKeyState - onEntered: loader.sourceComponent = genKey - - DSM.SignalTransition { - targetState: appState - signal: startupModule.appStateChanged - guard: state == Constants.appState.main - } - } - - DSM.State { - id: keycardState - onEntered: loader.sourceComponent = keycardFlowSelection - - DSM.SignalTransition { - targetState: appState - signal: startupModule.appStateChanged - guard: state == Constants.appState.main - } - } - - DSM.State { - id: stateLogin - onEntered: loader.sourceComponent = login - - DSM.SignalTransition { - targetState: appState - signal: startupModule.appStateChanged - guard: state == Constants.appState.main - } - - DSM.SignalTransition { - targetState: genKeyState - signal: applicationWindow.navigateTo - guard: path === "GenKey" - } - } - - DSM.SignalTransition { - targetState: hasAccounts ? stateLogin : keysMainState - signal: applicationWindow.navigateTo - guard: path === "InitialState" - } - - DSM.SignalTransition { - targetState: existingKeyState - signal: applicationWindow.navigateTo - guard: path === "ExistingKey" - } - - DSM.SignalTransition { - targetState: keysMainState - signal: applicationWindow.navigateTo - guard: path === "KeysMain" - } - - DSM.SignalTransition { - targetState: keycardState - signal: applicationWindow.navigateTo - guard: path === "KeycardFlowSelection" - } - - DSM.FinalState { - id: onboardingDoneState - } - } - - DSM.State { - id: appState - onEntered: loader.sourceComponent = app - - DSM.SignalTransition { - targetState: stateLogin - signal: startupModule.logOut - } - } - } - Loader { id: loader anchors.fill: parent + opacity: active ? 1.0 : 0.0 + visible: (opacity > 0.0001) + Behavior on opacity { NumberAnimation { duration: 120 }} + active: !splashScreen.visible } Component { @@ -420,63 +313,14 @@ StatusWindow { } } - Component { - id: keysMain - KeysMainView { - btnGenKey.onClicked: applicationWindow.navigateTo("GenKey") - btnExistingKey.onClicked: applicationWindow.navigateTo("ExistingKey") - btnKeycard.onClicked: applicationWindow.navigateTo("KeycardFlowSelection") + OnboardingLayout { + hasAccounts: applicationWindow.hasAccounts + onLoadApp: { + loader.sourceComponent = app; } - } - Component { - id: existingKey - ExistingKeyView { - onClosed: function () { - if (hasAccounts) { - applicationWindow.navigateTo("InitialState") - } else { - applicationWindow.navigateTo("KeysMain") - } - } - } - } - - Component { - id: genKey - GenKeyView { - onClosed: function () { - if (hasAccounts) { - applicationWindow.navigateTo("InitialState") - } else { - applicationWindow.navigateTo("KeysMain") - } - } - } - } - - Component { - id: keycardFlowSelection - KeycardFlowSelectionView { - onClosed: function () { - if (hasAccounts) { - applicationWindow.navigateTo("InitialState") - } else { - applicationWindow.navigateTo("KeysMain") - } - } - } - } - - Component { - id: login - LoginView { - onGenKeyClicked: function () { - applicationWindow.navigateTo("GenKey") - } - onExistingKeyClicked: function () { - applicationWindow.navigateTo("ExistingKey") - } + onOnBoardingStepChanged: { + loader.sourceComponent = view; } } @@ -513,6 +357,10 @@ StatusWindow { applicationWindow.toggleFullScreen() } } + + SplashScreen { + id: splashScreen + } } /*##^##