diff --git a/GEON-PPANG-iOS/Core/DesignSystem/Source/Assets/UIImage+.swift b/GEON-PPANG-iOS/Core/DesignSystem/Source/Assets/UIImage+.swift index e772dbc6..187d4d1d 100644 --- a/GEON-PPANG-iOS/Core/DesignSystem/Source/Assets/UIImage+.swift +++ b/GEON-PPANG-iOS/Core/DesignSystem/Source/Assets/UIImage+.swift @@ -7,178 +7,104 @@ import UIKit -public extension UIImage { +extension UIImage { // 따로 픽셀이 적혀있지 않은 컴포넌트는 24px임. - // MARK: - Icon + // Bread Types + static let icCakeDisable20px = UIImage(named: "ic_cake_disable_20px")!.withRenderingMode(.alwaysOriginal) + static let icHardDisable20px = UIImage(named: "ic_hard_disable_20px")!.withRenderingMode(.alwaysOriginal) + static let icSandwichDisable20px = UIImage(named: "ic_sandwich_disable_20px")!.withRenderingMode(.alwaysOriginal) + static let icCakeEnable20px = UIImage(named: "ic_cake_enable_20px")!.withRenderingMode(.alwaysOriginal) + static let icHardEnable20px = UIImage(named: "ic_hard_enable_20px")!.withRenderingMode(.alwaysOriginal) + static let icSandwichEnable20px = UIImage(named: "ic_sandwich_enable_20px")!.withRenderingMode(.alwaysOriginal) - enum Icon { - - // MARK: - Bread Types - - enum Cake { - static let disabled = UIImage(named: "ic_cake_disable_20px")!.withRenderingMode(.alwaysOriginal) - static let enabled = UIImage(named: "ic_cake_enable_20px")!.withRenderingMode(.alwaysOriginal) - } - - enum Hard { - static let disabled = UIImage(named: "ic_hard_disable_20px")!.withRenderingMode(.alwaysOriginal) - static let enabled = UIImage(named: "ic_hard_enable_20px")!.withRenderingMode(.alwaysOriginal) - } - - enum Sandwich { - static let disabled = UIImage(named: "ic_sandwich_disable_20px")!.withRenderingMode(.alwaysOriginal) - static let enabled = UIImage(named: "ic_sandwich_enable_20px")!.withRenderingMode(.alwaysOriginal) - } - - // MARK: - Emoji - - enum Smile { - static let px64 = UIImage(named: "ic_smile")!.withRenderingMode(.alwaysOriginal) - static let px86 = UIImage(named: "ic_smile_86px")!.withRenderingMode(.alwaysOriginal) - } - static let sad = UIImage(named: "icon_sad")!.withRenderingMode(.alwaysOriginal) - static let crying = UIImage(named: "icon_crying")!.withRenderingMode(.alwaysOriginal) - - // MARK: - arrow - - enum Arrow { - static let down = UIImage(named: "ic_arrow_down")!.withRenderingMode(.alwaysOriginal) - static let left = UIImage(named: "ic_arrow_left")!.withRenderingMode(.alwaysOriginal) - static let right = UIImage(named: "ic_arrow_right")!.withRenderingMode(.alwaysOriginal) - static let up = UIImage(named: "ic_arrow_up")!.withRenderingMode(.alwaysOriginal) - } - - // MARK: - Logo - - enum Logo { - static let px16 = UIImage(named: "ic_logo_16px")!.withRenderingMode(.alwaysOriginal) - static let px20 = UIImage(named: "ic_logo_20px")!.withRenderingMode(.alwaysOriginal) - } - - // MARK: - Bookmark - - enum Bookmark { - static let px16gray300 = UIImage(named: "ic_bookmark_16px_300")!.withRenderingMode(.alwaysOriginal) /// gray300 - static let px16gray400 = UIImage(named: "ic_bookmark_16px_400")!.withRenderingMode(.alwaysOriginal) /// gray400 - static let point = UIImage(named: "ic_bookmark")!.withRenderingMode(.alwaysOriginal) - } - - // MARK: - Review - - enum Review { - static let px16 = UIImage(named: "ic_review_16px")!.withRenderingMode(.alwaysOriginal) - static let point = UIImage(named: "ic_review")!.withRenderingMode(.alwaysOriginal) - static let px16gray400 = UIImage(named: "ic_review_16px_400")!.withRenderingMode(.alwaysOriginal) - static let bread = UIImage(named: "ic_review_bread")!.withRenderingMode(.alwaysOriginal) - } - - // MARK: - Search - - enum Search { - static let gray400 = UIImage(named: "ic_search_400")!.withRenderingMode(.alwaysOriginal) /// gray400 - static let gray600 = UIImage(named: "ic_search_600")!.withRenderingMode(.alwaysOriginal) /// gray600 - } - - // MARK: - Filter - - enum Filter { - static let check = UIImage(named: "ic_filter_check")!.withRenderingMode(.alwaysOriginal) - static let uncheck = UIImage(named: "ic_filter_unchecked")!.withRenderingMode(.alwaysOriginal) - } - - // MARK: - Tabbar - - enum Home { - static let disabled = UIImage(named: "ic_home_disable")!.withRenderingMode(.alwaysOriginal) - static let enabled = UIImage(named: "ic_home_enable")!.withRenderingMode(.alwaysOriginal) - } - - enum Mypage { - static let disabled = UIImage(named: "ic_mypage_disable")!.withRenderingMode(.alwaysOriginal) - static let enabled = UIImage(named: "ic_mypage_enable")!.withRenderingMode(.alwaysOriginal) - } - - enum StoreList { - static let disabled = UIImage(named: "ic_storelist_disable")!.withRenderingMode(.alwaysOriginal) - static let enabled = UIImage(named: "ic_storelist_enable")!.withRenderingMode(.alwaysOriginal) - } - - // MARK: - others - - static let call = UIImage(named: "ic_call")!.withRenderingMode(.alwaysOriginal) - static let check = UIImage(named: "ic_check")!.withRenderingMode(.alwaysOriginal) - static let deleteKeyword = UIImage(named: "ic_delete_keyword")!.withRenderingMode(.alwaysOriginal) /// 최근 검색어 삭제용 (앱잼 이후) - static let delete = UIImage(named: "ic_delete")!.withRenderingMode(.alwaysOriginal) - static let dotdotdot = UIImage(named: "ic_dotdotdot")!.withRenderingMode(.alwaysOriginal) - static let hide = UIImage(named: "ic_hide")!.withRenderingMode(.alwaysOriginal) - static let launchscreen = UIImage(named: "ic_launchscreen")!.withRenderingMode(.alwaysOriginal) - static let link = UIImage(named: "ic_link")!.withRenderingMode(.alwaysOriginal) - static let list = UIImage(named: "ic_list")!.withRenderingMode(.alwaysOriginal) // 건빵집 리스트 옆에 얘 써야 됨, 탭바의 storelist 아님! - static let map = UIImage(named: "ic_map")!.withRenderingMode(.alwaysOriginal) - static let notice = UIImage(named: "ic_notice_18px")!.withRenderingMode(.alwaysOriginal) - static let profile = UIImage(named: "ic_profile")!.withRenderingMode(.alwaysOriginal) - static let show = UIImage(named: "ic_show")!.withRenderingMode(.alwaysOriginal) - static let store = UIImage(named: "ic_store")!.withRenderingMode(.alwaysOriginal) - static let swap = UIImage(named: "ic_swap")!.withRenderingMode(.alwaysOriginal) - static let time = UIImage(named: "ic_time")!.withRenderingMode(.alwaysOriginal) - static let login = UIImage(named: "ic_login")!.withRenderingMode(.alwaysOriginal) - } - - // MARK: - Environmental Marks - enum GMO { - static let mark22 = UIImage(named: "gmo_mark_22px")!.withRenderingMode(.alwaysOriginal) - static let mark28 = UIImage(named: "gmo_mark_28px")!.withRenderingMode(.alwaysOriginal) - } + // Emoji - enum HACCP { - static let mark22 = UIImage(named: "haccp_mark_22px")!.withRenderingMode(.alwaysOriginal) - static let mark28 = UIImage(named: "haccp_mark_28px")!.withRenderingMode(.alwaysOriginal) - } + static let iconSad = UIImage(named: "icon_sad")!.withRenderingMode(.alwaysOriginal) + static let iconCrying = UIImage(named: "icon_crying")!.withRenderingMode(.alwaysOriginal) - enum Vegan { - static let mark22 = UIImage(named: "vegan_mark_22px")!.withRenderingMode(.alwaysOriginal) - static let mark28 = UIImage(named: "vegan_mark_28px")!.withRenderingMode(.alwaysOriginal) - } + // Environmental Marks + static let gmoMark22px = UIImage(named: "gmo_mark_22px")!.withRenderingMode(.alwaysOriginal) + static let haccpMark22px = UIImage(named: "haccp_mark_22px")!.withRenderingMode(.alwaysOriginal) + static let veganMark22px = UIImage(named: "vegan_mark_22px")!.withRenderingMode(.alwaysOriginal) + static let gmoMark28px = UIImage(named: "gmo_mark_28px")!.withRenderingMode(.alwaysOriginal) + static let haccpMark28px = UIImage(named: "haccp_mark_28px")!.withRenderingMode(.alwaysOriginal) + static let veganMark28px = UIImage(named: "vegan_mark_28px")!.withRenderingMode(.alwaysOriginal) + // Icons + static let icArrowDown = UIImage(named: "ic_arrow_down")!.withRenderingMode(.alwaysOriginal) + static let icArrowLeft = UIImage(named: "ic_arrow_left")!.withRenderingMode(.alwaysOriginal) + static let icArrowRight = UIImage(named: "ic_arrow_right")!.withRenderingMode(.alwaysOriginal) + static let icArrowUp = UIImage(named: "ic_arrow_up")!.withRenderingMode(.alwaysOriginal) + static let icBookmark16px300 = UIImage(named: "ic_bookmark_16px_300")!.withRenderingMode(.alwaysOriginal) /// gray300 + static let icBookmark16px400 = UIImage(named: "ic_bookmark_16px_400")!.withRenderingMode(.alwaysOriginal) /// gray400 + static let icBookmark = UIImage(named: "ic_bookmark")!.withRenderingMode(.alwaysOriginal) + static let icCall = UIImage(named: "ic_call")!.withRenderingMode(.alwaysOriginal) + static let icCheck = UIImage(named: "ic_check")!.withRenderingMode(.alwaysOriginal) + static let icDeleteKeyword = UIImage(named: "ic_delete_keyword")!.withRenderingMode(.alwaysOriginal) /// 최근 검색어 삭제용 (앱잼 이후) + static let icDelete = UIImage(named: "ic_delete")!.withRenderingMode(.alwaysOriginal) + static let icDotdotdot = UIImage(named: "ic_dotdotdot")!.withRenderingMode(.alwaysOriginal) + static let icHide = UIImage(named: "ic_hide")!.withRenderingMode(.alwaysOriginal) + static let icLaunchscreen = UIImage(named: "ic_launchscreen")!.withRenderingMode(.alwaysOriginal) + static let icLink = UIImage(named: "ic_link")!.withRenderingMode(.alwaysOriginal) + static let icList = UIImage(named: "ic_list")!.withRenderingMode(.alwaysOriginal) // 건빵집 리스트 옆에 얘 써야 됨, 탭바의 storelist 아님! + static let icLogo16px = UIImage(named: "ic_logo_16px")!.withRenderingMode(.alwaysOriginal) + static let icLogo20px = UIImage(named: "ic_logo_20px")!.withRenderingMode(.alwaysOriginal) + static let icMap = UIImage(named: "ic_map")!.withRenderingMode(.alwaysOriginal) + static let icNotice18px = UIImage(named: "ic_notice_18px")!.withRenderingMode(.alwaysOriginal) + static let icProfile = UIImage(named: "ic_profile")!.withRenderingMode(.alwaysOriginal) + static let icReview16px = UIImage(named: "ic_review_16px")!.withRenderingMode(.alwaysOriginal) + static let icReview = UIImage(named: "ic_review")!.withRenderingMode(.alwaysOriginal) + static let icReview16px400 = UIImage(named: "ic_review_16px_400")!.withRenderingMode(.alwaysOriginal) + static let icReviewBread = UIImage(named: "ic_review_bread")!.withRenderingMode(.alwaysOriginal) + static let icSearch400 = UIImage(named: "ic_search_400")!.withRenderingMode(.alwaysOriginal) /// gray400 + static let icSearch600 = UIImage(named: "ic_search_600")!.withRenderingMode(.alwaysOriginal) /// gray600 + static let icSmile = UIImage(named: "ic_smile")!.withRenderingMode(.alwaysOriginal) + static let icShow = UIImage(named: "ic_show")!.withRenderingMode(.alwaysOriginal) + static let icSmile86px = UIImage(named: "ic_smile_86px")!.withRenderingMode(.alwaysOriginal) + static let icStore = UIImage(named: "ic_store")!.withRenderingMode(.alwaysOriginal) + static let icSwap = UIImage(named: "ic_swap")!.withRenderingMode(.alwaysOriginal) + static let icTime = UIImage(named: "ic_time")!.withRenderingMode(.alwaysOriginal) + static let icFilterCheck = UIImage(named: "ic_filter_check")!.withRenderingMode(.alwaysOriginal) + static let icFilterUnchecked = UIImage(named: "ic_filter_unchecked")!.withRenderingMode(.alwaysOriginal) + static let icLogin = UIImage(named: "ic_login")!.withRenderingMode(.alwaysOriginal) - // MARK: - Image + // Images + static let imgNoBookmark = UIImage(named: "img_no_bookmark")!.withRenderingMode(.alwaysOriginal) + static let imgNoMyreview = UIImage(named: "img_no_myreview")!.withRenderingMode(.alwaysOriginal) + static let imgNoReview = UIImage(named: "img_no_review")!.withRenderingMode(.alwaysOriginal) + static let imgNoSearchResult = UIImage(named: "img_no_search_result")!.withRenderingMode(.alwaysOriginal) + static let imgSearch = UIImage(named: "img_search")!.withRenderingMode(.alwaysOriginal) + static let imgServerMaintenance = UIImage(named: "img_server_maintenance")!.withRenderingMode(.alwaysOriginal) + static let imgWelcome = UIImage(named: "img_welcome")!.withRenderingMode(.alwaysOriginal) + static let imgLeftBubble = UIImage(named: "img_left_bubble")!.withRenderingMode(.alwaysOriginal) + static let imgRightBubble = UIImage(named: "img_right_bubble")!.withRenderingMode(.alwaysOriginal) + static let imgLoadingLarge = UIImage(named: "img_loading_large")!.withRenderingMode(.alwaysOriginal) + static let imgLoadingMedium = UIImage(named: "img_loading_medium")!.withRenderingMode(.alwaysOriginal) + static let imgLoadingSmall = UIImage(named: "img_loading_small")!.withRenderingMode(.alwaysOriginal) + + static let icSearch48px = UIImage(named: "ic_search_48px")!.withRenderingMode(.alwaysOriginal) - enum Image { - static let noBookmark = UIImage(named: "img_no_bookmark")!.withRenderingMode(.alwaysOriginal) - static let noMyreview = UIImage(named: "img_no_myreview")!.withRenderingMode(.alwaysOriginal) - static let noReview = UIImage(named: "img_no_review")!.withRenderingMode(.alwaysOriginal) - static let noSearchResult = UIImage(named: "img_no_search_result")!.withRenderingMode(.alwaysOriginal) - static let search = UIImage(named: "img_search")!.withRenderingMode(.alwaysOriginal) - static let serverMaintenance = UIImage(named: "img_server_maintenance")!.withRenderingMode(.alwaysOriginal) - static let welcome = UIImage(named: "img_welcome")!.withRenderingMode(.alwaysOriginal) - - enum Bubble { - static let left = UIImage(named: "img_left_bubble")!.withRenderingMode(.alwaysOriginal) - static let right = UIImage(named: "img_right_bubble")!.withRenderingMode(.alwaysOriginal) - } - - enum Loading { - static let large = UIImage(named: "img_loading_large")!.withRenderingMode(.alwaysOriginal) - static let medium = UIImage(named: "img_loading_medium")!.withRenderingMode(.alwaysOriginal) - static let small = UIImage(named: "img_loading_small")!.withRenderingMode(.alwaysOriginal) - } - } - - - // MARK: - Button - - static let disabledBookmarkButton = UIImage(named: "bookmark_button_disable")!.withRenderingMode(.alwaysOriginal) - static let enabledBookmarkButton = UIImage(named: "bookmark_button_enable")!.withRenderingMode(.alwaysOriginal) + // Ready-made Buttons + static let bookmarkButtonDisable = UIImage(named: "bookmark_button_disable")!.withRenderingMode(.alwaysOriginal) + static let bookmarkButtonEnable = UIImage(named: "bookmark_button_enable")!.withRenderingMode(.alwaysOriginal) static let copyButton = UIImage(named: "copy_button")!.withRenderingMode(.alwaysOriginal) static let homeFilterButton = UIImage(named: "home_filter_button")!.withRenderingMode(.alwaysOriginal) static let mapButton = UIImage(named: "map_button")!.withRenderingMode(.alwaysOriginal) static let bakeryFilterButton = UIImage(named: "bakery_filter_button")!.withRenderingMode(.alwaysOriginal) // Social Login - static let kakaoLoginButton = UIImage(named: "KakaoSocialLogin")!.withRenderingMode(.alwaysOriginal) - static let appleLoginButton = UIImage(named: "AppleSocialLogin")!.withRenderingMode(.alwaysOriginal) + static let kakaoSociaLogin = UIImage(named: "KakaoSocialLogin")!.withRenderingMode(.alwaysOriginal) + static let appleSocialLogin = UIImage(named: "AppleSocialLogin")!.withRenderingMode(.alwaysOriginal) + + // TabBar + static let icHomeDisable = UIImage(named: "ic_home_disable")!.withRenderingMode(.alwaysOriginal) + static let icMypageDisable = UIImage(named: "ic_mypage_disable")!.withRenderingMode(.alwaysOriginal) + static let icStorelistDisable = UIImage(named: "ic_storelist_disable")!.withRenderingMode(.alwaysOriginal) + static let icHomeEnable = UIImage(named: "ic_home_enable")!.withRenderingMode(.alwaysOriginal) + static let icMypageEnable = UIImage(named: "ic_mypage_enable")!.withRenderingMode(.alwaysOriginal) + static let icStorelistEnable = UIImage(named: "ic_storelist_enable")!.withRenderingMode(.alwaysOriginal) } extension UIImage { diff --git a/GEON-PPANG-iOS/Global/Enum/AlertEnum.swift b/GEON-PPANG-iOS/Global/Enum/AlertEnum.swift index 8841228a..73f4a32e 100644 --- a/GEON-PPANG-iOS/Global/Enum/AlertEnum.swift +++ b/GEON-PPANG-iOS/Global/Enum/AlertEnum.swift @@ -41,8 +41,8 @@ enum AlertType { var image: UIImage { switch self { - case .logout: return .Icon.sad - case .leave: return .Icon.sad + case .logout: return .iconSad + case .leave: return .iconSad } } } diff --git a/GEON-PPANG-iOS/Global/Enum/BakeryListEmptyType.swift b/GEON-PPANG-iOS/Global/Enum/BakeryListEmptyType.swift index 4339fd93..ccdb19bc 100644 --- a/GEON-PPANG-iOS/Global/Enum/BakeryListEmptyType.swift +++ b/GEON-PPANG-iOS/Global/Enum/BakeryListEmptyType.swift @@ -16,10 +16,10 @@ enum EmptyType: String { var icon: UIImage { switch self { - case .noReview, .noMyReview: return .Image.noReview - case .noBookmark: return .Image.noBookmark - case .noSearch: return .Image.noSearchResult - case .initialize: return .Image.search + case .noReview, .noMyReview: return .imgNoReview + case .noBookmark: return .imgNoBookmark + case .noSearch: return .imgNoSearchResult + case .initialize: return .imgSearch } } diff --git a/GEON-PPANG-iOS/Global/Enum/TabBarItem.swift b/GEON-PPANG-iOS/Global/Enum/TabBarItem.swift index d434a3d4..595dedc8 100644 --- a/GEON-PPANG-iOS/Global/Enum/TabBarItem.swift +++ b/GEON-PPANG-iOS/Global/Enum/TabBarItem.swift @@ -17,22 +17,22 @@ extension TabBarItemType { var selectedIcon: UIImage { switch self { case .home: - return .Icon.Home.enabled + return .icHomeEnable case .bakeryList: - return .Icon.StoreList.enabled + return .icStorelistEnable case .mypage: - return .Icon.Mypage.enabled + return .icMypageEnable } } var unselectedIcon: UIImage { switch self { case .home: - return .Icon.Home.disabled + return .icHomeDisable case .bakeryList: - return .Icon.StoreList.disabled + return .icStorelistDisable case .mypage: - return .Icon.Mypage.disabled + return .icMypageDisable } } diff --git a/GEON-PPANG-iOS/Presentation/Common/BottomSheet/CommonBottomSheet.swift b/GEON-PPANG-iOS/Presentation/Common/BottomSheet/CommonBottomSheet.swift index 5074e62e..2507b986 100644 --- a/GEON-PPANG-iOS/Presentation/Common/BottomSheet/CommonBottomSheet.swift +++ b/GEON-PPANG-iOS/Presentation/Common/BottomSheet/CommonBottomSheet.swift @@ -17,9 +17,9 @@ enum EmojiType { var icon: UIImage? { switch self { - case .smile: return .Icon.Smile.px64 - case .sad: return .Icon.sad - case .crying: return .Icon.crying + case .smile: return .icSmile + case .sad: return .iconSad + case .crying: return .iconCrying } } diff --git a/GEON-PPANG-iOS/Presentation/Common/BottomSheet/LoginRequiredViewController.swift b/GEON-PPANG-iOS/Presentation/Common/BottomSheet/LoginRequiredViewController.swift index 7e454d32..74f8159a 100644 --- a/GEON-PPANG-iOS/Presentation/Common/BottomSheet/LoginRequiredViewController.swift +++ b/GEON-PPANG-iOS/Presentation/Common/BottomSheet/LoginRequiredViewController.swift @@ -36,7 +36,7 @@ final class LoginRequiredViewController: BaseViewController { // MARK: - UI Property - private let loginImageView = UIImageView(image: .Icon.login) + private let loginImageView = UIImageView(image: .icLogin) private let loginLabel = UILabel() private let kakaoLoginButton = UIButton() private let appleLoginButton = UIButton() @@ -124,11 +124,11 @@ final class LoginRequiredViewController: BaseViewController { } kakaoLoginButton.do { - $0.setImage(.kakaoLoginButton, for: .normal) + $0.setImage(.kakaoSociaLogin, for: .normal) } appleLoginButton.do { - $0.setImage(.appleLoginButton, for: .normal) + $0.setImage(.appleSocialLogin, for: .normal) } socialLoginButtonStackView.do { diff --git a/GEON-PPANG-iOS/Presentation/Common/Button/BackButton.swift b/GEON-PPANG-iOS/Presentation/Common/Button/BackButton.swift index f6b138c8..82809481 100644 --- a/GEON-PPANG-iOS/Presentation/Common/Button/BackButton.swift +++ b/GEON-PPANG-iOS/Presentation/Common/Button/BackButton.swift @@ -11,7 +11,7 @@ final class BackButton: UIButton { // MARK: - UI Property - private let leftChevron = UIImageView(image: .Icon.Arrow.left) + private let leftChevron = UIImageView(image: .icArrowLeft) // MARK: - Init diff --git a/GEON-PPANG-iOS/Presentation/Common/Button/BookmarkButton.swift b/GEON-PPANG-iOS/Presentation/Common/Button/BookmarkButton.swift index 23e28a31..b9774469 100644 --- a/GEON-PPANG-iOS/Presentation/Common/Button/BookmarkButton.swift +++ b/GEON-PPANG-iOS/Presentation/Common/Button/BookmarkButton.swift @@ -42,11 +42,11 @@ final class BookmarkButton: UIButton { $0.configurationUpdateHandler = { button in switch button.state { case .selected: - button.configuration?.image = .enabledBookmarkButton + button.configuration?.image = .bookmarkButtonEnable button.configuration?.baseForegroundColor = .gbbPoint1 default: - button.configuration?.image = .disabledBookmarkButton + button.configuration?.image = .bookmarkButtonDisable button.configuration?.baseForegroundColor = .gbbGray300 } } diff --git a/GEON-PPANG-iOS/Presentation/Common/Button/IconWithTextView.swift b/GEON-PPANG-iOS/Presentation/Common/Button/IconWithTextView.swift index 8956a2b2..9ac8ea9a 100644 --- a/GEON-PPANG-iOS/Presentation/Common/Button/IconWithTextView.swift +++ b/GEON-PPANG-iOS/Presentation/Common/Button/IconWithTextView.swift @@ -16,9 +16,9 @@ enum HomeIconType { var icon: UIImage { switch self { - case .reviews: return .Icon.Review.px16gray400 - case .bookmark: return .Icon.Bookmark.px16gray400 - case .region: return .Icon.map + case .reviews: return .icReview16px400 + case .bookmark: return .icBookmark16px400 + case .region: return .icMap } } diff --git a/GEON-PPANG-iOS/Presentation/Common/Label/BookmarkCountLabel.swift b/GEON-PPANG-iOS/Presentation/Common/Label/BookmarkCountLabel.swift index 48c4c0a7..30370a79 100644 --- a/GEON-PPANG-iOS/Presentation/Common/Label/BookmarkCountLabel.swift +++ b/GEON-PPANG-iOS/Presentation/Common/Label/BookmarkCountLabel.swift @@ -18,7 +18,7 @@ final class BookmarkCountLabel: UILabel { // MARK: - UI Property - private let imageView = UIImageView(image: .Icon.Bookmark.px16gray400) + private let imageView = UIImageView(image: .icBookmark16px400) private let label = UILabel() // MARK: - Life Cycle diff --git a/GEON-PPANG-iOS/Presentation/Common/Label/RegionLabel.swift b/GEON-PPANG-iOS/Presentation/Common/Label/RegionLabel.swift index f1ecba1d..15898a75 100644 --- a/GEON-PPANG-iOS/Presentation/Common/Label/RegionLabel.swift +++ b/GEON-PPANG-iOS/Presentation/Common/Label/RegionLabel.swift @@ -19,7 +19,7 @@ final class RegionLabel: UILabel { // MARK: - UI Property - private let imageView = UIImageView(image: .Icon.map) + private let imageView = UIImageView(image: .icMap) private let label = UILabel() // MARK: - Life Cycle diff --git a/GEON-PPANG-iOS/Presentation/Common/StackView/IconLabelStackView.swift b/GEON-PPANG-iOS/Presentation/Common/StackView/IconLabelStackView.swift index 2acb342e..95af0d62 100644 --- a/GEON-PPANG-iOS/Presentation/Common/StackView/IconLabelStackView.swift +++ b/GEON-PPANG-iOS/Presentation/Common/StackView/IconLabelStackView.swift @@ -25,13 +25,13 @@ final class IconLabelStackView: UIStackView { private var ic: UIImage { switch iconType { case .bookmark: - return .Icon.Bookmark.px16gray300 + return .icBookmark16px300 case .review: - return .Icon.Review.px16 + return .icReview16px case .notice: - return .Icon.notice + return .icNotice18px case .basic: - return .Icon.swap + return .icSwap } } private var icSize: Int { diff --git a/GEON-PPANG-iOS/Presentation/Common/StackView/MarkStackView.swift b/GEON-PPANG-iOS/Presentation/Common/StackView/MarkStackView.swift index bd056fab..7a23d8c8 100644 --- a/GEON-PPANG-iOS/Presentation/Common/StackView/MarkStackView.swift +++ b/GEON-PPANG-iOS/Presentation/Common/StackView/MarkStackView.swift @@ -66,9 +66,9 @@ final class MarkStackView: UIStackView { func configureIconImage(with data: CertificationMarkResponseType) { - haccpMarkIconView.image = data.isHACCP ? .HACCP.mark22 : nil - veganIconView.image = data.isVegan ? .Vegan.mark22 : nil - gmoIconView.image = data.isNonGMO ? .GMO.mark22 : nil + haccpMarkIconView.image = data.isHACCP ? .haccpMark22px : nil + veganIconView.image = data.isVegan ? .veganMark22px : nil + gmoIconView.image = data.isNonGMO ? .gmoMark22px : nil haccpMarkIconView.isHidden = data.isHACCP ? false : true veganIconView.isHidden = data.isVegan ? false : true diff --git a/GEON-PPANG-iOS/Presentation/Common/TextField/SearchTextField.swift b/GEON-PPANG-iOS/Presentation/Common/TextField/SearchTextField.swift index c458cbd5..f00a5fcd 100644 --- a/GEON-PPANG-iOS/Presentation/Common/TextField/SearchTextField.swift +++ b/GEON-PPANG-iOS/Presentation/Common/TextField/SearchTextField.swift @@ -51,11 +51,11 @@ final class SearchTextField: UITextField { private func setUI() { searchButton.do { - $0.setImage(.Icon.Search.gray400, for: .normal) + $0.setImage(.icSearch400, for: .normal) } clearButton.do { - $0.setImage(.Icon.delete, for: .normal) + $0.setImage(.icDelete, for: .normal) $0.addAction(UIAction { _ in self.text?.removeAll() }, for: .touchUpInside) diff --git a/GEON-PPANG-iOS/Presentation/Common/TextField/SignInTextField.swift b/GEON-PPANG-iOS/Presentation/Common/TextField/SignInTextField.swift index ac5dea09..369621ef 100644 --- a/GEON-PPANG-iOS/Presentation/Common/TextField/SignInTextField.swift +++ b/GEON-PPANG-iOS/Presentation/Common/TextField/SignInTextField.swift @@ -72,8 +72,8 @@ final class SignInTextField: UITextField { } securityButton.do { - $0.setImage(.Icon.hide, for: .normal) - $0.setImage(.Icon.show, for: .selected) + $0.setImage(.icHide, for: .normal) + $0.setImage(.icShow, for: .selected) $0.addAction(UIAction { [weak self]_ in self?.isSecureTextEntry.toggle() self?.securityButton.isSelected.toggle() diff --git a/GEON-PPANG-iOS/Presentation/Common/View/DetailBottomView.swift b/GEON-PPANG-iOS/Presentation/Common/View/DetailBottomView.swift index c89f584c..c70f9afc 100644 --- a/GEON-PPANG-iOS/Presentation/Common/View/DetailBottomView.swift +++ b/GEON-PPANG-iOS/Presentation/Common/View/DetailBottomView.swift @@ -72,7 +72,7 @@ final class DetailBottomView: UIView { private func setUI() { bookmarkButton.do { - $0.setImage(.disabledBookmarkButton, for: .normal) + $0.setImage(.bookmarkButtonDisable, for: .normal) $0.addAction(UIAction { [weak self] _ in self?.tappedBookmarkButton?() }, for: .touchUpInside) @@ -107,7 +107,7 @@ final class DetailBottomView: UIView { func configureBookmarkButton(to isSelected: Bool) { bookmarkButton.do { - $0.setImage((isSelected ? UIImage.enabledBookmarkButton : UIImage.disabledBookmarkButton), for: .normal) + $0.setImage((isSelected ? UIImage.bookmarkButtonEnable : UIImage.bookmarkButtonDisable), for: .normal) } } } diff --git a/GEON-PPANG-iOS/Presentation/Scene/Auth/Onboarding/ViewController/OnboardingViewController.swift b/GEON-PPANG-iOS/Presentation/Scene/Auth/Onboarding/ViewController/OnboardingViewController.swift index ce958bef..0568a806 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/Auth/Onboarding/ViewController/OnboardingViewController.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/Auth/Onboarding/ViewController/OnboardingViewController.swift @@ -96,16 +96,16 @@ final class OnboardingViewController: BaseViewController { } logoImage.do { - $0.image = .Icon.launchscreen + $0.image = .icLaunchscreen $0.contentMode = .scaleAspectFit } kakaoLoginButton.do { - $0.setImage(.kakaoLoginButton, for: .normal) + $0.setImage(.kakaoSociaLogin, for: .normal) } appleLoginButton.do { - $0.setImage(.appleLoginButton, for: .normal) + $0.setImage(.appleSocialLogin, for: .normal) } socialLoginButtonStackView.do { diff --git a/GEON-PPANG-iOS/Presentation/Scene/Auth/Welcome/ViewController/WelcomeViewController.swift b/GEON-PPANG-iOS/Presentation/Scene/Auth/Welcome/ViewController/WelcomeViewController.swift index 4bb35e50..360230d9 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/Auth/Welcome/ViewController/WelcomeViewController.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/Auth/Welcome/ViewController/WelcomeViewController.swift @@ -19,7 +19,7 @@ final class WelcomeViewController: BaseViewController { // MARK: - UI Property private let welcomeLabel = UILabel() - private let welcomeImageView = UIImageView(image: .Image.welcome) + private let welcomeImageView = UIImageView(image: .imgWelcome) // MARK: - Life Cycle diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/InfoCollectionViewCell.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/InfoCollectionViewCell.swift index 4acea88d..2fff0c77 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/InfoCollectionViewCell.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/InfoCollectionViewCell.swift @@ -131,7 +131,7 @@ final class InfoCollectionViewCell: UICollectionViewCell { } linkImage.do { - $0.image = .Icon.link + $0.image = .icLink } linkButtonStackView.do { @@ -149,7 +149,7 @@ final class InfoCollectionViewCell: UICollectionViewCell { } addressImage.do { - $0.image = .Icon.store + $0.image = .icStore } addressLabel.do { @@ -163,7 +163,7 @@ final class InfoCollectionViewCell: UICollectionViewCell { } openingHoursImage.do { - $0.image = .Icon.time + $0.image = .icTime } closedDaysLabel.do { @@ -176,7 +176,7 @@ final class InfoCollectionViewCell: UICollectionViewCell { } phoneNumberImage.do { - $0.image = .Icon.call + $0.image = .icCall } phoneNumberLabel.do { diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/TitleCollectionViewCell.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/TitleCollectionViewCell.swift index d3f4755d..4f0e84df 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/TitleCollectionViewCell.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/TitleCollectionViewCell.swift @@ -102,10 +102,10 @@ final class TitleCollectionViewCell: UICollectionViewCell { func configureCellUI(_ data: BakeryDetailResponseDTO) { guard let url = URL(string: data.bakeryPicture) else { return } - bakeryImage.kf.setImage(with: url, placeholder: UIImage.Image.Loading.large) + bakeryImage.kf.setImage(with: url, placeholder: UIImage.imgLoadingLarge) bakeryNameLabel.text = data.bakeryName markStackView.getMarkStatus(data.isHACCP, data.isVegan, data.isNonGMO) - markStackView.configureIconImage(.HACCP.mark28, .Vegan.mark28, .GMO.mark28) + markStackView.configureIconImage(.haccpMark28px, .veganMark28px, .gmoMark28px) if !data.isHACCP && !data.isVegan && !data.isNonGMO { bakeryNameLabel.snp.remakeConstraints { diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/WrittenReviewsCollectionViewCell.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/WrittenReviewsCollectionViewCell.swift index 7d565a04..a2deae97 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/WrittenReviewsCollectionViewCell.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/WrittenReviewsCollectionViewCell.swift @@ -116,7 +116,7 @@ final class WrittenReviewsCollectionViewCell: UICollectionViewCell { } profileImage.do { - $0.image = .Icon.Smile.px64 + $0.image = .icSmile $0.contentMode = .scaleToFill } diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/ViewController/BakeryDetailViewController.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/ViewController/BakeryDetailViewController.swift index 07c00249..7a5de992 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/ViewController/BakeryDetailViewController.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/ViewController/BakeryDetailViewController.swift @@ -128,7 +128,7 @@ final class BakeryDetailViewController: BaseViewController { } floatingButton.do { - $0.setImage(.Icon.Arrow.up, for: .normal) + $0.setImage(.icArrowUp, for: .normal) $0.backgroundColor = .gbbWhite $0.makeBorder(width: 1, color: .gbbGray200) $0.makeCornerRound(radius: 24) diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/Report/ViewController/ReportViewController.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/Report/ViewController/ReportViewController.swift index ee31a4c2..3aaba20b 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/Report/ViewController/ReportViewController.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/Report/ViewController/ReportViewController.swift @@ -206,7 +206,7 @@ final class ReportViewController: BaseViewController { leading: 8, bottom: 8, trailing: 8) - $0.configuration?.image = .Icon.Filter.uncheck + $0.configuration?.image = .icFilterUnchecked $0.configuration?.imagePadding = 6 $0.configuration?.imagePlacement = .leading $0.isSelected = false @@ -301,10 +301,10 @@ final class ReportViewController: BaseViewController { nothingSelected() selectedButton?.isSelected = false // 이전 선택 해제 - selectedButton?.configuration?.image = .Icon.Filter.uncheck + selectedButton?.configuration?.image = .icFilterUnchecked sender.isSelected = true // 새로운 버튼 선택 - sender.configuration?.image = .Icon.Filter.check + sender.configuration?.image = .icFilterCheck sender.configuration?.baseBackgroundColor = .gbbWhite writeButton.configureInteraction(to: true) diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/View/BakeryOverviewView.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/View/BakeryOverviewView.swift index 6dab7251..9433af4b 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/View/BakeryOverviewView.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/View/BakeryOverviewView.swift @@ -99,7 +99,7 @@ final class BakeryOverviewView: UIView { private func setUI() { bakeryImageView.do { - $0.kf.setImage(with: URL(string: data.imageURL), placeholder: UIImage.Image.Loading.small) + $0.kf.setImage(with: URL(string: data.imageURL), placeholder: UIImage.imgLoadingSmall) $0.backgroundColor = .gbbPoint1 $0.makeCornerRound(radius: 5) $0.contentMode = .scaleAspectFill diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/View/WriteReviewBottomSheetView.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/View/WriteReviewBottomSheetView.swift index 065e2d20..f3e84160 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/View/WriteReviewBottomSheetView.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/View/WriteReviewBottomSheetView.swift @@ -19,7 +19,7 @@ final class WriteReviewBottomSheetView: UIView { // MARK: - UI Property - private let emojiImageView = UIImageView(image: .Icon.Review.bread) + private let emojiImageView = UIImageView(image: .icReviewBread) private let sheetTitleLabel = UILabel() private let sheetDescriptionLabel = UILabel() diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/Cell/BakeryCommonCollectionViewCell.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/Cell/BakeryCommonCollectionViewCell.swift index f6526945..a579872d 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/Cell/BakeryCommonCollectionViewCell.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/Cell/BakeryCommonCollectionViewCell.swift @@ -107,7 +107,7 @@ final class BakeryCommonCollectionViewCell: UICollectionViewCell { } markStackView.do { - $0.configureIconImage(.HACCP.mark22, .Vegan.mark22, .GMO.mark22) + $0.configureIconImage(.haccpMark22px, .veganMark22px, .gmoMark22px) } bakeryTitle.do { @@ -136,7 +136,7 @@ final class BakeryCommonCollectionViewCell: UICollectionViewCell { bookmarkCount.setContentCompressionResistancePriority(UILayoutPriority(751), for: .horizontal) guard let url = URL(string: data.picture) else { return } - bakeryImage.kf.setImage(with: url, placeholder: UIImage.Image.Loading.small) + bakeryImage.kf.setImage(with: url, placeholder: UIImage.imgLoadingSmall) regionStackView.configureListUI(text: data.station) markStackView.getMarkStatus(data.isHACCP, data.isVegan, data.isNonGMO) @@ -153,7 +153,7 @@ final class BakeryCommonCollectionViewCell: UICollectionViewCell { bakeryTitle.lineBreakMode = .byTruncatingTail guard let url = URL(string: data.picture) else { return } - bakeryImage.kf.setImage(with: url, placeholder: UIImage.Image.Loading.small) + bakeryImage.kf.setImage(with: url, placeholder: UIImage.imgLoadingSmall) regionStackView.configureListUI(text: data.station) markStackView.getMarkStatus(data.isHACCP, data.isVegan, data.isNonGMO) diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/Cell/SortBakeryCollectionViewCell.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/Cell/SortBakeryCollectionViewCell.swift index cb0b4ba6..d13f27fb 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/Cell/SortBakeryCollectionViewCell.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/Cell/SortBakeryCollectionViewCell.swift @@ -25,7 +25,7 @@ final class SortBakeryCollectionViewCell: UICollectionViewCell { // MARK: - UI Property private let sortByLabel = UILabel() - private let checkImageView = UIImageView(image: .Icon.check) + private let checkImageView = UIImageView(image: .icCheck) // MARK: - Life Cycle diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/Model/BakeryFilterItems.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/Model/BakeryFilterItems.swift index 9c33f8e2..14906d97 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/Model/BakeryFilterItems.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/Model/BakeryFilterItems.swift @@ -35,13 +35,13 @@ struct BakeryFilterItems: Hashable { var leftIcon: UIImage static var item: [BakeryFilterItems] = [BakeryFilterItems(filter: .HARD, status: .off, - leftIcon: .Icon.Hard.disabled), + leftIcon: .icHardDisable20px), BakeryFilterItems(filter: .DESSERT, status: .off, - leftIcon: .Icon.Cake.disabled), + leftIcon: .icCakeDisable20px), BakeryFilterItems(filter: .BRUNCH, status: .off, - leftIcon: .Icon.Sandwich.disabled) + leftIcon: .icSandwichDisable20px) ] public func isSelected() -> Self { @@ -52,15 +52,15 @@ struct BakeryFilterItems: Hashable { case .HARD: return BakeryFilterItems(filter: filter, status: status, - leftIcon: .Icon.Hard.disabled) + leftIcon: .icHardDisable20px) case .DESSERT: return BakeryFilterItems(filter: filter, status: status, - leftIcon: .Icon.Cake.disabled) + leftIcon: .icCakeDisable20px) case .BRUNCH: return BakeryFilterItems(filter: filter, status: status, - leftIcon: .Icon.Sandwich.disabled) + leftIcon: .icSandwichDisable20px) } case .on: @@ -68,15 +68,15 @@ struct BakeryFilterItems: Hashable { case .HARD: return BakeryFilterItems(filter: filter, status: status, - leftIcon: .Icon.Hard.enabled) + leftIcon: .icHardEnable20px) case .DESSERT: return BakeryFilterItems(filter: filter, status: status, - leftIcon: .Icon.Cake.enabled) + leftIcon: .icCakeEnable20px) case .BRUNCH: return BakeryFilterItems(filter: filter, status: status, - leftIcon: .Icon.Sandwich.enabled) + leftIcon: .icSandwichEnable20px) } } } diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/View/BakeryListTopView.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/View/BakeryListTopView.swift index 1c3e5b5f..e867f69c 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/View/BakeryListTopView.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/View/BakeryListTopView.swift @@ -56,7 +56,7 @@ final class BakeryListTopView: UIView { } searchButton.do { - $0.setImage(.Icon.Search.gray400, for: .normal) + $0.setImage(.icSearch400, for: .normal) } } diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/View/SortBakeryFilterView.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/View/SortBakeryFilterView.swift index d2bb8b07..c9a010e1 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/View/SortBakeryFilterView.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/View/SortBakeryFilterView.swift @@ -69,7 +69,7 @@ final class SortBakeryFilterView: UIView { leading: 12, bottom: 11, trailing: 12) - $0.configuration?.image = .Icon.swap.resize(to: CGSize(width: 16, height: 16)) + $0.configuration?.image = .icSwap.resize(to: CGSize(width: 16, height: 16)) $0.configuration?.attributedTitle = AttributedString(I18N.BakeryList.defaultFilter, attributes: AttributeContainer([.font: UIFont.captionB1])) $0.configuration?.imagePadding = 5 @@ -116,9 +116,9 @@ final class SortBakeryFilterView: UIView { let handler: UIButton.ConfigurationUpdateHandler = { button in switch button.state { case .selected: - button.configuration?.image = .Icon.Filter.check + button.configuration?.image = .icFilterCheck default: - button.configuration?.image = .Icon.Filter.uncheck + button.configuration?.image = .icFilterUnchecked } } return handler diff --git a/GEON-PPANG-iOS/Presentation/Scene/Filter/Filter/ViewController/FilterViewController.swift b/GEON-PPANG-iOS/Presentation/Scene/Filter/Filter/ViewController/FilterViewController.swift index 6da73e01..3cf24d4b 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/Filter/Filter/ViewController/FilterViewController.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/Filter/Filter/ViewController/FilterViewController.swift @@ -107,7 +107,7 @@ final class FilterViewController: BaseViewController { $0.setTitle(I18N.Filter.skip, for: .normal) $0.setTitleColor(.gbbGray500, for: .normal) $0.titleLabel?.font = .bodyM2 - $0.setImage(.Icon.Arrow.right.resize(to: .init(width: 16, height: 16)), + $0.setImage(.icArrowRight.resize(to: .init(width: 16, height: 16)), for: .normal) $0.semanticContentAttribute = .forceRightToLeft $0.isHidden = !(self.from == .onboarding) diff --git a/GEON-PPANG-iOS/Presentation/Scene/Home/Home/HomeBakeryCollectionViewCell.swift b/GEON-PPANG-iOS/Presentation/Scene/Home/Home/HomeBakeryCollectionViewCell.swift index 4f46a75c..39fd7e9e 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/Home/Home/HomeBakeryCollectionViewCell.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/Home/Home/HomeBakeryCollectionViewCell.swift @@ -28,7 +28,7 @@ final class HomeBakeryCollectionViewCell: UICollectionViewCell { super.prepareForReuse() markStackView.getMarkStatus(false, false, false) - markStackView.configureIconImage(.HACCP.mark28, .Vegan.mark28, .GMO.mark28) + markStackView.configureIconImage(.haccpMark28px, .veganMark28px, .gmoMark28px) regionStackView.arrangedSubviews.forEach { regionStackView.removeArrangedSubview($0) } @@ -102,7 +102,7 @@ final class HomeBakeryCollectionViewCell: UICollectionViewCell { } markStackView.do { - $0.configureIconImage(.HACCP.mark28, .Vegan.mark28, .GMO.mark28) + $0.configureIconImage(.haccpMark28px, .veganMark28px, .gmoMark28px) } bakeryTitle.do { @@ -118,7 +118,7 @@ final class HomeBakeryCollectionViewCell: UICollectionViewCell { func configureCellUI(data: HomeBestBakeryResponseDTO) { let url = URL(string: data.bakeries.picture) - bakeryImage.kf.setImage(with: url, placeholder: UIImage.Image.Loading.large) + bakeryImage.kf.setImage(with: url, placeholder: UIImage.imgLoadingLarge) bakeryTitle.setLineHeight(by: 1.08, with: data.bakeries.name) bakeryTitle.lineBreakMode = .byTruncatingTail diff --git a/GEON-PPANG-iOS/Presentation/Scene/Home/Home/HomeReviewCollectionViewCell.swift b/GEON-PPANG-iOS/Presentation/Scene/Home/Home/HomeReviewCollectionViewCell.swift index fd912750..109b076a 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/Home/Home/HomeReviewCollectionViewCell.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/Home/Home/HomeReviewCollectionViewCell.swift @@ -124,7 +124,7 @@ final class HomeReviewCollectionViewCell: UICollectionViewCell { func configureCellUI(data: HomeBestReviewResponseDTO) { let url = URL(string: data.reviews.picture) - bakeryImage.kf.setImage(with: url, placeholder: UIImage.Image.Loading.large) + bakeryImage.kf.setImage(with: url, placeholder: UIImage.imgLoadingLarge) reviewTitle.setLineHeight(by: 1.14, with: "\"\(data.text)\"") reviewTitle.lineBreakMode = .byTruncatingTail diff --git a/GEON-PPANG-iOS/Presentation/Scene/Home/Home/View/BubbleView.swift b/GEON-PPANG-iOS/Presentation/Scene/Home/Home/View/BubbleView.swift index 42b553d4..3e1eafdd 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/Home/Home/View/BubbleView.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/Home/Home/View/BubbleView.swift @@ -20,8 +20,8 @@ final class BubbleView: UIView { var image: UIImage { switch self { - case .left: return .Image.Bubble.left - case .right: return .Image.Bubble.right + case .left: return .imgLeftBubble + case .right: return .imgRightBubble } } } @@ -85,7 +85,7 @@ final class BubbleView: UIView { } cancelButton.do { - $0.setImage(.Icon.deleteKeyword, for: .normal) + $0.setImage(.icDeleteKeyword, for: .normal) $0.addAction(UIAction { _ in self.removeFromSuperview() }, for: .touchUpInside) diff --git a/GEON-PPANG-iOS/Presentation/Scene/LaunchScreen/LaunchScreen/ViewController/LaunchScreenViewController.swift b/GEON-PPANG-iOS/Presentation/Scene/LaunchScreen/LaunchScreen/ViewController/LaunchScreenViewController.swift index 78c6e24c..ce06b3fa 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/LaunchScreen/LaunchScreen/ViewController/LaunchScreenViewController.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/LaunchScreen/LaunchScreen/ViewController/LaunchScreenViewController.swift @@ -13,7 +13,7 @@ final class LaunchScreenViewController: BaseViewController { // MARK: - UI Property - private let logoImageView = UIImageView(image: .Icon.launchscreen) + private let logoImageView = UIImageView(image: .icLaunchscreen) // MARK: - Life Cycle diff --git a/GEON-PPANG-iOS/Presentation/Scene/MyPage/MyPage/View/ImageWithSubtitleButton.swift b/GEON-PPANG-iOS/Presentation/Scene/MyPage/MyPage/View/ImageWithSubtitleButton.swift index 187e8307..3bb9c3b8 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/MyPage/MyPage/View/ImageWithSubtitleButton.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/MyPage/MyPage/View/ImageWithSubtitleButton.swift @@ -21,8 +21,8 @@ final class ImageWithSubtitleButton: UIButton { private var buttonImage: UIImage { switch type { - case .bookmark: return .Icon.Bookmark.point - case .myReview: return .Icon.Review.point + case .bookmark: return .icBookmark + case .myReview: return .icReview } } diff --git a/GEON-PPANG-iOS/Presentation/Scene/MyPage/MyPage/View/MyPageProfileCell.swift b/GEON-PPANG-iOS/Presentation/Scene/MyPage/MyPage/View/MyPageProfileCell.swift index 1ef43da9..0f4646d8 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/MyPage/MyPage/View/MyPageProfileCell.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/MyPage/MyPage/View/MyPageProfileCell.swift @@ -22,7 +22,7 @@ final class MyPageProfileCell: UICollectionViewCell { // MARK: - UI Property - private let profileImageView = UIImageView(image: .Icon.Smile.px86) + private let profileImageView = UIImageView(image: .icSmile86px) private let purposeFilterChipView = MyPagePurposeChipView() private let userNameLabel = UILabel() private let flowLayout = OptionsCollectionViewFlowLayout() @@ -138,7 +138,7 @@ final class MyPageProfileCell: UICollectionViewCell { } filterButton.do { - $0.setImage(.Icon.Arrow.right, for: .normal) + $0.setImage(.icArrowRight, for: .normal) $0.addAction(UIAction { _ in self.filterButtonTapped?() }, for: .touchUpInside) diff --git a/GEON-PPANG-iOS/Presentation/Scene/Search/Search/View/SearchNavigationView.swift b/GEON-PPANG-iOS/Presentation/Scene/Search/Search/View/SearchNavigationView.swift index 73ed0d70..8788b109 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/Search/Search/View/SearchNavigationView.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/Search/Search/View/SearchNavigationView.swift @@ -65,7 +65,7 @@ final class SearchNavigationView: UIView { } backButton.do { - $0.setImage(.Icon.Arrow.left, for: .normal) + $0.setImage(.icArrowLeft, for: .normal) $0.addAction(UIAction { [weak self] _ in self?.dismissSearchView?() }, for: .touchUpInside)