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

  -- merged Anqi's stuff with Teddy's things

Conflicts:
	Resources/friendship/ui/ApplicationWindow.js
	Resources/friendship/ui/LikeList.js

1 files changed, 35 insertions, 1 deletions

diff --git a/Resources/friendship/ui/LikeList.js b/Resources/friendship/ui/LikeList.js
index 54da696..9ba9bd5 100644
--- a/Resources/friendship/ui/LikeList.js
+++ b/Resources/friendship/ui/LikeList.js
@@ -1,4 +1,35 @@
 (function() {
+	function create_row( title )
+	{
+		// Reason for Factory: templating format of the row
+		var row = Ti.UI.createTableViewRow();
+		
+		var profile_icon = Ti.UI.createImageView({
+			url:"images/fb_test_profile.jpg",
+			width:50,
+			height:50,
+			left:0,
+			top:0
+		});
+
+		var content = Ti.UI.createLabel({
+			text:title,
+			font:{fontSize:12,fontWeight:'bold'},
+			width:'auto',
+			textAlign:'left',
+			top:2,
+			left:52,
+			height:26
+		});
+
+		row.height = 50;
+		
+		row.add( profile_icon );
+		row.add( content );
+		
+		return row;
+	}
+	
 	fs.ui.createLikeList = function() {
 		var ll_view = Ti.UI.createTableView();
 		
@@ -9,6 +40,9 @@
 			}));
 		});
 		
+		ll_view.appendRow( create_row( 'OMG, I like totally like Skrillex.') );
+		ll_view.appendRow( create_row( 'Seriously, this is amazing.  You totally need to party.') );
+		
 		return ll_view;
 	};
-})();
+ })();