Skip to content

Commit 4ca4e7b

Browse files
DAGalpinDAGalpin
committed
Updated the detail layout to make use of a secondary grid layout.
1 parent ce3459b commit 4ca4e7b

1 file changed

Lines changed: 64 additions & 96 deletions

File tree

‎app/src/main/res/layout/fragment_detail.xml‎

Lines changed: 64 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@
1414
limitations under the License.
1515
-->
1616
<!-- Master layout. -->
17-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
17+
<LinearLayout
18+
xmlns:android="http://schemas.android.com/apk/res/android"
1819
xmlns:tools="http://schemas.android.com/tools"
20+
xmlns:app="http://schemas.android.com/apk/res-auto"
1921
android:layout_width="match_parent"
2022
android:layout_height="match_parent"
2123
android:orientation="vertical">
@@ -31,110 +33,76 @@
3133
android:layout_height="0dp"
3234
android:layout_weight="3"/>
3335

34-
<LinearLayout
36+
<android.support.v7.widget.GridLayout
3537
android:id="@+id/detail_additional_pane"
3638
android:layout_width="match_parent"
3739
android:layout_height="0dp"
3840
android:layout_weight="2"
41+
app:columnCount="2"
3942
android:background="@color/detail_accent_pane_background"
40-
android:orientation="vertical"
4143
android:paddingBottom="@dimen/abc_list_item_padding_horizontal_material"
42-
android:paddingEnd="@dimen/forecast_detail_horizontal_padding"
44+
android:paddingTop="@dimen/abc_list_item_padding_horizontal_material"
4345
android:paddingLeft="@dimen/forecast_detail_horizontal_padding"
44-
android:paddingRight="@dimen/forecast_detail_horizontal_padding"
4546
android:paddingStart="@dimen/forecast_detail_horizontal_padding"
46-
android:paddingTop="@dimen/abc_list_item_padding_horizontal_material">
47-
48-
<LinearLayout
49-
android:layout_width="match_parent"
50-
android:layout_height="wrap_content"
51-
android:orientation="horizontal">
52-
53-
<TextView
54-
android:id="@+id/detail_humidity_label_textview"
55-
android:layout_width="wrap_content"
56-
android:layout_height="wrap_content"
57-
android:fontFamily="sans-serif"
58-
android:paddingEnd="@dimen/forecast_detail_horizontal_padding"
59-
android:paddingRight="@dimen/forecast_detail_horizontal_padding"
60-
android:gravity="center_vertical"
61-
android:text="@string/humidity"
62-
android:textAppearance="@style/TextAppearance.AppCompat.Title"
63-
android:textColor="@color/detail_accent_label" />
64-
65-
<TextView
66-
android:layout_height="wrap_content"
67-
android:layout_width="wrap_content"
68-
android:paddingEnd="@dimen/forecast_detail_horizontal_padding"
69-
android:paddingRight="@dimen/forecast_detail_horizontal_padding"
70-
android:id="@+id/detail_humidity_textview"
71-
android:gravity="center_vertical"
72-
android:textAppearance="@style/TextAppearance.AppCompat.Headline"
73-
android:textColor="@android:color/white"
74-
tools:text="38%" />
75-
</LinearLayout>
76-
77-
<LinearLayout
78-
android:layout_width="match_parent"
79-
android:layout_height="wrap_content"
80-
android:orientation="horizontal">
81-
82-
<TextView
83-
android:layout_width="wrap_content"
84-
android:layout_height="wrap_content"
85-
android:paddingEnd="@dimen/forecast_detail_horizontal_padding"
86-
android:paddingRight="@dimen/forecast_detail_horizontal_padding"
87-
android:id="@+id/detail_pressure_label_textview"
88-
android:fontFamily="sans-serif"
89-
android:gravity="center_vertical"
90-
android:text="@string/pressure"
91-
android:textAppearance="@style/TextAppearance.AppCompat.Title"
92-
android:textColor="@color/detail_accent_label" />
93-
94-
95-
<TextView
96-
android:layout_width="wrap_content"
97-
android:layout_height="wrap_content"
98-
android:id="@+id/detail_pressure_textview"
99-
android:gravity="center_vertical"
100-
android:textAppearance="@style/TextAppearance.AppCompat.Headline"
101-
android:textColor="@android:color/white"
102-
tools:text="995 hPa" />
103-
104-
</LinearLayout>
47+
android:paddingRight="@dimen/forecast_detail_horizontal_padding"
48+
android:paddingEnd="@dimen/forecast_detail_horizontal_padding">
10549

