From 0d972d987c476a36ca9be68387961723ba0b7aed Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Sun, 20 Sep 2020 10:46:51 -0400 Subject: [PATCH] Remove old Compose screen cold --- Tusker.xcodeproj/project.pbxproj | 16 ---- .../ComposeStatusReplyView.swift | 56 ------------- .../ComposeStatusReplyView.xib | 83 ------------------- 3 files changed, 155 deletions(-) delete mode 100644 Tusker/Views/Compose Status Reply/ComposeStatusReplyView.swift delete mode 100644 Tusker/Views/Compose Status Reply/ComposeStatusReplyView.xib diff --git a/Tusker.xcodeproj/project.pbxproj b/Tusker.xcodeproj/project.pbxproj index a3582eec..787eb0c7 100644 --- a/Tusker.xcodeproj/project.pbxproj +++ b/Tusker.xcodeproj/project.pbxproj @@ -173,8 +173,6 @@ D67B506D250B291200FAECFB /* BlurHashDecode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67B506C250B291200FAECFB /* BlurHashDecode.swift */; }; D67C57AD21E265FC00C3118B /* LargeAccountDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67C57AC21E265FC00C3118B /* LargeAccountDetailView.swift */; }; D67C57AF21E28EAD00C3118B /* Array+Uniques.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67C57AE21E28EAD00C3118B /* Array+Uniques.swift */; }; - D67C57B221E28FAD00C3118B /* ComposeStatusReplyView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D67C57B121E28FAD00C3118B /* ComposeStatusReplyView.xib */; }; - D67C57B421E2910700C3118B /* ComposeStatusReplyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67C57B321E2910700C3118B /* ComposeStatusReplyView.swift */; }; D68015402401A6BA00D6103B /* ComposingPrefsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D680153F2401A6BA00D6103B /* ComposingPrefsView.swift */; }; D68015422401A74600D6103B /* MediaPrefsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68015412401A74600D6103B /* MediaPrefsView.swift */; }; D681A29A249AD62D0085E54E /* LargeImageContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D681A299249AD62D0085E54E /* LargeImageContentView.swift */; }; @@ -502,8 +500,6 @@ D67B506C250B291200FAECFB /* BlurHashDecode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlurHashDecode.swift; sourceTree = ""; }; D67C57AC21E265FC00C3118B /* LargeAccountDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LargeAccountDetailView.swift; sourceTree = ""; }; D67C57AE21E28EAD00C3118B /* Array+Uniques.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Array+Uniques.swift"; sourceTree = ""; }; - D67C57B121E28FAD00C3118B /* ComposeStatusReplyView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ComposeStatusReplyView.xib; sourceTree = ""; }; - D67C57B321E2910700C3118B /* ComposeStatusReplyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeStatusReplyView.swift; sourceTree = ""; }; D680153F2401A6BA00D6103B /* ComposingPrefsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposingPrefsView.swift; sourceTree = ""; }; D68015412401A74600D6103B /* MediaPrefsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaPrefsView.swift; sourceTree = ""; }; D681A299249AD62D0085E54E /* LargeImageContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LargeImageContentView.swift; sourceTree = ""; }; @@ -1145,15 +1141,6 @@ path = "Account Detail"; sourceTree = ""; }; - D67C57B021E28F9400C3118B /* Compose Status Reply */ = { - isa = PBXGroup; - children = ( - D67C57B121E28FAD00C3118B /* ComposeStatusReplyView.xib */, - D67C57B321E2910700C3118B /* ComposeStatusReplyView.swift */, - ); - path = "Compose Status Reply"; - sourceTree = ""; - }; D6A3BC7223218C6E00FD64D5 /* Utilities */ = { isa = PBXGroup; children = ( @@ -1273,7 +1260,6 @@ D686BBE224FBF8110068E6AA /* WrappedProgressView.swift */, D6B4A4FE2506B81A000C81C1 /* AccountDisplayNameLabel.swift */, D67C57A721E2649B00C3118B /* Account Detail */, - D67C57B021E28F9400C3118B /* Compose Status Reply */, D626494023C122C800612E6E /* Asset Picker */, D61959D0241E842400A37B8E /* Draft Cell */, D641C78A213DD926004B4513 /* Status */, @@ -1645,7 +1631,6 @@ D626493D23C1000300612E6E /* AlbumTableViewCell.xib in Resources */, D627944723A6AC9300D38C68 /* BasicTableViewCell.xib in Resources */, D64BC19023C18B9D000D0238 /* FollowRequestNotificationTableViewCell.xib in Resources */, - D67C57B221E28FAD00C3118B /* ComposeStatusReplyView.xib in Resources */, D6A3BC812321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.xib in Resources */, D667E5E12134937B0057A976 /* TimelineStatusTableViewCell.xib in Resources */, D6F2E966249E8BFD005846BB /* CrashReporterViewController.xib in Resources */, @@ -1818,7 +1803,6 @@ D667E5F82135C3040057A976 /* Mastodon+Equatable.swift in Sources */, D681E4D5246E2BC30053414F /* UnmuteConversationActivity.swift in Sources */, D6B4A4FF2506B81A000C81C1 /* AccountDisplayNameLabel.swift in Sources */, - D67C57B421E2910700C3118B /* ComposeStatusReplyView.swift in Sources */, D6B053A623BD2D0C00A066FA /* AssetCollectionViewController.swift in Sources */, D67B506D250B291200FAECFB /* BlurHashDecode.swift in Sources */, D62275A024F1677200B82A16 /* ComposeHostingController.swift in Sources */, diff --git a/Tusker/Views/Compose Status Reply/ComposeStatusReplyView.swift b/Tusker/Views/Compose Status Reply/ComposeStatusReplyView.swift deleted file mode 100644 index bdc16152..00000000 --- a/Tusker/Views/Compose Status Reply/ComposeStatusReplyView.swift +++ /dev/null @@ -1,56 +0,0 @@ -// -// ComposeStatusReplyView.swift -// Tusker -// -// Created by Shadowfacts on 1/6/19. -// Copyright © 2019 Shadowfacts. All rights reserved. -// - -import UIKit -import Pachyderm - -class ComposeStatusReplyView: UIView { - - weak var mastodonController: MastodonController? - - @IBOutlet weak var avatarImageView: UIImageView! - @IBOutlet weak var displayNameLabel: EmojiLabel! - @IBOutlet weak var usernameLabel: UILabel! - @IBOutlet weak var statusContentTextView: StatusContentTextView! - - var avatarRequest: ImageCache.Request? - - static func create() -> ComposeStatusReplyView { - return UINib(nibName: "ComposeStatusReplyView", bundle: nil).instantiate(withOwner: nil, options: nil).first as! ComposeStatusReplyView - } - - deinit { - avatarRequest?.cancel() - } - - override func awakeFromNib() { - super.awakeFromNib() - - updateUIForPreferences() - NotificationCenter.default.addObserver(self, selector: #selector(updateUIForPreferences), name: .preferencesChanged, object: nil) - } - - @objc func updateUIForPreferences() { - avatarImageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadius(for: avatarImageView) - } - - func updateUI(for status: StatusMO) { - displayNameLabel.updateForAccountDisplayName(account: status.account) - usernameLabel.text = "@\(status.account.acct)" - statusContentTextView.overrideMastodonController = mastodonController - statusContentTextView.setTextFrom(status: status) - - avatarRequest = ImageCache.avatars.get(status.account.avatar) { [weak self] (data) in - guard let self = self, let data = data else { return } - DispatchQueue.main.async { - self.avatarImageView.image = UIImage(data: data) - } - } - } - -} diff --git a/Tusker/Views/Compose Status Reply/ComposeStatusReplyView.xib b/Tusker/Views/Compose Status Reply/ComposeStatusReplyView.xib deleted file mode 100644 index ea79d398..00000000 --- a/Tusker/Views/Compose Status Reply/ComposeStatusReplyView.xib +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -