-
Notifications
You must be signed in to change notification settings - Fork 1
[#392] 커피 이벤트 추가 #393
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
Merged
[#392] 커피 이벤트 추가 #393
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
179c3e9
[#383] 앱 아이콘 기본으로 변경
Hrepay f1a1dc8
[#383] 스플래시 화면 기본으로 변경
Hrepay 6854d25
[#392] 바텀 네비게이션에 커피 이벤트 탭 추가 및 웹뷰 연동
Hrepay c7d73cb
Merge branch 'release/v3.2.1' into feat/#392
Hrepay 578ba8f
[#392] 커피 웹뷰를 전체화면 모달 방식으로 변경
Hrepay 2e885c0
[#392] 커피 탭 아이콘 이미지 교체
Hrepay 1866d69
[#392] 커피 웹뷰 닫기 시 확인 다이얼로그 추가
Hrepay e4d7e5a
[#392] 커피 이벤트 화면 ID 추가
Hrepay 55d68da
[#392] 커피 이벤트 탭 코드 리뷰 반영
Hrepay File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file modified
BIN
-914 Bytes
(76%)
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon.appiconset/100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-47 KB
(42%)
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon.appiconset/1024.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-1.27 KB
(70%)
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon.appiconset/114.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-1.24 KB
(73%)
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon.appiconset/120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-1.73 KB
(70%)
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon.appiconset/144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-1.88 KB
(70%)
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon.appiconset/152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.2 KB
(68%)
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon.appiconset/167.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.41 KB
(68%)
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon.appiconset/180.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-54 Bytes
(91%)
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon.appiconset/20.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-108 Bytes
(87%)
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon.appiconset/29.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-188 Bytes
(85%)
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon.appiconset/40.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-319 Bytes
(80%)
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon.appiconset/50.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-313 Bytes
(83%)
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon.appiconset/57.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-351 Bytes
(81%)
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon.appiconset/58.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-391 Bytes
(79%)
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon.appiconset/60.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-556 Bytes
(78%)
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon.appiconset/72.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-617 Bytes
(76%)
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon.appiconset/76.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-659 Bytes
(77%)
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon.appiconset/80.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-683 Bytes
(78%)
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon.appiconset/87.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+3.66 KB
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon_christmas.appiconset/100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+81.6 KB
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon_christmas.appiconset/1024.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+4.2 KB
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon_christmas.appiconset/114.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+4.53 KB
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon_christmas.appiconset/120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+5.79 KB
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon_christmas.appiconset/144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+6.25 KB
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon_christmas.appiconset/152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+6.98 KB
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon_christmas.appiconset/167.png
Oops, something went wrong.
Binary file added
BIN
+7.57 KB
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon_christmas.appiconset/180.png
Oops, something went wrong.
Binary file added
BIN
+573 Bytes
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon_christmas.appiconset/20.png
Oops, something went wrong.
Binary file added
BIN
+855 Bytes
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon_christmas.appiconset/29.png
Oops, something went wrong.
Binary file added
BIN
+1.19 KB
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon_christmas.appiconset/40.png
Oops, something went wrong.
Binary file added
BIN
+1.59 KB
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon_christmas.appiconset/50.png
Oops, something went wrong.
Binary file added
BIN
+1.79 KB
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon_christmas.appiconset/57.png
Oops, something went wrong.
Binary file added
BIN
+1.76 KB
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon_christmas.appiconset/58.png
Oops, something went wrong.
Binary file added
BIN
+1.82 KB
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon_christmas.appiconset/60.png
Oops, something went wrong.
Binary file added
BIN
+2.42 KB
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon_christmas.appiconset/72.png
Oops, something went wrong.
Binary file added
BIN
+2.55 KB
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon_christmas.appiconset/76.png
Oops, something went wrong.
Binary file added
BIN
+2.77 KB
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon_christmas.appiconset/80.png
Oops, something went wrong.
Binary file added
BIN
+3 KB
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon_christmas.appiconset/87.png
Oops, something went wrong.
158 changes: 158 additions & 0 deletions
158
EATSSU/App/Resources/Assets/Images.xcassets/AppIcon_christmas.appiconset/Contents.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,158 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "40.png", | ||
| "idiom" : "iphone", | ||
| "scale" : "2x", | ||
| "size" : "20x20" | ||
| }, | ||
| { | ||
| "filename" : "60.png", | ||
| "idiom" : "iphone", | ||
| "scale" : "3x", | ||
| "size" : "20x20" | ||
| }, | ||
| { | ||
| "filename" : "29.png", | ||
| "idiom" : "iphone", | ||
| "scale" : "1x", | ||
| "size" : "29x29" | ||
| }, | ||
| { | ||
| "filename" : "58.png", | ||
| "idiom" : "iphone", | ||
| "scale" : "2x", | ||
| "size" : "29x29" | ||
| }, | ||
| { | ||
| "filename" : "87.png", | ||
| "idiom" : "iphone", | ||
| "scale" : "3x", | ||
| "size" : "29x29" | ||
| }, | ||
| { | ||
| "filename" : "80.png", | ||
| "idiom" : "iphone", | ||
| "scale" : "2x", | ||
| "size" : "40x40" | ||
| }, | ||
| { | ||
| "filename" : "120.png", | ||
| "idiom" : "iphone", | ||
| "scale" : "3x", | ||
| "size" : "40x40" | ||
| }, | ||
| { | ||
| "filename" : "57.png", | ||
| "idiom" : "iphone", | ||
| "scale" : "1x", | ||
| "size" : "57x57" | ||
| }, | ||
| { | ||
| "filename" : "114.png", | ||
| "idiom" : "iphone", | ||
| "scale" : "2x", | ||
| "size" : "57x57" | ||
| }, | ||
| { | ||
| "filename" : "120.png", | ||
| "idiom" : "iphone", | ||
| "scale" : "2x", | ||
| "size" : "60x60" | ||
| }, | ||
| { | ||
| "filename" : "180.png", | ||
| "idiom" : "iphone", | ||
| "scale" : "3x", | ||
| "size" : "60x60" | ||
| }, | ||
| { | ||
| "filename" : "20.png", | ||
| "idiom" : "ipad", | ||
| "scale" : "1x", | ||
| "size" : "20x20" | ||
| }, | ||
| { | ||
| "filename" : "40.png", | ||
| "idiom" : "ipad", | ||
| "scale" : "2x", | ||
| "size" : "20x20" | ||
| }, | ||
| { | ||
| "filename" : "29.png", | ||
| "idiom" : "ipad", | ||
| "scale" : "1x", | ||
| "size" : "29x29" | ||
| }, | ||
| { | ||
| "filename" : "58.png", | ||
| "idiom" : "ipad", | ||
| "scale" : "2x", | ||
| "size" : "29x29" | ||
| }, | ||
| { | ||
| "filename" : "40.png", | ||
| "idiom" : "ipad", | ||
| "scale" : "1x", | ||
| "size" : "40x40" | ||
| }, | ||
| { | ||
| "filename" : "80.png", | ||
| "idiom" : "ipad", | ||
| "scale" : "2x", | ||
| "size" : "40x40" | ||
| }, | ||
| { | ||
| "filename" : "50.png", | ||
| "idiom" : "ipad", | ||
| "scale" : "1x", | ||
| "size" : "50x50" | ||
| }, | ||
| { | ||
| "filename" : "100.png", | ||
| "idiom" : "ipad", | ||
| "scale" : "2x", | ||
| "size" : "50x50" | ||
| }, | ||
| { | ||
| "filename" : "72.png", | ||
| "idiom" : "ipad", | ||
| "scale" : "1x", | ||
| "size" : "72x72" | ||
| }, | ||
| { | ||
| "filename" : "144.png", | ||
| "idiom" : "ipad", | ||
| "scale" : "2x", | ||
| "size" : "72x72" | ||
| }, | ||
| { | ||
| "filename" : "76.png", | ||
| "idiom" : "ipad", | ||
| "scale" : "1x", | ||
| "size" : "76x76" | ||
| }, | ||
| { | ||
| "filename" : "152.png", | ||
| "idiom" : "ipad", | ||
| "scale" : "2x", | ||
| "size" : "76x76" | ||
| }, | ||
| { | ||
| "filename" : "167.png", | ||
| "idiom" : "ipad", | ||
| "scale" : "2x", | ||
| "size" : "83.5x83.5" | ||
| }, | ||
| { | ||
| "filename" : "1024.png", | ||
| "idiom" : "ios-marketing", | ||
| "scale" : "1x", | ||
| "size" : "1024x1024" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
95 changes: 95 additions & 0 deletions
95
EATSSU/App/Sources/Presentation/Coffee/ViewController/CoffeeWebViewController.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| // | ||
| // CoffeeWebViewController.swift | ||
| // EATSSU-DEV | ||
| // | ||
| // Created by 황상환 on 2/23/26. | ||
| // | ||
|
|
||
| import UIKit | ||
| import WebKit | ||
|
|
||
| import EATSSUDesign | ||
|
|
||
| import SnapKit | ||
|
|
||
| final class CoffeeWebViewController: BaseViewController { | ||
|
|
||
| // MARK: - UI Components | ||
|
|
||
| private let webView = WKWebView() | ||
|
|
||
| private let closeButton: UIButton = { | ||
| let button = UIButton(type: .system) | ||
| let image = UIImage(systemName: "xmark")? | ||
| .withConfiguration(UIImage.SymbolConfiguration(pointSize: 16, weight: .semibold)) | ||
| button.setImage(image, for: .normal) | ||
| button.tintColor = .gray700 | ||
| button.backgroundColor = .white | ||
| button.layer.cornerRadius = 18 | ||
| button.layer.shadowColor = UIColor.black.cgColor | ||
| button.layer.shadowOpacity = 0.15 | ||
| button.layer.shadowOffset = CGSize(width: 0, height: 2) | ||
| button.layer.shadowRadius = 4 | ||
| return button | ||
| }() | ||
|
|
||
| // MARK: - Life Cycle | ||
|
|
||
| override func viewDidLoad() { | ||
| super.viewDidLoad() | ||
|
|
||
| webView.scrollView.contentInsetAdjustmentBehavior = .never | ||
| logScreenView(screenID: FirebaseScreenID.AnyoneButMeActivity.abm1) | ||
| loadWebPage() | ||
| } | ||
|
|
||
| override func configureUI() { | ||
| view.addSubview(webView) | ||
| view.addSubview(closeButton) | ||
| } | ||
|
|
||
| override func setLayout() { | ||
| webView.snp.makeConstraints { | ||
| $0.edges.equalToSuperview() | ||
| } | ||
|
|
||
| closeButton.snp.makeConstraints { | ||
| $0.top.equalTo(view.safeAreaLayoutGuide).offset(8) | ||
| $0.leading.equalToSuperview().offset(16) | ||
| $0.size.equalTo(36) | ||
| } | ||
| } | ||
|
|
||
| override func setButtonEvent() { | ||
| closeButton.addTarget(self, action: #selector(closeTapped), for: .touchUpInside) | ||
| } | ||
|
|
||
| // MARK: - Private | ||
|
|
||
| @objc private func closeTapped() { | ||
| let dialogView = EATSSUDialogView() | ||
| dialogView.configure( | ||
| title: TextLiteral.Coffee.askLeave, | ||
| message: TextLiteral.Coffee.leaveWarning | ||
| ) | ||
| dialogView.setButtonTitles(cancel: TextLiteral.Coffee.leave, confirm: TextLiteral.Coffee.continueEvent) | ||
| view.addSubview(dialogView) | ||
| dialogView.snp.makeConstraints { | ||
| $0.edges.equalToSuperview() | ||
| } | ||
|
|
||
| dialogView.cancelButton.addAction(UIAction { [weak self] _ in | ||
| dialogView.removeFromSuperview() | ||
| self?.dismiss(animated: true) | ||
| }, for: .touchUpInside) | ||
|
|
||
| dialogView.confirmButton.addAction(UIAction { _ in | ||
| dialogView.removeFromSuperview() | ||
| }, for: .touchUpInside) | ||
| } | ||
|
|
||
| private func loadWebPage() { | ||
| guard let url = URL(string: "https://eatssu-coffee.figma.site/") else { return } | ||
Hrepay marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| webView.load(URLRequest(url: url)) | ||
Hrepay marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.