some UI optimizations

xavierlacot · Feb 22, 2011 · dfccfb8 · dfccfb8
1 parent 9db7cda
commit dfccfb8
Show file tree

Hide file tree

Showing 4 changed files with 231 additions and 190 deletions.
diff --git a/Resources/js/views/decode.js b/Resources/js/views/decode.js
@@ -8,7 +8,7 @@ if (Titanium.Platform.name != 'android') {
 // label and first field
 var l1a = Titanium.UI.createLabel({
 	text:'Short url to decode*',
-	width:250,
+	width:260,
 	height:35,
 	top:90,
 	left:30,
@@ -29,17 +29,19 @@ var tf1 = Titanium.UI.createTextField({
 	height:35,
 	top:120,
 	left:130,
-	width:150,
+	width:160,
 	autocapitalization: Titanium.UI.TEXT_AUTOCAPITALIZATION_NONE,
 	returnKeyType:Titanium.UI.RETURNKEY_DEFAULT,
-	borderStyle:Titanium.UI.INPUT_BORDERSTYLE_ROUNDED
+	borderStyle:Titanium.UI.INPUT_BORDERSTYLE_ROUNDED,
+	clearButtonMode:Titanium.UI.INPUT_BUTTONMODE_ONFOCUS
 });
 
 // second label, for the result
 var l2 = Titanium.UI.createLabel({
 	text:'',
-	width:250,
+	width:260,
 	height:90,
+	left:30,
 	top:300,
 	color:'#fff',
 	textAlign:'left',
@@ -50,7 +52,7 @@ var l2 = Titanium.UI.createLabel({
 var b1 = Titanium.UI.createButton({
 	title:'Decode this short url',
 	height:30,
-	width:250,
+	width:260,
 	left:30,
 	top:200
 });
@@ -89,6 +91,13 @@ Ti.App.addEventListener('xavcc.decode.result', function(event) {
         // put the expanded url in the clipboard
         Titanium.UI.Clipboard.setText(url);
       }
+
+      var shorturl = Titanium.App.Properties.getString('site_url', 'http://xav.cc/') + xavcc.trim(tf1.value);
+
+      if (Titanium.App.Properties.getBool('use_history', true) && !xavcc.url.has(shorturl)) {
+        // save in the local database
+        xavcc.url.save(url, shorturl);
+      }
     } else if (url.length > 0) {
       // something went wrong : display an alert message
     	alert(url);

diff --git a/Resources/js/views/encode.js b/Resources/js/views/encode.js
@@ -9,7 +9,7 @@ if (Titanium.Platform.name != 'android') {
 // label and first field
 var l1 = Titanium.UI.createLabel({
 	text:'Paste a long url*',
-	width:250,
+	width:260,
 	height:35,
 	top:40,
 	left:30,
@@ -22,11 +22,12 @@ var tf1 = Titanium.UI.createTextField({
 	height:35,
 	top:70,
 	left:30,
-	width:250,
+	width:260,
 	autocapitalization: Titanium.UI.TEXT_AUTOCAPITALIZATION_NONE,
 	keyboardType:Titanium.UI.KEYBOARD_URL,
 	returnKeyType:Titanium.UI.RETURNKEY_DEFAULT,
-	borderStyle:Titanium.UI.INPUT_BORDERSTYLE_ROUNDED
+	borderStyle:Titanium.UI.INPUT_BORDERSTYLE_ROUNDED,
+	clearButtonMode:Titanium.UI.INPUT_BUTTONMODE_ONFOCUS
 });
 if (Titanium.UI.Clipboard.hasText() && Titanium.App.Properties.getBool('auto_paste', false)) {
   var text = Titanium.UI.Clipboard.getText();
@@ -38,7 +39,7 @@ if (Titanium.UI.Clipboard.hasText() && Titanium.App.Properties.getBool('auto_pas
 // labels and field for the optionnal alias
 var l2a = Titanium.UI.createLabel({
 	text:'Your own alias',
-	width:250,
+	width:260,
 	height:35,
 	top:120,
 	left:30,
@@ -61,7 +62,7 @@ var tf2 = Titanium.UI.createTextField({
 	height:35,
 	top:150,
 	left:130,
-	width:150,
+	width:160,
 	autocapitalization: Titanium.UI.TEXT_AUTOCAPITALIZATION_NONE,
 	returnKeyType:Titanium.UI.RETURNKEY_DEFAULT,
 	borderStyle:Titanium.UI.INPUT_BORDERSTYLE_ROUNDED
@@ -70,7 +71,7 @@ var tf2 = Titanium.UI.createTextField({
 // second label, for the result
 var l3 = Titanium.UI.createLabel({
 	text:'',
-	width:250,
+	width:260,
 	height:'auto',
 	top:300,
 	color:'#fff',
@@ -82,7 +83,7 @@ var l3 = Titanium.UI.createLabel({
 var b1 = Titanium.UI.createButton({
 	title:'Shorten this url',
 	height:30,
-	width:250,
+	width:260,
 	left:30,
 	top:220
 });
@@ -121,12 +122,17 @@ Ti.App.addEventListener('xavcc.encode.result', function(event) {
 
     if (Titanium.App.Properties.getBool('auto_copy', true)) {
       // put the shortened url in the clipboard
-      alert(Titanium.App.Properties.getBool('auto_copy', true));
       Titanium.UI.Clipboard.setText(url);
     }
-
+if (Titanium.App.Properties.getBool('use_history', true)) {
+  info('using history');
+}
+if (!xavcc.url.has(url)) {
+  info('do not have the url in memory');
+}
     if (Titanium.App.Properties.getBool('use_history', true) && !xavcc.url.has(url)) {
       // save in the local database
+      info('saving url ' + url);
       var longurl = xavcc.trim(tf1.value);
       xavcc.url.save(longurl, url);
     }