Merge pull request #117 from Mow3l/master

CameraFab Fix
UnevenSoftware · Apr 21, 2016 · 0c57422 · 0c57422
2 parents 9234122 + deda03a
commit 0c57422
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/app/src/main/java/com/horaapps/leafpic/MainActivity.java b/app/src/main/java/com/horaapps/leafpic/MainActivity.java
@@ -4,6 +4,7 @@
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.Typeface;
@@ -327,6 +328,7 @@ public void onDrawerOpened(View drawerView) {
         /**** FAB ***/
         fabCamera = (FloatingActionButton) findViewById(R.id.fab_camera);
         fabCamera.setImageDrawable(new IconicsDrawable(this).icon(GoogleMaterial.Icon.gmd_camera_alt).color(Color.WHITE));
+        fabCamera.animate().translationY(-Measure.getNavBarHeight(Resources.getSystem())).setInterpolator(new DecelerateInterpolator(2)).start();
         fabCamera.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

diff --git a/...apps/leafpic/Views/FABScrollBehavior.java → ...com/horaapps/leafpic/Views/FabScroll.java b/...apps/leafpic/Views/FABScrollBehavior.java → ...com/horaapps/leafpic/Views/FabScroll.java
@@ -1,30 +1,37 @@
 package com.horaapps.leafpic.Views;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.support.design.widget.CoordinatorLayout;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.View;
+import android.view.animation.AccelerateInterpolator;
+import android.view.animation.DecelerateInterpolator;
+
+import com.horaapps.leafpic.utils.Measure;
 
 /**
  * Created by dnld on 06/03/16.
  */
-public class FABScrollBehavior extends FloatingActionButton.Behavior {
-    public FABScrollBehavior(Context context, AttributeSet attributeSet) {
+public class FabScroll extends FloatingActionButton.Behavior {
+
+    int dimen;
+
+    public FabScroll(Context context, AttributeSet attributeSet) {
         super();
     }
 
     @Override
     public void onNestedScroll(CoordinatorLayout coordinatorLayout, FloatingActionButton child, View target, int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed) {
         super.onNestedScroll(coordinatorLayout, child, target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed);
-        /*if (dyConsumed > 0 && child.getVisibility() == View.VISIBLE) {
+        if (dyConsumed > 0 && child.getVisibility() == View.VISIBLE) {
             child.animate().translationY(child.getHeight()*2).setInterpolator(new AccelerateInterpolator(2)).start();
         } else {
             child.animate().translationY(-Measure.getNavBarHeight(Resources.getSystem())).setInterpolator(new DecelerateInterpolator(2)).start();
-        }*/
-
         }
+    }
 
     @Override
     public boolean onStartNestedScroll(CoordinatorLayout coordinatorLayout, FloatingActionButton child, View directTargetChild, View target, int nestedScrollAxes) {

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -62,18 +62,12 @@
             android:theme="@style/ThemeOverlay.AppCompat.Light"
             app:borderWidth="0dp"
             app:elevation="4dp"
-
-            app:layout_behavior=".Views.FABScrollBehavior"
-            android:visibility="gone"
+            app:layout_behavior=".Views.FabScroll"
             />
-        <!--
-
-        -->
     </android.support.design.widget.CoordinatorLayout>
     <include
         android:id="@+id/drawer_items"
-        layout="@layout/drawer_albums_act"
-        />
+        layout="@layout/drawer_albums_act"/>
 </android.support.v4.widget.DrawerLayout>