Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions ACON-iOS/ACON-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
15CF62C22D577B600000A10F /* ProfileValidMessageType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15CF62C12D577B600000A10F /* ProfileValidMessageType.swift */; };
15CF62C52D579F2D0000A10F /* ProfileViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15CF62C42D579F2D0000A10F /* ProfileViewModel.swift */; };
15D122292D58BD0200E79866 /* DayOfMonthType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15D122282D58BD0200E79866 /* DayOfMonthType.swift */; };
15D6901E2DD723FA0009278D /* SpotDetailMoreViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15D6901D2DD723FA0009278D /* SpotDetailMoreViewController.swift */; };
15DC053F2D623DD400B752DD /* PostLogoutRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15DC053E2D623DD400B752DD /* PostLogoutRequest.swift */; };
15F15E832DBFD17A002F81E2 /* Pretendard-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = 15F15E822DBFD17A002F81E2 /* Pretendard-Light.otf */; };
15F15E852DBFD206002F81E2 /* LanguageType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15F15E842DBFD206002F81E2 /* LanguageType.swift */; };
Expand Down Expand Up @@ -338,6 +339,7 @@
15CF62C12D577B600000A10F /* ProfileValidMessageType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileValidMessageType.swift; sourceTree = "<group>"; };
15CF62C42D579F2D0000A10F /* ProfileViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewModel.swift; sourceTree = "<group>"; };
15D122282D58BD0200E79866 /* DayOfMonthType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DayOfMonthType.swift; sourceTree = "<group>"; };
15D6901D2DD723FA0009278D /* SpotDetailMoreViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpotDetailMoreViewController.swift; sourceTree = "<group>"; };
15DC053E2D623DD400B752DD /* PostLogoutRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostLogoutRequest.swift; sourceTree = "<group>"; };
15F15E822DBFD17A002F81E2 /* Pretendard-Light.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Light.otf"; sourceTree = "<group>"; };
15F15E842DBFD206002F81E2 /* LanguageType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LanguageType.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1334,6 +1336,7 @@
151AB68F2DD367BF00D01DE8 /* SpotDetailView.swift */,
151AB6C42DD3874100D01DE8 /* SpotDetailViewController.swift */,
151AB6C82DD3E64600D01DE8 /* MenuImageSlideViewController.swift */,
15D6901D2DD723FA0009278D /* SpotDetailMoreViewController.swift */,
);
path = View;
sourceTree = "<group>";
Expand Down Expand Up @@ -1934,6 +1937,7 @@
74D31C7A2D5841EA00B4B2B4 /* PhotoCollectionViewController.swift in Sources */,
746261632D3EA1D500A4E84F /* GetSearchSuggestionResponse.swift in Sources */,
D61917EC2D3E484A001BF0EE /* OnboardingRequest.swift in Sources */,
15D6901E2DD723FA0009278D /* SpotDetailMoreViewController.swift in Sources */,
74A13D672DCBC2BD007FFFC3 /* DislikeFoodCollectionViewCell.swift in Sources */,
D652597C2D62775C00B8176E /* CustomTextFieldView.swift in Sources */,
1533FCD12D55EE2600F985A0 /* ProfileBoxComponent.swift in Sources */,
Expand Down
33 changes: 26 additions & 7 deletions ACON-iOS/ACON-iOS/Global/Extensions/UIView+.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,40 @@
import UIKit

