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/10/06 09:47:49 UTC

[1/2] git commit: Incorrect js for statusbar plugin

Updated Branches:
  refs/heads/plugins 86fb3afef -> c019e95cf


Incorrect js for statusbar plugin


Project: http://git-wip-us.apache.org/repos/asf/cordova-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-labs/commit/5caf73b1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-labs/tree/5caf73b1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-labs/diff/5caf73b1

Branch: refs/heads/plugins
Commit: 5caf73b1828e3b010689572b274cdbe7017930c1
Parents: 86fb3af
Author: Shazron Abdullah <sh...@apache.org>
Authored: Sun Oct 6 00:39:36 2013 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Sun Oct 6 00:39:36 2013 -0700

----------------------------------------------------------------------
 statusbar/www/statusbar.js | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-labs/blob/5caf73b1/statusbar/www/statusbar.js
----------------------------------------------------------------------
diff --git a/statusbar/www/statusbar.js b/statusbar/www/statusbar.js
index 4f1886a..8c461bd 100644
--- a/statusbar/www/statusbar.js
+++ b/statusbar/www/statusbar.js
@@ -19,13 +19,9 @@
  *
 */
 
-// var argscheck = require('cordova/argscheck'),
-//     utils = require('cordova/utils'),
-//     exec = require('cordova/exec');
-
-(function() {
-   
-var exec = cordova.require('cordova/exec')
+var argscheck = require('cordova/argscheck'),
+    utils = require('cordova/utils'),
+    exec = require('cordova/exec');
 
 var StatusBar = function() {
 };
@@ -50,8 +46,7 @@ StatusBar.styleBlackOpaque = function() {
     exec(null, null, "StatusBar", "styleBlackOpaque", []);
 };
 
+// TODO:
 StatusBar.isVisible = true;
 
-window.StatusBar = StatusBar;
-
-})();
\ No newline at end of file
+module.exports = StatusBar;


[2/2] git commit: Added statusbar background, including API to change its background color

Posted by sh...@apache.org.
Added statusbar background, including API to change its background color


Project: http://git-wip-us.apache.org/repos/asf/cordova-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-labs/commit/c019e95c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-labs/tree/c019e95c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-labs/diff/c019e95c

Branch: refs/heads/plugins
Commit: c019e95cf8ec03564f07b26d67b0c5a56f2e4529
Parents: 5caf73b
Author: Shazron Abdullah <sh...@apache.org>
Authored: Sun Oct 6 00:47:33 2013 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Sun Oct 6 00:47:33 2013 -0700

----------------------------------------------------------------------
 statusbar/src/ios/CDVStatusBar.h |  3 +++
 statusbar/src/ios/CDVStatusBar.m | 22 ++++++++++++++++++++++
 statusbar/www/statusbar.js       |  4 ++++
 3 files changed, 29 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-labs/blob/c019e95c/statusbar/src/ios/CDVStatusBar.h
----------------------------------------------------------------------
diff --git a/statusbar/src/ios/CDVStatusBar.h b/statusbar/src/ios/CDVStatusBar.h
index 298b3f5..124128e 100644
--- a/statusbar/src/ios/CDVStatusBar.h
+++ b/statusbar/src/ios/CDVStatusBar.h
@@ -23,6 +23,8 @@
 @interface CDVStatusBar : CDVPlugin {
     @protected
     BOOL _statusBarOverlaysWebView;
+    @protected
+    UIView* _statusBarBackgroundView;
 }
 
 @property (atomic, assign) BOOL statusBarOverlaysWebView;
@@ -34,5 +36,6 @@
 - (void) styleBlackTranslucent:(CDVInvokedUrlCommand*)command;
 - (void) styleBlackOpaque:(CDVInvokedUrlCommand*)command;
 
+- (void) statusBarBackgroundColorByName:(CDVInvokedUrlCommand*)command;
 
 @end

http://git-wip-us.apache.org/repos/asf/cordova-labs/blob/c019e95c/statusbar/src/ios/CDVStatusBar.m
----------------------------------------------------------------------
diff --git a/statusbar/src/ios/CDVStatusBar.m b/statusbar/src/ios/CDVStatusBar.m
index 9fe4632..e2a660c 100644
--- a/statusbar/src/ios/CDVStatusBar.m
+++ b/statusbar/src/ios/CDVStatusBar.m
@@ -36,6 +36,11 @@
 {
     _statusBarOverlaysWebView = YES; // default
     
+    CGRect frame = [[UIApplication sharedApplication] statusBarFrame];
+    
+    _statusBarBackgroundView = [[UIView alloc] initWithFrame:frame];
+    _statusBarBackgroundView.backgroundColor = [UIColor blackColor];
+    
     NSString* setting  = @"StatusBarOverlaysWebView";
     if ([self settingForKey:setting]) {
         self.statusBarOverlaysWebView = [(NSNumber*)[self settingForKey:setting] boolValue];
@@ -57,6 +62,8 @@
         bounds.size.height += statusBarFrame.size.height;
         
         self.webView.frame = bounds;
+        
+        [_statusBarBackgroundView removeFromSuperview];
 
     } else {
         CGRect statusBarFrame = [UIApplication sharedApplication].statusBarFrame;
@@ -65,6 +72,8 @@
         bounds.size.height -= statusBarFrame.size.height;
         
         self.webView.frame = bounds;
+        [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleBlackOpaque];
+        [self.webView.superview addSubview:_statusBarBackgroundView];
     }
     
     _statusBarOverlaysWebView = statusBarOverlaysWebView;
@@ -105,4 +114,17 @@
     [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleBlackOpaque];
 }
 
+- (void) statusBarBackgroundColorByName:(CDVInvokedUrlCommand*)command
+{
+    id value = [command.arguments objectAtIndex:0];
+    if (!([value isKindOfClass:[NSString class]])) {
+        value = @"black";
+    }
+    
+    SEL selector = NSSelectorFromString([value stringByAppendingString:@"Color"]);
+    if ([UIColor respondsToSelector:selector]) {
+        _statusBarBackgroundView.backgroundColor = [UIColor performSelector:selector];
+    }
+}
+
 @end

http://git-wip-us.apache.org/repos/asf/cordova-labs/blob/c019e95c/statusbar/www/statusbar.js
----------------------------------------------------------------------
diff --git a/statusbar/www/statusbar.js b/statusbar/www/statusbar.js
index 8c461bd..6a2ca9e 100644
--- a/statusbar/www/statusbar.js
+++ b/statusbar/www/statusbar.js
@@ -46,6 +46,10 @@ StatusBar.styleBlackOpaque = function() {
     exec(null, null, "StatusBar", "styleBlackOpaque", []);
 };
 
+StatusBar.statusBarBackgroundColorByName = function(colorname) {
+    exec(null, null, "StatusBar", "statusBarBackgroundColorByName", [colorname]);
+}
+
 // TODO:
 StatusBar.isVisible = true;