Version 1.0

bsudekum · Nov 16, 2012 · 8b16134 · 8b16134
1 parent 0744451
commit 8b16134
Show file tree

Hide file tree

Showing 23 changed files with 61 additions and 77 deletions.
diff --git a/[email protected] b/[email protected]
diff --git a/Default-Portrait@2x~ipad.png b/Default-Portrait@2x~ipad.png
diff --git a/Default-Portrait~ipad.png b/Default-Portrait~ipad.png
diff --git a/[email protected] b/[email protected]
diff --git a/MeatText.xcodeproj/project.pbxproj b/MeatText.xcodeproj/project.pbxproj
@@ -44,8 +44,13 @@
 		EF31DEEF164B6F8400223E3A /* TwitterPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = EF31DEEE164B6F8400223E3A /* TwitterPlugin.m */; };
 		EF31DEF1164B6FF100223E3A /* Twitter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EF31DEF0164B6FF100223E3A /* Twitter.framework */; };
 		EF31DEF3164B6FFB00223E3A /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EF31DEF2164B6FFB00223E3A /* Accounts.framework */; };
+		EF3645BA1654871D0026AECA /* Default-Portrait~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = EF3645B91654871D0026AECA /* Default-Portrait~ipad.png */; };
+		EF3645BC1654892B0026AECA /* Default-Portrait@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = EF3645BB1654892B0026AECA /* Default-Portrait@2x~ipad.png */; };
+		EF3645BE16548ABD0026AECA /* icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = EF3645BD16548ABD0026AECA /* icon-72.png */; };
+		EF3645C016548BF20026AECA /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = EF3645BF16548BF20026AECA /* [email protected] */; };
+		EF3645C116548C520026AECA /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = EF83BCD8161D51FF004AEBA5 /* [email protected] */; };
+		EF3645C3165492410026AECA /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = EF3645C2165492410026AECA /* [email protected] */; };
 		EF38486D1617C63E009DB02E /* SMSComposer.m in Sources */ = {isa = PBXBuildFile; fileRef = EF38486C1617C63E009DB02E /* SMSComposer.m */; };
-		EF83BCDA161D5383004AEBA5 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = EF83BCD8161D51FF004AEBA5 /* [email protected] */; };
 		EF83BCDD161D576B004AEBA5 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = EF83BCDC161D576B004AEBA5 /* [email protected] */; };
 		EF83BCDF161D5796004AEBA5 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = EF83BCDE161D5795004AEBA5 /* icon.png */; };
 		EFBB806915F1C0A9009A5FEC /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EFBB806815F1C0A9009A5FEC /* MessageUI.framework */; };
@@ -130,6 +135,11 @@
 		EF31DEEE164B6F8400223E3A /* TwitterPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TwitterPlugin.m; sourceTree = "<group>"; };
 		EF31DEF0164B6FF100223E3A /* Twitter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Twitter.framework; path = System/Library/Frameworks/Twitter.framework; sourceTree = SDKROOT; };
 		EF31DEF2164B6FFB00223E3A /* Accounts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accounts.framework; path = System/Library/Frameworks/Accounts.framework; sourceTree = SDKROOT; };
+		EF3645B91654871D0026AECA /* Default-Portrait~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Portrait~ipad.png"; sourceTree = "<group>"; };
+		EF3645BB1654892B0026AECA /* Default-Portrait@2x~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Portrait@2x~ipad.png"; sourceTree = "<group>"; };
+		EF3645BD16548ABD0026AECA /* icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-72.png"; sourceTree = "<group>"; };
+		EF3645BF16548BF20026AECA /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		EF3645C2165492410026AECA /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		EF38486B1617C63E009DB02E /* SMSComposer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SMSComposer.h; sourceTree = "<group>"; };
 		EF38486C1617C63E009DB02E /* SMSComposer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SMSComposer.m; sourceTree = "<group>"; };
 		EF83BCD8161D51FF004AEBA5 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "../../../[email protected]"; sourceTree = "<group>"; };
@@ -210,6 +220,11 @@
 		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
+				EF3645C2165492410026AECA /* [email protected] */,
+				EF3645BF16548BF20026AECA /* [email protected] */,
+				EF3645BD16548ABD0026AECA /* icon-72.png */,
+				EF3645BB1654892B0026AECA /* Default-Portrait@2x~ipad.png */,
+				EF3645B91654871D0026AECA /* Default-Portrait~ipad.png */,
 				EF31DEF2164B6FFB00223E3A /* Accounts.framework */,
 				EF31DEF0164B6FF100223E3A /* Twitter.framework */,
 				EFC0C46E1627B1CD00C93A73 /* Default.png */,
@@ -442,11 +457,16 @@
 				30A0434914DC770100060A13 /* Localizable.strings in Resources */,
 				3088BBC1154F3926009F9C59 /* Default@2x~iphone.png in Resources */,
 				3088BBC2154F3926009F9C59 /* Default~iphone.png in Resources */,
