diff options
| -rw-r--r-- | Resources/friendship/ui/LikeList.js | 35 | ||||
| -rw-r--r-- | Resources/friendship/ui/LoginWindow.js | 5 | ||||
| -rw-r--r-- | Resources/friendship/ui/WebView.js | 5 | ||||
| -rw-r--r-- | tiapp.xml | 2 |
4 files changed, 28 insertions, 19 deletions
diff --git a/Resources/friendship/ui/LikeList.js b/Resources/friendship/ui/LikeList.js index 0d49d74..3ff885f 100644 --- a/Resources/friendship/ui/LikeList.js +++ b/Resources/friendship/ui/LikeList.js @@ -79,7 +79,7 @@ image:key.pic_square, width:50, height:50, - left:0, + left:5, top:0 }); @@ -101,7 +101,7 @@ textAlign:'right', top: 0, opacity:0.65, - left: 0, + left: 5, height:'12' }); fan_c.top = 50-fan_c.height; @@ -117,17 +117,17 @@ width:'auto', textAlign:'left', top:2, - left: profile_icon.width + 2, + left: profile_icon.width + 12, height:'auto' }); 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' }); @@ -156,11 +156,12 @@ 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, - left:profile_icon.width + 4, + left:profile_icon.width + 14, height:'auto', wordWrap:true }); @@ -170,17 +171,23 @@ if( description.height > max_height ) description.height = max_height; + var item_view = Ti.UI.createView({ + height: 'auto', + top: 5, + bottom: 5 + }); row.height = 'auto'; - row.add( profile_icon ); + 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; }; diff --git a/Resources/friendship/ui/LoginWindow.js b/Resources/friendship/ui/LoginWindow.js index 4593f82..3acd885 100644 --- a/Resources/friendship/ui/LoginWindow.js +++ b/Resources/friendship/ui/LoginWindow.js @@ -25,8 +25,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' diff --git a/Resources/friendship/ui/WebView.js b/Resources/friendship/ui/WebView.js index d1c8e50..f2a7dc3 100644 --- a/Resources/friendship/ui/WebView.js +++ b/Resources/friendship/ui/WebView.js @@ -4,12 +4,13 @@ var win = Ti.UI.createWindow({ barColor: fs.ui.styles.navBarColour, - title: (options['title']) ? options['title'] : '', + title: 'Sphnx', //(options['title']) ? options['title'] : '', backButtonTitle: 'Back' }); 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); @@ -7,7 +7,7 @@ <target device="android">false</target> <target device="blackberry">false</target> </deployment-targets> - <sdk-version>2.0.2.GA</sdk-version> + <sdk-version>1.6.2</sdk-version> <id>com.likefeed.LikeFeed</id> <name>LikeFeed</name> <version>1.0</version> |