From b14999fdec6cd4df06a674f8c96d6fb5908fb7b3 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Wed, 24 Jan 2018 13:45:53 +0100
Subject: [PATCH] Better UI for operations

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../talk/controllers/CallsListController.java | 19 ++++++++++++++-----
 .../res/layout/controller_operations_menu.xml |  9 +++++----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java
index 2a6222eb0..905575778 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java
@@ -150,7 +150,7 @@ public class CallsListController extends BaseController implements SearchView.On
         if (adapter == null) {
             adapter = new FlexibleAdapter<>(callItems, getActivity(), false);
             if (userEntity != null) {
-                fetchData();
+                fetchData(false);
             }
         }
 
@@ -238,7 +238,7 @@ public class CallsListController extends BaseController implements SearchView.On
         }
     }
 
-    private void fetchData() {
+    private void fetchData(boolean fromBottomSheet) {
         dispose(null);
 
         callItems = new ArrayList<>();
@@ -295,6 +295,13 @@ public class CallsListController extends BaseController implements SearchView.On
                     if (swipeRefreshLayout != null) {
                         swipeRefreshLayout.setRefreshing(false);
                     }
+
+                    if (fromBottomSheet) {
+                        bottomSheet.setCancelable(true);
+                        if (bottomSheet.isShowing()) {
+                            bottomSheet.cancel();
+                        }
+                    }
                 });
     }
 
@@ -310,7 +317,7 @@ public class CallsListController extends BaseController implements SearchView.On
                 layoutManager.getOrientation()
         ));
 
-        swipeRefreshLayout.setOnRefreshListener(this::fetchData);
+        swipeRefreshLayout.setOnRefreshListener(() -> fetchData(false));
         swipeRefreshLayout.setColorSchemeResources(R.color.colorPrimary);
     }
 
@@ -378,12 +385,14 @@ public class CallsListController extends BaseController implements SearchView.On
             if (!bottomSheetLockEvent.isCancel()) {
                 bottomSheet.setCancelable(bottomSheetLockEvent.isCancel());
             } else {
-                new Handler().postDelayed(() -> {
+                if (bottomSheetLockEvent.getDelay() != 0) {
+                    fetchData(true);
+                } else {
                     bottomSheet.setCancelable(true);
                     if (bottomSheet.isShowing()) {
                         bottomSheet.cancel();
                     }
-                }, bottomSheetLockEvent.getDelay());
+                }
             }
         }
     }
diff --git a/app/src/main/res/layout/controller_operations_menu.xml b/app/src/main/res/layout/controller_operations_menu.xml
index a25eeafab..856e8b772 100644
--- a/app/src/main/res/layout/controller_operations_menu.xml
+++ b/app/src/main/res/layout/controller_operations_menu.xml
@@ -28,8 +28,9 @@
         android:id="@+id/progress_bar"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:layout_centerHorizontal="true"
+        android:layout_centerInParent="true"
         android:layout_marginTop="24dp"
+        android:layout_marginBottom="24dp"
         android:indeterminate="true"
         android:indeterminateTint="@color/colorPrimary"
         android:indeterminateTintMode="src_in"
@@ -39,8 +40,8 @@
         android:id="@+id/result_image_view"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="12dp"
+        android:layout_centerInParent="true"
+        android:layout_marginBottom="8dp"
         android:layout_marginEnd="24dp"
         android:layout_marginStart="24dp"
         android:layout_marginTop="24dp"
@@ -55,6 +56,7 @@
         android:layout_centerHorizontal="true"
         android:layout_marginEnd="24dp"
         android:layout_marginStart="24dp"
+        android:layout_marginBottom="12dp"
         android:maxLines="2"
         android:textAlignment="center"
         android:textColor="@color/colorPrimary"
@@ -68,7 +70,6 @@
         android:layout_below="@id/result_text_view"
         android:layout_marginBottom="12dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginTop="8dp"
         android:background="#0000"
         android:text="@string/nc_ok"
         android:textColor="@color/colorPrimary"