Skip to content

Commit 3809744

Browse files
committed
animate in progress
1 parent aa15c68 commit 3809744

File tree

9 files changed

+523
-38
lines changed

9 files changed

+523
-38
lines changed

ChatSecure.xcodeproj/project.pbxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@
170170
63C5B66A1A82F3EE0011BEA8 /* OTRAudioPlaybackController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C5B6691A82F3EE0011BEA8 /* OTRAudioPlaybackController.m */; };
171171
63D184861A2D3F2400334CD8 /* OTRNotificationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63D184851A2D3F2400334CD8 /* OTRNotificationController.m */; };
172172
63D27FC51A6DC51C00EC251A /* OTRMediaItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 63D27FC41A6DC51C00EC251A /* OTRMediaItem.m */; };
173+
63D58C261A8C154D003C5A2D /* OTRAudioRecorderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63D58C251A8C154D003C5A2D /* OTRAudioRecorderViewController.m */; };
173174
63D64D661A2FBA8C00E21F77 /* OTRToastOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 63D64D651A2FBA8C00E21F77 /* OTRToastOptions.m */; };
174175
63F0FF641A798D8E001F0C99 /* OTRAudioControlsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 63F0FF631A798D8E001F0C99 /* OTRAudioControlsView.m */; };
175176
63F6E1911A69B9BA0011E6F7 /* OTRAttachmentPicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 63F6E1901A69B9BA0011E6F7 /* OTRAttachmentPicker.m */; };
@@ -549,6 +550,8 @@
549550
63D184851A2D3F2400334CD8 /* OTRNotificationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRNotificationController.m; sourceTree = "<group>"; };
550551
63D27FC31A6DC51C00EC251A /* OTRMediaItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRMediaItem.h; sourceTree = "<group>"; };
551552
63D27FC41A6DC51C00EC251A /* OTRMediaItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRMediaItem.m; sourceTree = "<group>"; };
553+
63D58C241A8C154D003C5A2D /* OTRAudioRecorderViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRAudioRecorderViewController.h; sourceTree = "<group>"; };
554+
63D58C251A8C154D003C5A2D /* OTRAudioRecorderViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRAudioRecorderViewController.m; sourceTree = "<group>"; };
552555
63D64D641A2FBA8C00E21F77 /* OTRToastOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRToastOptions.h; sourceTree = "<group>"; };
553556
63D64D651A2FBA8C00E21F77 /* OTRToastOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRToastOptions.m; sourceTree = "<group>"; };
554557
63DC0EB31A1ABC86002C9598 /* OTR_Codesigning.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = OTR_Codesigning.xcconfig; path = configurations/OTR_Codesigning.xcconfig; sourceTree = "<group>"; };
@@ -890,6 +893,8 @@
890893
633106331A16D1A300C17BAE /* OTRListSettingViewController.m */,
891894
633106341A16D1A300C17BAE /* OTRMessagesViewController.h */,
892895
633106351A16D1A300C17BAE /* OTRMessagesViewController.m */,
896+
63D58C241A8C154D003C5A2D /* OTRAudioRecorderViewController.h */,
897+
63D58C251A8C154D003C5A2D /* OTRAudioRecorderViewController.m */,
893898
633106361A16D1A300C17BAE /* OTRNewAccountViewController.h */,
894899
633106371A16D1A300C17BAE /* OTRNewAccountViewController.m */,
895900
633106381A16D1A300C17BAE /* OTRNewBuddyViewController.h */,
@@ -1362,6 +1367,7 @@
13621367
63C4BD1C1A1E9BE1001696CD /* OTRvCardAvatar.m in Sources */,
13631368
63C4BD281A1E9BE1001696CD /* _OTRManagedOscarAccount.m in Sources */,
13641369
633107031A16D1A300C17BAE /* OTRFingerprintsViewController.m in Sources */,
1370+
63D58C261A8C154D003C5A2D /* OTRAudioRecorderViewController.m in Sources */,
13651371
6331068C1A16D1A300C17BAE /* OTRSettingsManager.m in Sources */,
13661372
6331070C1A16D1A300C17BAE /* OTRQRCodeViewController.m in Sources */,
13671373
6331067B1A16D1A300C17BAE /* UIImage+ChatSecure.m in Sources */,

ChatSecure/Classes/Utilities/OTRColors.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,6 @@
2323
+ (UIColor *)greenNoErrorColor;
2424
+ (UIColor *)warnColor;
2525

26+
+ (UIColor *)defaultBlueColor;
27+
2628
@end

ChatSecure/Classes/Utilities/OTRColors.m

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,9 @@ + (UIColor *)warnColor {
103103
return [UIColor colorWithRed:0.94 green:0.77 blue:0 alpha:1];
104104
}
105105

106+
+ (UIColor *)defaultBlueColor
107+
{
108+
return [UIColor colorWithRed:0.0 green:122.0/255.0 blue:1.0 alpha:1.0];
109+
}
110+
106111
@end

ChatSecure/Classes/Utilities/OTRImages.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ typedef NS_ENUM(NSUInteger, OTRBubbleMessageType) {
3939

4040
+ (UIImage *)wifiWithColor:(UIColor *)color;
4141

42+
+ (UIImage *)microphoneWithColor:(UIColor *)color size:(CGSize)size;
43+
4244
+ (UIImage *)imageWithIdentifier:(NSString *)identifier;
4345
+ (void)removeImageWithIdentifier:(NSString *)identifier;
4446
+ (void)setImage:(UIImage *)image forIdentifier:(NSString *)identifier;

ChatSecure/Classes/Utilities/OTRImages.m

Lines changed: 94 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
//
2+
// OTRAudioRecorderViewController.h
3+
// ChatSecure
4+
//
5+
// Created by David Chiles on 2/11/15.
6+
// Copyright (c) 2015 Chris Ballinger. All rights reserved.
7+
//
8+
9+
#import <UIKit/UIKit.h>
10+
11+
@class OTRBuddy;
12+
13+
@interface OTRAudioRecorderViewController : UIViewController
14+
15+
- (instancetype)initWithBuddy:(OTRBuddy *)buddy;
16+
17+
- (void)showAudioRecorderFromViewController:(UIViewController *)viewController animated:(BOOL)animated fromMicrophoneRectInWindow:(CGRect)rectInWindow;
18+
19+
20+
@end

0 commit comments

Comments
 (0)