animate in progress

ChatSecure · Feb 18, 2015 · 3809744 · 3809744
1 parent aa15c68
commit 3809744
Show file tree

Hide file tree

Showing 9 changed files with 523 additions and 38 deletions.
diff --git a/ChatSecure.xcodeproj/project.pbxproj b/ChatSecure.xcodeproj/project.pbxproj
@@ -170,6 +170,7 @@
 		63C5B66A1A82F3EE0011BEA8 /* OTRAudioPlaybackController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C5B6691A82F3EE0011BEA8 /* OTRAudioPlaybackController.m */; };
 		63D184861A2D3F2400334CD8 /* OTRNotificationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63D184851A2D3F2400334CD8 /* OTRNotificationController.m */; };
 		63D27FC51A6DC51C00EC251A /* OTRMediaItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 63D27FC41A6DC51C00EC251A /* OTRMediaItem.m */; };
+		63D58C261A8C154D003C5A2D /* OTRAudioRecorderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63D58C251A8C154D003C5A2D /* OTRAudioRecorderViewController.m */; };
 		63D64D661A2FBA8C00E21F77 /* OTRToastOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 63D64D651A2FBA8C00E21F77 /* OTRToastOptions.m */; };
 		63F0FF641A798D8E001F0C99 /* OTRAudioControlsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 63F0FF631A798D8E001F0C99 /* OTRAudioControlsView.m */; };
 		63F6E1911A69B9BA0011E6F7 /* OTRAttachmentPicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 63F6E1901A69B9BA0011E6F7 /* OTRAttachmentPicker.m */; };
@@ -549,6 +550,8 @@
 		63D184851A2D3F2400334CD8 /* OTRNotificationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRNotificationController.m; sourceTree = "<group>"; };
 		63D27FC31A6DC51C00EC251A /* OTRMediaItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRMediaItem.h; sourceTree = "<group>"; };
 		63D27FC41A6DC51C00EC251A /* OTRMediaItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRMediaItem.m; sourceTree = "<group>"; };
+		63D58C241A8C154D003C5A2D /* OTRAudioRecorderViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRAudioRecorderViewController.h; sourceTree = "<group>"; };
+		63D58C251A8C154D003C5A2D /* OTRAudioRecorderViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRAudioRecorderViewController.m; sourceTree = "<group>"; };
 		63D64D641A2FBA8C00E21F77 /* OTRToastOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRToastOptions.h; sourceTree = "<group>"; };
 		63D64D651A2FBA8C00E21F77 /* OTRToastOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRToastOptions.m; sourceTree = "<group>"; };
 		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 @@
 				633106331A16D1A300C17BAE /* OTRListSettingViewController.m */,
 				633106341A16D1A300C17BAE /* OTRMessagesViewController.h */,
 				633106351A16D1A300C17BAE /* OTRMessagesViewController.m */,
+				63D58C241A8C154D003C5A2D /* OTRAudioRecorderViewController.h */,
+				63D58C251A8C154D003C5A2D /* OTRAudioRecorderViewController.m */,
 				633106361A16D1A300C17BAE /* OTRNewAccountViewController.h */,
 				633106371A16D1A300C17BAE /* OTRNewAccountViewController.m */,
 				633106381A16D1A300C17BAE /* OTRNewBuddyViewController.h */,
@@ -1362,6 +1367,7 @@
 				63C4BD1C1A1E9BE1001696CD /* OTRvCardAvatar.m in Sources */,
 				63C4BD281A1E9BE1001696CD /* _OTRManagedOscarAccount.m in Sources */,
 				633107031A16D1A300C17BAE /* OTRFingerprintsViewController.m in Sources */,
+				63D58C261A8C154D003C5A2D /* OTRAudioRecorderViewController.m in Sources */,
 				6331068C1A16D1A300C17BAE /* OTRSettingsManager.m in Sources */,
 				6331070C1A16D1A300C17BAE /* OTRQRCodeViewController.m in Sources */,
 				6331067B1A16D1A300C17BAE /* UIImage+ChatSecure.m in Sources */,

diff --git a/ChatSecure/Classes/Utilities/OTRColors.h b/ChatSecure/Classes/Utilities/OTRColors.h
@@ -23,4 +23,6 @@
 + (UIColor *)greenNoErrorColor;
 + (UIColor *)warnColor;
 
++ (UIColor *)defaultBlueColor;
+
 @end
diff --git a/ChatSecure/Classes/Utilities/OTRColors.m b/ChatSecure/Classes/Utilities/OTRColors.m
@@ -103,4 +103,9 @@ + (UIColor *)warnColor {
     return [UIColor colorWithRed:0.94 green:0.77 blue:0 alpha:1];
 }
 
++ (UIColor *)defaultBlueColor
+{
+    return [UIColor colorWithRed:0.0 green:122.0/255.0 blue:1.0 alpha:1.0];
+}
+
 @end
diff --git a/ChatSecure/Classes/Utilities/OTRImages.h b/ChatSecure/Classes/Utilities/OTRImages.h
@@ -39,6 +39,8 @@ typedef NS_ENUM(NSUInteger, OTRBubbleMessageType) {
 
 + (UIImage *)wifiWithColor:(UIColor *)color;
 
++ (UIImage *)microphoneWithColor:(UIColor *)color size:(CGSize)size;
+
 + (UIImage *)imageWithIdentifier:(NSString *)identifier;
 + (void)removeImageWithIdentifier:(NSString *)identifier;
 + (void)setImage:(UIImage *)image forIdentifier:(NSString *)identifier;

diff --git a/ChatSecure/Classes/Utilities/OTRImages.m b/ChatSecure/Classes/Utilities/OTRImages.m
diff --git a/ChatSecure/Classes/View Controllers/OTRAudioRecorderViewController.h b/ChatSecure/Classes/View Controllers/OTRAudioRecorderViewController.h
@@ -0,0 +1,20 @@
+//
+//  OTRAudioRecorderViewController.h
+//  ChatSecure
+//
+//  Created by David Chiles on 2/11/15.
+//  Copyright (c) 2015 Chris Ballinger. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@class OTRBuddy;
+
+@interface OTRAudioRecorderViewController : UIViewController
+
+- (instancetype)initWithBuddy:(OTRBuddy *)buddy;
+
+- (void)showAudioRecorderFromViewController:(UIViewController *)viewController animated:(BOOL)animated fromMicrophoneRectInWindow:(CGRect)rectInWindow;
+
+
+@end