Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Release] v1.2.2 #299

Merged
merged 31 commits into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
bdbef5e
[Feat] 2x2 4x2 Widget Base작업 (#244)
yuhaeun-la Apr 22, 2024
2136d0a
[Fix] SearchView 주변정류장 업데이트 시점 변경
gnksbm Apr 25, 2024
76bd511
Merge pull request #264 from Pepsi-Club/fix/#262
MUKER-WON Apr 26, 2024
afe0a8c
[Docs] 사진 업데이트, 문구 살짝 수정
yuhaeun-la May 2, 2024
ffa57b3
Feat/#263 UI변경작업 (#269)
yuhaeun-la May 3, 2024
b48d31c
[UI] BusStopView및 nearMapView수정
yuhaeun-la May 6, 2024
6621dd3
[UI] Color change
yuhaeun-la May 6, 2024
0b3bc98
[UI] UI 변경
yuhaeun-la May 6, 2024
d48437f
[UI] progressColor, refreshColor Change
yuhaeun-la May 6, 2024
e3646ab
[UI] Icon 변경
yuhaeun-la May 6, 2024
0c34cd3
[add] Update LeafMarker
yuhaeun-la May 6, 2024
41f1197
[UI] 배경 변경 전 최종
yuhaeun-la May 6, 2024
4068503
[UI] 정말 많은 것을 변경했습니다 - 스플래쉬 뷰, 아이콘 변경
yuhaeun-la May 6, 2024
cf014ea
[Feat] 다크모드 추가
yuhaeun-la May 6, 2024
9105b20
[UI] 정기 알람뷰
yuhaeun-la May 7, 2024
08c6a25
[Feat] 다크모드 보완
yuhaeun-la May 7, 2024
7d1a300
[UI] RegularAlarmView weekdaButton 색 수정
yuhaeun-la May 7, 2024
ff1f065
[UI] 소소한 UI 수정
MUKER-WON May 7, 2024
178c62f
Merge pull request #273 from Pepsi-Club/UI수정
yuhaeun-la May 7, 2024
e57079e
Revert "UI수정 UI수정작업 " (#274)
yuhaeun-la May 7, 2024
86e6c9e
Revert "Revert "UI수정 UI수정작업 " (#274)" (#278)
yuhaeun-la May 7, 2024
7b3030d
UI/#279 네비게이션 위치 통일
yuhaeun-la May 7, 2024
38375fb
[Bug] 잔상 버그 수정 (#282)
MUKER-WON May 7, 2024
2a0cf9f
Bug/#283 NearMapView 위치정보권한 없을 때 나오는 infomationView 수정 (#284)
MUKER-WON May 9, 2024
fe5aa90
Fix/#287 NearMapView에 InformainView 세브론UI 설정 (#288)
MUKER-WON May 9, 2024
144ed74
Fix/#285 설정 Icon 떴다 안떴다 하는 버그 및 UI수정 (#289)
yuhaeun-la May 9, 2024
a0150a6
[Fix] distance에 '알수없음'이 들어오는 로직 수정 (#293)
MUKER-WON May 10, 2024
03fc077
UI/#291 Cell에 text 흘러넘치는 UI오류 (#295)
isakatty May 10, 2024
9359b92
UI/#294 가독성을 위해 컬러 변경 (#296)
yuhaeun-la May 10, 2024
bd4f5f9
[Fix] #297 즐겨찾기 위치 수정 (#298)
isakatty May 10, 2024
eb3fe0a
ReleaseFix/#300 v1.2.2 배포를 위한 Setting 수정 (#301)
MUKER-WON May 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/upload_testflight.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: UploadTestflight

on:
push:
branches:
- releaseFix/**
pull_request:
branches:
- main
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public extension String {
static let organizationName = "Pepsi-Club"
static let teamId = "T4W7695R5C"
/// 앱스토어에 게시할 때마다 증가해줘야 하는 버전
static let marketingVersion: Self = "1.2.1"
static let marketingVersion: Self = "1.2.2"
/// 개발자가 내부적으로 확인하기 위한 용도 (날짜를 사용하기도 함 - 2023.12.8.1 )
static var buildVersion: Self {
let date = Date()
Expand Down
2 changes: 1 addition & 1 deletion Projects/App/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ let project = Project.makeProject(
.remote(
url: "https://github.com/firebase/firebase-ios-sdk",
requirement: .exact("10.23.1")
)
),
],
dependencies: [
.mainFeature,
Expand Down
Binary file removed Projects/App/Resources/AppLogo.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions Projects/App/Resources/Base.lproj/LaunchScreen.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="AppLogo.png" translatesAutoresizingMaskIntoConstraints="NO" id="SN6-pt-WKY">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="appLogo2.png" translatesAutoresizingMaskIntoConstraints="NO" id="SN6-pt-WKY">
<rect key="frame" x="116.66666666666669" y="276" width="170" height="300"/>
<constraints>
<constraint firstAttribute="width" constant="170" id="asc-3z-qNR"/>
Expand All @@ -25,7 +25,7 @@
</imageView>
</subviews>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
<color key="backgroundColor" red="0.20392156862745098" green="0.23137254901960785" blue="0.23137254901960785" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="backgroundColor" red="0.37647058823529411" green="0.47058823529411764" blue="0.81960784313725488" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="SN6-pt-WKY" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="FsO-Z9-kQF"/>
<constraint firstItem="SN6-pt-WKY" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" constant="5" id="cME-92-iZn"/>
Expand All @@ -38,6 +38,6 @@
</scene>
</scenes>
<resources>
<image name="AppLogo.png" width="823" height="1066"/>
<image name="appLogo2.png" width="500" height="500"/>
</resources>
</document>
1 change: 1 addition & 0 deletions Projects/App/Resources/Lottie/cleanMap.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"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],"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.9451,0.3843,0.3608],"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.9686,0.749,0.7098],"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],"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],"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],"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.6667,0.8549,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.8863,0.8863,0.8941],"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.949,0.949,0.949],"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":[]}
1 change: 1 addition & 0 deletions Projects/App/Resources/Lottie/goingBus.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Projects/App/Resources/Lottie/list.json

Large diffs are not rendered by default.

Loading
Loading