From e1b02c42d2e1a779986003421c1f587fe5bb5af8 Mon Sep 17 00:00:00 2001
From: vanitasvitae <vanitasvitae@riseup.net>
Date: Sun, 7 Aug 2016 01:51:07 +0200
Subject: [PATCH] Removed unnecessary and buggy collapsableToolbarLayout

---
 .../diaspora_android/activity/MainActivity.java  |  5 +----
 .../diaspora_android/ui/BottomBarBehavior.java   |  6 ++----
 app/src/main/res/layout/main__app_bar.xml        | 16 +---------------
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
index cce1ca6b..ea87ed23 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
@@ -40,7 +40,6 @@ import android.os.StrictMode;
 import android.provider.MediaStore;
 import android.support.annotation.NonNull;
 import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CollapsingToolbarLayout;
 import android.support.design.widget.NavigationView;
 import android.support.design.widget.Snackbar;
 import android.support.v4.content.LocalBroadcastManager;
@@ -158,8 +157,6 @@ public class MainActivity extends AppCompatActivity
     @BindView(R.id.main__layout)
     DrawerLayout navDrawer;
 
-    @BindView(R.id.collapsing_toolbar)
-    CollapsingToolbarLayout toolbarTopCollapsing;
 
 
     // NavHeader cannot be bound by Butterknife
@@ -251,7 +248,7 @@ public class MainActivity extends AppCompatActivity
         }
 
         if (!appSettings.isIntellihideToolbars()) {
-            AppBarLayout.LayoutParams params = (AppBarLayout.LayoutParams) toolbarTopCollapsing.getLayoutParams();
+            AppBarLayout.LayoutParams params = (AppBarLayout.LayoutParams) toolbarTop.getLayoutParams();
             params.setScrollFlags(0);  // clear all scroll flags
         }
 
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/BottomBarBehavior.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/BottomBarBehavior.java
index a32d5427..79789489 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/BottomBarBehavior.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/BottomBarBehavior.java
@@ -44,12 +44,10 @@ public class BottomBarBehavior extends CoordinatorLayout.Behavior<LinearLayout>
         if (defaultDependencyTop == -1) {
             defaultDependencyTop = dependency.getTop();
         }
-        Log.d("BOTTOMBAR", "c.h"+child.getHeight()+" c.top"+child.getTop()
-                +" c.tran_y"+child.getTranslationY()
-                +" d.h"+dependency.getHeight()+" d.top"+dependency.getTop()
-                +"d.tran_y"+dependency.getTranslationY());
         if(dependency.getTop()<0)
             child.setTranslationY(-dependency.getTop() + defaultDependencyTop);
+        else
+            child.setTranslationY(defaultDependencyTop);
         return true;
     }
 
diff --git a/app/src/main/res/layout/main__app_bar.xml b/app/src/main/res/layout/main__app_bar.xml
index 62909dab..154ad9f5 100644
--- a/app/src/main/res/layout/main__app_bar.xml
+++ b/app/src/main/res/layout/main__app_bar.xml
@@ -4,25 +4,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     tools:context=".activity.MainActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.design.widget.CollapsingToolbarLayout
-            android:id="@+id/collapsing_toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="81dp"
-            android:fitsSystemWindows="true"
-            app:contentScrim="?attr/colorPrimary"
-            app:expandedTitleMarginEnd="64dp"
-            app:expandedTitleMarginStart="48dp"
-            app:layout_scrollFlags="scroll|enterAlways|snap"
-            app:titleEnabled="false">
+        android:theme="@style/AppTheme.AppBarOverlay">
 
             <android.support.v7.widget.Toolbar
                 android:id="@+id/toolbar"
@@ -32,8 +20,6 @@
                 app:layout_scrollFlags="scroll|enterAlways"
                 app:popupTheme="@style/AppTheme.PopupOverlay" />
 
-        </android.support.design.widget.CollapsingToolbarLayout>
-
     </android.support.design.widget.AppBarLayout>
 
     <include layout="@layout/main__content" />