Fix #259

app/build.gradle

@@ -17,8 +17,8 @@ android {
         targetSdkVersion 28
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
-        versionCode 64
+        versionCode 65
-        versionName "3.1.0beta1"
+        versionName "3.1.0beta2"
 
         flavorDimensions "default"
         renderscriptTargetApi 19

app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java

@@ -36,6 +36,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.inputmethod.EditorInfo;
+import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 
 import com.bluelinelabs.conductor.RouterTransaction;
@@ -85,6 +86,7 @@ import javax.inject.Inject;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.SearchView;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.view.MenuItemCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
@@ -115,14 +117,16 @@ public class ContactsController extends BaseController implements SearchView.OnQ
     private static final String KEY_SEARCH_QUERY = "ContactsController.searchQuery";
     @Nullable
     @BindView(R.id.initial_relative_layout)
-    public RelativeLayout initialRelativeLayout;
+    RelativeLayout initialRelativeLayout;
     @Nullable
     @BindView(R.id.secondary_relative_layout)
-    public RelativeLayout secondaryRelativeLayout;
+    RelativeLayout secondaryRelativeLayout;
     @Inject
     UserUtils userUtils;
     @Inject
     EventBus eventBus;
+    @BindView(R.id.progressBar)
+    ProgressBar progressBar;
     @BindView(R.id.recycler_view)
     RecyclerView recyclerView;
 
@@ -132,6 +136,11 @@ public class ContactsController extends BaseController implements SearchView.OnQ
     @BindView(R.id.fast_scroller)
     FastScroller fastScroller;
 
+    @BindView(R.id.call_header_layout)
+    RelativeLayout callHeaderLayout;
+    @BindView(R.id.generic_rv_layout)
+    CoordinatorLayout genericRvLayout;
+
     @Inject
     NcApi ncApi;
     private String credentials;
@@ -177,11 +186,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
 
     @Override
     protected View inflateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container) {
-        if (isNewConversationView) {
         return inflater.inflate(R.layout.controller_contacts_rv, container, false);
-        } else {
-            return inflater.inflate(R.layout.controller_generic_rv, container, false);
-        }
     }
 
     @Override
@@ -631,9 +636,16 @@ public class ContactsController extends BaseController implements SearchView.OnQ
                                 swipeRefreshLayout.setRefreshing(false);
                             }
 
+                            progressBar.setVisibility(View.GONE);
+                            genericRvLayout.setVisibility(View.VISIBLE);
+                            if (isNewConversationView) {
+                                callHeaderLayout.setVisibility(View.VISIBLE);
+                            }
+
                             if (isNewConversationView) {
                                 checkAndHandleDoneMenuItem();
                             }
+
                         }
 
                     }

app/src/main/res/layout/controller_contacts_rv.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
   ~ Nextcloud Talk application
   ~
   ~ @author Andy Scherzinger
@@ -21,9 +20,27 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:gravity="center"
     android:orientation="vertical">
 
-    <include layout="@layout/rv_item_call_header"/>
+    <ProgressBar
+        android:id="@+id/progressBar"
+        android:layout_width="@dimen/item_height"
+        android:layout_height="@dimen/item_height"
+        android:layout_gravity="center"
+        android:layout_marginStart="@dimen/activity_horizontal_margin"
+        android:layout_marginLeft="@dimen/activity_horizontal_margin"
+        android:layout_marginEnd="@dimen/activity_horizontal_margin"
+        android:layout_marginRight="@dimen/activity_horizontal_margin"
+        android:indeterminate="true"
+        android:indeterminateTint="@color/colorPrimary"
+        android:indeterminateTintMode="src_in" />
 
-    <include layout="@layout/controller_generic_rv"/>
+    <include
+        layout="@layout/rv_item_call_header"
+        android:visibility="gone" />
+
+    <include
+        layout="@layout/controller_generic_rv"
+        android:visibility="gone" />
 </LinearLayout>