Эх сурвалжийг харах

Do not show big spinner when initial loading a folder that is known to be not empty, or on PhotoFragment

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 4 жил өмнө
parent
commit
a6e0d2b8bf

BIN
screenshots/gplay/debug/com.nextcloud.client.FileDisplayActivityScreenshotIT_open.png


+ 2 - 2
src/androidTest/java/com/nextcloud/client/FileDisplayActivityScreenshotIT.java

@@ -54,7 +54,7 @@ public class FileDisplayActivityScreenshotIT extends AbstractIT {
         FileDisplayActivity sut = activityRule.launchActivity(null);
 
         sut.getListOfFilesFragment().setFabEnabled(false);
-        sut.getListOfFilesFragment().setEmptyListLoadingMessage();
+        sut.getListOfFilesFragment().setEmptyListLoadingMessage(false);
 
         screenshot(sut);
     }
@@ -67,7 +67,7 @@ public class FileDisplayActivityScreenshotIT extends AbstractIT {
         onView(withId(R.id.drawer_layout)).perform(DrawerActions.open());
 
         sut.getListOfFilesFragment().setFabEnabled(false);
-        sut.getListOfFilesFragment().setEmptyListLoadingMessage();
+        sut.getListOfFilesFragment().setEmptyListLoadingMessage(false);
 
         screenshot(sut);
     }

+ 6 - 2
src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java

@@ -701,10 +701,14 @@ public class ExtendedListFragment extends Fragment implements
         });
     }
 
+    public void setEmptyListLoadingMessage() {
+        setEmptyListLoadingMessage(true);
+    }
+
     /**
      * Set message for empty list view.
      */
-    public void setEmptyListLoadingMessage() {
+    public void setEmptyListLoadingMessage(boolean showSpinner) {
         new Handler(Looper.getMainLooper()).post(new Runnable() {
             @Override
             public void run() {
@@ -713,7 +717,7 @@ public class ExtendedListFragment extends Fragment implements
                     mEmptyListMessage.setText("");
 
                     mEmptyListIcon.setVisibility(View.GONE);
-                    mEmptyListProgress.setVisibility(View.VISIBLE);
+                    mEmptyListProgress.setVisibility(showSpinner ? View.VISIBLE : View.INVISIBLE);
                 }
             }
         });

+ 1 - 1
src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -965,7 +965,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
                     } else {
                         // update state and view of this fragment
                         searchFragment = false;
-                        setEmptyListLoadingMessage();
+                        setEmptyListLoadingMessage(false);
                         listDirectory(file, MainApp.isOnlyOnDevice(), false);
                         // then, notify parent activity to let it update its state and view
                         mContainerActivity.onBrowsedDownTo(file);

+ 1 - 1
src/main/java/com/owncloud/android/ui/fragment/PhotoFragment.java

@@ -129,7 +129,7 @@ public class PhotoFragment extends OCFileListFragment {
     private void handleSearchEvent() {
         prepareCurrentSearch(searchEvent);
         searchFragment = true;
-        setEmptyListLoadingMessage();
+        setEmptyListLoadingMessage(false);
 
         if (refresh || preferences.getPhotoSearchTimestamp() == 0 ||
             System.currentTimeMillis() - preferences.getPhotoSearchTimestamp() >= 30 * 1000) {