Removed toolbar transition & co (58b2773) from master branch and moved those changes to the new shared-element-item-glitch branch to keep everything clean

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<String> names, Map<String, View> 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,

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();

app/src/main/res/layout/activity_main.xml

@@ -1,7 +1,8 @@
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.DrawerLayout
+    android:id="@+id/drawer_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
@@ -23,14 +24,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingTop="@dimen/main_toolbar_padding_top"
+            android:paddingTop="@dimen/main_toolbar_padding_top">
-            android:transitionName="toolbar"
-            tools:ignore="UnusedAttribute">
 
             <android.support.v7.widget.Toolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar"
-                android:transitionName=""
                 android:background="?colorPrimary">
 
                 <TextView
@@ -49,8 +47,6 @@
             </android.support.v7.widget.Toolbar>
 
             <com.astuetz.PagerSlidingTabStrip
-                app:pstsTabBackground="?selectableItemBackground"
-                app:pstsIndicatorHeight="3dp"
                 android:id="@+id/tabs"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/tab_height"
@@ -60,9 +56,11 @@
                 android:paddingStart="64dp"
                 android:textColor="@color/sliding_tabs_deactivated"
                 android:textColorPrimary="@color/sliding_tabs_activated"
+                android:transitionName="sliding_tabs"
+                app:pstsIndicatorHeight="3dp"
+                app:pstsTabBackground="?selectableItemBackground"
                 app:pstsTabPaddingLeftRight="8dp"
-                tools:ignore="NewApi,RtlSymmetry,UnusedAttribute"
+                tools:ignore="NewApi,RtlSymmetry,UnusedAttribute" />
-                android:transitionName="sliding_tabs" />
 
             <View
                 android:layout_width="match_parent"
@@ -75,8 +73,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end|right|bottom"
-            tools:ignore="RtlHardcoded"
+            android:fitsSystemWindows="true"
-            android:fitsSystemWindows="true">
+            tools:ignore="RtlHardcoded">
 
             <com.melnykov.fab.FloatingActionButton
                 android:id="@+id/fab"
@@ -92,17 +90,17 @@
         android:layout_width="1dp"
         android:layout_height="match_parent"
         android:layout_gravity="start"
+        android:clickable="true"
         android:fitsSystemWindows="true"
-        app:insetForeground="@color/scrim_inset_color"
+        app:insetForeground="@color/scrim_inset_color">
-        android:clickable="true">
 
         <fragment
             android:id="@+id/navigation_drawer"
             android:name="com.kabouzeid.gramophone.ui.fragments.NavigationDrawerFragment"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            tools:layout="@layout/fragment_navigation_drawer"
+            android:tag="NAV_DRAWER"
-            android:tag="NAV_DRAWER" />
+            tools:layout="@layout/fragment_navigation_drawer" />
 
     </com.kabouzeid.gramophone.views.ScrimInsetsFrameLayout>
 

app/src/main/res/values/styles_parents.xml

@@ -2,11 +2,11 @@
 <resources>
 
     <style name="Theme.MaterialMusic.Base" parent="Theme.AppCompat.NoActionBar">
-        <item name="md_dark_theme">true</item>
-
         <item name="android:windowActionBarOverlay">true</item>
         <item name="windowActionBarOverlay">true</item>
 
+        <item name="md_dark_theme">true</item>
+
         <item name="title_text_color">?android:attr/textColorPrimary</item>
         <item name="caption_text_color">?android:attr/textColorSecondary</item>
 
@@ -31,12 +31,12 @@
         <item name="card_color">@color/materialmusic_dark_default_bar_color</item>
 
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat</item>
-
     </style>
 
     <style name="Theme.MaterialMusic.Base.Light" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowActionBarOverlay">true</item>
         <item name="windowActionBarOverlay">true</item>
+
         <item name="md_dark_theme">false</item>
 
         <item name="title_text_color">?android:attr/textColorPrimary</item>
@@ -63,7 +63,6 @@
         <item name="card_color">@color/white</item>
 
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
-
     </style>
 
     <style name="PlayPauseFabParent">