From 7bd1eeb1e64e7a260ebcb7bc7283f4341836ed8d Mon Sep 17 00:00:00 2001 From: Dan Galpin Date: Mon, 25 May 2015 01:29:03 -0700 Subject: [PATCH] Switched from using ActionBar to using Toolbar --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 3 +- .../android/sunshine/app/DetailActivity.java | 8 ++- .../android/sunshine/app/MainActivity.java | 9 ++- .../main/res/layout-sw600dp/activity_main.xml | 57 ++++++++++++------- app/src/main/res/layout/activity_detail.xml | 25 ++++++-- app/src/main/res/layout/activity_main.xml | 31 ++++++++-- app/src/main/res/values/styles.xml | 15 ++--- 8 files changed, 105 insertions(+), 47 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 530d443..2068d3d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,7 +22,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile 'com.github.bumptech.glide:glide:3.5.2' - compile 'com.android.support:appcompat-v7:21.0.2' - compile 'com.android.support:support-annotations:22.0.0' + compile 'com.android.support:appcompat-v7:22.1.0' + compile 'com.android.support:support-annotations:22.1.0' compile 'com.google.android.gms:play-services-gcm:7.0.0' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f492e8c..7b2ef03 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,8 +43,7 @@ android:supportsRtl="true"> + android:label="@string/app_name"> diff --git a/app/src/main/java/com/example/android/sunshine/app/DetailActivity.java b/app/src/main/java/com/example/android/sunshine/app/DetailActivity.java index 2f32715..80185b3 100644 --- a/app/src/main/java/com/example/android/sunshine/app/DetailActivity.java +++ b/app/src/main/java/com/example/android/sunshine/app/DetailActivity.java @@ -18,17 +18,23 @@ package com.example.android.sunshine.app; import android.content.Intent; import android.os.Bundle; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; -public class DetailActivity extends ActionBarActivity { +public class DetailActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_detail); + Toolbar toolbar = (Toolbar)findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + if (savedInstanceState == null) { // Create the detail fragment and add it to the activity // using a fragment transaction. diff --git a/app/src/main/java/com/example/android/sunshine/app/MainActivity.java b/app/src/main/java/com/example/android/sunshine/app/MainActivity.java index a76b011..77bccfb 100644 --- a/app/src/main/java/com/example/android/sunshine/app/MainActivity.java +++ b/app/src/main/java/com/example/android/sunshine/app/MainActivity.java @@ -24,7 +24,8 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; -import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.Menu; import android.view.MenuItem; @@ -36,7 +37,7 @@ import com.google.android.gms.gcm.GoogleCloudMessaging; import java.io.IOException; -public class MainActivity extends ActionBarActivity implements ForecastFragment.Callback { +public class MainActivity extends AppCompatActivity implements ForecastFragment.Callback { private final String LOG_TAG = MainActivity.class.getSimpleName(); private static final String DETAILFRAGMENT_TAG = "DFTAG"; @@ -60,6 +61,10 @@ public class MainActivity extends ActionBarActivity implements ForecastFragment. mLocation = Utility.getPreferredLocation(this); setContentView(R.layout.activity_main); + Toolbar toolbar = (Toolbar)findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + getSupportActionBar().setDisplayShowTitleEnabled(false); + if (findViewById(R.id.weather_detail_container) != null) { // The detail container view will be present only in the large-screen layouts // (res/layout-sw600dp). If this view is present, then the activity should be diff --git a/app/src/main/res/layout-sw600dp/activity_main.xml b/app/src/main/res/layout-sw600dp/activity_main.xml index b4cf852..41321b8 100644 --- a/app/src/main/res/layout-sw600dp/activity_main.xml +++ b/app/src/main/res/layout-sw600dp/activity_main.xml @@ -17,27 +17,46 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:baselineAligned="false" - android:divider="?android:attr/dividerHorizontal" - android:orientation="horizontal" - tools:context="com.example.android.sunshine.app.MainActivity"> + android:orientation="vertical"> - + + + - + android:baselineAligned="false" + android:divider="?android:attr/dividerHorizontal" + android:orientation="horizontal" + tools:context="com.example.android.sunshine.app.MainActivity"> - + - \ No newline at end of file + + + + + + diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml index de55300..fd45611 100644 --- a/app/src/main/res/layout/activity_detail.xml +++ b/app/src/main/res/layout/activity_detail.xml @@ -13,10 +13,23 @@ See the License for the specific language governing permissions and limitations under the License. --> - \ No newline at end of file + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 66c5a98..e193f9d 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -13,11 +13,30 @@ See the License for the specific language governing permissions and limitations under the License. --> - \ No newline at end of file + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 6c4a3c7..cf120a0 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -16,25 +16,22 @@ - - - - -