Android support w/cordova 3.6.x & 4.1.x

README.md

@@ -1,6 +1,6 @@
 # ScreenDim
 
-> PhoneGap/Cordova plugin for enabling/disabling screen dim
+Cordova/Phonegap plugin for enabling/disabling screen dim.
 
 ## Usage
 
@@ -27,7 +27,9 @@
 
 ## Installation
 
-Use `pluginstall` - https://github.com/alunny/pluginstall
+```
+cordova plugin add <this repo url>
+```
 
 ## What/Why
 
@@ -51,3 +53,10 @@ part of your app, and enable it again once you're done.
 ## LICENSE
 
 MIT
+
+## Changelog
+
+* 1.0.3 Update for cordova >= 3.6.x (Android)
+* 1.0.2 Update for cordova >= 3.6.x (iOS)
+* 1.0.1 Update for cordova 3.0.x (Android/iOS)
+* 1.0.0 Initial release (Android/iOS)

plugin.xml

@@ -1,32 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
-    xmlns="http://www.phonegap.com/ns/plugins/1.0"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    id="com.phonegap.build.screendim"
-    version="1.0.0">
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  id="com.phonegap.build.screendim"
+  version="1.0.3">
 
-    <name>Screen Dim</name>
+  <name>Screen Dim</name>
+  <description>Cordova Screen Dim Plugin</description>
+    <keywords>cordova,screendim</keywords>
 
-    <asset src="www/screendim.js" target="screendim.js" />
+  <engines>
+    <engine name="cordova" version=">=3.0.0" />
+  </engines>
 
-    <!-- ios -->
-    <platform name="ios">
-        <plugins-plist key="ScreenDim"
-                    string="ScreenDimPlugin" />
+  <js-module src="www/screendim.js" name="screenDim">
+    <clobbers target="cordova.screenDim" />
+  </js-module>
 
-        <header-file src="ScreenDimPlugin.h" />
-
-        <source-file src="ScreenDimPlugin.m" />
-    </platform>
+  <!-- ios -->
+  <platform name="ios">
+    <config-file target="config.xml" parent="/*">
+    <feature name="ScreenDim">
+	    <param name="ios-package" value="ScreenDim"/>
+    </feature>
+    </config-file>
+    <header-file src="src/ios/ScreenDim.h" />
+    <source-file src="src/ios/ScreenDim.m" />
+  </platform>
 
     <!-- android -->
-    <platform name="android">
-        <source-file src="src/android/ScreenDim.java"
-                target-dir="src/com/phonegap/build/screendim" />
-
-        <config-file target="res/xml/plugins.xml" parent="/plugins">
-            <plugin name="ScreenDim"
-                    value="com.phonegap.build.screendim.ScreenDim" />
-        </config-file>
-    </platform>
+  <platform name="android">
+    <source-file src="src/android/ScreenDim.java" target-dir="src/com/phonegap/build/screendim" />
+    <config-file target="res/xml/config.xml" parent="/*">
+      <feature name="ScreenDim" >
+        <param name="android-package" value="com.phonegap.build.screendim.ScreenDim"/>
+      </feature>
+    </config-file>
+  </platform>
 </plugin>

src/android/ScreenDim.java

@@ -2,37 +2,46 @@
 
 import org.json.JSONArray;
 
-import org.apache.cordova.api.Plugin;
-import org.apache.cordova.api.PluginResult;
-import org.apache.cordova.api.LOG;
+import org.apache.cordova.CallbackContext;
+import org.apache.cordova.CordovaPlugin;
+import org.apache.cordova.PluginResult.Status;
+import org.json.JSONArray;
+import org.json.JSONException;
 
 import android.app.Activity;
 import android.view.WindowManager;
 import android.view.Window;
