From ca76568c79c3095a345c6b84d7caab7bf806861c Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Sun, 15 Mar 2020 11:40:28 -0400 Subject: [PATCH] Remove old code --- Tusker.xcodeproj/project.pbxproj | 16 ---- .../Compose Media/ComposeMediaView.swift | 75 ---------------- .../Views/Compose Media/ComposeMediaView.xib | 90 ------------------- 3 files changed, 181 deletions(-) delete mode 100644 Tusker/Views/Compose Media/ComposeMediaView.swift delete mode 100644 Tusker/Views/Compose Media/ComposeMediaView.xib diff --git a/Tusker.xcodeproj/project.pbxproj b/Tusker.xcodeproj/project.pbxproj index ee3d747a..c05714ae 100644 --- a/Tusker.xcodeproj/project.pbxproj +++ b/Tusker.xcodeproj/project.pbxproj @@ -25,7 +25,6 @@ 04ED00B121481ED800567C53 /* SteppedProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04ED00B021481ED800567C53 /* SteppedProgressView.swift */; }; D6028B9B2150811100F223B9 /* MastodonCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6028B9A2150811100F223B9 /* MastodonCache.swift */; }; D60309B52419D4F100A465FF /* ComposeAttachmentsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60309B42419D4F100A465FF /* ComposeAttachmentsViewController.swift */; }; - D60C07E421E8176B0057FAA8 /* ComposeMediaView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D60C07E321E8176B0057FAA8 /* ComposeMediaView.xib */; }; D60D2B8223844C71001B87A3 /* BaseStatusTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60D2B8123844C71001B87A3 /* BaseStatusTableViewCell.swift */; }; D61099B42144B0CC00432DC2 /* Pachyderm.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D61099AB2144B0CC00432DC2 /* Pachyderm.framework */; }; D61099BB2144B0CC00432DC2 /* PachydermTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099BA2144B0CC00432DC2 /* PachydermTests.swift */; }; @@ -106,7 +105,6 @@ D62D2426217ABF63005076CC /* UserActivityType.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62D2425217ABF63005076CC /* UserActivityType.swift */; }; D62FF04823D7CDD700909D6E /* AttributedStringHelperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62FF04723D7CDD700909D6E /* AttributedStringHelperTests.swift */; }; D6333B372137838300CE884A /* AttributedString+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6333B362137838300CE884A /* AttributedString+Helpers.swift */; }; - D6333B772138D94E00CE884A /* ComposeMediaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6333B762138D94E00CE884A /* ComposeMediaView.swift */; }; D6333B792139AEFD00CE884A /* Date+TimeAgo.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6333B782139AEFD00CE884A /* Date+TimeAgo.swift */; }; D63569E023908A8D003DD353 /* StatusState.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60A4FFB238B726A008AC647 /* StatusState.swift */; }; D63661C02381C144004B9E16 /* PreferencesNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63661BF2381C144004B9E16 /* PreferencesNavigationController.swift */; }; @@ -311,7 +309,6 @@ D6028B9A2150811100F223B9 /* MastodonCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonCache.swift; sourceTree = ""; }; D60309B42419D4F100A465FF /* ComposeAttachmentsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeAttachmentsViewController.swift; sourceTree = ""; }; D60A4FFB238B726A008AC647 /* StatusState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusState.swift; sourceTree = ""; }; - D60C07E321E8176B0057FAA8 /* ComposeMediaView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ComposeMediaView.xib; sourceTree = ""; }; D60D2B8123844C71001B87A3 /* BaseStatusTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseStatusTableViewCell.swift; sourceTree = ""; }; D61099AB2144B0CC00432DC2 /* Pachyderm.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pachyderm.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D61099AD2144B0CC00432DC2 /* Pachyderm.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Pachyderm.h; sourceTree = ""; }; @@ -393,7 +390,6 @@ D62D2425217ABF63005076CC /* UserActivityType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserActivityType.swift; sourceTree = ""; }; D62FF04723D7CDD700909D6E /* AttributedStringHelperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttributedStringHelperTests.swift; sourceTree = ""; }; D6333B362137838300CE884A /* AttributedString+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AttributedString+Helpers.swift"; sourceTree = ""; }; - D6333B762138D94E00CE884A /* ComposeMediaView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeMediaView.swift; sourceTree = ""; }; D6333B782139AEFD00CE884A /* Date+TimeAgo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+TimeAgo.swift"; sourceTree = ""; }; D63661BF2381C144004B9E16 /* PreferencesNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesNavigationController.swift; sourceTree = ""; }; D63F9C65241C4CC3004C03CF /* AddAttachmentTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AddAttachmentTableViewCell.xib; sourceTree = ""; }; @@ -603,15 +599,6 @@ path = Transitions; sourceTree = ""; }; - D60C07E221E817560057FAA8 /* Compose Media */ = { - isa = PBXGroup; - children = ( - D60C07E321E8176B0057FAA8 /* ComposeMediaView.xib */, - D6333B762138D94E00CE884A /* ComposeMediaView.swift */, - ); - path = "Compose Media"; - sourceTree = ""; - }; D61099AC2144B0CC00432DC2 /* Pachyderm */ = { isa = PBXGroup; children = ( @@ -1155,7 +1142,6 @@ D627944623A6AC9300D38C68 /* BasicTableViewCell.xib */, D67C57A721E2649B00C3118B /* Account Detail */, D67C57B021E28F9400C3118B /* Compose Status Reply */, - D60C07E221E817560057FAA8 /* Compose Media */, D626494023C122C800612E6E /* Asset Picker */, D641C78A213DD926004B4513 /* Status */, D6C7D27B22B6EBE200071952 /* Attachments */, @@ -1509,7 +1495,6 @@ D63F9C6C241C50B9004C03CF /* ComposeAttachmentTableViewCell.xib in Resources */, D6A3BC812321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.xib in Resources */, D63F9C66241C4CC3004C03CF /* AddAttachmentTableViewCell.xib in Resources */, - D60C07E421E8176B0057FAA8 /* ComposeMediaView.xib in Resources */, D667E5E12134937B0057A976 /* TimelineStatusTableViewCell.xib in Resources */, D6A5FAF1217B7E05003DB2D9 /* ComposeViewController.xib in Resources */, ); @@ -1671,7 +1656,6 @@ D627FF7B217E951500CC0648 /* DraftsTableViewController.swift in Sources */, D6A3BC8F2321FFB900FD64D5 /* StatusActionAccountListTableViewController.swift in Sources */, D6AEBB4823216B1D00E5038B /* AccountActivity.swift in Sources */, - D6333B772138D94E00CE884A /* ComposeMediaView.swift in Sources */, 04ED00B121481ED800567C53 /* SteppedProgressView.swift in Sources */, D6BC9DDA232D8BE5002CA326 /* SearchResultsViewController.swift in Sources */, D627FF7F217E95E000CC0648 /* DraftTableViewCell.swift in Sources */, diff --git a/Tusker/Views/Compose Media/ComposeMediaView.swift b/Tusker/Views/Compose Media/ComposeMediaView.swift deleted file mode 100644 index b1c5fd0e..00000000 --- a/Tusker/Views/Compose Media/ComposeMediaView.swift +++ /dev/null @@ -1,75 +0,0 @@ -// -// ComposeAttachmentView.swift -// Tusker -// -// Created by Shadowfacts on 1/10/19. -// Copyright © 2019 Shadowfacts. All rights reserved. -// - -import UIKit -import Photos -import AVFoundation - -protocol ComposeMediaViewDelegate: class { - func didRemoveMedia(_ mediaView: ComposeMediaView) - func descriptionTextViewDidChange(_ mediaView: ComposeMediaView) -} - -class ComposeMediaView: UIView { - - weak var delegate: ComposeMediaViewDelegate? - - @IBOutlet weak var imageView: UIImageView! - @IBOutlet weak var descriptionTextView: UITextView! - @IBOutlet weak var placeholderLabel: UILabel! - - var attachment: CompositionAttachmentData! - - static func create() -> ComposeMediaView { - return UINib(nibName: "ComposeMediaView", bundle: nil).instantiate(withOwner: nil, options: nil).first as! ComposeMediaView - } - - override func awakeFromNib() { - super.awakeFromNib() - - imageView.layer.masksToBounds = true - imageView.layer.cornerRadius = 10 // 0.1 * imageView.frame.width - - descriptionTextView.delegate = self - } - - func update(attachment: CompositionAttachmentData) { - self.attachment = attachment - - switch attachment { - case let .image(image): - imageView.image = image - case let .asset(asset): - let size = CGSize(width: 80, height: 80) - PHImageManager.default().requestImage(for: asset, targetSize: size, contentMode: .aspectFill, options: nil) { (image, _) in - guard self.attachment == attachment else { return } - self.imageView.image = image - } - case let .video(url): - let asset = AVURLAsset(url: url) - let imageGenerator = AVAssetImageGenerator(asset: asset) - if let cgImage = try? imageGenerator.copyCGImage(at: .zero, actualTime: nil) { - imageView.image = UIImage(cgImage: cgImage) - } - } - } - - // MARK: - Interaction - - @IBAction func removePressed(_ sender: Any) { - delegate?.didRemoveMedia(self) - } - -} - -extension ComposeMediaView: UITextViewDelegate { - func textViewDidChange(_ textView: UITextView) { - placeholderLabel.isHidden = !descriptionTextView.text.isEmpty - delegate?.descriptionTextViewDidChange(self) - } -} diff --git a/Tusker/Views/Compose Media/ComposeMediaView.xib b/Tusker/Views/Compose Media/ComposeMediaView.xib deleted file mode 100644 index 575f1028..00000000 --- a/Tusker/Views/Compose Media/ComposeMediaView.xib +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -