From ebff1f7ff3a57ae35d3910946b4eb6a6bf3b03ec Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Mon, 2 Aug 2021 15:43:50 +1000 Subject: [PATCH] Resolve more errors --- Session/Calls/UserInterface/CallHeader.swift | 6 +++--- .../Group/GroupCallNotificationView.swift | 4 ++-- Session/Conversations/ConversationVC.swift | 1 - Session/Meta/Dependencies+MainApp.swift | 16 ++++++++++++++++ SessionMessagingKit/Utilities/Environment.h | 2 +- SessionMessagingKit/Utilities/Environment.m | 4 ++-- SessionMessagingKit/Utilities/OWSAudioPlayer.m | 2 +- .../Utilities/OWSAudioSession.swift | 2 +- .../Media Viewing & Editing/OWSVideoPlayer.swift | 2 +- 9 files changed, 27 insertions(+), 12 deletions(-) diff --git a/Session/Calls/UserInterface/CallHeader.swift b/Session/Calls/UserInterface/CallHeader.swift index 536a3a3f4..09c9a1d59 100644 --- a/Session/Calls/UserInterface/CallHeader.swift +++ b/Session/Calls/UserInterface/CallHeader.swift @@ -235,7 +235,7 @@ class CallHeader: UIView { "GROUP_CALL_MANY_PEOPLE_HERE_FORMAT", comment: "Text explaining that there are more than three people in the group call. Embeds {{ %1$@ participant1, %2$@ participant2, %3$@ participantCount-2 }}" ) - callTitleText = String(format: formatString, memberNames[0], memberNames[1], OWSFormat.formatInt(memberNames.count - 2)) + callTitleText = String(format: formatString, memberNames[0], memberNames[1], OWSFormat.formatInt(Int32(memberNames.count) - 2)) } } } @@ -311,10 +311,10 @@ private class GroupMembersButton: UIButton { autoSetDimension(.height, toSize: 40) iconImageView.contentMode = .scaleAspectFit - iconImageView.setTemplateImage(#imageLiteral(resourceName: "group-solid-24"), tintColor: .ows_white) + iconImageView.setTemplateImage(#imageLiteral(resourceName: "group-solid-24"), tintColor: .white) addSubview(iconImageView) iconImageView.autoPinEdge(toSuperviewEdge: .leading) - iconImageView.autoSetDimensions(to: CGSize(square: 22)) + iconImageView.autoSetDimensions(to: CGSize(width: 22, height: 22)) iconImageView.autoPinEdge(toSuperviewEdge: .top, withInset: 2) countLabel.font = .systemFont(ofSize: Values.mediumFontSize) diff --git a/Session/Calls/UserInterface/Group/GroupCallNotificationView.swift b/Session/Calls/UserInterface/Group/GroupCallNotificationView.swift index f89a3a789..510057380 100644 --- a/Session/Calls/UserInterface/Group/GroupCallNotificationView.swift +++ b/Session/Calls/UserInterface/Group/GroupCallNotificationView.swift @@ -164,12 +164,12 @@ private class BannerView: UIView { clipsToBounds = true if UIAccessibility.isReduceTransparencyEnabled { - backgroundColor = .ows_blackAlpha80 + backgroundColor = .black.withAlphaComponent(0.8) } else { let blurEffectView = UIVisualEffectView(effect: UIBlurEffect(style: .dark)) addSubview(blurEffectView) blurEffectView.autoPinEdgesToSuperviewEdges() - backgroundColor = .ows_blackAlpha40 + backgroundColor = .black.withAlphaComponent(0.4) } let displayNames = databaseStorage.read { transaction in diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift index 439394502..7c9019d65 100644 --- a/Session/Conversations/ConversationVC.swift +++ b/Session/Conversations/ConversationVC.swift @@ -30,7 +30,6 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat var scrollDistanceToBottomBeforeUpdate: CGFloat? var baselineKeyboardHeight: CGFloat = 0 - var audioSession: OWSAudioSession { Environment.shared.audioSession } var dbConnection: YapDatabaseConnection { OWSPrimaryStorage.shared().uiDatabaseConnection } var viewItems: [ConversationViewItem] { viewModel.viewState.viewItems } override var canBecomeFirstResponder: Bool { true } diff --git a/Session/Meta/Dependencies+MainApp.swift b/Session/Meta/Dependencies+MainApp.swift index ee5e28011..e757765ff 100644 --- a/Session/Meta/Dependencies+MainApp.swift +++ b/Session/Meta/Dependencies+MainApp.swift @@ -9,6 +9,14 @@ import Foundation @objc public extension NSObject { + final var audioSession: OWSAudioSession { + Environment.shared.audioSessionRef + } + + static var audioSession: OWSAudioSession { + Environment.shared.audioSessionRef + } + final var individualCallUIAdapter: CallUIAdapter { AppEnvironment.shared.callServiceRef.individualCallService.callUIAdapter } @@ -37,6 +45,14 @@ public extension NSObject { public protocol Dependencies { } public extension Dependencies { + + var audioSession: OWSAudioSession { + Environment.shared.audioSessionRef + } + + static var audioSession: OWSAudioSession { + Environment.shared.audioSessionRef + } var individualCallUIAdapter: CallUIAdapter { AppEnvironment.shared.callServiceRef.individualCallService.callUIAdapter diff --git a/SessionMessagingKit/Utilities/Environment.h b/SessionMessagingKit/Utilities/Environment.h index edbd77376..48a7731fa 100644 --- a/SessionMessagingKit/Utilities/Environment.h +++ b/SessionMessagingKit/Utilities/Environment.h @@ -24,7 +24,7 @@ sounds:(OWSSounds *)sounds windowManager:(OWSWindowManager *)windowManager; -@property (nonatomic, readonly) OWSAudioSession *audioSession; +@property (nonatomic, readonly) OWSAudioSession *audioSessionRef; @property (nonatomic, readonly) id proximityMonitoringManager; @property (nonatomic, readonly) OWSPreferences *preferences; @property (nonatomic, readonly) OWSSounds *sounds; diff --git a/SessionMessagingKit/Utilities/Environment.m b/SessionMessagingKit/Utilities/Environment.m index 81a39ccf2..729964176 100644 --- a/SessionMessagingKit/Utilities/Environment.m +++ b/SessionMessagingKit/Utilities/Environment.m @@ -9,7 +9,7 @@ static Environment *sharedEnvironment = nil; @interface Environment () -@property (nonatomic) OWSAudioSession *audioSession; +@property (nonatomic) OWSAudioSession *audioSessionRef; @property (nonatomic) OWSPreferences *preferences; @property (nonatomic) id proximityMonitoringManager; @property (nonatomic) OWSSounds *sounds; @@ -53,7 +53,7 @@ static Environment *sharedEnvironment = nil; return self; } - _audioSession = audioSession; + _audioSessionRef = audioSession; _preferences = preferences; _proximityMonitoringManager = proximityMonitoringManager; _sounds = sounds; diff --git a/SessionMessagingKit/Utilities/OWSAudioPlayer.m b/SessionMessagingKit/Utilities/OWSAudioPlayer.m index d7b93e7c9..c8f62291a 100644 --- a/SessionMessagingKit/Utilities/OWSAudioPlayer.m +++ b/SessionMessagingKit/Utilities/OWSAudioPlayer.m @@ -95,7 +95,7 @@ NS_ASSUME_NONNULL_BEGIN - (OWSAudioSession *)audioSession { - return Environment.shared.audioSession; + return Environment.shared.audioSessionRef; } #pragma mark diff --git a/SessionMessagingKit/Utilities/OWSAudioSession.swift b/SessionMessagingKit/Utilities/OWSAudioSession.swift index 1f9653118..851d00f82 100644 --- a/SessionMessagingKit/Utilities/OWSAudioSession.swift +++ b/SessionMessagingKit/Utilities/OWSAudioSession.swift @@ -24,7 +24,7 @@ public class AudioActivity: NSObject { // MARK: Dependencies var audioSession: OWSAudioSession { - return Environment.shared.audioSession + return Environment.shared.audioSessionRef } // MARK: diff --git a/SignalUtilitiesKit/Media Viewing & Editing/OWSVideoPlayer.swift b/SignalUtilitiesKit/Media Viewing & Editing/OWSVideoPlayer.swift index 3fa8828e6..9b5c6d11c 100644 --- a/SignalUtilitiesKit/Media Viewing & Editing/OWSVideoPlayer.swift +++ b/SignalUtilitiesKit/Media Viewing & Editing/OWSVideoPlayer.swift @@ -35,7 +35,7 @@ public class OWSVideoPlayer: NSObject { // MARK: Dependencies var audioSession: OWSAudioSession { - return Environment.shared.audioSession + return Environment.shared.audioSessionRef } // MARK: Playback Controls