From 6831412e44ea1c562de9b915190f101968a660e8 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 16 Apr 2018 12:14:09 -0400 Subject: [PATCH] Respond to CR. --- .../ConversationView/Cells/OWSBubbleStrokeView.m | 4 ++-- .../ViewControllers/ConversationView/Cells/OWSBubbleView.m | 4 ++-- Signal/src/views/AudioProgressView.swift | 2 +- Signal/src/views/OWSBezierPathView.m | 2 +- Signal/src/views/OWSProgressView.m | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleStrokeView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleStrokeView.m index dd310ad7d8..415de838b4 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleStrokeView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleStrokeView.m @@ -87,7 +87,7 @@ NS_ASSUME_NONNULL_BEGIN // Prevent the shape layer from animating changes. [CATransaction begin]; - [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; + [CATransaction setDisableActions:YES]; // Don't fill the shape layer; we just want a stroke around the border. self.shapeLayer.fillColor = [UIColor clearColor].CGColor; @@ -114,7 +114,7 @@ NS_ASSUME_NONNULL_BEGIN // Prevent the shape layer from animating changes. [CATransaction begin]; - [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; + [CATransaction setDisableActions:YES]; self.shapeLayer.strokeColor = self.strokeColor.CGColor; self.shapeLayer.lineWidth = self.strokeThickness; diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.m index e1dd5ada20..b14f604a30 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.m @@ -133,7 +133,7 @@ const CGFloat kBubbleTextVInset = 10.f; // Prevent the shape layer from animating changes. [CATransaction begin]; - [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; + [CATransaction setDisableActions:YES]; self.shapeLayer.fillColor = bubbleColor.CGColor; @@ -153,7 +153,7 @@ const CGFloat kBubbleTextVInset = 10.f; // Prevent the shape layer from animating changes. [CATransaction begin]; - [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; + [CATransaction setDisableActions:YES]; self.shapeLayer.fillColor = self.bubbleColor.CGColor; self.shapeLayer.path = bezierPath.CGPath; diff --git a/Signal/src/views/AudioProgressView.swift b/Signal/src/views/AudioProgressView.swift index 4bda2204f4..d897e5e984 100644 --- a/Signal/src/views/AudioProgressView.swift +++ b/Signal/src/views/AudioProgressView.swift @@ -75,7 +75,7 @@ import SignalServiceKit // Prevent the shape layer from animating changes. CATransaction.begin() - CATransaction.setValue(kCFBooleanTrue, forKey: kCATransactionDisableActions) + CATransaction.setDisableActions(true) let horizontalBarPath = UIBezierPath() let horizontalBarHeightFraction = CGFloat(0.25) diff --git a/Signal/src/views/OWSBezierPathView.m b/Signal/src/views/OWSBezierPathView.m index 645632ad71..119842eb77 100644 --- a/Signal/src/views/OWSBezierPathView.m +++ b/Signal/src/views/OWSBezierPathView.m @@ -86,7 +86,7 @@ NS_ASSUME_NONNULL_BEGIN // Prevent the shape layer from animating changes. [CATransaction begin]; - [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; + [CATransaction setDisableActions:YES]; for (ConfigureShapeLayerBlock configureShapeLayerBlock in self.configureShapeLayerBlocks) { CAShapeLayer *shapeLayer = [CAShapeLayer new]; diff --git a/Signal/src/views/OWSProgressView.m b/Signal/src/views/OWSProgressView.m index 84a4b91907..f643856074 100644 --- a/Signal/src/views/OWSProgressView.m +++ b/Signal/src/views/OWSProgressView.m @@ -45,7 +45,7 @@ NS_ASSUME_NONNULL_BEGIN // Prevent the shape layer from animating changes. [CATransaction begin]; - [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; + [CATransaction setDisableActions:YES]; self.borderLayer = [CAShapeLayer new]; self.borderLayer.fillColor = self.color.CGColor; @@ -87,7 +87,7 @@ NS_ASSUME_NONNULL_BEGIN { // Prevent the shape layer from animating changes. [CATransaction begin]; - [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; + [CATransaction setDisableActions:YES]; CGFloat kBorderThickness = self.bounds.size.height * 0.1f; CGFloat kOuterRadius = self.bounds.size.height * 0.25f;