-				EF83BCDA161D5383004AEBA5 /* [email protected] in Resources */,
 				EF83BCDD161D576B004AEBA5 /* [email protected] in Resources */,
 				EF83BCDF161D5796004AEBA5 /* icon.png in Resources */,
 				EFC0C46D1627AE8100C93A73 /* [email protected] in Resources */,
 				EFC0C46F1627B1CD00C93A73 /* Default.png in Resources */,
+				EF3645BA1654871D0026AECA /* Default-Portrait~ipad.png in Resources */,
+				EF3645BC1654892B0026AECA /* Default-Portrait@2x~ipad.png in Resources */,
+				EF3645BE16548ABD0026AECA /* icon-72.png in Resources */,
+				EF3645C016548BF20026AECA /* [email protected] in Resources */,
+				EF3645C116548C520026AECA /* [email protected] in Resources */,
+				EF3645C3165492410026AECA /* [email protected] in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -533,6 +553,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMPRESS_PNG_FILES = NO;
 				COPY_PHASE_STRIP = NO;
 				DEPLOYMENT_LOCATION = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -541,7 +562,7 @@
 				GCC_PREFIX_HEADER = "MeatText/MeatText-Prefix.pch";
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INFOPLIST_FILE = "MeatText/MeatText-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/MeatText/Plugins/GoogSDK\"",
@@ -561,13 +582,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMPRESS_PNG_FILES = NO;
 				COPY_PHASE_STRIP = YES;
 				DEPLOYMENT_LOCATION = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "MeatText/MeatText-Prefix.pch";
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INFOPLIST_FILE = "MeatText/MeatText-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/MeatText/Plugins/GoogSDK\"",

diff --git a/...oj/project.xcworkspace/xcuserdata/bobbysudekum.xcuserdatad/UserInterfaceState.xcuserstate b/...oj/project.xcworkspace/xcuserdata/bobbysudekum.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/MeatText/MeatText-Info.plist b/MeatText/MeatText-Info.plist
@@ -10,12 +10,20 @@
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
 	<string>icon.png</string>
+	<key>CFBundleIconFiles</key>
+	<array>
+		<string>[email protected]</string>
+		<string>icon.png</string>
+		<string>icon-72.png</string>
+		<string>[email protected]</string>
+	</array>
 	<key>CFBundleIcons</key>
 	<dict>
 		<key>CFBundlePrimaryIcon</key>
 		<dict>
 			<key>CFBundleIconFiles</key>
 			<array>
+				<string>[email protected]</string>
 				<string>icon.png</string>
 				<string>icon-72.png</string>
 				<string>[email protected]</string>

diff --git a/MeatText/Resources/icons/icon-72.png b/MeatText/Resources/icons/icon-72.png
diff --git a/MeatText/Resources/icons/[email protected] b/MeatText/Resources/icons/[email protected]
diff --git a/MeatText/Resources/icons/icon.png b/MeatText/Resources/icons/icon.png
diff --git a/MeatText/Resources/icons/[email protected] b/MeatText/Resources/icons/[email protected]
diff --git a/MeatText/Resources/icons/itunes_image.png b/MeatText/Resources/icons/itunes_image.png
diff --git a/MeatText/Resources/splash/[email protected] b/MeatText/Resources/splash/[email protected]
diff --git a/MeatText/Resources/splash/Default-Portrait@2x~ipad.png b/MeatText/Resources/splash/Default-Portrait@2x~ipad.png
diff --git a/MeatText/Resources/splash/Default-Portrait~ipad.png b/MeatText/Resources/splash/Default-Portrait~ipad.png
diff --git a/icon-72.png b/icon-72.png
diff --git a/[email protected] b/[email protected]
diff --git a/icon.png b/icon.png
diff --git a/www/css/index.css b/www/css/index.css
@@ -196,4 +196,11 @@ left: 8px;
     #links {
         left:263px;
     }
+}
+
+#buttonDown{
+    position: absolute;
+    bottom: 225px;
+    left: -29px;
+    z-index=1000000;
 }
diff --git a/www/img/down.png b/www/img/down.png
diff --git a/www/index.html b/www/index.html
@@ -1,13 +1,12 @@
 <!DOCTYPE html>
 <html>
 
-    <head>
+    <head> 
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <meta name="format-detection" content="telephone=no" />
         <link rel="stylesheet" type="text/css" href="js/geocode/Control.BingGeocoder.css"/>
         <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width;"/>
         <script type="text/javascript" src="cordova-2.0.0.js"></script>
-        <script type="text/javascript" src="js/GoogleAnalyticsPlugin.js"></script>
         <script type="text/javascript" src="js/index.js"></script>
         <script type="text/javascript" src="js/jquery.js"></script>
         <script type="text/javascript" src="js/jquery.mobile.js"></script>
@@ -39,6 +38,7 @@
                     <img src="img/twitter.png" width="65px" height="65px"/>
                     <p>Tweet</p>
                 </div>
+                    <img src="img/down.png" width="25px" height="30px" id="buttonDown">
 
             </div>
         </div>
@@ -51,7 +51,6 @@
 
 <script type="text/javascript">
 
-
 </script>
 
 </html>
diff --git a/www/js/EmailComposer.js b/www/js/EmailComposer.js
@@ -26,7 +26,7 @@ EmailComposer.prototype.showEmailComposer = function(subject,body,toRecipients,c
 		args.bccRecipients = bccRecipients;
 	if(subject)
 		args.subject = subject;
-	if(body)
+	if(body) 
 		args.body = body;
 	if(bIsHTML)
 		args.bIsHTML = bIsHTML;

diff --git a/www/js/index.js b/www/js/index.js
@@ -140,6 +140,10 @@ L.Browser.retina = true;
             });
         };
 
+        $("#buttonDown").click(function(){
+                $("#panel").slideToggle("fast");
+                $(this).toggleClass("sent");  // Toggle the active button 
+            });
 
     map.on("popupopen", resetSlide);
 
@@ -149,42 +153,6 @@ L.Browser.retina = true;
 }; //Device on onDeviceReady
 
 
-//Copy
-//Copy
-//Copy
-
-var copyLink = function () {
-    function get_short_url(url, login, api_key, func)
-    {
-        $.getJSON(
-            "http://api.bitly.com/v3/shorten?callback=?", 
-            { 
-                "format": "json",
-                "apiKey": api_key,
-                "login": login,
-                "longUrl": url
-            },
-            function(response)
-            {
-                func(response.data.url);
-            }
-        );
-    }
-    var login = "o_7iuqro3rja";
-    var api_key = "R_0e5b4318f72e53dfee13fb1491229204";
-    get_short_url(url, login, api_key, function(short_url) {
-        console.log(short_url);
-
-
-    messageTwo = "Here is the location: "+short_url+"\n\n\n\n Sent via MeatText.com";
-    window.plugins.clipboardPlugin.getText(function(messageTwo) {alert(messageTwo)})
-    console.log(messageTwo);
-    });
-}
-
-
-
-
 
 //Email for onclick event
 var emailComposer = function () {
@@ -211,7 +179,7 @@ var emailComposer = function () {
 
 
     messageTwo = "Here is the location: "+short_url+"\n\n\n\n Sent via MeatText.com";
-    window.plugins.emailComposer.showEmailComposer("Let's meet here!",messageTwo,"","","");
+    window.plugins.emailComposer.showEmailComposerWithCB(myCallbackEmail,"Let's meet here.",messageTwo,"","","");
     console.log(messageTwo);
     });
 }
@@ -246,35 +214,6 @@ var ComposeSMS = function () {
 
 }
 
-//SMS for your location
-var ComposeSMSme = function () {
-    function get_short_url(url, login, api_key, func)
-    {
-        $.getJSON(
-            "http://api.bitly.com/v3/shorten?callback=?", 
-            { 
-                "format": "json",
-                "apiKey": api_key,
-                "login": login,
-                "longUrl": url
-            },
-            function(response)
-            {
-                func(response.data.url);
-            }
-        );
-    }
-    var login = "o_7iuqro3rja";
-    var api_key = "R_0e5b4318f72e53dfee13fb1491229204";
-    get_short_url(url, login, api_key, function(short_url) {
-        console.log(short_url);
-
-    messageTwo = "I'm right here.\n\n"+short_url;
-    window.plugins.smsComposer.showSMSComposerWithCB(myCallback,'', messageTwo);
-    console.log(messageTwo);
-    });
-}
-
 var myCallback = function(result){
 
     if(result == 0)
@@ -284,6 +223,15 @@ var myCallback = function(result){
         elem = document.getElementById('sent').innerHTML = "<a href='#one'/><p id='sent' style='color:black;text-decoration:none;text-align:center;margin:5px'>Location Sent!</p></a>";
 };
 
+var myCallbackEmail = function(result){
+
+    if(result == 0)
+        console.log("cancelled");
+
+    else if(result == 2)
+        elem = document.getElementById('sent').innerHTML = "<a href='#one'/><p id='sent' style='color:black;text-decoration:none;text-align:center;margin:5px'>Location Sent!</p></a>";
+};
+
 //SMS for your location
 var tweet = function () {
     function get_short_url(url, login, api_key, func)
@@ -307,16 +255,16 @@ var tweet = function () {
     get_short_url(url, login, api_key, function(short_url) {
         console.log(short_url);
 
-    messageTwo = "Here's the spot!\n"+short_url;
+    messageTwo = "Here's the spot:\n"+short_url;
 
 
 // is twitter setup? If not, tell the user to go do it
     window.plugins.twitter.isTwitterSetup(function(r) {
         if (r === 1) {
             // twitter is setup, compose a new tweet
               window.plugins.twitter.composeTweet(
-                  function(s){ },
-                  function(e){ console.log("quoteText"); console.log("failed"); }, 
+                  function(s){elem = document.getElementById('sent').innerHTML = "<a href='#one'/><p id='sent' style='color:black;text-decoration:none;text-align:center;margin:5px'>Location Sent!</p></a>";},
+                  function(e){console.log("Tweet Cancelled")}, 
                   ""+ messageTwo + "");
         } else {
         navigator.notification.alert("It looks like you haven't enabled Twitter.", null, "Oops!");