From e57079e0c564cf3dcea682dc83b85bd6ab0b2022 Mon Sep 17 00:00:00 2001 From: yuhaeun <65907001+yuhaeun-la@users.noreply.github.com> Date: Tue, 7 May 2024 15:26:33 +0900 Subject: [PATCH] =?UTF-8?q?Revert=20"UI=EC=88=98=EC=A0=95=20UI=EC=88=98?= =?UTF-8?q?=EC=A0=95=EC=9E=91=EC=97=85=20"=20(#274)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppIcon.appiconset/1024.png | Bin 60773 -> 33953 bytes .../Base.lproj/LaunchScreen.storyboard | 6 +- Projects/App/Resources/Lottie/mapPinBlue.json | 1 - Projects/App/Resources/appLogo2.png | Bin 23491 -> 0 bytes .../Core/Sources/Extension/UIColor+.swift | 27 --------- Projects/Core/Sources/Extension/UIView+.swift | 2 +- .../BusStopImage1.imageset/BusStopImage1.png | Bin 0 -> 6764 bytes .../BusStopImage1.imageset/Contents.json | 21 +++++++ .../BusStopImage2.imageset/BusStopImage2.png | Bin 0 -> 7875 bytes .../BusStopImage2.imageset/Contents.json | 21 +++++++ .../CarrotOrange.colorset/Contents.json | 36 ----------- .../ChangeBlue.colorset/Contents.json | 38 ------------ .../EmptyFavoriteImage.imageset/Contents.json | 21 +++++++ .../EmptyFavoriteImage.png | Bin 0 -> 46945 bytes .../Contents.json | 21 +++++++ .../EmptyFavoritesStars.png | Bin 0 -> 2737 bytes .../Gray1.colorset/Contents.json | 36 ----------- .../Gray2.colorset/Contents.json | 36 ----------- .../Gray3.colorset/Contents.json | 38 +----------- .../Gray4.colorset/Contents.json | 36 ----------- .../Gray5.colorset/Contents.json | 36 ----------- .../Gray6.colorset/Contents.json | 36 ----------- .../MainColor.colorset/Contents.json | 18 ------ .../MapBusStop.imageset/Contents.json | 12 ++++ .../MapBusStop.imageset/bigBusStop.png | Bin 0 -> 15877 bytes .../RemainingColor.colorset/Contents.json | 36 ----------- .../RouteTimeColor.colorset/Contents.json | 36 ----------- .../SettingColor.colorset/Contents.json | 36 ----------- .../Contents.json | 2 +- .../bigBusStop.imageset/bigBusStop.png | Bin 0 -> 15877 bytes .../Contents.json | 2 +- .../Assets.xcassets/bus.imageset/bus.png | Bin 0 -> 1615 bytes .../Contents.json | 2 +- .../Assets.xcassets/bus2.imageset/Vector.png | Bin 0 -> 1097 bytes .../busStop.imageset/Contents.json | 21 +++++++ .../busStop.imageset/busStop.png | Bin 0 -> 1021 bytes .../busStop2.imageset/Contents.json | 21 +++++++ .../busStop2.imageset/busStop2.png | Bin 0 -> 6076 bytes .../busStop3.imageset/Contents.json | 21 +++++++ .../busStop3.imageset/busStop3.png | Bin 0 -> 13814 bytes .../cell2.colorset/Contents.json | 56 ------------------ .../cellColor.colorset/Contents.json | 56 ------------------ .../mapPin.imageset/mapPin.png | Bin 6973 -> 0 bytes .../mapPinBlue.imageset/mapPinBlue.png | Bin 7056 -> 0 bytes .../mapPinGray.imageset/mapPinGray.png | Bin 7068 -> 0 bytes .../tabBarColor.colorset/Contents.json | 20 ------- .../DesignSystem/Sources/Appearance.swift | 13 ++-- .../DesignSystem/Sources/BottomButton.swift | 4 +- .../Sources/SearchBusStopBtn.swift | 7 ++- Projects/DesignSystem/Sources/UIColor +.swift | 36 ----------- .../Sources/UIViewController +.swift | 22 ------- .../Sources/View/EmptyRegularAlarmView.swift | 7 ++- .../Sources/View/RegularAlarmTVCell.swift | 20 ++++--- .../AddRegularAlarmViewController.swift | 13 ++-- .../RegularAlarmViewController.swift | 5 +- .../Sources/View/BusStopInfoHeaderView.swift | 12 ++-- .../Sources/View/BusTableViewCell.swift | 2 +- .../RegularAlarmForBusTableViewCell.swift | 2 +- .../BusStopViewController.swift | 47 ++++++--------- .../Sources/View/EmptyFavoritesView.swift | 2 +- .../Sources/View/FavoritesHeaderView.swift | 6 +- .../Sources/View/FavoritesTVCell.swift | 2 +- .../FavoritesViewController.swift | 10 ++-- .../NMapsClustreing/LeafMarkerUpdater.swift | 4 +- .../Sources/View/BusStopInformationView.swift | 28 +++++---- .../NearMapViewController.swift | 11 ++-- .../Sources/View/BusStopInfoView.swift | 4 +- .../Sources/View/Cell/SearchTVCell.swift | 2 +- .../Sources/View/Cell/SearchTVMapCell.swift | 4 +- .../View/SearchNearStopInformationView.swift | 15 ++--- .../Sources/View/SearchTextFieldView.swift | 11 +++- .../ViewController/SearchViewController.swift | 7 +-- .../Sources/View/SettingButton.swift | 6 +- .../AlarmSettingViewController.swift | 12 +++- .../PrivacyWebViewController.swift | 4 +- .../SettingsViewController.swift | 2 +- Projects/MainFeature/Sources/MainTab.swift | 6 +- .../Sources/TabBarCoordinator.swift | 2 +- 78 files changed, 306 insertions(+), 773 deletions(-) delete mode 100644 Projects/App/Resources/Lottie/mapPinBlue.json delete mode 100644 Projects/App/Resources/appLogo2.png create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/BusStopImage1.imageset/BusStopImage1.png create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/BusStopImage1.imageset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/BusStopImage2.imageset/BusStopImage2.png create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/BusStopImage2.imageset/Contents.json delete mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/ChangeBlue.colorset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/EmptyFavoriteImage.imageset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/EmptyFavoriteImage.imageset/EmptyFavoriteImage.png create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/EmptyFavoritesStars.imageset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/EmptyFavoritesStars.imageset/EmptyFavoritesStars.png create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/MapBusStop.imageset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/MapBusStop.imageset/bigBusStop.png rename Projects/DesignSystem/Resources/Assets.xcassets/{mapPinBlue.imageset => bigBusStop.imageset}/Contents.json (87%) create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/bigBusStop.imageset/bigBusStop.png rename Projects/DesignSystem/Resources/Assets.xcassets/{mapPin.imageset => bus.imageset}/Contents.json (89%) create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/bus.imageset/bus.png rename Projects/DesignSystem/Resources/Assets.xcassets/{mapPinGray.imageset => bus2.imageset}/Contents.json (87%) create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/bus2.imageset/Vector.png create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/busStop.imageset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/busStop.imageset/busStop.png create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/busStop2.imageset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/busStop2.imageset/busStop2.png create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/busStop3.imageset/Contents.json create mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/busStop3.imageset/busStop3.png delete mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/cell2.colorset/Contents.json delete mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/cellColor.colorset/Contents.json delete mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/mapPin.imageset/mapPin.png delete mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/mapPinBlue.imageset/mapPinBlue.png delete mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/mapPinGray.imageset/mapPinGray.png delete mode 100644 Projects/DesignSystem/Resources/Assets.xcassets/tabBarColor.colorset/Contents.json delete mode 100644 Projects/DesignSystem/Sources/UIColor +.swift delete mode 100644 Projects/DesignSystem/Sources/UIViewController +.swift diff --git a/Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/1024.png b/Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/1024.png index 0b0494da364ca076d38f5cd167e46736d00ebb8c..f0d1f7207a072e59f0a8c7a1a8dfabf94af6f959 100644 GIT binary patch literal 33953 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 z z4E-5S=zV%273HY=T|DSLanX4e#NacnAi#7G`Qsd{3knKnwYaK&qpRbmrOI+=X5TlX zSqrm|r)~UQ_FtWkAc%Se+vMe@h|8FC<{t2`whw7ltpqYfeLms3HvXD_StM^tS6L@y^uq=u>2qUN8`&jpz7uLb+3*p%K1jn*8R zzK$z!8?7y8U+}U{yis4Kb^1|hrKZ2E^=Dt}gDUa8->S9ozmNnn+-SWf+a*|wJ*Qht zf%G}Y$Lb^2ddxx&UT2D*x50Zfr-aKpHmkfxU0P5479KnNYX4GttCg!jy4AaP>1P#- z+I)3K7jHXnoUy}^!rN|P0@~M|3ru*C7c)e|B=v$!?aV0$)4}OJ`@ql9^DDn=Odg)r z+27CFmrNKnM)S0Fm=VcY`t-s8sJ-mpWDm zwD^89h^FOneTO}H#3RX_H$=*W5FM=!51I$EE^r< z!e%*5+N7k?-3RIET1M_53HGMUiBLXN$)b9g19Lk10)_=)TjDJ|)-f5;*02yyTHusX z+8#0)khlJ0rEhoMOL}JCk0^LWv42Z!m{K7brJbJ(5kvK)00wt^VEu(X0~owkHF+cz zBCplOqHqtDV$O*DYFmDB>mtOY35yV`Bqgl<5$F^?r*fhp&Nr|*xwSyu?UcyIT=()h zPtTv*7MH~?LPjV;W)e1&>OcVirj2m~>R}Nu%Rdd=L>6U3aG?`qD&TMq}m)T=qvA; z;~zVG>F3Ro$B4kuK_1&;USMyPvVh6rC1+W|Mm>1-
_MaL?D$DQfeBn!e&Sd0*H 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

w0(Ly0SLO)Z zeh#K-eTh-3T8-$vdH(QPPh6zu{@(Scm~C@$_DhY7>6G|gHB5^Co zBOoWFzs^fwdW8uskCdWps}&9nf`HMu5#s%N2Dr=Z2F-+=>HfF*I|Ss8{dZ|E z)pEC%rS76%rpkYdT;UJi=Nt0nKe(LXt42B;EO9Bb0hO0fIM~{%PWYD8VN3WKH2xXC zB*KIn?x+t)agh-;NtP#k&h{p%sZDn)&V!OVPWnYr%s8gOOH>%v1yO$%W~|%^e&r7r zl!p>o8hgGWQfvZniwRx%*t9V>RS%E`>-(I!f z>t^;xx9i;=1J1SAgBo}!wEaqTNDGiu44g;A%n8M>Sm{1RK>xfk8bBxx+bpve09YUbN(LG{5fVr9cg)!ev;9Oq}=fGZXI za?TDz0x!R?PI3%+3yBT0&UNT1$POV7ORg0=Q7riyivF;?J$xCQ#=8RG7WoO4qrF+= zD__M5XZx0vG3!#FjYs_jan8qIUJKIjvOMTg_Wc?b>Ot=HyelF%-lmhwR&FB0nYjAq ztwU2aGw0N3qoY}sH0Nqt4sddTl09#d97dc)KJ1WEqE$UaRMmzrD)&Z*;zo{TT9+R` zVb{1aY9_t3<;+s?uBBsK6BBq%lyEuW4neiujC?1*a&s10bVHi!c9l^CA=)A=;!a1E zYd&koAZOgLErMj!2Q7n(F-w3a9`yIc!FvvMx+6WtVX8I?6^Wv+Sob5qsC{8_M+~xY6i{8TNch;zx0riGe8f~{*V$+(dCY~e+?pqkdjU| zS`eyTJWZVA04n?)+*~e{P`(@y@<(6hRGOu+6{kr%)fil2Y&VmP>Lc@6+?4dXpI}N% zu@EQS-N*1AnIWRg6x)G&S0E$^B#M1x1Lv5cr~yGlc}N2mLYg~WKhPZhc}02P1}Y8r z%eepgA?0m0P%W|*)0F@I_U|uR0l#bwDx~?}x97wJpmSp|ie2?zO~YxyO$6;jq5l~} z5Zn&DU1ZApb%*rt_$~n*>yp5QUvBz;-)aCQSHlbb>&oEYre9u#LoZ>*^ncCjpSkD( zHCnHRdWoXE{5!pWUBv(Mwii%KFRxzezdxkR=phRW^bl_N$N#?l6C95}*Mj!`9TsIq zznA!*<^R3J|Do{TRQ%5=`^_l+VIsd7#cxLOTik)u@PDUK{FD;?1A-XaDHs92bb;S| z`8Qwwt-yg$#os#e-@@p(8S)=<=Kqc_|K`R2s6xN&=ifT=Zyou!zXJZ-CG;;>_|1#| m@!tLRy8YwD)H9hNQ)ka+A7OvuLx8})TQ_xX6koIa - + @@ -25,7 +25,7 @@ - + @@ -38,6 +38,6 @@ - + diff --git a/Projects/App/Resources/Lottie/mapPinBlue.json b/Projects/App/Resources/Lottie/mapPinBlue.json deleted file mode 100644 index 26b8a6a9..00000000 --- a/Projects/App/Resources/Lottie/mapPinBlue.json +++ /dev/null @@ -1 +0,0 @@ -{"nm":"02-B","mn":"","layers":[{"ty":4,"nm":"pin Outlines","mn":"","sr":1,"st":0,"op":90,"ip":0,"hd":false,"cl":"","ln":"","ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[42.579,115.457,0],"ix":1},"s":{"a":1,"k":[{"o":{"x":0.167,"y":0},"i":{"x":0.833,"y":1.444},"s":[100,100,100],"t":22},{"o":{"x":0.167,"y":0.073},"i":{"x":0.833,"y":0.99},"s":[92.917,112.992,100],"t":26},{"o":{"x":0.167,"y":-0.016},"i":{"x":0.833,"y":0.949},"s":[125.208,92.205,100],"t":29},{"o":{"x":0.167,"y":-0.209},"i":{"x":0.833,"y":0.967},"s":[97.643,103.464,100],"t":33},{"o":{"x":0.167,"y":-0.018},"i":{"x":0.811,"y":1.021},"s":[106.102,98,100],"t":38},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[100,100,100],"t":40}],"ix":6},"sk":{"a":0,"k":0},"p":{"a":0,"k":[183.71,143.456,0],"ix":2},"r":{"a":0,"k":0,"ix":10},"sa":{"a":0,"k":0},"o":{"a":0,"k":100,"ix":11}},"ef":[],"shapes":[{"ty":"gr","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Group","nm":"Group 1","ix":1,"cix":2,"np":2,"it":[{"ty":"sh","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Shape - Group","nm":"Path 1","ix":1,"d":1,"ks":{"a":0,"k":{"c":true,"i":[[0,7.781],[7.78,0],[0,-7.78],[-7.781,0]],"o":[[0,-7.78],[-7.781,0],[0,7.781],[7.78,0]],"v":[[14.089,0],[0,-14.088],[-14.089,0],[0,14.088]]},"ix":2}},{"ty":"fl","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Graphic - Fill","nm":"Fill 1","c":{"a":0,"k":[1,1,1,1],"ix":4},"r":1,"o":{"a":0,"k":100,"ix":5}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[42.624,42.283],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]},{"ty":"gr","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Group","nm":"Group 2","ix":2,"cix":2,"np":2,"it":[{"ty":"sh","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Shape - Group","nm":"Path 1","ix":1,"d":1,"ks":{"a":0,"k":{"c":true,"i":[[0,37.343],[23.454,0],[0,-23.455],[-1.368,0]],"o":[[0,-23.455],[-23.455,0],[0,37.343],[1.367,0]],"v":[[42.468,-14.644],[0,-57.113],[-42.469,-14.644],[0,57.113]]},"ix":2}},{"ty":"fl","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Graphic - Fill","nm":"Fill 1","c":{"a":0,"k":[0.356,0.4834,0.944,1],"ix":4},"r":1,"o":{"a":0,"k":100,"ix":5}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[42.468,57.113],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]}],"ind":1},{"ty":4,"nm":"line Outlines","mn":"","sr":1,"st":0,"op":90,"ip":0,"hd":false,"cl":"","ln":"","ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[17.389,6,0],"ix":1},"s":{"a":1,"k":[{"o":{"x":0.167,"y":0},"i":{"x":0.833,"y":1.733},"s":[100,100,100],"t":22},{"o":{"x":0.167,"y":0.195},"i":{"x":0.833,"y":0.987},"s":[60,100,100],"t":26},{"o":{"x":0.167,"y":-0.022},"i":{"x":0.833,"y":0.987},"s":[173,100,100],"t":29},{"o":{"x":0.158,"y":-0.067},"i":{"x":0.635,"y":0.714},"s":[81,100,100],"t":33},{"o":{"x":0.438,"y":-1.206},"i":{"x":0.811,"y":1.42},"s":[102.444,100,100],"t":38},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[100,100,100],"t":40}],"ix":6},"sk":{"a":0,"k":0},"p":{"a":0,"k":[183.6,144.956,0],"ix":2},"r":{"a":0,"k":0,"ix":10},"sa":{"a":0,"k":0},"o":{"a":0,"k":100,"ix":11}},"ef":[],"shapes":[{"ty":"gr","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Group","nm":"Group 1","ix":1,"cix":2,"np":2,"it":[{"ty":"sh","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Shape - Group","nm":"Path 1","ix":1,"d":1,"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[6,6],[28.779,6]]},"ix":2}},{"ty":"st","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Graphic - Stroke","nm":"Stroke 1","lc":2,"lj":2,"ml":1,"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":8,"ix":5},"d":[],"c":{"a":0,"k":[0.712,0.7675,0.968,1],"ix":3}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[0,0],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]}],"ind":2},{"ty":4,"nm":"horizontaal","mn":"","sr":1,"st":10,"op":100,"ip":10,"hd":false,"cl":"","ln":"","ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[183.5,120,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6},"sk":{"a":0,"k":0},"p":{"a":0,"k":[183.5,120,0],"ix":2},"r":{"a":0,"k":0,"ix":10},"sa":{"a":0,"k":0},"o":{"a":0,"k":100,"ix":11}},"ef":[],"shapes":[{"ty":"gr","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Group","nm":"Group 3","ix":1,"cix":2,"np":2,"it":[{"ty":"sh","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Shape - Group","nm":"Path 1","ix":1,"d":1,"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[99.736,145.12],[265.745,145.12]]},"ix":2}},{"ty":"st","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Graphic - Stroke","nm":"Stroke 1","lc":1,"lj":1,"ml":10,"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":8,"ix":5},"d":[],"c":{"a":0,"k":[1,1,1,1],"ix":3}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[0,0],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]},{"ty":"tm","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Filter - Trim","nm":"Trim Paths 1","ix":2,"e":{"a":1,"k":[{"o":{"x":0.496,"y":0},"i":{"x":0.521,"y":1},"s":[0],"t":21},{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[100],"t":33},{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[100],"t":73},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[100],"t":84}],"ix":2},"o":{"a":0,"k":0,"ix":3},"s":{"a":1,"k":[{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[0],"t":21},{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[0],"t":33},{"o":{"x":0.426,"y":0},"i":{"x":0.518,"y":1},"s":[0],"t":73},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[100],"t":84}],"ix":1},"m":1}],"ind":3},{"ty":4,"nm":"verticaal","mn":"","sr":1,"st":0,"op":90,"ip":0,"hd":false,"cl":"","ln":"","ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[183.5,120,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6},"sk":{"a":0,"k":0},"p":{"a":0,"k":[183.5,120,0],"ix":2},"r":{"a":0,"k":0,"ix":10},"sa":{"a":0,"k":0},"o":{"a":0,"k":100,"ix":11}},"ef":[],"shapes":[{"ty":"gr","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Group","nm":"Group 2","ix":1,"cix":2,"np":2,"it":[{"ty":"sh","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Shape - Group","nm":"Path 1","ix":1,"d":1,"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[209.609,41.667],[209.609,200.667]]},"ix":2}},{"ty":"st","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Graphic - Stroke","nm":"Stroke 1","lc":1,"lj":1,"ml":10,"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":8,"ix":5},"d":[],"c":{"a":0,"k":[1,1,1,1],"ix":3}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[0,0],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]},{"ty":"tm","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Filter - Trim","nm":"Trim Paths 1","ix":2,"e":{"a":1,"k":[{"o":{"x":0.427,"y":0},"i":{"x":0.437,"y":1},"s":[100],"t":11},{"o":{"x":0.333,"y":0},"i":{"x":0.833,"y":1},"s":[0],"t":23},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[0],"t":63},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[0],"t":75}],"ix":2},"o":{"a":0,"k":0,"ix":3},"s":{"a":1,"k":[{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[100],"t":11},{"o":{"x":0.167,"y":0},"i":{"x":0.667,"y":1},"s":[100],"t":23},{"o":{"x":0.333,"y":0},"i":{"x":0.412,"y":1},"s":[100],"t":63},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[0],"t":75}],"ix":1},"m":1}],"ind":4},{"ty":4,"nm":"bocht","mn":"","sr":1,"st":0,"op":90,"ip":0,"hd":false,"cl":"","ln":"","ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[183.5,120,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6},"sk":{"a":0,"k":0},"p":{"a":0,"k":[183.5,120,0],"ix":2},"r":{"a":0,"k":0,"ix":10},"sa":{"a":0,"k":0},"o":{"a":0,"k":100,"ix":11}},"ef":[],"shapes":[{"ty":"gr","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Group","nm":"Group 1","ix":1,"cix":2,"np":2,"it":[{"ty":"sh","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Shape - Group","nm":"Path 1","ix":1,"d":1,"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0],[0,-20.781],[0,0],[1.889,-4.513]],"o":[[0,0],[-20.568,0],[0,0],[0,5.208],[0,0]],"v":[[62.182,-47.966],[-22.005,-47.966],[-59.249,-10.339],[-59.249,33.285],[-62.182,47.967]]},"ix":2}},{"ty":"st","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Graphic - Stroke","nm":"Stroke 1","lc":1,"lj":1,"ml":10,"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":8,"ix":5},"d":[],"c":{"a":0,"k":[1,1,1,1],"ix":3}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[204.09,147.818],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]},{"ty":"tm","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Filter - Trim","nm":"Trim Paths 1","ix":2,"e":{"a":1,"k":[{"o":{"x":0.444,"y":0},"i":{"x":0.429,"y":1},"s":[100],"t":11},{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[0],"t":23},{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[0],"t":72},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[0],"t":84}],"ix":2},"o":{"a":0,"k":0,"ix":3},"s":{"a":1,"k":[{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[100],"t":11},{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[100],"t":23},{"o":{"x":0.435,"y":0},"i":{"x":0.514,"y":1},"s":[100],"t":72},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[0],"t":84}],"ix":1},"m":1}],"ind":5},{"ty":4,"nm":"blauw","mn":"","sr":1,"st":9,"op":99,"ip":9,"hd":false,"cl":"","ln":"","ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[183.5,120,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6},"sk":{"a":0,"k":0},"p":{"a":0,"k":[183.5,117,0],"ix":2},"r":{"a":0,"k":0,"ix":10},"sa":{"a":0,"k":0},"o":{"a":1,"k":[{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[0],"t":20},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[100],"t":32},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[100],"t":63},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[0],"t":75}],"ix":11}},"ef":[],"shapes":[{"ty":"gr","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Group","nm":"Group 5","ix":1,"cix":2,"np":2,"it":[{"ty":"sh","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Shape - Group","nm":"Path 1","ix":1,"d":1,"ks":{"a":0,"k":{"c":true,"i":[[12.741,-1.208],[-4.334,-45.689],[-1.422,-4.92],[0,0],[0,0],[-20.569,0],[0,0],[0,0]],"o":[[-45.689,4.334],[0.502,5.285],[0,0],[0,0],[0,-20.781],[0,0],[0,0],[-11.268,-4.122]],"v":[[21.165,-52.344],[-53.715,38.232],[-50.785,53.551],[-9.253,53.551],[-9.253,47.764],[27.99,10.136],[58.049,10.136],[57.512,-47.688]]},"ix":2}},{"ty":"fl","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Graphic - Fill","nm":"Fill 1","c":{"a":0,"k":[0.3765,0.4706,0.8196,1],"ix":4},"r":1,"o":{"a":0,"k":100,"ix":5}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[154.094,89.716],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]},{"ty":"tm","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Filter - Trim","nm":"Trim Paths 1","ix":2,"e":{"a":1,"k":[{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[0],"t":20},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[100],"t":32},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[100],"t":63},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[100],"t":75}],"ix":2},"o":{"a":0,"k":0,"ix":3},"s":{"a":1,"k":[{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[0],"t":20},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[0],"t":32},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[0],"t":63},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[100],"t":75}],"ix":1},"m":1}],"ind":6},{"ty":4,"nm":"groen","mn":"","sr":1,"st":10,"op":100,"ip":10,"hd":false,"cl":"","ln":"","ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[183.5,120,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6},"sk":{"a":0,"k":0},"p":{"a":0,"k":[183.5,117,0],"ix":2},"r":{"a":0,"k":0,"ix":10},"sa":{"a":0,"k":0},"o":{"a":1,"k":[{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[1],"t":21},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[100],"t":33},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[100],"t":64},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[0],"t":76}],"ix":11}},"ef":[],"shapes":[{"ty":"gr","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Group","nm":"Group 4","ix":1,"cix":2,"np":2,"it":[{"ty":"sh","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Shape - Group","nm":"Path 1","ix":1,"d":1,"ks":{"a":0,"k":{"c":true,"i":[[25.349,9.192],[0,0],[0,0]],"o":[[0,0],[0,0],[-6.91,-27.008]],"v":[[-26.104,-28.726],[-26.104,28.726],[26.104,28.726]]},"ix":2}},{"ty":"fl","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Graphic - Fill","nm":"Fill 1","c":{"a":0,"k":[0.8856,0.8875,0.8944,1],"ix":4},"r":1,"o":{"a":0,"k":100,"ix":5}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[237.488,70.677],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]},{"ty":"tm","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Filter - Trim","nm":"Trim Paths 1","ix":2,"e":{"a":1,"k":[{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[0],"t":21},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[100],"t":33},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[100],"t":64},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[100],"t":76}],"ix":2},"o":{"a":0,"k":0,"ix":3},"s":{"a":1,"k":[{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[0],"t":21},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[0],"t":33},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[0],"t":64},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[100],"t":76}],"ix":1},"m":1}],"ind":7},{"ty":4,"nm":"circle Outlines","mn":"","sr":1,"st":0,"op":90,"ip":0,"hd":false,"cl":"","ln":"","ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[83.1,83.099,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6},"sk":{"a":0,"k":0},"p":{"a":0,"k":[183.355,117.117,0],"ix":2},"r":{"a":0,"k":0,"ix":10},"sa":{"a":0,"k":0},"o":{"a":0,"k":100,"ix":11}},"ef":[],"shapes":[{"ty":"gr","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Group","nm":"Group 1","ix":1,"cix":2,"np":2,"it":[{"ty":"sh","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Shape - Group","nm":"Path 1","ix":1,"d":1,"ks":{"a":0,"k":{"c":true,"i":[[-0.794,45.889],[45.886,0.794],[0.794,-45.888],[-45.888,-0.794]],"o":[[0.794,-45.888],[-45.889,-0.794],[-0.794,45.889],[45.887,0.794]],"v":[[83.087,1.437],[1.439,-83.087],[-83.087,-1.438],[-1.437,83.086]]},"ix":2}},{"ty":"fl","bm":0,"cl":"","ln":"","hd":false,"mn":"ADBE Vector Graphic - Fill","nm":"Fill 1","c":{"a":0,"k":[0.95,0.95,0.95,1],"ix":4},"r":1,"o":{"a":0,"k":100,"ix":5}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[83.1,83.099],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]}],"ind":8}],"ddd":0,"h":240,"w":368,"meta":{"a":"","k":"","d":"","g":"@lottiefiles/toolkit-js 0.22.1","tc":"#000000"},"v":"5.1.1","fr":30,"op":90,"ip":0,"assets":[]} \ No newline at end of file diff --git a/Projects/App/Resources/appLogo2.png b/Projects/App/Resources/appLogo2.png deleted file mode 100644 index 2a83b70196e0dca9afddf5faa8944be92cc197f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23491 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

ho=GMJ%u{73M~|_6bLz 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 diff --git a/Projects/Core/Sources/Extension/UIColor+.swift b/Projects/Core/Sources/Extension/UIColor+.swift index 96170c0b..534e4212 100644 --- a/Projects/Core/Sources/Extension/UIColor+.swift +++ b/Projects/Core/Sources/Extension/UIColor+.swift @@ -31,30 +31,3 @@ public extension UIColor { ) } } - -public extension UIColor { - static var adaptiveWhite: UIColor { - return UIColor { traitCollection in - if traitCollection.userInterfaceStyle == .dark { - return UIColor( - red: 20/255, - green: 20/255, - blue: 23/255, - alpha: 1.0 - ) - } else { - return UIColor.white - } - } - } - - static var adaptiveBlack: UIColor { - return UIColor { traitCollection in - if traitCollection.userInterfaceStyle == .dark { - return UIColor.white - } else { - return UIColor.black - } - } - } -} diff --git a/Projects/Core/Sources/Extension/UIView+.swift b/Projects/Core/Sources/Extension/UIView+.swift index b70ef7d8..babb4a10 100644 --- a/Projects/Core/Sources/Extension/UIView+.swift +++ b/Projects/Core/Sources/Extension/UIView+.swift @@ -25,7 +25,7 @@ public extension UIView { func addBorder( edges: UIRectEdge, - color: UIColor = .adaptiveBlack, + color: UIColor = .black, thickness: CGFloat = 1 ) { let border = CALayer() diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/BusStopImage1.imageset/BusStopImage1.png b/Projects/DesignSystem/Resources/Assets.xcassets/BusStopImage1.imageset/BusStopImage1.png new file mode 100644 index 0000000000000000000000000000000000000000..4f7d2462ab8184ce4654d1bd740a398a929b94b1 GIT binary patch literal 6764 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 literal 0 HcmV?d00001 diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/BusStopImage1.imageset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/BusStopImage1.imageset/Contents.json new file mode 100644 index 00000000..0e7b280a --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/BusStopImage1.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "BusStopImage1.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/BusStopImage2.imageset/BusStopImage2.png b/Projects/DesignSystem/Resources/Assets.xcassets/BusStopImage2.imageset/BusStopImage2.png new file mode 100644 index 0000000000000000000000000000000000000000..96da2e95190bd0f83e57d5de77efee5f13c3dc1e GIT binary patch literal 7875 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 literal 0 HcmV?d00001 diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/BusStopImage2.imageset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/BusStopImage2.imageset/Contents.json new file mode 100644 index 00000000..2f9241a7 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/BusStopImage2.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "BusStopImage2.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/CarrotOrange.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/CarrotOrange.colorset/Contents.json index 84c8da38..e32971a3 100644 --- a/Projects/DesignSystem/Resources/Assets.xcassets/CarrotOrange.colorset/Contents.json +++ b/Projects/DesignSystem/Resources/Assets.xcassets/CarrotOrange.colorset/Contents.json @@ -11,42 +11,6 @@ } }, "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "light" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x61", - "green" : "0x6E", - "red" : "0xEF" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x61", - "green" : "0x6E", - "red" : "0xEF" - } - }, - "idiom" : "universal" } ], "info" : { diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/ChangeBlue.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/ChangeBlue.colorset/Contents.json deleted file mode 100644 index 992b0576..00000000 --- a/Projects/DesignSystem/Resources/Assets.xcassets/ChangeBlue.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xD1", - "green" : "0x78", - "red" : "0x60" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.970", - "blue" : "0xD1", - "green" : "0x78", - "red" : "0x60" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/EmptyFavoriteImage.imageset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/EmptyFavoriteImage.imageset/Contents.json new file mode 100644 index 00000000..4d14b8ac --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/EmptyFavoriteImage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "EmptyFavoriteImage.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/EmptyFavoriteImage.imageset/EmptyFavoriteImage.png b/Projects/DesignSystem/Resources/Assets.xcassets/EmptyFavoriteImage.imageset/EmptyFavoriteImage.png new file mode 100644 index 0000000000000000000000000000000000000000..76b12f980bcaeb17bcf26c40638731a53ffb48fa GIT binary patch literal 46945 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

