First attempt at new GUI.

This commit is contained in:
Robert Kolner committed 2011-10-31 15:23:48 +01:00
1 parent 98c75036a3
commit edb890fbe5
3 files changed
+95 -4

No files matched your search

+5
View File
@@ -0,0 +1,5 @@
TODO:
- "Today@Neuf" main screen
- Redesign GUI / make logical menu system
- Write a mail to designers
- Streaming?
+59 -4
View File
@@ -9,18 +9,73 @@
android:layout_alignParentTop="true"/> android:layout_alignParentTop="true"/>
<!-- Footer --> <!-- Footer -->
<include layout="@layout/footer" <!-- <include layout="@layout/footer"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_alignParentBottom="true" /> android:layout_alignParentBottom="true" /> -->
<!-- MENU: -->
<LinearLayout
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:layout_below="@id/header"
android:layout_marginTop="20px"
android:layout_marginBottom="20px"
android:orientation="vertical"
android:gravity="center">
<LinearLayout
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:orientation="horizontal"
android:layout_weight="1"
android:gravity="center">
<Button android:id="@+id/main_menu_program"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:layout_weight="1"
android:onClick="programButton"
android:text="Button 1" />
<Button android:id="@+id/main_menu_tickets"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:layout_weight="1"
android:onClick="ticketButton"
android:text="Button 2" />
</LinearLayout>
<LinearLayout
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:orientation="horizontal"
android:layout_weight="1"
android:gravity="center">
<Button android:id="@+id/main_menu_stream"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:layout_weight="1"
android:onClick="streamButton"
android:text="Button 3" />
<Button android:id="@+id/main_menu_join"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:layout_weight="1"
android:onClick="joinButton"
android:text="Button 4" />
</LinearLayout>
</LinearLayout>
<!-- Formålsparagraf --> <!-- Formålsparagraf -->
<ImageView <!-- <ImageView
android:id="@+id/paragraph" android:id="@+id/paragraph"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:src="@drawable/partest" /> android:src="@drawable/partest" /> -->
</RelativeLayout> </RelativeLayout>
@@ -1,6 +1,9 @@
package com.studentersamfundet.app.ui; package com.studentersamfundet.app.ui;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.View;
import android.widget.Toast;
import com.studentersamfundet.app.R; import com.studentersamfundet.app.R;
@@ -12,4 +15,32 @@ public class DnsActivity extends BaseDnsActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.main); 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);
}
} }