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

[Feat] #31 - WriteReviewViewController 기능 완료 #38

Merged
merged 197 commits into from
Jul 15, 2023
Merged
Show file tree
Hide file tree
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 Jul 10, 2023
4226bcd
[Feat] #31 - flow partially completed
seongmin221 Jul 10, 2023
b75c5e9
[Fix] #17 - 컴포넌트 수정_진짜 최종
ckkim817 Jul 10, 2023
6614293
[Feat] #31 - write review flow in progress
seongmin221 Jul 10, 2023
1679815
[Fix] #17 - 컴포넌트 수정_진짜진짜 최종_이게 최종임
ckkim817 Jul 10, 2023
2699bfb
[Feat] #32 - Launch Screen 구현
ckkim817 Jul 10, 2023
0c91a86
[Feat] #31 - writeReview flow completed
seongmin221 Jul 10, 2023
945b151
[Fix] #32 - Launch Screen sleep 시간 변경
ckkim817 Jul 10, 2023
f8c70a0
[Feat] #31 - added navigation bar
seongmin221 Jul 10, 2023
6bed13d
[Move] #31 - moved common folders
seongmin221 Jul 10, 2023
bf2a601
[Feat] #31 - keyboard show hide move functions added
seongmin221 Jul 10, 2023
9436288
[Feat] #31 - bottomView added
seongmin221 Jul 10, 2023
fdf8eac
[Feat] #31 - complete except shadow
seongmin221 Jul 10, 2023
d8cc517
[Feat] #31 - applied line height to aboutReviewLabel
seongmin221 Jul 11, 2023
a38eece
[Feat] #31 - added navigationBarHidden func
seongmin221 Jul 11, 2023
5dea551
[Feat] #36 - 빵집리스트 더미 데이터 생성
jeongdung-eo Jul 11, 2023
c8e2e65
[Feat] #36 - 필터 아이템 구현
jeongdung-eo Jul 11, 2023
c1b01ef
[Fix] #36 - icon name 수정
jeongdung-eo Jul 11, 2023
75a3651
[Feat] #36 - 빵집 리스트 상단뷰 구현
jeongdung-eo Jul 11, 2023
361831c
[Feat] #36 - 빵집 리스트 필터셀 구현
jeongdung-eo Jul 11, 2023
873d8f5
[Feat] #36 - 빵집 리스트 필터뷰 구현
jeongdung-eo Jul 11, 2023
45144fa
[Feat] #36 - 빵집리스트 구현
jeongdung-eo Jul 11, 2023
0696592
[Add] #36 - 빵집리스트 리터럴 추가
jeongdung-eo Jul 11, 2023
382a55d
[Feat] #36 - 빵집리스트 셀 구현
jeongdung-eo Jul 11, 2023
d8e0182
[Fix] #36 - 빵집필터셀 분기처리 코드 수정
jeongdung-eo Jul 11, 2023
8b37439
[Add] #36 - 빵집리스트 컬렉션뷰 뷰컨에 구현
jeongdung-eo Jul 11, 2023
15196b9
[Fix] #36 - 빵집 필터셀 수정
jeongdung-eo Jul 11, 2023
8008063
[Add] #36 - 셀업데이트 후 데이터 소스 적용
jeongdung-eo Jul 11, 2023
34598ed
[Add] #36 - FilterItem UUID 추가
jeongdung-eo Jul 11, 2023
7d07aa2
[Merge] 'develop' into feat/#36-bakeryList-collectionview
jeongdung-eo Jul 11, 2023
263ade8
[Feat] #31 - writeReviewViewController layout done
seongmin221 Jul 11, 2023
0360fe8
[Fix] #36 - conflict 해결
jeongdung-eo Jul 11, 2023
29b5447
[Feat] #31 - review flow completed
seongmin221 Jul 11, 2023
030dc1a
[Feat] #32 - 로그인/회원가입 화면 뷰 구현
ckkim817 Jul 11, 2023
eab2f21
[Feat] #31 - review flow detail checked
seongmin221 Jul 11, 2023
2c09b17
[Feat] #31 - edited details
seongmin221 Jul 11, 2023
2cabf10
[Feat] #31 - edited bottomview detail
seongmin221 Jul 11, 2023
c35145e
[Fix] #34 - 날린 커밋 재 커밋
ckkim817 Jul 11, 2023
73e8720
[Fix] #34 - 코드 리뷰 반영
ckkim817 Jul 11, 2023
8be649b
[Fix] #34 - 코드 리뷰 반영2
ckkim817 Jul 11, 2023
03dffe3
[Feat] #36 - 빵집 리스트 셀 컴포넌트 구현
jeongdung-eo Jul 11, 2023
ecf1d46
[Fix] #32 - Confilct 해결
ckkim817 Jul 11, 2023
d71415a
[Fix] #36 - 더미 데이터 수정
jeongdung-eo Jul 11, 2023
149e327
[Fix] #34 - 코드 리뷰 반영3
ckkim817 Jul 11, 2023
c2c2518
[Move] #36 - 파일 폴더 이동
jeongdung-eo Jul 11, 2023
c04579d
[Fix] #36 - 불필요한 코드 삭제 및 수정
jeongdung-eo Jul 11, 2023
1136df1
[Add] #36 - getIconImage 함수 추가
jeongdung-eo Jul 11, 2023
6687564
[Fix] #34 - 코드 리뷰 반영4
ckkim817 Jul 11, 2023
0bb6c2f
[Feat] #40 - search 네비게이션뷰 구현
jeongdung-eo Jul 11, 2023
107b8be
[Feat] #40 - search result뷰 구현
jeongdung-eo Jul 11, 2023
14bd328
[Fix] #40 - conflict 해결
jeongdung-eo Jul 11, 2023
f762c93
[Fix] #34 - 코드 리뷰 반영5
ckkim817 Jul 11, 2023
ac9b6f6
[Feat] #40 - search Initial 컬렉션뷰셀 구현
jeongdung-eo Jul 11, 2023
72caee1
[Merge] 'develop' into feat/#40-search-topView
jeongdung-eo Jul 11, 2023
2617aa9
[Feat] #40 - search empty 컬렉션뷰셀 구현
jeongdung-eo Jul 11, 2023
9984d0e
[Fix] #32 - conflict 해결
ckkim817 Jul 11, 2023
ea17411
[Feat] #39 - FilterViewControllers added
seongmin221 Jul 11, 2023
a362b71
[Fix] #34 - 코드 리뷰 반영6
ckkim817 Jul 11, 2023
5fa38eb
[Feat] #39 - FilterCollectionViewCell added
seongmin221 Jul 11, 2023
56c5038
[Feat] #39 - FilterPurposeViewController added
seongmin221 Jul 11, 2023
c10a768
[Feat] #39 - Models added for ViewControllers
seongmin221 Jul 11, 2023
22e602f
[Add] #40 - search 컬렉션뷰 셀 추가
jeongdung-eo Jul 11, 2023
1406ec4
[Feat] #40 - empty 컬렉션뷰 셀 구현
jeongdung-eo Jul 11, 2023
b4c7072
[Feat] #40 - search 검색 리스트뷰 구현
jeongdung-eo Jul 11, 2023
c8bbaa0
[Fix] #40 - empty icon 수정
jeongdung-eo Jul 11, 2023
b81e446
[Add] #40 - empty 뷰 type 분기처리
jeongdung-eo Jul 11, 2023
2755d23
[Add] #40 - empty뷰 text관련 함수 추가
jeongdung-eo Jul 12, 2023
8fa994b
[Fix] #36 - conflict 해결
jeongdung-eo Jul 12, 2023
bfdc671
[Feat] #39 - filter common cell added
seongmin221 Jul 12, 2023
3f1bf9d
Merge branch 'develop' into feat/#39-filter-selection
seongmin221 Jul 12, 2023
f03bd4a
[Add] #42 - 저장목록 리터럴 추가
jeongdung-eo Jul 12, 2023
6952315
[Feat] #42 - 저장 목록 네비뷰 구현
jeongdung-eo Jul 12, 2023
9470e74
[Add] #43 - MyReviews 리터럴 추가
jeongdung-eo Jul 12, 2023
e9ed0e0
[Feat] #43 - 내가 쓴 리뷰 네비뷰 구현
jeongdung-eo Jul 12, 2023
b419e65
[Feat] #43 - 내가 쓴 리뷰 header뷰 구현
jeongdung-eo Jul 12, 2023
3c26cb0
[Feat] #39 - pop action added
seongmin221 Jul 12, 2023
6f9ee5a
[Feat] #39 - string literal added
seongmin221 Jul 12, 2023
f5008f0
[Feat] #39 - insert text into string added
seongmin221 Jul 12, 2023
acf45f1
[Feat] #39 - FilterPurposeViewController edited
seongmin221 Jul 12, 2023
85fe523
Merge pull request #30 from GEON-PPANG/feat/#16-review-view
seongmin221 Jul 12, 2023
8eb8ffd
[Fix] #36 - conflict 해결
jeongdung-eo Jul 12, 2023
2015471
[Merge] #31 - merged develop into #31
seongmin221 Jul 12, 2023
1c90da7
[Fix] #31 - code restored
seongmin221 Jul 12, 2023
167e3e8
[Feat] #31 - edited some files
seongmin221 Jul 12, 2023
958ac9f
Merge branch 'feat/#31-review-flow' into feat/#31-review-flow
seongmin221 Jul 12, 2023
7a08f66
[Feat] #31 - check text length method added
seongmin221 Jul 12, 2023
0b6e339
[Feat] #39 - filterPurposeCollectionView in progress
seongmin221 Jul 12, 2023
57c6313
[Fix] #36 - sectionInset 수정
jeongdung-eo Jul 12, 2023
d662548
[Add] #36 - header edgeInsets 추가
jeongdung-eo Jul 12, 2023
7f26c52
[Fix] #36 - 불필요한 코드 삭제 및 수정
jeongdung-eo Jul 12, 2023
e7a8a2b
[Add] #36 - 빵집 리스트셀에 성분 컬렉션뷰 추가
jeongdung-eo Jul 12, 2023
254d2ec
[Fix] #34 - 코드 리뷰 반영7
ckkim817 Jul 12, 2023
abf4a5b
[Fix] #34 - conflict 해결
ckkim817 Jul 12, 2023
718611b
[Fix] #34 - 사라졌던 Launch Screen 다시 추가
ckkim817 Jul 12, 2023
8d3c00b
[Feat] #32, #34 - 런치 스크린 구현 및 로그인/회원가입 화면 뷰 구현
ckkim817 Jul 12, 2023
43000a4
[Merge] 'develop' into feat/#36-bakeryList-collectionview
jeongdung-eo Jul 12, 2023
6f16845
[Add] #36 - 분기처리 추가
jeongdung-eo Jul 12, 2023
76b6682
[Fix] #36 - minimumLineSpacing 변경
jeongdung-eo Jul 12, 2023
f025f53
[Add] #36 - 빵집 리스트 리터럴 추가
jeongdung-eo Jul 12, 2023
b39ca24
[Add] #36 - 빵집 리스트 동적 높이 구하는 함수 추가
jeongdung-eo Jul 12, 2023
ac654d8
[Add] #36 - 빵집리스트 초기화 추가
jeongdung-eo Jul 12, 2023
226eefb
[Fix] #40 - Conflict 해결
jeongdung-eo Jul 12, 2023
875ce6f
[Feat] #39 - FilterPurposeVC completed
seongmin221 Jul 13, 2023
d228705
[Feat] #39 - FilterPurposeVC layout completed
seongmin221 Jul 13, 2023
3e643b3
[Fix] #47 - 컬렉션뷰 section inset 수정
jeongdung-eo Jul 13, 2023
4d148bd
[Fix] #47 - 레이아웃 및 코드 수정
jeongdung-eo Jul 13, 2023
00599c0
[Add] #47 - 홈 리뷰 키워드 컬렉션뷰 구현
jeongdung-eo Jul 13, 2023
a998519
[Merge] 'develop' into #47-reviewKeyword
jeongdung-eo Jul 13, 2023
2fedee4
[Feat] #39 - FilterPurposeVC completed
seongmin221 Jul 13, 2023
163b6a1
[Fix] #42 - conflict 해결
jeongdung-eo Jul 13, 2023
9114935
[Feat] #39 - FilterBreadTypeVC inprogress
seongmin221 Jul 13, 2023
8333f77
[Feat] #39 - FilterBreadTypeVC completed
seongmin221 Jul 13, 2023
b67dad8
[Feat] #39 - FilterIngredientVC completed
seongmin221 Jul 13, 2023
599839c
[Feat] #39 - Filter selection flow connected
seongmin221 Jul 13, 2023
4505f9c
[Fix] #47 - keywords 리스트 수정
jeongdung-eo Jul 13, 2023
c3eddff
[Fix] #36 - breadTypeTag 수정
jeongdung-eo Jul 13, 2023
e438703
[Feat] #39 - filter selection data connected
seongmin221 Jul 13, 2023
f5bf41b
[Fix] #36 - 빵집 필터 셀 UI 로직 수정
jeongdung-eo Jul 13, 2023
08437bb
[Feat] #39 - changed backbutton action
seongmin221 Jul 13, 2023
d81a8cb
[Feat] #39 - edited layout details
seongmin221 Jul 13, 2023
e0151b3
[Fix] #40 - snapShot 로직 수정
jeongdung-eo Jul 13, 2023
d91669a
[Fix] #47 - 홈 header UI 로직 수정
jeongdung-eo Jul 13, 2023
33594f5
[Feat] #39 - edited offsets for different devices
seongmin221 Jul 13, 2023
4e2305e
[Fix] #36 - 코드리뷰 반영 코드 수정
jeongdung-eo Jul 13, 2023
c15d713
[Feat] #39 - hasNotch extension added
seongmin221 Jul 13, 2023
e758c3a
[Feat] #39 - heightConsideringBottomSafeArea method added
seongmin221 Jul 13, 2023
a0c1702
[Fix] #36 - 코드리뷰 반영 수정
jeongdung-eo Jul 13, 2023
f65151b
[Fix] #31 - review applied - 1
seongmin221 Jul 13, 2023
49cb684
[Feat] #31 - review applied - 2
seongmin221 Jul 13, 2023
c489bb9
[Feat] #36 - 빵집 리스트뷰 구현
jeongdung-eo Jul 13, 2023
12695e7
[Feat] #31 - review applied - 3
seongmin221 Jul 13, 2023
8864ff3
[Fix] #40 - conflict 해결
jeongdung-eo Jul 13, 2023
5987d45
[Fix] #40 - 불필요한 코드 삭제 및 수정
jeongdung-eo Jul 14, 2023
c8bfe20
[Remove] #40 - 파일 삭제
jeongdung-eo Jul 14, 2023
9d36d8f
[Feat] #40 - search 더미데이터 생성
jeongdung-eo Jul 14, 2023
7ec30c1
[Add] #40 - 리터럴 추가
jeongdung-eo Jul 14, 2023
b743910
[Feat] #40 - bakeryType 프로토콜 생성
jeongdung-eo Jul 14, 2023
aa7e69f
[Fix] #40 - BakeryList관련 UI 로직 수정
jeongdung-eo Jul 14, 2023
7f5b265
[Fix] #40 - 코드 수정
jeongdung-eo Jul 14, 2023
96c13c6
[Merge] #42 - develop into 'feat/#42-mySavedView'
jeongdung-eo Jul 14, 2023
fa92efb
[Feat] #42 - 저장 목록 UI 로직 구현
jeongdung-eo Jul 14, 2023
f04f06c
[Merge] #43 - develop into '#43-myReviewView'
jeongdung-eo Jul 14, 2023
ceee637
[Feat] #51 - mypageDTO added
seongmin221 Jul 14, 2023
5e1d457
[Feat] #51 - myPageUI in progress
seongmin221 Jul 14, 2023
7a2634c
[Feat] #42 - MyRevies 헤더뷰 구현
jeongdung-eo Jul 14, 2023
efa6cd4
[Feat] #43 - MyReviews UI 로직 구현
jeongdung-eo Jul 14, 2023
9420d6c
[Fix] #43 - 불필요한 코드 삭제 및 수정
jeongdung-eo Jul 14, 2023
723ec69
[Fix] #43 - MyReviews관련 뷰 레이아웃 수정
jeongdung-eo Jul 14, 2023
2c66c1e
[Feat] #51 - MyPageViewController overall UI completed
seongmin221 Jul 14, 2023
1caadf6
[Feat] #51 - adapted UI to iPhone SE2
seongmin221 Jul 14, 2023
9af0c3d
[Feat] #51 - MyPageVC detail added
seongmin221 Jul 14, 2023
60942ee
[Add] #51 - edited BreadType to BreadResponseType in BakeryListRespon…
seongmin221 Jul 14, 2023
968c95d
[Feat] #51 - MyPageVC completed
seongmin221 Jul 14, 2023
b9dbff5
[Del] #51 - deleted unused codes
seongmin221 Jul 14, 2023
50f626c
[Setting] edited PR template
seongmin221 Jul 14, 2023
4b010fb
Merge branch 'develop' into feat/#51-mypage
seongmin221 Jul 14, 2023
e28eb7c
[Merge] 'develop' into feat/#43-myReviewView
jeongdung-eo Jul 14, 2023
45abb88
[Merge] 'develop' into feat/#40-search-topView
jeongdung-eo Jul 15, 2023
2ad1723
[Merge] #39 - merged develop into #39
seongmin221 Jul 15, 2023
bf385ee
[Add] #39 - duplicated model changed
seongmin221 Jul 15, 2023
3472849
[Feat] #40 - 검색뷰 UI 구현
jeongdung-eo Jul 15, 2023
88c2c2a
[Merge] #47 - conflict 해결 및 머지
jeongdung-eo Jul 15, 2023
a38a7cb
[Feat] #39 - connected filterview to homeview
seongmin221 Jul 15, 2023
75b9495
[Fix] #47 - 홈 리뷰 컬렉션뷰 셀 로직 수정
jeongdung-eo Jul 15, 2023
afe1d47
[Fix] #47 - 린트 수정
jeongdung-eo Jul 15, 2023
786cf5e
[Feat] #47 - 홈뷰 리뷰 키워드 컬렉션뷰 구현
jeongdung-eo Jul 15, 2023
530f8c3
[Merge] #42 - conflict 해결 및 머지
jeongdung-eo Jul 15, 2023
02e76c7
[Fix] #42 - MySavedBakery 로직 수정
jeongdung-eo Jul 15, 2023
d42525f
[Merge] #51 - merged develop into #51
seongmin221 Jul 15, 2023
de60626
[Feat] #51 - changed BreadType to BreadResponseType
seongmin221 Jul 15, 2023
f2f4348
[Feat] #51 - connected MyPage and Filter in progress
seongmin221 Jul 15, 2023
3a151ab
Merge pull request #50 from GEON-PPANG/feat/#39-filter-selection
seongmin221 Jul 15, 2023
21989ba
[Merge] #51 - merged develop into #51
seongmin221 Jul 15, 2023
4cf3574
[Fix] #42 - 빵집 리스트 DTO 관련 로직 수정
jeongdung-eo Jul 15, 2023
11f064b
[Fix] #42 - Conflict 해결
jeongdung-eo Jul 15, 2023
81c0fd7
[Del] #42 - 불필요한 코드 삭제
jeongdung-eo Jul 15, 2023
a6e1991
[Feat] #51 - connected MyPage and Filter
seongmin221 Jul 15, 2023
be188ee
Merge pull request #54 from GEON-PPANG/feat/#51-mypage
seongmin221 Jul 15, 2023
dca5db2
[Merge] #42 - conflict 해결 및 머지
jeongdung-eo Jul 15, 2023
5e97bfd
[Fix] #42 - 마이페이지 저장목록 뷰 전환 연결
jeongdung-eo Jul 15, 2023
90dab33
[Merge] #31 - merged develop into #31
seongmin221 Jul 15, 2023
a7328a7
[Fix] #42 - 뷰컨트롤러 뷰 전환 로직 수정
jeongdung-eo Jul 15, 2023
53713d5
[Fix] #42 - 불필요한 코드 삭제 및 수정
jeongdung-eo Jul 15, 2023
f32c541
[Add] #42 - 저장목록 lineView 추가
jeongdung-eo Jul 15, 2023
877ab43
[Fix] #42 - bookmark 네이밍 수정
jeongdung-eo Jul 15, 2023
d5db785
[Merge] #42 - conflict 해결 및 머지
jeongdung-eo Jul 15, 2023
3472948
[Feat] #42 - 마이페이지 저장목록 UI 구현
jeongdung-eo Jul 15, 2023
6f7ffe1
[Merge] #43 - conflict 해결 및 머지
jeongdung-eo Jul 15, 2023
b43b561
[Merge] #31 - merged develop into #31
seongmin221 Jul 15, 2023
37f3a03
[Fix] #43 - 불필요한 코드 삭제 및 수정
jeongdung-eo Jul 15, 2023
0a39311
[Add] #43 - 내 정보뷰 내가 쓴 리뷰 화면 전환 추가
jeongdung-eo Jul 15, 2023
a684338
[Del] #31 - deleted unused codes
seongmin221 Jul 15, 2023
22d163b
[Del] #31 - deleted unused code
seongmin221 Jul 15, 2023
e70f401
[Add] #42 - empty section 추가
jeongdung-eo Jul 15, 2023
9692352
[Feat] #43 - 마이페이지 내가 쓴 리뷰 UI 구현
jeongdung-eo Jul 15, 2023
3e10b4f
Merge branch 'develop' into feat/#31-review-flow
seongmin221 Jul 15, 2023
5d739a4
[Feat] #31 - attached DTO
seongmin221 Jul 15, 2023
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
46 changes: 31 additions & 15 deletions GEON-PPANG-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,18 @@
3E16E4FA2A57D1F400B813D0 /* RecommendationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E16E4F92A57D1F400B813D0 /* RecommendationModel.swift */; };
3E16E4FC2A57D24900B813D0 /* LikeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E16E4FB2A57D24900B813D0 /* LikeModel.swift */; };
3E16E4FE2A57F06D00B813D0 /* OptionsCollectionViewFlowLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E16E4FD2A57F06D00B813D0 /* OptionsCollectionViewFlowLayout.swift */; };
3E16E5002A57FFD900B813D0 /* OptionsCollectionViewHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E16E4FF2A57FFD900B813D0 /* OptionsCollectionViewHeader.swift */; };
3E16E5022A58176800B813D0 /* ReviewDetailTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E16E5012A58176800B813D0 /* ReviewDetailTextView.swift */; };
3E2EEF752A5C93010093BCA9 /* BottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E2EEF742A5C93010093BCA9 /* BottomView.swift */; };
3E79B19D2A54523D00D36A26 /* BackButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E79B19C2A54523D00D36A26 /* BackButton.swift */; };
3E79B1A02A5546E700D36A26 /* DescriptionCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E79B19F2A5546E700D36A26 /* DescriptionCollectionViewCell.swift */; };
3E79B1A62A566F6400D36A26 /* WriteReviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E79B1A52A566F6400D36A26 /* WriteReviewViewController.swift */; };
3E79B1AE2A56F14A00D36A26 /* BakeryOverviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E79B1AD2A56F14A00D36A26 /* BakeryOverviewView.swift */; };
3E79B1B02A571B4B00D36A26 /* LineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E79B1AF2A571B4B00D36A26 /* LineView.swift */; };
3E79B1B22A571E1F00D36A26 /* OptionsCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E79B1B12A571E1F00D36A26 /* OptionsCollectionView.swift */; };
3E79B1B52A571E7100D36A26 /* OptionsCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E79B1B42A571E7100D36A26 /* OptionsCollectionViewCell.swift */; };
3E79B1A02A5546E700D36A26 /* DescriptionCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E79B19F2A5546E700D36A26 /* DescriptionCollectionViewCell.swift */; };
3EA2E1E32A53E88B003516A3 /* BaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EA2E1E22A53E88B003516A3 /* BaseViewController.swift */; };
3EA2E1E92A541AEB003516A3 /* CustomNavigationBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EA2E1E82A541AEB003516A3 /* CustomNavigationBar.swift */; };
3EA2E1EB2A542151003516A3 /* SizeLiteral.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EA2E1EA2A542151003516A3 /* SizeLiteral.swift */; };
3EFA97862A5EBCA9002E70FA /* LineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EFA97852A5EBCA9002E70FA /* LineView.swift */; };
3EFA97882A5EBCED002E70FA /* CustomNavigationBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EFA97872A5EBCED002E70FA /* CustomNavigationBar.swift */; };
DF959A612A539FBE00E75774 /* Pretendard-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = DF959A5F2A539FBE00E75774 /* Pretendard-Bold.otf */; };
DF959A622A539FBE00E75774 /* Pretendard-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = DF959A602A539FBE00E75774 /* Pretendard-Medium.otf */; };
DF959A6C2A568C4600E75774 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DF959A6B2A568C4600E75774 /* Colors.xcassets */; };
Expand Down Expand Up @@ -137,18 +137,18 @@
3E16E4F92A57D1F400B813D0 /* RecommendationModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecommendationModel.swift; sourceTree = "<group>"; };
3E16E4FB2A57D24900B813D0 /* LikeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LikeModel.swift; sourceTree = "<group>"; };
3E16E4FD2A57F06D00B813D0 /* OptionsCollectionViewFlowLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptionsCollectionViewFlowLayout.swift; sourceTree = "<group>"; };
3E16E4FF2A57FFD900B813D0 /* OptionsCollectionViewHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptionsCollectionViewHeader.swift; sourceTree = "<group>"; };
3E16E5012A58176800B813D0 /* ReviewDetailTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewDetailTextView.swift; sourceTree = "<group>"; };
3E2EEF742A5C93010093BCA9 /* BottomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomView.swift; sourceTree = "<group>"; };
3E79B19C2A54523D00D36A26 /* BackButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackButton.swift; sourceTree = "<group>"; };
3E79B19F2A5546E700D36A26 /* DescriptionCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DescriptionCollectionViewCell.swift; sourceTree = "<group>"; };
3E79B1A52A566F6400D36A26 /* WriteReviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WriteReviewViewController.swift; sourceTree = "<group>"; };
3E79B1AD2A56F14A00D36A26 /* BakeryOverviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BakeryOverviewView.swift; sourceTree = "<group>"; };
3E79B1AF2A571B4B00D36A26 /* LineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineView.swift; sourceTree = "<group>"; };
3E79B1B12A571E1F00D36A26 /* OptionsCollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptionsCollectionView.swift; sourceTree = "<group>"; };
3E79B1B42A571E7100D36A26 /* OptionsCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptionsCollectionViewCell.swift; sourceTree = "<group>"; };
3EA2E1E22A53E88B003516A3 /* BaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = "<group>"; };
3EA2E1E82A541AEB003516A3 /* CustomNavigationBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomNavigationBar.swift; sourceTree = "<group>"; };
3EA2E1EA2A542151003516A3 /* SizeLiteral.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SizeLiteral.swift; sourceTree = "<group>"; };
3EFA97852A5EBCA9002E70FA /* LineView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineView.swift; sourceTree = "<group>"; };
3EFA97872A5EBCED002E70FA /* CustomNavigationBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomNavigationBar.swift; sourceTree = "<group>"; };
DF959A5F2A539FBE00E75774 /* Pretendard-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Bold.otf"; sourceTree = "<group>"; };
DF959A602A539FBE00E75774 /* Pretendard-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Medium.otf"; sourceTree = "<group>"; };
DF959A6B2A568C4600E75774 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = "<group>"; };
Expand Down Expand Up @@ -543,11 +543,28 @@
path = Model;
sourceTree = "<group>";
};
3E2EEF722A5C928F0093BCA9 /* View */ = {
isa = PBXGroup;
children = (
3EFA97852A5EBCA9002E70FA /* LineView.swift */,
3E2EEF742A5C93010093BCA9 /* BottomView.swift */,
);
path = View;
sourceTree = "<group>";
};
3E2EEF732A5C92980093BCA9 /* NavigationBar */ = {
isa = PBXGroup;
children = (
3EFA97872A5EBCED002E70FA /* CustomNavigationBar.swift */,
);
path = NavigationBar;
sourceTree = "<group>";
};
3E79B19B2A54523400D36A26 /* Button */ = {
isa = PBXGroup;
children = (
0987288C2A5BA1F000A29402 /* BookmarkButton.swift */,
3E79B19C2A54523D00D36A26 /* BackButton.swift */,
0987288C2A5BA1F000A29402 /* BookmarkButton.swift */,
09CA3EF72A5676AA0063897A /* CommonButton.swift */,
);
path = Button;
Expand Down Expand Up @@ -577,23 +594,22 @@
3E79B1B12A571E1F00D36A26 /* OptionsCollectionView.swift */,
3E79B1B42A571E7100D36A26 /* OptionsCollectionViewCell.swift */,
3E16E4FD2A57F06D00B813D0 /* OptionsCollectionViewFlowLayout.swift */,
3E16E4FF2A57FFD900B813D0 /* OptionsCollectionViewHeader.swift */,
);
path = OptionsCollection;
sourceTree = "<group>";
};
3EA2E1E02A53E864003516A3 /* Common */ = {
isa = PBXGroup;
children = (
3EA2E1E12A53E880003516A3 /* Base */,
3E2EEF722A5C928F0093BCA9 /* View */,
093213FD2A5A74D100875EF6 /* TextField */,
3E79B19E2A55468500D36A26 /* Cell */,
0915C1732A5C4FEE00ACB8D4 /* StackView */,
0915C1762A5C634000ACB8D4 /* Label */,
097682D82A5C828E0008F4FB /* ImageView */,
3E79B19B2A54523400D36A26 /* Button */,
3EA2E1E12A53E880003516A3 /* Base */,
3E79B1AF2A571B4B00D36A26 /* LineView.swift */,
3EA2E1E82A541AEB003516A3 /* CustomNavigationBar.swift */,
3E2EEF732A5C92980093BCA9 /* NavigationBar */,
);
path = Common;
sourceTree = "<group>";
Expand Down Expand Up @@ -755,6 +771,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3EFA97882A5EBCED002E70FA /* CustomNavigationBar.swift in Sources */,
0915C1702A5C3C5600ACB8D4 /* RegionStackView.swift in Sources */,
3E16E4FC2A57D24900B813D0 /* LikeModel.swift in Sources */,
3E79B1AE2A56F14A00D36A26 /* BakeryOverviewView.swift in Sources */,
Expand All @@ -763,7 +780,6 @@
090556292A51DBC000752067 /* UIView+.swift in Sources */,
090556292A51DBC000752067 /* UIView+.swift in Sources */,
090668FC2A4FF3C600F413FA /* AppDelegate.swift in Sources */,
3E79B1B02A571B4B00D36A26 /* LineView.swift in Sources */,
090668FD2A4FF3C600F413FA /* SceneDelegate.swift in Sources */,
097682DC2A5C83910008F4FB /* CGFloat+.swift in Sources */,
0924632F2A5BA0F200B6F65D /* HomeBakeryCollectionViewCell.swift in Sources */,
Expand All @@ -772,6 +788,7 @@
090556492A51E7EC00752067 /* UIScreen+.swift in Sources */,
09B71C022A59D99200076AC2 /* SearchTextField.swift in Sources */,
09B13F482A5931DC00C0C723 /* TabBarController.swift in Sources */,
3E2EEF752A5C93010093BCA9 /* BottomView.swift in Sources */,
0961C3642A501EBF0031A822 /* Strings.swift in Sources */,
093214082A5AE40900875EF6 /* SearchViewController.swift in Sources */,
09B13F542A593CD300C0C723 /* MyPageViewController.swift in Sources */,
Expand All @@ -792,6 +809,7 @@
0915C1752A5C533900ACB8D4 /* HomeReviewCollectionViewCell.swift in Sources */,
097682DA2A5C829D0008F4FB /* GradientImageView.swift in Sources */,
3EA2E1EB2A542151003516A3 /* SizeLiteral.swift in Sources */,
3EFA97862A5EBCA9002E70FA /* LineView.swift in Sources */,
0987288D2A5BA1F000A29402 /* BookmarkButton.swift in Sources */,
090556202A51DB2C00752067 /* UIImage+.swift in Sources */,
09B71BFC2A59CF3E00076AC2 /* Protocol.swift in Sources */,
Expand All @@ -809,15 +827,13 @@
0905562B2A51DBCE00752067 /* UIStackView+.swift in Sources */,
090556312A51DDD800752067 /* UITableView+.swift in Sources */,
09B13F562A59410C00C0C723 /* CALayer+.swift in Sources */,
3EA2E1E92A541AEB003516A3 /* CustomNavigationBar.swift in Sources */,
090556312A51DDD800752067 /* UITableView+.swift in Sources */,
3E16E4FE2A57F06D00B813D0 /* OptionsCollectionViewFlowLayout.swift in Sources */,
3E79B1B22A571E1F00D36A26 /* OptionsCollectionView.swift in Sources */,
3E79B1B52A571E7100D36A26 /* OptionsCollectionViewCell.swift in Sources */,
090556312A51DDD800752067 /* UITableView+.swift in Sources */,
090556272A51DBB100752067 /* NSObject+.swift in Sources */,
3E79B1A02A5546E700D36A26 /* DescriptionCollectionViewCell.swift in Sources */,
3E16E5002A57FFD900B813D0 /* OptionsCollectionViewHeader.swift in Sources */,
3E16E4F52A57CF3800B813D0 /* WriteReviewDTO.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
7 changes: 7 additions & 0 deletions GEON-PPANG-iOS/Global/Extensions/UI/UILabel+.swift
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,13 @@ extension UILabel {
}
self.attributedText = attributedString
}

func setLineHeight(by multiple: CGFloat, with text: String) {
var paragraphStyle = NSMutableParagraphStyle()
paragraphStyle.lineHeightMultiple = multiple
attributedText = NSMutableAttributedString(string: text, attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle])
}

}

extension UILabel {
Expand Down
30 changes: 29 additions & 1 deletion GEON-PPANG-iOS/Global/Extensions/UI/UIViewController+.swift
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,35 @@ extension UIViewController {
view.addGestureRecognizer(tap)
}

@objc func dismissKeyboard() {
func setKeyboardNotificationCenter() {
NotificationCenter.default.addObserver(self, selector: #selector(moveUpAboutKeyboard), name: UIResponder.keyboardWillShowNotification, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(moveDownAboutKeyboard), name: UIResponder.keyboardWillHideNotification, object: nil)
}

func setNavigationBarHidden() {
self.navigationController?.navigationBar.isHidden = true
}

// MARK: - objc functions

@objc
func dismissKeyboard() {
view.endEditing(true)
}

@objc
func moveUpAboutKeyboard(_ notification: NSNotification) {
if let keyboardSize = (notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue)?.cgRectValue {
UIView.animate(withDuration: 0.2, animations: {
self.view.transform = CGAffineTransform(translationX: 0, y: -keyboardSize.height + 24)
})
}
}

@objc
func moveDownAboutKeyboard(_ notification: NSNotification) {
UIView.animate(withDuration: 0.2, animations: {
self.view.transform = .identity
})
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

private func setStyle() {
backButton.do {
// TODO: asset 추가되면 image 변경

Check failure on line 60 in GEON-PPANG-iOS/Presentation/Common/NavigationBar/CustomNavigationBar.swift

View workflow job for this annotation

GitHub Actions / SwiftLint

Todo Violation: TODOs should be resolved (asset 추가되면 image 변경) (todo)

Check warning on line 60 in GEON-PPANG-iOS/Presentation/Common/NavigationBar/CustomNavigationBar.swift

View workflow job for this annotation

GitHub Actions / SwiftLint

Todo Violation: TODOs should be resolved (asset 추가되면 image 변경) (todo)
$0.tintColor = .gbbGray700
}
}
Expand Down Expand Up @@ -117,4 +117,13 @@
}
}

func configureBottomLine() {
let bottomLine = LineView()
addSubview(bottomLine)
bottomLine.snp.makeConstraints {
$0.bottom.horizontalEdges.equalToSuperview()
$0.height.equalTo(1)
}
}

}
60 changes: 60 additions & 0 deletions GEON-PPANG-iOS/Presentation/Common/View/BottomView.swift
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
Copy link
Contributor

Choose a reason for hiding this comment

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

Q: 이부분은 뭔가욤 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

앗 ><
f65151b

반영 완 ~

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.
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,17 @@

// MARK: - Property

// private let bakeryImage: UIImage
// TODO: ingredient Tag 추가

Check failure on line 17 in GEON-PPANG-iOS/Presentation/WriteReview/View/BakeryOverviewView.swift

View workflow job for this annotation

GitHub Actions / SwiftLint

Todo Violation: TODOs should be resolved (ingredient Tag 추가) (todo)

Check warning on line 17 in GEON-PPANG-iOS/Presentation/WriteReview/View/BakeryOverviewView.swift

View workflow job for this annotation

GitHub Actions / SwiftLint

Todo Violation: TODOs should be resolved (ingredient Tag 추가) (todo)
// private let regions: [String]

// MARK: - UI Property

private let bakeryImageView = UIImageView()
// TODO: ingredient Tag 추가

Check failure on line 22 in GEON-PPANG-iOS/Presentation/WriteReview/View/BakeryOverviewView.swift

View workflow job for this annotation

GitHub Actions / SwiftLint

Todo Violation: TODOs should be resolved (ingredient Tag 추가) (todo)

Check warning on line 22 in GEON-PPANG-iOS/Presentation/WriteReview/View/BakeryOverviewView.swift

View workflow job for this annotation

GitHub Actions / SwiftLint

Todo Violation: TODOs should be resolved (ingredient Tag 추가) (todo)
private let sampleView = UIView()
private let regionStackView = RegionStackView()

// MARK: - Life Cycle
// TODO: ingredient Tag 추가

Check failure on line 27 in GEON-PPANG-iOS/Presentation/WriteReview/View/BakeryOverviewView.swift

View workflow job for this annotation

GitHub Actions / SwiftLint

Todo Violation: TODOs should be resolved (ingredient Tag 추가) (todo)

Check warning on line 27 in GEON-PPANG-iOS/Presentation/WriteReview/View/BakeryOverviewView.swift

View workflow job for this annotation

GitHub Actions / SwiftLint

Todo Violation: TODOs should be resolved (ingredient Tag 추가) (todo)
init(bakeryImage: UIImage, firstRegion: String, secondRegion: String) {
super.init(frame: .zero)

Expand Down Expand Up @@ -59,7 +57,7 @@
$0.width.height.equalTo(84)
}

// TODO: ingredient Tag 추가

Check failure on line 60 in GEON-PPANG-iOS/Presentation/WriteReview/View/BakeryOverviewView.swift

View workflow job for this annotation

GitHub Actions / SwiftLint

Todo Violation: TODOs should be resolved (ingredient Tag 추가) (todo)

Check warning on line 60 in GEON-PPANG-iOS/Presentation/WriteReview/View/BakeryOverviewView.swift

View workflow job for this annotation

GitHub Actions / SwiftLint

Todo Violation: TODOs should be resolved (ingredient Tag 추가) (todo)
addSubview(sampleView)
sampleView.snp.makeConstraints {
$0.leading.equalTo(bakeryImageView.snp.trailing).offset(20)
Expand All @@ -76,14 +74,15 @@

private func setUI() {
bakeryImageView.do {
// TODO: image 추가 시 적용

Check failure on line 77 in GEON-PPANG-iOS/Presentation/WriteReview/View/BakeryOverviewView.swift

View workflow job for this annotation

GitHub Actions / SwiftLint

Todo Violation: TODOs should be resolved (image 추가 시 적용) (todo)

Check warning on line 77 in GEON-PPANG-iOS/Presentation/WriteReview/View/BakeryOverviewView.swift

View workflow job for this annotation

GitHub Actions / SwiftLint

Todo Violation: TODOs should be resolved (image 추가 시 적용) (todo)
$0.backgroundColor = .gbbPoint1
$0.makeCornerRound(radius: 5)
$0.contentMode = .scaleAspectFill
}

// TODO: ingredient Tag 추가

Check failure on line 83 in GEON-PPANG-iOS/Presentation/WriteReview/View/BakeryOverviewView.swift

View workflow job for this annotation

GitHub Actions / SwiftLint

Todo Violation: TODOs should be resolved (ingredient Tag 추가) (todo)

Check warning on line 83 in GEON-PPANG-iOS/Presentation/WriteReview/View/BakeryOverviewView.swift

View workflow job for this annotation

GitHub Actions / SwiftLint

Todo Violation: TODOs should be resolved (ingredient Tag 추가) (todo)
sampleView.do {
$0.backgroundColor = .black
$0.backgroundColor = .gbbPoint1
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,27 @@ final class OptionsCollectionView: UICollectionView {
private func setUI() {
self.do {
$0.register(cell: OptionsCollectionViewCell.self)
$0.register(header: OptionsCollectionViewHeader.self)
$0.isScrollEnabled = false
$0.backgroundColor = .clear
}
}

// MARK: - Custom Method

private func resetCellsAreSelected() {
self.indexPathsForSelectedItems?.forEach({ indexPath in
self.deselectItem(at: indexPath, animated: false)
})
}

func toggleIsEnabled(to isLikeSelected: Bool) {
self.isUserInteractionEnabled = isLikeSelected
self.resetCellsAreSelected()
self.visibleCells.forEach { cell in
guard let optionCell = cell as? OptionsCollectionViewCell
else { return }
optionCell.configureCell(to: isLikeSelected ? .deselected : .disabled)
}
}

}
Loading