From 5524ab19324d310f0e85d86f180acb58cb5a0f43 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Wed, 27 Jan 2021 14:21:13 +1100 Subject: [PATCH] Remove unused code --- Session.xcodeproj/project.pbxproj | 8 --- Session/Notifications/AppNotifications.swift | 24 ------- Session/Shared/AvatarTableViewCell.swift | 72 -------------------- Session/Shared/GroupTableViewCell.swift | 66 ------------------ 4 files changed, 170 deletions(-) delete mode 100644 Session/Shared/AvatarTableViewCell.swift delete mode 100644 Session/Shared/GroupTableViewCell.swift diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index 2f80cb9e9..71d3a6fe3 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -119,7 +119,6 @@ 457F671B20746193000EABCD /* QuotedReplyPreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = 457F671A20746193000EABCD /* QuotedReplyPreview.swift */; }; 45847E871E4283C30080EAB3 /* Intents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 45847E861E4283C30080EAB3 /* Intents.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 45A2F005204473A3002E978A /* NewMessage.aifc in Resources */ = {isa = PBXBuildFile; fileRef = 45A2F004204473A3002E978A /* NewMessage.aifc */; }; - 45A663C51F92EC760027B59E /* GroupTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45A663C41F92EC760027B59E /* GroupTableViewCell.swift */; }; 45A6DAD61EBBF85500893231 /* ReminderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45A6DAD51EBBF85500893231 /* ReminderView.swift */; }; 45B5360E206DD8BB00D61655 /* UIResponder+OWS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45B5360D206DD8BB00D61655 /* UIResponder+OWS.swift */; }; 45B74A742044AAB600CD42F8 /* aurora-quiet.aifc in Resources */ = {isa = PBXBuildFile; fileRef = 45B74A5B2044AAB300CD42F8 /* aurora-quiet.aifc */; }; @@ -160,7 +159,6 @@ 4C1885D2218F8E1C00B67051 /* PhotoGridViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C1885D1218F8E1C00B67051 /* PhotoGridViewCell.swift */; }; 4C21D5D6223A9DC500EF8A77 /* UIAlerts+iOS9.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C21D5D5223A9DC500EF8A77 /* UIAlerts+iOS9.m */; }; 4C21D5D8223AC60F00EF8A77 /* PhotoCapture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C21D5D7223AC60F00EF8A77 /* PhotoCapture.swift */; }; - 4C2F454F214C00E1004871FF /* AvatarTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2F454E214C00E1004871FF /* AvatarTableViewCell.swift */; }; 4C4AE6A1224AF35700D4AF6F /* SendMediaNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C4AE69F224AF21900D4AF6F /* SendMediaNavigationController.swift */; }; 4C4AEC4520EC343B0020E72B /* DismissableTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C4AEC4420EC343B0020E72B /* DismissableTextField.swift */; }; 4C586926224FAB83003FD070 /* AVAudioSession+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C586925224FAB83003FD070 /* AVAudioSession+OWS.m */; }; @@ -1148,7 +1146,6 @@ 457F671A20746193000EABCD /* QuotedReplyPreview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuotedReplyPreview.swift; sourceTree = ""; }; 45847E861E4283C30080EAB3 /* Intents.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Intents.framework; path = System/Library/Frameworks/Intents.framework; sourceTree = SDKROOT; }; 45A2F004204473A3002E978A /* NewMessage.aifc */ = {isa = PBXFileReference; lastKnownFileType = file; name = NewMessage.aifc; path = Session/Meta/AudioFiles/NewMessage.aifc; sourceTree = SOURCE_ROOT; }; - 45A663C41F92EC760027B59E /* GroupTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupTableViewCell.swift; sourceTree = ""; }; 45A6DAD51EBBF85500893231 /* ReminderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReminderView.swift; sourceTree = ""; }; 45B201741DAECBFD00C461E0 /* Signal-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Signal-Bridging-Header.h"; sourceTree = ""; }; 45B5360D206DD8BB00D61655 /* UIResponder+OWS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIResponder+OWS.swift"; sourceTree = ""; }; @@ -1191,7 +1188,6 @@ 4C1D2337218B6BA000A0598F /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = ""; }; 4C21D5D5223A9DC500EF8A77 /* UIAlerts+iOS9.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIAlerts+iOS9.m"; sourceTree = ""; }; 4C21D5D7223AC60F00EF8A77 /* PhotoCapture.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoCapture.swift; sourceTree = ""; }; - 4C2F454E214C00E1004871FF /* AvatarTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvatarTableViewCell.swift; sourceTree = ""; }; 4C4AE69F224AF21900D4AF6F /* SendMediaNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendMediaNavigationController.swift; sourceTree = ""; }; 4C4AEC4420EC343B0020E72B /* DismissableTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DismissableTextField.swift; sourceTree = ""; }; 4C586924224FAB83003FD070 /* AVAudioSession+OWS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "AVAudioSession+OWS.h"; sourceTree = ""; }; @@ -2349,10 +2345,8 @@ B8CCF63B239757C10091D419 /* Shared */ = { isa = PBXGroup; children = ( - 4C2F454E214C00E1004871FF /* AvatarTableViewCell.swift */, 4CA46F4B219CCC630038ABDE /* CaptionView.swift */, 4C4AEC4420EC343B0020E72B /* DismissableTextField.swift */, - 45A663C41F92EC760027B59E /* GroupTableViewCell.swift */, 45E5A6981F61E6DD001E4A8A /* MarqueeLabel.swift */, 34386A53207D271C009F5D9C /* NeverClearView.swift */, 34F308A01ECB469700BB7697 /* OWSBezierPathView.h */, @@ -5037,7 +5031,6 @@ 451166C01FD86B98000739BA /* AccountManager.swift in Sources */, B83F2B88240CB75A000A54AB /* UIImage+Scaling.swift in Sources */, 3430FE181F7751D4000EC51B /* GiphyAPI.swift in Sources */, - 4C2F454F214C00E1004871FF /* AvatarTableViewCell.swift in Sources */, 340FC8AA204DAC8D007AEB0F /* NotificationSettingsViewController.m in Sources */, 4C090A1B210FD9C7001FD7F9 /* HapticFeedback.swift in Sources */, 3496744F2076ACD000080B5F /* LongTextViewController.swift in Sources */, @@ -5155,7 +5148,6 @@ 346B66311F4E29B200E5122F /* CropScaleImageViewController.swift in Sources */, 45E5A6991F61E6DE001E4A8A /* MarqueeLabel.swift in Sources */, 34D1F0B01F867BFC0066283D /* OWSSystemMessageCell.m in Sources */, - 45A663C51F92EC760027B59E /* GroupTableViewCell.swift in Sources */, B86BD08423399ACF000F5AE3 /* Modal.swift in Sources */, 34D1F0861F8678AA0066283D /* ConversationViewController.m in Sources */, 3427C64320F500E000EEC730 /* OWSMessageTimerView.m in Sources */, diff --git a/Session/Notifications/AppNotifications.swift b/Session/Notifications/AppNotifications.swift index 4bf251056..e3d7528bc 100644 --- a/Session/Notifications/AppNotifications.swift +++ b/Session/Notifications/AppNotifications.swift @@ -25,15 +25,9 @@ enum AppNotificationCategory: CaseIterable { case incomingMessageFromNoLongerVerifiedIdentity case errorMessage case threadlessErrorMessage -// case incomingCall -// case missedCall -// case missedCallFromNoLongerVerifiedIdentity } enum AppNotificationAction: CaseIterable { -// case answerCall -// case callBack -// case declineCall case markAsRead case reply case showThread @@ -56,12 +50,6 @@ extension AppNotificationCategory { return "Signal.AppNotificationCategory.errorMessage" case .threadlessErrorMessage: return "Signal.AppNotificationCategory.threadlessErrorMessage" -// case .incomingCall: -// return "Signal.AppNotificationCategory.incomingCall" -// case .missedCall: -// return "Signal.AppNotificationCategory.missedCall" -// case .missedCallFromNoLongerVerifiedIdentity: -// return "Signal.AppNotificationCategory.missedCallFromNoLongerVerifiedIdentity" } } @@ -75,12 +63,6 @@ extension AppNotificationCategory { return [.showThread] case .threadlessErrorMessage: return [] -// case .incomingCall: -// return [.answerCall, .declineCall] -// case .missedCall: -// return [.callBack, .showThread] -// case .missedCallFromNoLongerVerifiedIdentity: -// return [.showThread] } } } @@ -88,12 +70,6 @@ extension AppNotificationCategory { extension AppNotificationAction { var identifier: String { switch self { -// case .answerCall: -// return "Signal.AppNotifications.Action.answerCall" -// case .callBack: -// return "Signal.AppNotifications.Action.callBack" -// case .declineCall: -// return "Signal.AppNotifications.Action.declineCall" case .markAsRead: return "Signal.AppNotifications.Action.markAsRead" case .reply: diff --git a/Session/Shared/AvatarTableViewCell.swift b/Session/Shared/AvatarTableViewCell.swift deleted file mode 100644 index 005cfaca0..000000000 --- a/Session/Shared/AvatarTableViewCell.swift +++ /dev/null @@ -1,72 +0,0 @@ -// -// Copyright (c) 2019 Open Whisper Systems. All rights reserved. -// - -import Foundation - -@objc(OWSAvatarTableViewCell) -public class AvatarTableViewCell: UITableViewCell { - - private let columns: UIStackView - private let textRows: UIStackView -// private let avatarView: AvatarImageView - - private let _textLabel: UILabel - override public var textLabel: UILabel? { - get { - return _textLabel - } - } - - private let _detailTextLabel: UILabel - override public var detailTextLabel: UILabel? { - get { - return _detailTextLabel - } - } - - @objc - public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { -// self.avatarView = AvatarImageView() -// avatarView.autoSetDimensions(to: CGSize(width: CGFloat(kStandardAvatarSize), height: CGFloat(kStandardAvatarSize))) - - self._textLabel = UILabel() - self._detailTextLabel = UILabel() - - self.textRows = UIStackView(arrangedSubviews: [_textLabel, _detailTextLabel]) - textRows.axis = .vertical - - self.columns = UIStackView(arrangedSubviews: [ textRows ]) - columns.axis = .horizontal - columns.spacing = CGFloat(kContactCellAvatarTextMargin) - - super.init(style: style, reuseIdentifier: reuseIdentifier) - - self.contentView.addSubview(columns) - columns.autoPinEdgesToSuperviewMargins() - - OWSTableItem.configureCell(self) - } - - required public init?(coder aDecoder: NSCoder) { - fatalError("init(coder:) has not been implemented") - } - - @objc - public func configure(image: UIImage?, text: String?, detailText: String?) { -// self.avatarView.image = image - self.textLabel?.text = text - self.detailTextLabel?.text = detailText - - OWSTableItem.configureCell(self) - } - - @objc - public override func prepareForReuse() { - super.prepareForReuse() - -// self.avatarView.image = nil - self.textLabel?.text = nil - self.detailTextLabel?.text = nil - } -} diff --git a/Session/Shared/GroupTableViewCell.swift b/Session/Shared/GroupTableViewCell.swift deleted file mode 100644 index e8f9da488..000000000 --- a/Session/Shared/GroupTableViewCell.swift +++ /dev/null @@ -1,66 +0,0 @@ -// -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. -// - -import UIKit -import SignalUtilitiesKit - -@objc class GroupTableViewCell: UITableViewCell { - - // MARK: - - -// private let avatarView = AvatarImageView() - private let nameLabel = UILabel() - private let subtitleLabel = UILabel() - - init() { - super.init(style: .default, reuseIdentifier: GroupTableViewCell.logTag()) - - // Font config - nameLabel.font = .ows_dynamicTypeBody - nameLabel.textColor = Theme.primaryColor - subtitleLabel.font = UIFont.ows_regularFont(withSize: 11.0) - subtitleLabel.textColor = Theme.secondaryColor - - // Layout - -// avatarView.autoSetDimension(.width, toSize: CGFloat(kStandardAvatarSize)) -// avatarView.autoPinToSquareAspectRatio() - - let textRows = UIStackView(arrangedSubviews: [nameLabel, subtitleLabel]) - textRows.axis = .vertical - textRows.alignment = .leading - - let columns = UIStackView(arrangedSubviews: [ textRows ]) - columns.axis = .horizontal - columns.alignment = .center - columns.spacing = kContactCellAvatarTextMargin - - self.contentView.addSubview(columns) - columns.autoPinEdgesToSuperviewMargins() - } - - required init?(coder aDecoder: NSCoder) { - notImplemented() - } - - @objc - public func configure(thread: TSGroupThread) { - OWSTableItem.configureCell(self) - - if let groupName = thread.groupModel.groupName, !groupName.isEmpty { - self.nameLabel.text = groupName - } else { - self.nameLabel.text = MessageStrings.newGroupDefaultTitle - } - - let groupMemberIds: [String] = thread.groupModel.groupMemberIds - let groupMemberNames = groupMemberIds.map { (recipientId: String) in - SSKEnvironment.shared.profileManager.profileNameForRecipient(withID: recipientId, avoidingWriteTransaction: true)! - }.joined(separator: ", ") - self.subtitleLabel.text = groupMemberNames - -// self.avatarView.image = OWSAvatarBuilder.buildImage(thread: thread, diameter: kStandardAvatarSize) - } - -}