-
Notifications
You must be signed in to change notification settings - Fork 0
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
[Feat] #31 - WriteReviewViewController 기능 완료 #38
Merged
Merged
Changes from 22 commits
Commits
Show all changes
197 commits
Select commit
Hold shift + click to select a range
6c32623
[Merge] #31 - merged develop into #31
seongmin221 4226bcd
[Feat] #31 - flow partially completed
seongmin221 b75c5e9
[Fix] #17 - 컴포넌트 수정_진짜 최종
ckkim817 6614293
[Feat] #31 - write review flow in progress
seongmin221 1679815
[Fix] #17 - 컴포넌트 수정_진짜진짜 최종_이게 최종임
ckkim817 2699bfb
[Feat] #32 - Launch Screen 구현
ckkim817 0c91a86
[Feat] #31 - writeReview flow completed
seongmin221 945b151
[Fix] #32 - Launch Screen sleep 시간 변경
ckkim817 f8c70a0
[Feat] #31 - added navigation bar
seongmin221 6bed13d
[Move] #31 - moved common folders
seongmin221 bf2a601
[Feat] #31 - keyboard show hide move functions added
seongmin221 9436288
[Feat] #31 - bottomView added
seongmin221 fdf8eac
[Feat] #31 - complete except shadow
seongmin221 d8cc517
[Feat] #31 - applied line height to aboutReviewLabel
seongmin221 a38eece
[Feat] #31 - added navigationBarHidden func
seongmin221 5dea551
[Feat] #36 - 빵집리스트 더미 데이터 생성
jeongdung-eo c8e2e65
[Feat] #36 - 필터 아이템 구현
jeongdung-eo c1b01ef
[Fix] #36 - icon name 수정
jeongdung-eo 75a3651
[Feat] #36 - 빵집 리스트 상단뷰 구현
jeongdung-eo 361831c
[Feat] #36 - 빵집 리스트 필터셀 구현
jeongdung-eo 873d8f5
[Feat] #36 - 빵집 리스트 필터뷰 구현
jeongdung-eo 45144fa
[Feat] #36 - 빵집리스트 구현
jeongdung-eo 0696592
[Add] #36 - 빵집리스트 리터럴 추가
jeongdung-eo 382a55d
[Feat] #36 - 빵집리스트 셀 구현
jeongdung-eo d8e0182
[Fix] #36 - 빵집필터셀 분기처리 코드 수정
jeongdung-eo 8b37439
[Add] #36 - 빵집리스트 컬렉션뷰 뷰컨에 구현
jeongdung-eo 15196b9
[Fix] #36 - 빵집 필터셀 수정
jeongdung-eo 8008063
[Add] #36 - 셀업데이트 후 데이터 소스 적용
jeongdung-eo 34598ed
[Add] #36 - FilterItem UUID 추가
jeongdung-eo 7d07aa2
[Merge] 'develop' into feat/#36-bakeryList-collectionview
jeongdung-eo 263ade8
[Feat] #31 - writeReviewViewController layout done
seongmin221 0360fe8
[Fix] #36 - conflict 해결
jeongdung-eo 29b5447
[Feat] #31 - review flow completed
seongmin221 030dc1a
[Feat] #32 - 로그인/회원가입 화면 뷰 구현
ckkim817 eab2f21
[Feat] #31 - review flow detail checked
seongmin221 2c09b17
[Feat] #31 - edited details
seongmin221 2cabf10
[Feat] #31 - edited bottomview detail
seongmin221 c35145e
[Fix] #34 - 날린 커밋 재 커밋
ckkim817 73e8720
[Fix] #34 - 코드 리뷰 반영
ckkim817 8be649b
[Fix] #34 - 코드 리뷰 반영2
ckkim817 03dffe3
[Feat] #36 - 빵집 리스트 셀 컴포넌트 구현
jeongdung-eo ecf1d46
[Fix] #32 - Confilct 해결
ckkim817 d71415a
[Fix] #36 - 더미 데이터 수정
jeongdung-eo 149e327
[Fix] #34 - 코드 리뷰 반영3
ckkim817 c2c2518
[Move] #36 - 파일 폴더 이동
jeongdung-eo c04579d
[Fix] #36 - 불필요한 코드 삭제 및 수정
jeongdung-eo 1136df1
[Add] #36 - getIconImage 함수 추가
jeongdung-eo 6687564
[Fix] #34 - 코드 리뷰 반영4
ckkim817 0bb6c2f
[Feat] #40 - search 네비게이션뷰 구현
jeongdung-eo 107b8be
[Feat] #40 - search result뷰 구현
jeongdung-eo 14bd328
[Fix] #40 - conflict 해결
jeongdung-eo f762c93
[Fix] #34 - 코드 리뷰 반영5
ckkim817 ac9b6f6
[Feat] #40 - search Initial 컬렉션뷰셀 구현
jeongdung-eo 72caee1
[Merge] 'develop' into feat/#40-search-topView
jeongdung-eo 2617aa9
[Feat] #40 - search empty 컬렉션뷰셀 구현
jeongdung-eo 9984d0e
[Fix] #32 - conflict 해결
ckkim817 ea17411
[Feat] #39 - FilterViewControllers added
seongmin221 a362b71
[Fix] #34 - 코드 리뷰 반영6
ckkim817 5fa38eb
[Feat] #39 - FilterCollectionViewCell added
seongmin221 56c5038
[Feat] #39 - FilterPurposeViewController added
seongmin221 c10a768
[Feat] #39 - Models added for ViewControllers
seongmin221 22e602f
[Add] #40 - search 컬렉션뷰 셀 추가
jeongdung-eo 1406ec4
[Feat] #40 - empty 컬렉션뷰 셀 구현
jeongdung-eo b4c7072
[Feat] #40 - search 검색 리스트뷰 구현
jeongdung-eo c8bbaa0
[Fix] #40 - empty icon 수정
jeongdung-eo b81e446
[Add] #40 - empty 뷰 type 분기처리
jeongdung-eo 2755d23
[Add] #40 - empty뷰 text관련 함수 추가
jeongdung-eo 8fa994b
[Fix] #36 - conflict 해결
jeongdung-eo bfdc671
[Feat] #39 - filter common cell added
seongmin221 3f1bf9d
Merge branch 'develop' into feat/#39-filter-selection
seongmin221 f03bd4a
[Add] #42 - 저장목록 리터럴 추가
jeongdung-eo 6952315
[Feat] #42 - 저장 목록 네비뷰 구현
jeongdung-eo 9470e74
[Add] #43 - MyReviews 리터럴 추가
jeongdung-eo e9ed0e0
[Feat] #43 - 내가 쓴 리뷰 네비뷰 구현
jeongdung-eo b419e65
[Feat] #43 - 내가 쓴 리뷰 header뷰 구현
jeongdung-eo 3c26cb0
[Feat] #39 - pop action added
seongmin221 6f9ee5a
[Feat] #39 - string literal added
seongmin221 f5008f0
[Feat] #39 - insert text into string added
seongmin221 acf45f1
[Feat] #39 - FilterPurposeViewController edited
seongmin221 85fe523
Merge pull request #30 from GEON-PPANG/feat/#16-review-view
seongmin221 8eb8ffd
[Fix] #36 - conflict 해결
jeongdung-eo 2015471
[Merge] #31 - merged develop into #31
seongmin221 1c90da7
[Fix] #31 - code restored
seongmin221 167e3e8
[Feat] #31 - edited some files
seongmin221 958ac9f
Merge branch 'feat/#31-review-flow' into feat/#31-review-flow
seongmin221 7a08f66
[Feat] #31 - check text length method added
seongmin221 0b6e339
[Feat] #39 - filterPurposeCollectionView in progress
seongmin221 57c6313
[Fix] #36 - sectionInset 수정
jeongdung-eo d662548
[Add] #36 - header edgeInsets 추가
jeongdung-eo 7f26c52
[Fix] #36 - 불필요한 코드 삭제 및 수정
jeongdung-eo e7a8a2b
[Add] #36 - 빵집 리스트셀에 성분 컬렉션뷰 추가
jeongdung-eo 254d2ec
[Fix] #34 - 코드 리뷰 반영7
ckkim817 abf4a5b
[Fix] #34 - conflict 해결
ckkim817 718611b
[Fix] #34 - 사라졌던 Launch Screen 다시 추가
ckkim817 8d3c00b
[Feat] #32, #34 - 런치 스크린 구현 및 로그인/회원가입 화면 뷰 구현
ckkim817 43000a4
[Merge] 'develop' into feat/#36-bakeryList-collectionview
jeongdung-eo 6f16845
[Add] #36 - 분기처리 추가
jeongdung-eo 76b6682
[Fix] #36 - minimumLineSpacing 변경
jeongdung-eo f025f53
[Add] #36 - 빵집 리스트 리터럴 추가
jeongdung-eo b39ca24
[Add] #36 - 빵집 리스트 동적 높이 구하는 함수 추가
jeongdung-eo ac654d8
[Add] #36 - 빵집리스트 초기화 추가
jeongdung-eo 226eefb
[Fix] #40 - Conflict 해결
jeongdung-eo 875ce6f
[Feat] #39 - FilterPurposeVC completed
seongmin221 d228705
[Feat] #39 - FilterPurposeVC layout completed
seongmin221 3e643b3
[Fix] #47 - 컬렉션뷰 section inset 수정
jeongdung-eo 4d148bd
[Fix] #47 - 레이아웃 및 코드 수정
jeongdung-eo 00599c0
[Add] #47 - 홈 리뷰 키워드 컬렉션뷰 구현
jeongdung-eo a998519
[Merge] 'develop' into #47-reviewKeyword
jeongdung-eo 2fedee4
[Feat] #39 - FilterPurposeVC completed
seongmin221 163b6a1
[Fix] #42 - conflict 해결
jeongdung-eo 9114935
[Feat] #39 - FilterBreadTypeVC inprogress
seongmin221 8333f77
[Feat] #39 - FilterBreadTypeVC completed
seongmin221 b67dad8
[Feat] #39 - FilterIngredientVC completed
seongmin221 599839c
[Feat] #39 - Filter selection flow connected
seongmin221 4505f9c
[Fix] #47 - keywords 리스트 수정
jeongdung-eo c3eddff
[Fix] #36 - breadTypeTag 수정
jeongdung-eo e438703
[Feat] #39 - filter selection data connected
seongmin221 f5bf41b
[Fix] #36 - 빵집 필터 셀 UI 로직 수정
jeongdung-eo 08437bb
[Feat] #39 - changed backbutton action
seongmin221 d81a8cb
[Feat] #39 - edited layout details
seongmin221 e0151b3
[Fix] #40 - snapShot 로직 수정
jeongdung-eo d91669a
[Fix] #47 - 홈 header UI 로직 수정
jeongdung-eo 33594f5
[Feat] #39 - edited offsets for different devices
seongmin221 4e2305e
[Fix] #36 - 코드리뷰 반영 코드 수정
jeongdung-eo c15d713
[Feat] #39 - hasNotch extension added
seongmin221 e758c3a
[Feat] #39 - heightConsideringBottomSafeArea method added
seongmin221 a0c1702
[Fix] #36 - 코드리뷰 반영 수정
jeongdung-eo f65151b
[Fix] #31 - review applied - 1
seongmin221 49cb684
[Feat] #31 - review applied - 2
seongmin221 c489bb9
[Feat] #36 - 빵집 리스트뷰 구현
jeongdung-eo 12695e7
[Feat] #31 - review applied - 3
seongmin221 8864ff3
[Fix] #40 - conflict 해결
jeongdung-eo 5987d45
[Fix] #40 - 불필요한 코드 삭제 및 수정
jeongdung-eo c8bfe20
[Remove] #40 - 파일 삭제
jeongdung-eo 9d36d8f
[Feat] #40 - search 더미데이터 생성
jeongdung-eo 7ec30c1
[Add] #40 - 리터럴 추가
jeongdung-eo b743910
[Feat] #40 - bakeryType 프로토콜 생성
jeongdung-eo aa7e69f
[Fix] #40 - BakeryList관련 UI 로직 수정
jeongdung-eo 7f5b265
[Fix] #40 - 코드 수정
jeongdung-eo 96c13c6
[Merge] #42 - develop into 'feat/#42-mySavedView'
jeongdung-eo fa92efb
[Feat] #42 - 저장 목록 UI 로직 구현
jeongdung-eo f04f06c
[Merge] #43 - develop into '#43-myReviewView'
jeongdung-eo ceee637
[Feat] #51 - mypageDTO added
seongmin221 5e1d457
[Feat] #51 - myPageUI in progress
seongmin221 7a2634c
[Feat] #42 - MyRevies 헤더뷰 구현
jeongdung-eo efa6cd4
[Feat] #43 - MyReviews UI 로직 구현
jeongdung-eo 9420d6c
[Fix] #43 - 불필요한 코드 삭제 및 수정
jeongdung-eo 723ec69
[Fix] #43 - MyReviews관련 뷰 레이아웃 수정
jeongdung-eo 2c66c1e
[Feat] #51 - MyPageViewController overall UI completed
seongmin221 1caadf6
[Feat] #51 - adapted UI to iPhone SE2
seongmin221 9af0c3d
[Feat] #51 - MyPageVC detail added
seongmin221 60942ee
[Add] #51 - edited BreadType to BreadResponseType in BakeryListRespon…
seongmin221 968c95d
[Feat] #51 - MyPageVC completed
seongmin221 b9dbff5
[Del] #51 - deleted unused codes
seongmin221 50f626c
[Setting] edited PR template
seongmin221 4b010fb
Merge branch 'develop' into feat/#51-mypage
seongmin221 e28eb7c
[Merge] 'develop' into feat/#43-myReviewView
jeongdung-eo 45abb88
[Merge] 'develop' into feat/#40-search-topView
jeongdung-eo 2ad1723
[Merge] #39 - merged develop into #39
seongmin221 bf385ee
[Add] #39 - duplicated model changed
seongmin221 3472849
[Feat] #40 - 검색뷰 UI 구현
jeongdung-eo 88c2c2a
[Merge] #47 - conflict 해결 및 머지
jeongdung-eo a38a7cb
[Feat] #39 - connected filterview to homeview
seongmin221 75b9495
[Fix] #47 - 홈 리뷰 컬렉션뷰 셀 로직 수정
jeongdung-eo afe1d47
[Fix] #47 - 린트 수정
jeongdung-eo 786cf5e
[Feat] #47 - 홈뷰 리뷰 키워드 컬렉션뷰 구현
jeongdung-eo 530f8c3
[Merge] #42 - conflict 해결 및 머지
jeongdung-eo 02e76c7
[Fix] #42 - MySavedBakery 로직 수정
jeongdung-eo d42525f
[Merge] #51 - merged develop into #51
seongmin221 de60626
[Feat] #51 - changed BreadType to BreadResponseType
seongmin221 f2f4348
[Feat] #51 - connected MyPage and Filter in progress
seongmin221 3a151ab
Merge pull request #50 from GEON-PPANG/feat/#39-filter-selection
seongmin221 21989ba
[Merge] #51 - merged develop into #51
seongmin221 4cf3574
[Fix] #42 - 빵집 리스트 DTO 관련 로직 수정
jeongdung-eo 11f064b
[Fix] #42 - Conflict 해결
jeongdung-eo 81c0fd7
[Del] #42 - 불필요한 코드 삭제
jeongdung-eo a6e1991
[Feat] #51 - connected MyPage and Filter
seongmin221 be188ee
Merge pull request #54 from GEON-PPANG/feat/#51-mypage
seongmin221 dca5db2
[Merge] #42 - conflict 해결 및 머지
jeongdung-eo 5e97bfd
[Fix] #42 - 마이페이지 저장목록 뷰 전환 연결
jeongdung-eo 90dab33
[Merge] #31 - merged develop into #31
seongmin221 a7328a7
[Fix] #42 - 뷰컨트롤러 뷰 전환 로직 수정
jeongdung-eo 53713d5
[Fix] #42 - 불필요한 코드 삭제 및 수정
jeongdung-eo f32c541
[Add] #42 - 저장목록 lineView 추가
jeongdung-eo 877ab43
[Fix] #42 - bookmark 네이밍 수정
jeongdung-eo d5db785
[Merge] #42 - conflict 해결 및 머지
jeongdung-eo 3472948
[Feat] #42 - 마이페이지 저장목록 UI 구현
jeongdung-eo 6f7ffe1
[Merge] #43 - conflict 해결 및 머지
jeongdung-eo b43b561
[Merge] #31 - merged develop into #31
seongmin221 37f3a03
[Fix] #43 - 불필요한 코드 삭제 및 수정
jeongdung-eo 0a39311
[Add] #43 - 내 정보뷰 내가 쓴 리뷰 화면 전환 추가
jeongdung-eo a684338
[Del] #31 - deleted unused codes
seongmin221 22d163b
[Del] #31 - deleted unused code
seongmin221 e70f401
[Add] #42 - empty section 추가
jeongdung-eo 9692352
[Feat] #43 - 마이페이지 내가 쓴 리뷰 UI 구현
jeongdung-eo 3e10b4f
Merge branch 'develop' into feat/#31-review-flow
seongmin221 5d739a4
[Feat] #31 - attached DTO
seongmin221 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
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,60 @@ | ||
// | ||
// BottomView.swift | ||
// GEON-PPANG-iOS | ||
// | ||
// Created by 이성민 on 2023/07/11. | ||
// | ||
|
||
import UIKit | ||
|
||
import SnapKit | ||
import Then | ||
|
||
final class BottomView: UIView { | ||
|
||
// MARK: - Life Cycle | ||
|
||
override init(frame: CGRect) { | ||
super.init(frame: frame) | ||
|
||
setLayout() | ||
setShadow() | ||
} | ||
|
||
@available(*, unavailable) | ||
required init?(coder: NSCoder) { | ||
fatalError("init(coder:) has not been implemented") | ||
} | ||
|
||
// MARK: - Setting | ||
// 16 | ||
// 56 | ||
// 16 -> 32 | ||
// 24 | ||
private func setLayout() { | ||
self.snp.makeConstraints { | ||
$0.height.equalTo(128) | ||
} | ||
} | ||
|
||
private func setShadow() { | ||
self.layer.applyShadow(color: .init(red: 0, green: 0, blue: 0, alpha: 0.1), | ||
alpha: 1, | ||
x: 0, | ||
y: 1, | ||
blur: 10) | ||
} | ||
|
||
// MARK: - Custom Method | ||
|
||
func applyAdditionalSubview(_ view: UIView, withTrailingOffset offset: CGFloat = 21) { | ||
addSubview(view) | ||
view.snp.makeConstraints { | ||
$0.leading.equalToSuperview().inset(24) | ||
$0.trailing.equalToSuperview().inset(24) | ||
$0.top.equalToSuperview().inset(offset) | ||
$0.height.equalTo(56) | ||
} | ||
} | ||
|
||
} |
File renamed without changes.
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
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.
Q: 이부분은 뭔가욤 ?
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.
앗 ><
f65151b
반영 완 ~