diff --git a/Tusker.xcodeproj/project.pbxproj b/Tusker.xcodeproj/project.pbxproj index 10e62933..c468ee00 100644 --- a/Tusker.xcodeproj/project.pbxproj +++ b/Tusker.xcodeproj/project.pbxproj @@ -127,8 +127,6 @@ D6412B0B24B0D4C600F5412E /* ProfileHeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6412B0A24B0D4C600F5412E /* ProfileHeaderView.xib */; }; D6412B0D24B0D4CF00F5412E /* ProfileHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6412B0C24B0D4CF00F5412E /* ProfileHeaderView.swift */; }; D641C77F213DC78A004B4513 /* InlineTextAttachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = D641C77E213DC78A004B4513 /* InlineTextAttachment.swift */; }; - D6420AEE26BED18B00ED8175 /* PublicTimelineDescriptionTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6420AEC26BED18B00ED8175 /* PublicTimelineDescriptionTableViewCell.swift */; }; - D6420AEF26BED18B00ED8175 /* PublicTimelineDescriptionTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6420AED26BED18B00ED8175 /* PublicTimelineDescriptionTableViewCell.xib */; }; D646C956213B365700269FB5 /* LargeImageExpandAnimationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D646C955213B365700269FB5 /* LargeImageExpandAnimationController.swift */; }; D646C958213B367000269FB5 /* LargeImageShrinkAnimationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D646C957213B367000269FB5 /* LargeImageShrinkAnimationController.swift */; }; D646C95A213B5D0500269FB5 /* LargeImageInteractionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D646C959213B5D0500269FB5 /* LargeImageInteractionController.swift */; }; @@ -513,8 +511,6 @@ D6412B0A24B0D4C600F5412E /* ProfileHeaderView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ProfileHeaderView.xib; sourceTree = ""; }; D6412B0C24B0D4CF00F5412E /* ProfileHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileHeaderView.swift; sourceTree = ""; }; D641C77E213DC78A004B4513 /* InlineTextAttachment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InlineTextAttachment.swift; sourceTree = ""; }; - D6420AEC26BED18B00ED8175 /* PublicTimelineDescriptionTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublicTimelineDescriptionTableViewCell.swift; sourceTree = ""; }; - D6420AED26BED18B00ED8175 /* PublicTimelineDescriptionTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PublicTimelineDescriptionTableViewCell.xib; sourceTree = ""; }; D646C955213B365700269FB5 /* LargeImageExpandAnimationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LargeImageExpandAnimationController.swift; sourceTree = ""; }; D646C957213B367000269FB5 /* LargeImageShrinkAnimationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LargeImageShrinkAnimationController.swift; sourceTree = ""; }; D646C959213B5D0500269FB5 /* LargeImageInteractionController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LargeImageInteractionController.swift; sourceTree = ""; }; @@ -1151,15 +1147,6 @@ path = Notifications; sourceTree = ""; }; - D6420AEB26BED17500ED8175 /* Timeline Description Cell */ = { - isa = PBXGroup; - children = ( - D6420AEC26BED18B00ED8175 /* PublicTimelineDescriptionTableViewCell.swift */, - D6420AED26BED18B00ED8175 /* PublicTimelineDescriptionTableViewCell.xib */, - ); - path = "Timeline Description Cell"; - sourceTree = ""; - }; D646C954213B364600269FB5 /* Transitions */ = { isa = PBXGroup; children = ( @@ -1390,7 +1377,6 @@ D641C78B213DD92F004B4513 /* Profile Header */, D641C78A213DD926004B4513 /* Status */, D64AAE8F26C80DB600FC57FB /* Toast */, - D6420AEB26BED17500ED8175 /* Timeline Description Cell */, ); path = Views; sourceTree = ""; @@ -1774,7 +1760,6 @@ D6412B0B24B0D4C600F5412E /* ProfileHeaderView.xib in Resources */, D6C82B5725C5F3F20017F1E6 /* ExpandThreadTableViewCell.xib in Resources */, D6D4DDDA212518A200E1C4BB /* LaunchScreen.storyboard in Resources */, - D6420AEF26BED18B00ED8175 /* PublicTimelineDescriptionTableViewCell.xib in Resources */, D6E57FA325C26FAB00341037 /* Localizable.stringsdict in Resources */, D6B053AC23BD2F1400A066FA /* AssetCollectionViewCell.xib in Resources */, D6D4DDD7212518A200E1C4BB /* Assets.xcassets in Resources */, @@ -2020,7 +2005,6 @@ D61F75B7293C119700C0B37F /* Filterer.swift in Sources */, D64AAE9526C88C5000FC57FB /* ToastableViewController.swift in Sources */, D6895DE928D962C2006341DA /* TimelineLikeController.swift in Sources */, - D6420AEE26BED18B00ED8175 /* PublicTimelineDescriptionTableViewCell.swift in Sources */, D6E0DC8E216EDF1E00369478 /* Previewing.swift in Sources */, D6B93667281D937300237D0E /* MainSidebarMyProfileCollectionViewCell.swift in Sources */, D61F75BD293D099600C0B37F /* Lazy.swift in Sources */, diff --git a/Tusker/Views/Timeline Description Cell/PublicTimelineDescriptionTableViewCell.swift b/Tusker/Views/Timeline Description Cell/PublicTimelineDescriptionTableViewCell.swift deleted file mode 100644 index 7faa8568..00000000 --- a/Tusker/Views/Timeline Description Cell/PublicTimelineDescriptionTableViewCell.swift +++ /dev/null @@ -1,53 +0,0 @@ -// -// PublicTimelineDescriptionTableViewCell.swift -// PublicTimelineDescriptionTableViewCell -// -// Created by Shadowfacts on 8/7/21. -// Copyright © 2021 Shadowfacts. All rights reserved. -// - -import UIKit - -class PublicTimelineDescriptionTableViewCell: UITableViewCell { - - weak var mastodonController: MastodonController! - - var local = false { - didSet { - updateLabel() - } - } - var didDismiss: (() -> Void)? - - @IBOutlet private weak var descriptionLabel: UILabel! - - override func awakeFromNib() { - super.awakeFromNib() - - contentView.backgroundColor = .tintColor - } - - private func updateLabel() { - let str = NSMutableAttributedString() - let instanceStr = NSAttributedString(string: mastodonController.instanceURL.host!, attributes: [ - .font: UIFont(descriptor: .preferredFontDescriptor(withTextStyle: .body).withSymbolicTraits(.traitBold)!, size: 0) - ]) - if local { - str.append(NSAttributedString(string: "The local timeline shows public posts from only ")) - str.append(instanceStr) - str.append(NSAttributedString(string: ".")) - } else { - str.append(NSAttributedString(string: "The federated timeline shows public posts from all users that ")) - str.append(instanceStr) - str.append(NSAttributedString(string: " knows about.")) - } - descriptionLabel.attributedText = str - } - -} - -extension PublicTimelineDescriptionTableViewCell: SelectableTableViewCell { - func didSelectCell() { - didDismiss?() - } -} diff --git a/Tusker/Views/Timeline Description Cell/PublicTimelineDescriptionTableViewCell.xib b/Tusker/Views/Timeline Description Cell/PublicTimelineDescriptionTableViewCell.xib deleted file mode 100644 index 14311340..00000000 --- a/Tusker/Views/Timeline Description Cell/PublicTimelineDescriptionTableViewCell.xib +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -