Created
May 28, 2016 13:37
-
-
Save pareshchouhan/657f87b262f5c60b07b1d8dce3baeb64 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml | |
index a0e6485..6ef2886 100644 | |
--- a/app/src/main/AndroidManifest.xml | |
+++ b/app/src/main/AndroidManifest.xml | |
@@ -22,7 +22,8 @@ | |
<activity | |
android:name=".ui.activity.MovieDetailActivity" | |
android:label="@string/title_activity_detail" | |
- android:parentActivityName=".ui.activity.BrowseMoviesActivity"> | |
+ android:parentActivityName=".ui.activity.BrowseMoviesActivity" | |
+ android:theme="@style/AppTheme.NoActionBar"> | |
<meta-data | |
android:name="android.support.PARENT_ACTIVITY" | |
android:value=".ui.activity.BrowseMoviesActivity" /> | |
@@ -30,7 +31,8 @@ | |
<activity | |
android:name=".ui.activity.SettingsActivity" | |
android:label="@string/title_activity_settings" | |
- android:parentActivityName=".ui.activity.BrowseMoviesActivity"> | |
+ android:parentActivityName=".ui.activity.BrowseMoviesActivity" | |
+ android:theme="@style/AppTheme.NoActionBar"> | |
<meta-data | |
android:name="android.support.PARENT_ACTIVITY" | |
android:value=".ui.activity.BrowseMoviesActivity" /> | |
diff --git a/app/src/main/java/com/futuretraxex/freakpirate/moviepedia/ui/fragment/MovieDetailFragment.java b/app/src/main/java/com/futuretraxex/freakpirate/moviepedia/ui/fragment/MovieDetailFragment.java | |
index bc44a72..1dafc82 100644 | |
--- a/app/src/main/java/com/futuretraxex/freakpirate/moviepedia/ui/fragment/MovieDetailFragment.java | |
+++ b/app/src/main/java/com/futuretraxex/freakpirate/moviepedia/ui/fragment/MovieDetailFragment.java | |
@@ -118,7 +118,6 @@ public class MovieDetailFragment extends Fragment { | |
android.support.v7.app.ActionBar actionBar = ((AppCompatActivity)getActivity()).getSupportActionBar(); | |
setHasOptionsMenu(true); | |
- | |
assert actionBar != null; | |
actionBar.setDisplayHomeAsUpEnabled(true); | |
@@ -387,6 +386,9 @@ public class MovieDetailFragment extends Fragment { | |
mStatusBarColor = Color.argb(250, Color.red(statusBarColor), | |
Color.green(statusBarColor), Color.blue(statusBarColor)); | |
+ collapsedToolbar.setStatusBarScrimColor(mStatusBarColor); | |
+ collapsedToolbar.setContentScrimColor(mToolbarColor); | |
+ | |
// Log.v(GlobalData.LOG_TAG_DETAIL_ACTIVITY_FRAGMENT, | |
// "Toolbar: " + toolbarColor + "\tStatusBar: " + statusBarColor); | |
diff --git a/app/src/main/res/layout/fragment_movie_details.xml b/app/src/main/res/layout/fragment_movie_details.xml | |
index 5c8d82e..f0d8261 100644 | |
--- a/app/src/main/res/layout/fragment_movie_details.xml | |
+++ b/app/src/main/res/layout/fragment_movie_details.xml | |
@@ -1,20 +1,24 @@ | |
<android.support.design.widget.CoordinatorLayout | |
xmlns:android="http://schemas.android.com/apk/res/android" | |
xmlns:app="http://schemas.android.com/apk/res-auto" | |
+ android:fitsSystemWindows="true" | |
android:layout_width="match_parent" | |
android:layout_height="match_parent"> | |
<android.support.design.widget.AppBarLayout | |
android:layout_width="match_parent" | |
android:layout_height="wrap_content" | |
- android:theme="@style/AppTheme"> | |
+ android:fitsSystemWindows="true" | |
+ android:theme="@style/AppTheme.AppBarOverlay"> | |
<android.support.design.widget.CollapsingToolbarLayout | |
android:layout_width="match_parent" | |
android:layout_height="match_parent" | |
android:id="@+id/collapsing_toolbar" | |
app:contentScrim="?attr/colorPrimary" | |
- app:layout_scrollFlags="scroll|exitUntilCollapsed"> | |
+ app:layout_scrollFlags="scroll|exitUntilCollapsed" | |
+ android:fitsSystemWindows="true" | |
+ > | |
<ImageView | |
android:id="@+id/movie_cover" | |
@@ -37,7 +41,8 @@ | |
android:id="@+id/detail_toolbar" | |
android:layout_width="match_parent" | |
android:layout_height="?attr/actionBarSize" | |
- app:layout_collapseMode="pin"/> | |
+ app:layout_collapseMode="pin" | |
+ app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/> | |
</android.support.design.widget.CollapsingToolbarLayout> | |
</android.support.design.widget.AppBarLayout> | |
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml | |
index 3720348..1d69c26 100644 | |
--- a/app/src/main/res/values/styles.xml | |
+++ b/app/src/main/res/values/styles.xml | |
@@ -43,4 +43,5 @@ | |
<item name="android:divider">@null</item> | |
</style> | |
+ | |
</resources> | |
diff --git a/build.gradle b/build.gradle | |
index e0b366a..03bced9 100644 | |
--- a/build.gradle | |
+++ b/build.gradle | |
@@ -5,7 +5,7 @@ buildscript { | |
jcenter() | |
} | |
dependencies { | |
- classpath 'com.android.tools.build:gradle:1.5.0' | |
+ classpath 'com.android.tools.build:gradle:2.1.0' | |
// NOTE: Do not place your application dependencies here; they belong | |
// in the individual module build.gradle files | |
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties | |
index f23df6e..c25cec5 100644 | |
--- a/gradle/wrapper/gradle-wrapper.properties | |
+++ b/gradle/wrapper/gradle-wrapper.properties | |
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME | |
distributionPath=wrapper/dists | |
zipStoreBase=GRADLE_USER_HOME | |
zipStorePath=wrapper/dists | |
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip | |
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment