From f8a5a414151b71189ba340983a51f5beafb52ed5 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 1 Nov 2018 14:02:45 -0400 Subject: [PATCH] Apply dark theme to typing indicator. --- Signal/src/views/TypingIndicatorView.swift | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Signal/src/views/TypingIndicatorView.swift b/Signal/src/views/TypingIndicatorView.swift index 2f14ac43d..58e68683b 100644 --- a/Signal/src/views/TypingIndicatorView.swift +++ b/Signal/src/views/TypingIndicatorView.swift @@ -98,6 +98,9 @@ fileprivate func startAnimation() { stopAnimation() + let baseColor = (Theme.isDarkThemeEnabled + ? UIColor(rgbHex: 0xBBBDBE) + : UIColor(rgbHex: 0x636467)) let timeIncrement: CFTimeInterval = 0.15 var colorValues = [CGColor]() var pathValues = [CGPath]() @@ -105,7 +108,7 @@ var animationDuration: CFTimeInterval = 0 let addDotKeyFrame = { (keyFrameTime: CFTimeInterval, progress: CGFloat) in - let dotColor = UIColor(rgbHex: 0x636467).withAlphaComponent(CGFloatLerp(0.4, 1.0, progress)) + let dotColor = baseColor.withAlphaComponent(CGFloatLerp(0.4, 1.0, progress)) colorValues.append(dotColor.cgColor) let radius = CGFloatLerp(TypingIndicatorView.kMinRadiusPt, TypingIndicatorView.kMaxRadiusPt, progress) let margin = (TypingIndicatorView.kMaxRadiusPt - radius) * 0.5