From f22332ff4a8e13bdcd74481d3f6d2c148f3ae272 Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Sun, 28 Nov 2021 01:18:10 +0900 Subject: [PATCH 1/8] =?UTF-8?q?[FIX]=20#87=20groupCollectionView=20esimate?= =?UTF-8?q?d=20size=20none=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resouces/Storyboards/Group/Group.storyboard | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/Group/Group.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/Group/Group.storyboard index 3219b7f0..5aa213d8 100644 --- a/NADA-iOS-forRelease/Resouces/Storyboards/Group/Group.storyboard +++ b/NADA-iOS-forRelease/Resouces/Storyboards/Group/Group.storyboard @@ -1,9 +1,9 @@ - + - + @@ -85,7 +85,7 @@ - + From 87ec9c20785067373079c8efd28dd567d6550630 Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Sun, 28 Nov 2021 01:34:23 +0900 Subject: [PATCH 2/8] =?UTF-8?q?[FIX]=20#87=20=EB=AA=85=ED=95=A8=20?= =?UTF-8?q?=EA=B7=B8=EB=A3=B9=20Cell=20const=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/Cells/GroupCell/CardInGroupCollectionViewCell.swift | 2 +- .../Sources/Cells/GroupCell/GroupCollectionViewCell.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/Cells/GroupCell/CardInGroupCollectionViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/GroupCell/CardInGroupCollectionViewCell.swift index 687a8ddc..4d939376 100644 --- a/NADA-iOS-forRelease/Sources/Cells/GroupCell/CardInGroupCollectionViewCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/GroupCell/CardInGroupCollectionViewCell.swift @@ -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)) } } diff --git a/NADA-iOS-forRelease/Sources/Cells/GroupCell/GroupCollectionViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/GroupCell/GroupCollectionViewCell.swift index 923e4868..955c9595 100644 --- a/NADA-iOS-forRelease/Sources/Cells/GroupCell/GroupCollectionViewCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/GroupCell/GroupCollectionViewCell.swift @@ -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)) } } From db495d5c6ee1306bc98582666e9f30cd4435960e Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Sun, 28 Nov 2021 02:12:52 +0900 Subject: [PATCH 3/8] =?UTF-8?q?[FIX]=20#87=20selectedItem=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B0=8F=20linespacing=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Group/GroupViewController.swift | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index f06e63ac..a9be0b79 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -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 { @@ -309,12 +304,15 @@ extension GroupViewController: UICollectionViewDelegateFlowLayout { return .zero } 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: From 20f6313369e6ea27c7a7441d339facfe24a7fbcd Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Sun, 28 Nov 2021 04:20:30 +0900 Subject: [PATCH 4/8] =?UTF-8?q?[FIX]=20#87=20groupCollectionView=20inset?= =?UTF-8?q?=2010=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/ViewControllers/Group/GroupViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index a9be0b79..a2b4056d 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -301,7 +301,7 @@ extension GroupViewController: UICollectionViewDelegateFlowLayout { return CGSize(width: width, height: height) } func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets { - return .zero + return .init(top: 0, left: 0, bottom: 0, right: 10) } func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumInteritemSpacingForSectionAt section: Int) -> CGFloat { switch collectionView { From e7c45839cba6e2283174dd7cdff57f92b84c4838 Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Sun, 28 Nov 2021 04:58:11 +0900 Subject: [PATCH 5/8] =?UTF-8?q?[FIX]=20#87=20collectionView=20inset=20?= =?UTF-8?q?=EB=B6=84=EA=B8=B0=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewControllers/Group/GroupViewController.swift | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index a2b4056d..f8ac2d80 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -301,7 +301,12 @@ extension GroupViewController: UICollectionViewDelegateFlowLayout { return CGSize(width: width, height: height) } func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets { - return .init(top: 0, left: 0, bottom: 0, right: 10) + switch collectionView { + case groupCollectionView: + return .init(top: 0, left: 0, bottom: 0, right: 10) + default: + return .zero + } } func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumInteritemSpacingForSectionAt section: Int) -> CGFloat { switch collectionView { From 315446f1212096ed7b70cea741537e53a153d2cc Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Mon, 29 Nov 2021 21:43:12 +0900 Subject: [PATCH 6/8] =?UTF-8?q?[FIX]=20#87=20=EC=B9=B4=EB=93=9C=20?= =?UTF-8?q?=ED=81=AC=EA=B8=B0=20=EC=A3=BC=EC=84=9D=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/ViewControllers/Group/GroupViewController.swift | 2 -- 1 file changed, 2 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index f8ac2d80..e2e4ef33 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -290,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: From cdf6282409441cb02813d64982a5060fc9d399d3 Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Tue, 30 Nov 2021 00:44:26 +0900 Subject: [PATCH 7/8] =?UTF-8?q?[FIX]=20#87=20collectionView=20background?= =?UTF-8?q?=20=EB=8B=A4=ED=81=AC=EB=AA=A8=EB=93=9C=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resouces/Storyboards/Group/Group.storyboard | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/Group/Group.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/Group/Group.storyboard index 5aa213d8..b03b6554 100644 --- a/NADA-iOS-forRelease/Resouces/Storyboards/Group/Group.storyboard +++ b/NADA-iOS-forRelease/Resouces/Storyboards/Group/Group.storyboard @@ -6,7 +6,6 @@ - @@ -81,7 +80,7 @@ - + @@ -104,7 +103,7 @@ - + @@ -180,8 +179,5 @@ - - - From cf4fe38fa9e8976c1dc81a96fcaab510c6b8ede5 Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Tue, 30 Nov 2021 00:47:38 +0900 Subject: [PATCH 8/8] =?UTF-8?q?[FIX]=20#87=20iconFolder=20=EB=8B=A4?= =?UTF-8?q?=ED=81=AC=EB=AA=A8=EB=93=9C=20=EC=97=90=EC=85=8B=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iconFolder.imageset/Contents.json | 51 ++++++++++++++---- .../iconFolder.imageset/iconFolder-1.png | Bin 0 -> 366 bytes .../iconFolder.imageset/iconFolder@2x-1.png | Bin 0 -> 547 bytes .../iconFolder.imageset/iconFolder@3x-1.png | Bin 0 -> 694 bytes 4 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder-1.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder@2x-1.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder@3x-1.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/Contents.json index 72e90120..6b5aeeed 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/Contents.json @@ -2,22 +2,55 @@ "images" : [ { "filename" : "iconFolder.png", - "scale" : "1x", - "idiom" : "universal" + "idiom" : "universal", + "scale" : "1x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "iconFolder-1.png", + "idiom" : "universal", + "scale" : "1x" }, { + "filename" : "iconFolder@2x.png", "idiom" : "universal", - "scale" : "2x", - "filename" : "iconFolder@2x.png" + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "iconFolder@2x-1.png", + "idiom" : "universal", + "scale" : "2x" }, { "filename" : "iconFolder@3x.png", - "scale" : "3x", - "idiom" : "universal" + "idiom" : "universal", + "scale" : "3x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "iconFolder@3x-1.png", + "idiom" : "universal", + "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db1bf50c7c806cb4c9ac51ab0b27f7c2e27c60e6 GIT binary patch literal 366 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaO00(?ST-3xq7%xz6AY>iE=fTW3q4TK9~*frLh50gCVQba4!^INci@DAugNqs`&5 zv1#}J)bOt-7ih)W)g(AATFScOz!M(@u49oc){D|N9ddPCtj>6U=aHFtGo&ZKY)n6D zVs*dj0r&Z?&(=1356Lr{9FTkD#Px#IZ#YgMMrQucMTxDr*Lqs7eJ3jI?)7a_s|evWo`6e6ea<^;7a829d?kVKXkhaH^eP3g-ckfS`~)lJNZq2Q-3dpmi{sNJ<4SDfEcE z6o5`J?fMs=FCP>cWU_>t|6r*Z=;#Yp@2eT$)r078_I^H?Hh;l3#|$n}f-gbL5EJx? zcYG4yx`a5-!y=41g7W#8P_iZhofxAg0uaa}!2dwNE+V^)>_M_T0+SH5CIXpz&Nb(* zASi#ZCIlrbX}+WfHYuuC6$p?PRiWsz4m58O3fk^X>AyB7cqx2r4mE|-vv!;cw0p#B z3+NU>xhHKN!RDB!tuEhe^X-1aL|Wd;qq@w}RpHole)H>re*HTMn_E21P_etZyDaL$ lA6UNMc}R1v|Mq_E{s9AMq?$WLfU^Jq002ovPDHLkV1gcG;V1wA literal 0 HcmV?d00001 diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder@3x-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder@3x-1.png new file mode 100644 index 0000000000000000000000000000000000000000..1ad8672866f531618bf857d85198cf1d9444b40c GIT binary patch literal 694 zcmV;n0!jUeP)Px#Gf+%aMMrQ1 zmY=d@;^x3*7+)-5O5zLpZNrXnm^w45eWZ`)k!v%az?>o4FH*t z?o8((Hd4AbrPi6%KUkoAcUlvln8l}-72R-FXhEm<@dXNei3MLI!k4*v^ZYjdeyI^( zEZrO-GQy_6Q?M2oLG8T>EePvHeF?P)^5QlWSK$jIZrpgeJC$2cyh0C6PVo>zF)4QF ch}(ZY0M$h~oI1K`!T