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.

Sign up for GitHub

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

Jump to bottom

[FIX] #87 - 명함 그룹 화면 수정 #93

Merged
merged 8 commits into from
Nov 29, 2021
Merged

[FIX] #87 - 명함 그룹 화면 수정 #93

Show file tree
Hide file tree
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 Nov 27, 2021
87ec9c2
[FIX] #87 명함 그룹 Cell const로 수정
dlwns33 Nov 27, 2021
db495d5
[FIX] #87 selectedItem 추가 및 linespacing 조정
dlwns33 Nov 27, 2021
20f6313
[FIX] #87 groupCollectionView inset 10으로 수정
dlwns33 Nov 27, 2021
e7c4583
[FIX] #87 collectionView inset 분기처리
dlwns33 Nov 27, 2021
315446f
[FIX] #87 카드 크기 주석 제거
dlwns33 Nov 29, 2021
cdf6282
[FIX] #87 collectionView background 다크모드 대응
dlwns33 Nov 29, 2021
cf4fe38
[FIX] #87 iconFolder 다크모드 에셋추가
dlwns33 Nov 29, 2021
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
6 changes: 3 additions & 3 deletions NADA-iOS-forRelease/Resouces/Storyboards/Group/Group.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="oYA-6c-Tkj">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="oYA-6c-Tkj">
<device id="retina5_9" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
Expand Down Expand Up @@ -85,7 +85,7 @@
<constraints>
<constraint firstAttribute="height" constant="32" id="4E1-ms-weE"/>
</constraints>
<collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="gMe-6U-LJh">
<collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="10" minimumInteritemSpacing="10" id="gMe-6U-LJh">
Copy link
Member

Choose a reason for hiding this comment

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

크으 도-약🚀

Copy link
Member Author

Choose a reason for hiding this comment

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

헐 background 색상 이 이슈에 같이 수정해야겠네요!!! 감사함둥 ㅠㅠ

Copy link
Member Author

Choose a reason for hiding this comment

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

고생하셨습니다 교수님!! 이거는 조금 다른 얘기인데 이미 아실수도 있지만, 그룹화면에 컬렉션 뷰 2개 모두 background 색상이 아직 설정이 안되어 있는 것 같더라구요!! 이것두 나중에 이슈파서 진행하시거나 이 이슈에 한번에 수정해주시면 감사하겠습니다 ^__^

설정 완료하고 폴더아이콘도 다크모드 추가했슴당 !!!!

Copy link
Member

Choose a reason for hiding this comment

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

좋씀다!

<size key="itemSize" width="128" height="128"/>
<size key="headerReferenceSize" width="0.0" height="0.0"/>
<size key="footerReferenceSize" width="0.0" height="0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion NADA-iOS-forRelease/Sources/Cells/GroupCell/CardInGroupCollectionViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class CardInGroupCollectionViewCell: UICollectionViewCell {
}

static func nib() -> UINib {
return UINib(nibName: "CardInGroupCollectionViewCell", bundle: Bundle(for: CardInGroupCollectionViewCell.self))
return UINib(nibName: Const.Xib.cardInGroupCollectionViewCell, bundle: Bundle(for: CardInGroupCollectionViewCell.self))
}

}
Expand Down
2 changes: 1 addition & 1 deletion NADA-iOS-forRelease/Sources/Cells/GroupCell/GroupCollectionViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class GroupCollectionViewCell: UICollectionViewCell {
}

static func nib() -> UINib {
return UINib(nibName: "GroupCollectionViewCell", bundle: nil)
return UINib(nibName: Const.Xib.groupCollectionViewCell, bundle: Bundle(for: GroupCollectionViewCell.self))
}
}

Expand Down
25 changes: 13 additions & 12 deletions NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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:
Expand All @@ -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
Copy link
Member

Choose a reason for hiding this comment

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

역시 해결할줄 알았습니다 교수님

Copy link
Member

Choose a reason for hiding this comment

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

캬..! 좋습니다!
더 디테일한건 QA 때 뵙도록 하져

}
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:
Expand Down