From f173fb53ea62d30fb342b08c9126d8833d38c378 Mon Sep 17 00:00:00 2001 From: JUNWON LEE <87055456+murjune@users.noreply.github.com> Date: Mon, 12 Feb 2024 17:11:17 +0900 Subject: [PATCH] =?UTF-8?q?[Feature]=20OnBoarding=20UI=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84,=20APP=20Icon=20=EC=B6=94=EA=B0=80=20(#57)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [init] onBoarding Module * [build] compose-lottie 추가 * [feat] onBoarding string추가 * [chore] match 중복 코드 삭제 * [TEMP] 임시 로티 파일 추가 * [feat] OnBoardingScreen 구현 * [chore] ktForamt * [chore] app-strings 수정 * [feat] app_logo 추가 * [fix] onBoarding, Home 부분 Colors.kt 네이밍 수정 --- app/build.gradle.kts | 2 +- app/src/main/AndroidManifest.xml | 5 +- app/src/main/ic_funch_logo-playstore.png | Bin 0 -> 20211 bytes app/src/main/res/drawable/ic_app_icon.xml | 21 + .../res/drawable/ic_funch_logo_foreground.xml | 26 + .../res/mipmap-anydpi-v26/ic_funch_logo.xml | 5 + .../mipmap-anydpi-v26/ic_funch_logo_round.xml | 5 + .../main/res/mipmap-hdpi/ic_funch_logo.webp | Bin 0 -> 1194 bytes .../res/mipmap-hdpi/ic_funch_logo_round.webp | Bin 0 -> 2284 bytes .../main/res/mipmap-mdpi/ic_funch_logo.webp | Bin 0 -> 860 bytes .../res/mipmap-mdpi/ic_funch_logo_round.webp | Bin 0 -> 1550 bytes .../main/res/mipmap-xhdpi/ic_funch_logo.webp | Bin 0 -> 1582 bytes .../res/mipmap-xhdpi/ic_funch_logo_round.webp | Bin 0 -> 2956 bytes .../main/res/mipmap-xxhdpi/ic_funch_logo.webp | Bin 0 -> 2268 bytes .../mipmap-xxhdpi/ic_funch_logo_round.webp | Bin 0 -> 4704 bytes .../res/mipmap-xxxhdpi/ic_funch_logo.webp | Bin 0 -> 2850 bytes .../mipmap-xxxhdpi/ic_funch_logo_round.webp | Bin 0 -> 6098 bytes .../res/values/ic_funch_logo_background.xml | 4 + app/src/main/res/values/strings.xml | 4 +- .../funch/theme/{Colors.kt => HomeColors.kt} | 0 .../main/java/com/moya/funch/MatchScreen.kt | 94 - .../java/com/moya/funch/MatchViewModel.kt | 86 - .../moya/funch/navigation/MatchNavigatoin.kt | 33 - feature/onboarding/.gitignore | 1 + feature/onboarding/build.gradle.kts | 15 + feature/onboarding/proguard-rules.pro | 21 + .../onboarding/src/main/AndroidManifest.xml | 3 + .../moya/funch/onboarding/OnBoardingScreen.kt | 97 + .../navigation/OnBoardingNavigation.kt | 13 + .../onboarding/theme/OnBoardingColors.kt | 18 + .../src/main/res/raw/temp_lottie.json | 3776 +++++++++++++++++ .../src/main/res/values/strings.xml | 7 + gradle/libs.versions.toml | 1 + settings.gradle.kts | 3 +- 34 files changed, 4020 insertions(+), 220 deletions(-) create mode 100644 app/src/main/ic_funch_logo-playstore.png create mode 100644 app/src/main/res/drawable/ic_app_icon.xml create mode 100644 app/src/main/res/drawable/ic_funch_logo_foreground.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_funch_logo.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_funch_logo_round.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_funch_logo.webp create mode 100644 app/src/main/res/mipmap-hdpi/ic_funch_logo_round.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_funch_logo.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_funch_logo_round.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_funch_logo.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_funch_logo_round.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_funch_logo.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_funch_logo_round.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_funch_logo.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_funch_logo_round.webp create mode 100644 app/src/main/res/values/ic_funch_logo_background.xml rename feature/home/src/main/java/com/moya/funch/theme/{Colors.kt => HomeColors.kt} (100%) delete mode 100644 feature/match/src/main/java/com/moya/funch/MatchScreen.kt delete mode 100644 feature/match/src/main/java/com/moya/funch/MatchViewModel.kt delete mode 100644 feature/match/src/main/java/com/moya/funch/navigation/MatchNavigatoin.kt create mode 100644 feature/onboarding/.gitignore create mode 100644 feature/onboarding/build.gradle.kts create mode 100644 feature/onboarding/proguard-rules.pro create mode 100644 feature/onboarding/src/main/AndroidManifest.xml create mode 100644 feature/onboarding/src/main/java/com/moya/funch/onboarding/OnBoardingScreen.kt create mode 100644 feature/onboarding/src/main/java/com/moya/funch/onboarding/navigation/OnBoardingNavigation.kt create mode 100644 feature/onboarding/src/main/java/com/moya/funch/onboarding/theme/OnBoardingColors.kt create mode 100644 feature/onboarding/src/main/res/raw/temp_lottie.json create mode 100644 feature/onboarding/src/main/res/values/strings.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 4afa4daf..b093cd2e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -39,7 +39,7 @@ dependencies { implementation(projects.feature.profile) implementation(projects.feature.home) implementation(projects.feature.match) - + implementation(projects.feature.onboarding) // implementation(libs.coil.core) implementation(libs.startup) // implementation(libs.security) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9ffb357d..a08e353d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,9 +10,9 @@ android:allowBackup="true" android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="@xml/backup_rules" - android:icon="@mipmap/ic_launcher" + android:icon="@mipmap/ic_funch_logo" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher_round" + android:roundIcon="@mipmap/ic_funch_logo_round" android:supportsRtl="true" android:theme="@style/Theme.PunchAOS" android:usesCleartextTraffic="true" @@ -20,7 +20,6 @@ diff --git a/app/src/main/ic_funch_logo-playstore.png b/app/src/main/ic_funch_logo-playstore.png new file mode 100644 index 0000000000000000000000000000000000000000..5ff2ac66c77f7faa67a91d4bb27babf6a996ee87 GIT binary patch literal 20211 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 + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_funch_logo_foreground.xml b/app/src/main/res/drawable/ic_funch_logo_foreground.xml new file mode 100644 index 00000000..f6997464 --- /dev/null +++ b/app/src/main/res/drawable/ic_funch_logo_foreground.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_funch_logo.xml b/app/src/main/res/mipmap-anydpi-v26/ic_funch_logo.xml new file mode 100644 index 00000000..e7cb1ecb --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_funch_logo.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_funch_logo_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_funch_logo_round.xml new file mode 100644 index 00000000..e7cb1ecb --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_funch_logo_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_funch_logo.webp b/app/src/main/res/mipmap-hdpi/ic_funch_logo.webp new file mode 100644 index 0000000000000000000000000000000000000000..00f63e10ab3c49bae6ab6b5fa7ad90b7eb32df57 GIT binary patch literal 1194 zcmV;b1XcS|Nk&GZ1ONb6MM6+kP&iDL1ONapN5ByfO(b44Sy>a|wgCV%N!?wZ zz(1x(!m*Pzr) z6>yA^9WkDm0014`??5hyNNj+_@>y(ED{WF7sd|qpmx(prSj$@KT5bk3 z*&qv5OF)Jo2}H*+M?-8hmO1*s6n8X39MoFD$SWxqValt(v}V&csLE&6Ixz{F<9Y=Q z+BAIzHsGKbm>_m)Va{6=P_aYXJ$j8!bd#e=pPu_2mKp~a=6GlTQ0Hdi(LzRIQ;-8= z#oD2K6BDoe&K)*qDh_VV@ghZdiSFvd`Kd?K!Ofs_)bX^}Ad3S2%5#05I+&P41r4~c zba)$}3UCU-~PN$XXZ@ zUI|2Xh0R~`a58buL=ay3cqiuk1aS++mk<>UKmdq*>(33(mLaYirymZ8N=Ctez5rDJ zbTz}qxj=oJj;$U807OLKbS+-TIfJ-enl8bC97KRZ!4+q|o4vjxjKvHZG>LYAwqNlM z#Vj|!T8G;5U=>kBhlb!kVx)8AY z^PI^i03JTla=++~y8|9Zp-|}iD?oxNLiiE7xnGVO{v4h7mI$CP(Dxg^Wq~QeJ(|b= zokRf6tsj>AJTCrmeC!j2G5{F=i~@KKcmFx~@xP(CfzPSZFtJ3pCWOKgOFZhJRVNh? z`uvX-zmF@t9X)BG`5LeMWzw}ho))KF4m}% z2e!6^n;?mwYyt3dw_y93c$VSrXL#ryLX_J>nidFM01xkWL6SnUaK_%GKh3%r zK5xu>4#8(2qAoR3;6pqGqRN1{{F*g?5E=hNz`}q6D0UKj^vm4>{X_jqbi@gZK%2ZP I{;VS^0Qt>9W&i*H literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-hdpi/ic_funch_logo_round.webp b/app/src/main/res/mipmap-hdpi/ic_funch_logo_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..a5454dcd9a919ba57675308877f13ea6c4f0ba3b GIT binary patch literal 2284 zcmV}g0hDVk zRG_Umg0%dKNh}l4d(D#guhxKK0PneA&`6S^_OJ5z`rttXSzr`Nl9b$2#J(?H_}736 z0v!{CqDGRU4rz`j{>72jfP(%{0Qf523=E~=1BCwW&op1S7XUaKN-1mi8vs(4@s+eM z>jeOS`%wcthfDC&8w%RCkz)R^w|gK!jDh{Fj55vJVWo_FI*-lq)+qP}nw#}h! z+qP|cgxDV2HkMh{e^vDnJh7Ac7dw3bar(-1A4NR>hndQ)ZEe}2b06H@-JuI>f!v`3 zGLI~UDj*|uCmkulXHvKCxsqesR&8a>bH9Z3-pk|vkEK8!Btat9B?E`HyWUMEZJWzE zWBbM?fU>M@izMa!vlYAl3w7wO{E@26tehKou*BWT)rY$~{Mff-SQ0V%tr8pAB7ZiG-=DBpstqdWJOe%Z2e>XkRc}g=Bq08Q-jD9FFP)CCE{!Vi z68|uCqQ5@XH9_~pFsJ?`C-?=RX|J7TL5CWF>Ycc${gG*XM=6OTg&--h@h3% zAZe+aoLtA!XIHuC!!`vAfM9-#DRs&;TvY(3sNH1XJ*|Iq;nSbpENW|lAPpJ z`e)J*92AOTcO!)ezbAP03WXry)^MDe_+D&< z>zs+?{L;|RobA7FVc)^fWUv{NV?pmhha@`zHV<4W@8L+W2x)k2Hft>I!LV%@3rOp4 zhMK`Sx|yQnTg(RrZOGIUW(< z4oFB)lu85-OvH0Uzcyc=dXd;L7y#dhpx9_W+4{kEkVMZIfmms*&X zQ7i=WH&&3cf#Lf}P#Tq>X7U|^-XY{^5)CSV2xdVs-xRCPPq3M>cSyDg>y}D{Golro z6wLCCMWtyboJ7f3egxwtAV7CRq$4pA92Cp~V30t7cFPRdixMPoiwOf6r0bNJziP&) zSTYg;iXvhXRAUH0zl{t#z{Zom0O5MaHY8Bez@Xd}f)oZ4kn|!45erMf`~hhFfd;KL zWL1=m{3$4~;`yGePZV^x5F(t z9yj3-qktqKDMj&;sisin7HE8()S6ME&R1 zm$7t{jYs3`>39jt7zN<>#3ZBWQIeKl5g$f-ppRkzueX!L5K(6S&8}9-OHmmFc>D{e z&$#M}7k?x=gZlqKBH|G~f;=N@00@5lXi}fWgZ6m%8)g5!bldv?Jp7I;FL>fBIO=h* z7EiGy{A9!{a7$4I5l8C}P+7RP97- z$jwFY0Lio*PH?#_iPjXBrcJ( z;?zn{7wPjIMHUi$+zups?ekOgucsREV~kw1CqAz+K$P0h!Nz0I(B_#zBT5Uhfe~k8 zYbp`LK(Xc{eN%i4UPxc*!-C<>Z+^{J6t``e7xK+5&u(l(@Fb8n+kfg}+pwkbblQ4% zTDAhOi(Hegk;>`C;!y^2t8>O^MEyrjlFq?)%}$lp(&!p)RwgWN5z)iUqC`g0Qtm(E zNhQ9sePfRHd*}JTCQ4#pf!JU$19!CxY4{fABmWbO(j#p3wJT~O6p`E|r>~y#k(S$~ z*5#3}g3$^UWPJYN=ewNb+&Hi78rj{6(UL_FW@;=y>AQW|xoOYy`SHIj?>=D0m~9gA z!_QAWbE@tUYo>_0gJ%T`B(NOWrq?gLE~`w1@t69{sak{;z62&@F`r()FgYh`M2R)# GW^5P#)=qB# literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/ic_funch_logo.webp b/app/src/main/res/mipmap-mdpi/ic_funch_logo.webp new file mode 100644 index 0000000000000000000000000000000000000000..fd48ccefd0f305345eb4833a7f1f7561e9ba915c GIT binary patch literal 860 zcmV-i1Ec&>Nk&Fg0{{S5MM6+kP&iCS0{{RoFTe{Bm*y&xB*m(l+2ea;>-qQb{umBL zIF2OAQL1|8B)q^4{5K3=*iL+(we@D*c4@z5gKqQX?+xQr&@z46)(5K5`KLdu4D8y+&_LbOiB^!=$h*LHx0i3HBG+X zb-CRp<9_+n=xf#En8wN_0>mJ2T%uBsBSR#JpcphtSyDPL$A9pFzk?oG7!+Yc*5<)t zA|PAS?t&9VKqi;~@*3Qp2k+OtZui$K|Ht+5yMTZJq5%OF6zvBB2ADwy6%myGumgWE zrnzg-K?9}PzFSZrf7`a>ZJrOcZQJ&2ud{92wmR3g+i#hZ&TZbA|54NT{f<1(+TSDk z&&X{XM>IUgw)GD%R-&lrDEed>tc=xrlL7t)1|bvp7eLmj!;itY=nVdF09o{%k>s1i zQ{dkxHe^O;h7kwsHd}@N885E}6 zK0RLWW%E1=88@_}lR0@i4@FW)yr%V?Ssd|o=K9OM8ySVTtD2^jTsU{DPcsygNV~2H zdD68>ynxXdg*U}^cfMFQHGAUp*~_;SVa&ZF)X>$@+H~po>-$v?7BY+t{X9cwM|(?i zU2Sz$#f~tH)GI=}_|{Zamd{}r2gP=_w>H-gw|cmbk`Trp5N7AvFw%;$SFu)0S$g<< z3D>8c9hTN{EqxhpwebA(oGGi$T4uMjrGcBFytMRj7V0`@zwqP_Lr)=Z|CFIWqn-CalfotbuV8>5xC zYaFqHC5+glsnjB)M$LEi|9$6usRmD;0>STS{!?!Pcp%&TWF+}zF9T0;`8{AX8BsAA m2mZJ!IzMK6XAd`Y+@0-pfBd$NPUtw=%Agz71|1c~NB{s%4yj21 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/ic_funch_logo_round.webp b/app/src/main/res/mipmap-mdpi/ic_funch_logo_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..139ea300a2e7bf01d9df5fda688282144a8f9788 GIT binary patch literal 1550 zcmV+p2J!h)Nk&En1^@t8MM6+kP&iEa1pojqFTe{BO_*uhHl`-|wut_RZslXaDNK(# zwKiQSXxm0If0*0uKNxo$)I^dLb#x+#5P*M0ME@gzLff`&h(O5yC+37so%^47nfaRn zuwRvLuVySTb?dwBS6Tp3!Y>X5ZQC$4f7;!F5D^m~6&^CujcwbJ-JI70oqwzv=m#G#yR;{eHzec}?--vba@zxwNhm4xY$Sl0uAlpbifIEMI*ZfR?1%j(7 zj*Aw>c5yvI3`gsWNC3&s$VU+adKM4}u=r89&u}tOa%zS`vPvNV!u78wotCw_q;qEX zy)82jPc_yCWk00#X)TvVNtu`ZWRNEt>X6F8tRa)n|3BH7Snk0)r_*bT0z|me8WG%j z`3q*>4aTgJN|<=;yjt+aOYHO3LO6T%V0mp913$P>A%)KvoNA_Eg=LdL{r_i$H%*>v z1t2DDWkzaNpyK_?D!HYj^}0!XCSedu zCF4sULn%h8=n4P|LEXN*N(W-4OyY(x*h>$zGHP1G6AHSR&?8GLm{VqA4G1pG{^Nl- zl8G?Q*cHP-AD0t|0#J6Nrz>kkyvLBYBf*A5yQc2q~`1zZS*S{IqlN&k=d z6dJG>m0s1t!!__nFuQip$#B7`87IQHQ}QLV2Akvrs4i+8+uS&&W&XfN0=FV71-NKx zCdPD{A5y9hPS2j05)(C1!HE2*6jj5hC$yy&?QJ!qYydE7dPYx$Xid)zWL5(b`$}6E zE*zXcw{GFwg7uv_+gmF(HfC?{)hB95R*9_&ES<+>YWh(fNMZnBp*$HBr6S6dD46gQ z_)y!*3=kKi% zgbz*2AS;(5))ZB@NHGmm(uc`gPc#Yd^tI;&i%zQR|UOt-7~bH!t}IN~6kw zf>LFoxNw!Q0I+1-5t(6H`nYY^`BW9ZIQ${tNe_pvhYj}%{L#~qq7l3d8Ub)h8Hq3f z!M(C%7F@c}7SR$kib2&!>y870M{(jG54(s$C`KTJLD{)ry7$j1G3pw#vSeg2bff;OiWSbpuiB2@iFUD0K2F{>B3nSg+ zJJI};bHgmPYUrs7R$-_0fC(eAQ!AyLmm6>iHyI@kl>l^vzz|AwlXb_Llz5XSL2|0> zHW6wWkyZqo)c1_ZG)d$lS#}e-jWDY7uH_WzcPvoMWRV-!&3W`EcUse3Aeh~-yBSo_ zJ!wyRd8immx7^A4!t=xZ%Sp+7xKwef9|6_u-KA67oEK3%_b ztD`I1SFXPOJv#fh{zAU@-h1!eeRxdBW$fv94~N6yg&rJflk?nKOK)`MLE0Pl(2 AoB#j- literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_funch_logo.webp b/app/src/main/res/mipmap-xhdpi/ic_funch_logo.webp new file mode 100644 index 0000000000000000000000000000000000000000..ca49870c1cbd7ae3aa8402cb6e81e43ae5cb44c9 GIT binary patch literal 1582 zcmV+}2GRLaNk&E{1^@t8MM6+kP&iB)1^@srU%(d-O)zZRHWDKDxjWzf3+I_3qW=>R zb9ZY)2Z@j-mQ<;nP)01-9!P3xV0DJm{VWu;k)(`&mCsBb_#H5bBuP>V*$*vR|3cn7 zc<@9FK-;!$Gzj|t!oo*%DmwIk0>ICKvk-#75N?1=mZ@nHBD8?P4;C!A<1Ju>n4EK zwrz$aDWf#DZQHi3wQbutTwr$(C3mFH=?T8=nT!U|I#afPR+p4Y1xz7ErWP0Dj z-5qlJ-vo+`-1RKDwQZ|b);bRgpaF=X3ErhCclVTX98wx^B6qiYVgdl#uZG|j0PWRt$-VhHcYN+N}nTKYR9lHNyNuGzkxs}48B?t#G z)`0a@@&x68pp{0?`{w!aEI9*)IrrddqM$I&GRc6c6H5x+^tmv-0@v7@gZRKp!7!%G@U%Cg=>sU=EU z5$X~LZ`xj%?2nAjDV+$E4d^w==&n<2`L2FM0F4^QuD!!%-ab0C z#!xVL#@5Z@)t437vc?Dci2^jnL$-Z~504KYYef69d|heU5Ip!$oB3#s5>_xk1E}bg z;VA1POXr6`fox{uR-gXY3P6XClUUPz5dsvA`^Y!cgPPdYrey_i?zM(JRD(1fyfUyy zMwF)Da5{D{?NJM>V+uGAX&Tyan?iMd45?pgLo(-14B3M zK54f^JvbiXGPyEb=+NzhnoLqjb9rtXrxL<%Cvg(gR| zJ;${0;C;*EA zRxqZif1QZZ=F~Q|@NGqnc=H`NRuzug- z2_S%k36TfBUTSKXQX9{>+T9&UQvg|v00KIId%S*J4e5sauRXodgQOAw0W=UQ=-_yD z)S?=Z$H`^yO?ML{t^|O^gbI<);Y#3(30-lsnP1lc5(*&16pus#IC3aeE<{X-u^WHCqpWHAT` zAmD&*gIZYSVh{hZcfhB3_b-9Z`L~v8(t)32!1w*-=H7!}2?!vmF>OgP2zWt1Qyu*g zIzgx^=%fz#@|ipjcP;-f5*j`D89ZsaKK1=@);?B;oC#y7&D1Pt9RJsmuNLza;9=Rk zeAH{rf6GWrX%nY}4l+745Az154T4tD9}@mqJZbqmBK1S@h1gmlLuR!yQLxvw4|l9}v8Hj9CG_1gHVXeH$@$bD^DC4wrS=?79qtlb&5iBPW; z5R2#J>|2HJS|c`>yVjD^(f|Kyl2+rcZ5at|5WC;LDeKOfH7s}QwrvSm{?Lo1I#^D@ z>Stp495i0AT~^CryAlxF?HvM>0G5gekfLvBZXecn7Qffp#6t(zb=$fmsg+N@@0?q8g%Qo7grI@`N) g2l739ak^R($!k5hXJ)d))0NyRFIV=(wNTUEC4M*gw*UYD literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_funch_logo_round.webp b/app/src/main/res/mipmap-xhdpi/ic_funch_logo_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b7abf43bb929374fa6fb1f688f0253c4bbd2bfc4 GIT binary patch literal 2956 zcmV;73v={RNk&G53jhFDMM6+kP&iC@3jhEwU%(d-O)zL1$&oUd@6Vs`6$}ymp8%F^ z3py}pZpctgi_k=KVlZ>Z0UWdO@g-LvD&)CZzCpd(*7?<*0Kd9m&`6S^_OJ4o*#bN` zVB1Kxld0i{1{3}MMJcZ(7?ORdPsGC{$?B;2mo=)0?WsD^#e^vClPS10cA;U)~5+WsEtez%d3qG*R%k zI25#P!zBD+cb7p#OaPyj;6U<3a7b2MP%77UWo>&TN%{V4x#Iq>6kXN%8&zHPXVwJv zgYq)C17bb2RzF&O7P10+JOWFNSiN7Y3Eu@EJq`9ox&)t1{AjI}rNPS!h>#=z0NF@w zlCf>uwmmo7^8#LHu5;7cwr$%+ZCf!XfNr$?izH{JXJ(m?nVFf%Ix#adGc(I&W>{Nj zF_?P7gf%ouq3&BXxI&dzP%)wq-||>n8ax4P_+FHz?{`8+hT3s6hh7dnYD9 z_&nDbL0lsosy7$`3>Ajm1q_7s8$_6SV^jR^4_y0Y-wcuHgr8zhg9T-?n!6rcjiw;p z=NXbG`I4EEBw9jKK=w8~kr@`3n6pNt@?QkckqHS=>tP9`4epI!H>EbI`H}>(zrZ4q z&-uma8_^>)%i&ZS5_I0(4dr%;0cZ+A0E$9X05PTK{k3NV(X<{$rE!@qvw1?Yfks5I zuc}gkv~jum0~&RF5sizCyqp(bj7~Lz(yDC<#3^TGM`S!3ijma`2}=ty^K)9O!LZt* z^8d8=S)1aR>X;(nyys;S!o(7cu<3%x^BP2qCY<|Xx_(JVD65Rsn|RUneGre4L}Oi% z8z77^PYb#JaaxQbAXi8t$I8g{h$Q98AjUwIEQnzA5%BTK@H3xCF}QJ%=Dc14h=G)v zL-620!})wghoLD12OFTykcyzm#la`HAZRhAWfSO5VfarWnD$jZN8JxYBVtHaUo_Aj% zYcHg&tBfq+{9|>Wx|g`~1xjWuR1o&`N;t6893!_{01xvuv9V{RJDD8S3y^YvS}(lz_VXN}#cP+^ðC7aEo^En3WztB9+89l2(F6;f{< z*}-F(4d1~Kzl*=t$}E76%3Q{AiSg#5CGA|BEsY6wT?RF8n#rJqHQOQ1J0-trnMCBE z;W=D6*P~g}RY!%|)P&=6{KaGQQyR?xl3MI|W2Bt(-ncGW$S{qvb-5sem$D|MEK!XP z%z7s@n!*BzX+b7I-h|M|fVH?rxcj10D_+RMX0ti0Rpt#wYPd{N+g4-MC<$nx2-)j% zR3jCdM}fp$wM5ABg zxdzB(;@j$$xJXZ#jzw?5Gg`8G$a>~Ql%~{xrZD$ z<;m@~!}}v|?+?AcKlu9oz}3fFw_bc)aq4l(-edP$Yx|q0iI-N9BuzC;1h@?+<-|s~ zNhVsVs0zzWKr{gonH3*bcFNaZmrZY%%!(o!4M0p2JPLt3C8t#n2(^?%@i#k}Q5Lw& z5_&=3p6Tp?ahEV_0CDR*3oY1eg#fk2>9 z1-*a(6WMz@n5UpWv-KiS{E0GacCV&{MNtIvkWRn?>86zN2Vu4DZ*xEDpx3oZq<`skegG#d!$wC6we8ucVCX)LoNcysz-ld~d0ghP*y^;a z@*yiT<>m?@KvmG}V$WiXsC~Bvw6GdX1igR&2#6veK&vxdH$N7^40?~is-R5CvRhPx zSHF&E8A_@?W>G7x3FuI6)G*KsdI1m+c(-=qgU+`X56)`E8B)_1xnB zHvb<$&mj!hD#>93&X8z5Bw9@BE%_<9Zb zvfck7g)o5C%gevj=D2;VG-3C%cIk}*SAub)M*eUNwoYyJMKlbtbZd9E)1IaQX8cwA z!PCE532es=Lq+tf_rgrunu|5R!v~=D*&6m`)BQK;Z})r^FMR77b z{?+Z>mTZ9hy6C@%eTZ*$$-MMf2zHF#aoULw0QVTbvwtrpZ5=X z*nAfv@@X-f5Aop)RKizo@5(3L*x8r0x*I zdAPpwS87RrG4Uiex8Do-;zNRGi5A$ z#QCC5_mXda?h7mCc>F?}7UOV*Q(xxqes_*#u`{49+2>U!z8N5~SGeGboZ5;NcAE5f z^X9Pz2OeQ{x%H~KT9^d^s_yFT_?s_G&6OKsgjuzvS`9#(x5=BkDmT&~2)3Xo%2)v{ C0=($} literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxhdpi/ic_funch_logo.webp b/app/src/main/res/mipmap-xxhdpi/ic_funch_logo.webp new file mode 100644 index 0000000000000000000000000000000000000000..5a2bde1e3fa7b174674329dd6c7793780c369e71 GIT binary patch literal 2268 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 Y!30PULV!8V3NT|cX&{*tcg5-g07^c>f&c&j literal 0 HcmV?d00001 diff --git a/app/src/main/res/values/ic_funch_logo_background.xml b/app/src/main/res/values/ic_funch_logo_background.xml new file mode 100644 index 00000000..057d2b90 --- /dev/null +++ b/app/src/main/res/values/ic_funch_logo_background.xml @@ -0,0 +1,4 @@ + + + #070707 + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cb6e6328..3689feb5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,4 @@ + - Punch-AOS - SampleActivity + Funch diff --git a/feature/home/src/main/java/com/moya/funch/theme/Colors.kt b/feature/home/src/main/java/com/moya/funch/theme/HomeColors.kt similarity index 100% rename from feature/home/src/main/java/com/moya/funch/theme/Colors.kt rename to feature/home/src/main/java/com/moya/funch/theme/HomeColors.kt diff --git a/feature/match/src/main/java/com/moya/funch/MatchScreen.kt b/feature/match/src/main/java/com/moya/funch/MatchScreen.kt deleted file mode 100644 index ff3ab0c2..00000000 --- a/feature/match/src/main/java/com/moya/funch/MatchScreen.kt +++ /dev/null @@ -1,94 +0,0 @@ -package com.moya.funch - -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.material3.Button -import androidx.compose.material3.LocalContentColor -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.CompositionLocalProvider -import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.getValue -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.hilt.navigation.compose.hiltViewModel -import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.moya.funch.entity.SubwayStation -import com.moya.funch.entity.match.Chemistry -import com.moya.funch.entity.match.Recommend -import com.moya.funch.entity.profile.Profile - -@Composable -internal fun MatchRoute(onClose: () -> Unit, code: String, matchViewModel: MatchViewModel = hiltViewModel()) { - val uiState by matchViewModel.uiState.collectAsStateWithLifecycle() - val matchCode by matchViewModel.matchCode.collectAsStateWithLifecycle() - - LaunchedEffect(matchViewModel) { - matchViewModel.saveMatchCode(code) - } - - MatchScreen( - onClose = onClose, - memberCode = matchCode, - matchUiState = uiState - ) -} - -@Composable -private fun MatchScreen(onClose: () -> Unit, memberCode: String, matchUiState: MatchUiState) { - CompositionLocalProvider(LocalContentColor provides Color.White) { // @murjune TODO Delete this line - Column( - modifier = Modifier.fillMaxSize(), - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Center - ) { - when (matchUiState) { - is MatchUiState.Loading -> Loading() - is MatchUiState.Error -> ErrorMatchContent(code = memberCode) - is MatchUiState.Success -> { - val (profile, similarity, chemistrys, recommends, subways) = matchUiState.matching - MatchContent( - profile = profile, - similarity = similarity, - chemistrys = chemistrys, - recommends = recommends, - subways = subways - ) - } - } - Button(onClick = onClose) { - Text("Close") - } - } - } -} - -@Composable -internal fun MatchContent( - profile: Profile, - similarity: Int, - chemistrys: List, - recommends: List, - subways: List -) { - Column { - Text("This is Match Screen") - Text(text = "Profile : $profile") - Text(text = "Similarity : $similarity") - Text(text = "Chemistrys : $chemistrys") - Text(text = "Recommends : $recommends") - Text(text = "Subways : $subways") - } -} - -@Composable -internal fun ErrorMatchContent(code: String) { - Text("There is no match code $code. Please try again.") -} - -@Composable -internal fun Loading() { - Text(text = "Loading...") -} diff --git a/feature/match/src/main/java/com/moya/funch/MatchViewModel.kt b/feature/match/src/main/java/com/moya/funch/MatchViewModel.kt deleted file mode 100644 index ff5003f8..00000000 --- a/feature/match/src/main/java/com/moya/funch/MatchViewModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.moya.funch - -import androidx.lifecycle.SavedStateHandle -import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope -import com.moya.funch.entity.Blood -import com.moya.funch.entity.Club -import com.moya.funch.entity.Job -import com.moya.funch.entity.Mbti -import com.moya.funch.entity.SubwayLine -import com.moya.funch.entity.SubwayStation -import com.moya.funch.entity.match.Chemistry -import com.moya.funch.entity.match.Matching -import com.moya.funch.entity.match.Recommend -import com.moya.funch.entity.profile.Profile -import dagger.hilt.android.lifecycle.HiltViewModel -import javax.inject.Inject -import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.delay -import kotlinx.coroutines.flow.SharingStarted -import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.catch -import kotlinx.coroutines.flow.mapLatest -import kotlinx.coroutines.flow.stateIn - -@HiltViewModel -class MatchViewModel @Inject constructor( -// private val matchProfileUseCase : MatchProfileUseCase, - private val savedStateHandle: SavedStateHandle -) : ViewModel() { - - val matchCode: StateFlow = savedStateHandle.getStateFlow(MATCH_CODE, "") - - @OptIn(ExperimentalCoroutinesApi::class) - val uiState: StateFlow = matchCode.mapLatest { code -> - if (code.isEmpty()) { - MatchUiState.Loading - } else { - // MatchUiState.Success(matchProfileUseCase("1", it)) - // TODO : Remove 목 데이터, delay - delay(1000L) - MatchUiState.Success(MOCK_MATCHING) - } - }.catch { - emit(MatchUiState.Error) - }.stateIn(viewModelScope, started = SharingStarted.WhileSubscribed(5000), initialValue = MatchUiState.Loading) - - fun saveMatchCode(code: String) { - savedStateHandle[MATCH_CODE] = code - } - - companion object { - private const val MATCH_CODE = "matchCode" - - // id: 65c27d3232e6054951260d3d, code: V3H5, device : bbb - // id: 65c27d8b32e6054951260d3e, code: 6V2Q, device: ccc - private val MOCK_MATCHING = Matching( - profile = Profile().copy( - name = "abc", - job = Job.DEVELOPER, - clubs = listOf(Club.NEXTERS), - mbti = Mbti.INFP, - blood = Blood.A, - subways = listOf( - SubwayStation("목동역", lines = listOf(SubwayLine.FIVE)) - ) - ), - similarity = 80, - chemistrys = listOf( - Chemistry("대한민국 선수분들", "정말 고생 많으셨습니다...") - ), - recommends = listOf( - Recommend("지금은"), - Recommend("새벽"), - Recommend("3시"), - Recommend("48뷴") - ) - ) - } -} - -sealed class MatchUiState { - data object Loading : MatchUiState() - data object Error : MatchUiState() - data class Success(val matching: Matching) : MatchUiState() -} diff --git a/feature/match/src/main/java/com/moya/funch/navigation/MatchNavigatoin.kt b/feature/match/src/main/java/com/moya/funch/navigation/MatchNavigatoin.kt deleted file mode 100644 index f4d59192..00000000 --- a/feature/match/src/main/java/com/moya/funch/navigation/MatchNavigatoin.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.moya.funch.navigation - -import androidx.navigation.NavController -import androidx.navigation.NavGraphBuilder -import androidx.navigation.NavOptions -import androidx.navigation.NavType -import androidx.navigation.compose.composable -import androidx.navigation.navArgument -import com.moya.funch.MatchRoute - -private const val MATCH_ROUTE = "match/{code}" -private const val MEMBER_CODE_KEY = "code" -private const val NO_MEMBER_CODE = "no member code" - -fun NavController.navigateToMatching(memberCode: String, navOptions: NavOptions? = null) = - navigate(createMatchRoute(memberCode), navOptions) - -fun NavGraphBuilder.matchingScreen(onClose: () -> Unit) { - composable( - route = MATCH_ROUTE, - arguments = listOf( - navArgument(MEMBER_CODE_KEY) { - type = NavType.StringType - defaultValue = NO_MEMBER_CODE - } - ) - ) { backStackEntry -> - val code = backStackEntry.arguments?.getString(MEMBER_CODE_KEY) ?: NO_MEMBER_CODE - MatchRoute(code = code, onClose = onClose) - } -} - -private fun createMatchRoute(memberCode: String) = MATCH_ROUTE.replace("{$MEMBER_CODE_KEY}", memberCode) diff --git a/feature/onboarding/.gitignore b/feature/onboarding/.gitignore new file mode 100644 index 00000000..42afabfd --- /dev/null +++ b/feature/onboarding/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/feature/onboarding/build.gradle.kts b/feature/onboarding/build.gradle.kts new file mode 100644 index 00000000..0c27b069 --- /dev/null +++ b/feature/onboarding/build.gradle.kts @@ -0,0 +1,15 @@ +plugins { + alias(libs.plugins.funch.feature) + alias(libs.plugins.funch.compose) +} + +android { + namespace = "com.moya.funch.onboarding" +} + +dependencies { + implementation(projects.core.designsystem) + implementation(projects.core.domain) + + implementation(libs.compose.lottie) +} diff --git a/feature/onboarding/proguard-rules.pro b/feature/onboarding/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/feature/onboarding/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/feature/onboarding/src/main/AndroidManifest.xml b/feature/onboarding/src/main/AndroidManifest.xml new file mode 100644 index 00000000..76073216 --- /dev/null +++ b/feature/onboarding/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + + diff --git a/feature/onboarding/src/main/java/com/moya/funch/onboarding/OnBoardingScreen.kt b/feature/onboarding/src/main/java/com/moya/funch/onboarding/OnBoardingScreen.kt new file mode 100644 index 00000000..d437f324 --- /dev/null +++ b/feature/onboarding/src/main/java/com/moya/funch/onboarding/OnBoardingScreen.kt @@ -0,0 +1,97 @@ +package com.moya.funch.onboarding + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import com.airbnb.lottie.compose.LottieAnimation +import com.airbnb.lottie.compose.LottieCompositionSpec +import com.airbnb.lottie.compose.LottieConstants +import com.airbnb.lottie.compose.rememberLottieComposition +import com.moya.funch.component.FunchButtonType +import com.moya.funch.component.FunchMainButton +import com.moya.funch.onboarding.theme.Gray300 +import com.moya.funch.onboarding.theme.Gray900 +import com.moya.funch.onboarding.theme.White +import com.moya.funch.theme.FunchTheme + +@Composable +internal fun OnBoardingScreen(onNavigateToCreateProfile: () -> Unit) { + Column( + modifier = Modifier + .background(Gray900) + .fillMaxSize() + .padding(horizontal = 37.dp), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text( + text = stringResource(id = R.string.onboarding_sub_title), + color = Gray300, + style = FunchTheme.typography.b + ) + Spacer(modifier = Modifier.height(2.dp)) + Text( + text = stringResource(id = R.string.onboarding_title), + color = White, + style = FunchTheme.typography.t1 + ) + Spacer(modifier = Modifier.height(48.dp)) + OnBoardingLottie() + Spacer(modifier = Modifier.height(48.dp)) + Text( + text = stringResource(id = R.string.profile_create_recommend), + color = Gray300, + style = FunchTheme.typography.b + ) + Spacer(modifier = Modifier.height(8.dp)) + FunchMainButton( + buttonType = FunchButtonType.Medium, + onClick = onNavigateToCreateProfile, + text = stringResource(id = R.string.profile_create_btn_text), + contentHorizontalPadding = 24.dp + ) + } +} + +@Composable +private fun OnBoardingLottie() { + val composition by rememberLottieComposition( + LottieCompositionSpec.RawRes( + R.raw.temp_lottie + ) + ) + + Box( + modifier = Modifier + .fillMaxWidth() + .height(185.dp), + contentAlignment = Alignment.TopCenter + ) { + LottieAnimation( + composition = composition, + iterations = LottieConstants.IterateForever + ) + } +} + +@Composable +@Preview +private fun Preview() { + FunchTheme { + OnBoardingScreen({}) + } +} diff --git a/feature/onboarding/src/main/java/com/moya/funch/onboarding/navigation/OnBoardingNavigation.kt b/feature/onboarding/src/main/java/com/moya/funch/onboarding/navigation/OnBoardingNavigation.kt new file mode 100644 index 00000000..5fbb12ff --- /dev/null +++ b/feature/onboarding/src/main/java/com/moya/funch/onboarding/navigation/OnBoardingNavigation.kt @@ -0,0 +1,13 @@ +package com.moya.funch.onboarding.navigation + +import androidx.navigation.NavGraphBuilder +import androidx.navigation.compose.composable +import com.moya.funch.onboarding.OnBoardingScreen + +const val ON_BOARDING_ROUTE = "home" + +fun NavGraphBuilder.onBoardingScreen(onNavigateToCreateProfile: () -> Unit) { + composable(route = ON_BOARDING_ROUTE) { + OnBoardingScreen(onNavigateToCreateProfile) + } +} diff --git a/feature/onboarding/src/main/java/com/moya/funch/onboarding/theme/OnBoardingColors.kt b/feature/onboarding/src/main/java/com/moya/funch/onboarding/theme/OnBoardingColors.kt new file mode 100644 index 00000000..28470440 --- /dev/null +++ b/feature/onboarding/src/main/java/com/moya/funch/onboarding/theme/OnBoardingColors.kt @@ -0,0 +1,18 @@ +package com.moya.funch.onboarding.theme + +import androidx.compose.ui.graphics.Color + +internal val Coral500 = Color(0xFFF86E6F) +internal val Lemon500 = Color(0xFFFFE83B) +internal val Lemon600 = Color(0xFFE1CA13) +internal val Lemon900 = Color(0xFF90720A) +internal val Yellow500 = Color(0xFFFFD240) +internal val Yellow600 = Color(0xFFE1B012) +internal val White = Color(0xFFFFFFFF) +internal val Gray900 = Color(0xFF151515) +internal val Gray800 = Color(0xFF242627) +internal val Gray700 = Color(0xFF2C2C2C) +internal val Gray600 = Color(0xFF363636) +internal val Gray500 = Color(0xFF404040) +internal val Gray400 = Color(0xFF6D6D6D) +internal val Gray300 = Color(0xFF9B9B9B) diff --git a/feature/onboarding/src/main/res/raw/temp_lottie.json b/feature/onboarding/src/main/res/raw/temp_lottie.json new file mode 100644 index 00000000..3629e7e1 --- /dev/null +++ b/feature/onboarding/src/main/res/raw/temp_lottie.json @@ -0,0 +1,3776 @@ +{ + "v": "5.9.0", + "fr": 24, + "ip": 0, + "op": 120, + "w": 4096, + "h": 4096, + "nm": "main", + "ddd": 0, + "assets": [ + { + "id": "image_0", + "w": 87, + "h": 319, + "u": "", + "p": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAAE/BAMAAADBNkLcAAAAJHpUWHRDcmVhdG9yAAAImXNMyU9KVXBMK0ktUnBNS0tNLikGAEF6Bs5qehXFAAAACXBIWXMAAAABAAAAAQBPJcTWAAAAHlBMVEVHcEz/Zmb/Zmb/Zmb/ZWX/Zmb/ZGT/Zmb/ZWX/Zmbi1+3jAAAACXRSTlMAnB7cZLtEgO+DMltwAAADwUlEQVRo3u3bwW+TYBzG8Rda6Hrr4tT0hk6NveESD73VbJp4a/TEDaeJ4daT2ltdvPRWCm3xvxUYq8BK3+ehvNFDue4Twuj63fuWX4Xo/0YPS4gpjIUQ71EbMTiIsYfiVYwH/x77Me6ieBPjEwa3UBwyeB1jg8GaEryMcUcJXsS4jeIZg+0Ymygex1hXgnssFiieJHjO4CGIRwx2E+wwGI2dRWO0jImFY8fgIMWeArxK8UAB9nkMZnSTYjB2IY/BMq55DJZxyWOwjIsUtxVgO8WmAjxOsa4Ap11Ey5hhrIyTW4zFblQDY2V0a2CsjFYNjGX01mJljBgcZNjDUwf2Sx32MwyVcZPhEwZDZQwZvM6wwWCtcbzMcKdxvMgwVMYZg+0Mm3jqwNhRuFcHC6KLWOxGyrB7hx0G9/HUkXiKdxGLHYODLfYaxqstHjSM/Xq4i3cRil1YDxt46kis4akjcQfvIhQ7CttbbDaMx1usN4y3XUTKOPmL5wwe4l0ksYN3kcR9vIsknuJdBMoYMTjIYQ9PHdAvddjP4S7eRWCBmcctvIsAXuewwWCtUbzM4U6jeJHD0jLOGGznsImnDogdhXt1sSC6KI/dSBl289hhcB9PHYmneBflsWNwUMBeg3hVwIMGsV/A3QbxpoBbeBdJbOCpI7GGp47EHbyL0thR2C5gs0E8LmC9QVzooqyMkyKeM3iId5HEDt5FWewobB2Ap3gXJWWMGByUsIenThI7ddgv4S7eRckCs4xbeBcleF3CBoM1PHUk7jSGFyXcRheXUmyXsImnThI7CvcOwYLo4v7YjQ7CDp46Er85rT4scTyOx/E4HsfjPziefrm6eneNRPnZw+y/S/T6m8S/eFBYzz3aZz+V9wmvKk+uX+5YLI4q7I+dK9zd+nPFQnTXlTxH14vJ6qR6D3RxD+/ZIQQuehE7LkQfEhuxc+KDBV32CdUEP3Hh1NIT5xcz1HMr4AFoZNV5OH6O4JB4DHt3HdQ8EjjKteaH8foYTpeC1LwoPGp7w04pD1C8IkYv05fFQXFyO+YwnuB3LnnBTRzb+G1ONm+GMtw64rqYus+aMtzG8Yz7eyZwj3wPwu/u5IM4j+kG/CWLkP3CAjX8z02wg79hwAweh/xcLjcvCuXcZ+brLmrNfb3ErwKaObkg5goCi3h2fFP7KZ7GPAPaf+poRHxseFNeEk+xWyFdNX64vzR/UmV/HbpBEOJyp3WJTY1buV16W7Y/3X17tsJbLDrbv2/Tv37c3t4zC9k7fj89fXx1ff8nfwDcAiyf4nS7JgAAAABJRU5ErkJggg==", + "e": 1 + }, + { + "id": "image_1", + "w": 52, + "h": 52, + "u": "", + "p": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADQAAAA0BAMAAAA3VgbYAAAAJHpUWHRDcmVhdG9yAAAImXNMyU9KVXBMK0ktUnBNS0tNLikGAEF6Bs5qehXFAAAACXBIWXMAAAABAAAAAQBPJcTWAAAAJ1BMVEVHcEz///////////////////////////////////////////////8NopmKAAAADHRSTlMAINq7gJrvXUAQMHDMbGS2AAABLUlEQVQ4y53UvU8CQRAF8AFRQSxAWwrFwmiuMCYmxlCYWJlYGG0ppCVXSENNYuyNhbWdjYWdjY0cIIb3R3Hc597tPAped/lld2fvbkbESL1eEy3lKwfAQc+WZxdhDvMrn5BknLVdGBmZUnVNwn4qlTay+UpoJyfplgUnT7iM6NWSZFnbJjwGUlIEnYAaGnl0v3DHsio48mlNp5lPnzoN6VHAQMQhdMuqAB70Cy/yywoE/mSD0Vi2OTUYeZyGK5G3jJZUWGQ0knVGU6ky+pcCoxORFiH/v78h5HfZG7uWsBKniz5xWRXssBrpobiLtjTaC/vrR/lY0YBQ/rdu3MxWIZP3mKxlx+ng6OsnBeOhpY6GIJtmv1xkJ5th59akvIve+LUyRj/uT5tn3y/J8xwlOSVeQ6jCWwAAAABJRU5ErkJggg==", + "e": 1 + }, + { + "id": "image_2", + "w": 360, + "h": 312, + "u": "", + "p": "data:image/png;base64,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", + "e": 1 + }, + { + "id": "image_3", + "w": 152, + "h": 154, + "u": "", + "p": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJgAAACaBAMAAACnJJwZAAAAJHpUWHRDcmVhdG9yAAAImXNMyU9KVXBMK0ktUnBNS0tNLikGAEF6Bs5qehXFAAAACXBIWXMAAAABAAAAAQBPJcTWAAAAGFBMVEVHcEz/r5z/tJz/tJ3/tJ3/tJv/tJ3/tJ29jJVLAAAAB3RSTlMAF3HA5z6WDUwUKwAAApZJREFUaN7tmUFPwkAQhbeQ1ms1NVwJaLhCiHIF0XAticIVDNGrQOn+fdF2YwvdJTPzbvadzRfeOPN2dqsUT95ipVC62WgUzOtqrdugnzU6snSMQPl3WoNg3mKWsTSk8Ln28sKbnyWHZYXPlcoK39VF7SSsxazE0gc+6najNQhWLLzRF6LwRmNE4Y36iMIbrRCFN2ojCm8UIwrPg1kKbxQiCp8robAi7RYpNAIkzHO7JIbG0g2jzXkDCVMjJ2xLg7n/n8TQcPukhsYnEub0SQ0NHwlz+iRvGk1UaFwaKXpo9zBzfsknA2b3yVlblpgEuhCRnE3D6pO1tth8staWADTnzojkwSLY2mKPSOZdZ4QJDZdPJswHhYY9IhMuLMKEht0n/67Tw4SGNSL5d52K6BBcnHrStcXtc6yAPvt82HlESmABKDQynyMgTL1iQqM6IkMJ7CQiExHrJDqEDyQ+ElaOyFQBfe4U0OdBAX1upbAm4LWlMjr6UlgxIuWwpnRtsfgEPNEuMaFxGpGIJ9qZdG2p8pkgYA3Ue28xIlMILMKERsnnQQF9gmARJoGKETnGwLKI7CugTxTMB4XGX0TGKFiTCGtcig7K2rJcu32SQqOXxE6fe9rM7Jw+SbBjVQauKlBCw/vJUkcrBTtqX6b2/5j3QD6EJvY/mNNPbszMXOWnRoiAmQPtCTXKv1rjzrNjfwCMzmB7cHkTHiBhibQ/AuTCX76QT2SwFvCaenofT0NIz+Z6wV1ThUbP3jAEg1DxwMWf+KrXzzWkZ43RGNKzwkFoVT5+TiA9K5t4yzcY3iDYPkROID0rGAT79znG0Wf9qJlM1/KefR4+vnfu56GoZ5+HH53O27UozaJpBlG1atWqVatWrX+rb5b7z3ICi2VCAAAAAElFTkSuQmCC", + "e": 1 + }, + { + "id": "image_4", + "w": 864, + "h": 531, + "u": "", + "p": "data:image/png;base64,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", + "e": 1 + }, + { + "id": "comp_0", + "nm": "cir1", + "fr": 24, + "layers": [ + { + "ddd": 0, + "ind": 1, + "ty": 4, + "nm": "mouth", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 1, + "k": [ + { + "i": { + "x": 0.833, + "y": 0.833 + }, + "o": { + "x": 0.167, + "y": 0.167 + }, + "t": 27, + "s": [ + 1800, + 2618, + 0 + ], + "to": [ + -15.333, + -52, + 0 + ], + "ti": [ + -8.667, + 156, + 0 + ] + }, + { + "t": 32, + "s": [ + 1708, + 2306, + 0 + ] + } + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + -248, + 570, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 100, + 100, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "ind": 0, + "ty": "sh", + "ix": 1, + "ks": { + "a": 1, + "k": [ + { + "i": { + "x": 0.833, + "y": 0.833 + }, + "o": { + "x": 0.167, + "y": 0.167 + }, + "t": 27, + "s": [ + { + "i": [ + [ + 107.569, + 180.635 + ], + [ + 270, + -2 + ], + [ + 56, + -194 + ], + [ + -318, + -6 + ] + ], + "o": [ + [ + -106, + -178 + ], + [ + -246.651, + 1.827 + ], + [ + -84.742, + 293.569 + ], + [ + 318.001, + 6 + ] + ], + "v": [ + [ + 286, + 344 + ], + [ + -286, + 352 + ], + [ + -800, + 386 + ], + [ + -200, + 816 + ] + ], + "c": true + } + ] + }, + { + "t": 32, + "s": [ + { + "i": [ + [ + 14, + 104 + ], + [ + 150.204, + -9.103 + ], + [ + 0, + -54 + ], + [ + -144, + 10 + ] + ], + "o": [ + [ + -9.887, + -73.445 + ], + [ + -132, + 8 + ], + [ + 0, + 110.164 + ], + [ + 133.693, + -9.284 + ] + ], + "v": [ + [ + -92, + 518 + ], + [ + -286, + 352 + ], + [ + -436, + 510 + ], + [ + -244, + 694 + ] + ], + "c": true + } + ] + } + ], + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "fl", + "c": { + "a": 0, + "k": [ + 1, + 1, + 1, + 1 + ], + "ix": 4 + }, + "o": { + "a": 0, + "k": 100, + "ix": 5 + }, + "r": 1, + "bm": 0, + "nm": "Fill 1", + "mn": "ADBE Vector Graphic - Fill", + "hd": false + }, + { + "ty": "tr", + "p": { + "a": 0, + "k": [ + 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": 120, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 2, + "ty": 2, + "nm": "!", + "refId": "image_0", + "sr": 1, + "ks": { + "o": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0.833 + ], + "y": [ + 0.833 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 27, + "s": [ + 0 + ] + }, + { + "t": 32, + "s": [ + 100 + ] + } + ], + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 688, + 984, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 43.5, + 159.5, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 395.402, + 400, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "ip": 0, + "op": 120, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 3, + "ty": 2, + "nm": "nose", + "refId": "image_1", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 1, + "k": [ + { + "i": { + "x": 0.833, + "y": 0.833 + }, + "o": { + "x": 0.167, + "y": 0.167 + }, + "t": 27, + "s": [ + 1686, + 2220, + 0 + ], + "to": [ + -32.667, + -115.333, + 0 + ], + "ti": [ + -31.333, + 95.333, + 0 + ] + }, + { + "t": 32, + "s": [ + 1670, + 1900, + 0 + ] + } + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 26, + 26, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 350, + 350, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "ip": 0, + "op": 120, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 4, + "ty": 2, + "nm": "eye_2", + "refId": "image_1", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 1, + "k": [ + { + "i": { + "x": 0.833, + "y": 0.833 + }, + "o": { + "x": 0.167, + "y": 0.167 + }, + "t": 27, + "s": [ + 2114, + 2080, + 0 + ], + "to": [ + -32.667, + -101.333, + 0 + ], + "ti": [ + -21.333, + 89.333, + 0 + ] + }, + { + "t": 32, + "s": [ + 2098, + 1760, + 0 + ] + } + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 26, + 26, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 350, + 350, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "ip": 0, + "op": 120, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 5, + "ty": 2, + "nm": "eye_1", + "refId": "image_1", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 1, + "k": [ + { + "i": { + "x": 0.833, + "y": 0.833 + }, + "o": { + "x": 0.167, + "y": 0.167 + }, + "t": 27, + "s": [ + 1378, + 2014, + 0 + ], + "to": [ + -24.667, + -87.333, + 0 + ], + "ti": [ + -39.333, + 121.333, + 0 + ] + }, + { + "t": 32, + "s": [ + 1362, + 1694, + 0 + ] + } + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 26, + 26, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 350, + 350, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "ip": 0, + "op": 120, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 6, + "ty": 4, + "nm": "arm_l", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 2304, + 3157.385, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 296, + 1109.385, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 100, + 100, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "ind": 0, + "ty": "sh", + "ix": 1, + "ks": { + "a": 0, + "k": { + "i": [ + [ + 0, + 0 + ], + [ + -568, + 904 + ] + ], + "o": [ + [ + 0, + 0 + ], + [ + 469.489, + -747.216 + ] + ], + "v": [ + [ + -584, + 1312 + ], + [ + 1096, + 640 + ] + ], + "c": false + }, + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "st", + "c": { + "a": 0, + "k": [ + 1, + 0.756862745098, + 0.380392156863, + 1 + ], + "ix": 3 + }, + "o": { + "a": 0, + "k": 100, + "ix": 4 + }, + "w": { + "a": 0, + "k": 180, + "ix": 5 + }, + "lc": 2, + "lj": 1, + "ml": 4, + "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": [ + 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": 120, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 7, + "ty": 2, + "nm": "phone", + "refId": "image_2", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 1110, + 3202, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 180, + 156, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 400, + 400, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "ip": 0, + "op": 120, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 8, + "ty": 4, + "nm": "face", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 2176, + 2000, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 0, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 100, + 100, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { + "a": 0, + "k": [ + 3032, + 3032 + ], + "ix": 2 + }, + "p": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 3 + }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse", + "hd": false + }, + { + "ty": "fl", + "c": { + "a": 0, + "k": [ + 1, + 0.839215686275, + 0.427450980392, + 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": [ + 292, + 84 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 100, + 100 + ], + "ix": 3 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "nm": "Transform" + } + ], + "nm": "Ellipse 1", + "np": 3, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 120, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 9, + "ty": 4, + "nm": "arm_r", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 908, + 2404, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + -1092, + 364, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 100, + 100, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "ind": 0, + "ty": "sh", + "ix": 1, + "ks": { + "a": 0, + "k": { + "i": [ + [ + 0, + 0 + ], + [ + -384, + 144 + ] + ], + "o": [ + [ + 0, + 0 + ], + [ + 384, + -144 + ] + ], + "v": [ + [ + -1296, + 696 + ], + [ + -888, + 32 + ] + ], + "c": false + }, + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "st", + "c": { + "a": 0, + "k": [ + 1, + 0.756862745098, + 0.380392156863, + 1 + ], + "ix": 3 + }, + "o": { + "a": 0, + "k": 100, + "ix": 4 + }, + "w": { + "a": 0, + "k": 180, + "ix": 5 + }, + "lc": 1, + "lj": 1, + "ml": 4, + "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": [ + 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": 120, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 10, + "ty": 2, + "nm": "Group 6992.png", + "cl": "png", + "refId": "image_3", + "sr": 1, + "ks": { + "o": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0.833 + ], + "y": [ + 0.833 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 27, + "s": [ + 100 + ] + }, + { + "t": 32, + "s": [ + 0 + ] + } + ], + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 616, + 2708, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 152, + 154, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0.667, + 0.667, + 0.667 + ], + "y": [ + 1, + 1, + 1 + ] + }, + "o": { + "x": [ + 0.333, + 0.333, + 0.333 + ], + "y": [ + 0, + 0, + 0 + ] + }, + "t": 0, + "s": [ + 400, + 400, + 100 + ] + }, + { + "i": { + "x": [ + 0.667, + 0.667, + 0.667 + ], + "y": [ + 1, + 1, + 1 + ] + }, + "o": { + "x": [ + 0.333, + 0.333, + 0.333 + ], + "y": [ + 0, + 0, + 0 + ] + }, + "t": 6, + "s": [ + 300, + 300, + 100 + ] + }, + { + "i": { + "x": [ + 0.667, + 0.667, + 0.667 + ], + "y": [ + 1, + 1, + 1 + ] + }, + "o": { + "x": [ + 0.333, + 0.333, + 0.333 + ], + "y": [ + 0, + 0, + 0 + ] + }, + "t": 12, + "s": [ + 400, + 400, + 100 + ] + }, + { + "i": { + "x": [ + 0.667, + 0.667, + 0.667 + ], + "y": [ + 1, + 1, + 1 + ] + }, + "o": { + "x": [ + 0.333, + 0.333, + 0.333 + ], + "y": [ + 0, + 0, + 0 + ] + }, + "t": 18, + "s": [ + 300, + 300, + 100 + ] + }, + { + "t": 24, + "s": [ + 400, + 400, + 100 + ] + } + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "ip": 0, + "op": 120, + "st": 0, + "bm": 0 + } + ] + }, + { + "id": "comp_1", + "nm": "clock", + "fr": 24, + "layers": [ + { + "ddd": 0, + "ind": 1, + "ty": 4, + "nm": "ancher", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 2048, + 2208, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 160, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 100, + 100, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "ind": 0, + "ty": "sh", + "ix": 1, + "ks": { + "a": 1, + "k": [ + { + "i": { + "x": 0.833, + "y": 0.833 + }, + "o": { + "x": 0.167, + "y": 0.167 + }, + "t": 12, + "s": [ + { + "i": [ + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ] + ], + "o": [ + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + -320, + -706 + ], + [ + 0, + 160 + ], + [ + -416, + -256 + ] + ], + "c": false + } + ] + }, + { + "t": 26, + "s": [ + { + "i": [ + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ] + ], + "o": [ + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + 0, + -762 + ], + [ + 0, + 160 + ], + [ + -416, + -256 + ] + ], + "c": false + } + ] + } + ], + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "st", + "c": { + "a": 0, + "k": [ + 1, + 0.878431372549, + 0.694117647059, + 1 + ], + "ix": 3 + }, + "o": { + "a": 0, + "k": 100, + "ix": 4 + }, + "w": { + "a": 0, + "k": 200, + "ix": 5 + }, + "lc": 1, + "lj": 3, + "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": [ + 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": 120, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 2, + "ty": 4, + "nm": "clock", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 2048, + 2048, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 0, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 70, + 70, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { + "a": 0, + "k": [ + 4096, + 4096 + ], + "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": [ + 1, + 0.666666666667, + 0.149019607843, + 1 + ], + "ix": 3 + }, + "o": { + "a": 0, + "k": 100, + "ix": 4 + }, + "w": { + "a": 0, + "k": 800, + "ix": 5 + }, + "lc": 1, + "lj": 1, + "ml": 4, + "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": [ + 100, + 100 + ], + "ix": 3 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "nm": "Transform" + } + ], + "nm": "Ellipse 1", + "np": 3, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 120, + "st": 0, + "bm": 0 + } + ] + }, + { + "id": "comp_2", + "nm": "cir2", + "fr": 24, + "layers": [ + { + "ddd": 0, + "ind": 1, + "ty": 4, + "nm": "Shape Layer 4", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 2024.014, + 2388, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + -77.986, + 340, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 94.306, + 100, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "ind": 0, + "ty": "sh", + "ix": 1, + "ks": { + "a": 0, + "k": { + "i": [ + [ + 0, + 0 + ], + [ + -480, + 0 + ], + [ + 0, + 0 + ] + ], + "o": [ + [ + 0, + 0 + ], + [ + 480, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + -592, + 204 + ], + [ + -32, + 520 + ], + [ + 484, + 208 + ] + ], + "c": false + }, + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "st", + "c": { + "a": 0, + "k": [ + 1, + 1, + 1, + 1 + ], + "ix": 3 + }, + "o": { + "a": 0, + "k": 100, + "ix": 4 + }, + "w": { + "a": 0, + "k": 180, + "ix": 5 + }, + "lc": 1, + "lj": 1, + "ml": 4, + "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": [ + 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": 120, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 2, + "ty": 4, + "nm": "Shape Layer 3", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 2026, + 2188, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + -336, + -56, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 100, + 100, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { + "a": 0, + "k": [ + 192, + 192 + ], + "ix": 2 + }, + "p": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 3 + }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse", + "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": [ + -336, + -56 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 100, + 100 + ], + "ix": 3 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "nm": "Transform" + } + ], + "nm": "Ellipse 1", + "np": 3, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 120, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 3, + "ty": 4, + "nm": "Shape Layer 2", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 2388, + 1992, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + -336, + -56, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 100, + 100, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { + "a": 0, + "k": [ + 192, + 192 + ], + "ix": 2 + }, + "p": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 3 + }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse", + "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": [ + -336, + -56 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 100, + 100 + ], + "ix": 3 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "nm": "Transform" + } + ], + "nm": "Ellipse 1", + "np": 3, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 120, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 4, + "ty": 4, + "nm": "Shape Layer 1", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 1664, + 1992, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + -336, + -56, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 100, + 100, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { + "a": 0, + "k": [ + 192, + 192 + ], + "ix": 2 + }, + "p": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 3 + }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse", + "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": [ + -336, + -56 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 100, + 100 + ], + "ix": 3 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "nm": "Transform" + } + ], + "nm": "Ellipse 1", + "np": 3, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 120, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 5, + "ty": 2, + "nm": "headsets", + "refId": "image_4", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 1, + "k": [ + { + "i": { + "x": 0.833, + "y": 0.833 + }, + "o": { + "x": 0.167, + "y": 0.167 + }, + "t": 36, + "s": [ + 2048, + -984, + 0 + ], + "to": [ + 0, + 432, + 0 + ], + "ti": [ + 0, + -432, + 0 + ] + }, + { + "t": 43, + "s": [ + 2048, + 1608, + 0 + ] + } + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 432, + 265.5, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 350, + 350, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "ip": 0, + "op": 120, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 6, + "ty": 4, + "nm": "face", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 2048, + 2076, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 140, + 28, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 103.785, + 103.785, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "d": 1, + "ty": "el", + "s": { + "a": 0, + "k": [ + 2536, + 2536 + ], + "ix": 2 + }, + "p": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 3 + }, + "nm": "Ellipse Path 1", + "mn": "ADBE Vector Shape - Ellipse", + "hd": false + }, + { + "ty": "fl", + "c": { + "a": 0, + "k": [ + 1, + 0.839215686275, + 0.427450980392, + 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": [ + 140, + 28 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 100, + 100 + ], + "ix": 3 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "nm": "Transform" + } + ], + "nm": "Ellipse 1", + "np": 3, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 120, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 7, + "ty": 4, + "nm": "arm 2", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 3480, + 2120, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + -1480, + 72, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + -100, + 100, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "ind": 0, + "ty": "sh", + "ix": 1, + "ks": { + "a": 1, + "k": [ + { + "i": { + "x": 0.833, + "y": 0.833 + }, + "o": { + "x": 0.167, + "y": 0.167 + }, + "t": 36, + "s": [ + { + "i": [ + [ + 0, + 0 + ], + [ + 218.376, + 168.552 + ], + [ + 35.926, + 452.67 + ] + ], + "o": [ + [ + 0, + 0 + ], + [ + -178.006, + -137.393 + ], + [ + -80, + -1008 + ] + ], + "v": [ + [ + -1064, + 576 + ], + [ + -1510.62, + 407.448 + ], + [ + -1896, + -432 + ] + ], + "c": false + } + ] + }, + { + "t": 43, + "s": [ + { + "i": [ + [ + 0, + 0 + ], + [ + 157.54, + 498.983 + ], + [ + -270.152, + 20.118 + ] + ], + "o": [ + [ + 0, + 0 + ], + [ + -69.613, + -220.49 + ], + [ + 752, + -56 + ] + ], + "v": [ + [ + -1064, + 576 + ], + [ + -1786.387, + 364.49 + ], + [ + -1480, + -256 + ] + ], + "c": false + } + ] + } + ], + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "st", + "c": { + "a": 0, + "k": [ + 1, + 0.756862745098, + 0.380392156863, + 1 + ], + "ix": 3 + }, + "o": { + "a": 0, + "k": 100, + "ix": 4 + }, + "w": { + "a": 0, + "k": 180, + "ix": 5 + }, + "lc": 1, + "lj": 1, + "ml": 4, + "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": [ + 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": 120, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 8, + "ty": 4, + "nm": "arm", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 568, + 2120, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + -1480, + 72, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 100, + 100, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "ind": 0, + "ty": "sh", + "ix": 1, + "ks": { + "a": 1, + "k": [ + { + "i": { + "x": 0.833, + "y": 0.833 + }, + "o": { + "x": 0.167, + "y": 0.167 + }, + "t": 36, + "s": [ + { + "i": [ + [ + 0, + 0 + ], + [ + 218.376, + 168.552 + ], + [ + 35.926, + 452.67 + ] + ], + "o": [ + [ + 0, + 0 + ], + [ + -178.006, + -137.393 + ], + [ + -80, + -1008 + ] + ], + "v": [ + [ + -1064, + 576 + ], + [ + -1510.62, + 407.448 + ], + [ + -1896, + -432 + ] + ], + "c": false + } + ] + }, + { + "t": 43, + "s": [ + { + "i": [ + [ + 0, + 0 + ], + [ + 157.54, + 498.983 + ], + [ + -270.152, + 20.118 + ] + ], + "o": [ + [ + 0, + 0 + ], + [ + -69.613, + -220.49 + ], + [ + 752, + -56 + ] + ], + "v": [ + [ + -1064, + 576 + ], + [ + -1786.387, + 364.49 + ], + [ + -1480, + -256 + ] + ], + "c": false + } + ] + } + ], + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "st", + "c": { + "a": 0, + "k": [ + 1, + 0.756862745098, + 0.380392156863, + 1 + ], + "ix": 3 + }, + "o": { + "a": 0, + "k": 100, + "ix": 4 + }, + "w": { + "a": 0, + "k": 180, + "ix": 5 + }, + "lc": 1, + "lj": 1, + "ml": 4, + "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": [ + 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": 120, + "st": 0, + "bm": 0 + } + ] + } + ], + "layers": [ + { + "ddd": 0, + "ind": 1, + "ty": 0, + "nm": "cir1", + "refId": "comp_0", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 1, + "k": [ + { + "i": { + "x": 0.833, + "y": 0.833 + }, + "o": { + "x": 0.167, + "y": 0.167 + }, + "t": 44, + "s": [ + 2048, + 2048, + 0 + ], + "to": [ + 0, + 680, + 0 + ], + "ti": [ + 0, + -680, + 0 + ] + }, + { + "t": 50, + "s": [ + 2048, + 6128, + 0 + ] + } + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 2048, + 2048, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 100, + 100, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "w": 4096, + "h": 4096, + "ip": 0, + "op": 50, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 2, + "ty": 0, + "nm": "clock", + "refId": "comp_1", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 1, + "k": [ + { + "i": { + "x": 0.833, + "y": 0.833 + }, + "o": { + "x": 0.167, + "y": 0.167 + }, + "t": 44, + "s": [ + 2048, + -2048, + 0 + ], + "to": [ + 0, + 682.667, + 0 + ], + "ti": [ + 0, + -682.667, + 0 + ] + }, + { + "i": { + "x": 0.833, + "y": 0.833 + }, + "o": { + "x": 0.167, + "y": 0.167 + }, + "t": 50, + "s": [ + 2048, + 2048, + 0 + ], + "to": [ + 0, + 0, + 0 + ], + "ti": [ + 0, + 0, + 0 + ] + }, + { + "i": { + "x": 0.833, + "y": 0.833 + }, + "o": { + "x": 0.167, + "y": 0.167 + }, + "t": 75, + "s": [ + 2048, + 2048, + 0 + ], + "to": [ + -684, + 0, + 0 + ], + "ti": [ + 684, + 0, + 0 + ] + }, + { + "t": 81, + "s": [ + -2056, + 2048, + 0 + ] + } + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 2048, + 2048, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 100, + 100, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "w": 4096, + "h": 4096, + "ip": 44, + "op": 81, + "st": 40, + "bm": 0 + }, + { + "ddd": 0, + "ind": 3, + "ty": 0, + "nm": "cir2", + "refId": "comp_2", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 1, + "k": [ + { + "i": { + "x": 0.833, + "y": 0.833 + }, + "o": { + "x": 0.167, + "y": 0.167 + }, + "t": 75, + "s": [ + 6128, + 2048, + 0 + ], + "to": [ + -680, + 0, + 0 + ], + "ti": [ + 680, + 0, + 0 + ] + }, + { + "t": 81, + "s": [ + 2048, + 2048, + 0 + ] + } + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 2048, + 2048, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 100, + 100, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "w": 4096, + "h": 4096, + "ip": 66, + "op": 120, + "st": 53, + "bm": 0 + } + ], + "markers": [] +} \ No newline at end of file diff --git a/feature/onboarding/src/main/res/values/strings.xml b/feature/onboarding/src/main/res/values/strings.xml new file mode 100644 index 00000000..b41ce7ae --- /dev/null +++ b/feature/onboarding/src/main/res/values/strings.xml @@ -0,0 +1,7 @@ + + + 친구와 프로필 매칭하기 + 우리 사이의 공통점을 찾아요 + 1분만에 프로필 만들고 매칭해보기! + 프로필 생성 시작🚀 + diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3a37166d..c1e713a2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -107,6 +107,7 @@ activity-compose = { group = "androidx.activity", name = "activity-compose", ver navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation" } hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "dagger-hilt-navigation-compose" } lifecycle-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycle" } +compose-lottie = { group = "com.airbnb.android", name = "lottie-compose", version.ref = "lottie" } # dagger-hilt hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "dagger-hilt" } diff --git a/settings.gradle.kts b/settings.gradle.kts index a5535105..14caf443 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -30,4 +30,5 @@ include(":core:data") // feature include(":feature:profile") include(":feature:home") - include(":feature:match") +include(":feature:match") +include(":feature:onboarding")