diff --git a/.gitignore b/.gitignore index a609a53..62e9792 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ bin gen doc +project.properties diff --git a/res/layout/main.xml b/res/layout/main.xml index 096e652..0e88945 100644 --- a/res/layout/main.xml +++ b/res/layout/main.xml @@ -20,130 +20,30 @@ android:gravity="center"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - + + + @@ -154,41 +54,20 @@ android:layout_weight="1" android:gravity="center"> + + + - - - - - - - - + \ No newline at end of file diff --git a/res/layout/main_hours.xml b/res/layout/main_hours.xml new file mode 100644 index 0000000..1feef64 --- /dev/null +++ b/res/layout/main_hours.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/main_tile_join.xml b/res/layout/main_tile_join.xml new file mode 100644 index 0000000..41bdba2 --- /dev/null +++ b/res/layout/main_tile_join.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/res/layout/main_tile_news.xml b/res/layout/main_tile_news.xml new file mode 100644 index 0000000..b1d225a --- /dev/null +++ b/res/layout/main_tile_news.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/res/layout/main_tile_program.xml b/res/layout/main_tile_program.xml new file mode 100644 index 0000000..bd827fe --- /dev/null +++ b/res/layout/main_tile_program.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/res/layout/main_tile_tickets.xml b/res/layout/main_tile_tickets.xml new file mode 100644 index 0000000..f19daf5 --- /dev/null +++ b/res/layout/main_tile_tickets.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 3b2fc89..f2e2a32 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -13,4 +13,5 @@ Vent til oppdateringen fullførerPROGRAM ÅPNINGSTIDER I DAG BILLETTERBLI MED + NYHETER diff --git a/src/com/studentersamfundet/app/ui/DnsActivity.java b/src/com/studentersamfundet/app/ui/DnsActivity.java index 9dbb4ad..1c038ce 100644 --- a/src/com/studentersamfundet/app/ui/DnsActivity.java +++ b/src/com/studentersamfundet/app/ui/DnsActivity.java @@ -66,6 +66,7 @@ public class DnsActivity extends BaseDnsActivity { findViewById(R.id.main_menu_program), findViewById(R.id.main_menu_tickets), findViewById(R.id.main_menu_join), + findViewById(R.id.main_menu_news), }; for (int i = 0; i < buttons.length; i++) {