You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2013/06/26 00:31:13 UTC
[1/2] git commit: Added .gitignore
Updated Branches:
refs/heads/master b258f2794 -> 49ed92e2b
Added .gitignore
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/commit/a9151bc6
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/tree/a9151bc6
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/diff/a9151bc6
Branch: refs/heads/master
Commit: a9151bc6e03751514d9bc29597908e16f49ea5fe
Parents: b258f27
Author: Shazron Abdullah <sh...@apache.org>
Authored: Tue Jun 25 15:30:15 2013 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Tue Jun 25 15:30:15 2013 -0700
----------------------------------------------------------------------
.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/a9151bc6/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..496ee2c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
\ No newline at end of file
[2/2] git commit: [CB-3701] Breakout Media Capture Plugin for iOS
(re-fix)
Posted by sh...@apache.org.
[CB-3701] Breakout Media Capture Plugin for iOS (re-fix)
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/commit/49ed92e2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/tree/49ed92e2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/diff/49ed92e2
Branch: refs/heads/master
Commit: 49ed92e2b4cc0e3f0d8e6f0017f10bddad7a1c01
Parents: a9151bc
Author: Shazron Abdullah <sh...@apache.org>
Authored: Tue Jun 25 15:31:06 2013 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Tue Jun 25 15:31:06 2013 -0700
----------------------------------------------------------------------
plugin.xml | 1 +
src/ios/CDVCapture.bundle/controls_bg.png | Bin 0 -> 955 bytes
src/ios/CDVCapture.bundle/controls_bg@2x.png | Bin 0 -> 971 bytes
src/ios/CDVCapture.bundle/controls_bg@2x~ipad.png | Bin 0 -> 2858 bytes
src/ios/CDVCapture.bundle/controls_bg~ipad.png | Bin 0 -> 969 bytes
.../microphone-568h@2x~iphone.png | Bin 0 -> 531673 bytes
src/ios/CDVCapture.bundle/microphone.png | Bin 0 -> 72226 bytes
src/ios/CDVCapture.bundle/microphone@2x.png | Bin 0 -> 282409 bytes
src/ios/CDVCapture.bundle/microphone@2x~ipad.png | Bin 0 -> 911582 bytes
src/ios/CDVCapture.bundle/microphone~ipad.png | Bin 0 -> 393975 bytes
src/ios/CDVCapture.bundle/record_button.png | Bin 0 -> 5852 bytes
src/ios/CDVCapture.bundle/record_button@2x.png | Bin 0 -> 13875 bytes
.../CDVCapture.bundle/record_button@2x~ipad.png | Bin 0 -> 15822 bytes
src/ios/CDVCapture.bundle/record_button~ipad.png | Bin 0 -> 7547 bytes
src/ios/CDVCapture.bundle/recording_bg.png | Bin 0 -> 973 bytes
src/ios/CDVCapture.bundle/recording_bg@2x.png | Bin 0 -> 990 bytes
.../CDVCapture.bundle/recording_bg@2x~ipad.png | Bin 0 -> 1026 bytes
src/ios/CDVCapture.bundle/recording_bg~ipad.png | Bin 0 -> 996 bytes
src/ios/CDVCapture.bundle/stop_button.png | Bin 0 -> 5514 bytes
src/ios/CDVCapture.bundle/stop_button@2x.png | Bin 0 -> 12965 bytes
src/ios/CDVCapture.bundle/stop_button@2x~ipad.png | Bin 0 -> 14474 bytes
src/ios/CDVCapture.bundle/stop_button~ipad.png | Bin 0 -> 7119 bytes
src/ios/CDVCapture.m | 14 +++++++-------
23 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index bf3f397..106d7a7 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -61,6 +61,7 @@ id="org.apache.cordova.core.Capture" version="0.1.0">
</config-file>
<header-file src="src/ios/CDVCapture.h" />
<source-file src="src/ios/CDVCapture.m" />
+ <resource-file src="src/ios/CDVCapture.bundle" />
</platform>
<!-- wp7 -->
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/src/ios/CDVCapture.bundle/controls_bg.png
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.bundle/controls_bg.png b/src/ios/CDVCapture.bundle/controls_bg.png
new file mode 100644
index 0000000..784e9c7
Binary files /dev/null and b/src/ios/CDVCapture.bundle/controls_bg.png differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/src/ios/CDVCapture.bundle/controls_bg@2x.png
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.bundle/controls_bg@2x.png b/src/ios/CDVCapture.bundle/controls_bg@2x.png
new file mode 100644
index 0000000..1e28c6d
Binary files /dev/null and b/src/ios/CDVCapture.bundle/controls_bg@2x.png differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/src/ios/CDVCapture.bundle/controls_bg@2x~ipad.png
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.bundle/controls_bg@2x~ipad.png b/src/ios/CDVCapture.bundle/controls_bg@2x~ipad.png
new file mode 100644
index 0000000..d4e3483
Binary files /dev/null and b/src/ios/CDVCapture.bundle/controls_bg@2x~ipad.png differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/src/ios/CDVCapture.bundle/controls_bg~ipad.png
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.bundle/controls_bg~ipad.png b/src/ios/CDVCapture.bundle/controls_bg~ipad.png
new file mode 100644
index 0000000..efbef8a
Binary files /dev/null and b/src/ios/CDVCapture.bundle/controls_bg~ipad.png differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/src/ios/CDVCapture.bundle/microphone-568h@2x~iphone.png
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.bundle/microphone-568h@2x~iphone.png b/src/ios/CDVCapture.bundle/microphone-568h@2x~iphone.png
new file mode 100644
index 0000000..8e80f73
Binary files /dev/null and b/src/ios/CDVCapture.bundle/microphone-568h@2x~iphone.png differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/src/ios/CDVCapture.bundle/microphone.png
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.bundle/microphone.png b/src/ios/CDVCapture.bundle/microphone.png
new file mode 100644
index 0000000..155b88c
Binary files /dev/null and b/src/ios/CDVCapture.bundle/microphone.png differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/src/ios/CDVCapture.bundle/microphone@2x.png
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.bundle/microphone@2x.png b/src/ios/CDVCapture.bundle/microphone@2x.png
new file mode 100644
index 0000000..79ef16b
Binary files /dev/null and b/src/ios/CDVCapture.bundle/microphone@2x.png differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/src/ios/CDVCapture.bundle/microphone@2x~ipad.png
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.bundle/microphone@2x~ipad.png b/src/ios/CDVCapture.bundle/microphone@2x~ipad.png
new file mode 100644
index 0000000..af1bbb2
Binary files /dev/null and b/src/ios/CDVCapture.bundle/microphone@2x~ipad.png differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/src/ios/CDVCapture.bundle/microphone~ipad.png
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.bundle/microphone~ipad.png b/src/ios/CDVCapture.bundle/microphone~ipad.png
new file mode 100644
index 0000000..ef1c472
Binary files /dev/null and b/src/ios/CDVCapture.bundle/microphone~ipad.png differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/src/ios/CDVCapture.bundle/record_button.png
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.bundle/record_button.png b/src/ios/CDVCapture.bundle/record_button.png
new file mode 100644
index 0000000..ceb9589
Binary files /dev/null and b/src/ios/CDVCapture.bundle/record_button.png differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/src/ios/CDVCapture.bundle/record_button@2x.png
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.bundle/record_button@2x.png b/src/ios/CDVCapture.bundle/record_button@2x.png
new file mode 100644
index 0000000..d6ce302
Binary files /dev/null and b/src/ios/CDVCapture.bundle/record_button@2x.png differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/src/ios/CDVCapture.bundle/record_button@2x~ipad.png
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.bundle/record_button@2x~ipad.png b/src/ios/CDVCapture.bundle/record_button@2x~ipad.png
new file mode 100644
index 0000000..0ac2e67
Binary files /dev/null and b/src/ios/CDVCapture.bundle/record_button@2x~ipad.png differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/src/ios/CDVCapture.bundle/record_button~ipad.png
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.bundle/record_button~ipad.png b/src/ios/CDVCapture.bundle/record_button~ipad.png
new file mode 100644
index 0000000..d8e24a4
Binary files /dev/null and b/src/ios/CDVCapture.bundle/record_button~ipad.png differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/src/ios/CDVCapture.bundle/recording_bg.png
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.bundle/recording_bg.png b/src/ios/CDVCapture.bundle/recording_bg.png
new file mode 100644
index 0000000..bafc087
Binary files /dev/null and b/src/ios/CDVCapture.bundle/recording_bg.png differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/src/ios/CDVCapture.bundle/recording_bg@2x.png
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.bundle/recording_bg@2x.png b/src/ios/CDVCapture.bundle/recording_bg@2x.png
new file mode 100644
index 0000000..798490b
Binary files /dev/null and b/src/ios/CDVCapture.bundle/recording_bg@2x.png differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/src/ios/CDVCapture.bundle/recording_bg@2x~ipad.png
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.bundle/recording_bg@2x~ipad.png b/src/ios/CDVCapture.bundle/recording_bg@2x~ipad.png
new file mode 100644
index 0000000..a1b7208
Binary files /dev/null and b/src/ios/CDVCapture.bundle/recording_bg@2x~ipad.png differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/src/ios/CDVCapture.bundle/recording_bg~ipad.png
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.bundle/recording_bg~ipad.png b/src/ios/CDVCapture.bundle/recording_bg~ipad.png
new file mode 100644
index 0000000..3b467f6
Binary files /dev/null and b/src/ios/CDVCapture.bundle/recording_bg~ipad.png differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/src/ios/CDVCapture.bundle/stop_button.png
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.bundle/stop_button.png b/src/ios/CDVCapture.bundle/stop_button.png
new file mode 100644
index 0000000..9c31838
Binary files /dev/null and b/src/ios/CDVCapture.bundle/stop_button.png differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/src/ios/CDVCapture.bundle/stop_button@2x.png
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.bundle/stop_button@2x.png b/src/ios/CDVCapture.bundle/stop_button@2x.png
new file mode 100644
index 0000000..8cf657e
Binary files /dev/null and b/src/ios/CDVCapture.bundle/stop_button@2x.png differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/src/ios/CDVCapture.bundle/stop_button@2x~ipad.png
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.bundle/stop_button@2x~ipad.png b/src/ios/CDVCapture.bundle/stop_button@2x~ipad.png
new file mode 100644
index 0000000..88b606c
Binary files /dev/null and b/src/ios/CDVCapture.bundle/stop_button@2x~ipad.png differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/src/ios/CDVCapture.bundle/stop_button~ipad.png
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.bundle/stop_button~ipad.png b/src/ios/CDVCapture.bundle/stop_button~ipad.png
new file mode 100644
index 0000000..59bb7a5
Binary files /dev/null and b/src/ios/CDVCapture.bundle/stop_button~ipad.png differ
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/49ed92e2/src/ios/CDVCapture.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.m b/src/ios/CDVCapture.m
index db52611..50bf0e7 100644
--- a/src/ios/CDVCapture.m
+++ b/src/ios/CDVCapture.m
@@ -544,7 +544,7 @@
BOOL isLessThaniOS4 = ([systemVersion compare:@"4.0" options:NSNumericSearch] == NSOrderedAscending);
// the iPad image (nor retina) differentiation code was not in 3.x, and we have to explicitly set the path
- // if user wants iPhone only app to run on iPad they must remove *~ipad.* images from capture.bundle
+ // if user wants iPhone only app to run on iPad they must remove *~ipad.* images from CDVCapture.bundle
if (isLessThaniOS4) {
NSString* iPadResource = [NSString stringWithFormat:@"%@~ipad.png", resource];
if (CDV_IsIPad() && [UIImage imageNamed:iPadResource]) {
@@ -579,10 +579,10 @@
UIView* tmp = [[UIView alloc] initWithFrame:viewRect];
// make backgrounds
- NSString* microphoneResource = @"Capture.bundle/microphone";
+ NSString* microphoneResource = @"CDVCapture.bundle/microphone";
if (CDV_IsIPhone5()) {
- microphoneResource = @"Capture.bundle/microphone-568h";
+ microphoneResource = @"CDVCapture.bundle/microphone-568h";
}
UIImage* microphone = [UIImage imageNamed:[self resolveImageResource:microphoneResource]];
@@ -593,7 +593,7 @@
[tmp addSubview:microphoneView];
// add bottom bar view
- UIImage* grayBkg = [UIImage imageNamed:[self resolveImageResource:@"Capture.bundle/controls_bg"]];
+ UIImage* grayBkg = [UIImage imageNamed:[self resolveImageResource:@"CDVCapture.bundle/controls_bg"]];
UIView* controls = [[UIView alloc] initWithFrame:CGRectMake(0, microphone.size.height, viewRect.size.width, grayBkg.size.height)];
[controls setBackgroundColor:[UIColor colorWithPatternImage:grayBkg]];
[controls setUserInteractionEnabled:NO];
@@ -601,7 +601,7 @@
[tmp addSubview:controls];
// make red recording background view
- UIImage* recordingBkg = [UIImage imageNamed:[self resolveImageResource:@"Capture.bundle/recording_bg"]];
+ UIImage* recordingBkg = [UIImage imageNamed:[self resolveImageResource:@"CDVCapture.bundle/recording_bg"]];
UIColor* background = [UIColor colorWithPatternImage:recordingBkg];
self.recordingView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, viewRect.size.width, recordingBkg.size.height)];
[self.recordingView setBackgroundColor:background];
@@ -624,8 +624,8 @@
// Add record button
- self.recordImage = [UIImage imageNamed:[self resolveImageResource:@"Capture.bundle/record_button"]];
- self.stopRecordImage = [UIImage imageNamed:[self resolveImageResource:@"Capture.bundle/stop_button"]];
+ self.recordImage = [UIImage imageNamed:[self resolveImageResource:@"CDVCapture.bundle/record_button"]];
+ self.stopRecordImage = [UIImage imageNamed:[self resolveImageResource:@"CDVCapture.bundle/stop_button"]];
self.recordButton.accessibilityTraits |= [self accessibilityTraits];
self.recordButton = [[UIButton alloc] initWithFrame:CGRectMake((viewRect.size.width - recordImage.size.width) / 2, (microphone.size.height + (grayBkg.size.height - recordImage.size.height) / 2), recordImage.size.width, recordImage.size.height)];
[self.recordButton setAccessibilityLabel:NSLocalizedString(@"toggle audio recording", nil)];