From 5315572ea01926ec4997a3d4a651bd8e152d11f7 Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Sun, 24 Jun 2012 03:40:13 -0400 Subject: Login window: hid navigation bar, made background colour the red colour. --- Resources/friendship/ui/LoginWindow.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Resources/friendship/ui/LoginWindow.js b/Resources/friendship/ui/LoginWindow.js index c6103ff..e51db53 100644 --- a/Resources/friendship/ui/LoginWindow.js +++ b/Resources/friendship/ui/LoginWindow.js @@ -24,8 +24,9 @@ fs.ui.createLoginWindow = function() { var tab_group = Ti.UI.createTabGroup(); var win = Ti.UI.createWindow({ - title: 'FriendShip', - tabBarHidden: true + navBarHidden: true, + tabBarHidden: true, + backgroundColor: fs.ui.style.navBarColour }); var view = Ti.UI.createView({ backgroundColor: '#fff' -- cgit v1.2.3 From d5ce0e54285b1e0bb011bb762e5351c19568f80a Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Sun, 24 Jun 2012 03:49:20 -0400 Subject: Webview: shifted it up 44px to take out the Facebook navbar/topbar. --- Resources/friendship/ui/WebView.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/friendship/ui/WebView.js b/Resources/friendship/ui/WebView.js index d1c8e50..ea4ea21 100644 --- a/Resources/friendship/ui/WebView.js +++ b/Resources/friendship/ui/WebView.js @@ -9,7 +9,8 @@ }); var webview = Ti.UI.createWebView({ - url: options['url'] + url: options['url'], + top: -44 // Removes the Facebook navbar. Eventually, we should only do this on facebook webviews, but as long as we only have facebook webviews, we can just hard-code it in there. }); win.add(webview); -- cgit v1.2.3 From 290565f01e275df4d02d7fa322c4375fb72af98f Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Sun, 24 Jun 2012 03:53:17 -0400 Subject: Webview: changed title in navBar to 'Sphnx' instead of page-specific title. --- Resources/friendship/ui/WebView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/friendship/ui/WebView.js b/Resources/friendship/ui/WebView.js index ea4ea21..f2a7dc3 100644 --- a/Resources/friendship/ui/WebView.js +++ b/Resources/friendship/ui/WebView.js @@ -4,7 +4,7 @@ var win = Ti.UI.createWindow({ barColor: fs.ui.styles.navBarColour, - title: (options['title']) ? options['title'] : '', + title: 'Sphnx', //(options['title']) ? options['title'] : '', backButtonTitle: 'Back' }); -- cgit v1.2.3 From 4ca2c86c189db5b476c9bef9c4b8f0744eada30b Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Sun, 24 Jun 2012 04:16:19 -0400 Subject: Like list: spaced out the like list and added some styling. Don't know if Nikita was doing this at the same time, hmmm. --- Resources/friendship/ui/LikeList.js | 40 ++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/Resources/friendship/ui/LikeList.js b/Resources/friendship/ui/LikeList.js index 93a7814..0bf744c 100644 --- a/Resources/friendship/ui/LikeList.js +++ b/Resources/friendship/ui/LikeList.js @@ -63,7 +63,7 @@ image:key.pic_square, width:50, height:50, - left:0, + left:5, top:0 }); @@ -85,7 +85,7 @@ textAlign:'right', top: 0, opacity:0.65, - left: 0, + left: 5, height:'12' }); fan_c.top = 50-fan_c.height; @@ -101,7 +101,7 @@ width:'auto', textAlign:'left', top:2, - left: profile_icon.width + 2, + left: profile_icon.width + 12, height:'auto' }); @@ -119,11 +119,11 @@ var title = Ti.UI.createLabel({ text:key.name, - font:{fontSize:12,fontWeight:'bold'}, + font:{fontSize:16,fontWeight:'bold'}, width:'auto', textAlign:'left', top:item_type.height + 2, - left: profile_icon.width + 4, + left: profile_icon.width + 14, height:'auto', wordWrap:'true' }); @@ -133,24 +133,32 @@ var description = Ti.UI.createLabel({ text:key.description, - font:{fontSize:12,fontWeight:'single'}, + font:{fontSize:14,fontWeight:'single'}, + height: 15, width:'auto', textAlign:'left', - top: title.top + title.height-5, - left:profile_icon.width + 4 + top: title.top + title.height, + left:profile_icon.width + 14 }); - - row.height = 50; + var item_view = Ti.UI.createView({ + height: 'auto', + top: 5, + bottom: 5 + }); - row.add( profile_icon ); + row.height = 'auto'; //50; + + item_view.add( profile_icon ); // row.add( thumb_icon ); - row.add(fan_c); - row.add( title ); - row.add(liked_by); - row.add( item_type ); - row.add( description ); + item_view.add(fan_c); + item_view.add( title ); + item_view.add(liked_by); + item_view.add( item_type ); + item_view.add( description ); + + row.add(item_view); return row; } -- cgit v1.2.3