keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Respond to CR.

Browse Source
pull/1/head
Matthew Chen 8 years ago
parent a5c7bdb987
commit 6831412e44
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

4
Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleStrokeView.m
Unescape Escape View File

@ -87,7 +87,7 @@ NS_ASSUME_NONNULL_BEGIN
// Prevent the shape layer from animating changes. // Prevent the shape layer from animating changes.
[CATransaction begin]; [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. // Don't fill the shape layer; we just want a stroke around the border.
self.shapeLayer.fillColor = [UIColor clearColor].CGColor; self.shapeLayer.fillColor = [UIColor clearColor].CGColor;
@ -114,7 +114,7 @@ NS_ASSUME_NONNULL_BEGIN
// Prevent the shape layer from animating changes. // Prevent the shape layer from animating changes.
[CATransaction begin]; [CATransaction begin];
[CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; [CATransaction setDisableActions:YES];
self.shapeLayer.strokeColor = self.strokeColor.CGColor; self.shapeLayer.strokeColor = self.strokeColor.CGColor;
self.shapeLayer.lineWidth = self.strokeThickness; self.shapeLayer.lineWidth = self.strokeThickness;

4
Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.m
Unescape Escape View File

@ -133,7 +133,7 @@ const CGFloat kBubbleTextVInset = 10.f;
// Prevent the shape layer from animating changes. // Prevent the shape layer from animating changes.
[CATransaction begin]; [CATransaction begin];
[CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; [CATransaction setDisableActions:YES];
self.shapeLayer.fillColor = bubbleColor.CGColor; self.shapeLayer.fillColor = bubbleColor.CGColor;
@ -153,7 +153,7 @@ const CGFloat kBubbleTextVInset = 10.f;
// Prevent the shape layer from animating changes. // Prevent the shape layer from animating changes.
[CATransaction begin]; [CATransaction begin];
[CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; [CATransaction setDisableActions:YES];
self.shapeLayer.fillColor = self.bubbleColor.CGColor; self.shapeLayer.fillColor = self.bubbleColor.CGColor;
self.shapeLayer.path = bezierPath.CGPath; self.shapeLayer.path = bezierPath.CGPath;

2
Signal/src/views/AudioProgressView.swift
Unescape Escape View File

@ -75,7 +75,7 @@ import SignalServiceKit
// Prevent the shape layer from animating changes. // Prevent the shape layer from animating changes.
CATransaction.begin() CATransaction.begin()
CATransaction.setValue(kCFBooleanTrue, forKey: kCATransactionDisableActions) CATransaction.setDisableActions(true)
let horizontalBarPath = UIBezierPath() let horizontalBarPath = UIBezierPath()
let horizontalBarHeightFraction = CGFloat(0.25) let horizontalBarHeightFraction = CGFloat(0.25)

2
Signal/src/views/OWSBezierPathView.m
Unescape Escape View File

@ -86,7 +86,7 @@ NS_ASSUME_NONNULL_BEGIN
// Prevent the shape layer from animating changes. // Prevent the shape layer from animating changes.
[CATransaction begin]; [CATransaction begin];
[CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; [CATransaction setDisableActions:YES];
for (ConfigureShapeLayerBlock configureShapeLayerBlock in self.configureShapeLayerBlocks) { for (ConfigureShapeLayerBlock configureShapeLayerBlock in self.configureShapeLayerBlocks) {
CAShapeLayer *shapeLayer = [CAShapeLayer new]; CAShapeLayer *shapeLayer = [CAShapeLayer new];

4
Signal/src/views/OWSProgressView.m
Unescape Escape View File

@ -45,7 +45,7 @@ NS_ASSUME_NONNULL_BEGIN
// Prevent the shape layer from animating changes. // Prevent the shape layer from animating changes.
[CATransaction begin]; [CATransaction begin];
[CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; [CATransaction setDisableActions:YES];
self.borderLayer = [CAShapeLayer new]; self.borderLayer = [CAShapeLayer new];
self.borderLayer.fillColor = self.color.CGColor; self.borderLayer.fillColor = self.color.CGColor;
@ -87,7 +87,7 @@ NS_ASSUME_NONNULL_BEGIN
{ {
// Prevent the shape layer from animating changes. // Prevent the shape layer from animating changes.
[CATransaction begin]; [CATransaction begin];
[CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; [CATransaction setDisableActions:YES];
CGFloat kBorderThickness = self.bounds.size.height * 0.1f; CGFloat kBorderThickness = self.bounds.size.height * 0.1f;
CGFloat kOuterRadius = self.bounds.size.height * 0.25f; CGFloat kOuterRadius = self.bounds.size.height * 0.25f;

Write Preview
Loading…
Cancel
Save