+import android.util.Log;
+
+public class ScreenDim extends CordovaPlugin {
+    public final static String TAG = "ScreenDim";
 
-public class ScreenDim extends Plugin {
-    public PluginResult execute(String action, JSONArray args, String callbackId) {
+    @Override
+    public boolean execute(String action, JSONArray args, final CallbackContext callbackContext)
+    throws JSONException {
         if (action.equals("enable")) {
             enable();
         } else if (action.equals("disable")) {
             disable();
+        } else {
+          // Returning false results in a "MethodNotFound" error.
+          return false;
         }
 
-        return new PluginResult(PluginResult.Status.OK);
+        return true;
     }
 
     public void enable() {
-        LOG.d("CordovaLog", "Enable called");   
+        Log.d(TAG, "Enable screen dimmer");
         getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
     }
 
     public void disable() {
-        LOG.d("CordovaLog", "Disable called");   
+        Log.d(TAG, "Disable screen dimmer");
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
     }
 
     protected Window getWindow() {
-        Activity ctxActivity = (Activity) ctx.getContext();
-        return ctxActivity.getWindow();
+        return cordova.getActivity().getWindow();
     }
 }

src/ios/ScreenDim.h

@@ -0,0 +1,17 @@
+//
+//  ScreenDim.h
+//  ios-cordova
+//
+//  Created by Andrew Lunny on 12-07-11.
+//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <Cordova/CDVPlugin.h>
+
+@interface ScreenDim : CDVPlugin
+
+- (void) enable:(CDVInvokedUrlCommand *)command;
+- (void) disable:(CDVInvokedUrlCommand *)command;
+
+@end

src/ios/ScreenDim.m

@@ -0,0 +1,26 @@
+//
+//  ScreenDim.m
+//  ios-cordova
+//
+//  Created by Andrew Lunny on 12-07-11.
+//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
+//
+
+#import "ScreenDim.h"
+
+@implementation ScreenDim
+
+- (void) enable:(CDVInvokedUrlCommand *)command
+{	
+    [[UIApplication sharedApplication] setIdleTimerDisabled:NO];
+    NSLog(@" ScreenDim Plugin: dim enabled");
+}
+
+
+- (void) disable:(CDVInvokedUrlCommand *)command
+{   
+    [[UIApplication sharedApplication] setIdleTimerDisabled:YES];
+    NSLog(@" ScreenDim Plugin: dim disabled");
+}
+
+@end

src/ios/ScreenDimPlugin.h

@@ -1,19 +1,15 @@
 //
-//  ScreenDimPlugin.h
+//  ScreenDim.h
 //  ios-cordova
 //
 //  Created by Andrew Lunny on 12-07-11.
 //  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
-#ifdef CORDOVA_FRAMEWORK
 #import <Cordova/CDVPlugin.h>
-#else
-#import "CDVPlugin.h"
-#endif
 
-@interface ScreenDimPlugin : CDVPlugin
+@interface ScreenDim : CDVPlugin
 
 - (void) enable:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options;
 - (void) disable:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options;

src/ios/ScreenDimPlugin.m

@@ -13,12 +13,14 @@ @implementation ScreenDimPlugin
 - (void) enable:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options
 {	
     [[UIApplication sharedApplication] setIdleTimerDisabled:NO];
+    NSLog(@" ScreenDim Plugin: dim enabled");
 }
 
 
 - (void) disable:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options 
 {   
     [[UIApplication sharedApplication] setIdleTimerDisabled:YES];
+    NSLog(@" ScreenDim Plugin: dim disabled");
 }
 
 @end

www/screendim.js

@@ -1,24 +1,24 @@
-(function (gap) {
-    // dims by default
-    var on = true;
+var exec = require("cordova/exec");
 
-    gap.screenDim = { };
+module.exports = {
+    on: true,
+
+    enable: function () {
+        this.on = true;
+        exec(null, null, 'ScreenDim', 'enable', []);
+    },
 
-    gap.screenDim.enable = function () {
-        on = true;
-        gap.exec(null, null, 'ScreenDim', 'enable', []);
-    };
+    disable: function () {
+        this.on = false;
+        exec(null, null, 'ScreenDim', 'disable', []);
+    },
 
-    gap.screenDim.disable = function () {
-        on = false;
-        gap.exec(null, null, 'ScreenDim', 'disable', []);
-    };
-
-    gap.screenDim.toggle = function () {
-        if (on) {
+    toggle: function () {
+        if (this.on) {
             this.disable();
         } else {
             this.enable();
         }
-    };
-}).call(this, (window.cordova || window.Cordova));
+    },
+
+};