From d16bffe6c1e8f64bb62ee017efaccbed2bffddf3 Mon Sep 17 00:00:00 2001 From: Fredrik Lillejordet Date: Sun, 4 Mar 2018 12:05:03 +0100 Subject: [PATCH] forget target reference to new class in PR --- Signal.xcodeproj/project.pbxproj | 3 +++ Signal/src/ViewControllers/InboxTableViewCell.m | 2 +- Signal/src/ViewControllers/Utils/NeverClearView.swift | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index ab96147ca..6fd23ad3a 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -223,6 +223,7 @@ 34E3EF101EFC2684007F6822 /* DebugUIPage.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E3EF0F1EFC2684007F6822 /* DebugUIPage.m */; }; 34F308A21ECB469700BB7697 /* OWSBezierPathView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F308A11ECB469700BB7697 /* OWSBezierPathView.m */; }; 34FD93701E3BD43A00109093 /* OWSAnyTouchGestureRecognizer.m in Sources */ = {isa = PBXBuildFile; fileRef = 34FD936F1E3BD43A00109093 /* OWSAnyTouchGestureRecognizer.m */; }; + 35BF1A53204BF9B300AF5900 /* NeverClearView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35BF1A52204BF9B300AF5900 /* NeverClearView.swift */; }; 4503F1BE20470A5B00CEE724 /* classic-quiet.aifc in Resources */ = {isa = PBXBuildFile; fileRef = 4503F1BB20470A5B00CEE724 /* classic-quiet.aifc */; }; 4503F1BF20470A5B00CEE724 /* classic.aifc in Resources */ = {isa = PBXBuildFile; fileRef = 4503F1BC20470A5B00CEE724 /* classic.aifc */; }; 4503F1C3204711D300CEE724 /* OWS107LegacySounds.m in Sources */ = {isa = PBXBuildFile; fileRef = 4503F1C1204711D200CEE724 /* OWS107LegacySounds.m */; }; @@ -860,6 +861,7 @@ 34F308A11ECB469700BB7697 /* OWSBezierPathView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSBezierPathView.m; sourceTree = ""; }; 34FD936E1E3BD43A00109093 /* OWSAnyTouchGestureRecognizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OWSAnyTouchGestureRecognizer.h; path = views/OWSAnyTouchGestureRecognizer.h; sourceTree = ""; }; 34FD936F1E3BD43A00109093 /* OWSAnyTouchGestureRecognizer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSAnyTouchGestureRecognizer.m; path = views/OWSAnyTouchGestureRecognizer.m; sourceTree = ""; }; + 35BF1A52204BF9B300AF5900 /* NeverClearView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NeverClearView.swift; sourceTree = ""; }; 435EAC2E5E22D3F087EB3192 /* Pods-SignalShareExtension.app store release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SignalShareExtension.app store release.xcconfig"; path = "Pods/Target Support Files/Pods-SignalShareExtension/Pods-SignalShareExtension.app store release.xcconfig"; sourceTree = ""; }; 4503F1BB20470A5B00CEE724 /* classic-quiet.aifc */ = {isa = PBXFileReference; lastKnownFileType = file; path = "classic-quiet.aifc"; sourceTree = ""; }; 4503F1BC20470A5B00CEE724 /* classic.aifc */ = {isa = PBXFileReference; lastKnownFileType = file; path = classic.aifc; sourceTree = ""; }; @@ -1693,6 +1695,7 @@ 34D1F0BE1F8EC1760066283D /* Utils */ = { isa = PBXGroup; children = ( + 35BF1A52204BF9B300AF5900 /* NeverClearView.swift */, 34D1F0BF1F8EC1760066283D /* MessageRecipientStatusUtils.swift */, ); path = Utils; diff --git a/Signal/src/ViewControllers/InboxTableViewCell.m b/Signal/src/ViewControllers/InboxTableViewCell.m index 10897872d..5b69b95c4 100644 --- a/Signal/src/ViewControllers/InboxTableViewCell.m +++ b/Signal/src/ViewControllers/InboxTableViewCell.m @@ -106,7 +106,7 @@ const NSUInteger kAvatarViewDiameter = 52; [self.timeLabel setCompressionResistanceHigh]; const int kunreadBadgeSize = 24; - self.unreadBadge = [[NeverClearUIView alloc] initWithFrame:CGRectMake(0, 0, kunreadBadgeSize, kunreadBadgeSize)]; + self.unreadBadge = [[NeverClearView alloc] initWithFrame:CGRectMake(0, 0, kunreadBadgeSize, kunreadBadgeSize)]; self.unreadBadge.layer.cornerRadius = kunreadBadgeSize / 2; self.unreadBadge.backgroundColor = [UIColor ows_materialBlueColor]; [self.contentView addSubview:self.unreadBadge]; diff --git a/Signal/src/ViewControllers/Utils/NeverClearView.swift b/Signal/src/ViewControllers/Utils/NeverClearView.swift index 30e42510c..912f7dda5 100644 --- a/Signal/src/ViewControllers/Utils/NeverClearView.swift +++ b/Signal/src/ViewControllers/Utils/NeverClearView.swift @@ -1,7 +1,7 @@ // Created by Fredrik Lillejordet on 04.03.2018. // Copyright © 2018 Open Whisper Systems. All rights reserved. -@objc class NeverClearUIView: UIView { +@objc class NeverClearView: UIView { override var backgroundColor: UIColor? { didSet { if backgroundColor != nil && backgroundColor!.cgColor.alpha == 0 {