From 9872111cf66cfb299ecf97432c2a838baaf1656c Mon Sep 17 00:00:00 2001 From: Nora Trapp Date: Thu, 11 Aug 2022 13:11:17 -0700 Subject: [PATCH] PR Feedback --- .../ConversationView/CV/CVComponents/CVComponentSticker.swift | 2 -- .../ConversationView/Cells/CVAttachmentProgressView.swift | 2 +- .../ViewControllers/ConversationView/Cells/CVMediaView.swift | 1 - .../Stories/Context View/StoryContextViewController.swift | 2 -- 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentSticker.swift b/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentSticker.swift index 15f2d87e82..8f0f4061c4 100644 --- a/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentSticker.swift +++ b/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentSticker.swift @@ -73,7 +73,6 @@ public class CVComponentSticker: CVComponentBase, CVComponent { break case .uploading: let progressView = CVAttachmentProgressView(direction: .upload(attachmentStream: attachmentStream), - diameter: 44, isDarkThemeEnabled: conversationStyle.isDarkThemeEnabled, mediaCache: mediaCache) stackView.addSubview(progressView) @@ -100,7 +99,6 @@ public class CVComponentSticker: CVComponentBase, CVComponent { subviews: [ placeholderView ]) let progressView = CVAttachmentProgressView(direction: .download(attachmentPointer: attachmentPointer), - diameter: 44, isDarkThemeEnabled: conversationStyle.isDarkThemeEnabled, mediaCache: mediaCache) stackView.addSubview(progressView) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/CVAttachmentProgressView.swift b/Signal/src/ViewControllers/ConversationView/Cells/CVAttachmentProgressView.swift index d834e7114c..02958477c5 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/CVAttachmentProgressView.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/CVAttachmentProgressView.swift @@ -31,7 +31,7 @@ public class CVAttachmentProgressView: ManualLayoutView { private var attachmentId: String { direction.attachmentId } public required init(direction: Direction, - diameter: CGFloat, + diameter: CGFloat = 44, isDarkThemeEnabled: Bool, mediaCache: CVMediaCache) { self.direction = direction diff --git a/Signal/src/ViewControllers/ConversationView/Cells/CVMediaView.swift b/Signal/src/ViewControllers/ConversationView/Cells/CVMediaView.swift index 3aa87e5320..cb6ad19654 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/CVMediaView.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/CVMediaView.swift @@ -112,7 +112,6 @@ public class CVMediaView: ManualLayoutViewWithLayer { } let progressView = CVAttachmentProgressView(direction: direction, - diameter: 44, isDarkThemeEnabled: conversationStyle.isDarkThemeEnabled, mediaCache: mediaCache) addSubviewToCenterOnSuperview(progressView, size: progressView.layoutSize) diff --git a/Signal/src/ViewControllers/HomeView/Stories/Context View/StoryContextViewController.swift b/Signal/src/ViewControllers/HomeView/Stories/Context View/StoryContextViewController.swift index d98a470b13..53701d0d11 100644 --- a/Signal/src/ViewControllers/HomeView/Stories/Context View/StoryContextViewController.swift +++ b/Signal/src/ViewControllers/HomeView/Stories/Context View/StoryContextViewController.swift @@ -420,8 +420,6 @@ class StoryContextViewController: OWSViewController { } } - if subsequentItems.count >= Self.subsequentItemsToLoad { break } - context = nextContext }