mirrors/metatext
1
0
Fork 0
mirror of https://github.com/metabolist/metatext.git synced 2024-11-25 09:41:00 +00:00
Code Issues Projects Releases Wiki Activity

Refactoring

Browse source
This commit is contained in:
Justin Mazzocchi 2021-02-08 18:48:02 -08:00
parent 6427ce803f
commit d716e8a68e
No known key found for this signature in database
GPG key ID: E223E6937AAFB01C
8 changed files with 28 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Extensions/CollectionItem+Extensions.swift
View file

@ -12,7 +12,7 @@ extension CollectionItem {
NotificationTableViewCell.self, NotificationTableViewCell.self,
ConversationTableViewCell.self, ConversationTableViewCell.self,
TagTableViewCell.self, TagTableViewCell.self,
UITableViewCell.self] SeparatorConfiguredTableViewCell.self]
var cellClass: AnyClass { var cellClass: AnyClass {
switch self { switch self {
@ -29,7 +29,7 @@ extension CollectionItem {
case .tag: case .tag:
return TagTableViewCell.self return TagTableViewCell.self
case .moreResults: case .moreResults:
return UITableViewCell.self return SeparatorConfiguredTableViewCell.self
} }
} }

4
Metatext.xcodeproj/project.pbxproj
View file

@ -133,6 +133,7 @@
D0BE97A325CF44310057E161 /* CGRect+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BE97A225CF44310057E161 /* CGRect+Extensions.swift */; }; D0BE97A325CF44310057E161 /* CGRect+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BE97A225CF44310057E161 /* CGRect+Extensions.swift */; };
D0BE97D725D0863E0057E161 /* ImagePastableTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BE97D625D0863E0057E161 /* ImagePastableTextView.swift */; }; D0BE97D725D0863E0057E161 /* ImagePastableTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BE97D625D0863E0057E161 /* ImagePastableTextView.swift */; };
D0BE97E025D086F80057E161 /* ImagePastableTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BE97D625D0863E0057E161 /* ImagePastableTextView.swift */; }; D0BE97E025D086F80057E161 /* ImagePastableTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BE97D625D0863E0057E161 /* ImagePastableTextView.swift */; };
D0BE980425D229D50057E161 /* SeparatorConfiguredTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BE980325D229D50057E161 /* SeparatorConfiguredTableViewCell.swift */; };
D0BEB1F324F8EE8C001B0F04 /* AttachmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BEB1F224F8EE8C001B0F04 /* AttachmentView.swift */; }; D0BEB1F324F8EE8C001B0F04 /* AttachmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BEB1F224F8EE8C001B0F04 /* AttachmentView.swift */; };
D0BEB1F724F9A84B001B0F04 /* LoadingTableFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BEB1F624F9A84B001B0F04 /* LoadingTableFooterView.swift */; }; D0BEB1F724F9A84B001B0F04 /* LoadingTableFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BEB1F624F9A84B001B0F04 /* LoadingTableFooterView.swift */; };
D0BEB1FF24F9E5BB001B0F04 /* ListsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BEB1FE24F9E5BB001B0F04 /* ListsView.swift */; }; D0BEB1FF24F9E5BB001B0F04 /* ListsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BEB1FE24F9E5BB001B0F04 /* ListsView.swift */; };
@ -330,6 +331,7 @@
D0BDF66524FD7A6400C7FA1C /* ServiceLayer */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ServiceLayer; sourceTree = "<group>"; }; D0BDF66524FD7A6400C7FA1C /* ServiceLayer */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ServiceLayer; sourceTree = "<group>"; };
D0BE97A225CF44310057E161 /* CGRect+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CGRect+Extensions.swift"; sourceTree = "<group>"; }; D0BE97A225CF44310057E161 /* CGRect+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CGRect+Extensions.swift"; sourceTree = "<group>"; };
D0BE97D625D0863E0057E161 /* ImagePastableTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePastableTextView.swift; sourceTree = "<group>"; }; D0BE97D625D0863E0057E161 /* ImagePastableTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePastableTextView.swift; sourceTree = "<group>"; };
D0BE980325D229D50057E161 /* SeparatorConfiguredTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeparatorConfiguredTableViewCell.swift; sourceTree = "<group>"; };
D0BEB1F224F8EE8C001B0F04 /* AttachmentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachmentView.swift; sourceTree = "<group>"; }; D0BEB1F224F8EE8C001B0F04 /* AttachmentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachmentView.swift; sourceTree = "<group>"; };
D0BEB1F624F9A84B001B0F04 /* LoadingTableFooterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingTableFooterView.swift; sourceTree = "<group>"; }; D0BEB1F624F9A84B001B0F04 /* LoadingTableFooterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingTableFooterView.swift; sourceTree = "<group>"; };
D0BEB1FE24F9E5BB001B0F04 /* ListsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListsView.swift; sourceTree = "<group>"; }; D0BEB1FE24F9E5BB001B0F04 /* ListsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListsView.swift; sourceTree = "<group>"; };
@ -516,6 +518,7 @@
D021A60925C36B32008A0C0D /* IdentityTableViewCell.swift */, D021A60925C36B32008A0C0D /* IdentityTableViewCell.swift */,
D0B8510B25259E56004E0744 /* LoadMoreTableViewCell.swift */, D0B8510B25259E56004E0744 /* LoadMoreTableViewCell.swift */,
D036AA01254B6101009094DF /* NotificationTableViewCell.swift */, D036AA01254B6101009094DF /* NotificationTableViewCell.swift */,
D0BE980325D229D50057E161 /* SeparatorConfiguredTableViewCell.swift */,
D0625E58250F092900502611 /* StatusTableViewCell.swift */, D0625E58250F092900502611 /* StatusTableViewCell.swift */,
D0D2AC4C25BCD2A9003D5DF2 /* TagTableViewCell.swift */, D0D2AC4C25BCD2A9003D5DF2 /* TagTableViewCell.swift */,
); );
@ -1087,6 +1090,7 @@
D0030982250C6C8500EACB32 /* URL+Extensions.swift in Sources */, D0030982250C6C8500EACB32 /* URL+Extensions.swift in Sources */,
D0BE97A325CF44310057E161 /* CGRect+Extensions.swift in Sources */, D0BE97A325CF44310057E161 /* CGRect+Extensions.swift in Sources */,
D00CB2ED2533ACC00080096B /* StatusView.swift in Sources */, D00CB2ED2533ACC00080096B /* StatusView.swift in Sources */,
D0BE980425D229D50057E161 /* SeparatorConfiguredTableViewCell.swift in Sources */,
D0A1F4F7252E7D4B004435BF /* TableViewDataSource.swift in Sources */, D0A1F4F7252E7D4B004435BF /* TableViewDataSource.swift in Sources */,
D025B17E25C500BC001C69A8 /* CapsuleButton.swift in Sources */, D025B17E25C500BC001C69A8 /* CapsuleButton.swift in Sources */,
D0C7D4C424F7616A001EBDBB /* AppDelegate.swift in Sources */, D0C7D4C424F7616A001EBDBB /* AppDelegate.swift in Sources */,

