Skip to content

Commit

Permalink
Remove SingleImageCollectionViewCell.xib
Browse files Browse the repository at this point in the history
  • Loading branch information
@hartlco
hartlco committed Dec 1, 2021
1 parent 307b103 commit 466b596
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 69 deletions.
4 changes: 4 additions & 0 deletions External/Dequeueable/Classes/UICollectionView+Dequeueable.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ public extension UICollectionView {
register(T.nib, forCellWithReuseIdentifier: T.reuseIdentifier)
}

func registerClass<T: UICollectionViewCell>(cellType: T.Type) {
register(T.self, forCellWithReuseIdentifier: T.reuseIdentifier)
}

func dequeueCell<T: UICollectionViewCell>(ofType: T.Type,
for indexPath: IndexPath) -> T {
guard let cell = dequeueReusableCell(withReuseIdentifier: T.reuseIdentifier, for: indexPath) as? T else {
Expand Down
6 changes: 0 additions & 6 deletions Icro.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@
C504652E274F77C60004B812 /* ItemTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BE9455D2079EFCE004F9FF4 /* ItemTableViewCell.swift */; };
C504652F274F77C60004B812 /* UIViewController+Loading.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BA6D1782087ACF900F484B2 /* UIViewController+Loading.swift */; };
C5046530274F77C60004B812 /* KeyboardInputView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B3F68782098BBA200A24983 /* KeyboardInputView.xib */; };
C5046531274F77C60004B812 /* SingleImageCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BC1820620790C930061F261 /* SingleImageCollectionViewCell.xib */; };
C5046532274F77C60004B812 /* KeyboardInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B3F68762098BB8800A24983 /* KeyboardInputView.swift */; };
C5046533274F77C60004B812 /* ComposeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B60CF4C2072A66C00C51258 /* ComposeViewController.swift */; };
C5046534274F77C70004B812 /* VideoThumbnailImageProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD2FE672259E0DC00591490 /* VideoThumbnailImageProvider.swift */; };
Expand All @@ -99,7 +98,6 @@
C504653F274F77C70004B812 /* ItemTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BE9455D2079EFCE004F9FF4 /* ItemTableViewCell.swift */; };
C5046540274F77C70004B812 /* UIViewController+Loading.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BA6D1782087ACF900F484B2 /* UIViewController+Loading.swift */; };
C5046541274F77C70004B812 /* KeyboardInputView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B3F68782098BBA200A24983 /* KeyboardInputView.xib */; };
C5046542274F77C70004B812 /* SingleImageCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BC1820620790C930061F261 /* SingleImageCollectionViewCell.xib */; };
C5046543274F77C70004B812 /* KeyboardInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B3F68762098BB8800A24983 /* KeyboardInputView.swift */; };
C5046544274F77C70004B812 /* ComposeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B60CF4C2072A66C00C51258 /* ComposeViewController.swift */; };
C5046545274F77CD0004B812 /* IcroEditorTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5A498F423B69636006ED94F /* IcroEditorTheme.swift */; };
Expand Down Expand Up @@ -358,7 +356,6 @@
5BC1384121C632FF0040353C /* Icro.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Icro.entitlements; sourceTree = "<group>"; };
5BC1384221C6332B0040353C /* LocalizedString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizedString.swift; sourceTree = "<group>"; };
5BC1820520790C930061F261 /* SingleImageCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingleImageCollectionViewCell.swift; sourceTree = "<group>"; };
5BC1820620790C930061F261 /* SingleImageCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingleImageCollectionViewCell.xib; sourceTree = "<group>"; };
5BC184D322E47CE7000155DB /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
5BC184D422E47D2F000155DB /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5BC184D522E47D34000155DB /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/Main.storyboard; sourceTree = "<group>"; };
Expand Down Expand Up @@ -652,7 +649,6 @@
isa = PBXGroup;
children = (
5BC1820520790C930061F261 /* SingleImageCollectionViewCell.swift */,
5BC1820620790C930061F261 /* SingleImageCollectionViewCell.xib */,
5B2A5A7920A6196700B54399 /* FakeTableCellButton.swift */,
5BE9455D2079EFCE004F9FF4 /* ItemTableViewCell.swift */,
5BE9455E2079EFCE004F9FF4 /* ItemTableViewCell.xib */,
Expand Down Expand Up @@ -1239,7 +1235,6 @@
C504653C274F77C70004B812 /* ComposeViewController.xib in Resources */,
C5046541274F77C70004B812 /* KeyboardInputView.xib in Resources */,
5BC1384721C639160040353C /* Assets.xcassets in Resources */,
C5046542274F77C70004B812 /* SingleImageCollectionViewCell.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1279,7 +1274,6 @@
C5046530274F77C60004B812 /* KeyboardInputView.xib in Resources */,
5BE945642079F8C7004F9FF4 /* ProfileTableViewCell.xib in Resources */,
C5FA2ACB1EB4482C006DEB40 /* Assets.xcassets in Resources */,
C5046531274F77C60004B812 /* SingleImageCollectionViewCell.xib in Resources */,
5B609F1423091FD600F2C1BC /* ListViewController.xib in Resources */,
5B20952122F6B0CF00C06123 /* acknowledgements.json in Resources */,
5B689BAD20837ECE005B9874 /* TabBarViewController.xib in Resources */,
Expand Down
2 changes: 1 addition & 1 deletion Icro.xcodeproj/xcuserdata/martinhartl.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<key>Icro-Next.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
<integer>5</integer>
</dict>
<key>Icro-Share.xcscheme_^#shared#^_</key>
<dict>
Expand Down
2 changes: 1 addition & 1 deletion IcroUIKit/View/ItemTableViewCell.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public final class ItemTableViewCell: UITableViewCell {

@IBOutlet weak var imageCollectionView: UICollectionView! {
didSet {
imageCollectionView.register(cellType: SingleImageCollectionViewCell.self)
imageCollectionView.registerClass(cellType: SingleImageCollectionViewCell.self)
imageCollectionView.delegate = self
imageCollectionView.dataSource = self
imageCollectionView.allowsSelection = true
Expand Down
42 changes: 39 additions & 3 deletions IcroUIKit/View/SingleImageCollectionViewCell.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,34 @@ import UIKit
import Style

final class SingleImageCollectionViewCell: UICollectionViewCell {
@IBOutlet weak var imageView: UIImageView!
@IBOutlet weak var videoPlayImage: UIImageView!
let videoPlayImage: UIImageView = {
let imageView = UIImageView()
imageView.translatesAutoresizingMaskIntoConstraints = false
imageView.image = UIImage(named: "play-button")

return imageView
}()

let imageView: UIImageView = {
let imageView = UIImageView()
imageView.translatesAutoresizingMaskIntoConstraints = false

return imageView
}()

override init(frame: CGRect) {
super.init(frame: frame)

updateAppearance()
}

required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}

override func awakeFromNib() {
super.awakeFromNib()
videoPlayImage.isHidden = true
updateAppearance()
}

override func prepareForReuse() {
Expand All @@ -22,6 +43,21 @@ final class SingleImageCollectionViewCell: UICollectionViewCell {
}

private func updateAppearance() {
addSubview(imageView)
addSubview(videoPlayImage)

NSLayoutConstraint.activate([
imageView.leadingAnchor.constraint(equalTo: leadingAnchor),
imageView.trailingAnchor.constraint(equalTo: trailingAnchor),
imageView.topAnchor.constraint(equalTo: topAnchor),
imageView.bottomAnchor.constraint(equalTo: bottomAnchor),

videoPlayImage.centerXAnchor.constraint(equalTo: centerXAnchor),
videoPlayImage.centerYAnchor.constraint(equalTo: centerYAnchor),
videoPlayImage.heightAnchor.constraint(equalToConstant: 34.0),
videoPlayImage.widthAnchor.constraint(equalToConstant: 34.0)
])

imageView.backgroundColor = Color.accentLight
}
}
57 changes: 0 additions & 57 deletions IcroUIKit/View/SingleImageCollectionViewCell.xib
View file

This file was deleted.

2 changes: 1 addition & 1 deletion IcroUIKit/ViewController/ComposeViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public final class ComposeViewController: UIViewController, LoadingViewControlle

@IBOutlet weak var imageCollectionView: UICollectionView! {
didSet {
imageCollectionView.register(cellType: SingleImageCollectionViewCell.self)
imageCollectionView.registerClass(cellType: SingleImageCollectionViewCell.self)
imageCollectionView.delegate = self
imageCollectionView.dataSource = self
}
Expand Down

0 comments on commit 466b596

Please sign in to comment.