Fixes #1521 (Search activity, image search feature added.) #1561

ujjwalagrawal17 · 2018-05-28T08:18:53Z

Add Search activity, image search feature

Fixes #1521 (Add search Images from commons feature)
Fixes #1522 (Browse search field: Pressing Enter should launch search, rather than add newline character)

Description

Search activity added for browse feature
Menu added in featured image activity to Open search activity
Search Image Fragment added which has a recyclerview to show search results (images)
Search Activity contains a toolbar with edittext to search which on text change updates imageList
Also onclick of image in search results, a instance of media detail pager fragment replaces a search images fragment. (To open media details)
SearchImageRenderer added (handles presentation of individual image)
Icons for search and back button are added.

Tests performed

Manually tested on [API 25 Motog5S+] with ProdDebug
Please test on ProdDebug as betaDebug variant doesn't have many images to search

Screenshots showing what changed

ujjwalagrawal17 · 2018-05-28T08:22:29Z

@neslihanturan @nicolas-raoul I have completed search feature. Can you tell me the improvements? Also, some extra commits are coming due to merging master, how can I remove them?

nicolas-raoul · 2018-05-28T09:35:13Z

app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java

+
+    @Override
+    public void onBackPressed() {
+        if (getSupportFragmentManager().getBackStackEntryCount()==1){


spaces around ==

nicolas-raoul · 2018-05-28T09:35:36Z

app/src/main/java/fr/free/nrw/commons/explore/images/SearchImageFragment.java

+
+public class SearchImageFragment extends CommonsDaggerSupportFragment {
+
+    public static final int SEARCH_IMAGES_LIMIT = 25;


nicolas-raoul · 2018-05-28T09:36:07Z

app/src/main/java/fr/free/nrw/commons/explore/images/SearchImageFragment.java

+
+        return rootView;
+    }
+


nicolas-raoul · 2018-05-28T09:36:29Z

app/src/main/java/fr/free/nrw/commons/explore/images/SearchImageFragment.java

+    private Observable<SearchImageItem> searchImages(String query) {
+        return mwApi.searchImages(query, SEARCH_IMAGES_LIMIT).map(s -> new SearchImageItem(s));
+    }
+


nicolas-raoul · 2018-05-28T09:36:50Z

app/src/main/java/fr/free/nrw/commons/explore/images/SearchImageItem.java

@@ -0,0 +1,13 @@
+package fr.free.nrw.commons.explore.images;
+
+public class SearchImageItem  {


nicolas-raoul · 2018-05-28T09:37:07Z

app/src/main/java/fr/free/nrw/commons/explore/images/SearchImagesAdapterFactory.java

+import java.util.List;
+
+
+class SearchImagesAdapterFactory {


nicolas-raoul · 2018-05-28T09:39:11Z

app/src/main/java/fr/free/nrw/commons/explore/images/SearchImagesRenderer.java

+    interface ImageClickedListener {
+        void imageClicked(SearchImageItem item);
+    }
+


nicolas-raoul · 2018-05-28T09:39:37Z

app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java

        return CategoryImageUtils.getMediaList(childNodes);
    }

+    @Override


nicolas-raoul · 2018-05-28T10:11:45Z

Strangely I get Failed to resolve: common at implementation 'commons-codec:commons-codec:1.10' when building...

Could not find common.jar (android.arch.core:common:1.1.0).
Searched in the following locations:
    https://jcenter.bintray.com/android/arch/core/common/1.1.0/common-1.1.0.jar

ujjwalagrawal17 · 2018-05-28T10:27:46Z

Umm, @nicolas-raoul I have not changed anything in gradle files and it is working fine in my Laptop.

ujjwalagrawal17 · 2018-05-28T10:28:22Z

@nicolas-raoul Also can we enable codacy for our branch.

neslihanturan · 2018-05-28T12:39:11Z

can you ping me when it is ready to test @ujjwalagrawal17 ?

ujjwalagrawal17 · 2018-05-28T12:44:10Z

@neslihanturan @nicolas-raoul I think it is ready for review.

neslihanturan · 2018-05-28T15:14:15Z

Okay so search is added to featured activity for now. But it will be added to another activity in future right? Our task has no relation with featured activity.

ujjwalagrawal17 · 2018-05-28T15:23:29Z

Actually, we can rename featured image activity as explore Activity and menu in a drawer. We don't have to make a new activity for Explore feature then. If we make a separate activity then featured image will not be used. So I think its better to refractor already existing activity.

neslihanturan · 2018-05-28T15:26:51Z

We have to think about UIs. Because Featured images is not same with explore. You can explore ALL images. But when we add search icon top of featured images, it feels like user can only search in featured images. This is not the case.

ujjwalagrawal17 · 2018-05-28T15:33:00Z

Yes @neslihanturan you are right. There are 2 solutions for this -

We can change and refractor featured activity and rename it explore and below toolbar we can maybe mention that below images are featured using a textview maybe.
Or create a seperate Explore activity and do it there.

ujjwalagrawal17 · 2018-05-28T15:34:05Z

In both cases in toolbar and navigation drawer, we have to write "Explore".

misaochan · 2018-05-28T16:07:40Z

@neslihanturan Can that issue not be solved by having existing text in the search bar that says "Search all images in Commons"?

I would personally prefer Browse and Featured to be united in a single activity if possible, as they are highly related and it reduces cluttering. I believe we were discussing this at #1521

neslihanturan · 2018-05-28T19:07:38Z

I also meant we definitely should have them in same activity but maybe different tabs? Or your solution could also work. Under any case I think it is better to discuss on mockups. @ujjwalagrawal17 are you willing to create some mockups to find best solution? @nicolas-raoul I really wonder your opinion about this topic.

Please continue to discussion at #1521

ujjwalagrawal17 · 2018-05-28T19:10:09Z

@neslihanturan sure I will share some mock-ups tomorrow. I think we can merge that in a seperate PR.

neslihanturan · 2018-05-29T07:22:01Z

Travis fail is not about this PR. Thanks a lot @ujjwalagrawal17 for great job! Looking forward for your other PRs:)

ujjwalagrawal17 changed the base branch from master to browse-commons-via-app May 28, 2018 08:19

ujjwalagrawal17 added 4 commits May 28, 2018 14:03

Search activity, image search fragment added

75f5f1b

Removed explore icon xml

5bb1d19

Updated Javadocs for search Activity and Navigation Base Activity

2aac404

SearchImageItem class updated

021905a

ujjwalagrawal17 force-pushed the search_activity branch from b5af070 to 021905a Compare May 28, 2018 08:34

nicolas-raoul reviewed May 28, 2018

View reviewed changes

Javadocs added for search activity

4422329

removed redundant code and added javadocs for search image modules

092d2a3

Javadocs added for updateImageList method

a5d67cc

ujjwalagrawal17 mentioned this pull request May 28, 2018

Add search Images from commons feature #1521

Closed

neslihanturan merged commit df82383 into commons-app:browse-commons-via-app May 29, 2018


		public class SearchImageFragment extends CommonsDaggerSupportFragment {

		public static final int SEARCH_IMAGES_LIMIT = 25;

		@@ -0,0 +1,13 @@
		package fr.free.nrw.commons.explore.images;

		public class SearchImageItem {

Fixes #1521 (Search activity, image search feature added.) #1561

Fixes #1521 (Search activity, image search feature added.) #1561

Uh oh!

Conversation

ujjwalagrawal17 commented May 28, 2018

Add Search activity, image search feature

Description

Tests performed

Screenshots showing what changed

Uh oh!

ujjwalagrawal17 commented May 28, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nicolas-raoul commented May 28, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ujjwalagrawal17 commented May 28, 2018

Uh oh!

ujjwalagrawal17 commented May 28, 2018

Uh oh!

neslihanturan commented May 28, 2018

Uh oh!

ujjwalagrawal17 commented May 28, 2018

Uh oh!

neslihanturan commented May 28, 2018

Uh oh!

ujjwalagrawal17 commented May 28, 2018

Uh oh!

neslihanturan commented May 28, 2018

Uh oh!

ujjwalagrawal17 commented May 28, 2018

Uh oh!

ujjwalagrawal17 commented May 28, 2018

Uh oh!

misaochan commented May 28, 2018

Uh oh!

neslihanturan commented May 28, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ujjwalagrawal17 commented May 28, 2018

Uh oh!

neslihanturan commented May 29, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

nicolas-raoul commented May 28, 2018 •

edited

Loading

neslihanturan commented May 28, 2018 •

edited

Loading