Skip to content

6.04 altering the layout finish #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: 6.03_Altering_the_Layout_Start
Choose a base branch
from
Open

6.04 altering the layout finish #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4ca4e7b
Updated the detail layout to make use of a secondary grid layout.
DAGalpin May 25, 2015
9caaf90
Merge branch '6.03_Altering_the_Layout_Start' into 6.04_Altering_the_…
DAGalpin Aug 26, 2015
e9741e1
"Merged from 6.03_Altering_the_Layout_Start"
DAGalpin Aug 27, 2015
ee6fccc
Add API Key Parameter to OpenWeatherMap API Call
cdlei Oct 28, 2015
33f4039
Merge pull request #16 from DAGalpin/6.04_Altering_the_Layout_Finish
cdlei Dec 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
buildTypes.each {
it.buildConfigField 'String', 'OPEN_WEATHER_MAP_API_KEY', MyOpenWeatherMapApiKey
}
}

dependencies {
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/com/example/android/sunshine/app/sync/SunshineSyncAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import android.util.Log;

import com.bumptech.glide.Glide;
import com.example.android.sunshine.app.BuildConfig;
import com.example.android.sunshine.app.MainActivity;
import com.example.android.sunshine.app.R;
import com.example.android.sunshine.app.Utility;
Expand Down Expand Up @@ -114,12 +115,14 @@ public void onPerformSync(Account account, Bundle extras, String authority, Cont
final String FORMAT_PARAM = "mode";
final String UNITS_PARAM = "units";
final String DAYS_PARAM = "cnt";
final String APPID_PARAM = "APPID";

Uri builtUri = Uri.parse(FORECAST_BASE_URL).buildUpon()
.appendQueryParameter(QUERY_PARAM, locationQuery)
.appendQueryParameter(FORMAT_PARAM, format)
.appendQueryParameter(UNITS_PARAM, units)
.appendQueryParameter(DAYS_PARAM, Integer.toString(numDays))
.appendQueryParameter(APPID_PARAM, BuildConfig.OPEN_WEATHER_MAP_API_KEY)
.build();

URL url = new URL(builtUri.toString());
Expand Down
160 changes: 64 additions & 96 deletions app/src/main/res/layout/fragment_detail.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">

<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: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>

<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_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: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" />

</LinearLayout>
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">

<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>
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_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: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"/>

<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: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: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>

<ImageSwitcher
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/imageSwitcher"
android:layout_gravity="right" />
</LinearLayout>