From 6a6da75fd603818f73da9edc23503eeecec605b9 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Sun, 19 Apr 2015 22:35:15 +0200 Subject: [PATCH] Removed toolbar transition & co (58b2773) from master branch and moved those changes to the new shared-element-item-glitch branch to keep everything clean --- .../ui/activities/MainActivity.java | 52 ------------------- .../gramophone/util/NavigationUtil.java | 5 -- app/src/main/res/layout/activity_main.xml | 30 +++++------ app/src/main/res/values/styles_parents.xml | 7 ++- 4 files changed, 17 insertions(+), 77 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java index 3961aac9..6e1796af 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java @@ -1,12 +1,9 @@ package com.kabouzeid.gramophone.ui.activities; -import android.annotation.TargetApi; -import android.app.SharedElementCallback; import android.content.Intent; import android.content.res.Configuration; import android.graphics.Bitmap; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.provider.MediaStore; @@ -27,8 +24,6 @@ import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; import android.view.SubMenu; -import android.view.View; -import android.view.Window; import android.widget.FrameLayout; import com.afollestad.materialdialogs.ThemeSingleton; @@ -60,10 +55,8 @@ import com.koushikdutta.ion.Ion; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Set; -@TargetApi(Build.VERSION_CODES.LOLLIPOP) public class MainActivity extends AbsFabActivity implements NavigationDrawerFragment.NavigationDrawerCallbacks, KabViewsDisableAble { @@ -77,48 +70,6 @@ public class MainActivity extends AbsFabActivity private ViewPager viewPager; private PagerSlidingTabStrip slidingTabLayout; private int currentPage = -1; - private boolean mIsReentering; - - public void setReentering(boolean reentering) { - this.mIsReentering = reentering; - } - - private final SharedElementCallback mCallback = new SharedElementCallback() { - @Override - public void onMapSharedElements(List names, Map sharedElements) { - if (!mIsReentering) { - View navigationBar = findViewById(android.R.id.navigationBarBackground); -// View statusBxar = findViewById(android.R.id.statusBarBackground); - View toolbarFrame = findViewById(R.id.toolbarFrame); -// if (statusBar != null) { -// names.add(statusBar.getTransitionName()); -// sharedElements.put(statusBar.getTransitionName(), statusBar); -// } - - if (navigationBar != null) { - names.add(navigationBar.getTransitionName()); - sharedElements.put(navigationBar.getTransitionName(), navigationBar); - } - if (toolbarFrame != null) { - names.add(toolbarFrame.getTransitionName()); - sharedElements.put(toolbarFrame.getTransitionName(), toolbarFrame); - } - } else { - names.remove(Window.NAVIGATION_BAR_BACKGROUND_TRANSITION_NAME); - sharedElements.remove(Window.NAVIGATION_BAR_BACKGROUND_TRANSITION_NAME); - names.remove(Window.STATUS_BAR_BACKGROUND_TRANSITION_NAME); - sharedElements.remove(Window.STATUS_BAR_BACKGROUND_TRANSITION_NAME); - names.remove("toolbar"); - sharedElements.remove("toolbar"); - } - } - }; - - @Override - public void onActivityReenter(int requestCode, Intent data) { - super.onActivityReenter(requestCode, data); - mIsReentering = true; - } @Override protected void onCreate(Bundle savedInstanceState) { @@ -126,9 +77,6 @@ public class MainActivity extends AbsFabActivity super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - if (Util.hasLollipopSDK()) - setExitSharedElementCallback(mCallback); - initViews(); navigationDrawerFragment.setUp( R.id.navigation_drawer, diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java index f0409420..6772c68d 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java @@ -17,7 +17,6 @@ import com.kabouzeid.gramophone.interfaces.KabViewsDisableAble; import com.kabouzeid.gramophone.misc.AppKeys; import com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity; import com.kabouzeid.gramophone.ui.activities.ArtistDetailActivity; -import com.kabouzeid.gramophone.ui.activities.MainActivity; import com.kabouzeid.gramophone.ui.activities.MusicControllerActivity; import com.kabouzeid.gramophone.ui.activities.PlaylistDetailActivity; @@ -29,8 +28,6 @@ public class NavigationUtil { public static void goToArtist(final Activity activity, final int artistId, final Pair[] sharedViews) { if (activity instanceof ArtistDetailActivity) return; - else if (activity instanceof MainActivity) - ((MainActivity) activity).setReentering(false); if ((activity instanceof KabViewsDisableAble && ((KabViewsDisableAble) activity).areViewsEnabled()) || !(activity instanceof KabViewsDisableAble)) { if (activity instanceof KabViewsDisableAble) ((KabViewsDisableAble) activity).disableViews(); @@ -50,8 +47,6 @@ public class NavigationUtil { public static void goToAlbum(final Activity activity, final int albumId, final Pair[] sharedViews) { if (activity instanceof AlbumDetailActivity) return; - else if (activity instanceof MainActivity) - ((MainActivity) activity).setReentering(false); if ((activity instanceof KabViewsDisableAble && ((KabViewsDisableAble) activity).areViewsEnabled()) || !(activity instanceof KabViewsDisableAble)) { if (activity instanceof KabViewsDisableAble) ((KabViewsDisableAble) activity).disableViews(); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index cc979c82..4386dc78 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,7 +1,8 @@ - + android:paddingTop="@dimen/main_toolbar_padding_top"> + tools:ignore="NewApi,RtlSymmetry,UnusedAttribute" /> + android:fitsSystemWindows="true" + tools:ignore="RtlHardcoded"> + app:insetForeground="@color/scrim_inset_color"> + android:tag="NAV_DRAWER" + tools:layout="@layout/fragment_navigation_drawer" /> diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml index 9856976d..55038673 100644 --- a/app/src/main/res/values/styles_parents.xml +++ b/app/src/main/res/values/styles_parents.xml @@ -2,11 +2,11 @@