106-
<LinearLayout
107-
android:layout_width="match_parent"
50+
<TextView
51+
android:id="@+id/detail_humidity_label_textview"
10852
android:layout_height="wrap_content"
109-
android:orientation="horizontal">
110-
111-
<TextView
112-
android:layout_width="wrap_content"
113-
android:layout_height="wrap_content"
114-
android:paddingEnd="@dimen/forecast_detail_horizontal_padding"
115-
android:paddingRight="@dimen/forecast_detail_horizontal_padding"
116-
android:id="@+id/detail_wind_label_textview"
117-
android:fontFamily="sans-serif"
118-
android:gravity="center_vertical"
119-
android:text="@string/wind"
120-
android:textColor="@color/detail_accent_label"
121-
android:textAppearance="@style/TextAppearance.AppCompat.Title" />
122-
123-
124-
<TextView
125-
android:layout_width="wrap_content"
126-
android:layout_height="wrap_content"
127-
android:id="@+id/detail_wind_textview"
128-
android:gravity="center_vertical"
129-
android:textAppearance="@style/TextAppearance.AppCompat.Headline"
130-
android:textColor="@android:color/white"
131-
tools:text="4km/h NW" />
132-
</LinearLayout>
133-
</LinearLayout>
53+
android:fontFamily="sans-serif"
54+
android:gravity="center_vertical"
55+
android:text="@string/humidity"
56+
android:textAppearance="@style/TextAppearance.AppCompat.Title"
57+
android:textColor="@color/detail_accent_label"
58+
app:layout_columnWeight="1"
59+
app:layout_gravity="fill"
60+
app:layout_rowWeight="1" />
61+
62+
<TextView
63+
android:id="@+id/detail_humidity_textview"
64+
android:gravity="center_vertical"
65+
tools:text="38%"
66+
android:textAppearance="@style/TextAppearance.AppCompat.Headline"
67+
android:textColor="@android:color/white"
68+
app:layout_gravity="fill"/>
69+
70+
<TextView
71+
android:id="@+id/detail_pressure_label_textview"
72+
android:fontFamily="sans-serif"
73+
android:gravity="center_vertical"
74+
android:text="@string/pressure"
75+
android:textAppearance="@style/TextAppearance.AppCompat.Title"
76+
android:textColor="@color/detail_accent_label"
77+
app:layout_gravity="fill"
78+
app:layout_rowWeight="1"/>
79+
80+
<TextView
81+
android:id="@+id/detail_pressure_textview"
82+
android:gravity="center_vertical"
83+
tools:text="995 hPa"
84+
android:textAppearance="@style/TextAppearance.AppCompat.Headline"
85+
android:textColor="@android:color/white"
86+
app:layout_gravity="fill"/>
87+
88+
<TextView
89+
android:id="@+id/detail_wind_label_textview"
90+
android:fontFamily="sans-serif"
91+
android:gravity="center_vertical"
92+
android:text="@string/wind"
93+
android:textColor="@color/detail_accent_label"
94+
android:textSize="20sp"
95+
app:layout_gravity="fill"
96+
app:layout_rowWeight="1" />
97+
98+
99+
<TextView
100+
android:id="@+id/detail_wind_textview"
101+
android:gravity="center_vertical"
102+
tools:text="4km/h NW"
103+
android:textAppearance="@style/TextAppearance.AppCompat.Headline"
104+
android:textColor="@android:color/white"
105+
app:layout_gravity="fill" />
106+
</android.support.v7.widget.GridLayout>
134107

135-
<ImageSwitcher
136-
android:layout_width="wrap_content"
137-
android:layout_height="wrap_content"
138-
android:id="@+id/imageSwitcher"
139-
android:layout_gravity="right" />
140108
</LinearLayout>

0 commit comments

Comments
 (0)