diff --git a/res/drawable-hdpi/ex1.jpg b/res/drawable-hdpi/ex1.jpg
new file mode 100644
index 0000000..b93fd88
Binary files /dev/null and b/res/drawable-hdpi/ex1.jpg differ
diff --git a/res/drawable-hdpi/ex2.jpg b/res/drawable-hdpi/ex2.jpg
new file mode 100644
index 0000000..15a26a2
Binary files /dev/null and b/res/drawable-hdpi/ex2.jpg differ
diff --git a/res/drawable-hdpi/ex3.jpg b/res/drawable-hdpi/ex3.jpg
new file mode 100644
index 0000000..2a4420d
Binary files /dev/null and b/res/drawable-hdpi/ex3.jpg differ
diff --git a/res/drawable-hdpi/ex4.jpg b/res/drawable-hdpi/ex4.jpg
new file mode 100644
index 0000000..4de4f17
Binary files /dev/null and b/res/drawable-hdpi/ex4.jpg differ
diff --git a/res/drawable-ldpi/ex1.jpg b/res/drawable-ldpi/ex1.jpg
new file mode 100644
index 0000000..b93fd88
Binary files /dev/null and b/res/drawable-ldpi/ex1.jpg differ
diff --git a/res/drawable-ldpi/ex2.jpg b/res/drawable-ldpi/ex2.jpg
new file mode 100644
index 0000000..15a26a2
Binary files /dev/null and b/res/drawable-ldpi/ex2.jpg differ
diff --git a/res/drawable-ldpi/ex3.jpg b/res/drawable-ldpi/ex3.jpg
new file mode 100644
index 0000000..2a4420d
Binary files /dev/null and b/res/drawable-ldpi/ex3.jpg differ
diff --git a/res/drawable-ldpi/ex4.jpg b/res/drawable-ldpi/ex4.jpg
new file mode 100644
index 0000000..4de4f17
Binary files /dev/null and b/res/drawable-ldpi/ex4.jpg differ
diff --git a/res/drawable-mdpi/ex1.jpg b/res/drawable-mdpi/ex1.jpg
new file mode 100644
index 0000000..b93fd88
Binary files /dev/null and b/res/drawable-mdpi/ex1.jpg differ
diff --git a/res/drawable-mdpi/ex2.jpg b/res/drawable-mdpi/ex2.jpg
new file mode 100644
index 0000000..15a26a2
Binary files /dev/null and b/res/drawable-mdpi/ex2.jpg differ
diff --git a/res/drawable-mdpi/ex3.jpg b/res/drawable-mdpi/ex3.jpg
new file mode 100644
index 0000000..2a4420d
Binary files /dev/null and b/res/drawable-mdpi/ex3.jpg differ
diff --git a/res/drawable-mdpi/ex4.jpg b/res/drawable-mdpi/ex4.jpg
new file mode 100644
index 0000000..4de4f17
Binary files /dev/null and b/res/drawable-mdpi/ex4.jpg differ
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 22aa544..8c86fb7 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -34,6 +34,7 @@
-
+
+
+
-
-
-
- android:layout_marginTop="20px"
- android:layout_marginBottom="20px"
+
+
+ android:layout_width="fill_parent"
+ android:layout_below="@id/main_menu_hours_neuf_header" />
+
+
+
+
+
@@ -90,6 +117,7 @@
+ android:text="@string/bli_med_button" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 20882c0..2dfc92e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -11,4 +11,5 @@
Kategorier
Velg kategori
Vent til oppdateringen fullfører
+ Ã…pningstider
diff --git a/src/com/studentersamfundet/app/ui/BaseDnsActivity.java b/src/com/studentersamfundet/app/ui/BaseDnsActivity.java
index 6068f85..8b4600d 100644
--- a/src/com/studentersamfundet/app/ui/BaseDnsActivity.java
+++ b/src/com/studentersamfundet/app/ui/BaseDnsActivity.java
@@ -38,4 +38,8 @@ public abstract class BaseDnsActivity extends Activity {
startActivity(intent);
}
}
+
+ public void doNothing(View v) {
+ /* As promised. */
+ }
}
diff --git a/src/com/studentersamfundet/app/ui/DnsActivity.java b/src/com/studentersamfundet/app/ui/DnsActivity.java
index 2937a8b..b966e8e 100644
--- a/src/com/studentersamfundet/app/ui/DnsActivity.java
+++ b/src/com/studentersamfundet/app/ui/DnsActivity.java
@@ -36,13 +36,14 @@ public class DnsActivity extends BaseDnsActivity {
setContentView(R.layout.main);
/* Set opening hours: */
- TextView openingHours = (TextView)findViewById(R.id.main_menu_openinghours);
+ TextView tvNeuf = (TextView)findViewById(R.id.main_menu_hours_neuf);
+ TextView tvBC = (TextView)findViewById(R.id.main_menu_hours_bc);
int day = (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) + 5) % 7;
- openingHours.setText(
- "Huset "+openingHoursHouse[day]
- +"\nKjøkkenet - 19.00"
- +"\nBokCaféen "+openingHoursBC[day]);
+ tvNeuf.setText(openingHoursHouse[day]);
+
+ // +"\nKjøkkenet - 19.00"
+ tvBC.setText(openingHoursBC[day]);
}