From ed783e66d41c1881cf6e38f0d6469ed42f140f07 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Fri, 2 Oct 2020 11:24:36 +1000 Subject: [PATCH] Rename file --- Signal.xcodeproj/project.pbxproj | 8 ++++---- ...{VoiceMessageView2.swift => VoiceMessageView.swift} | 10 +++++----- .../ConversationView/Cells/OWSMessageBubbleView.m | 4 ++-- .../ConversationView/ConversationViewItem.h | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) rename Signal/src/Loki/Components/{VoiceMessageView2.swift => VoiceMessageView.swift} (96%) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 3bbbf0093..611fc21ee 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -584,7 +584,7 @@ C35E8AA92485C85800ACB629 /* GeoLite2-Country-Blocks-IPv4.csv in Resources */ = {isa = PBXBuildFile; fileRef = C35E8AA62485C85600ACB629 /* GeoLite2-Country-Blocks-IPv4.csv */; }; C35E8AAE2485E51D00ACB629 /* IP2Country.swift in Sources */ = {isa = PBXBuildFile; fileRef = C35E8AAD2485E51D00ACB629 /* IP2Country.swift */; }; C3638C0524C7F0B500AF29BC /* LK002RemoveFriendRequests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3638C0424C7F0B500AF29BC /* LK002RemoveFriendRequests.swift */; }; - C3645350252449260045C478 /* VoiceMessageView2.swift in Sources */ = {isa = PBXBuildFile; fileRef = C364534F252449260045C478 /* VoiceMessageView2.swift */; }; + C3645350252449260045C478 /* VoiceMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C364534F252449260045C478 /* VoiceMessageView.swift */; }; C364535C252467900045C478 /* AudioUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = C364535B252467900045C478 /* AudioUtilities.swift */; }; C369549D24D27A3500CEB4E3 /* MultiDeviceRemovalSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C369549C24D27A3500CEB4E3 /* MultiDeviceRemovalSheet.swift */; }; C36B8707243C50C60049991D /* SignalMessaging.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 453518921FC63DBF00210559 /* SignalMessaging.framework */; }; @@ -1386,7 +1386,7 @@ C35E8AA62485C85600ACB629 /* GeoLite2-Country-Blocks-IPv4.csv */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "GeoLite2-Country-Blocks-IPv4.csv"; sourceTree = ""; }; C35E8AAD2485E51D00ACB629 /* IP2Country.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IP2Country.swift; sourceTree = ""; }; C3638C0424C7F0B500AF29BC /* LK002RemoveFriendRequests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LK002RemoveFriendRequests.swift; sourceTree = ""; }; - C364534F252449260045C478 /* VoiceMessageView2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VoiceMessageView2.swift; sourceTree = ""; }; + C364534F252449260045C478 /* VoiceMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VoiceMessageView.swift; sourceTree = ""; }; C364535B252467900045C478 /* AudioUtilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioUtilities.swift; sourceTree = ""; }; C369549C24D27A3500CEB4E3 /* MultiDeviceRemovalSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiDeviceRemovalSheet.swift; sourceTree = ""; }; C396469C2509D3ED00B0B9F5 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = translations/pl.lproj/Localizable.strings; sourceTree = ""; }; @@ -2694,7 +2694,7 @@ B8BB82B423947F2D00BA5194 /* TextField.swift */, C3C3CF8824D8EED300E1CCE7 /* TextView.swift */, C31D1DDC25217014005D4DA8 /* UserCell.swift */, - C364534F252449260045C478 /* VoiceMessageView2.swift */, + C364534F252449260045C478 /* VoiceMessageView.swift */, ); path = Components; sourceTree = ""; @@ -4031,7 +4031,7 @@ 3427C64320F500E000EEC730 /* OWSMessageTimerView.m in Sources */, B90418E6183E9DD40038554A /* DateUtil.m in Sources */, 340FC8BD204DAC8D007AEB0F /* ShowGroupMembersViewController.m in Sources */, - C3645350252449260045C478 /* VoiceMessageView2.swift in Sources */, + C3645350252449260045C478 /* VoiceMessageView.swift in Sources */, 3496956F21A301A100DCFE74 /* OWSBackupLazyRestore.swift in Sources */, 459311FC1D75C948008DD4F0 /* OWSDeviceTableViewCell.m in Sources */, ); diff --git a/Signal/src/Loki/Components/VoiceMessageView2.swift b/Signal/src/Loki/Components/VoiceMessageView.swift similarity index 96% rename from Signal/src/Loki/Components/VoiceMessageView2.swift rename to Signal/src/Loki/Components/VoiceMessageView.swift index d0edd56b3..1dac2b9e9 100644 --- a/Signal/src/Loki/Components/VoiceMessageView2.swift +++ b/Signal/src/Loki/Components/VoiceMessageView.swift @@ -1,7 +1,7 @@ import Accelerate -@objc(LKVoiceMessageView2) -final class VoiceMessageView2 : UIView { +@objc(LKVoiceMessageView) +final class VoiceMessageView : UIView { private let voiceMessage: TSAttachment private let isOutgoing: Bool private var isAnimating = false @@ -91,7 +91,7 @@ final class VoiceMessageView2 : UIView { private func setUpViewHierarchy() { set(.width, to: 200) - set(.height, to: VoiceMessageView2.contentHeight) + set(.height, to: VoiceMessageView.contentHeight) addSubview(loader) loader.pin(to: self) layer.insertSublayer(backgroundShapeLayer, at: 0) @@ -109,9 +109,9 @@ final class VoiceMessageView2 : UIView { } private func animateLoader() { - loader.frame = CGRect(x: 0, y: 0, width: 0, height: VoiceMessageView2.contentHeight) + loader.frame = CGRect(x: 0, y: 0, width: 0, height: VoiceMessageView.contentHeight) UIView.animate(withDuration: 2) { [weak self] in - self?.loader.frame = CGRect(x: 0, y: 0, width: 200, height: VoiceMessageView2.contentHeight) + self?.loader.frame = CGRect(x: 0, y: 0, width: 200, height: VoiceMessageView.contentHeight) } completion: { [weak self] _ in guard let self = self else { return } if self.isAnimating { self.animateLoader() } diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m index 99a105433..b134742f1 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m @@ -839,7 +839,7 @@ NS_ASSUME_NONNULL_BEGIN OWSAssertDebug(attachment); OWSAssertDebug([attachment isAudio]); - LKVoiceMessageView2 *voiceMessageView = [[LKVoiceMessageView2 alloc] initWithVoiceMessage:attachment isOutgoing:self.isOutgoing]; + LKVoiceMessageView *voiceMessageView = [[LKVoiceMessageView alloc] initWithVoiceMessage:attachment isOutgoing:self.isOutgoing]; [voiceMessageView setDuration:(int)self.viewItem.audioDurationSeconds]; [voiceMessageView updateForProgress:self.viewItem.audioProgressSeconds / self.viewItem.audioDurationSeconds]; @@ -1065,7 +1065,7 @@ NS_ASSUME_NONNULL_BEGIN return nil; } case OWSMessageCellType_Audio: - result = CGSizeMake(maxMessageWidth, LKVoiceMessageView2.contentHeight); + result = CGSizeMake(maxMessageWidth, LKVoiceMessageView.contentHeight); break; case OWSMessageCellType_GenericAttachment: { TSAttachment *attachment = (self.viewItem.attachmentStream ?: self.viewItem.attachmentPointer); diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h index 3159ed880..984210640 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h @@ -24,7 +24,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType); @class ContactShareViewModel; @class ConversationViewCell; @class DisplayableText; -@class LKVoiceMessageView2; +@class LKVoiceMessageView; @class OWSLinkPreview; @class OWSQuotedReplyModel; @class OWSUnreadIndicator; @@ -99,7 +99,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType); #pragma mark - Audio Playback -@property (nonatomic, weak) LKVoiceMessageView2 *lastAudioMessageView; +@property (nonatomic, weak) LKVoiceMessageView *lastAudioMessageView; @property (nonatomic, readonly) CGFloat audioDurationSeconds; @property (nonatomic, readonly) CGFloat audioProgressSeconds;