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 00000000..db1bf50c Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder-1.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder@2x-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder@2x-1.png new file mode 100644 index 00000000..c505bfbd Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder@2x-1.png differ 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 00000000..1ad86728 Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder@3x-1.png differ diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/Group/Group.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/Group/Group.storyboard index 3219b7f0..b03b6554 100644 --- a/NADA-iOS-forRelease/Resouces/Storyboards/Group/Group.storyboard +++ b/NADA-iOS-forRelease/Resouces/Storyboards/Group/Group.storyboard @@ -1,12 +1,11 @@ - + - + - @@ -81,11 +80,11 @@ - + - + @@ -104,7 +103,7 @@ - + @@ -180,8 +179,5 @@ - - - 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)) } } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index 49258246..0f191e1d 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -250,13 +250,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 { @@ -297,8 +292,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: @@ -308,15 +301,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 + } } 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: