From c19c5b03f82bfae3addfaa3a6cea211b6ccea08a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Jans=C3=B8n=20Engvik?= <lars@engvik.nu>
Date: Wed, 14 Nov 2012 21:15:22 +0100
Subject: [PATCH] Category sorting now works. Also removed the temp pictures
 with TEMPORARY pig pics.

---
 res/drawable/gris.png                            | Bin 0 -> 5443 bytes
 res/layout/event_view.xml                        |  12 +++++++++---
 res/layout/main.xml                              |   1 +
 res/layout/main_tile_join.xml                    |   2 +-
 res/layout/main_tile_news.xml                    |   2 +-
 res/layout/main_tile_program.xml                 |   2 +-
 res/layout/main_tile_tickets.xml                 |   2 +-
 .../app/ui/EventViewActivity.java                |   2 ++
 .../app/ui/lists/BaseListActivity.java           |   1 -
 .../app/ui/lists/EventListActivity.java          |   5 +++--
 10 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 res/drawable/gris.png

diff --git a/res/drawable/gris.png b/res/drawable/gris.png
new file mode 100644
index 0000000000000000000000000000000000000000..e37b6607acf9ff77b39a837e3efdde6afa7d27d2
GIT binary patch
literal 5443
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

literal 0
HcmV?d00001

diff --git a/res/layout/event_view.xml b/res/layout/event_view.xml
index 7dae9cc..a44396f 100644
--- a/res/layout/event_view.xml
+++ b/res/layout/event_view.xml
@@ -32,7 +32,7 @@
 			android:layout_alignParentLeft="true" 
 			android:paddingLeft="5dp"
 			android:paddingRight="5dp" />
-			
+					
 		<TextView android:id="@+id/event_view_datetime" 
 	    	android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -40,7 +40,7 @@
 			android:layout_alignParentRight="true" 
 			android:paddingLeft="5dp"
 			android:paddingRight="5dp" />	
-	</RelativeLayout>	
+	</RelativeLayout>
 		
 	<Button android:id="@+id/event_view_link"
 		android:layout_width="match_parent"
@@ -59,6 +59,12 @@
 		<TextView android:id="@+id/event_view_description" 
 	    	android:layout_width="match_parent"
 			android:layout_height="wrap_content" />
+		
+		<ImageView 
+		    android:id="@+id/event_fb_icon"
+		    android:layout_width="wrap_content"
+		    android:layout_height="wrap_content"
+		    android:src="@drawable/fbicon" />
+		
 	</ScrollView>
-    
 </RelativeLayout>
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 1b6a643..da4bd0c 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -8,6 +8,7 @@
 		android:layout_width="match_parent" 
 		android:layout_alignParentTop="true"/>
 	
+	<!-- Picture size for buttons: 425x350 -->
 	<!-- MENU: --> 
 	<LinearLayout 
 	    android:layout_height="match_parent"
diff --git a/res/layout/main_tile_join.xml b/res/layout/main_tile_join.xml
index 41bdba2..d1b173a 100644
--- a/res/layout/main_tile_join.xml
+++ b/res/layout/main_tile_join.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/main_menu_join"
     style="@style/MetroTile"
-    android:background="@drawable/ex4"
+    android:background="@drawable/gris"
     android:onClick="joinButton" >
 
     <TextView
diff --git a/res/layout/main_tile_news.xml b/res/layout/main_tile_news.xml
index 0be1434..5234d44 100644
--- a/res/layout/main_tile_news.xml
+++ b/res/layout/main_tile_news.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/main_menu_news"
     style="@style/MetroTile"
-    android:background="@drawable/ex2"
+    android:background="@drawable/gris"
     android:onClick="newsButton" >
 
     <TextView
diff --git a/res/layout/main_tile_program.xml b/res/layout/main_tile_program.xml
index bd827fe..4beef8a 100644
--- a/res/layout/main_tile_program.xml
+++ b/res/layout/main_tile_program.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/main_menu_program"
     style="@style/MetroTile"
-    android:background="@drawable/ex1"
+    android:background="@drawable/gris"
     android:onClick="programButton" >
 
     <TextView
diff --git a/res/layout/main_tile_tickets.xml b/res/layout/main_tile_tickets.xml
index f19daf5..d0b9039 100644
--- a/res/layout/main_tile_tickets.xml
+++ b/res/layout/main_tile_tickets.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/main_menu_tickets"
     style="@style/MetroTile"
-    android:background="@drawable/ex3"
+    android:background="@drawable/gris"
     android:onClick="ticketButton" >
 
     <TextView
diff --git a/src/com/studentersamfundet/app/ui/EventViewActivity.java b/src/com/studentersamfundet/app/ui/EventViewActivity.java
index 5cac0b9..0569475 100644
--- a/src/com/studentersamfundet/app/ui/EventViewActivity.java
+++ b/src/com/studentersamfundet/app/ui/EventViewActivity.java
@@ -11,6 +11,7 @@ import android.text.util.Linkify;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -38,6 +39,7 @@ public class EventViewActivity extends BaseDnsActivity {
         TextView location = (TextView) findViewById(R.id.event_view_location);
         TextView datetime = (TextView) findViewById(R.id.event_view_datetime);
         Button link = (Button) findViewById(R.id.event_view_link);
+        ImageView fblink = (ImageView) findViewById(R.id.event_fb_icon);
         
         title.setText(Html.fromHtml(e.title));
         location.setText(Html.fromHtml(e.getLocation()));
diff --git a/src/com/studentersamfundet/app/ui/lists/BaseListActivity.java b/src/com/studentersamfundet/app/ui/lists/BaseListActivity.java
index 3b1fa43..caef8a3 100644
--- a/src/com/studentersamfundet/app/ui/lists/BaseListActivity.java
+++ b/src/com/studentersamfundet/app/ui/lists/BaseListActivity.java
@@ -27,7 +27,6 @@ public abstract class BaseListActivity extends BaseDnsActivity {
 	private IParser parser;
 	
 	private boolean isUpdated = false;
-
 	
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
diff --git a/src/com/studentersamfundet/app/ui/lists/EventListActivity.java b/src/com/studentersamfundet/app/ui/lists/EventListActivity.java
index cafc7bb..b7cc028 100644
--- a/src/com/studentersamfundet/app/ui/lists/EventListActivity.java
+++ b/src/com/studentersamfundet/app/ui/lists/EventListActivity.java
@@ -136,6 +136,7 @@ public class EventListActivity extends BaseListActivity {
 				if (message.length < 1) 
 					message = new String[] { Event.ALL };
 				
+				currentCategory = message[0];
 				ListCreator<?> lc = getListCreator(EventListActivity.this, R.id.event_list, R.id.event_list_progress_bar);
 				lc.setCategory(message[0]);
 				lc.execute();
@@ -146,7 +147,7 @@ public class EventListActivity extends BaseListActivity {
 	    	Dialog dialog = new ChooseCategoryDialog(this, callback, getDataHandler().getEventCategories());
 	    	dialog.show();
     	} else {
-    		Toast.makeText(this, R.string.error_loading, Toast.LENGTH_SHORT);
+    		Toast.makeText(this, R.string.error_loading, Toast.LENGTH_SHORT).show();
     	}
     }
 
@@ -157,7 +158,7 @@ public class EventListActivity extends BaseListActivity {
 
 			@Override
 			protected Event[] getObjects() {
-				return getDataHandler().getEvents(Event.ALL);
+				return getDataHandler().getEvents(currentCategory);
 			}
     	};
     }