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.

Sign up for GitHub

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

Jump to bottom

[Fix] #117 - 온보딩 mp4 파일 수정 #128

Merged
merged 3 commits into from
Jun 25, 2023
Merged

[Fix] #117 - 온보딩 mp4 파일 수정 #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6d477b
[Fix] #117 - 온보딩 mp4 수정
Jun 25, 2023
24e1c82
[Merge] 'develop' into feat/#117
Jun 25, 2023
844a6a3
[Fix] #117 - mp4 파일 수정
Jun 25, 2023
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
8 changes: 4 additions & 4 deletions iOS-NOTTODO/iOS-NOTTODO.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@
6C44127D29A35A1000313C3F /* KakaoSDKTalk in Frameworks */ = {isa = PBXBuildFile; productRef = 6C44127C29A35A1000313C3F /* KakaoSDKTalk */; };
6C44127F29A35A1000313C3F /* KakaoSDKTemplate in Frameworks */ = {isa = PBXBuildFile; productRef = 6C44127E29A35A1000313C3F /* KakaoSDKTemplate */; };
6C44128129A35A1000313C3F /* KakaoSDKUser in Frameworks */ = {isa = PBXBuildFile; productRef = 6C44128029A35A1000313C3F /* KakaoSDKUser */; };
6C5F96532A48579A0009DF80 /* logo.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 6C5F96522A48579A0009DF80 /* logo.mp4 */; };
6C9628A72A22208F003ADE25 /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = 6C9628A62A22208F003ADE25 /* Lottie */; };
6C9628A92A22209E003ADE25 /* LogoOnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C9628A82A22209E003ADE25 /* LogoOnboardingViewController.swift */; };
6C9CF1F92A45B9E3005CF39E /* logo.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 6C9CF1F82A45B9E3005CF39E /* logo.mp4 */; };
6CA208232A18FE78001C4247 /* RecommendAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CA208222A18FE78001C4247 /* RecommendAPI.swift */; };
6CA208252A18FEEA001C4247 /* RecommendService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CA208242A18FEEA001C4247 /* RecommendService.swift */; };
6CA208272A18FFCF001C4247 /* RecommendResponseDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CA208262A18FFCF001C4247 /* RecommendResponseDTO.swift */; };
Expand Down Expand Up @@ -257,8 +257,8 @@
6C16015B29C56DBA005AE3F5 /* MyInfoAccountViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyInfoAccountViewController.swift; sourceTree = "<group>"; };
6C16016129C59EFD005AE3F5 /* MyInfoAccountModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyInfoAccountModel.swift; sourceTree = "<group>"; };
6C16016329C5E37D005AE3F5 /* MyInfoAccountStackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyInfoAccountStackView.swift; sourceTree = "<group>"; };
6C5F96522A48579A0009DF80 /* logo.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = logo.mp4; sourceTree = "<group>"; };
6C9628A82A22209E003ADE25 /* LogoOnboardingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogoOnboardingViewController.swift; sourceTree = "<group>"; };
6C9CF1F82A45B9E3005CF39E /* logo.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = logo.mp4; sourceTree = "<group>"; };
6CA208222A18FE78001C4247 /* RecommendAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecommendAPI.swift; sourceTree = "<group>"; };
6CA208242A18FEEA001C4247 /* RecommendService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecommendService.swift; sourceTree = "<group>"; };
6CA208262A18FFCF001C4247 /* RecommendResponseDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecommendResponseDTO.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -955,8 +955,8 @@
6C9628AA2A2220E2003ADE25 /* Lottie */ = {
isa = PBXGroup;
children = (
6C9CF1F82A45B9E3005CF39E /* logo.mp4 */,
6CC54C192A28C3AE00AAD76D /* value.json */,
6C5F96522A48579A0009DF80 /* logo.mp4 */,
);
path = Lottie;
sourceTree = "<group>";
Expand Down Expand Up @@ -1159,7 +1159,6 @@
buildActionMask = 2147483647;
files = (
3B027AAC299C35E500BEB65C /* Colors.xcassets in Resources */,
6C9CF1F92A45B9E3005CF39E /* logo.mp4 in Resources */,
3B4E12FA2A27C4DD001D1EC1 /* Pretendard-Bold.otf in Resources */,
3B146D9C299D07D500B17B62 /* Pretendard-Regular.otf in Resources */,
3B146D9E299D081400B17B62 /* Pretendard-SemiBold.otf in Resources */,
Expand All @@ -1168,6 +1167,7 @@
3B027A81299C31B600BEB65C /* Assets.xcassets in Resources */,
3B146D9A299D079D00B17B62 /* Pretendard-Light.otf in Resources */,
3B146D98299D077800B17B62 /* Pretendard-Medium.otf in Resources */,
6C5F96532A48579A0009DF80 /* logo.mp4 in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
2 changes: 1 addition & 1 deletion iOS-NOTTODO/iOS-NOTTODO/Application/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
KakaoSDK.initSDK(appKey: "f06c671df540ff4a8f8275f453368748")

if KeychainUtil.getAccessToken() != "" {
self.skipAuthView()
// self.skipAuthView()
print("토큰유효!!!!!")
} else {
// self.showAuthView()
Expand Down
Binary file modified iOS-NOTTODO/iOS-NOTTODO/Presentation/Onboarding/Lottie/logo.mp4
View file
Open in desktop
Binary file not shown.
Binary file added iOS-NOTTODO/iOS-NOTTODO/Presentation/Onboarding/Lottie/아요_로고.mp4
View file
Open in desktop
Binary file not shown.
Loading