vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2024-06-26 05:24:52 +02:00
Code Issues Releases Wiki Activity

Removed unnecessary and buggy collapsableToolbarLayout

Browse source
This commit is contained in:
vanitasvitae 2016-08-07 01:51:07 +02:00
parent 6534a89721
commit e1b02c42d2
3 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
View file

@ -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
}

6
app/src/main/java/com/github/dfa/diaspora_android/ui/BottomBarBehavior.java
View file

@ -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;
}

16
app/src/main/res/layout/main__app_bar.xml
View file

@ -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" />