extension UIView {

// MARK: - UIView 여러 개 한 번에 addSubview

func addSubviews(_ views: UIView...) {
views.forEach { self.addSubview($0) }
}


// MARK: - 뷰 모서리 둥글게

func roundCorners(cornerRadius: CGFloat, maskedCorners: CACornerMask) {
clipsToBounds = true
layer.cornerRadius = cornerRadius
layer.maskedCorners = CACornerMask(arrayLiteral: maskedCorners)
}




// MARK: - 바텀시트 핸들 이미지 추가

func setHandlerImageView() {
let handlerImageView: UIImageView = UIImageView()
self.addSubview(handlerImageView)

handlerImageView.snp.makeConstraints {
$0.top.equalToSuperview().inset(14 * ScreenUtils.heightRatio)
$0.centerX.equalToSuperview()
$0.width.equalTo(36 * ScreenUtils.widthRatio)
$0.height.equalTo(5 * ScreenUtils.heightRatio)
}

handlerImageView.do {
$0.image = .btnBottomsheetBar
$0.contentMode = .scaleAspectFit
}
}

}
4 changes: 2 additions & 2 deletions ACON-iOS/ACON-iOS/Global/Extensions/UIViewController+.swift
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ extension UIViewController {

// MARK: - 바텀시트 내려가게

func setSheetLayout(detent: ACSheetDetent) {
func setSheetLayout(detent: ACSheetDetentType) {
self.modalPresentationStyle = .pageSheet

if let sheet = self.sheetPresentationController {
Expand Down Expand Up @@ -99,7 +99,7 @@ extension UIViewController {

func presentLoginModal(_ presentedModalType: String) {
let vc = LoginModalViewController(presentedModalType)
vc.setSheetLayout(detent: .short)
vc.setSheetLayout(detent: .middle)

self.present(vc, animated: true)
}
Expand Down
6 changes: 6 additions & 0 deletions ACON-iOS/ACON-iOS/Global/Literals/StringLiterals.swift
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,10 @@ enum StringLiterals {

static let findCourse = "길 찾기"

static let seeMore = "더보기"

static let reportInfoError = "정보 오류 신고하기"

}


Expand All @@ -242,6 +246,8 @@ enum StringLiterals {

static let termsOfUseLink = "https://bit.ly/acon서비스이용약관"

static let spotInfoErrorReportLink = "https://walla.my/survey/ekYLYwpJv2d0Eznnijla"

}

enum Network {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "btn_bottomsheet bar.svg",
"filename" : "btn_bottomsheet_bar.svg",
"idiom" : "universal"
}
],
Expand Down

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 14 additions & 14 deletions ACON-iOS/ACON-iOS/Global/Utils/Enums/ACSheetDetentType.swift
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
//
// SheetUtils.swift
// ACSheetDetentType.swift
// ACON-iOS
//
// Created by 이수민 on 1/13/25.
//

import UIKit

enum ACSheetDetent: String {
enum ACSheetDetentType: String {

case short
case middle
case long

var identifier: UISheetPresentationController.Detent.Identifier {
return UISheetPresentationController.Detent.Identifier(rawValue)
}

var height: CGFloat {
switch self {
case .short: return 478
case .middle: return 558
case .long: return 724
case .short: return 204
case .middle: return 518
case .long: return 680
}
}

var detent: UISheetPresentationController.Detent {
return UISheetPresentationController.Detent.custom(identifier: identifier) { _ in
let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene
let safeAreaBottom = windowScene?.windows.first?.safeAreaInsets.bottom ?? 0
return ScreenUtils.heightRatio * height - safeAreaBottom
}
}

}

extension ACSheetDetent {
extension ACSheetDetentType {

static var shortDetent: UISheetPresentationController.Detent {
return short.detent
}

static var middleDetent: UISheetPresentationController.Detent {
return middle.detent
}

static var longDetent: UISheetPresentationController.Detent {
return long.detent
}

}
25 changes: 0 additions & 25 deletions ACON-iOS/ACON-iOS/Presentation/Base/BaseView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ import Then

class BaseView: UIView {

private let handlerImageView: UIImageView = UIImageView()


// MARK: - Initializer

override init(frame: CGRect) {
Expand All @@ -38,25 +35,3 @@ class BaseView: UIView {
}

}

// MARK: setHandlerImage for Modal

extension BaseView {

func setHandlerImageView() {
self.addSubview(handlerImageView)

handlerImageView.snp.makeConstraints {
$0.top.equalToSuperview().inset(ScreenUtils.heightRatio*4)
$0.centerX.equalToSuperview()
$0.width.equalTo(ScreenUtils.heightRatio*36)
$0.height.equalTo(ScreenUtils.heightRatio*5)
}

handlerImageView.do {
$0.image = .btnBottomsheetBar
$0.contentMode = .scaleAspectFit
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ private extension ProfileViewController {
func tappedNeedLoginButton() {
// presentLoginModal() // TODO: 메소드 수정 고민해보기 (SpotListVC도 로그인 성공했을 때 reloadData 시켜야할 것 같기 때문)
let vc = LoginModalViewController("profile")
vc.setSheetLayout(detent: .short)
vc.setSheetLayout(detent: .middle)
vc.onSuccessLogin = { [weak self] onSuccess in
guard let self = self else { return }
viewModel.onLoginSuccess.value = onSuccess
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,15 @@ extension SpotDetailSideButton {
func setLayout() {
self.snp.makeConstraints {
$0.width.equalTo(36)
$0.height.equalTo(58)
}

imageView.snp.makeConstraints {
$0.size.equalTo(36)
$0.size.equalTo(36 * ScreenUtils.heightRatio)
$0.top.centerX.equalToSuperview()
}

label.snp.makeConstraints {
$0.top.equalTo(imageView.snp.bottom).offset(4)
$0.top.equalTo(imageView.snp.bottom).offset(min(4, 4 * ScreenUtils.heightRatio))
$0.centerX.equalToSuperview()
$0.bottom.equalToSuperview()
}
Expand All @@ -63,25 +62,28 @@ extension SpotDetailSideButton {
imageView.do {
$0.image = type.image
$0.contentMode = .scaleAspectFit
$0.layer.shadowColor = UIColor.acBlack.cgColor
$0.layer.shadowOpacity = 0.16
$0.layer.shadowOffset = CGSize(width: 0, height: 4)
$0.layer.shadowRadius = 4
$0.layer.masksToBounds = false

$0.layer.do {
$0.shadowColor = UIColor.acBlack.cgColor
$0.shadowOpacity = 0.16
$0.shadowOffset = CGSize(width: 0, height: 4)
$0.shadowRadius = 4
$0.masksToBounds = false
}
}

label.do {
let attrText = type.text.attributedString(.c1SB)
let mutable = NSMutableAttributedString(attributedString: attrText)

// shadow 추가
let shadow = NSShadow()
shadow.shadowColor = UIColor.acBlack.withAlphaComponent(0.16)
shadow.shadowOffset = CGSize(width: 0, height: 4)
shadow.shadowBlurRadius = 4

mutable.addAttribute(.shadow, value: shadow, range: NSRange(location: 0, length: mutable.length))

$0.attributedText = mutable
$0.textAlignment = .center
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class MenuImageSlideViewController: BaseViewController {
super.viewDidLoad()

setDelegate()
registerCell()
addTarget()
}

Expand Down Expand Up @@ -110,7 +111,9 @@ class MenuImageSlideViewController: BaseViewController {
private func setDelegate() {
collectionView.dataSource = self
collectionView.delegate = self
}

private func registerCell() {
collectionView.register(MenuCollectionViewCell.self, forCellWithReuseIdentifier: MenuCollectionViewCell.cellIdentifier)
}

Expand Down
Loading