From 4ca4e7b45ccdc4af78782a7f1177692e1f5328c5 Mon Sep 17 00:00:00 2001
From: Dan Galpin <dgalpin@google.com>
Date: Mon, 25 May 2015 01:49:07 -0700
Subject: [PATCH] Updated the detail layout to make use of a secondary grid
 layout.

---
 app/src/main/res/layout/fragment_detail.xml | 148 ++++++++------------
 1 file changed, 58 insertions(+), 90 deletions(-)

diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml
index f4108dd..083ea10 100644
--- a/app/src/main/res/layout/fragment_detail.xml
+++ b/app/src/main/res/layout/fragment_detail.xml
@@ -14,8 +14,10 @@
      limitations under the License.
  -->
 <!-- Master layout. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -31,110 +33,76 @@
         android:layout_height="0dp"
         android:layout_weight="3"/>
 
-    <LinearLayout
+    <android.support.v7.widget.GridLayout
         android:id="@+id/detail_additional_pane"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="2"
+        app:columnCount="2"
         android:background="@color/detail_accent_pane_background"
-        android:orientation="vertical"
         android:paddingBottom="@dimen/abc_list_item_padding_horizontal_material"
-        android:paddingEnd="@dimen/forecast_detail_horizontal_padding"
+        android:paddingTop="@dimen/abc_list_item_padding_horizontal_material"
         android:paddingLeft="@dimen/forecast_detail_horizontal_padding"
-        android:paddingRight="@dimen/forecast_detail_horizontal_padding"
         android:paddingStart="@dimen/forecast_detail_horizontal_padding"
-        android:paddingTop="@dimen/abc_list_item_padding_horizontal_material">
+        android:paddingRight="@dimen/forecast_detail_horizontal_padding"
+        android:paddingEnd="@dimen/forecast_detail_horizontal_padding">
 
-        <LinearLayout
-            android:layout_width="match_parent"
+        <TextView
+            android:id="@+id/detail_humidity_label_textview"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:fontFamily="sans-serif"
+            android:gravity="center_vertical"
+            android:text="@string/humidity"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:textColor="@color/detail_accent_label"
+            app:layout_columnWeight="1"
+            app:layout_gravity="fill"
+            app:layout_rowWeight="1" />
 
-            <TextView
-                android:id="@+id/detail_humidity_label_textview"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif"
-                android:paddingEnd="@dimen/forecast_detail_horizontal_padding"
-                android:paddingRight="@dimen/forecast_detail_horizontal_padding"
-                android:gravity="center_vertical"
-                android:text="@string/humidity"
-                android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                android:textColor="@color/detail_accent_label" />
+        <TextView
+            android:id="@+id/detail_humidity_textview"
+            android:gravity="center_vertical"
+            tools:text="38%"
+            android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+            android:textColor="@android:color/white"
+            app:layout_gravity="fill"/>
 
-            <TextView
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:paddingEnd="@dimen/forecast_detail_horizontal_padding"
-                android:paddingRight="@dimen/forecast_detail_horizontal_padding"
-                android:id="@+id/detail_humidity_textview"
-                android:gravity="center_vertical"
-                android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-                android:textColor="@android:color/white"
-                tools:text="38%" />
-        </LinearLayout>
+        <TextView
+            android:id="@+id/detail_pressure_label_textview"
+            android:fontFamily="sans-serif"
+            android:gravity="center_vertical"
+            android:text="@string/pressure"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:textColor="@color/detail_accent_label"
+            app:layout_gravity="fill"
+            app:layout_rowWeight="1"/>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
+        <TextView
+            android:id="@+id/detail_pressure_textview"
+            android:gravity="center_vertical"
+            tools:text="995 hPa"
+            android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+            android:textColor="@android:color/white"
+            app:layout_gravity="fill"/>
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingEnd="@dimen/forecast_detail_horizontal_padding"
-                android:paddingRight="@dimen/forecast_detail_horizontal_padding"
-                android:id="@+id/detail_pressure_label_textview"
-                android:fontFamily="sans-serif"
-                android:gravity="center_vertical"
-                android:text="@string/pressure"
-                android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                android:textColor="@color/detail_accent_label" />
+        <TextView
+            android:id="@+id/detail_wind_label_textview"
+            android:fontFamily="sans-serif"
+            android:gravity="center_vertical"
+            android:text="@string/wind"
+            android:textColor="@color/detail_accent_label"
+            android:textSize="20sp"
+            app:layout_gravity="fill"
+            app:layout_rowWeight="1" />
 
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/detail_pressure_textview"
-                android:gravity="center_vertical"
-                android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-                android:textColor="@android:color/white"
-                tools:text="995 hPa" />
+        <TextView
+            android:id="@+id/detail_wind_textview"
+            android:gravity="center_vertical"
+            tools:text="4km/h NW"
+            android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+            android:textColor="@android:color/white"
+            app:layout_gravity="fill" />
+    </android.support.v7.widget.GridLayout>
 
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingEnd="@dimen/forecast_detail_horizontal_padding"
-                android:paddingRight="@dimen/forecast_detail_horizontal_padding"
-                android:id="@+id/detail_wind_label_textview"
-                android:fontFamily="sans-serif"
-                android:gravity="center_vertical"
-                android:text="@string/wind"
-                android:textColor="@color/detail_accent_label"
-                android:textAppearance="@style/TextAppearance.AppCompat.Title" />
-
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/detail_wind_textview"
-                android:gravity="center_vertical"
-                android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-                android:textColor="@android:color/white"
-                tools:text="4km/h NW" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <ImageSwitcher
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/imageSwitcher"
-        android:layout_gravity="right" />
 </LinearLayout>