From 4af1d113091730e0acb5ce88d080b9facc7bb637 Mon Sep 17 00:00:00 2001
From: Robert Kolner <robert.kolner@gmail.com>
Date: Mon, 5 Dec 2011 16:18:52 +0100
Subject: [PATCH 1/2] First attempt at third version of gui.

---
 res/layout/main.xml | 97 ++++++++++++++++++++++++++++++---------------
 1 file changed, 64 insertions(+), 33 deletions(-)

diff --git a/res/layout/main.xml b/res/layout/main.xml
index 185e5b4..8144f67 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -26,54 +26,39 @@
 		android:orientation="vertical"
 		android:gravity="center">
 	    
+	    <!-- Opening hours: -->
 	    <LinearLayout
-	        android:layout_height="fill_parent"
-			android:layout_width="fill_parent" 
+	        android:layout_height="wrap_content"
+			android:layout_width="fill_parent"
+			android:layout_marginBottom="30px" 
 			android:orientation="horizontal"
-			android:layout_weight="1"
-			android:gravity="center">
-			
-		    <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:onClick="programButton">
-				
-				<TextView 
-		            style="@style/MetroTileText_bg"
-		            android:layout_height="wrap_content"
-		            android:layout_width="fill_parent"
-		            android:layout_alignParentBottom="true"
-		            android:text="@string/program_button" />
-	        </RelativeLayout>
+			android:gravity="center"
+			android:focusable="false"
+			android:clickable="false">
 		    
 		    
 		    <RelativeLayout android:id="@+id/main_menu_hours"
 		        style="@style/MetroTile"
-		        android:background="@drawable/ex2"
+		        android:background="#000000"
             	android:layout_margin="5px"
-		        android:layout_height="fill_parent"
+		        android:layout_height="wrap_content"
 		        android:layout_width="fill_parent"
-		        android:onClick="doNothing"
-		        android:layout_weight="1">
+		        android:layout_weight="0.5">
 		        
-		        <TextView
+		        <!-- 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:layout_alignParentBottom="true"
+		            android:layout_alignParentTop="true"
 		            android:text="@string/main_menu_opening_hours" />
 		        
-		        <!-- OPENING HOURS: -->
-		        <TextView android:id="@+id/main_menu_hours_neuf_header" 
+		        <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_below="@id/main_menu_hours_header"
 		            android:layout_marginTop="10px"
 		            android:layout_marginBottom="10px"
 		            android:text="Chateau Neuf" />
@@ -109,6 +94,7 @@
 		    </RelativeLayout>
 	    </LinearLayout>
 	    
+        <!-- Row nr 1: -->
 	    <LinearLayout
 	        android:layout_height="match_parent"
 			android:layout_width="match_parent" 
@@ -116,13 +102,30 @@
 			android:layout_weight="1"
 			android:gravity="center">
 		    
-		    <RelativeLayout android:id="@+id/main_menu_tickets"
+	        <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="0.5"
+		        android:onClick="programButton">
+				
+				<TextView 
+		            style="@style/MetroTileText_bg"
+		            android:layout_height="wrap_content"
+		            android:layout_width="fill_parent"
+		            android:layout_alignParentBottom="true"
+		            android:text="@string/program_button" />
+	        </RelativeLayout>
+	        
+	        <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 +135,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 +152,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 +162,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>
\ No newline at end of file

From 5871e04a88e1be436329b40fb88c089799fd3a0e Mon Sep 17 00:00:00 2001
From: Robert Kolner <robert.kolner@gmail.com>
Date: Mon, 5 Dec 2011 16:38:28 +0100
Subject: [PATCH 2/2] Fixed some layout issues.

---
 res/layout/main.xml | 114 +++++++++++++++++++++++++++-----------------
 1 file changed, 71 insertions(+), 43 deletions(-)

diff --git a/res/layout/main.xml b/res/layout/main.xml
index 8144f67..31f3db5 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -21,67 +21,67 @@
 		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
+	    <LinearLayout android:id="@+id/main_menu_hours"
+           	android:layout_marginBottom="20px"
 	        android:layout_height="wrap_content"
-			android:layout_width="fill_parent"
-			android:layout_marginBottom="30px" 
-			android:orientation="horizontal"
-			android:gravity="center"
-			android:focusable="false"
-			android:clickable="false">
-		    
-		    
-		    <RelativeLayout android:id="@+id/main_menu_hours"
-		        style="@style/MetroTile"
-		        android:background="#000000"
-            	android:layout_margin="5px"
-		        android:layout_height="wrap_content"
-		        android:layout_width="fill_parent"
-		        android:layout_weight="0.5">
-		        
-		        <!-- 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:layout_alignParentTop="true"
-		            android:text="@string/main_menu_opening_hours" />
-		        
-		        <TextView android:id="@+id/main_menu_hours_neuf_header"
-		            style="@style/MetroTileText_bg"
+	        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_below="@id/main_menu_hours_header"
-		            android:layout_marginTop="10px"
-		            android:layout_marginBottom="10px"
+		            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_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" />
-		            
+		            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 android:id="@+id/main_menu_hours_bc_header" 
-		            style="@style/MetroTileText_bg"
+		        <TextView
+		            style="@style/MetroTileText"
 		            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:layout_weight="0.5"
+		            android:layout_marginLeft="20px"
+		            android:gravity="left"
 		            android:text="Bokcaféen" />
 		            
 		        <!-- This is set in Java: -->
@@ -90,8 +90,36 @@
 		            android:textSize="10sp"
 		            android:layout_height="wrap_content"
 		            android:layout_width="fill_parent"
-		            android:layout_below="@id/main_menu_hours_bc_header" />
-		    </RelativeLayout>
+		            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: -->