Archived
Merge branch 'newgui'
This commit is contained in:
Robert Kolner committed
commit
fd6fdfacf5
1 file changed
+136
-77
+136
-77
@@ -21,25 +21,122 @@
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_below="@id/header"
|
||||
android:layout_above="@id/footer"
|
||||
android:layout_marginTop="30px"
|
||||
android:layout_marginBottom="30px"
|
||||
android:layout_marginTop="20px"
|
||||
android:layout_marginBottom="20px"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center">
|
||||
|
||||
<!-- Opening hours: -->
|
||||
<LinearLayout android:id="@+id/main_menu_hours"
|
||||
android:layout_marginBottom="20px"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<!-- OPENING HOURS: -->
|
||||
<TextView android:id="@+id/main_menu_hours_header"
|
||||
style="@style/MetroTileText_bg"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:text="@string/main_menu_opening_hours" />
|
||||
|
||||
<LinearLayout android:id="@+id/main_menu_hours_neuf_header"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_marginTop="10px"
|
||||
android:layout_marginBottom="10px"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
style="@style/MetroTileText"
|
||||
android:textSize="12sp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_weight="0.5"
|
||||
android:layout_marginLeft="20px"
|
||||
android:gravity="left"
|
||||
android:text="Chateau Neuf" />
|
||||
|
||||
<!-- This is set in Java: -->
|
||||
<TextView android:id="@+id/main_menu_hours_neuf"
|
||||
style="@style/MetroTileText"
|
||||
android:textSize="10sp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_weight="0.5"
|
||||
android:gravity="left" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout android:id="@+id/main_menu_hours_bc_header"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_marginTop="10px"
|
||||
android:layout_marginBottom="10px"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
style="@style/MetroTileText"
|
||||
android:textSize="12sp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_weight="0.5"
|
||||
android:layout_marginLeft="20px"
|
||||
android:gravity="left"
|
||||
android:text="Bokcaféen" />
|
||||
|
||||
<!-- This is set in Java: -->
|
||||
<TextView android:id="@+id/main_menu_hours_bc"
|
||||
style="@style/MetroTileText"
|
||||
android:textSize="10sp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_weight="0.5"
|
||||
android:gravity="left" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout android:id="@+id/main_menu_hours_gb_header"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_marginTop="10px"
|
||||
android:layout_marginBottom="10px"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
style="@style/MetroTileText"
|
||||
android:textSize="12sp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_weight="0.5"
|
||||
android:layout_marginLeft="20px"
|
||||
android:gravity="left"
|
||||
android:text="Glassbaren" />
|
||||
|
||||
<!-- This is set in Java: -->
|
||||
<TextView android:id="@+id/main_menu_hours_gb"
|
||||
style="@style/MetroTileText"
|
||||
android:textSize="10sp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_weight="0.5"
|
||||
android:gravity="left" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Row nr 1: -->
|
||||
<LinearLayout
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="match_parent"
|
||||
android:orientation="horizontal"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center">
|
||||
|
||||
<RelativeLayout android:id="@+id/main_menu_program"
|
||||
|
||||
<RelativeLayout android:id="@+id/main_menu_program"
|
||||
style="@style/MetroTile"
|
||||
android:background="@drawable/ex1"
|
||||
android:layout_margin="5px"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_weight="1"
|
||||
android:layout_weight="0.5"
|
||||
android:onClick="programButton">
|
||||
|
||||
<TextView
|
||||
@@ -49,80 +146,14 @@
|
||||
android:layout_alignParentBottom="true"
|
||||
android:text="@string/program_button" />
|
||||
</RelativeLayout>
|
||||
|
||||
|
||||
<RelativeLayout android:id="@+id/main_menu_hours"
|
||||
style="@style/MetroTile"
|
||||
android:background="@drawable/ex2"
|
||||
android:layout_margin="5px"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_width="fill_parent"
|
||||
android:onClick="doNothing"
|
||||
android:layout_weight="1">
|
||||
|
||||
<TextView
|
||||
style="@style/MetroTileText_bg"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:text="@string/main_menu_opening_hours" />
|
||||
|
||||
<!-- OPENING HOURS: -->
|
||||
<TextView android:id="@+id/main_menu_hours_neuf_header"
|
||||
style="@style/MetroTileText_bg"
|
||||
android:textSize="12sp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_marginTop="10px"
|
||||
android:layout_marginBottom="10px"
|
||||
android:text="Chateau Neuf" />
|
||||
|
||||
<!-- This is set in Java: -->
|
||||
<TextView android:id="@+id/main_menu_hours_neuf"
|
||||
style="@style/MetroTileText"
|
||||
android:textSize="10sp"
|
||||
android:layout_marginLeft="5px"
|
||||
android:layout_marginRight="5px"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_below="@id/main_menu_hours_neuf_header" />
|
||||
|
||||
|
||||
<TextView android:id="@+id/main_menu_hours_bc_header"
|
||||
style="@style/MetroTileText_bg"
|
||||
android:textSize="12sp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_marginTop="10px"
|
||||
android:layout_marginBottom="10px"
|
||||
android:layout_below="@id/main_menu_hours_neuf"
|
||||
android:text="Bokcaféen" />
|
||||
|
||||
<!-- This is set in Java: -->
|
||||
<TextView android:id="@+id/main_menu_hours_bc"
|
||||
style="@style/MetroTileText"
|
||||
android:textSize="10sp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_below="@id/main_menu_hours_bc_header" />
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="match_parent"
|
||||
android:orientation="horizontal"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center">
|
||||
|
||||
<RelativeLayout android:id="@+id/main_menu_tickets"
|
||||
|
||||
<RelativeLayout android:id="@+id/main_menu_tickets"
|
||||
style="@style/MetroTile"
|
||||
android:background="@drawable/ex3"
|
||||
android:layout_margin="5px"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:layout_weight="0.5"
|
||||
android:onClick="ticketButton">
|
||||
|
||||
<TextView
|
||||
@@ -132,6 +163,16 @@
|
||||
android:layout_alignParentBottom="true"
|
||||
android:text="@string/main_menu_tickets" />
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Row nr 2: -->
|
||||
<LinearLayout
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="match_parent"
|
||||
android:orientation="horizontal"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center">
|
||||
|
||||
|
||||
<RelativeLayout android:id="@+id/main_menu_join"
|
||||
style="@style/MetroTile"
|
||||
@@ -139,7 +180,7 @@
|
||||
android:layout_margin="5px"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:layout_weight="0.5"
|
||||
android:onClick="joinButton">
|
||||
|
||||
<TextView
|
||||
@@ -149,6 +190,24 @@
|
||||
android:layout_alignParentBottom="true"
|
||||
android:text="@string/bli_med_button" />
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout android:id="@+id/main_menu_unused"
|
||||
style="@style/MetroTile"
|
||||
android:visibility="invisible"
|
||||
android:background="#000000"
|
||||
android:layout_margin="5px"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_weight="0.5"
|
||||
android:onClick="doNothing">
|
||||
|
||||
<TextView
|
||||
style="@style/MetroTileText_bg"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:text="INVALID" />
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
Reference in new issue
Block a user