From baa312f449ce16df53e08bf6ecb0f0f95e40da3e Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 20 Jan 2018 11:27:32 -0500 Subject: [PATCH] Timer button with duration label // FREEBIE --- Signal.xcodeproj/project.pbxproj | 4 + .../xcshareddata/xcschemes/Signal.xcscheme | 2 +- .../button_timer_white.imageset/Contents.json | 23 --- .../ic_timer_white.png | Bin 354 -> 0 bytes .../ic_timer_white@2x.png | Bin 631 -> 0 bytes .../ic_timer_white@3x.png | Bin 809 -> 0 bytes .../Contents.json | 6 +- .../ic_timer.imageset/ic_timer.png | Bin 0 -> 778 bytes .../ic_timer.imageset/ic_timer@2x.png | Bin 0 -> 1524 bytes .../ic_timer.imageset/ic_timer@3x.png | Bin 0 -> 2476 bytes .../Contents.json | 23 --- .../ic_timer_white.png | Bin 354 -> 0 bytes .../ic_timer_white@2x.png | Bin 631 -> 0 bytes .../ic_timer_white@3x.png | Bin 809 -> 0 bytes .../table_ic_timer.png | Bin 518 -> 0 bytes .../table_ic_timer@2x.png | Bin 844 -> 0 bytes .../table_ic_timer@3x.png | Bin 1064 -> 0 bytes .../table_ic_timer.imageset/Contents.json | 26 ---- .../table_ic_timer.png | Bin 518 -> 0 bytes .../table_ic_timer@2x.png | Bin 844 -> 0 bytes .../table_ic_timer@3x.png | Bin 1064 -> 0 bytes .../Cells/OWSSystemMessageCell.m | 4 +- .../ConversationViewController.m | 49 +++---- .../OWSConversationSettingsViewController.m | 12 +- .../translations/en.lproj/Localizable.strings | 15 ++ .../DisappearingTimerConfigurationView.swift | 134 ++++++++++++++++++ SignalMessaging/categories/UIColor+OWS.h | 3 +- SignalMessaging/categories/UIColor+OWS.m | 7 +- .../contacts/SelectThreadViewController.m | 19 ++- .../OWSDisappearingMessagesConfiguration.h | 7 +- .../OWSDisappearingMessagesConfiguration.m | 106 ++++++++++---- ...sappearingConfigurationUpdateInfoMessage.m | 9 +- 32 files changed, 288 insertions(+), 161 deletions(-) delete mode 100644 Signal/Images.xcassets/button_timer_white.imageset/Contents.json delete mode 100644 Signal/Images.xcassets/button_timer_white.imageset/ic_timer_white.png delete mode 100644 Signal/Images.xcassets/button_timer_white.imageset/ic_timer_white@2x.png delete mode 100644 Signal/Images.xcassets/button_timer_white.imageset/ic_timer_white@3x.png rename Signal/Images.xcassets/{table_ic_hourglass.imageset => ic_timer.imageset}/Contents.json (72%) create mode 100644 Signal/Images.xcassets/ic_timer.imageset/ic_timer.png create mode 100644 Signal/Images.xcassets/ic_timer.imageset/ic_timer@2x.png create mode 100644 Signal/Images.xcassets/ic_timer.imageset/ic_timer@3x.png delete mode 100644 Signal/Images.xcassets/system_message_timer.imageset/Contents.json delete mode 100644 Signal/Images.xcassets/system_message_timer.imageset/ic_timer_white.png delete mode 100644 Signal/Images.xcassets/system_message_timer.imageset/ic_timer_white@2x.png delete mode 100644 Signal/Images.xcassets/system_message_timer.imageset/ic_timer_white@3x.png delete mode 100644 Signal/Images.xcassets/table_ic_hourglass.imageset/table_ic_timer.png delete mode 100644 Signal/Images.xcassets/table_ic_hourglass.imageset/table_ic_timer@2x.png delete mode 100644 Signal/Images.xcassets/table_ic_hourglass.imageset/table_ic_timer@3x.png delete mode 100644 Signal/Images.xcassets/table_ic_timer.imageset/Contents.json delete mode 100644 Signal/Images.xcassets/table_ic_timer.imageset/table_ic_timer.png delete mode 100644 Signal/Images.xcassets/table_ic_timer.imageset/table_ic_timer@2x.png delete mode 100644 Signal/Images.xcassets/table_ic_timer.imageset/table_ic_timer@3x.png create mode 100644 SignalMessaging/Views/DisappearingTimerConfigurationView.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 0d2797499..5e37de0b7 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -292,6 +292,7 @@ 45BB93381E688E14001E3939 /* UIDevice+featureSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45BB93371E688E14001E3939 /* UIDevice+featureSupport.swift */; }; 45BC829D1FD9C4B400011CF3 /* ShareViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45BC829C1FD9C4B400011CF3 /* ShareViewDelegate.swift */; }; 45BD60821DE9547E00A8F436 /* Contacts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 45BD60811DE9547E00A8F436 /* Contacts.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; + 45BE4EA22012AD2000935E59 /* DisappearingTimerConfigurationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45BE4EA12012AD2000935E59 /* DisappearingTimerConfigurationView.swift */; }; 45C0DC1B1E68FE9000E04C47 /* UIApplication+OWS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45C0DC1A1E68FE9000E04C47 /* UIApplication+OWS.swift */; }; 45C0DC1E1E69011F00E04C47 /* UIStoryboard+OWS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45C0DC1D1E69011F00E04C47 /* UIStoryboard+OWS.swift */; }; 45C9DEB81DF4E35A0065CA84 /* WebRTCCallMessageHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45C9DEB71DF4E35A0065CA84 /* WebRTCCallMessageHandler.swift */; }; @@ -831,6 +832,7 @@ 45BB93371E688E14001E3939 /* UIDevice+featureSupport.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIDevice+featureSupport.swift"; sourceTree = ""; }; 45BC829C1FD9C4B400011CF3 /* ShareViewDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareViewDelegate.swift; sourceTree = ""; }; 45BD60811DE9547E00A8F436 /* Contacts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Contacts.framework; path = System/Library/Frameworks/Contacts.framework; sourceTree = SDKROOT; }; + 45BE4EA12012AD2000935E59 /* DisappearingTimerConfigurationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisappearingTimerConfigurationView.swift; sourceTree = ""; }; 45C0DC1A1E68FE9000E04C47 /* UIApplication+OWS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIApplication+OWS.swift"; sourceTree = ""; }; 45C0DC1D1E69011F00E04C47 /* UIStoryboard+OWS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIStoryboard+OWS.swift"; sourceTree = ""; }; 45C9DEB71DF4E35A0065CA84 /* WebRTCCallMessageHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebRTCCallMessageHandler.swift; sourceTree = ""; }; @@ -1255,6 +1257,7 @@ 340CB2221EAC155C0001CAA1 /* ContactsViewHelper.h */, 340CB2231EAC155C0001CAA1 /* ContactsViewHelper.m */, 346129D11FD2085A00532771 /* CommonStrings.swift */, + 45BE4EA12012AD2000935E59 /* DisappearingTimerConfigurationView.swift */, 346129CF1FD207F200532771 /* OWSAlerts.swift */, 454A965E1FD60EA2008D2A0E /* OWSFlatButton.swift */, 3400C7971EAFB772008A8584 /* ThreadViewHelper.h */, @@ -2752,6 +2755,7 @@ buildActionMask = 2147483647; files = ( 45194F951FD7216600333B2C /* TSUnreadIndicatorInteraction.m in Sources */, + 45BE4EA22012AD2000935E59 /* DisappearingTimerConfigurationView.swift in Sources */, 346129F71FD5F31400532771 /* OWS105AttachmentFilePaths.m in Sources */, 45194F931FD7215C00333B2C /* OWSContactOffersInteraction.m in Sources */, 450998681FD8C0FF00D89EB3 /* AttachmentSharing.m in Sources */, diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme index fdcb74c83..526b04e7a 100644 --- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme +++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme @@ -28,7 +28,7 @@ buildForAnalyzing = "YES"> diff --git a/Signal/Images.xcassets/button_timer_white.imageset/Contents.json b/Signal/Images.xcassets/button_timer_white.imageset/Contents.json deleted file mode 100644 index 72e4dc33d..000000000 --- a/Signal/Images.xcassets/button_timer_white.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "ic_timer_white.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "ic_timer_white@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "ic_timer_white@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Signal/Images.xcassets/button_timer_white.imageset/ic_timer_white.png b/Signal/Images.xcassets/button_timer_white.imageset/ic_timer_white.png deleted file mode 100644 index dccf011eecaa47cd0a92ea445fea522d4d3303f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 354 zcmV-o0iFJdP){{&3C@HiAH`{T;gI_iEri z8rLr14H3^_k}x9a5mNDfngUr!!!I3Ra}EptqDs1DBnF5ye5Y_Qs~%E~MS|Ssj9ApJ zAF(6q(AnCa*h`97mE;t?2|20~sYp&=I*6CVPcXv377j*+RKO^`!C#w4%#v(1e0v;T_R*xKmrzPgTguluNbfkZgJxAZ4fsI=Tn2|VsWW(} zZ@qyj`_V1Prw$m~YwF3xbx^+Up#FEr=SZ$m>QVM2e|b)%en$<&eW}s98}8_0_Q}3+~qvHQjdixQycVsHZY6=t6}Ui!FlRp zU~tMfrbryE`gmL5+2wSFLq6u4w-q74H|6ufVa2aKffojb@w2a*+Dwpgsj1e=)q!e7 zLfFD~!x>w2C*|`t;Q((9eS68meVV532O2g+n$9D_azeXJ?6+@YKqG7$eHOt%9UFQC zw$2icMDH^iIBR{XnKMBP)Ol&)qa@aZGpx%+igehFY@u>z>WE|F65Hs2I=nc!B?*`s zP5WA%O<}k*H36Va%AL~$URz$d_Erv9 zf@zux@lkp{rqA>I_R^#Uh}Gn;6?H$~*eMtUgJ2N6YOq+zxyGG~Y?O;E)n}pksdRx} zw2N|y)5}wqgBR_HkWlR*NtKL8qSYw@s6-nke93241_<3hxYz*7yUtLmmG9C(n4-cE zFK(vrYBUg>VdMw^WY9Z`=DIODYrc1V&dm^br9MT#?a7lR2Un24tM5(P;$k&|n^hrP zp#TQNJ!J3}DEpKlbN~w|BL(6rRA98_22I4E+=hZs$DR$9rw3K?$P8vIJic02oIq2&O~W9TL=b#&dQ-4}A^RFsP&|76{Waex!&EsMN7Q0IU@h zE1+kVTV0wg(${nJLzTZi==xD%g3!(SA)(_BU0>GJZZQ(XoYwQ1<6QTEScEQ3PVors z-HQ)CMg6JK`;2bQUMe5{0`1Fad{1^m-U=Sv~dn7M~=MDAY$#Qq~ zOsEP<5Ld(6JbRxZAbt}}Z0R@#C)fCK+<(N>%5e-%AbQfx46fFs$)C?=CX{?PhtO5y z?08NQLtDqb&!Sx!PK%2Ktf4SiZH4`^5$oWV0K|^s%tZIHCT5ASpqEW(K9Z9oWZ3i}+Jbqs_6hUBaOu&Q9zWp~k51tcJ)+OTyq2j5`UYm%)Rb9Rdv n;EyXQ6riwJEEelQzXA*Z2R$EWlNXta00000NkvXXu0mjfdtzq8 diff --git a/Signal/Images.xcassets/table_ic_hourglass.imageset/Contents.json b/Signal/Images.xcassets/ic_timer.imageset/Contents.json similarity index 72% rename from Signal/Images.xcassets/table_ic_hourglass.imageset/Contents.json rename to Signal/Images.xcassets/ic_timer.imageset/Contents.json index a62333543..b78318659 100644 --- a/Signal/Images.xcassets/table_ic_hourglass.imageset/Contents.json +++ b/Signal/Images.xcassets/ic_timer.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "table_ic_timer.png", + "filename" : "ic_timer.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "table_ic_timer@2x.png", + "filename" : "ic_timer@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "table_ic_timer@3x.png", + "filename" : "ic_timer@3x.png", "scale" : "3x" } ], diff --git a/Signal/Images.xcassets/ic_timer.imageset/ic_timer.png b/Signal/Images.xcassets/ic_timer.imageset/ic_timer.png new file mode 100644 index 0000000000000000000000000000000000000000..8b93f68735c86f9dacd17265a730e1448c9a71fe GIT binary patch literal 778 zcmV+l1NHogP)$dq+yd{tUZ~B==vH|mKR?sOQtGLF2&WJ*IOW<9e?SQ4rh-d?3)jzPiNh)@9?)9$5 zH+9=AZIhzTz&xA102TIC-^=p~Xw|cfe`n;`Fn57@Q8dp5f_K29{D#gAf)1t}_!aQ# zdG$}-Ho5DCAOpm0w)B-h07cz4YcGkJcLfv%UIBbF9QTD|{|w zit|O?Hrpr-10bA*8lKW$zzg^c$kqSN5TEx!xHoDz%>W5?diAfSyhFxRbTPuU155RP zKUMo=booMz0acPlY0$E)A=PDo4r!Y7n$WVWH+D=x)23*Wh+tVp1AMXfp78J` zrO|*fZ`o@jrXI**hzEAwf@Qf}NN0%46ipJLWtp;7z->U~A-yKFtjhLci~-NCD}5}8 z3|(?+UA|y7K(6#&dYi0SIC|;3D~0ie(Ng_?l``-u5N>_zY8@`%Ghj`B7YZrxM}=?} zYWURrvchRV-8QX(U<#CD-qylZVo2Xb2P;Cm5?lJo-Hxub98{gj%9keox^28W9hyqy z^j&EIR71{$%&q7vf1qCt8gY+}tpi=hBWP!%dZUT0#ZTY~e`^sUm4~$EuFYqMBI!)s zU3)zixBkFU5)dj~80{lp;3uXXaz^gr6VpB5|12pV2@h|;Uzgb`2ZL?yK>z>%07*qo IM6N<$f-jtKM*si- literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/ic_timer.imageset/ic_timer@2x.png b/Signal/Images.xcassets/ic_timer.imageset/ic_timer@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..ba56ce864b85b15702dfd1f9ca2dc41445a214b0 GIT binary patch literal 1524 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 W>zh2DBD3umz|_#f;FZ2>?0*5_(2`LA literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/system_message_timer.imageset/Contents.json b/Signal/Images.xcassets/system_message_timer.imageset/Contents.json deleted file mode 100644 index 72e4dc33d..000000000 --- a/Signal/Images.xcassets/system_message_timer.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "ic_timer_white.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "ic_timer_white@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "ic_timer_white@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Signal/Images.xcassets/system_message_timer.imageset/ic_timer_white.png b/Signal/Images.xcassets/system_message_timer.imageset/ic_timer_white.png deleted file mode 100644 index dccf011eecaa47cd0a92ea445fea522d4d3303f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 354 zcmV-o0iFJdP){{&3C@HiAH`{T;gI_iEri z8rLr14H3^_k}x9a5mNDfngUr!!!I3Ra}EptqDs1DBnF5ye5Y_Qs~%E~MS|Ssj9ApJ zAF(6q(AnCa*h`97mE;t?2|20~sYp&=I*6CVPcXv377j*+RKO^`!C#w4%#v(1e0v;T_R*xKmrzPgTguluNbfkZgJxAZ4fsI=Tn2|VsWW(} zZ@qyj`_V1Prw$m~YwF3xbx^+Up#FEr=SZ$m>QVM2e|b)%en$<&eW}s98}8_0_Q}3+~qvHQjdixQycVsHZY6=t6}Ui!FlRp zU~tMfrbryE`gmL5+2wSFLq6u4w-q74H|6ufVa2aKffojb@w2a*+Dwpgsj1e=)q!e7 zLfFD~!x>w2C*|`t;Q((9eS68meVV532O2g+n$9D_azeXJ?6+@YKqG7$eHOt%9UFQC zw$2icMDH^iIBR{XnKMBP)Ol&)qa@aZGpx%+igehFY@u>z>WE|F65Hs2I=nc!B?*`s zP5WA%O<}k*H36Va%AL~$URz$d_Erv9 zf@zux@lkp{rqA>I_R^#Uh}Gn;6?H$~*eMtUgJ2N6YOq+zxyGG~Y?O;E)n}pksdRx} zw2N|y)5}wqgBR_HkWlR*NtKL8qSYw@s6-nke93241_<3hxYz*7yUtLmmG9C(n4-cE zFK(vrYBUg>VdMw^WY9Z`=DIODYrc1V&dm^br9MT#?a7lR2Un24tM5(P;$k&|n^hrP zp#TQNJ!J3}DEpKlbN~w|BL(6rRA98_22I4E+=hZs$DR$9rw3K?$P8vIJic02oIq2&O~W9TL=b#&dQ-4}A^RFsP&|76{Waex!&EsMN7Q0IU@h zE1+kVTV0wg(${nJLzTZi==xD%g3!(SA)(_BU0>GJZZQ(XoYwQ1<6QTEScEQ3PVors z-HQ)CMg6JK`;2bQUMe5{0`1Fad{1^m-U=Sv~dn7M~=MDAY$#Qq~ zOsEP<5Ld(6JbRxZAbt}}Z0R@#C)fCK+<(N>%5e-%AbQfx46fFs$)C?=CX{?PhtO5y z?08NQLtDqb&!Sx!PK%2Ktf4SiZH4`^5$oWV0K|^s%tZIHCT5ASpqEW(K9Z9oWZ3i}+Jbqs_6hUBaOu&Q9zWp~k51tcJ)+OTyq2j5`UYm%)Rb9Rdv n;EyXQ6riwJEEelQzXA*Z2R$EWlNXta00000NkvXXu0mjfdtzq8 diff --git a/Signal/Images.xcassets/table_ic_hourglass.imageset/table_ic_timer.png b/Signal/Images.xcassets/table_ic_hourglass.imageset/table_ic_timer.png deleted file mode 100644 index 8c66731fea65578a28b8343ef6aaae3b58b26d0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 518 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 i2m}IwK!6H=1sDKAdnR+cBmr#z0000 \(frame)") + } + } + + override public var bounds: CGRect { + didSet { + Logger.verbose("\(logTag) in \(#function): \(oldValue) -> \(bounds)") + } + } + + override public func layoutSubviews() { + let oldFrame = self.frame + super.layoutSubviews() + Logger.verbose("\(logTag) in \(#function). Frame: \(oldFrame) -> \(self.frame)") + } + + private let imageView: UIImageView + private let label: UILabel + private var pressGesture: UILongPressGestureRecognizer! + + public required init?(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + @objc + public init(durationSeconds: UInt32) { + self.imageView = UIImageView(image: #imageLiteral(resourceName: "ic_timer")) + imageView.contentMode = .scaleAspectFit + + self.label = UILabel() + label.text = OWSDisappearingMessagesConfiguration.string(forDurationSeconds: durationSeconds, useShortFormat: true) + label.font = UIFont.systemFont(ofSize: 10) + label.textColor = UIColor.white + label.textAlignment = .center + label.minimumScaleFactor = 0.5 + + super.init(frame: CGRect.zero) + + applyTintColor(self.tintColor) + + // Gesture, simulating button touch up inside + let gesture = UILongPressGestureRecognizer(target: self, action: #selector(pressHandler)) + gesture.minimumPressDuration = 0 + self.pressGesture = gesture + self.addGestureRecognizer(pressGesture) + + // disable gesture recognizer until a delegate is assigned + // this lets us use the UI as either an interactive button + // or as a non-interactive status indicator + pressGesture.isEnabled = false + + // Accessability + self.accessibilityLabel = NSLocalizedString("DISAPPEARING_MESSAGES_LABEL", comment: "Accessibility label for disappearing messages") + let hintFormatString = NSLocalizedString("DISAPPEARING_MESSAGES_HINT", comment: "Accessibility hint that contains current timeout information") + let durationString = OWSDisappearingMessagesConfiguration.string(forDurationSeconds: durationSeconds, useShortFormat: false) + self.accessibilityHint = String(format: hintFormatString, durationString) + + // Layout + self.addSubview(imageView) + self.addSubview(label) + + let kHorizontalPadding: CGFloat = 4 + let kVerticalPadding: CGFloat = 6 + imageView.autoPinEdgesToSuperviewEdges(with: UIEdgeInsets(top: kVerticalPadding, left: kHorizontalPadding, bottom: 0, right: kHorizontalPadding), excludingEdge: .bottom) + label.autoPinEdgesToSuperviewEdges(with: UIEdgeInsets(top: 0, left: kHorizontalPadding, bottom: kVerticalPadding, right: kHorizontalPadding), excludingEdge: .top) + label.autoPinEdge(.top, to: .bottom, of: imageView) + } + + @objc + func pressHandler(_ gestureRecognizer: UILongPressGestureRecognizer) { + Logger.verbose("\(self.logTag) in \(#function)") + + // handle touch down and touch up events separately + if gestureRecognizer.state == .began { + applyTintColor(UIColor.gray) + } else if gestureRecognizer.state == .ended { + applyTintColor(self.tintColor) + + let location = gestureRecognizer.location(in: self) + let isTouchUpInside = self.bounds.contains(location) + + if (isTouchUpInside) { + // Similar to a UIButton's touch-up-inside + self.delegate?.disappearingTimerConfigurationViewWasTapped(self) + } else { + // Similar to a UIButton's touch-up-outside + + // cancel gesture + gestureRecognizer.isEnabled = false + gestureRecognizer.isEnabled = true + } + } + } + + override public var tintColor: UIColor! { + didSet { + applyTintColor(tintColor) + } + } + + private func applyTintColor(_ color: UIColor) { + imageView.tintColor = color + label.textColor = color + } +} diff --git a/SignalMessaging/categories/UIColor+OWS.h b/SignalMessaging/categories/UIColor+OWS.h index ac5c5263a..de19f3b5d 100644 --- a/SignalMessaging/categories/UIColor+OWS.h +++ b/SignalMessaging/categories/UIColor+OWS.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // #import @@ -21,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN @property (class, readonly, nonatomic) UIColor *ows_greenColor; @property (class, readonly, nonatomic) UIColor *ows_redColor; @property (class, readonly, nonatomic) UIColor *ows_blackColor; +@property (class, readonly, nonatomic) UIColor *ows_blackIconColor; @property (class, readonly, nonatomic) UIColor *ows_errorMessageBorderColor; @property (class, readonly, nonatomic) UIColor *ows_infoMessageBorderColor; @property (class, readonly, nonatomic) UIColor *ows_inputToolbarBackgroundColor; diff --git a/SignalMessaging/categories/UIColor+OWS.m b/SignalMessaging/categories/UIColor+OWS.m index a6736c3e9..d48b14435 100644 --- a/SignalMessaging/categories/UIColor+OWS.m +++ b/SignalMessaging/categories/UIColor+OWS.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // #import "OWSMath.h" @@ -27,6 +27,11 @@ NS_ASSUME_NONNULL_BEGIN return [UIColor colorWithRed:8.f / 255.f green:10.f / 255.f blue:0. / 255.f alpha:1.f]; } ++ (UIColor *)ows_blackIconColor +{ + return [UIColor colorWithRGBHex:0x505050]; +} + + (UIColor *)ows_darkGrayColor { return [UIColor colorWithRed:81.f / 255.f green:81.f / 255.f blue:81.f / 255.f alpha:1.f]; diff --git a/SignalMessaging/contacts/SelectThreadViewController.m b/SignalMessaging/contacts/SelectThreadViewController.m index 22790a509..62d44b97f 100644 --- a/SignalMessaging/contacts/SelectThreadViewController.m +++ b/SignalMessaging/contacts/SelectThreadViewController.m @@ -217,17 +217,14 @@ NS_ASSUME_NONNULL_BEGIN }]; if (disappearingMessagesConfiguration && disappearingMessagesConfiguration.isEnabled) { - UIImage *icon = [UIImage imageNamed:@"table_ic_hourglass"]; - OWSAssert(icon); - UIImageView *iconView = [UIImageView new]; - iconView.image = [icon imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; - iconView.tintColor = [UIColor colorWithWhite:0.5f alpha:1.f]; - iconView.contentMode = UIViewContentModeScaleAspectFit; - // Default size of this icon is a too large for the thread picker context - // so we specify a bit smaller. - iconView.frame = CGRectMake(0, 0, 20, 20); - - cell.accessoryView = iconView; + DisappearingTimerConfigurationView *disappearingTimerConfigurationView = + [[DisappearingTimerConfigurationView alloc] + initWithDurationSeconds:disappearingMessagesConfiguration.durationSeconds]; + + disappearingTimerConfigurationView.frame = CGRectMake(0, 0, 44, 44); + disappearingTimerConfigurationView.tintColor = [UIColor colorWithWhite:0.5f alpha:1.f]; + + cell.accessoryView = disappearingTimerConfigurationView; } } diff --git a/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.h b/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.h index 03ee715f0..1aa20daab 100644 --- a/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.h +++ b/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.h @@ -1,5 +1,6 @@ -// Created by Michael Kirk on 9/23/16. -// Copyright © 2016 Open Whisper Systems. All rights reserved. +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// #import "TSYapDatabaseObject.h" @@ -24,7 +25,7 @@ extern const uint32_t OWSDisappearingMessagesConfigurationDefaultExpirationDurat + (NSArray *)validDurationsSeconds; -+ (NSString *)stringForDurationSeconds:(uint32_t)durationSeconds; ++ (NSString *)stringForDurationSeconds:(uint32_t)durationSeconds useShortFormat:(BOOL)useShortFormat; @end diff --git a/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.m b/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.m index f3242de2f..6ea20514b 100644 --- a/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.m +++ b/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // #import "OWSDisappearingMessagesConfiguration.h" @@ -62,7 +62,7 @@ const uint32_t OWSDisappearingMessagesConfigurationDefaultExpirationDuration = k } } -+ (NSString *)stringForDurationSeconds:(uint32_t)durationSeconds ++ (NSString *)stringForDurationSeconds:(uint32_t)durationSeconds useShortFormat:(BOOL)useShortFormat { NSString *amountFormat; uint32_t duration; @@ -73,55 +73,101 @@ const uint32_t OWSDisappearingMessagesConfigurationDefaultExpirationDuration = k uint32_t secondsPerWeek = secondsPerDay * 7; if (durationSeconds < secondsPerMinute) { // XX Seconds - amountFormat = NSLocalizedString(@"TIME_AMOUNT_SECONDS", - @"{{number of seconds}} embedded in strings, e.g. 'Alice updated disappearing messages " - @"expiration to {{5 seconds}}'. See other *_TIME_AMOUNT strings"); + if (useShortFormat) { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_SECONDS_SHORT_FORMAT", + @"Label text below navbar button, embeds {{number of seconds}}. Must be very short, like 1 or 2 characters, The space is intentionally ommitted between the text and the embedded duration so that we get, e.g. '5s' not '5 s'. See other *_TIME_AMOUNT strings"); + } else { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_SECONDS", + @"{{number of seconds}} embedded in strings, e.g. 'Alice updated disappearing messages " + @"expiration to {{5 seconds}}'. See other *_TIME_AMOUNT strings"); + } + duration = durationSeconds; } else if (durationSeconds < secondsPerMinute * 1.5) { // 1 Minute - amountFormat = NSLocalizedString(@"TIME_AMOUNT_SINGLE_MINUTE", - @"{{1 minute}} embedded in strings, e.g. 'Alice updated disappearing messages " - @"expiration to {{1 minute}}'. See other *_TIME_AMOUNT strings"); + if (useShortFormat) { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_MINUTES_SHORT_FORMAT", + @"Label text below navbar button, embeds {{number of minutes}}. Must be very short, like 1 or 2 characters, The space is intentionally ommitted between the text and the embedded duration so that we get, e.g. '5m' not '5 m'. See other *_TIME_AMOUNT strings"); + } else { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_SINGLE_MINUTE", + @"{{1 minute}} embedded in strings, e.g. 'Alice updated disappearing messages " + @"expiration to {{1 minute}}'. See other *_TIME_AMOUNT strings"); + } duration = durationSeconds / secondsPerMinute; } else if (durationSeconds < secondsPerHour) { // Multiple Minutes - amountFormat = NSLocalizedString(@"TIME_AMOUNT_MINUTES", - @"{{number of minutes}} embedded in strings, e.g. 'Alice updated disappearing messages " - @"expiration to {{5 minutes}}'. See other *_TIME_AMOUNT strings"); + if (useShortFormat) { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_MINUTES_SHORT_FORMAT", + @"Label text below navbar button, embeds {{number of minutes}}. Must be very short, like 1 or 2 characters, The space is intentionally ommitted between the text and the embedded duration so that we get, e.g. '5m' not '5 m'. See other *_TIME_AMOUNT strings"); + } else { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_MINUTES", + @"{{number of minutes}} embedded in strings, e.g. 'Alice updated disappearing messages " + @"expiration to {{5 minutes}}'. See other *_TIME_AMOUNT strings"); + } duration = durationSeconds / secondsPerMinute; } else if (durationSeconds < secondsPerHour * 1.5) { // 1 Hour - amountFormat = NSLocalizedString(@"TIME_AMOUNT_SINGLE_HOUR", - @"{{1 hour}} embedded in strings, e.g. 'Alice updated disappearing messages " - @"expiration to {{1 hour}}'. See other *_TIME_AMOUNT strings"); + if (useShortFormat) { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_HOURS_SHORT_FORMAT", + @"Label text below navbar button, embeds {{number of hours}}. Must be very short, like 1 or 2 characters, The space is intentionally ommitted between the text and the embedded duration so that we get, e.g. '5h' not '5 h'. See other *_TIME_AMOUNT strings"); + } else { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_SINGLE_HOUR", + @"{{1 hour}} embedded in strings, e.g. 'Alice updated disappearing messages " + @"expiration to {{1 hour}}'. See other *_TIME_AMOUNT strings"); + } duration = durationSeconds / secondsPerHour; } else if (durationSeconds < secondsPerDay) { // Multiple Hours - amountFormat = NSLocalizedString(@"TIME_AMOUNT_HOURS", - @"{{number of hours}} embedded in strings, e.g. 'Alice updated disappearing messages " - @"expiration to {{5 hours}}'. See other *_TIME_AMOUNT strings"); + if (useShortFormat) { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_HOURS_SHORT_FORMAT", + @"Label text below navbar button, embeds {{number of hours}}. Must be very short, like 1 or 2 characters, The space is intentionally ommitted between the text and the embedded duration so that we get, e.g. '5h' not '5 h'. See other *_TIME_AMOUNT strings"); + } else { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_HOURS", + @"{{number of hours}} embedded in strings, e.g. 'Alice updated disappearing messages " + @"expiration to {{5 hours}}'. See other *_TIME_AMOUNT strings"); + } duration = durationSeconds / secondsPerHour; } else if (durationSeconds < secondsPerDay * 1.5) { // 1 Day - amountFormat = NSLocalizedString(@"TIME_AMOUNT_SINGLE_DAY", - @"{{1 day}} embedded in strings, e.g. 'Alice updated disappearing messages " - @"expiration to {{1 day}}'. See other *_TIME_AMOUNT strings"); + if (useShortFormat) { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_DAYS_SHORT_FORMAT", + @"Label text below navbar button, embeds {{number of days}}. Must be very short, like 1 or 2 characters, The space is intentionally ommitted between the text and the embedded duration so that we get, e.g. '5d' not '5 d'. See other *_TIME_AMOUNT strings"); + } else { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_SINGLE_DAY", + @"{{1 day}} embedded in strings, e.g. 'Alice updated disappearing messages " + @"expiration to {{1 day}}'. See other *_TIME_AMOUNT strings"); + } duration = durationSeconds / secondsPerDay; } else if (durationSeconds < secondsPerWeek) { // Multiple Days - amountFormat = NSLocalizedString(@"TIME_AMOUNT_DAYS", - @"{{number of days}} embedded in strings, e.g. 'Alice updated disappearing messages " - @"expiration to {{5 days}}'. See other *_TIME_AMOUNT strings"); + if (useShortFormat) { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_DAYS_SHORT_FORMAT", + @"Label text below navbar button, embeds {{number of days}}. Must be very short, like 1 or 2 characters, The space is intentionally ommitted between the text and the embedded duration so that we get, e.g. '5d' not '5 d'. See other *_TIME_AMOUNT strings"); + } else { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_DAYS", + @"{{number of days}} embedded in strings, e.g. 'Alice updated disappearing messages " + @"expiration to {{5 days}}'. See other *_TIME_AMOUNT strings"); + } duration = durationSeconds / secondsPerDay; } else if (durationSeconds < secondsPerWeek * 1.5) { // 1 Week - amountFormat = NSLocalizedString(@"TIME_AMOUNT_SINGLE_WEEK", - @"{{1 week}} embedded in strings, e.g. 'Alice updated disappearing messages " - @"expiration to {{1 week}}'. See other *_TIME_AMOUNT strings"); + if (useShortFormat) { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_WEEKS_SHORT_FORMAT", + @"Label text below navbar button, embeds {{number of weeks}}. Must be very short, like 1 or 2 characters, The space is intentionally ommitted between the text and the embedded duration so that we get, e.g. '5w' not '5 w'. See other *_TIME_AMOUNT strings"); + } else { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_SINGLE_WEEK", + @"{{1 week}} embedded in strings, e.g. 'Alice updated disappearing messages " + @"expiration to {{1 week}}'. See other *_TIME_AMOUNT strings"); + } duration = durationSeconds / secondsPerWeek; } else { // Multiple weeks - amountFormat = NSLocalizedString(@"TIME_AMOUNT_WEEKS", - @"{{number of weeks}}, embedded in strings, e.g. 'Alice updated disappearing messages " - @"expiration to {{5 weeks}}'. See other *_TIME_AMOUNT strings"); + if (useShortFormat) { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_WEEKS_SHORT_FORMAT", + @"Label text below navbar button, embeds {{number of weeks}}. Must be very short, like 1 or 2 characters, The space is intentionally ommitted between the text and the embedded duration so that we get, e.g. '5w' not '5 w'. See other *_TIME_AMOUNT strings"); + } else { + amountFormat = NSLocalizedString(@"TIME_AMOUNT_WEEKS", + @"{{number of weeks}}, embedded in strings, e.g. 'Alice updated disappearing messages " + @"expiration to {{5 weeks}}'. See other *_TIME_AMOUNT strings"); + } duration = durationSeconds / secondsPerWeek; } @@ -152,7 +198,7 @@ const uint32_t OWSDisappearingMessagesConfigurationDefaultExpirationDuration = k - (NSString *)durationString { - return [self.class stringForDurationSeconds:self.durationSeconds]; + return [self.class stringForDurationSeconds:self.durationSeconds useShortFormat:NO]; } #pragma mark - Dirty Tracking diff --git a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage.m b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage.m index 96f03bb7e..eec9f356b 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage.m @@ -1,5 +1,6 @@ -// Created by Michael Kirk on 9/25/16. -// Copyright © 2016 Open Whisper Systems. All rights reserved. +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// #import "OWSDisappearingConfigurationUpdateInfoMessage.h" #import "OWSDisappearingMessagesConfiguration.h" @@ -57,7 +58,7 @@ NS_ASSUME_NONNULL_BEGIN @"strings for context."); NSString *durationString = - [OWSDisappearingMessagesConfiguration stringForDurationSeconds:self.configurationDurationSeconds]; + [OWSDisappearingMessagesConfiguration stringForDurationSeconds:self.configurationDurationSeconds useShortFormat:NO]; return [NSString stringWithFormat:infoFormat, self.createdByRemoteName, durationString]; } else { NSString *infoFormat = NSLocalizedString(@"OTHER_DISABLED_DISAPPEARING_MESSAGES_CONFIGURATION", @@ -70,7 +71,7 @@ NS_ASSUME_NONNULL_BEGIN @"Info message embedding a {{time amount}}, see the *_TIME_AMOUNT strings for context."); NSString *durationString = - [OWSDisappearingMessagesConfiguration stringForDurationSeconds:self.configurationDurationSeconds]; + [OWSDisappearingMessagesConfiguration stringForDurationSeconds:self.configurationDurationSeconds useShortFormat:NO]; return [NSString stringWithFormat:infoFormat, durationString]; } else { return NSLocalizedString(@"YOU_DISABLED_DISAPPEARING_MESSAGES_CONFIGURATION",