Merge branch 'charlesmchen/linkPreviewsFixOmnibus3'

6 years ago · 67c32490ba
parent 94a377b4fe 6fa4e52a84
commit 67c32490ba
7 changed files with 4 additions and 1 deletions
--- a/Signal/Images.xcassets/introducing-link-previews-dark.imageset/ios-rick-roll-dark@1x.png
+++ b/Signal/Images.xcassets/introducing-link-previews-dark.imageset/ios-rick-roll-dark@1x.png
--- a/Signal/Images.xcassets/introducing-link-previews-dark.imageset/ios-rick-roll-dark@2x.png
+++ b/Signal/Images.xcassets/introducing-link-previews-dark.imageset/ios-rick-roll-dark@2x.png
--- a/Signal/Images.xcassets/introducing-link-previews-dark.imageset/ios-rick-roll-dark@3x.png
+++ b/Signal/Images.xcassets/introducing-link-previews-dark.imageset/ios-rick-roll-dark@3x.png
--- a/Signal/Images.xcassets/introducing-link-previews-light.imageset/ios-rick-roll-light@1x.png
+++ b/Signal/Images.xcassets/introducing-link-previews-light.imageset/ios-rick-roll-light@1x.png
--- a/Signal/Images.xcassets/introducing-link-previews-light.imageset/ios-rick-roll-light@2x.png
+++ b/Signal/Images.xcassets/introducing-link-previews-light.imageset/ios-rick-roll-light@2x.png
--- a/Signal/Images.xcassets/introducing-link-previews-light.imageset/ios-rick-roll-light@3x.png
+++ b/Signal/Images.xcassets/introducing-link-previews-light.imageset/ios-rick-roll-light@3x.png
--- a/Signal/src/views/LinkPreviewView.swift
+++ b/Signal/src/views/LinkPreviewView.swift
@ -710,7 +710,10 @@ public class LinkPreviewView: UIStackView {

        self.layoutConstraints.append(self.autoSetDimension(.height, toSize: draftHeight + draftMarginTop))

-        let activityIndicator = UIActivityIndicatorView(activityIndicatorStyle: .gray)
+        let activityIndicatorStyle: UIActivityIndicatorView.Style = (Theme.isDarkThemeEnabled
+            ? .white
+            : .gray)
+        let activityIndicator = UIActivityIndicatorView(activityIndicatorStyle: activityIndicatorStyle)
        activityIndicator.startAnimating()
        addArrangedSubview(activityIndicator)
        let activityIndicatorSize: CGFloat = 25