Twitter (iOS) CDV 2.0 Compliance

cristiano-belloni · Jul 31, 2012 · 8d1ea68 · 8d1ea68
1 parent b4c386f
commit 8d1ea68
Show file tree

Hide file tree

Showing 54 changed files with 5,898 additions and 51 deletions.
diff --git a/iOS/Twitter/native/ios/TwitterPlugin.h → iOS/Twitter/TwitterPlugin.h b/iOS/Twitter/native/ios/TwitterPlugin.h → iOS/Twitter/TwitterPlugin.h
@@ -5,14 +5,10 @@
 //  Created by Antonelli Brian on 10/13/11.
 //
 
-#import <Foundation/Foundation.h>
-#import <Twitter/Twitter.h>
-#import <Accounts/Accounts.h>
-#ifdef CORDOVA_FRAMEWORK
+    #import <Foundation/Foundation.h>
+    #import <Twitter/Twitter.h>
+    #import <Accounts/Accounts.h>
     #import <Cordova/CDVPlugin.h>
-#else
-    #import "CDVPlugin.h"
-#endif
 
 @interface TwitterPlugin : CDVPlugin{
 }

diff --git a/iOS/Twitter/native/ios/TwitterPlugin.m → iOS/Twitter/TwitterPlugin.m b/iOS/Twitter/native/ios/TwitterPlugin.m → iOS/Twitter/TwitterPlugin.m
@@ -5,14 +5,9 @@
 //  Created by Antonelli Brian on 10/13/11.
 //
 
-#import "TwitterPlugin.h"
-#ifdef CORDOVA_FRAMEWORK
+    #import "TwitterPlugin.h"
     #import <Cordova/JSONKit.h>
 	#import <Cordova/CDVAvailability.h>
-#else
-    #import "JSONKit.h"
-	#import "CDVAvailability.h"
-#endif
 
 #define TWITTER_URL @"http://api.twitter.com/1/"
 
@@ -92,7 +87,7 @@ - (void) composeTweet:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)
     else{
 
 #if TARGET_IPHONE_SIMULATOR
-        NSString *simWarning = @"Test TwitterPlugin on Real Hardware. Tested on Cordova 1.7.0";
+        NSString *simWarning = @"Test TwitterPlugin on Real Hardware. Tested on Cordova 2.0.0";
         //EXC_BAD_ACCESS occurs on simulator unable to reproduce on real device
         //running iOS 5.1 and Cordova 1.6.1
         NSLog(@"%@",simWarning);

diff --git a/iOS/Twitter/example/www/index.html b/iOS/Twitter/example/www/index.html
@@ -10,9 +10,18 @@
     <script type="text/javascript" charset="utf-8" src="cordova-1.7.0.js"></script>
     <script type="text/javascript" charset="utf-8" src="TwitterPlugin.js"></script>
     <script type="text/javascript" charset="utf-8" src="demo.js"></script>
+        <link rel="stylesheet" type="text/css" href="css/index.css" />
+
   </head>
   <body onload="onBodyLoad()">
 	<h1>Hey, it's Twitter on PhoneGap!</h1>
+      <h1>Apache Cordova™</h1>
+      <div id="deviceready">
+          <p class="status pending blink">Connecting to Device</p>
+          <p class="status complete blink hide">Device is Ready</p>
+      </div>
+      </div>
+
 	<br />
 	<ol>
 		<li><a href="#" id="isAvailable">isAvailable</a></li>

diff --git a/iOS/Twitter/www/TwitterPlugin.js → iOS/Twitter/example/www2.0/TwitterPlugin.js b/iOS/Twitter/www/TwitterPlugin.js → iOS/Twitter/example/www2.0/TwitterPlugin.js
diff --git a/iOS/Twitter/example/www2.0/config.xml b/iOS/Twitter/example/www2.0/config.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<widget xmlns     = "http://www.w3.org/ns/widgets"
+        xmlns:gap = "http://phonegap.com/ns/1.0"
+        id        = "io.cordova.hello-cordova"
+        version   = "2.0.0">
+    <name>Hello Cordova</name>
+
+    <description>
+        A sample Apache Cordova application that responds to the deviceready event.
+    </description>
+
+    <author href="http://cordova.io" email="callback-dev@incubator.apache.org">
+        Apache Cordova Team
+    </author>
+
+    <icon src="res/icon/cordova_512.png"        width="512" height="512" />
+    <icon src="res/icon/cordova_android_96.png" width="96"  height="96"  gap:platform="android" />
+    <icon src="res/icon/cordova_bb_80.png"      width="80"  height="80"  gap:platform="blackberry" />
+    <icon src="res/icon/cordova_ios_144.png"    width="144" height="144" gap:platform="ios" />
+
+    <gap:splash src="res/screen/android_hdpi_landscape.png"      width="800"  height="480"  gap:platform="android" />
+    <gap:splash src="res/screen/android_hdpi_portrait.png"       width="480"  height="800"  gap:platform="android" />
+    <gap:splash src="res/screen/android_ldpi_landscape.png"      width="320"  height="200"  gap:platform="android" />
+    <gap:splash src="res/screen/android_ldpi_portrait.png"       width="200"  height="320"  gap:platform="android" />
+    <gap:splash src="res/screen/android_mdpi_landscape.png"      width="480"  height="320"  gap:platform="android" />
+    <gap:splash src="res/screen/android_mdpi_portrait.png"       width="320"  height="480"  gap:platform="android" />
+    <gap:splash src="res/screen/android_xhdpi_landscape.png"     width="1280" height="720"  gap:platform="android" />
+    <gap:splash src="res/screen/android_xhdpi_portrait.png"      width="720"  height="1280" gap:platform="android" />
+    <gap:splash src="res/screen/blackberry_transparent_300.png"  width="300"  height="300"  gap:platform="blackberry" />
+    <gap:splash src="res/screen/blackberry_transparent_400.png"  width="200"  height="200"  gap:platform="blackberry" />
+    <gap:splash src="res/screen/ipad_landscape.png"              width="1024" height="748"  gap:platform="ios" />
+    <gap:splash src="res/screen/ipad_portrait.png"               width="768"  height="1004" gap:platform="ios" />
+    <gap:splash src="res/screen/ipad_retina_landscape.png"       width="2048" height="1496" gap:platform="ios" />
+    <gap:splash src="res/screen/ipad_retina_portrait.png"        width="1536" height="2008" gap:platform="ios" />
+    <gap:splash src="res/screen/iphone_landscape.png"            width="480"  height="320"  gap:platform="ios" />
+    <gap:splash src="res/screen/iphone_portrait.png"             width="320"  height="480"  gap:platform="ios" />
+    <gap:splash src="res/screen/iphone_retina_landscape.png"     width="960"  height="640"  gap:platform="ios" />
+    <gap:splash src="res/screen/iphone_retina_portrait.png"      width="640"  height="960"  gap:platform="ios" />
+    <gap:splash src="res/screen/windows_phone_portrait.jpg"      width="480"  height="800"  gap:platform="winphone" />
+
+    <feature name="http://api.phonegap.com/1.0/device" />
+
+    <preference name="phonegap-version" value="1.9.0" />
+    <preference name="orientation"      value="default" />
+    <preference name="target-device"    value="universal" />
+    <preference name="fullscreen"       value="false" />
+</widget>