-
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
[FIX] #87 - 명함 그룹 화면 수정 #93
Merged
Merged
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
f22332f
[FIX] #87 groupCollectionView esimated size none으로 수정
dlwns33 87ec9c2
[FIX] #87 명함 그룹 Cell const로 수정
dlwns33 db495d5
[FIX] #87 selectedItem 추가 및 linespacing 조정
dlwns33 20f6313
[FIX] #87 groupCollectionView inset 10으로 수정
dlwns33 e7c4583
[FIX] #87 collectionView inset 분기처리
dlwns33 315446f
[FIX] #87 카드 크기 주석 제거
dlwns33 cdf6282
[FIX] #87 collectionView background 다크모드 대응
dlwns33 cf4fe38
[FIX] #87 iconFolder 다크모드 에셋추가
dlwns33 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -248,13 +248,8 @@ extension GroupViewController: UICollectionViewDataSource { | |
|
||
groupCell.groupName.text = groups[indexPath.row] | ||
if indexPath.row == 0 { | ||
// groupCell.groupName.textColor = .background | ||
// groupCell.groupBackground.backgroundColor = .primary | ||
groupCell.isSelected = true | ||
} else { | ||
groupCell.isSelected = false | ||
collectionView.selectItem(at: indexPath, animated: true, scrollPosition: .init()) | ||
} | ||
groupCollectionView.layoutIfNeeded() | ||
return groupCell | ||
case cardsCollectionView: | ||
guard let cardCell = collectionView.dequeueReusableCell(withReuseIdentifier: Const.Xib.cardInGroupCollectionViewCell, for: indexPath) as? CardInGroupCollectionViewCell else { | ||
|
@@ -295,8 +290,6 @@ extension GroupViewController: UICollectionViewDelegateFlowLayout { | |
} | ||
height = collectionView.frame.size.height | ||
case cardsCollectionView: | ||
// width = collectionView.frame.size.width / 2 - 7.5 | ||
// height = collectionView.frame.size.height / 2 | ||
width = 156 | ||
height = 258 | ||
default: | ||
|
@@ -306,15 +299,23 @@ extension GroupViewController: UICollectionViewDelegateFlowLayout { | |
return CGSize(width: width, height: height) | ||
} | ||
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets { | ||
return .zero | ||
switch collectionView { | ||
case groupCollectionView: | ||
return .init(top: 0, left: 0, bottom: 0, right: 10) | ||
default: | ||
return .zero | ||
} | ||
Comment on lines
+302
to
+307
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 역시 해결할줄 알았습니다 교수님 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 캬..! 좋습니다! |
||
} | ||
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumInteritemSpacingForSectionAt section: Int) -> CGFloat { | ||
return 0 | ||
} | ||
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumLineSpacingForSectionAt section: Int) -> CGFloat { | ||
switch collectionView { | ||
case groupCollectionView: | ||
return 5 | ||
default: | ||
return 0 | ||
} | ||
} | ||
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumLineSpacingForSectionAt section: Int) -> CGFloat { | ||
switch collectionView { | ||
case cardsCollectionView: | ||
return 14 | ||
default: | ||
|
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.
크으 도-약🚀
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.
헐 background 색상 이 이슈에 같이 수정해야겠네요!!! 감사함둥 ㅠㅠ
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.
설정 완료하고 폴더아이콘도 다크모드 추가했슴당 !!!!
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.
좋씀다!