From e963970c62bd9fb8007694143fb90ecaea198da2 Mon Sep 17 00:00:00 2001 From: Nicholas Tay Date: Fri, 25 Mar 2022 10:02:00 +1100 Subject: ForayNewTableViewCell -> ForayTableViewCell --- foray.xcodeproj/project.pbxproj | 8 +-- foray/Scenes/ForayNewTableViewCell.swift | 84 ----------------------------- foray/Scenes/ForayTableViewCell.swift | 84 +++++++++++++++++++++++++++++ foray/Scenes/ForayTableViewController.swift | 4 +- 4 files changed, 90 insertions(+), 90 deletions(-) delete mode 100644 foray/Scenes/ForayNewTableViewCell.swift create mode 100644 foray/Scenes/ForayTableViewCell.swift diff --git a/foray.xcodeproj/project.pbxproj b/foray.xcodeproj/project.pbxproj index 0480143..3d24015 100644 --- a/foray.xcodeproj/project.pbxproj +++ b/foray.xcodeproj/project.pbxproj @@ -16,7 +16,7 @@ C04B45AD27DEF118001451A3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C04B45AC27DEF118001451A3 /* Assets.xcassets */; }; C04B45B827DEF2ED001451A3 /* ForayTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C04B45B727DEF2ED001451A3 /* ForayTableViewController.swift */; }; C04EDE4227E428AB00D83005 /* SnapKit in Frameworks */ = {isa = PBXBuildFile; productRef = C04EDE4127E428AB00D83005 /* SnapKit */; }; - C04EDE4427E4298D00D83005 /* ForayNewTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C04EDE4327E4298D00D83005 /* ForayNewTableViewCell.swift */; }; + C04EDE4427E4298D00D83005 /* ForayTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C04EDE4327E4298D00D83005 /* ForayTableViewCell.swift */; }; C09676BA27E86B6E00353D46 /* ForayLoadingOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = C09676B927E86B6E00353D46 /* ForayLoadingOverlay.swift */; }; C09676BC27EC27E700353D46 /* UIViewController+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C09676BB27EC27E700353D46 /* UIViewController+Extensions.swift */; }; C09676BE27EC28B100353D46 /* ForayDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C09676BD27EC28B100353D46 /* ForayDetailView.swift */; }; @@ -36,7 +36,7 @@ C04B45AC27DEF118001451A3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; C04B45B127DEF118001451A3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; C04B45B727DEF2ED001451A3 /* ForayTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ForayTableViewController.swift; sourceTree = ""; }; - C04EDE4327E4298D00D83005 /* ForayNewTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ForayNewTableViewCell.swift; sourceTree = ""; }; + C04EDE4327E4298D00D83005 /* ForayTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ForayTableViewCell.swift; sourceTree = ""; }; C09676B927E86B6E00353D46 /* ForayLoadingOverlay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ForayLoadingOverlay.swift; sourceTree = ""; }; C09676BB27EC27E700353D46 /* UIViewController+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Extensions.swift"; sourceTree = ""; }; C09676BD27EC28B100353D46 /* ForayDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ForayDetailView.swift; sourceTree = ""; }; @@ -94,7 +94,7 @@ isa = PBXGroup; children = ( C04B45B727DEF2ED001451A3 /* ForayTableViewController.swift */, - C04EDE4327E4298D00D83005 /* ForayNewTableViewCell.swift */, + C04EDE4327E4298D00D83005 /* ForayTableViewCell.swift */, C0FEAF5E27E14C52000A7648 /* ForayDetailViewController.swift */, C09676BD27EC28B100353D46 /* ForayDetailView.swift */, C09676B927E86B6E00353D46 /* ForayLoadingOverlay.swift */, @@ -226,7 +226,7 @@ C04B45B827DEF2ED001451A3 /* ForayTableViewController.swift in Sources */, C0FEAF5F27E14C52000A7648 /* ForayDetailViewController.swift in Sources */, C0C73E6427EC3A650015497D /* PenguinItemViewModel.swift in Sources */, - C04EDE4427E4298D00D83005 /* ForayNewTableViewCell.swift in Sources */, + C04EDE4427E4298D00D83005 /* ForayTableViewCell.swift in Sources */, C09676BC27EC27E700353D46 /* UIViewController+Extensions.swift in Sources */, C04B45A427DEF117001451A3 /* AppDelegate.swift in Sources */, C09676BA27E86B6E00353D46 /* ForayLoadingOverlay.swift in Sources */, diff --git a/foray/Scenes/ForayNewTableViewCell.swift b/foray/Scenes/ForayNewTableViewCell.swift deleted file mode 100644 index 224709a..0000000 --- a/foray/Scenes/ForayNewTableViewCell.swift +++ /dev/null @@ -1,84 +0,0 @@ -// -// ForayNewTableViewCell.swift -// foray -// -// Created by Nicholas Tay on 18/3/2022. -// - -import UIKit -import SnapKit - -class ForayNewTableViewCell: UITableViewCell { - - let container: UIView = UIView() - - let nameLabel: UILabel = { - let l = UILabel() - l.font = UIFont.preferredFont(forTextStyle: .headline) - l.numberOfLines = 3 - l.adjustsFontForContentSizeCategory = true - return l - }() - - let descLabel: UILabel = { - let l = UILabel() - l.font = UIFont.preferredFont(forTextStyle: .caption1) - l.adjustsFontForContentSizeCategory = true - return l - }() - - let itemImageView: UIImageView = { - let iv = UIImageView() - iv.contentMode = .scaleAspectFit - return iv - }() - - override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { - super.init(style: style, reuseIdentifier: reuseIdentifier) - initialiseViews() - } - - required init?(coder: NSCoder) { - fatalError("unreachable") - } - - private func initialiseViews() { - contentView.addSubview(container) - container.addSubview(nameLabel) - container.addSubview(descLabel) - container.addSubview(itemImageView) - setupConstraints() - } - - private func setupConstraints() { - container.snp.makeConstraints { (make) in - make.edges.equalTo(contentView.snp.margins) - } - - let imageWidth = 64 - let imageHeight = 38 - nameLabel.snp.makeConstraints { (make) in - make.top.equalToSuperview() - make.leading.equalToSuperview() - make.trailing.equalTo(itemImageView.snp.trailing).inset(imageWidth) - } - descLabel.snp.makeConstraints { (make) in - make.top.equalTo(nameLabel.snp.bottom) - make.leading.equalToSuperview() - make.bottom.equalToSuperview() - make.trailing.equalTo(itemImageView.snp.trailing).inset(imageWidth) - } - itemImageView.snp.makeConstraints { (make) in - make.top.equalToSuperview() - make.trailing.equalToSuperview() - make.width.equalTo(imageWidth) - make.height.equalTo(imageHeight) - } - } - - public func setData(name: String, desc: String, img: UIImage) { - nameLabel.text = name - descLabel.text = desc - itemImageView.image = img - } -} diff --git a/foray/Scenes/ForayTableViewCell.swift b/foray/Scenes/ForayTableViewCell.swift new file mode 100644 index 0000000..3849169 --- /dev/null +++ b/foray/Scenes/ForayTableViewCell.swift @@ -0,0 +1,84 @@ +// +// ForayNewTableViewCell.swift +// foray +// +// Created by Nicholas Tay on 18/3/2022. +// + +import UIKit +import SnapKit + +class ForayTableViewCell: UITableViewCell { + + let container: UIView = UIView() + + let nameLabel: UILabel = { + let l = UILabel() + l.font = UIFont.preferredFont(forTextStyle: .headline) + l.numberOfLines = 3 + l.adjustsFontForContentSizeCategory = true + return l + }() + + let descLabel: UILabel = { + let l = UILabel() + l.font = UIFont.preferredFont(forTextStyle: .caption1) + l.adjustsFontForContentSizeCategory = true + return l + }() + + let itemImageView: UIImageView = { + let iv = UIImageView() + iv.contentMode = .scaleAspectFit + return iv + }() + + override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { + super.init(style: style, reuseIdentifier: reuseIdentifier) + initialiseViews() + } + + required init?(coder: NSCoder) { + fatalError("unreachable") + } + + private func initialiseViews() { + contentView.addSubview(container) + container.addSubview(nameLabel) + container.addSubview(descLabel) + container.addSubview(itemImageView) + setupConstraints() + } + + private func setupConstraints() { + container.snp.makeConstraints { (make) in + make.edges.equalTo(contentView.snp.margins) + } + + let imageWidth = 64 + let imageHeight = 38 + nameLabel.snp.makeConstraints { (make) in + make.top.equalToSuperview() + make.leading.equalToSuperview() + make.trailing.equalTo(itemImageView.snp.trailing).inset(imageWidth) + } + descLabel.snp.makeConstraints { (make) in + make.top.equalTo(nameLabel.snp.bottom) + make.leading.equalToSuperview() + make.bottom.equalToSuperview() + make.trailing.equalTo(itemImageView.snp.trailing).inset(imageWidth) + } + itemImageView.snp.makeConstraints { (make) in + make.top.equalToSuperview() + make.trailing.equalToSuperview() + make.width.equalTo(imageWidth) + make.height.equalTo(imageHeight) + } + } + + public func setData(name: String, desc: String, img: UIImage) { + nameLabel.text = name + descLabel.text = desc + itemImageView.image = img + } +} diff --git a/foray/Scenes/ForayTableViewController.swift b/foray/Scenes/ForayTableViewController.swift index baa0e6b..72d3569 100644 --- a/foray/Scenes/ForayTableViewController.swift +++ b/foray/Scenes/ForayTableViewController.swift @@ -30,7 +30,7 @@ class ForayTableViewController: UITableViewController, ForayCoordinated { tableView.rowHeight = UITableView.automaticDimension // Register our custom cell - tableView.register(ForayNewTableViewCell.self, forCellReuseIdentifier: "ForayNewTableViewCell") + tableView.register(ForayTableViewCell.self, forCellReuseIdentifier: "ForayTableViewCell") // Not sure if this is the right way to go about this... coordinator?.showLoading() @@ -85,7 +85,7 @@ class ForayTableViewController: UITableViewController, ForayCoordinated { icon = UIImage(named: "spy")! } - let cell: ForayNewTableViewCell = tableView.dequeueReusableCell(withIdentifier: "ForayNewTableViewCell", for: indexPath) as! ForayNewTableViewCell + let cell: ForayTableViewCell = tableView.dequeueReusableCell(withIdentifier: "ForayTableViewCell", for: indexPath) as! ForayTableViewCell cell.setData(name: item.name, desc: type + "ID: " + item.id, img: icon) return cell } -- cgit