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

Conflicts:
	Resources/friendship/ui/LikeList.js

3 files changed, 17 insertions, 10 deletions

diff --git a/Resources/app.js b/Resources/app.js
index fb6d46e..3835b41 100644
--- a/Resources/app.js
+++ b/Resources/app.js
@@ -1,7 +1,5 @@
 Ti.include('/friendship/friendship.js');
 
-Ti.API.info("Running the app - app.js");
-
 fs.app.mainTabGroup = fs.ui.createApplicationTabGroup();
 
 // Login switch
diff --git a/Resources/friendship/ui/LikeList.js b/Resources/friendship/ui/LikeList.js
index 0894d07..7b2e037 100644
--- a/Resources/friendship/ui/LikeList.js
+++ b/Resources/friendship/ui/LikeList.js
@@ -1,11 +1,20 @@
 (function() {
-	function create_row( title )
+	function create_row( key )
 	{
+		// Ti.UI.createAlertDialog( {title:"key " + key.name} ).show();
+
 		// Reason for Factory: templating format of the row
 		var row = Ti.UI.createTableViewRow();
-		
+
+			/*		
+			description
+			fan_count
+			page_url
+			website
+			*/
+
 		var profile_icon = Ti.UI.createImageView({
-			image:"images/fb_test_profile.jpg",
+			image:key.pic_square,
 			width:50,
 			height:50,
 			left:0,
@@ -13,7 +22,7 @@
 		});
 
 		var content = Ti.UI.createLabel({
-			text:title,
+			text:key.name,
 			font:{fontSize:12,fontWeight:'bold'},
 			width:'auto',
 			textAlign:'left',
@@ -32,8 +41,10 @@
 	
 	fs.ui.addItems = function( list )
 	{
+		Ti.UI.createAlertDialog( {title:"Items: " + list.list.length} ).show();
+		
 		for ( key in list.list ) {
-			Ti.API.info( list.list[key] );
+			ll_view.appendRow( create_row( key ) );
 		}
 	}
 	
@@ -47,8 +58,6 @@
 			}));
 		});
 		
-		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.') );
 		
 		Ti.API.addEventListener( "processPosts", fs.ui.addItems );
 		
diff --git a/tiapp.xml b/tiapp.xml
index 6c7786d..9cc4a2f 100644
--- a/tiapp.xml
+++ b/tiapp.xml
@@ -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>