Fix collapsing toolbar issue

AliMehrpour · May 24, 2016 · bc25f8e · bc25f8e
1 parent cfb71ba
commit bc25f8e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/eSecureBox/src/main/java/com/volcano/esecurebox/activity/DisplayAccountActivity.java b/eSecureBox/src/main/java/com/volcano/esecurebox/activity/DisplayAccountActivity.java
@@ -15,6 +15,7 @@
 import com.volcano.esecurebox.R;
 import com.volcano.esecurebox.analytics.MixpanelManager;
 import com.volcano.esecurebox.fragment.DisplayAccountFragment;
+import com.volcano.esecurebox.util.CompatUtils;
 import com.volcano.esecurebox.widget.FloatingActionButton;
 
 /**
@@ -39,7 +40,7 @@ protected void onCreate(Bundle savedInstanceState) {
         collapsingToolbar.setTitle(intent.getStringExtra(Intents.EXTRA_ACCOUNT_TITLE));
         collapsingToolbar.setContentScrimColor(colorId);
         collapsingToolbar.setStatusBarScrimColor(colorId);
-        collapsingToolbar.setExpandedTitleColor(getResources().getColor(android.R.color.transparent));
+        collapsingToolbar.setExpandedTitleColor(CompatUtils.getColor(android.R.color.transparent));
         collapsingToolbar.setExpandedTitleTextAppearance(R.style.Text_RegularWhite30);
 
         final AppBarLayout appBarLayout = (AppBarLayout) findViewById(R.id.appbar);

diff --git a/eSecureBox/src/main/java/com/volcano/esecurebox/fragment/AddFieldDialogFragment.java b/eSecureBox/src/main/java/com/volcano/esecurebox/fragment/AddFieldDialogFragment.java
@@ -105,7 +105,7 @@ public Dialog onCreateDialog(final Bundle savedInstanceState) {
         final Dialog dialog = new Dialog(getActivity());
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         dialog.setContentView(root);
-        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.YELLOW));
+        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.WHITE));
         dialog.getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
 
         return dialog;

diff --git a/...reBox/src/main/java/com/volcano/esecurebox/widget/FloatingActionButtonAppbarBehavior.java b/...reBox/src/main/java/com/volcano/esecurebox/widget/FloatingActionButtonAppbarBehavior.java
@@ -8,11 +8,15 @@
 import android.util.AttributeSet;
 import android.view.View;
 
+import com.volcano.esecurebox.R;
+import com.volcano.esecurebox.VlApplication;
+
 /**
  * Defines fab behavior when user scroll the list and coordinator layout has been changed
  */
 @SuppressWarnings("unused")
 public final class FloatingActionButtonAppBarBehavior extends Behavior<FloatingActionButton> {
+    final int sCollapsedToolbarHeight = VlApplication.getInstance().getResources().getDimensionPixelSize(R.dimen.toolbar_collapse_height);
 
     public FloatingActionButtonAppBarBehavior(Context context, AttributeSet attrs) {
     }
@@ -23,13 +27,13 @@ public boolean layoutDependsOn(CoordinatorLayout parent, FloatingActionButton ch
     }
 
     @Override
-    public boolean onDependentViewChanged(CoordinatorLayout parent, FloatingActionButton child, View dependency) {
+    public boolean onDependentViewChanged(CoordinatorLayout parent, final FloatingActionButton child, View dependency) {
         final Rect rect = new Rect();
         dependency.getGlobalVisibleRect(rect);
 
         child.setTranslationY(dependency.getTop());
 
-        if (child.getHeight() + 50 > rect.height()) {
+        if (rect.height() < sCollapsedToolbarHeight * 2) {
             child.setTranslationX(-500); // Just goes out of screen
         }
         else {

diff --git a/eSecureBox/src/main/res/layout/activity_display_account.xml b/eSecureBox/src/main/res/layout/activity_display_account.xml
@@ -19,7 +19,7 @@
         <android.support.design.widget.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
-            android:layout_height="192dp"
+            android:layout_height="@dimen/toolbar_extended_height"
             app:layout_scrollFlags="scroll|exitUntilCollapsed"
             app:expandedTitleMarginStart="48dp"
             app:expandedTitleMarginEnd="48dp"

diff --git a/eSecureBox/src/main/res/values/dimens.xml b/eSecureBox/src/main/res/values/dimens.xml
@@ -77,8 +77,9 @@
     <dimen name="text_size_36">36sp</dimen>
 
     <dimen name="text_view_height">64dp</dimen>
-
-    <dimen name="toolbar_extended_height">192dp</dimen>
-    <dimen name="toolbar_extended_button_margin_top">164dp</dimen>
+
+    <dimen name="toolbar_collapse_height">56dp</dimen>
+    <dimen name="toolbar_extended_height">208dp</dimen>
+    <dimen name="toolbar_extended_button_margin_top">156dp</dimen>
 
 </resources>