diff --git a/TODO b/TODO
index b0516b4..c8e6843 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,5 @@
Prioriteringer fra 0-100.
-Før lansering:
-[0] Dersom ingen billetter tilgjengelig for online kjøp, si ifra om dette.
-
Etter:
[0] Ha med link til FB-event.
[5] Åpningstidene er snodig plassert på større skjermer. Midtstille?
diff --git a/res/drawable/piggies.jpg b/res/drawable/piggies.jpg
new file mode 100644
index 0000000..a4c433b
Binary files /dev/null and b/res/drawable/piggies.jpg differ
diff --git a/res/layout/event_list_empty.xml b/res/layout/event_list_empty.xml
new file mode 100644
index 0000000..9263d21
--- /dev/null
+++ b/res/layout/event_list_empty.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ce0473b..fa8726c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -20,4 +20,7 @@
Glassbaren
Billettluka
Event-bilde
+
+ Vi har ingen planlagte arrangementer akkurat nå. Prøv igjen senere.
+ Vi har ingen billetter liggende ute på Billettservice. Alle billetter kan kjøpes i billettluka.
diff --git a/src/com/studentersamfundet/app/ui/lists/BaseListActivity.java b/src/com/studentersamfundet/app/ui/lists/BaseListActivity.java
index caef8a3..a5c1309 100644
--- a/src/com/studentersamfundet/app/ui/lists/BaseListActivity.java
+++ b/src/com/studentersamfundet/app/ui/lists/BaseListActivity.java
@@ -127,15 +127,20 @@ public abstract class BaseListActivity extends BaseDnsActivity {
if (result) {
ListView list = (ListView)findViewById(idList);
T[] objects = getObjects();
-
- Log.i("DNSapp", "Showing " + objects.length +" objects.");
- ListAdapter adapter = createAdapter(objects);
- list.setAdapter(adapter);
- list.setVisibility(View.VISIBLE);
ProgressBar pb = (ProgressBar)findViewById(idProgressBar);
if (pb != null)
pb.setVisibility(View.GONE);
+
+ Log.i("DNSapp", "Showing " + objects.length +" objects.");
+ ListAdapter adapter = createAdapter(objects);
+ if (adapter == null) {
+ return;
+ }
+
+ list.setAdapter(adapter);
+ list.setVisibility(View.VISIBLE);
+
} else {
Toast toast = Toast.makeText(context, R.string.error_noconnection_noupdate, Toast.LENGTH_LONG);
toast.show();
diff --git a/src/com/studentersamfundet/app/ui/lists/EventListActivity.java b/src/com/studentersamfundet/app/ui/lists/EventListActivity.java
index 5c68ca9..d968bd4 100644
--- a/src/com/studentersamfundet/app/ui/lists/EventListActivity.java
+++ b/src/com/studentersamfundet/app/ui/lists/EventListActivity.java
@@ -81,6 +81,19 @@ public class EventListActivity extends BaseListActivity {
protected ListAdapter createAdapter(T[] objects) {
Event[] events = (Event[])objects;
+ if (events.length == 0) {
+ setContentView(R.layout.event_list_empty);
+ TextView text = (TextView)findViewById(R.id.event_list_empty_text);
+
+ // Fuck it:
+ if (this instanceof EventListTicketsActivity) {
+ text.setText(R.string.no_ticket_events);
+ } else {
+ text.setText(R.string.no_events);
+ }
+ return null;
+ }
+
ListAdapter adapter = new ArrayAdapter(this, R.layout.event_list_row, R.id.event_list_row_text, events) {
@Override
public View getView(int position, View convertView, ViewGroup parent) {