14
Views/UIKit/Table View Cells/AccountTableViewCell.swift
View file

@ -3,7 +3,7 @@
import UIKit import UIKit
import ViewModels import ViewModels
final class AccountTableViewCell: UITableViewCell { final class AccountTableViewCell: SeparatorConfiguredTableViewCell {
var viewModel: AccountViewModel? var viewModel: AccountViewModel?
override func updateConfiguration(using state: UICellConfigurationState) { override func updateConfiguration(using state: UICellConfigurationState) {
@ -12,16 +12,4 @@ final class AccountTableViewCell: UITableViewCell {
contentConfiguration = AccountContentConfiguration(viewModel: viewModel).updated(for: state) contentConfiguration = AccountContentConfiguration(viewModel: viewModel).updated(for: state)
accessibilityElements = [contentView] accessibilityElements = [contentView]
} }
override func layoutSubviews() {
super.layoutSubviews()
if UIDevice.current.userInterfaceIdiom == .phone {
separatorInset.left = 0
separatorInset.right = 0
} else {
separatorInset.left = layoutMargins.left
separatorInset.right = layoutMargins.right
}
}
} }

14
Views/UIKit/Table View Cells/ConversationTableViewCell.swift
View file

@ -3,7 +3,7 @@
import UIKit import UIKit
import ViewModels import ViewModels
final class ConversationTableViewCell: UITableViewCell { final class ConversationTableViewCell: SeparatorConfiguredTableViewCell {
var viewModel: ConversationViewModel? var viewModel: ConversationViewModel?
override func updateConfiguration(using state: UICellConfigurationState) { override func updateConfiguration(using state: UICellConfigurationState) {
@ -12,16 +12,4 @@ final class ConversationTableViewCell: UITableViewCell {
contentConfiguration = ConversationContentConfiguration(viewModel: viewModel).updated(for: state) contentConfiguration = ConversationContentConfiguration(viewModel: viewModel).updated(for: state)
accessibilityElements = [contentView] accessibilityElements = [contentView]
} }
override func layoutSubviews() {
super.layoutSubviews()
if UIDevice.current.userInterfaceIdiom == .phone {
separatorInset.left = 0
separatorInset.right = 0
} else {
separatorInset.left = layoutMargins.left
separatorInset.right = layoutMargins.right
}
}
} }

14
Views/UIKit/Table View Cells/LoadMoreTableViewCell.swift
View file

@ -3,7 +3,7 @@
import UIKit import UIKit
import ViewModels import ViewModels
final class LoadMoreTableViewCell: UITableViewCell { final class LoadMoreTableViewCell: SeparatorConfiguredTableViewCell {
var viewModel: LoadMoreViewModel? var viewModel: LoadMoreViewModel?
override func updateConfiguration(using state: UICellConfigurationState) { override func updateConfiguration(using state: UICellConfigurationState) {
@ -12,16 +12,4 @@ final class LoadMoreTableViewCell: UITableViewCell {
contentConfiguration = LoadMoreContentConfiguration(viewModel: viewModel) contentConfiguration = LoadMoreContentConfiguration(viewModel: viewModel)
accessibilityElements = [contentView] accessibilityElements = [contentView]
} }
override func layoutSubviews() {
super.layoutSubviews()
if UIDevice.current.userInterfaceIdiom == .phone {
separatorInset.left = 0
separatorInset.right = 0
} else {
separatorInset.left = layoutMargins.left
separatorInset.right = layoutMargins.right
}
}
} }

14
Views/UIKit/Table View Cells/NotificationTableViewCell.swift
View file

@ -3,7 +3,7 @@
import UIKit import UIKit
import ViewModels import ViewModels
final class NotificationTableViewCell: UITableViewCell { final class NotificationTableViewCell: SeparatorConfiguredTableViewCell {
var viewModel: NotificationViewModel? var viewModel: NotificationViewModel?
override func updateConfiguration(using state: UICellConfigurationState) { override func updateConfiguration(using state: UICellConfigurationState) {
@ -12,16 +12,4 @@ final class NotificationTableViewCell: UITableViewCell {
contentConfiguration = NotificationContentConfiguration(viewModel: viewModel).updated(for: state) contentConfiguration = NotificationContentConfiguration(viewModel: viewModel).updated(for: state)
accessibilityElements = [contentView] accessibilityElements = [contentView]
} }
override func layoutSubviews() {
super.layoutSubviews()
if UIDevice.current.userInterfaceIdiom == .phone {
separatorInset.left = 0
separatorInset.right = 0
} else {
separatorInset.left = layoutMargins.left
separatorInset.right = layoutMargins.right
}
}
} }

17
Views/UIKit/Table View Cells/SeparatorConfiguredTableViewCell.swift Normal file
View file

@ -0,0 +1,17 @@
// Copyright © 2021 Metabolist. All rights reserved.
import UIKit
class SeparatorConfiguredTableViewCell: UITableViewCell {
override func layoutSubviews() {
super.layoutSubviews()
if UIDevice.current.userInterfaceIdiom == .phone {
separatorInset.left = 0
separatorInset.right = 0
} else {
separatorInset.left = layoutMargins.left
separatorInset.right = layoutMargins.right
}
}
}

14
Views/UIKit/Table View Cells/TagTableViewCell.swift
View file

@ -3,7 +3,7 @@
import UIKit import UIKit
import ViewModels import ViewModels
final class TagTableViewCell: UITableViewCell { final class TagTableViewCell: SeparatorConfiguredTableViewCell {
var viewModel: TagViewModel? var viewModel: TagViewModel?
override func updateConfiguration(using state: UICellConfigurationState) { override func updateConfiguration(using state: UICellConfigurationState) {
@ -11,16 +11,4 @@ final class TagTableViewCell: UITableViewCell {
contentConfiguration = TagContentConfiguration(viewModel: viewModel).updated(for: state) contentConfiguration = TagContentConfiguration(viewModel: viewModel).updated(for: state)
} }
override func layoutSubviews() {
super.layoutSubviews()
if UIDevice.current.userInterfaceIdiom == .phone {
separatorInset.left = 0
separatorInset.right = 0
} else {
separatorInset.left = layoutMargins.left
separatorInset.right = layoutMargins.right
}
}
} }