mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-22 13:15:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7289 from nextcloud/showSortingAgain

Browse source 
All files -> media --> all files: show sort header
This commit is contained in:
Tobias Kaminsky 2021-03-18 07:21:33 +01:00 committed by GitHub
commit f2e9d4f285
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
screenshots/gplay/debug/com.nextcloud.client.FileDisplayActivityScreenshotIT_showMediaThenAllFiles.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.3 KiB

35
src/androidTest/java/com/nextcloud/client/FileDisplayActivityScreenshotIT.java
View file

@ -33,6 +33,7 @@ import org.junit.Rule;
import org.junit.Test;
import androidx.test.espresso.contrib.DrawerActions;
import androidx.test.espresso.contrib.NavigationViewActions;
import androidx.test.espresso.intent.rule.IntentsTestRule;
import androidx.test.rule.GrantPermissionRule;
@ -58,6 +59,40 @@ public class FileDisplayActivityScreenshotIT extends AbstractIT {
sut.getListOfFilesFragment().setLoading(false);
waitForIdleSync();
shortSleep();
screenshot(sut);
}
@Test
@ScreenshotTest
public void showMediaThenAllFiles() {
FileDisplayActivity sut = activityRule.launchActivity(null);
sut.getListOfFilesFragment().setFabEnabled(false);
sut.getListOfFilesFragment().setEmptyListLoadingMessage();
sut.getListOfFilesFragment().setLoading(false);
// open drawer
onView(withId(R.id.drawer_layout)).perform(DrawerActions.open());
// click "all files"
onView(withId(R.id.nav_view))
.perform(NavigationViewActions.navigateTo(R.id.nav_gallery));
// wait
shortSleep();
// click "all files"
onView(withId(R.id.drawer_layout)).perform(DrawerActions.open());
onView(withId(R.id.nav_view)).perform(NavigationViewActions.navigateTo(R.id.nav_all_files));
// then compare screenshot
shortSleep();
sut.getListOfFilesFragment().setFabEnabled(false);
sut.getListOfFilesFragment().setEmptyListLoadingMessage();
sut.getListOfFilesFragment().setLoading(false);
shortSleep();
screenshot(sut);
}

2
src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file

@ -208,7 +208,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
ADD_GRID_AND_SORT_WITH_SEARCH
}
protected MenuItemAddRemove menuItemAddRemoveValue = MenuItemAddRemove.DO_NOTHING;
protected MenuItemAddRemove menuItemAddRemoveValue = MenuItemAddRemove.ADD_GRID_AND_SORT_WITH_SEARCH;
private List<MenuItem> mOriginalMenuItems = new ArrayList<>();