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

[Design] #12 - 햄버거바 UI 구현 #32

Merged
merged 26 commits into from
Jul 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
c40f61e
[Fix] 변경된 UIColor 파일로 인해 발생하는 오류 코드 주석 처리
yungu0010 Jul 8, 2022
8c93a59
[Add] 햄버거바 구현에 필요한 파일 추가
yungu0010 Jul 10, 2022
4ca4b9c
[Chore] #12 - info.plist의 storyboardName 변경
yungu0010 Jul 10, 2022
429dd6e
[Design] 뷰 배경색 설정
yungu0010 Jul 10, 2022
775a105
[Add] 햄버거바 버튼 이미지 추가
yungu0010 Jul 10, 2022
8a7e7f1
[Design] #12 - 햄버거바 뷰에 관한 코드 작성
yungu0010 Jul 10, 2022
ffb3fac
[Add] 햄버거바에서 사용하는 string literal 추가
yungu0010 Jul 10, 2022
ec628eb
[Add] 라벨과 버튼에 string literal 사용하여 text값 지정
yungu0010 Jul 10, 2022
7c4a090
[Design] #12 - 햄버거바 UI 완성
yungu0010 Jul 10, 2022
65dd905
[Chore] #12 - setUI와 setLayout 함수 extension으로 빼주기
yungu0010 Jul 10, 2022
57def16
[Add] #12 - 애니메이션 효과를 위한 임시 뷰컨트롤러 추가
yungu0010 Jul 10, 2022
6c7bec0
[Refactor] #12 - 중복코드 제거하여 UI코드 재작성
yungu0010 Jul 10, 2022
ef1b389
[Feat] 버튼 클릭 시 배경 불투명하도록 애니메이션 추가
yungu0010 Jul 10, 2022
32ac44f
[Feat] 버튼 눌렀을 때 햄버거바 나오는 애니메이션 구현
yungu0010 Jul 10, 2022
aa21b97
[Feat] 버튼 눌렀을 때 햄버거바 나오는 애니메이션 구현(메뉴 컴포넌트까지)
yungu0010 Jul 10, 2022
92fab50
[Merge] #12 - upstream develop
yungu0010 Jul 12, 2022
6818bc4
[Chore] rootView 작업파일로 변경
yungu0010 Jul 12, 2022
e7dfaf5
[Fix] merge하면서 생긴 문법 오류 수정
yungu0010 Jul 12, 2022
dbb097b
[Feat] 햄버거바 애니메이션 구현
yungu0010 Jul 12, 2022
137b47f
[Fix] 햄버거바 dismiss 애니메이션 추가
yungu0010 Jul 12, 2022
4aba8f9
[Comment] #12 - 마크주석 추가
yungu0010 Jul 12, 2022
c9f4a6c
[Add] #12 - 이미지 리터럴 추가
yungu0010 Jul 12, 2022
a4c9379
[Chore] #12 - 햄버거바뷰 UI 관련파일 폴더 이동
yungu0010 Jul 12, 2022
e60fd94
[Merge] #12 - upstream develop
yungu0010 Jul 12, 2022
5752175
[Refactor] #12 - 코드리뷰 반영
yungu0010 Jul 12, 2022
a8b3002
[Refactor] #12 - stringLiteral 추가
yungu0010 Jul 12, 2022
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
16 changes: 16 additions & 0 deletions HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
3B0B25572876BBE400950539 /* Pretendard-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 3B0B25512876BBE300950539 /* Pretendard-Medium.otf */; };
3B0B25582876BBE400950539 /* NotoSansCJKkr-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 3B0B25522876BBE400950539 /* NotoSansCJKkr-Bold.otf */; };
3B0B25592876BBE400950539 /* NotoSansCJKkr-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 3B0B25532876BBE400950539 /* NotoSansCJKkr-Medium.otf */; };
3B18D8AC287AB7CD009AF9E7 /* HamburgerBarVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B18D8AB287AB7CD009AF9E7 /* HamburgerBarVC.swift */; };
3B18D8AE287AB7D8009AF9E7 /* HamburgerBar.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3B18D8AD287AB7D8009AF9E7 /* HamburgerBar.storyboard */; };
3BCC441E28745FD800661A12 /* SocialLoginVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BCC441D28745FD800661A12 /* SocialLoginVC.swift */; };
3BCC442028745FE500661A12 /* SocialLogin.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3BCC441F28745FE500661A12 /* SocialLogin.storyboard */; };
69028BA62874673600373984 /* MenuCellCVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69028BA52874673600373984 /* MenuCellCVC.swift */; };
Expand Down Expand Up @@ -130,6 +132,8 @@
3B0B25512876BBE300950539 /* Pretendard-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Medium.otf"; sourceTree = "<group>"; };
3B0B25522876BBE400950539 /* NotoSansCJKkr-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSansCJKkr-Bold.otf"; sourceTree = "<group>"; };
3B0B25532876BBE400950539 /* NotoSansCJKkr-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSansCJKkr-Medium.otf"; sourceTree = "<group>"; };
3B18D8AB287AB7CD009AF9E7 /* HamburgerBarVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HamburgerBarVC.swift; sourceTree = "<group>"; };
3B18D8AD287AB7D8009AF9E7 /* HamburgerBar.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = HamburgerBar.storyboard; sourceTree = "<group>"; };
3BCC441D28745FD800661A12 /* SocialLoginVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocialLoginVC.swift; sourceTree = "<group>"; };
3BCC441F28745FE500661A12 /* SocialLogin.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SocialLogin.storyboard; sourceTree = "<group>"; };
69028BA52874673600373984 /* MenuCellCVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuCellCVC.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -253,6 +257,15 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
3B18D8AA287AB7B6009AF9E7 /* HamburgerBarScene */ = {
isa = PBXGroup;
children = (
3B18D8AB287AB7CD009AF9E7 /* HamburgerBarVC.swift */,
3B18D8AD287AB7D8009AF9E7 /* HamburgerBar.storyboard */,
);
path = HamburgerBarScene;
sourceTree = "<group>";
};
3BCC441A28745FA900661A12 /* Auth */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -557,6 +570,7 @@
EB6A44E22873BAAE00749582 /* Map */ = {
isa = PBXGroup;
children = (
3B18D8AA287AB7B6009AF9E7 /* HamburgerBarScene */,
EB6A44E32873BABE00749582 /* MainMapScene */,
);
path = Map;
Expand Down Expand Up @@ -1049,6 +1063,7 @@
3B0B25582876BBE400950539 /* NotoSansCJKkr-Bold.otf in Resources */,
3B0B25572876BBE400950539 /* Pretendard-Medium.otf in Resources */,
3B0B25552876BBE400950539 /* Pretendard-Bold.otf in Resources */,
3B18D8AE287AB7D8009AF9E7 /* HamburgerBar.storyboard in Resources */,
A938BB8E287D221200B8DE07 /* Search.storyboard in Resources */,
695758B9287D7C0B00E36789 /* MenuTab.storyboard in Resources */,
3B0B25542876BBE400950539 /* NotoSansCJKkr-Regular.otf in Resources */,
Expand Down Expand Up @@ -1163,6 +1178,7 @@
EB6A45172874276B00749582 /* DetailTabTitleHeader.swift in Sources */,
EB6A451B2875365B00749582 /* TabIndicator.swift in Sources */,
EB6A44D528737CC400749582 /* MainDetailViewModel.swift in Sources */,
3B18D8AC287AB7CD009AF9E7 /* HamburgerBarVC.swift in Sources */,
EBF66ACA287227F500DE0ED1 /* Reactive+.swift in Sources */,
EB6A44D228737CC400749582 /* MainDetailRepository.swift in Sources */,
EBF66B0C2872B4FE00DE0ED1 /* StoryboardLiterals.swift in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion HealthFoodMe/HealthFoodMe/Application/SceneDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
}

guard let windowScene = (scene as? UIWindowScene) else { return }
let rootViewController = ModuleFactory.resolve().makeSearchVC()
let rootViewController = HamburgerBarVC()
let navigation = UINavigationController(rootViewController: rootViewController)
let window = UIWindow(windowScene: windowScene)
window.rootViewController = navigation
Expand Down
4 changes: 4 additions & 0 deletions HealthFoodMe/HealthFoodMe/Global/Literals/ImageLiterals.swift
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,8 @@ struct ImageLiterals {
static let star3Icon = UIImage(named: "icn_star_03")
static let beforeIcon = UIImage(named: "icon_before")
}

struct HamburgerBar {
static let editNameBtn = UIImage(named: "btn_edit")
}
}
13 changes: 13 additions & 0 deletions HealthFoodMe/HealthFoodMe/Global/Literals/StringLiterals.swift
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,17 @@ struct I18N {
static let copyComplete = "📑 주소가 복사되었습니다"
static let notOpenTravelSpot = "추후 오픈될 예정입니다"
}

struct Map {
struct HamburgerBar {
static let logout = "로그아웃"
static let setting = "설정"
static let reposrtCorrection = "수정사항 제보하기"
static let reportStore = "가게 제보하기"
static let myReview = "내가 쓴 리뷰"
static let scrapList = "스크랩한 식당"
static let buttonTitles = ["스크랩한 식당", "내가 쓴 리뷰", "가게 제보하기",
"수정사항 제보하기"]
}
}
}

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"images" : [
{
"filename" : "authTitle.png",
"filename" : "btn_edit.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "authTitle@2x.png",
"filename" : "btn_edit@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "authTitle@3x.png",
"filename" : "btn_edit@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion HealthFoodMe/HealthFoodMe/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<key>UISceneDelegateClassName</key>
<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
<key>UISceneStoryboardFile</key>
<string>MenuTab</string>
<string>HamburgerBar</string>
</dict>
</array>
</dict>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ extension SocialLoginVC {
kakaoLoginButton.setTitleColor(.black, for: .normal)

appleLoginButton.setTitle("애플 아이디로 로그인", for: .normal)
// appleLoginButton.backgroundColor = UIColor.carrotBlack
appleLoginButton.backgroundColor = UIColor.black
}

private func setLayout() {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//
// ButtonVC.swift
// HealthFoodMe
//
// Created by 강윤서 on 2022/07/10.
//

import UIKit
import SnapKit

class ButtonVC: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

p3;
요건 지워주세요~!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

넵!!


}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Y6W-OH-hqX">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Hamburger BarVC-->
<scene sceneID="s0d-6b-0kx">
<objects>
<viewController storyboardIdentifier="HamburgerBarVC" useStoryboardIdentifierAsRestorationIdentifier="YES" id="Y6W-OH-hqX" customClass="HamburgerBarVC" customModule="HealthFoodMe" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="5EZ-qb-Rvc">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="32" y="42"/>
</scene>
</scenes>
<resources>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
Loading