From d8a175e7b2404ab759e59bcb429ba01f112958c0 Mon Sep 17 00:00:00 2001
From: Gagan290 <gagan290@gmail.com>
Date: Wed, 18 Jan 2017 18:07:59 +0530
Subject: [PATCH] //Stock_FacingActivity Changes today

---
 .../gsk_dailyentry/Stock_FacingActivity.java  | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
index f9c5e9d..45584f5 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
@@ -92,6 +92,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
     Uri outputFileUri = null;
     String gallery_package = "";
     private SharedPreferences preferences;
+    boolean isExpand = true;
 
     private static boolean updateResources(Context context, String language) {
 
@@ -215,12 +216,14 @@ public class Stock_FacingActivity extends AppCompatActivity {
                 public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
                     int lastItem = firstVisibleItem + visibleItemCount;
 
-                    if (firstVisibleItem == 0) {
-                        fab.setVisibility(View.VISIBLE);
-                    } else if (lastItem == totalItemCount) {
-                        fab.setVisibility(View.INVISIBLE);
-                    } else {
-                        fab.setVisibility(View.VISIBLE);
+                    if (isExpand) {
+                        if (firstVisibleItem == 0) {
+                            fab.setVisibility(View.VISIBLE);
+                        } else if (lastItem == totalItemCount) {
+                            fab.setVisibility(View.INVISIBLE);
+                        } else {
+                            fab.setVisibility(View.VISIBLE);
+                        }
                     }
                 }
 
@@ -256,6 +259,12 @@ public class Stock_FacingActivity extends AppCompatActivity {
                         getCurrentFocus().clearFocus();
                     }
 
+                    if (groupPosition == 0) {
+                        isExpand = false;
+                    } else {
+                        isExpand = true;
+                    }
+
                     fab.setVisibility(View.INVISIBLE);
                 }
             });
@@ -271,6 +280,11 @@ public class Stock_FacingActivity extends AppCompatActivity {
                         getCurrentFocus().clearFocus();
                     }
 
+                    if (groupPosition == 0) {
+                        isExpand = false;
+                    } else {
+                        isExpand = true;
+                    }
                     fab.setVisibility(View.VISIBLE);
                 }
             });
@@ -692,6 +706,8 @@ public class Stock_FacingActivity extends AppCompatActivity {
 
         //Planogram Dialog
         if (id == R.id.action_planogram) {
+            expandableListView.clearFocus();
+
             //final Dialog dialog = new Dialog(Stock_FacingActivity.this, android.R.style.Theme_Black_NoTitleBar_Fullscreen);
             final Dialog dialog = new Dialog(Stock_FacingActivity.this);
             dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);