From 719fd314a56bcbc4de20d2e6555c0338325c8bc6 Mon Sep 17 00:00:00 2001
From: Andy2 <andy2@trand>
Date: Sat, 6 Aug 2011 16:03:38 -0700
Subject: [PATCH] move net msg icon outside of hideable part of game list item
 layout so it remains visible when not expanded.  Otherwise people won't see
 that something happened to a closed game.

---
 .../XWords4/res/layout/game_list_item.xml     | 139 ++++++++++--------
 1 file changed, 77 insertions(+), 62 deletions(-)

diff --git a/xwords4/android/XWords4/res/layout/game_list_item.xml b/xwords4/android/XWords4/res/layout/game_list_item.xml
index b9711cf0d..4a412a218 100644
--- a/xwords4/android/XWords4/res/layout/game_list_item.xml
+++ b/xwords4/android/XWords4/res/layout/game_list_item.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- -*- compile-command: "cd ../../; ant install"; -*- -->
 
+
+<!-- top-level layout is hozontal, with an image and another layout -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
+              android:orientation="horizontal"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
               android:longClickable="true"
@@ -11,77 +13,90 @@
               android:background="@android:drawable/list_selector_background"
               >
 
-  <LinearLayout android:orientation="horizontal"
+  <ImageView android:id="@+id/msg_marker"
+	         android:layout_width="wrap_content"
+	         android:layout_height="fill_parent"
+             android:layout_gravity="center_vertical|center_horizontal"
+             android:layout_weight="0"
+             android:visibility="gone"
+    	     android:src="@drawable/ic_popup_sync_1"
+             />
+
+  <!-- this layout is vertical, holds everything but the status
+       icon[s] (plural later) -->
+  <LinearLayout android:orientation="vertical"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 >
 
-  <TextView android:id="@+id/game_name"
-	        android:layout_width="wrap_content" 
-	        android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_weight="1"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            />
-
-  <ImageButton android:id="@+id/expander"
-               android:layout_width="32dp" 
-	           android:layout_height="32dp"
-               android:src="@drawable/expander_ic_maximized"
-               />
-
-  </LinearLayout>
-
-  <LinearLayout android:id="@+id/hideable"
-                android:orientation="horizontal"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:padding="4sp">
-
-    <ImageView android:id="@+id/msg_marker"
-	           android:layout_width="wrap_content"
-	           android:layout_height="fill_parent"
-               android:layout_gravity="center_vertical|center_horizontal"
-               android:layout_weight="0"
-               android:visibility="gone"
-    	       android:src="@drawable/ic_popup_sync_1"
-               />
-
-    <LinearLayout android:orientation="vertical"
-                  android:layout_width="wrap_content"
-                  android:layout_height="fill_parent"
-                  android:layout_weight="1"
+    <!-- This is the game name and expander -->
+    <LinearLayout android:orientation="horizontal"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
                   >
-      
-      <LinearLayout android:id="@+id/player_list"
-                    android:orientation="vertical"
+
+      <TextView android:id="@+id/game_name"
+	            android:layout_width="wrap_content" 
+	            android:layout_height="wrap_content"
+                android:gravity="center"
+                android:layout_weight="1"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                />
+
+      <ImageButton android:id="@+id/expander"
+                   android:layout_width="32dp" 
+	               android:layout_height="32dp"
+                   android:src="@drawable/expander_ic_maximized"
+                   />
+
+    </LinearLayout>
+
+    <!-- This is everything below the name (which can be hidden) -->
+    <LinearLayout android:id="@+id/hideable"
+                  android:orientation="horizontal"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:padding="4sp">
+
+      <!-- Player list plus connection status -->
+      <LinearLayout android:orientation="vertical"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="fill_parent"
+                    android:layout_weight="1"
                     >
+        
+        <!-- Player names container I stick stuff in -->
+        <LinearLayout android:id="@+id/player_list"
+                      android:orientation="vertical"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      >
+        </LinearLayout>
+
+        <TextView android:id="@+id/role"
+	              android:layout_width="wrap_content" 
+	              android:layout_height="wrap_content"
+                  />
+      </LinearLayout> <!-- end players column -->
+
+      <!-- holds right column.  Could hold more... -->
+      <LinearLayout android:orientation="vertical"
+                    android:layout_width="wrap_content"
+                    android:layout_height="fill_parent"
+                    >
+        <TextView android:id="@+id/modtime"
+	              android:layout_width="wrap_content" 
+	              android:layout_height="wrap_content"
+	              android:gravity="right"
+                  />
+        <TextView android:id="@+id/state"
+	              android:layout_width="wrap_content" 
+	              android:layout_height="wrap_content"
+	              android:gravity="right"
+                  />
       </LinearLayout>
 
-      <TextView android:id="@+id/role"
-	            android:layout_width="wrap_content" 
-	            android:layout_height="wrap_content"
-                />
-    </LinearLayout>
-
-    <LinearLayout android:orientation="vertical"
-                  android:layout_width="wrap_content"
-                  android:layout_height="fill_parent"
-                  >
-      <TextView android:id="@+id/modtime"
-	            android:layout_width="wrap_content" 
-	            android:layout_height="wrap_content"
-	            android:gravity="right"
-                />
-      <TextView android:id="@+id/state"
-	            android:layout_width="wrap_content" 
-	            android:layout_height="wrap_content"
-	            android:gravity="right"
-                />
     </LinearLayout>
 
   </LinearLayout>
-
 </LinearLayout>