E9S4%c)svOI|G-l%Tt z!=Rs(6s>OVuM+hjCxV7_o5yWN8>}nj3_pJ){9rY0=1GLj`s-k)H>E z)_&Vs?A)4Q1bycGdwo_Vt5A5tY^_QEvWQY$nqEi{p2uHVp1u|j!SSzbp+hA4&TM;sTPMrySVFGBK{>jOLeCra#zNBYNgxb3@Q znmOH8rX+A~5Q3vHX!$_FLARxlsGV`#{Qj(DU1!qu)R2|sDPbi@UmbsFe!$1^OF&T^ zLEkXgnFCq-)`q!Li=MRso&Io=3VJUw2(0H4H{};%#)2)KC5XO+e9_s?)Yy}qT$IV1 zXidM5D;0FWC~d#{1tYnW`-3|m1A2DNf#>MxD4K*XF<&B_-ExdzD4I~>^XG3@M>}rJ zV8=BxBdefL*w&VoKrQp_s5n*4z+ilPFe+UnKo}XH#r#(y&GSzoBD+)sFnq1bxW*D# z@b5cRuQeNKB9Bj*MI4Y-hY`CIj=cnD^w|Va9XJ) zF56jECV}6|Eh6r0pR#v0B(ZV@{5a7P=fvDCP=h+su|s*BXg{ zrRdbI+uLm0g&`iFojrazOg{O8UcIcW%y_m$$@k@Qxa1HZ1}w^;K8gfcQ#A|Q z(H3y3(`&I>!Kaw^=+bdR7P^{A<}@)$ z7_hHI5c?3ox!Y4CH)S*#Ir%maq(xrrJDd^1EYI2BWi^?jm?M}@$YIImu*Tca(17JW z(Gr9KRXQtYVnP`j8X8T^6PxMSlOBqUe|6S*&hB$(w@{@cp{_pLBXsYHb;VQnHtMm| z>BYA*@$zX{@fot5(93yUk7xXQ^^fMa!BYW?@dgTv_%nCSEV90~>u++C=e+3k5kr~# zpe1sgIxte`lP*4wz)nNDf#9YytI?fW6>$KOfJ%Q(O$yRbry_1X(-$hYbDx>|8yj7L zWuo))w&VNS*Ly)X!f@{?Xl`Z2VLe5mEb{8A%(sUV85t?7WPjklK=8c-Jgu7jI|LDX zsnH4@EVaGjR72Ct?ZF?ZsXO=2V87nHx0-(Y(tWa07lLT@{^R8g+PS048S_>(FCk;5 zTHcHV4&_X$lcn4uP7T1CmAVA zEKzN#DX-O$1V{iPqgXr>^R-!y&T$snndm?apS|Pgql`e3{5Uld%XR(uP%g0Cex{(~ z%O5KVJydYE&oL>Ol%&ib5gi@fmQ&gdb_mC}YHDiY_h;*T2U#u;yGbgZ=iT?7J25;T znVHvH7s*(Ily1S%kNnQzEd!iD$@Myy?pzi9#9_m)zBSaUSFp)ig*Cu3s^-lP>A#pb zz))NJ?laP>DV{#vD__*2W%fb6IWhJ$_l-t%U%A``4T|!zEDy zaEMAyOrW=WYxrzY22Bv6NNJdU==D|1vDch37!*5D0zG}IV6}vp>U=V$=j@}t&0P;& zxMcggrT(FNSm$D;FeLbr5sfkgc

%n>!gz$kBFK5JkY_pdXIpq<|-m01nlJLf)K( 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 literal 0 HcmV?d00001 diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/EmptyFavoritesStars.imageset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/EmptyFavoritesStars.imageset/Contents.json new file mode 100644 index 00000000..844d4ba0 --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/EmptyFavoritesStars.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "EmptyFavoritesStars.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/EmptyFavoritesStars.imageset/EmptyFavoritesStars.png b/Projects/DesignSystem/Resources/Assets.xcassets/EmptyFavoritesStars.imageset/EmptyFavoritesStars.png new file mode 100644 index 0000000000000000000000000000000000000000..383323bc176e67beca2111f72785e552844bef36 GIT binary patch literal 2737 zcmV;i3QqNjP)qq%ju$!<983^(A$o`Bol8g9M8-uBjTV`dL{ zC&1)Z_m(}?J!_tC*y=0Y(HF(Py5LeO}obe6}gW$Ak1g)GBeV)rL7Z_)kgeLCnR_>Qz#Apy# zbjW}bnBAK70#*eRmvQ^q+`{rbGq-BO2#Kxm>)cI)0>}=ueLUOte$^4qH*=?!KZX$z zTeZW4P$GQb(5~zEuO_If%&{oWEN17@N(w0{h$B6q?qpiQ_!w!jlM6YS48KJS22ps%6e z<#>llTeJqft^s07Q%{$hFE9&*G*mNL6olCjqBN#GSBGG%#NY5inYZZ0PFHT={)6uBhWd1&pzBq;U`< zXm-2bO@7!O)%Fv~`mGKF^t+^=$<3sh4GP%Zz8^`hv6=a1el_F%-?@l_@0h)wug+Wz zb?M$`H>83$k+Tfyb{HDgh#8^~3*nRC`5X5#+Or70y-1@7P5PSD&DBFN zzqlN@I=mZ$f-isqaB}=B>e#VYJA0W+MXsfU*#?KAwX;!?$3T7W3imT3ji0EQ^j70e6(rO-qkuRkC zHUtz+8oE)$uzkpMFSDiKn+dez3xB#sZe>_dH4vh|WS??_OM-VD*SoM1`n>09|J)h8 z5uB$DexMR1@8S2moVx|eoj{)mofkb_EE8p{cj!MLHRFwOA}9ycjZ)$Jc@20nN9klp zc#i9=HV4UnRaSYdFT+jOHZ_@Q` z?+Y+$1YEDEDZUn6C*wmRnY}G8w znVMYO5-IU}+?j{bk>)A>hR&tez@gQSOs^hr$XyG%pqAbb>o$PE6GZidUQbF(TYh;P zN)Ln;!e#oPmPxm(w)xx&RjWQ$>gjY6N%w~ep9G8Zw9~-ZQ1gCNdNUkug$Q2a>3zyZ zViDv+7!bcA1qqTfp3y+Ba?Iy+XFJ0f=}m~B`vZkPzp!!(PwG0TIg#_S2(k1LrV6yH zFd(!F9#=Nj+xG?C&{nn+vpaM{!feTiZbA)L{L!!hfja-lu>}%R4phM4Thf8Gr(eH1 zJbf~a!N?p8M#j_M-j3xJAxh&&aRVWOAa49RlsX955IddJC)5DnVGW& z*$f&g?Zxw*zoWf5fj3x{JxCv(IrTaIwiPrWFv!B0^Es%Z;Q>hXwY&Xr)6n@pXcogD zR5KkZWzywQgD^R>xpvN}i;Ir?`s(cIKVF|*`lu!Bl%2Yc=cTNF2i@t=m?Ti`NJBc| zd=IJ+P&PE}uvAqn+%RF>8{4~inQ~45pWY=(*zih+umW8f1~NAVUS9Cgs`&>B3d~?flft z;=gOpDlI)rGte`rw4cs_3?dm??Zw2dKr5v=2Y0)JFAT0INE{PY3I-lA${_UlzgM1q?L3PTF6BlP+@(G!H=}`O=?3QZ zb@bN<>?S4^R%dQj1BPl$Wc{+EUJ%!VsJR>vs1-d_@~oi@Y1MW6jv2YFpIW}mYm;EJ`aR`5i$tR}ioprEV554`9b zIP2HxeKYMG>TWh#MKtQYIVamhP(2OOU*8;0uU56J(PY&G4J+RGJZ^71-rgv}2#BV3 zax0&r-oFeAkvi1SFEmrct@e;XiX}}-Z=-`xS9z%nsJ=l7l#nM zMAm6Vs;F8wkBXkcSMBSQnt8JQ;I{X9*i5JIF&Nu?@}G?@7;}2+d{hsYgaU<69s|zI z3r{K!O7z*U?@|?-kO{%~3m@fP00m%X@unwu$^RxzOzVxnePyRrA);3kJi= zj*l+h%jclWhaZR0`>o!bU*XBZK?oJTLNBLPSU_Q$P*2%Gk!#;s&L+}(%D%iChbPZH z!qtvYmeDMGZ(Z9h2uzk?E`2X@oqlPx+PM47a>~<01G`HGR#|`B+aXl=VeTa^af@af z1tL9D4+2^}j2IMU=+UK)$d%f-b1VA_<@+A}=~@+y-phk`$MMnrD1^^^^vCH2XiO^$ zF22r(`7cWBD9z*s5rM#3$~=;%_f_od@(ccH&kl rOh`ybNJvOXNJvOXNJvOX7$Ls^$$QtAs0ePc00000NkvXXu0mjf{}M+N literal 0 HcmV?d00001 diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Gray1.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Gray1.colorset/Contents.json index a6c414c1..6ced91c1 100644 --- a/Projects/DesignSystem/Resources/Assets.xcassets/Gray1.colorset/Contents.json +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Gray1.colorset/Contents.json @@ -11,42 +11,6 @@ } }, "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "light" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xF8", - "green" : "0xF8", - "red" : "0xF8" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xF8", - "green" : "0xF8", - "red" : "0xF8" - } - }, - "idiom" : "universal" } ], "info" : { diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Gray2.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Gray2.colorset/Contents.json index 77694c79..2cedebe3 100644 --- a/Projects/DesignSystem/Resources/Assets.xcassets/Gray2.colorset/Contents.json +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Gray2.colorset/Contents.json @@ -11,42 +11,6 @@ } }, "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "light" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xF2", - "green" : "0xF2", - "red" : "0xF2" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xE5", - "green" : "0xE5", - "red" : "0xE5" - } - }, - "idiom" : "universal" } ], "info" : { diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Gray3.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Gray3.colorset/Contents.json index bf13f44c..bdb682bc 100644 --- a/Projects/DesignSystem/Resources/Assets.xcassets/Gray3.colorset/Contents.json +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Gray3.colorset/Contents.json @@ -4,43 +4,7 @@ "color" : { "color-space" : "srgb", "components" : { - "alpha" : "0.960", - "blue" : "0xE4", - "green" : "0xE4", - "red" : "0xE4" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "light" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.960", - "blue" : "0xE4", - "green" : "0xE4", - "red" : "0xE4" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.860", + "alpha" : "1.000", "blue" : "0xE4", "green" : "0xE4", "red" : "0xE4" diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Gray4.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Gray4.colorset/Contents.json index 444f59ee..2e4a98b0 100644 --- a/Projects/DesignSystem/Resources/Assets.xcassets/Gray4.colorset/Contents.json +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Gray4.colorset/Contents.json @@ -11,42 +11,6 @@ } }, "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "light" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x8C", - "green" : "0x8C", - "red" : "0x8C" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.850", - "blue" : "0xFF", - "green" : "0xFF", - "red" : "0xFF" - } - }, - "idiom" : "universal" } ], "info" : { diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Gray5.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Gray5.colorset/Contents.json index 84264ecf..a52fff79 100644 --- a/Projects/DesignSystem/Resources/Assets.xcassets/Gray5.colorset/Contents.json +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Gray5.colorset/Contents.json @@ -11,42 +11,6 @@ } }, "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "light" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x7A", - "green" : "0x7A", - "red" : "0x7D" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.940", - "blue" : "0xFF", - "green" : "0xFF", - "red" : "0xFF" - } - }, - "idiom" : "universal" } ], "info" : { diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/Gray6.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/Gray6.colorset/Contents.json index 9056400f..b3b1303b 100644 --- a/Projects/DesignSystem/Resources/Assets.xcassets/Gray6.colorset/Contents.json +++ b/Projects/DesignSystem/Resources/Assets.xcassets/Gray6.colorset/Contents.json @@ -11,42 +11,6 @@ } }, "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "light" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x74", - "green" : "0x74", - "red" : "0x75" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.990", - "blue" : "0xFF", - "green" : "0xFF", - "red" : "0xFF" - } - }, - "idiom" : "universal" } ], "info" : { diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/MainColor.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/MainColor.colorset/Contents.json index 430710d1..f46b7133 100644 --- a/Projects/DesignSystem/Resources/Assets.xcassets/MainColor.colorset/Contents.json +++ b/Projects/DesignSystem/Resources/Assets.xcassets/MainColor.colorset/Contents.json @@ -11,24 +11,6 @@ } }, "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xFF", - "green" : "0xFF", - "red" : "0xFF" - } - }, - "idiom" : "universal" } ], "info" : { diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/MapBusStop.imageset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/MapBusStop.imageset/Contents.json new file mode 100644 index 00000000..e42be7ad --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/MapBusStop.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "bigBusStop.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/MapBusStop.imageset/bigBusStop.png b/Projects/DesignSystem/Resources/Assets.xcassets/MapBusStop.imageset/bigBusStop.png new file mode 100644 index 0000000000000000000000000000000000000000..a22e04006b6ddab48f61958a829a18aa1af84294 GIT binary patch literal 15877 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 literal 0 HcmV?d00001 diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/RemainingColor.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/RemainingColor.colorset/Contents.json index 3fae1647..c79b370c 100644 --- a/Projects/DesignSystem/Resources/Assets.xcassets/RemainingColor.colorset/Contents.json +++ b/Projects/DesignSystem/Resources/Assets.xcassets/RemainingColor.colorset/Contents.json @@ -11,42 +11,6 @@ } }, "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "light" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x81", - "green" : "0x81", - "red" : "0x8D" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.980", - "blue" : "0xF6", - "green" : "0xF3", - "red" : "0xF2" - } - }, - "idiom" : "universal" } ], "info" : { diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/RouteTimeColor.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/RouteTimeColor.colorset/Contents.json index 07a8905a..3eecd33d 100644 --- a/Projects/DesignSystem/Resources/Assets.xcassets/RouteTimeColor.colorset/Contents.json +++ b/Projects/DesignSystem/Resources/Assets.xcassets/RouteTimeColor.colorset/Contents.json @@ -11,42 +11,6 @@ } }, "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "light" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x5C", - "green" : "0x5C", - "red" : "0x64" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.930", - "blue" : "0xF4", - "green" : "0xF3", - "red" : "0xF2" - } - }, - "idiom" : "universal" } ], "info" : { diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/SettingColor.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/SettingColor.colorset/Contents.json index e27aad7e..98b0b6a4 100644 --- a/Projects/DesignSystem/Resources/Assets.xcassets/SettingColor.colorset/Contents.json +++ b/Projects/DesignSystem/Resources/Assets.xcassets/SettingColor.colorset/Contents.json @@ -11,42 +11,6 @@ } }, "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "light" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x3D", - "green" : "0x39", - "red" : "0x38" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xFF", - "green" : "0xFF", - "red" : "0xFF" - } - }, - "idiom" : "universal" } ], "info" : { diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/mapPinBlue.imageset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/bigBusStop.imageset/Contents.json similarity index 87% rename from Projects/DesignSystem/Resources/Assets.xcassets/mapPinBlue.imageset/Contents.json rename to Projects/DesignSystem/Resources/Assets.xcassets/bigBusStop.imageset/Contents.json index 5a20ea46..9e9b11c8 100644 --- a/Projects/DesignSystem/Resources/Assets.xcassets/mapPinBlue.imageset/Contents.json +++ b/Projects/DesignSystem/Resources/Assets.xcassets/bigBusStop.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "mapPinBlue.png", + "filename" : "bigBusStop.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/bigBusStop.imageset/bigBusStop.png b/Projects/DesignSystem/Resources/Assets.xcassets/bigBusStop.imageset/bigBusStop.png new file mode 100644 index 0000000000000000000000000000000000000000..a22e04006b6ddab48f61958a829a18aa1af84294 GIT binary patch literal 15877 zcmcJ$2UJsC*Dks#0R#m^ic$nbMY;_TkSaw{Iv8mIM2hqpN(2IeAV^U`1O$}cL+=oz zh*G77&_eGWLQirw@Av(ujB&=f_y5nmj^R$&S!?aJS9#`~&wSQMjrH-S}`%~@yAI;U&2BH1b^?A@uZYZ2g%E{x1!Y{p$uWY zkW$6U$XI_Kwc`#e~Y(>zyysm-{ z)U(eFeV66-I`^AewEuVXO<3~ckQB`7oI;-P_KGJ8wrv-Ve8>avR286zx+q`Yp%*~E zV;)q@2VY;>&J0K?0ScON2P@L3B7ELAAh??yb@gB+6;{Yv%uNZbX&In=eLORvHy}J~ z65jZ7XtZ~Qev|WW#$sm)JCZ7Day#$s*A!~ykmP(dU(dMGY^JD76jUV)<$$@F11;_| zOq>~+le9cE)RCf2bDHrTnQG`xvhPUo>gwhWqn3$Z|5oWDl;cU`Cle(v(h2F0m|{U#w(2jSe4EQLziT{x>45R$BS&mSgv+S28Lq^eeA_ zWmOFH63^06X$o{9vrd?6u)E$}VJPWw&zEy4dC`<80b$uE^|b~9 z)*6Rirv0jHDdXB#AU^hFMQh^~#$x`r^%_p1@O57kD_-5Rci}vgbaj@^#NVW`B9PD#msHrWAs3I_p0FIi(~4Cw^3hcOB8^xcuc*t zn!w)@Jelu8mZgVzML&7WRh$?MC3KZNORJsmo!Q3}J9dtb>T)s*x5VQ`i_9jlLpmfG z={%*^DaU~xg3!FMp5?)&P5R6C{1SA(mq7XI6Zw^|iU8Z@Nj@WarWaUv>~{iI#MD-2 zib81=s_VCi=S}fjTlya7y7uzkLtm$+hn@a_@LYA;%L^sf&vm%tH?sIDKu#XH^?LIA zC+YjBB8J9qiwvyiVGF}v~FyCNG8GYo8j`IzP zn+8uHO^Jl|2A7+X0X#tkH@@TBD9T^1TSH#Gg;vxXi6}FP0DbUe^4g;@B)V!-{$r9n zqYivyRLbN*b!PSYsCzP_;d$~8MY^ztX@fhEDQr@-MH4rpYen9do%p5721@dmbQH4l z2I}!Qf;lLWOSP)l6HghN-BV{-bS9vj+D-qW%EDfIm2!k4Z2j`@FF!A~UPdmJ-U#66 zykk7QnXXn_lEA>oSDEnleZwT3U0YLbhtoNQ*4tD(i4GU(7bOE$h05psYK|zjUoMs> zkC8=E7u)Mx;&r0|`aDv|%{fkrE9Dur;7(&wS7Q{4p3tyH`}SG>aQp!^bo*Vomwa#P z4IEGLvI~B(0AWqysbqr97+gTX&wW$`2b+_>T{6IZx279x{*KLJb@D1%v392dLXz+K0g;|O-){f_fR(-Rh;{I4N#8WjrGIaaMZ82kMj;hznDbrJZuKF7B8;()YNVp+PBuo6G8ACs($vahy&#zH z@aGzNj0yZgv3;N=B{J-+mYSJM~~9 zJ01Xz|zLkbEa8+U8t zLKDeS(QWb*-k)H!%oIYX*{dulip+_gX&MEJAmxBEB^i%2(*(J>)=`zbnMW*A%7+1lh&a>J_N0dXJu_P7DVEt8CgJ^!dBO$-2NOz+xZcnYMQ0nmh4y8G@^%b zoQx#lwX9zsIFbE;Hr3^&4CDrGYzHZ<7i`I&Csn^rQs*Xp<1Dq7TDYtRfY1CkNrXq& zs#;Vov={z^RXg%}6>*Jklw(9H5cn&Rp2oe;1)+lD2QB1|sWF!0#@CRB08O$0u28>> zj##KR`4u#eAFVb`5e#Dp?BsyL2qVBKxcNp-O$|n@To5DZC~%IP{jfht)f@~UwTp=a z^Z^Iz9&!Jpgwv!bkLH@Jlg-@K_kJIVNSkNFGB^31ozb?6m01Ur$b^fQtgl z3V=cfcBiqjnHxA-Y;KfbCl69RyERHI*rI+_=Kizi9M2F9@K|7Ms8?d2Z0nv3|Jpd9 z3$`CyD<q&u|(5*BsXr0(3usw+!nn@~NUtc>q#p&jlGZq&_deV?`C2h~kp*I@d%h zb#Ljp$YTIDmvErkW1vmTeCzvwmb|Io@m}B7bW4Rl!53xd>2=F)q}al3c_}@bzT1Ax z82(HYyD2P;>YjYMpHh18rJ;STfi;$=_u>?W_T1yZbs6|_df(576N5#j#$pY7pLUZN z&DG-sGxyiWPKNTKV)Ezr*06fJ3*DdX;ZY+spA5rn?omd2UD2J{eG*abKPyoKAAOy@ zyoy3EEJVka93(a@t~D$sCiB6IfLw5V)G6<@z25wcmi!jrLV^QV53Z2`xuB<~Ufq~e;egduxLoZo#stI&{<~P2bvL*z{zowf_xcm=w5O;MezEV=gcubrwm^H>xBic z^8_t)CuQfnsP)J-87;MXx&%XWeSW$x6VZ>m9CnQyxR$G#EUlhbV%h$Sh(B2Bdjtfj zu>IdZ`2YEpXwQXxH>$8ZM-y?hyGR$t4tC}BWW5i0bDBaRIeFSUQLq#LuZKgJlJYc4 z#JJLSz9Y`R5Y}LHLp@fzEu4iQsF(F21}5XRu}2a`kW{TVaoKNh&0RW=F zs6w4j^}}CqDH9T95tR~7QtiK=bIWk&cr&e&B?{Zv6VNh-^4!ZF_WXg+=jWhSqYaQ6ldS7kSpC%xNs&vVECx;*ukfpy0QQ)GG!?xelF z0WJHbzduInead#yUzEI*-XF2_oR5R9v|iHE{~6@ut7s|);l%IifuI*Cuj|1G`17JA zS6&ZfE$3#Z^b4Wt(=KpG+@fjc4yZ3`Jht;(AC1deGAZRhVS{=9L~r*d%Rm)#^s=M4 zDMcF(U!pU4Bfy5RHj;wxxub>M;G-5x)<}JFYVc)3G zxJq-m9~}@NkF3WJ8#nh>I^)2hcDS7x+47j}tO8sZ{!C%~BEV?Rrxvy6OuWReseie^ zwC=f0s$bD*3Y0=-wWsJ*hs~{rYglZXhdCj&$lC63O+MD~XGb5lRWP_CI2f%}9|&9J{x-taMA_ z_H1b9yzGpbHNM_fRO56FUg%0lFD|t#vn;oS%!C2R5uf!6j7O(P)h*h_)19Zu?mbdO zp0?|*fdlYUv}<@Vwdb|}k>_e*)v-NQ zYaHa;ZTiDb0kH79a?pwS!%ME949*E1>2y(E-2c>DC85H^#O=?G5>5tliWT33jl!HV z4C6vzgwIgX6LG2gx?z;ye(q&Gt|9D?u~1w7`mnwDqrKZI-jp>0OTW*)R?(^SU`wLrDO^u`~;2|9U( znXx+-flv(HN6;E)V0Q}NQeDvfHZr>B`WjMU2ZoWhj)vcc?%AkJ2176Qkn(p164vGIo9Rd9BB5al66C5v(HW*gTg?HNWmeaTbG0 z{B{iQqgdJyT9$s^P|g|BSW1uA+Q^UZSo<=rt3pt?bf_FNt&R0kVE$;{L0h5td|h1P zVK*)6%W4~g%_tB0J))!1>Di?8@SPbCf*NJV>(JQ^9n7sb+VV(P>i!@8)Pk$BzK18R z7?hbAg!WacsQqxkcKg*ghtr|Ny+@T%8quQ__W4j0%nntIjV&Xd+%L*=y40gkWOKyAdu_^f&Ax zU+`c_uJmqh!44DkP9S_cOoWfbK^%(7^C$1eA# zTHcf4XPJxjguKLKw*bii%T&u$doxQjx+xn*@<{q1qvh5=GPF|YX<0up) z$bs)`WC2GtHD5s(TAf5}vW%DEz)@X{_hUGL0W<(|6U3+(I@4N@?d*)7BKFNF-OTWv z&PFv@El8e#wk_p(q0t`*hwX5qAL6G-(hA$JO^7o1^!GM&HPvf%i{}Pp$$_b>WPpH9 zvAK6PgQWAMiKx}9S2RxIultpYs!w5xG`lrH-k`5_V`YeDlha{LuPL*u>)Fr3%%|}k zamCIRCL~~3NWl&qE+!F?apd~P0GdbGIKmwQxLs|7&)L7 zl2J1XsjfS}4Q{87|Ja(%wxETpJ)DV%d#uVC`p^819?M>RZ;hxz9EpKiBv26W48*3WKIR{QK)^S*c#N{@#+ zmN&)e?bqy!?^js7S`13Q1a|^*mBF5i7eaL|9TOBKQ^!m~?lvE=u8mcp*d?6`cptqx z-B|2SlI+DPFM+*dAdK%kz#<-@7gG@aRpL!V`IB$sRPXdl4jRuK^ARbs4ECp*D(y~E z<%mIX+PB@tUbY=xLgL#=EHDwwOdN;%X$7v!EdA)IJ24}LEl$ut7X*USc}oVFwc8>_ z<&Qt}Ywg>ER>#LKswX!sNP1kH+dvwxv_F( zGN4lBio^B!YT1x5Fceo4rcm%df3;45|MW<CGe*Zm5Pi=k2iAKE&O+UlV=XJ)f z1fJ!^iWMD^8WdFS&Q|S}LAE=&IkQ0Wr3$S@Xv*(ge;WMz2OaQns76DB%ZNV(QOCBG zcH|jAbC8HXv6TFkujO1&4Wes%5~=fTW8aU(`jpQ}Xen&|GOPxx#UY>q0y5!fEh{`- zv(P@zV%;sgR!GZ{^VoW$z8LcgCE|44DEUZs^XQqqq(gUiJaz#h=HvOEQGgOq9_5yi z)Sh>1W0u6EvP7Hfl{n}mdnr-0MK;_-IJ)k%lwPQv-hNZ~X{0@$BKS8*-u63uA16Ss z{&=uFattK9cx$w&Y(^L_+I=?}!P=K#m?h)oZtJf~I_b&9?yvZqu?b=I5t?$!?G+!| zIaiq4?&8P0+iz()%$>Ag%Job}&g$^D+!WcP9+Lix&G&8yv;^a-7v97#mIn2^BU6{}1LaKD0zrSG__e#mr0dqfh#pDiAT=ilGFx|FZDPf0 zZxikHT$R!+ovVziuHoH-QWbwrI{{^KGN5Ej>w{azbr>p zwy?=iM5_zm41>2T#| z3T&P68n3^xVH+mdZK>z7sMRroK2JwAKDqyK!emI#eh#i=V0okC#Iyfm#hzknk#r^@ zu;Vw67b#H$g@Cso6V1!}2EHu7?BgpxUWH)1Fqz$bAX(hRwJQ8RnzcVyu(7< zP&RkgfXv{9d7f5}r2FzeT)nu7HTfrDXKWTDK>kuo_R-DL?-rNXUboJ* z5%X-v+^~1GH<6`wxbj3Z)6wDQA$PY&1tli3{Lme^f?q^AR;uSH+^2k0RiGbypb8x= z!aTIpMBBVs=04TUi#zJ1H0JsG5RnP;G>v^H=$k?(@0`;KIDI%y{#qDF!BHZavGtyz zzckIVHd%`XIy{pq+}2r1vnzOGgJ%1iMK3D93i?WVpV-zlbM@uq;bK1wj;tr2ySGp{ zd`7N?i%;Tgk`E3HlL&olgt3u!_4)9l2qiAvx;NLdb|J6h*<$aF%D$fcN;`{a;aZ2qn;jS{tc(${lU^{XI??Ly5ZSU)D_AeTllc zk$Vp2=a4F>%w#O1Nx>|sF}*LmGfNBdy^7$2gN;k=(m6XoWa~?$i3FLU*F&`;w7Sz>L4szr zIcau_MH9rZ^=k=NXw!?iam0eLVvVG#1t+VqG?lyhm9H+6={y2Sxsi~4`IZIS(=ID^ zNy~(+E?5HY^<$}*lG%1~>N&M$Hwe*%?9cn&hhlUSK83K{gg+u|Zb`A<6FKp^zdXh= zTIrX~jw$>;9IC$^RadIH>7qRvC9~FEC1%_(%OP#?L-iS~Af!{$wl6%=sQm89?62;z zI5zS8*yCk^OlyT8^Mu}#XfqDzP=6nU}wIOAx8>|yaZbqo1MGo#(vvy_w8X4KdG==LtmyN8oY z?$^@I$tFCU+$Vfo?NMz4>>|97Q90iB>MCU*AY&;^1t?ya9!ud$4>coo1o)mWn>FV8 zPK~n5UjY5VI0xDNP*_sNWN$P+^||{>=|<>E-)fZZcG^#gwGhIg|LdQn+=PQMj?|ug z93poR++M!;o+vvvZIuu%GM03k#(FUWQuxaqYoQi-Amjx$g9` zSJrY~s5}%lqOlJqHgsZ|{onjbIow3}1YPCc@+?vcw>J=C#_VBw&Jn6Fkt^K2Lk9?0 zx<`Tq($ZQ};AW&bWAO(k;sKvyd6J^K4PpHR*5ngcCn(>VOQPsD zkA!eU&4k&CCvI)??}RT|*D?SW59RC)rAsh~A9g!9He=j1dJ*$5Hqi6E zrYQoTJvs-{lf`A~#$(!?B#Nk;Le>u*F1)|mKppBYy$p+z94Fg}JmWM=;AJzvsea+B zEsL#tIsdR)hY{i67f!{;Vm9-B*KcvG`NqS9;m96TobMjci{zqqgUy@b+}WD zrKBIT%_)byjef7`qLDx$SjlqfU{UX0zXyl7X`*MZ{C+WmWA;q zh*uYrR%Pv0n0Oy_K6mb?Kq=eb5g6E+>LBKQQuqo&K&aE3m$8iB>W(An-iWJWXjz57 zqs>ND&$xLYv;Z=NZb7q+m&uV9se7~s_oVA`qaF%B{pZ(qCm&zth(^k(VH;Jojf2r* zxYUFncAC5yWKJJgYvpl=csv=+Ikv!3HS8X7sywMmU$I@9&Cau(K2K%=lBwjkw<2nS zWGK*KnpNu9Pbzym>+SYaZ%t3vk%7f8t!R~X<92-Nik(JFAIUq>`fqxdT>E*}Sro|i ziI_cA$M?wrrrzT>Cpg#oyL2_O zT&zVdxV#u;#qyqqewNfj1-j}ApFs9mtL!*#4?}0vaf5@JF|N?A#Q{VoaR4vT zDPh0>kO7D9yBTf4+^vbxGvGHH29363d0PB{p_m%{DFh6derJ9-uUT?>D|Q;LN&Mm{ z1L5I-@|!bo6ib4fhg+^&%}b?8>?H(Q=oNGPu}ET_cLTr(AXB@(RgG@C!`}lj@*(%` z>6d&M!%epuc0!N z0=LZlhRgaT*FsLYCyhheId3;HN*{49aw508P`mP>hFkfb6p7>i~0eG9F3L znJRK-E5O^Ms9^~?pJ2BiOm7)Yx(@d}akM8{3z47gZyq2(y6pXwCfjC~(XI6F@U`*G z+oMyEx1{qYJz_FFSGiV~Q#u)JIxT|P-vVUq1vQCR0H-s}LA-~IvW_|Ld|b3mE|D8H z6sh%Q`OQ7PCNQ3#8Yx_?VjN%f)3HZ0$O$^Yf3~0kGHY%2FnrF>_NzkAvU9+Lv*2Ro zZ+-1l%KFSfynCX69S9fi+ST$_Be`t}zZ}V%gTPWR{m`WP#s)@CIzXc3S~wLb-jIkt zzh%P(SSWzlRWqCR+@B5zvP@s!tebIB8Is(^9P&8mQeWc?fdbo_@)qQFN_VYXE9X3DF!G%UOj8fVe+8H%Wnq7 z6grq|QuLKdZm2Kxdus?(c zUR{#cQOE-~uG(3kyy^Zk@EFpdS{$W z72Y8elyThZqViW{W718JLDF=rzPp`Nx%M|YDG2v*y=+_lP@}d|k+Jzl+s`;c?MbP` z87Q3jYi&Z3#}%(O+YORVLz4H~;5#RUq~6Rxv#ud=8_t_Nwjg)V-_Ibb3tO8M36QMZ zz88PAi!$SS*hz9O!gjyxD!2LwE0XA0(HB~WI*q)P9cVPmbiMawS^m-D(q~sX=HO{F zksTBTd%mVb$*MBnj*6=J}?h*iUuGF_}yqvSF83$JDhKsx7(BwRqX8}%vY)>M-~cK`x01dUKZ-Oo_|6EdP>FZT|W8A2XzYz z*EVYD%vZh{`0kcrJH$vQ=Z`c+t=iTW7D_AH^o8|=p@nJ+Fwm69f=+9NNvS7fO({iB z@!_`VgiZCA!k#0AR!IeycBtwz5= z_kN|AYB?wt@WzRlWIx^DzJ{?g5Q)q0tumN*P`rkjJb789*73+nVPxLSCC(JYt|{S7ZZn(uKGjJ*Z}oy zf;4Axwou}>X9Mw1)d^u7WFYdEA*A7SQVN(d8+VTLKC=%74@d0*2YjuvlfPZ;sM(Pw zk1^%qd;`TC>lhi|C%4`ECr>%5958cOA;N3NM>mB%A{-DCBF4LtQ9oH1 z6YksB-1J7LGpKbRRK?LNZKs8tYUClmgW0_&hNdS1T@I+D7WxhX{o6AtSE5k(R^^kA z255#@H;J2R#&y!PiQOiLwtH_PQ)|W{*cFS_(dOrV0-Q1RKs)`xF(%sSxv7uU0JZaj?1Y(x3{X`F zMu5ze95|QeRNO%MCRCt9bQvBd_(epJhXu?vSdyw29?xUU>H+NrE&Sf z*0U-p_0zUwpztLu%F%79T|*N+;g407bbZxXN&lue0vF1WA)h*-&*l}`qxUlZUEI*7 zbGv}84(v{E&-=cN*Cd(m~s(FYgryGj)2zUP8SYFYIj{NyLZGU;BR;&6V>Z5pt}_t2ojQ8dP0V%ZuQa5pOt;Vcp&Fk;L>S`)s*oW8=YNehf&v+K} z{jhs3IVAW+8)Q(1Vxhi=9K0b0|JKy;H|%P~aNrwOgw@u5S<}U27}257mGB|m#NkPIs)8;$p-IMj1hFhvtL;oGUU>qk1rm43A zw6eW7lUXma$J(OPJNO&EgDl#gADPtlozo-z6Q?y^4bhNgi>p2W)PM z5)BdlY=$fmq&UmyI^xhbB~d8^W~7K^uFB+Pnku57-jgzn0V8jI#pMl_cY`R z9nBI2{Wun+w^0o|VkHHOJG$GKasxKB)v^33h=vuE5nJ+)th#lH(ww;pz)WY)HsD13 zRrF;1l z*G8>>UdGh{{}Sw&v@Q)pGl1XNYO1=71U>$6!H>s&nQmLCzS z-w(_3sIPsiaF=XKLYLSxNRnvMAw0)+2ld7OeL=K$@nF8g=XY|Brc8_5u zfK?^;Y%mg3X0-&;dK0G|oO-uufA5GV5iYidO6GNZ1$bHudeO6~RCXJmnlQW7rh5dn zt7JS^fBAU6g9ct0tGb{J+f`Di2*2@_3kZ&h+^-@F5LhZLTYn_RC`3{@E4rrq?Z?{Z zySEVsjAm69`O=j|xj~R6Me_dco~KER&Uysh@-U2H#|B)v^&&81nF7T(*cBkL(q!q` zB10cT4fJYsRVaC69ei+Cz0T9SeM~hg6DOU}lr-^~)Q=#WP%P%qCNY+tuD@~F68(;{ z#w8IvF-n#Bsg7%w_9xWk^_z_aTPwHkY>7#La)0-r(t~+TEN-}xsqtuhp_W*Xbw(=y zlr6tz9{%f$K*o1C{zPQB%Hb!MH< zzARU`fd{YrP6(5!xdTpI8DIc~@2z1*H09fbyqFf`(%Qc)*Od=ff1Ae=o)7w8E0aV8 zE==jW@K>Mi1&)^{oq{`4+@v zjh;Lc68L#^SQq>0JUgX-Cx~z2wu5gPRwwr4*=5bZT@Fnw+{;UV(uItGwZ|^P{IUS( zxvt1ACCCtHrH2ZP`pvYavh((K(N9^#gn5b_qKIJHz0AJtS1M_JC@7QTzU#1?Bkp42 zGJbf@obE%(kn=NeLVBq-&g;Xg0AMay{J;ykk9^t6oLsgoX^fSjO1VbPjU<#^B(eG6 zxp{}dQ!%&C4zhSM0jG^g%u}N2Gz{blZXa~vG)uRP$bnNa#7uaD5#B?8@7GhKRNtDx1ZYMaHPXQsX;9#z(w2x>LP8RU~5%5?v>DpmRf4%0}T~Gzw zs*hGqyYirBEw~CIr%J29ggq0iI}y*dT}Hk#-W(EwSqUPr=0?HD!?K_Lm6ZWnsA1ao zZ4hn*Ry2qZmsS`|mJ#B(jA$GgVo0L{A*<_Gu=wdDWokc$r_DY5}>dG%0?k7prto|4C5*c)G6>P*astbrU~ zjX_8L(>U3XoDv{oOdkc?S@A*nGsirl1m;3L>AwB<(^fkBIsV4&mj9f#YJwzb`hF`t zxLo|NgIa%nO+VYU3oFH}RYmWu^O;pY=A(&=la1SYVTHQ=LaXaK;AU9|EsJX~+0?eu znl=_~;sq)5pVmo(+j&1z@-~OaU~$j)zXqB4zse$;aY!nSpCWEUxdXOVj8WF>0%Mhk zY$R|IK<3C4JrsOVos&2*2!-6GJqNf&fMt81p@>-z?YyUx1r2x2$^Hp=_k0KQ zIbtKe0Eiv=y&Yu8)DiBNKfOz7r?i@+Q!cr$v~ z?bUk0xqnY>pL$e5vbYWqV+^u}vPK;rD{z`j{}lX}jC^^zV0Q8gE!Dpk!W~%Dh#c9! z3;+6aaqK$Hzt%x}HY`$G4!fX0qz?pQo}RVkaMT!4KbrBd1S*X^qsB6RWq0=%A_1Lv7{eR;v?!5w>W?Yb+#@Ip-u7)($AzWUo!V2 zs>#cUA~?(wiDYw+c*$reR_T|%uW1B1qyol*)mDA9hC>c1Xz(asACZWZcRB?)r_{-V zUtqK(LflZe1DSarwpm>BzvkdSG5272{9oFk`j3I;=AQOT^>)(+Pfre)vDA6b8mtBN z&@~;t1~pb{EWfA9Au$0EN}luVzC&hMNh0nQ?{}<*pF!!uPxb5r8J2iUlL#bpIvwy> ztZo~>WA|y_eOJ;Rot!ZZtr$9RCOsW(Fa~0v;*)P|Y1h91S+9`tbidqG&FgSp#9 zw7kSk^P^xb$iKjX4<|`#81|ES@*nHu_s0rwFZqDf_Zg79kUSA0Q*b(ixZj`njGv3K z{7)l2puP!_QJPMS~C-+L;8CPWhhhe+vGg!i)MPL?SHC9=t*6M;vcc z05K958b%B1aStUokFG8=fwjP+KfVH+l7C_9=p1f&0C=sVfR$_>fB3|Ca#tJ@>#rm4 z4^C1?VzYaHwj6BQK_VJ#=lvsc>gE=zmgFe|I+W4Ik?qY50S+Hh2~>tz6Rg0aLuA1E rJ~WqhW4r~94!zZjC)OGofFSrCG!p;(>(~2y_W49bQ@KdVJm|jxTIt>d literal 0 HcmV?d00001 diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/mapPin.imageset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/bus.imageset/Contents.json similarity index 89% rename from Projects/DesignSystem/Resources/Assets.xcassets/mapPin.imageset/Contents.json rename to Projects/DesignSystem/Resources/Assets.xcassets/bus.imageset/Contents.json index 3094a16a..ca19e526 100644 --- a/Projects/DesignSystem/Resources/Assets.xcassets/mapPin.imageset/Contents.json +++ b/Projects/DesignSystem/Resources/Assets.xcassets/bus.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "mapPin.png", + "filename" : "bus.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/bus.imageset/bus.png b/Projects/DesignSystem/Resources/Assets.xcassets/bus.imageset/bus.png new file mode 100644 index 0000000000000000000000000000000000000000..d1df8cb405db3e22d52b7b3f78864bbd00f75ffa GIT binary patch literal 1615 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 ro)Jcwuz(%5EYE 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 literal 0 HcmV?d00001 diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/busStop3.imageset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/busStop3.imageset/Contents.json new file mode 100644 index 00000000..f350340f --- /dev/null +++ b/Projects/DesignSystem/Resources/Assets.xcassets/busStop3.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "busStop3.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/busStop3.imageset/busStop3.png b/Projects/DesignSystem/Resources/Assets.xcassets/busStop3.imageset/busStop3.png new file mode 100644 index 0000000000000000000000000000000000000000..7c4e6b7ca5a94e15ac037a5718b83f498074244d GIT binary patch literal 13814 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 literal 0 HcmV?d00001 diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/cell2.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/cell2.colorset/Contents.json deleted file mode 100644 index e998feb9..00000000 --- a/Projects/DesignSystem/Resources/Assets.xcassets/cell2.colorset/Contents.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xF6", - "green" : "0xF5", - "red" : "0xF3" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "light" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xF6", - "green" : "0xF5", - "red" : "0xF3" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.510", - "blue" : "0xF6", - "green" : "0xF5", - "red" : "0xF3" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/cellColor.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/cellColor.colorset/Contents.json deleted file mode 100644 index 458f8087..00000000 --- a/Projects/DesignSystem/Resources/Assets.xcassets/cellColor.colorset/Contents.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xFB", - "green" : "0xF7", - "red" : "0xF5" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "light" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xFB", - "green" : "0xF7", - "red" : "0xF5" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.980", - "blue" : "0x12", - "green" : "0x0F", - "red" : "0x0F" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/mapPin.imageset/mapPin.png b/Projects/DesignSystem/Resources/Assets.xcassets/mapPin.imageset/mapPin.png deleted file mode 100644 index c444377b273628dc0ec64c443fb967be30d6a435..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6973 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 diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/mapPinBlue.imageset/mapPinBlue.png b/Projects/DesignSystem/Resources/Assets.xcassets/mapPinBlue.imageset/mapPinBlue.png deleted file mode 100644 index e3db3d2dd38d63d92adc2b9aa481f0f9517ff329..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7056 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 diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/mapPinGray.imageset/mapPinGray.png b/Projects/DesignSystem/Resources/Assets.xcassets/mapPinGray.imageset/mapPinGray.png deleted file mode 100644 index bd3589ccb4ae39bed327b276dc193f8f1bdbcb09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7068 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 UIButton.Configuration { var config = UIButton.Configuration.plain() - config.background.backgroundColor = .adaptiveWhiteforDesign + config.background.backgroundColor = UIColor( + red: 0.91, + green: 0.91, + blue: 0.92, + alpha: 1.0 + ) config.baseForegroundColor = color config.cornerStyle = .large config.contentInsets = .init( diff --git a/Projects/DesignSystem/Sources/UIColor +.swift b/Projects/DesignSystem/Sources/UIColor +.swift deleted file mode 100644 index 1846e9b0..00000000 --- a/Projects/DesignSystem/Sources/UIColor +.swift +++ /dev/null @@ -1,36 +0,0 @@ -// -// UIColor +.swift -// DesignSystem -// -// Created by 유하은 on 5/7/24. -// Copyright © 2024 Pepsi-Club. All rights reserved. -// - -import UIKit - -public extension UIColor { - static var adaptiveWhiteforDesign: UIColor { - return UIColor { traitCollection in - if traitCollection.userInterfaceStyle == .dark { - return UIColor( - red: 20/255, - green: 20/255, - blue: 23/255, - alpha: 1.0 - ) - } else { - return UIColor.white - } - } - } - - static var adaptiveBlackforDesign: UIColor { - return UIColor { traitCollection in - if traitCollection.userInterfaceStyle == .dark { - return UIColor.white - } else { - return UIColor.black - } - } - } -} diff --git a/Projects/DesignSystem/Sources/UIViewController +.swift b/Projects/DesignSystem/Sources/UIViewController +.swift deleted file mode 100644 index 3888e697..00000000 --- a/Projects/DesignSystem/Sources/UIViewController +.swift +++ /dev/null @@ -1,22 +0,0 @@ -// -// UIViewController +.swift -// DesignSystem -// -// Created by 유하은 on 5/6/24. -// Copyright © 2024 Pepsi-Club. All rights reserved. -// - -import UIKit - -extension UIViewController { - public func applyGlobalViewStyle() { - view.layoutMargins = UIEdgeInsets( - top: 0, - left: 0, - bottom: 0, - right: 0 - ) - - view.backgroundColor = DesignSystemAsset.cellColor.color - } -} diff --git a/Projects/Feature/AlarmFeature/Sources/View/EmptyRegularAlarmView.swift b/Projects/Feature/AlarmFeature/Sources/View/EmptyRegularAlarmView.swift index e890043c..f352c940 100644 --- a/Projects/Feature/AlarmFeature/Sources/View/EmptyRegularAlarmView.swift +++ b/Projects/Feature/AlarmFeature/Sources/View/EmptyRegularAlarmView.swift @@ -11,6 +11,11 @@ import UIKit import DesignSystem final class EmptyRegularAlarmView: UIView { + private let imageView: UIImageView = { + let imageView = UIImageView() + imageView.image = DesignSystemAsset.bus.image + return imageView + }() private let messageLabel: UILabel = { let label = UILabel() @@ -64,7 +69,7 @@ final class EmptyRegularAlarmView: UIView { } private func configureUI() { - backgroundColor = DesignSystemAsset.cellColor.color + backgroundColor = .white [messageLabel].forEach { addSubview($0) diff --git a/Projects/Feature/AlarmFeature/Sources/View/RegularAlarmTVCell.swift b/Projects/Feature/AlarmFeature/Sources/View/RegularAlarmTVCell.swift index 63720597..e71a850c 100644 --- a/Projects/Feature/AlarmFeature/Sources/View/RegularAlarmTVCell.swift +++ b/Projects/Feature/AlarmFeature/Sources/View/RegularAlarmTVCell.swift @@ -53,12 +53,16 @@ final class RegularAlarmTVCell: UITableViewCell { stackView.distribution = .equalCentering stackView.alignment = .center stackView.addDivider( - color: DesignSystemAsset.cell2.color, + color: .white, hasPadding: true, - dividerRatio: 0.8 + dividerRatio: 1.0 + ) + stackView.backgroundColor = UIColor( + red: 0.95, + green: 0.96, + blue: 0.96, + alpha: 1.0 ) - stackView.backgroundColor = - .adaptiveWhite stackView.layer.cornerRadius = 10 return stackView }() @@ -109,7 +113,7 @@ final class RegularAlarmTVCell: UITableViewCell { .font: DesignSystemFontFamily.NanumSquareNeoOTF.regular.font( size: 15 ), - .foregroundColor: DesignSystemAsset.settingColor.color + .foregroundColor: DesignSystemAsset.lightRed.color ] ) let paddingString = NSAttributedString( @@ -163,10 +167,10 @@ final class RegularAlarmTVCell: UITableViewCell { let busStopString = NSAttributedString( string: busStop, attributes: [ - .font: DesignSystemFontFamily.NanumSquareNeoOTF.regular.font( + .font: DesignSystemFontFamily.NanumSquareNeoOTF.light.font( size: 15 ), - .foregroundColor: UIColor.adaptiveBlack + .foregroundColor: UIColor.black ] ) @@ -178,7 +182,7 @@ final class RegularAlarmTVCell: UITableViewCell { } private func configureUI() { - backgroundColor = DesignSystemAsset.cellColor.color + backgroundColor = .clear [removeBtn, stackView].forEach { contentView.addSubview($0) $0.translatesAutoresizingMaskIntoConstraints = false diff --git a/Projects/Feature/AlarmFeature/Sources/ViewController/AddRegularAlarmViewController.swift b/Projects/Feature/AlarmFeature/Sources/ViewController/AddRegularAlarmViewController.swift index 2fed4ece..64bbc005 100644 --- a/Projects/Feature/AlarmFeature/Sources/ViewController/AddRegularAlarmViewController.swift +++ b/Projects/Feature/AlarmFeature/Sources/ViewController/AddRegularAlarmViewController.swift @@ -25,7 +25,7 @@ final class AddRegularAlarmViewController: UIViewController { size: 23 ) label.textAlignment = .left - label.textColor = .adaptiveBlack + label.textColor = .black return label }() @@ -46,7 +46,7 @@ final class AddRegularAlarmViewController: UIViewController { font: DesignSystemFontFamily.NanumSquareNeoOTF.bold.font( size: 14 ), - color: .adaptiveBlack + color: .black ) btn.accessibilityIdentifier = "알람에서 검색뷰로 네비게이션" return btn @@ -67,7 +67,7 @@ final class AddRegularAlarmViewController: UIViewController { let picker = UIDatePicker() picker.datePickerMode = .time picker.preferredDatePickerStyle = .wheels - picker.setValue(UIColor.adaptiveBlack, forKey: "textColor") + picker.setValue(UIColor.black, forKey: "textColor") return picker }() @@ -108,7 +108,6 @@ final class AddRegularAlarmViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - configureUI() setNavigation() bind() @@ -133,7 +132,7 @@ final class AddRegularAlarmViewController: UIViewController { } private func configureUI() { - view.backgroundColor = DesignSystemAsset.cellColor.color + view.backgroundColor = .white [ titleLabel, firstDescriptionLabel, @@ -298,10 +297,10 @@ final class AddRegularAlarmViewController: UIViewController { .forEach { btn in var color: UIColor if response.weekday.contains(btn.tag) { - color = DesignSystemAsset.changeBlue.color + color = DesignSystemAsset.weekDayBlue.color btn.setTitleColor(.white, for: .normal) } else { - color = DesignSystemAsset.gray3.color + color = DesignSystemAsset.weekDayGray.color btn.setTitleColor(.black, for: .normal) } btn.backgroundColor = color diff --git a/Projects/Feature/AlarmFeature/Sources/ViewController/RegularAlarmViewController.swift b/Projects/Feature/AlarmFeature/Sources/ViewController/RegularAlarmViewController.swift index 84888b88..c0167621 100644 --- a/Projects/Feature/AlarmFeature/Sources/ViewController/RegularAlarmViewController.swift +++ b/Projects/Feature/AlarmFeature/Sources/ViewController/RegularAlarmViewController.swift @@ -27,7 +27,7 @@ public final class RegularAlarmViewController: UIViewController { private lazy var alarmTableView: UITableView = { let tableView = UITableView() - tableView.backgroundColor = DesignSystemAsset.cellColor.color + tableView.backgroundColor = .white tableView.separatorStyle = .none tableView.backgroundView = emptyRegularAlarmView tableView.register(RegularAlarmTVCell.self) @@ -52,7 +52,6 @@ public final class RegularAlarmViewController: UIViewController { public override func viewDidLoad() { super.viewDidLoad() - configureUI() bind() configureDataSource() @@ -67,7 +66,7 @@ public final class RegularAlarmViewController: UIViewController { } private func configureUI() { - view.backgroundColor = DesignSystemAsset.cellColor.color + view.backgroundColor = .white [floatingBtnSpacingView, titleLabel, alarmTableView, addBtn].forEach { view.addSubview($0) diff --git a/Projects/Feature/BusStopFeature/Sources/View/BusStopInfoHeaderView.swift b/Projects/Feature/BusStopFeature/Sources/View/BusStopInfoHeaderView.swift index cd5b4ad8..39046672 100644 --- a/Projects/Feature/BusStopFeature/Sources/View/BusStopInfoHeaderView.swift +++ b/Projects/Feature/BusStopFeature/Sources/View/BusStopInfoHeaderView.swift @@ -48,8 +48,8 @@ public final class BusStopInfoHeaderView: UIView { private let nextStopNameLb: UILabel = { let label = UILabel() label.font = DesignSystemFontFamily.NanumSquareNeoOTF - .bold.font(size: 14) - label.textColor = DesignSystemAsset.gray2.color + .regular.font(size: 14) + label.textColor = .white return label }() @@ -63,7 +63,7 @@ public final class BusStopInfoHeaderView: UIView { .regular.font(size: 10) config.attributedTitle = title config.baseBackgroundColor = .white - config.baseForegroundColor = DesignSystemAsset.overnightBusColor.color + config.baseForegroundColor = DesignSystemAsset.regularAlarmBlue.color config.imagePadding = 7 let imgConfig = UIImage.SymbolConfiguration( font: .systemFont(ofSize: 11) @@ -126,7 +126,7 @@ extension BusStopInfoHeaderView { busStopNumLb.topAnchor.constraint( equalTo: topAnchor, - constant: 25 + constant: 15 ), busStopNumLb.heightAnchor.constraint(equalToConstant: 15), busStopNameLb.topAnchor.constraint( @@ -149,11 +149,11 @@ extension BusStopInfoHeaderView { nextStopNameLb.heightAnchor.constraint(equalToConstant: 15), mapBtn.topAnchor.constraint( equalTo: nextStopNameLb.bottomAnchor, - constant: 20 + constant: 12 ), mapBtn.bottomAnchor.constraint( equalTo: bottomAnchor, - constant: -10 + constant: -20 ), mapBtn.heightAnchor.constraint(equalToConstant: 25), navigationBtn.topAnchor.constraint( diff --git a/Projects/Feature/BusStopFeature/Sources/View/BusTableViewCell.swift b/Projects/Feature/BusStopFeature/Sources/View/BusTableViewCell.swift index bb3f2ab7..c6a79a10 100644 --- a/Projects/Feature/BusStopFeature/Sources/View/BusTableViewCell.swift +++ b/Projects/Feature/BusStopFeature/Sources/View/BusTableViewCell.swift @@ -73,7 +73,7 @@ public final class BusTableViewCell: UITableViewCell { override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { super.init(style: style, reuseIdentifier: reuseIdentifier) - backgroundColor = .adaptiveWhite + backgroundColor = .white configureUI() buttonTap() diff --git a/Projects/Feature/BusStopFeature/Sources/View/RegularAlarmForBusTableViewCell.swift b/Projects/Feature/BusStopFeature/Sources/View/RegularAlarmForBusTableViewCell.swift index 81a3efc6..92b68fd9 100644 --- a/Projects/Feature/BusStopFeature/Sources/View/RegularAlarmForBusTableViewCell.swift +++ b/Projects/Feature/BusStopFeature/Sources/View/RegularAlarmForBusTableViewCell.swift @@ -61,7 +61,7 @@ public final class RegularAlarmForBusTableViewCell: UITableViewCell { reuseIdentifier: String? ) { super.init(style: style, reuseIdentifier: reuseIdentifier) - backgroundColor = .adaptiveWhite + backgroundColor = .white configureUI() } diff --git a/Projects/Feature/BusStopFeature/Sources/ViewController/BusStopViewController.swift b/Projects/Feature/BusStopFeature/Sources/ViewController/BusStopViewController.swift index dde69709..e9f97e7b 100644 --- a/Projects/Feature/BusStopFeature/Sources/ViewController/BusStopViewController.swift +++ b/Projects/Feature/BusStopFeature/Sources/ViewController/BusStopViewController.swift @@ -30,7 +30,7 @@ public final class BusStopViewController: UIViewController { ) table.delegate = self table.isScrollEnabled = false - table.backgroundColor = DesignSystemAsset.cellColor.color + table.backgroundColor = DesignSystemAsset.tableViewColor.color table.rowHeight = 60 table.sectionHeaderHeight = 46 table.sectionFooterHeight = 10 @@ -55,39 +55,21 @@ public final class BusStopViewController: UIViewController { } private func setupGradientBackground() { - let upperView = UIView( - frame: CGRect( - x: 0, - y: 0, - width: view.bounds.width, - height: view.bounds.height * 0.35 - ) - ) - let gradientLayer = CAGradientLayer() - gradientLayer.frame = upperView.bounds - + gradientLayer.frame = view.bounds gradientLayer.colors = [ - DesignSystemAsset.changeBlue.color.cgColor, - DesignSystemAsset.changeBlue.color.withAlphaComponent(0.3).cgColor + DesignSystemAsset.regularAlarmBlue.color.cgColor, + UIColor( + red: 0.95, + green: 0.96, + blue: 0.96, + alpha: 1.0).cgColor ] - + gradientLayer.locations = [0.0, 0.35] gradientLayer.startPoint = CGPoint(x: 0.5, y: 0.0) gradientLayer.endPoint = CGPoint(x: 0.5, y: 1.0) - - upperView.layer.insertSublayer(gradientLayer, at: 0) - - let lowerView = UIView( - frame: CGRect( - x: 0, - y: view.bounds.height * 0.35, - width: view.bounds.width, - height: view.bounds.height * 0.65) - ) - lowerView.backgroundColor = DesignSystemAsset.cellColor.color - view.addSubview(upperView) - view.addSubview(lowerView) + view.layer.insertSublayer(gradientLayer, at: 0) } public override func viewDidLoad() { @@ -95,6 +77,12 @@ public final class BusStopViewController: UIViewController { self.navigationController? .interactivePopGestureRecognizer?.delegate = nil + view.layoutMargins = UIEdgeInsets( + top: 0, + left: 0, + bottom: 10, + right: 0 + ) setupGradientBackground() configureUI() bind() @@ -338,8 +326,7 @@ extension BusStopViewController { ), busStopTableView.topAnchor.constraint( - equalTo: headerView.bottomAnchor, - constant: 20 + equalTo: headerView.bottomAnchor ), busStopTableView.leadingAnchor.constraint( equalTo: contentView.leadingAnchor diff --git a/Projects/Feature/HomeFeature/Sources/View/EmptyFavoritesView.swift b/Projects/Feature/HomeFeature/Sources/View/EmptyFavoritesView.swift index f6603779..ce670087 100644 --- a/Projects/Feature/HomeFeature/Sources/View/EmptyFavoritesView.swift +++ b/Projects/Feature/HomeFeature/Sources/View/EmptyFavoritesView.swift @@ -147,7 +147,7 @@ final class EmptyFavoritesView: UIView { } private func configureUI() { - backgroundColor = DesignSystemAsset.cellColor.color + backgroundColor = .white [ listLottieView, messageLabel, diff --git a/Projects/Feature/HomeFeature/Sources/View/FavoritesHeaderView.swift b/Projects/Feature/HomeFeature/Sources/View/FavoritesHeaderView.swift index fe8f4031..40e381fe 100644 --- a/Projects/Feature/HomeFeature/Sources/View/FavoritesHeaderView.swift +++ b/Projects/Feature/HomeFeature/Sources/View/FavoritesHeaderView.swift @@ -31,13 +31,13 @@ internal final class FavoritesHeaderView: UITableViewHeaderFooterView { size: 13 ) label.textAlignment = .left - label.textColor = DesignSystemAsset.gray4.color + label.textColor = .gray return label }() private let dividerLine: UIView = { let view = UIView() - view.backgroundColor = DesignSystemAsset.gray3.color + view.backgroundColor = DesignSystemAsset.gray4Minor.color return view }() @@ -59,7 +59,7 @@ internal final class FavoritesHeaderView: UITableViewHeaderFooterView { private func configureUI() { contentView.backgroundColor = - .adaptiveWhite + DesignSystemAsset.tableViewColor.color [busStopNameLabel, directionLabel, dividerLine].forEach { contentView.addSubview($0) diff --git a/Projects/Feature/HomeFeature/Sources/View/FavoritesTVCell.swift b/Projects/Feature/HomeFeature/Sources/View/FavoritesTVCell.swift index ffe7649d..e0cc5f3a 100644 --- a/Projects/Feature/HomeFeature/Sources/View/FavoritesTVCell.swift +++ b/Projects/Feature/HomeFeature/Sources/View/FavoritesTVCell.swift @@ -77,7 +77,7 @@ class FavoritesTVCell: UITableViewCell { private func configureUI() { contentView.backgroundColor = - .adaptiveWhite + DesignSystemAsset.tableViewColor.color [ routeLabel, diff --git a/Projects/Feature/HomeFeature/Sources/ViewController/FavoritesViewController.swift b/Projects/Feature/HomeFeature/Sources/ViewController/FavoritesViewController.swift index 84fa57db..2654f8d5 100644 --- a/Projects/Feature/HomeFeature/Sources/ViewController/FavoritesViewController.swift +++ b/Projects/Feature/HomeFeature/Sources/ViewController/FavoritesViewController.swift @@ -35,7 +35,7 @@ public final class FavoritesViewController: UIViewController { private lazy var refreshBtn: UIButton = { var config = UIButton.Configuration.plain() - config.baseForegroundColor = .adaptiveBlack + config.baseForegroundColor = .black config.imagePadding = 6 // Image let image = UIImage(systemName: "arrow.triangle.2.circlepath") @@ -56,7 +56,7 @@ public final class FavoritesViewController: UIViewController { private let editBtn: UIButton = { var config = UIButton.Configuration.plain() - config.baseForegroundColor = .adaptiveBlack + config.baseForegroundColor = .black config.imagePadding = 5 var titleContainer = AttributeContainer() titleContainer.font = .systemFont(ofSize: 13) @@ -71,8 +71,7 @@ public final class FavoritesViewController: UIViewController { private lazy var favoritesTableView: UITableView = { let tableView = UITableView() - tableView.backgroundColor = - DesignSystemAsset.cellColor.color + tableView.backgroundColor = .white tableView.register(FavoritesHeaderView.self) tableView.register(FavoritesTVCell.self) tableView.dataSource = dataSource @@ -98,7 +97,6 @@ public final class FavoritesViewController: UIViewController { public override func viewDidLoad() { super.viewDidLoad() - configureDataSource() configureUI() bind() @@ -113,7 +111,7 @@ public final class FavoritesViewController: UIViewController { } private func configureUI() { - view.backgroundColor = DesignSystemAsset.cellColor.color + view.backgroundColor = .white [ searchBtn, editBtn, diff --git a/Projects/Feature/NearMapFeature/Sources/NMapsClustreing/LeafMarkerUpdater.swift b/Projects/Feature/NearMapFeature/Sources/NMapsClustreing/LeafMarkerUpdater.swift index d1a6e60c..cce2804c 100644 --- a/Projects/Feature/NearMapFeature/Sources/NMapsClustreing/LeafMarkerUpdater.swift +++ b/Projects/Feature/NearMapFeature/Sources/NMapsClustreing/LeafMarkerUpdater.swift @@ -25,7 +25,7 @@ public class LeafMarkerUpdater: NMCDefaultLeafMarkerUpdater { private var selectedImg: NMFOverlayImage { .init( - image: DesignSystemAsset.mapPin.image + image: DesignSystemAsset.mapBusStop.image .resize(45, 45), reuseIdentifier: "selectedbusStop" ) @@ -33,7 +33,7 @@ public class LeafMarkerUpdater: NMCDefaultLeafMarkerUpdater { private var unselectedImg: NMFOverlayImage { .init( - image: DesignSystemAsset.mapPinGray.image + image: DesignSystemAsset.mapBusStopGray.image .resize(45, 45), reuseIdentifier: "unselectedbusStop" ) diff --git a/Projects/Feature/NearMapFeature/Sources/View/BusStopInformationView.swift b/Projects/Feature/NearMapFeature/Sources/View/BusStopInformationView.swift index 44df0971..fb156df8 100644 --- a/Projects/Feature/NearMapFeature/Sources/View/BusStopInformationView.swift +++ b/Projects/Feature/NearMapFeature/Sources/View/BusStopInformationView.swift @@ -16,6 +16,12 @@ import Lottie public final class BusStopInformationView: UIView { private let symbolSize = 50 + private let busStopSymbol: UIImageView = { + let imageView = UIImageView() + imageView.image = DesignSystemAsset.busStop3.image + return imageView + }() + private let birdLottieView: LottieAnimationView = { let imgView = LottieAnimationView( name: "goingBus", @@ -28,7 +34,7 @@ public final class BusStopInformationView: UIView { private let busStopNameLabel: UILabel = { let label = UILabel() label.font = .nanumExtraBold(size: 18) - label.textColor = .adaptiveBlack.withAlphaComponent(0.8) + label.textColor = .black.withAlphaComponent(0.8) return label }() @@ -37,7 +43,7 @@ public final class BusStopInformationView: UIView { label.font = .nanumRegular(size: 13) label.adjustsFontForContentSizeCategory = true label.minimumScaleFactor = 0.8 - label.textColor = .adaptiveBlack.withAlphaComponent(0.8) + label.textColor = .black.withAlphaComponent(0.8) return label }() @@ -45,20 +51,20 @@ public final class BusStopInformationView: UIView { let label = UILabel() label.font = .nanumLight(size: 13) label.text = "현재 위치에서 약 " - label.textColor = .adaptiveBlack.withAlphaComponent(0.8) + label.textColor = .black.withAlphaComponent(0.8) return label }() private let distanceFromBusStopLabel: UILabel = { let label = UILabel() - label.font = .nanumExtraBold(size: 12) - label.textColor = .adaptiveWhite - label.backgroundColor = DesignSystemAsset.carrotOrange.color + label.font = .nanumBold(size: 13) + label.textColor = .white + label.backgroundColor = DesignSystemAsset.weekDayBlue.color label.clipsToBounds = true label.textAlignment = .center - label.widthAnchor.constraint(equalToConstant: 65).isActive = true - label.heightAnchor.constraint(equalToConstant: 22).isActive = true + label.widthAnchor.constraint(equalToConstant: 50).isActive = true + label.heightAnchor.constraint(equalToConstant: 20).isActive = true label.layer.cornerRadius = 10 return label @@ -68,13 +74,13 @@ public final class BusStopInformationView: UIView { let label = UILabel() label.font = .nanumLight(size: 13) label.text = " 떨어져 있어요" - label.textColor = .adaptiveBlack + label.textColor = .black return label }() private let separationView: UIView = { let view = UIView() - view.backgroundColor = .adaptiveBlack + view.backgroundColor = .black return view }() @@ -102,7 +108,7 @@ public final class BusStopInformationView: UIView { } private func configureUI() { - backgroundColor = .adaptiveWhite + backgroundColor = .white [ busStopNameLabel, diff --git a/Projects/Feature/NearMapFeature/Sources/ViewController/NearMapViewController.swift b/Projects/Feature/NearMapFeature/Sources/ViewController/NearMapViewController.swift index 148f23f8..6f3d18dc 100644 --- a/Projects/Feature/NearMapFeature/Sources/ViewController/NearMapViewController.swift +++ b/Projects/Feature/NearMapFeature/Sources/ViewController/NearMapViewController.swift @@ -41,10 +41,10 @@ public final class NearMapViewController: UIViewController { let view = BusStopInformationView() view.clipsToBounds = false view.layer.cornerRadius = 15 -// view.layer.shadowColor = UIColor.adaptiveBlack.cgColor -// view.layer.shadowOffset = CGSize(width: 0, height: 2) -// view.layer.shadowOpacity = 0.4 -// view.layer.shadowRadius = 2 + view.layer.shadowColor = UIColor.black.cgColor + view.layer.shadowOpacity = 0.5 + view.layer.shadowOffset = CGSize(width: 0, height: 2) + view.layer.shadowRadius = 2 return view }() @@ -66,7 +66,6 @@ public final class NearMapViewController: UIViewController { public override func viewDidLoad() { super.viewDidLoad() - configureUI() bind() } @@ -90,7 +89,7 @@ public final class NearMapViewController: UIViewController { } private func configureUI() { - view.backgroundColor = DesignSystemAsset.cellColor.color + view.backgroundColor = .white [busStopInformationView, naverMap].forEach { view.addSubview($0) $0.translatesAutoresizingMaskIntoConstraints = false diff --git a/Projects/Feature/SearchFeature/Sources/View/BusStopInfoView.swift b/Projects/Feature/SearchFeature/Sources/View/BusStopInfoView.swift index ee575d01..74faf721 100644 --- a/Projects/Feature/SearchFeature/Sources/View/BusStopInfoView.swift +++ b/Projects/Feature/SearchFeature/Sources/View/BusStopInfoView.swift @@ -77,7 +77,7 @@ public final class BusStopInfoView: UIView { attributedDescription.addAttributes( [ .font: UIFont.nanumExtraBold(size: 13), - .foregroundColor: UIColor.adaptiveBlack + .foregroundColor: UIColor.black ], range: NSRange( boldDescriptionRange, @@ -91,7 +91,7 @@ public final class BusStopInfoView: UIView { } private func configureUI() { - backgroundColor = .adaptiveWhite + backgroundColor = .white [busStopNameLabel, descriptionLabel].forEach { addSubview($0) $0.translatesAutoresizingMaskIntoConstraints = false diff --git a/Projects/Feature/SearchFeature/Sources/View/Cell/SearchTVCell.swift b/Projects/Feature/SearchFeature/Sources/View/Cell/SearchTVCell.swift index 3de0a392..9d82faf5 100644 --- a/Projects/Feature/SearchFeature/Sources/View/Cell/SearchTVCell.swift +++ b/Projects/Feature/SearchFeature/Sources/View/Cell/SearchTVCell.swift @@ -64,7 +64,7 @@ final class SearchTVCell: UITableViewCell { } private func configureUI() { - backgroundColor = .adaptiveWhite + backgroundColor = .white [busStopInfoView].forEach { contentView.addSubview($0) diff --git a/Projects/Feature/SearchFeature/Sources/View/Cell/SearchTVMapCell.swift b/Projects/Feature/SearchFeature/Sources/View/Cell/SearchTVMapCell.swift index eb059d99..ebe1f784 100644 --- a/Projects/Feature/SearchFeature/Sources/View/Cell/SearchTVMapCell.swift +++ b/Projects/Feature/SearchFeature/Sources/View/Cell/SearchTVMapCell.swift @@ -85,8 +85,8 @@ final class SearchTVMapCell: UITableViewCell { } private func configureUI() { - backgroundColor = .adaptiveWhite - + backgroundColor = .white + [busStopInfoView, mapBtn].forEach { contentView.addSubview($0) $0.translatesAutoresizingMaskIntoConstraints = false diff --git a/Projects/Feature/SearchFeature/Sources/View/SearchNearStopInformationView.swift b/Projects/Feature/SearchFeature/Sources/View/SearchNearStopInformationView.swift index 261d6337..e742e69c 100644 --- a/Projects/Feature/SearchFeature/Sources/View/SearchNearStopInformationView.swift +++ b/Projects/Feature/SearchFeature/Sources/View/SearchNearStopInformationView.swift @@ -32,9 +32,10 @@ final class SearchNearStopInformationView: UIButton { private let nearStopLabel: UILabel = { let label = UILabel() - label.textColor = .adaptiveBlack + label.textColor = .black label.font = DesignSystemFontFamily.NanumSquareNeoOTF.bold.font(size: 13) + label.textColor = .black.withAlphaComponent(0.6) label.text = "근처 정류장" return label }() @@ -47,7 +48,7 @@ final class SearchNearStopInformationView: UIButton { label.adjustsFontForContentSizeCategory = true label.minimumScaleFactor = 0.7 label.sizeToFit() - label.textColor = DesignSystemAsset.settingColor.color + label.textColor = .black.withAlphaComponent(0.6) return label }() @@ -79,14 +80,14 @@ final class SearchNearStopInformationView: UIButton { private func drawShadow() { layer.masksToBounds = false layer.cornerRadius = 10 -// layer.shadowColor = UIColor.adaptiveBlack.cgColor -// layer.shadowOffset = CGSize(width: 0, height: 2) -// layer.shadowOpacity = 0.4 -// layer.shadowRadius = 2 + layer.shadowColor = UIColor.black.cgColor + layer.shadowOffset = CGSize(width: 0, height: 2) + layer.shadowOpacity = 0.4 + layer.shadowRadius = 2 } private func configureUI() { - backgroundColor = .adaptiveWhite + backgroundColor = .white let symbolSize = 64 [ diff --git a/Projects/Feature/SearchFeature/Sources/View/SearchTextFieldView.swift b/Projects/Feature/SearchFeature/Sources/View/SearchTextFieldView.swift index 621743c5..b073745d 100644 --- a/Projects/Feature/SearchFeature/Sources/View/SearchTextFieldView.swift +++ b/Projects/Feature/SearchFeature/Sources/View/SearchTextFieldView.swift @@ -25,7 +25,12 @@ public final class SearchTextFieldView: UITextField { } private func configureUI() { - self.backgroundColor = .adaptiveWhite + self.backgroundColor = UIColor( + red: 0.91, + green: 0.91, + blue: 0.92, + alpha: 1.0 + ) self.font = DesignSystemFontFamily.NanumSquareNeoOTF.regular.font(size: 15) self.layer.cornerRadius = 15 @@ -36,7 +41,7 @@ public final class SearchTextFieldView: UITextField { self.addLeftPadding(width: 15) self.autocorrectionType = .no self.spellCheckingType = .no - self.textColor = .adaptiveBlack + self.textColor = .black } private func setPlaceholder(_ placeholder: String?) { @@ -45,7 +50,7 @@ public final class SearchTextFieldView: UITextField { string: self.placeholder ?? "", attributes: [ NSAttributedString.Key.foregroundColor: - DesignSystemAsset.mainColor.color + DesignSystemAsset.gray4.color ] ) } diff --git a/Projects/Feature/SearchFeature/Sources/ViewController/SearchViewController.swift b/Projects/Feature/SearchFeature/Sources/ViewController/SearchViewController.swift index d7a29ac6..3b9131d8 100644 --- a/Projects/Feature/SearchFeature/Sources/ViewController/SearchViewController.swift +++ b/Projects/Feature/SearchFeature/Sources/ViewController/SearchViewController.swift @@ -43,7 +43,7 @@ public final class SearchViewController: UIViewController { style: .insetGrouped ) table.register(SearchTVCell.self) - table.backgroundColor = DesignSystemAsset.cellColor.color + table.backgroundColor = DesignSystemAsset.tableViewColor.color table.dataSource = recentSearchDataSource table.delegate = self table.accessibilityIdentifier = "최근검색" @@ -62,7 +62,7 @@ public final class SearchViewController: UIViewController { style: .insetGrouped ) table.register(SearchTVMapCell.self) - table.backgroundColor = DesignSystemAsset.cellColor.color + table.backgroundColor = DesignSystemAsset.tableViewColor.color table.isHidden = true table.dataSource = searchedDataSource table.delegate = self @@ -100,7 +100,6 @@ public final class SearchViewController: UIViewController { public override func viewDidLoad() { super.viewDidLoad() - configureUI() configureDataSource() bind() @@ -138,7 +137,7 @@ public final class SearchViewController: UIViewController { } private func configureUI() { - view.backgroundColor = DesignSystemAsset.cellColor.color + view.backgroundColor = .white [ recentSearchHeaderView, diff --git a/Projects/Feature/SettingsFeature/Sources/View/SettingButton.swift b/Projects/Feature/SettingsFeature/Sources/View/SettingButton.swift index 94707267..4142fff6 100644 --- a/Projects/Feature/SettingsFeature/Sources/View/SettingButton.swift +++ b/Projects/Feature/SettingsFeature/Sources/View/SettingButton.swift @@ -20,11 +20,7 @@ public final class SettingButton: UIButton { private lazy var leftIconLabel: UIImageView = { let title = iconName let view = UIImageView(image: UIImage(systemName: title)) - if self.traitCollection.userInterfaceStyle == .light { - view.tintColor = DesignSystemAsset.routeTimeColor.color - } else { - view.tintColor = .white - } + view.tintColor = DesignSystemAsset.routeTimeColor.color view.contentMode = .scaleAspectFill return view }() diff --git a/Projects/Feature/SettingsFeature/Sources/ViewController/AlarmSettingViewController.swift b/Projects/Feature/SettingsFeature/Sources/ViewController/AlarmSettingViewController.swift index e7608232..8dbd6c34 100644 --- a/Projects/Feature/SettingsFeature/Sources/ViewController/AlarmSettingViewController.swift +++ b/Projects/Feature/SettingsFeature/Sources/ViewController/AlarmSettingViewController.swift @@ -93,6 +93,12 @@ public final class AlarmSettingViewController: UIViewController { return label }() + private let busIconView: UIImageView = { + let imageView = UIImageView() + imageView.image = DesignSystemAsset.bus2.image + return imageView + }() + private let squareView: UIView = { let squareView = UIView() @@ -105,7 +111,7 @@ public final class AlarmSettingViewController: UIViewController { private let endLabel: UILabel = { let label = UILabel() label.text = "완료" - label.textColor = .adaptiveWhite + label.textColor = .white label.textAlignment = .center label.font = DesignSystemFontFamily.NanumSquareNeoOTF.regular.font(size: 18) @@ -124,7 +130,7 @@ public final class AlarmSettingViewController: UIViewController { [settingAlarmViewCell, alarmStack, labelStack, labelStack2, labelImgStack, timeLabel, alarmSettingLabel, alarmSettingLabel2, - alarmSettingLabel3, squareView, endLabel] + alarmSettingLabel3, busIconView, squareView, endLabel] .forEach { view.addSubview($0) $0.translatesAutoresizingMaskIntoConstraints = false @@ -140,7 +146,7 @@ public final class AlarmSettingViewController: UIViewController { labelStack2.addArrangedSubview(components) } - [labelStack2] + [labelStack2, busIconView] .forEach { components in labelImgStack.addArrangedSubview(components) } diff --git a/Projects/Feature/SettingsFeature/Sources/ViewController/PrivacyWebViewController.swift b/Projects/Feature/SettingsFeature/Sources/ViewController/PrivacyWebViewController.swift index 836f928b..f514e432 100644 --- a/Projects/Feature/SettingsFeature/Sources/ViewController/PrivacyWebViewController.swift +++ b/Projects/Feature/SettingsFeature/Sources/ViewController/PrivacyWebViewController.swift @@ -21,7 +21,7 @@ public final class PrivacyWebViewController let webView = WKWebView() webView.translatesAutoresizingMaskIntoConstraints = false webView.allowsBackForwardNavigationGestures = true - webView.backgroundColor = .adaptiveWhite + webView.backgroundColor = .white return webView }() private let indicator: UIActivityIndicatorView = { @@ -50,7 +50,7 @@ public final class PrivacyWebViewController public override func viewDidLoad() { super.viewDidLoad() - view.backgroundColor = .adaptiveWhite + view.backgroundColor = .white navigationController?.navigationBar.barTintColor = .white webView.navigationDelegate = self diff --git a/Projects/Feature/SettingsFeature/Sources/ViewController/SettingsViewController.swift b/Projects/Feature/SettingsFeature/Sources/ViewController/SettingsViewController.swift index 9c0fbb84..ea0ec0b0 100644 --- a/Projects/Feature/SettingsFeature/Sources/ViewController/SettingsViewController.swift +++ b/Projects/Feature/SettingsFeature/Sources/ViewController/SettingsViewController.swift @@ -41,7 +41,7 @@ public final class SettingsViewController: UIViewController { public override func viewDidLoad() { super.viewDidLoad() - view.backgroundColor = DesignSystemAsset.cellColor.color + view.backgroundColor = .white configureUI() bind() diff --git a/Projects/MainFeature/Sources/MainTab.swift b/Projects/MainFeature/Sources/MainTab.swift index 4428fb4d..84426100 100644 --- a/Projects/MainFeature/Sources/MainTab.swift +++ b/Projects/MainFeature/Sources/MainTab.swift @@ -16,19 +16,19 @@ enum MainTab: Int, CaseIterable { case .home: return .init( title: "홈", - image: .init(systemName: "house.fill"), + image: .init(systemName: "house"), tag: rawValue ) case .alarm: return .init( title: "알람", - image: .init(systemName: "bell.fill"), + image: .init(systemName: "bell"), tag: rawValue ) case .settings: return .init( title: "설정", - image: .init(systemName: "gearshape.fill"), + image: .init(systemName: "gearshape"), tag: rawValue ) } diff --git a/Projects/MainFeature/Sources/TabBarCoordinator.swift b/Projects/MainFeature/Sources/TabBarCoordinator.swift index 812d3f82..d6b5a531 100644 --- a/Projects/MainFeature/Sources/TabBarCoordinator.swift +++ b/Projects/MainFeature/Sources/TabBarCoordinator.swift @@ -51,7 +51,7 @@ public final class TabBarCoordinator: Coordinator { let navigationController = UINavigationController() navigationController.tabBarItem = tabKind.tabItem navigationController.navigationBar.titleTextAttributes = [ - .foregroundColor: UIColor.adaptiveBlack + .foregroundColor: UIColor.black ] setupChildCoordinators( tabKind: tabKind,