Skip to content

re-add CONTENT_TYPE_SEARCH #4748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tobiasKaminsky wants to merge 1 commit into
base: master
Choose a base branch
from
Open

re-add CONTENT_TYPE_SEARCH #4748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
re-add CONTENT_TYPE_SEARCH 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
  • Loading branch information
@tobiasKaminsky
tobiasKaminsky committed Oct 29, 2019
commit b111182c537b9ee41a1838ce71dc2fc38bb77e12
4 changes: 1 addition & 3 deletions src/main/java/com/nextcloud/client/di/ComponentsModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,7 @@ abstract class ComponentsModule {
@ContributesAndroidInjector abstract ManageAccountsActivity manageAccountsActivity();
@ContributesAndroidInjector abstract ManageSpaceActivity manageSpaceActivity();
@ContributesAndroidInjector abstract NotificationsActivity notificationsActivity();

@ContributesAndroidInjector
abstract CommunityActivity participateActivity();
@ContributesAndroidInjector abstract CommunityActivity participateActivity();
@ContributesAndroidInjector abstract PassCodeActivity passCodeActivity();
@ContributesAndroidInjector abstract PreviewImageActivity previewImageActivity();
@ContributesAndroidInjector abstract PreviewVideoActivity previewVideoActivity();
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,10 @@ private void selectNavigationItem(final MenuItem menuItem) {
SearchEvent.UnsetType.UNSET_BOTTOM_NAV_BAR),
menuItem.getItemId());
break;
case R.id.nav_recently_added:
handleSearchEvents(new SearchEvent("%", SearchRemoteOperation.SearchType.CONTENT_TYPE_SEARCH,
SearchEvent.UnsetType.UNSET_BOTTOM_NAV_BAR), menuItem.getItemId());
break;
case R.id.nav_recently_modified:
handleSearchEvents(new SearchEvent("",
SearchRemoteOperation.SearchType.RECENTLY_MODIFIED_SEARCH,
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,13 @@ protected void prepareCurrentSearch(SearchEvent event) {
currentSearchType = SearchType.FILE_SEARCH;
break;

case CONTENT_TYPE_SEARCH:
if ("video/%".equals(event.getSearchQuery())) {
currentSearchType = SearchType.VIDEO_SEARCH;
}
break;


case FAVORITE_SEARCH:
currentSearchType = SearchType.FAVORITE_SEARCH;
break;
Expand Down