|
|
@@ -20,7 +20,6 @@ import java.util.HashMap;
|
|
|
import kr.co.zumo.app.R;
|
|
|
import kr.co.zumo.app.lifeplus.util.ResourceUtil;
|
|
|
import kr.co.zumo.app.lifeplus.view.CustomHeaderBehavior;
|
|
|
-import kr.co.zumo.app.lifeplus.view.CustomScrollingViewBehavior;
|
|
|
|
|
|
/**
|
|
|
* ActionBar 관리
|
|
|
@@ -214,14 +213,12 @@ public class ActionBarManager {
|
|
|
AppBarLayout.LayoutParams params = (AppBarLayout.LayoutParams) toolbar.getLayoutParams();
|
|
|
CoordinatorLayout.LayoutParams appBarLayoutParams = (CoordinatorLayout.LayoutParams) appBarLayout.getLayoutParams();
|
|
|
if (isEnabled) {
|
|
|
- params.setScrollFlags(AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL);
|
|
|
+ params.setScrollFlags(AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL | AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS);
|
|
|
appBarLayoutParams.setBehavior(new AppBarLayout.Behavior());
|
|
|
- appBarLayout.setLayoutParams(appBarLayoutParams);
|
|
|
}
|
|
|
else {
|
|
|
params.setScrollFlags(0);
|
|
|
appBarLayoutParams.setBehavior(null);
|
|
|
- appBarLayout.setLayoutParams(appBarLayoutParams);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -236,41 +233,38 @@ public class ActionBarManager {
|
|
|
containerLayoutParams.setBehavior(null);
|
|
|
containerLayoutParams.topMargin = 0;
|
|
|
containerLayoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT;
|
|
|
- container.setLayoutParams(containerLayoutParams);
|
|
|
}
|
|
|
else if (isTransparentBackground) {
|
|
|
if (isScrollable) {
|
|
|
// todo 스크롤되는 경우에는 appbar behavior 도 수정 필요;
|
|
|
AppBarLayout.LayoutParams params = (AppBarLayout.LayoutParams) toolbar.getLayoutParams();
|
|
|
+ params.setScrollFlags(AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL | AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS);
|
|
|
CoordinatorLayout.LayoutParams appBarLayoutParams = (CoordinatorLayout.LayoutParams) appBarLayout.getLayoutParams();
|
|
|
- params.setScrollFlags(AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL);
|
|
|
appBarLayoutParams.setBehavior(new CustomHeaderBehavior());
|
|
|
- appBarLayout.setLayoutParams(appBarLayoutParams);
|
|
|
|
|
|
// todo 스크롤되는 경우에는 appbar behavior 도 수정 필요;
|
|
|
containerLayoutParams.setBehavior(null);
|
|
|
containerLayoutParams.topMargin = 0;
|
|
|
containerLayoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT;
|
|
|
- container.setLayoutParams(containerLayoutParams);
|
|
|
}
|
|
|
else {
|
|
|
containerLayoutParams.setBehavior(null);
|
|
|
containerLayoutParams.topMargin = 0;
|
|
|
containerLayoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT;
|
|
|
- container.setLayoutParams(containerLayoutParams);
|
|
|
}
|
|
|
}
|
|
|
else {
|
|
|
if (isScrollable) {
|
|
|
+ CoordinatorLayout.LayoutParams appBarLayoutParams = (CoordinatorLayout.LayoutParams) appBarLayout.getLayoutParams();
|
|
|
+ appBarLayoutParams.setBehavior(new CustomHeaderBehavior());
|
|
|
+ containerLayoutParams.setBehavior(null);
|
|
|
containerLayoutParams.topMargin = 0;
|
|
|
- containerLayoutParams.setBehavior(new CustomScrollingViewBehavior());
|
|
|
- container.setLayoutParams(containerLayoutParams);
|
|
|
+ containerLayoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT;
|
|
|
}
|
|
|
else {
|
|
|
containerLayoutParams.setBehavior(null);
|
|
|
containerLayoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT;
|
|
|
containerLayoutParams.topMargin = ResourceUtil.getDimension(R.dimen.action_bar_height);
|
|
|
- container.setLayoutParams(containerLayoutParams);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -363,7 +357,7 @@ public class ActionBarManager {
|
|
|
}
|
|
|
|
|
|
private void setBackgroundTransparent(boolean isTransparent) {
|
|
|
- toolbar.setBackgroundResource(isTransparent ? android.R.color.transparent : R.color.CFFFFFF);
|
|
|
+ toolbar.setBackgroundResource(isTransparent ? android.R.color.transparent : R.color.C80FFFFFF);
|
|
|
}
|
|
|
|
|
|
/**
|