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

Prep for "Too Little Real Estate"

Browse Source
This commit is contained in:
Dan Galpin
2015-05-25 02:44:34 -07:00
parent b081ffbca5
commit c0501e4d79
5 changed files with 116 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/src/main/res/layout-sw600dp/fragment_main.xml Normal file
View File

@@ -0,0 +1,41 @@
<!--
Copyright (C) 2015 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.example.android.sunshine.app.ForecastFragment">
<ListView
style="@style/ForecastListStyle"
android:id="@+id/listview_forecast"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@null" />
<!-- empty list -->
<TextView
android:id="@+id/listview_forecast_empty"
android:text="@string/empty_forecast_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingEnd="@dimen/activity_horizontal_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingStart="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
/>
</FrameLayout>

8
app/src/main/res/layout/activity_main.xml
View File

@@ -13,11 +13,10 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<LinearLayout <FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:orientation="vertical">
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
@@ -40,6 +39,5 @@
android:name="com.example.android.sunshine.app.ForecastFragment" android:name="com.example.android.sunshine.app.ForecastFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context="com.example.android.sunshine.app.ForecastFragment"
tools:layout="@android:layout/list_content" /> tools:layout="@android:layout/list_content" />
</LinearLayout> </FrameLayout>

52
app/src/main/res/layout/fragment_main.xml
View File

@@ -13,29 +13,35 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout
xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android"
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">
tools:context="com.example.android.sunshine.app.ForecastFragment"> <include layout="@layout/fragment_main_base"
<ListView android:layout_below="@+id/appbar"
style="@style/ForecastListStyle"
android:id="@+id/listview_forecast"
android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:divider="@null" /> android:layout_width="match_parent"/>
<!-- empty list --> <LinearLayout
<TextView android:id="@+id/appbar"
android:id="@+id/listview_forecast_empty"
android:text="@string/empty_forecast_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:layout_alignParentTop="true"
android:paddingRight="@dimen/activity_horizontal_margin" android:background="?attr/colorPrimary"
android:paddingEnd="@dimen/activity_horizontal_margin" android:orientation="vertical">
android:paddingLeft="@dimen/activity_horizontal_margin" <android.support.v7.widget.Toolbar
android:paddingStart="@dimen/activity_horizontal_margin" android:id="@+id/toolbar"
android:paddingTop="@dimen/activity_vertical_margin" android:layout_height="?attr/actionBarSize"
android:paddingBottom="@dimen/activity_vertical_margin" android:layout_width="match_parent"
/> android:elevation="0dp"
</FrameLayout> app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
<ImageView
android:layout_width="match_parent"
android:layout_height="?attr/listPreferredItemHeight"
android:layout_gravity="center"
android:scaleType="center"
android:src="@drawable/ic_logo"
android:contentDescription="@string/app_name"/>
</LinearLayout>
</RelativeLayout>

42
app/src/main/res/layout/fragment_main_base.xml Normal file
View File

@@ -0,0 +1,42 @@
<!--
Copyright (C) 2015 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:elevation="@dimen/appbar_elevation"
tools:context="com.example.android.sunshine.app.ForecastFragment">
<ListView
style="@style/ForecastListStyle"
android:id="@+id/listview_forecast"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@null" />
<!-- empty list -->
<TextView
android:id="@+id/listview_forecast_empty"
android:text="@string/empty_forecast_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingEnd="@dimen/activity_horizontal_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingStart="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
/>
</FrameLayout>

1
app/src/main/res/values/dimens.xml
View File

@@ -51,4 +51,5 @@
<dimen name="detail_container_bottom_margin">@dimen/detail_view_padding</dimen> <dimen name="detail_container_bottom_margin">@dimen/detail_view_padding</dimen>
<dimen name="detail_card_elevation">6dp</dimen> <dimen name="detail_card_elevation">6dp</dimen>
<dimen name="landscape_forecast_view_width">360dp</dimen>
</resources> </resources>