bauer/UdacityProject6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated the detail layout to make use of a secondary grid layout.

Browse Source
This commit is contained in:
Dan Galpin
2015-05-25 01:49:07 -07:00
parent ce3459bd87
commit 4ca4e7b45c
1 changed files with 58 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
app/src/main/res/layout/fragment_detail.xml
View File

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