-
Notifications
You must be signed in to change notification settings - Fork 5
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
Changes from all commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
c40f61e
[Fix] 변경된 UIColor 파일로 인해 발생하는 오류 코드 주석 처리
yungu0010 8c93a59
[Add] 햄버거바 구현에 필요한 파일 추가
yungu0010 4ca4b9c
[Chore] #12 - info.plist의 storyboardName 변경
yungu0010 429dd6e
[Design] 뷰 배경색 설정
yungu0010 775a105
[Add] 햄버거바 버튼 이미지 추가
yungu0010 8a7e7f1
[Design] #12 - 햄버거바 뷰에 관한 코드 작성
yungu0010 ffb3fac
[Add] 햄버거바에서 사용하는 string literal 추가
yungu0010 ec628eb
[Add] 라벨과 버튼에 string literal 사용하여 text값 지정
yungu0010 7c4a090
[Design] #12 - 햄버거바 UI 완성
yungu0010 65dd905
[Chore] #12 - setUI와 setLayout 함수 extension으로 빼주기
yungu0010 57def16
[Add] #12 - 애니메이션 효과를 위한 임시 뷰컨트롤러 추가
yungu0010 6c7bec0
[Refactor] #12 - 중복코드 제거하여 UI코드 재작성
yungu0010 ef1b389
[Feat] 버튼 클릭 시 배경 불투명하도록 애니메이션 추가
yungu0010 32ac44f
[Feat] 버튼 눌렀을 때 햄버거바 나오는 애니메이션 구현
yungu0010 aa21b97
[Feat] 버튼 눌렀을 때 햄버거바 나오는 애니메이션 구현(메뉴 컴포넌트까지)
yungu0010 92fab50
[Merge] #12 - upstream develop
yungu0010 6818bc4
[Chore] rootView 작업파일로 변경
yungu0010 e7dfaf5
[Fix] merge하면서 생긴 문법 오류 수정
yungu0010 dbb097b
[Feat] 햄버거바 애니메이션 구현
yungu0010 137b47f
[Fix] 햄버거바 dismiss 애니메이션 추가
yungu0010 4aba8f9
[Comment] #12 - 마크주석 추가
yungu0010 c9f4a6c
[Add] #12 - 이미지 리터럴 추가
yungu0010 a4c9379
[Chore] #12 - 햄버거바뷰 UI 관련파일 폴더 이동
yungu0010 e60fd94
[Merge] #12 - upstream develop
yungu0010 5752175
[Refactor] #12 - 코드리뷰 반영
yungu0010 a8b3002
[Refactor] #12 - stringLiteral 추가
yungu0010 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
23 changes: 0 additions & 23 deletions
23
...Me/HealthFoodMe/Global/Resources/Assets.xcassets/Auth/authSubTitle.imageset/Contents.json
This file was deleted.
Oops, something went wrong.
Binary file removed
BIN
-3.12 KB
...Me/Global/Resources/Assets.xcassets/Auth/authSubTitle.imageset/authSubTitle.png
Binary file not shown.
Binary file removed
BIN
-5.68 KB
...Global/Resources/Assets.xcassets/Auth/authSubTitle.imageset/authSubTitle@2x.png
Binary file not shown.
Binary file removed
BIN
-8.31 KB
...Global/Resources/Assets.xcassets/Auth/authSubTitle.imageset/authSubTitle@3x.png
Binary file not shown.
Binary file removed
BIN
-1.73 KB
...thFoodMe/Global/Resources/Assets.xcassets/Auth/authTitle.imageset/authTitle.png
Binary file not shown.
Binary file removed
BIN
-2.83 KB
...oodMe/Global/Resources/Assets.xcassets/Auth/authTitle.imageset/authTitle@2x.png
Binary file not shown.
Binary file removed
BIN
-4.14 KB
...oodMe/Global/Resources/Assets.xcassets/Auth/authTitle.imageset/authTitle@3x.png
Binary file not shown.
6 changes: 6 additions & 0 deletions
6
HealthFoodMe/HealthFoodMe/Global/Resources/Assets.xcassets/HamburgerBar/Contents.json
This file contains 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,6 @@ | ||
{ | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
6 changes: 3 additions & 3 deletions
6
...ets/Auth/authTitle.imageset/Contents.json → ...burgerBar/btn_edit.imageset/Contents.json
This file contains 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
Binary file added
BIN
+617 Bytes
...Me/Global/Resources/Assets.xcassets/HamburgerBar/btn_edit.imageset/btn_edit.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
+1.16 KB
...Global/Resources/Assets.xcassets/HamburgerBar/btn_edit.imageset/btn_edit@2x.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
+1.7 KB
...Global/Resources/Assets.xcassets/HamburgerBar/btn_edit.imageset/btn_edit@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains 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
This file contains 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
16 changes: 16 additions & 0 deletions
16
HealthFoodMe/HealthFoodMe/Presentation/Map/HamburgerBarScene/ButtonVC.swift
This file contains 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,16 @@ | ||
// | ||
// ButtonVC.swift | ||
// HealthFoodMe | ||
// | ||
// Created by 강윤서 on 2022/07/10. | ||
// | ||
|
||
import UIKit | ||
import SnapKit | ||
|
||
class ButtonVC: UIViewController { | ||
override func viewDidLoad() { | ||
super.viewDidLoad() | ||
|
||
} | ||
} |
33 changes: 33 additions & 0 deletions
33
HealthFoodMe/HealthFoodMe/Presentation/Map/HamburgerBarScene/HamburgerBar.storyboard
This file contains 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,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> |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
p3;
요건 지워주세요~!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
넵!!