Skip to content

Commit

Permalink
Merge branch 'TeamNADA:develop' into feature/TeamNADA#94
Browse files Browse the repository at this point in the history
  • Loading branch information
@mini-min
mini-min authored Nov 30, 2021
2 parents 6f3a0db + 343f508 commit 2b62574
Show file tree
Hide file tree
Showing 8 changed files with 62 additions and 32 deletions.
51 changes: 42 additions & 9 deletions NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
Binary file added ...forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...Release/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder@2x-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...Release/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder@3x-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 5 additions & 9 deletions NADA-iOS-forRelease/Resouces/Storyboards/Group/Group.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<?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"/>
<capability name="collection view cell content view" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand Down Expand Up @@ -81,11 +80,11 @@
</button>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="fjf-wy-tr3">
<rect key="frame" x="66" y="158" width="309" height="32"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<color key="backgroundColor" name="background"/>
<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">
<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 All @@ -104,7 +103,7 @@
</collectionView>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="khE-2k-qTd">
<rect key="frame" x="24" y="210" width="327" height="519"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<color key="backgroundColor" name="background"/>
<collectionViewFlowLayout key="collectionViewLayout" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="Nld-ty-a2r">
<size key="itemSize" width="128" height="128"/>
<size key="headerReferenceSize" width="0.0" height="0.0"/>
Expand Down Expand Up @@ -180,8 +179,5 @@
<namedColor name="background">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
2 changes: 1 addition & 1 deletion NADA-iOS-forRelease/Sources/Cells/GroupCell/CardInGroupCollectionViewCell.swift
View file
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down

0 comments on commit 2b62574

Please sign in to comment.