diff --git a/README b/README
index e69de29..9b5104a 100644
--- a/README
+++ b/README
@@ -0,0 +1,5 @@
+TODO:
+- "Today@Neuf" main screen
+- Redesign GUI / make logical menu system
+- Write a mail to designers
+- Streaming?
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 095ae3c..2ac5a33 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -9,18 +9,73 @@
android:layout_alignParentTop="true"/>
-
+ android:layout_alignParentBottom="true" /> -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ android:src="@drawable/partest" /> -->
\ No newline at end of file
diff --git a/src/com/studentersamfundet/app/ui/DnsActivity.java b/src/com/studentersamfundet/app/ui/DnsActivity.java
index b2f87e2..6b3a0e8 100644
--- a/src/com/studentersamfundet/app/ui/DnsActivity.java
+++ b/src/com/studentersamfundet/app/ui/DnsActivity.java
@@ -1,15 +1,46 @@
package com.studentersamfundet.app.ui;
+import android.content.Intent;
import android.os.Bundle;
+import android.view.View;
+import android.widget.Toast;
import com.studentersamfundet.app.R;
public class DnsActivity extends BaseDnsActivity {
-
- /** Called when the activity is first created. */
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.main);
- }
+
+ /** Called when the activity is first created. */
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.main);
+ }
+
+ public void programButton(View v) {
+ Intent intent = new Intent();
+
+ intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
+ | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+ intent.setClass(this, ProgramListActivity.class);
+
+ startActivity(intent);
+ }
+
+ public void ticketButton(View v) {
+ Toast.makeText(this, "Not implemented (yet!)", Toast.LENGTH_SHORT).show();
+ }
+
+ public void streamButton(View v) {
+ Toast.makeText(this, "Not implemented (yet!)", Toast.LENGTH_SHORT).show();
+ }
+
+ public void joinButton(View v) {
+ Intent intent = new Intent();
+
+ intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+ intent.setClass(this, JoinUsActivity.class);
+
+ startActivity(intent);
+
+ }
}
\ No newline at end of file