Merge branch 'master' of github.com:teddywing/LikeFeed

13 files changed, 18 insertions, 8 deletions

diff --git a/Resources/friendship/core/FacebookFQL.js b/Resources/friendship/core/FacebookFQL.js
index 9a011aa..1c6f217 100644
--- a/Resources/friendship/core/FacebookFQL.js
+++ b/Resources/friendship/core/FacebookFQL.js
@@ -10,11 +10,11 @@
 			var data = JSON.parse(response.result);
 			Ti.API.fireEvent(eventName, {data: data});
 		} else if (response.error) {
-			Ti.API.fireEvent("processFQLError", {what: response.error}); // TODO: add event listener to processFQLError and print the .what field
+			Ti.API.fireEvent("processFQLError", {what: response.error});
 		} else {
 			Ti.API.fireEvent("processFQLError", {what: "unrecognized query response"});
 		}
-	}; // TODO: find some way to handle timeout (via Ti.Facebook....)
+	}; // LATER: find some way to handle timeout (via Ti.Facebook....)
 
 	fs.core.handleFriendIDsFQLResponse = function (result) { fs.core.handleFQLResponse(result, "processFriendIDs"); };
 	fs.core.queryFriendIDsFQL = function() {
@@ -50,7 +50,7 @@
 		numLikesMore = Math.min((fs.data.reverseChronoLikedIDs.length - fs.data.numLikesFetched), numLikesMore);
 		page_ids = Array();
 		for (var i = fs.data.numLikesFetched; i < fs.data.numLikesFetched + numLikesMore; i++) {
-			page_ids.push(fs.data.reverseChronoLikedIDs[i]);
+			page_ids.push(fs.data.reverseChronoLikedIDs[i].pid);
 		}
 		fs.core.queryLikesFQL(page_ids);
 	};
diff --git a/Resources/friendship/ui/LikeList.js b/Resources/friendship/ui/LikeList.js
index 2dfd46d..8e9f74c 100644
--- a/Resources/friendship/ui/LikeList.js
+++ b/Resources/friendship/ui/LikeList.js
@@ -125,7 +125,7 @@
 		});
 
 		var liked_by = Ti.UI.createLabel({
-			text: " Friend Bob ",
+			text: key.friend_name,
 			font:{fontSize:11,fontWeight:'single'},
 			
 			//color: 'white',
@@ -183,9 +183,17 @@
 		
 		return row;
 	};
+
 	
-	function sortLikeIDsByTime(a, b) { // TODO: deprecated
-  		return ((a.time > b.time) ? -1 : ((a.time < b.time) ? 1 : 0));
+	function friend_name_from_uid(uid) {
+		var result = "???";
+		for (var i = 0; i < fs.data.friends.length; i++) {
+			if (fs.data.friends[i].uid == uid) {
+				result = fs.data.friends[i].name;
+				break;
+			}
+		}
+		return result;
 	};
 	
 	fs.ui.createLikeList = function() {
@@ -239,8 +247,7 @@
 				});
 	
 				for (var i = 0; i < tuples.length; i++) {
-					fs.data.reverseChronoLikedIDs.push(tuples[i][0]);
-					//Ti.API.info(tuples[i][0] + ' ' + tuples[i][1].time);
+					fs.data.reverseChronoLikedIDs.push({pid: tuples[i][0], count: tuples[i][1].count, time: tuples[i][1].time, uid: tuples[i][1].uid});
 	   			}
 	   			fs.data.numLikesFetched = 0;
 	   			
@@ -257,6 +264,9 @@
 				
 		Ti.API.addEventListener("processLikes", function(e) {
 			for ( key in e.data ) {
+				
+				e.data[key].more = fs.data.reverseChronoLikedIDs[fs.data.numLikesFetched];
+				e.data[key].friend_name = friend_name_from_uid(e.data[key].more.uid);		
 				fs.data.numLikesFetched++;
 				ll_view.appendRow(create_row(e.data[key]));
 			}
diff --git a/Resources/images/SphnxLogo150.png b/Resources/images/SphnxLogo150.png
new file mode 100644
index 0000000..b1faf8e
--- /dev/null
+++ b/Resources/images/SphnxLogo150.png
diff --git a/Resources/images/SphnxLogo300.png b/Resources/images/SphnxLogo300.png
new file mode 100644
index 0000000..ac6c806
--- /dev/null
+++ b/Resources/images/SphnxLogo300.png
diff --git a/Resources/images/SphnxLogo50.png b/Resources/images/SphnxLogo50.png
new file mode 100644
index 0000000..c2aa8e7
--- /dev/null
+++ b/Resources/images/SphnxLogo50.png
diff --git a/Resources/iphone/Default-Landscape.png b/Resources/iphone/Default-Landscape.png
index 082688a..a99944c 100644
--- a/Resources/iphone/Default-Landscape.png
+++ b/Resources/iphone/Default-Landscape.png
diff --git a/Resources/iphone/Default-Landscape.psd b/Resources/iphone/Default-Landscape.psd
new file mode 100644
index 0000000..e79ed3b
--- /dev/null
+++ b/Resources/iphone/Default-Landscape.psd
diff --git a/Resources/iphone/Default-Portrait.png b/Resources/iphone/Default-Portrait.png
index 426e1f0..31abe5b 100644
--- a/Resources/iphone/Default-Portrait.png
+++ b/Resources/iphone/Default-Portrait.png
diff --git a/Resources/iphone/Default-Portrait.psd b/Resources/iphone/Default-Portrait.psd
new file mode 100644
index 0000000..181d3f0
--- /dev/null
+++ b/Resources/iphone/Default-Portrait.psd
diff --git a/Resources/iphone/Default.png b/Resources/iphone/Default.png
index b41d4a9..e8a1146 100644
--- a/Resources/iphone/Default.png
+++ b/Resources/iphone/Default.png
diff --git a/Resources/iphone/Default@2x.png b/Resources/iphone/Default@2x.png
index 11e4e4d..f394d56 100644
--- a/Resources/iphone/Default@2x.png
+++ b/Resources/iphone/Default@2x.png
diff --git a/Resources/iphone/Default@2x.psd b/Resources/iphone/Default@2x.psd
new file mode 100644
index 0000000..b2a082c
--- /dev/null
+++ b/Resources/iphone/Default@2x.psd
diff --git a/Resources/iphone/appicon.png b/Resources/iphone/appicon.png
index ac74d27..ab15594 100644
--- a/Resources/iphone/appicon.png
+++ b/Resources/iphone/appicon.png