diff options
| -rw-r--r-- | Resources/friendship/core/FacebookFQL.js | 1 | ||||
| -rw-r--r-- | Resources/friendship/ui/ApplicationWindow.js | 33 | ||||
| -rw-r--r-- | Resources/friendship/ui/LikeList.js | 13 | ||||
| -rw-r--r-- | Resources/friendship/ui/LoginWindow.js | 8 | ||||
| -rw-r--r-- | Resources/images/refresh.png | bin | 0 -> 30136 bytes | |||
| -rw-r--r-- | tiapp.xml | 2 |
6 files changed, 30 insertions, 27 deletions
diff --git a/Resources/friendship/core/FacebookFQL.js b/Resources/friendship/core/FacebookFQL.js index 7abf0c0..2d04bcb 100644 --- a/Resources/friendship/core/FacebookFQL.js +++ b/Resources/friendship/core/FacebookFQL.js @@ -26,6 +26,5 @@ query += " limit 20"; // TODO: remove the limit Ti.API.info(query); // TODO: remove debug printout Ti.Facebook.request('fql.query', {query: query}, fs.core.handleAllFriendPostsFQLResponse); - Ti.API.fireEvent("displayLoadingAnimation"); }; })(); diff --git a/Resources/friendship/ui/ApplicationWindow.js b/Resources/friendship/ui/ApplicationWindow.js index babc43c..a88990d 100644 --- a/Resources/friendship/ui/ApplicationWindow.js +++ b/Resources/friendship/ui/ApplicationWindow.js @@ -3,30 +3,22 @@ var tab_group = Ti.UI.createTabGroup(); Ti.UI.currentTabGroup = tab_group; - var login_button = Ti.Facebook.createLoginButton({ - top: 50, - style: 'wide' - }); - - var debug_button = Ti.UI.createButton({title: 'Debug'}); - debug_button.addEventListener('click', function(e) { - // Show loading view - var loading = fs.ui.createLoadingView(); - win.add(loading); - Ti.App.fireEvent('app:show.loader'); - - Ti.API.info('Logged in: ' + JSON.stringify(Ti.Facebook.loggedIn)); - if (Ti.Facebook.loggedIn) { - fs.core.queryAllFriendPostsFQL(); - } - }); + var login_button = Ti.Facebook.createLoginButton(); + var refresh_button = Ti.UI.createButton({ + image: 'images/refresh.png', + width: 10.0, + height: 10.0, + }); // TODO: figure out how to resize buttons + refresh_button.addEventListener('click', fs.ui.refreshLikeList); var win = Ti.UI.createWindow({ - title: 'FriendShip', + //title: 'FriendShip', tabBarHidden: true, - leftNavButton: debug_button, - rightNavButton: login_button, + leftNavButton: refresh_button, + rightNavButton: login_button, // TODO: remove before deployment }); + var loading = fs.ui.createLoadingView(); + win.add(loading); var tab = Titanium.UI.createTab({ icon:'KS_nav_views.png', @@ -35,6 +27,7 @@ }); win.add(fs.ui.createLikeList()); + fs.ui.refreshLikeList(); tab_group.addTab(tab); return tab_group; diff --git a/Resources/friendship/ui/LikeList.js b/Resources/friendship/ui/LikeList.js index 22d3352..8440e01 100644 --- a/Resources/friendship/ui/LikeList.js +++ b/Resources/friendship/ui/LikeList.js @@ -143,7 +143,16 @@ Ti.App.fireEvent('app:hide.loader'); }); - + return ll_view; }; - })(); + + fs.ui.refreshLikeList = function(e) { + if (Ti.Facebook.loggedIn) { + Ti.App.fireEvent('app:show.loader'); + fs.core.queryAllFriendPostsFQL(); + } else { + Ti.Facebook.fireEvent('login'); + } + }; +})(); diff --git a/Resources/friendship/ui/LoginWindow.js b/Resources/friendship/ui/LoginWindow.js index 1d9befc..c6103ff 100644 --- a/Resources/friendship/ui/LoginWindow.js +++ b/Resources/friendship/ui/LoginWindow.js @@ -3,17 +3,19 @@ // Don't forget to set your appid and requested permissions, else the login button // won't be effective. - Titanium.Facebook.addEventListener('login', function(e) { + Ti.Facebook.addEventListener('login', function(e) { if (e.success) { fs.app.mainTabGroup.open(); + } else { + alert('Could not log into Facebook'); } }); - Titanium.Facebook.addEventListener('logout', function(e) { + Ti.Facebook.addEventListener('logout', function(e) { alert('Logged out'); }); // add the button. Note that it doesn't need a click event or anything. - return Titanium.Facebook.createLoginButton({ + return Ti.Facebook.createLoginButton({ top: 50, style: 'wide' }); diff --git a/Resources/images/refresh.png b/Resources/images/refresh.png Binary files differnew file mode 100644 index 0000000..864e9c8 --- /dev/null +++ b/Resources/images/refresh.png @@ -7,7 +7,7 @@ <target device="android">false</target> <target device="blackberry">false</target> </deployment-targets> - <sdk-version>1.6.2</sdk-version> + <sdk-version>2.0.2.GA</sdk-version> <id>com.likefeed.LikeFeed</id> <name>LikeFeed</name> <version>1.0</version> |
