Hidden categories are not showed in suggested categories #3853

PaulinaQuintero · 2020-06-29T23:49:09Z

Description
Categories marked as not allowed for the user are now hidden
Fixes #3640

What changes did you make and why?
I added the functionality to hidde categories marked, because before these categories were shown to the user and and supposed to be prohibited

Tested ProdDebug on Nexus 5x and Nexus 4 with API level 30.

tests-checker

Could you please add tests to make sure this change works as expected?

PaulinaQuintero · 2020-06-29T23:57:09Z

There are important information missing in the documentation of the APIS, the way to access to important elements of the generator version of the API allcategories is shown with prop=categoryinfo

…pps-android-commons into add-pquinterom

PaulinaQuintero · 2020-06-30T01:14:29Z

Sorry in advance for all the commits I had some troubles

sivaraam

... he way to access to important elements of the generator version of the API allcategories is shown with prop=categoryinfo

Ah, so that's where the information has been hiding. Thanks a lot for finding this! Certainly better than moving to the list version of the API. 😉

I took a brief look and left some comments. Kindly look into them.

sivaraam · 2020-07-02T19:11:28Z

app/src/main/java/fr/free/nrw/commons/category/CategoryInterface.java

     * @return
     */
    @GET("w/api.php?action=query&format=json&formatversion=2"
            + "&generator=allcategories")


For the API to actually return the categoryinfo in the requests made by the app you should do this

Suggested change

+ "&generator=allcategories")

+ "&generator=allcategories&prop=categoryinfo")

sivaraam · 2020-07-02T19:11:56Z

app/src/main/java/fr/free/nrw/commons/category/CategoryInterface.java

    Single<MwQueryResponse> searchCategoriesForPrefix(@Query("gacprefix") String prefix,
                                                          @Query("gaclimit") int itemLimit, @Query("gacoffset") int offset);

+


Revert these whitespace changes.

sivaraam · 2020-07-02T19:12:21Z

data-client/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryPage.java

+
+
+


Revert this whitespace change too.

sivaraam · 2020-07-02T19:13:01Z

data-client/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryPage.java

        @SuppressWarnings("unused") private List<String> label;
    }
-}
+}


Revert this removal of the newline too.

sivaraam · 2020-07-02T19:13:24Z

app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt

    }

-}
+}


Revert this removal of the newline.

sivaraam · 2020-07-02T19:13:39Z

data-client/src/main/java/org/wikipedia/search/SearchResults.java

    }
-}
-
+}


Revert changes to this file.

PaulinaQuintero · 2020-07-03T00:47:49Z

@sivaraam Thank you, I'm going to check it. Could I open a new issue to add the information of the generator version API of allcategories in the documentation? I think it's so important to have this information in the documentation for future contributions. It could be very useful

sivaraam · 2020-07-03T17:31:41Z

Could I open a new issue to add the information of the generator version API of allcategories in the documentation?

Its not relevant here. You could discuss about this in the talk page of API:Allcategories (or) better yet you could be bold and edit the API help page yourself. Its called a wiki for a reason :)

sivaraam

Thanks for the changes. See my comments.

sivaraam · 2020-07-04T20:04:23Z

app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt

+                it.filter { page -> !page.categoryInfo().isHidden
+                }.map { page -> page.title().replace(CATEGORY_PREFIX, "") }


I think we need to be careful here as the categoryInfo object wouldn't be present in all the responses that are handled by responseMapper. So, we should do this:

Suggested change

it.filter { page -> !page.categoryInfo().isHidden

}.map { page -> page.title().replace(CATEGORY_PREFIX, "") }

it.filter {

page -> page.categoryInfo() == null || !page.categoryInfo().isHidden

}.map { page -> page.title().replace(CATEGORY_PREFIX, "") }

Not handling this is likely a reason for the tests failing in Travis CI.

sivaraam · 2020-07-04T20:05:07Z

app/src/main/java/fr/free/nrw/commons/category/CategoryInterface.java

    @GET("w/api.php?action=query&format=json&formatversion=2"
-            + "&generator=allcategories")
+            + "&generator=allcategories&prop=categoryinfo")
+


Remove this additional new line.

sivaraam · 2020-07-04T20:05:26Z

app/src/main/java/fr/free/nrw/commons/category/CategoryInterface.java

    Single<MwQueryResponse> searchCategoriesForPrefix(@Query("gacprefix") String prefix,
                                                          @Query("gaclimit") int itemLimit, @Query("gacoffset") int offset);
-
+    


Remove this needless whitespace.

sivaraam · 2020-07-04T20:08:43Z

data-client/src/main/java/org/wikipedia/search/SearchResults.java

     */
    public SearchResults(@NonNull List<MwQueryPage> pages, @NonNull WikiSite wiki,
-                         @Nullable Map<String, String> continuation, @Nullable String suggestion) {
+        @Nullable Map<String, String> continuation, @Nullable String suggestion) {


I don't see any need for this file to be changed. So, revert the changes to this file. You could use the following commands to revert the changes in this file:

git fetch origin git checkout origin/master -- data-client/src/main/java/org/wikipedia/search/SearchResults.java

Assuming origin points to this repo.

…mapper

sivaraam

Thanks. This looks good to me. I just reverted a few minor whitespace changes. Hope you don't mind :)

sivaraam · 2020-07-19T15:29:14Z

Merging this PR despite a failed build as the test that failed is unrelated to this PR. For reference, this is the failed test:

> Task :app:testBetaDebugUnitTest

fr.free.nrw.commons.nearby.NearbyParentFragmentPresenterTest > testFilterByMarkerTypeMultiSelectCHECKED FAILED

    org.mockito.exceptions.verification.WantedButNotInvoked at NearbyParentFragmentPresenterTest.kt:267

366 tests completed, 1 failed, 2 skipped

The same failure is observed in master build too, at the time of writing.

@VisibleForTesting

* Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * #3749 Improve MediaClient UnitTests (#3846) * #3468 Switch from RvRenderer to AdapterDelegates - replace SearchDepictionsRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace UploadCategoryDepictionsRenderer * #3468 Switch from RvRenderer to AdapterDelegates - update BaseAdapter to be easier to use * #3468 Switch from RvRenderer to AdapterDelegates - replace SearchImagesRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace SearchCategoriesRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace NotificationRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace UploadDepictsRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace PlaceRenderer * #3756 Convert SearchDepictionsFragment to use Pagination - convert SearchDepictionsFragment * #3756 Convert SearchDepictionsFragment to use Pagination - fix presenter unit tests now that view is not nullable - fix Category prefix imports * #3756 Convert SearchDepictionsFragment to use Pagination - test DataSource related classes * #3756 Convert SearchDepictionsFragment to use Pagination - reset rx scheduler - ignore failing test * #3760 Convert SearchCategoriesFragment to use Pagination - extract functionality of pagination to base classes - add category pagination * #3772 Convert SearchImagesFragment to use Pagination - convert SearchImagesFragment - tidy up showing the empty view - make search fragments show snackbar with appropriate text * #3772 Convert SearchImagesFragment to use Pagination - allow viewpager to load more data * #3760 remove test that got re-added by merge * #3760 remove duplicate dependency * #3772 fix compilation * #3780 Create media using a combination of Entities & MwQueryResult - construct media with an entity - move fields from media down to contribution - move dynamic fields outside of media - remove unused constructors - remove all unnecessary fetching of captions/descriptions - bump database version * #3808 Construct media objects that depict an item id correctly - use generator to construct media for DepictedImages * #3810 Convert DepictedImagesFragment to use Pagination - extract common media paging methods - convert to DepictedImages to use pagination * #3810 Convert DepictedImagesFragment to use Pagination - rename base classes to better reflect usage * #3810 Convert DepictedImagesFragment to use Pagination - map to empty result with no pages * #3810 Convert DepictedImagesFragment to use Pagination - align test with returned values * #3780 Create media using a combination of Entities & MwQueryResult - update wikicode to align with expected behaviour * #3780 Create media using a combination of Entities & MwQueryResult - replace old site of thumbnail title with most relevant caption * #3818 Convert SubDepictionListFragment to use Pagination - replace SubDepictionList with Child and Parent Fragments - replace contracts with simple presenter declarations - move classes to appropriate packages - delete unused network models - delete duplicated paging classes * #3820 Convert CategoryImagesListFragment to use Pagination - replace CategoryImagesListFragment with CategoriesMediaFragment - disallow the construction of media objects without imageinfo * #3822 Convert SubCategoryImagesListFragment to use Pagination - convert subcategories - add continuation support in category client - rely on interfaces for callbacks of PageableMediaFragments * #3822 Convert SubCategoryImagesListFragment to use Pagination - convert parent categories - delete list fragment - creat base class to support continuation requests in clients * #3822 Convert SubCategoryImagesListFragment to use Pagination - add tests for ParentCategoriesDataSource * #3822 Convert SubCategoryImagesListFragment to use Pagination - remove no longer applicable test * #3749 Improve MediaClient UnitTests - test rewrite * #3749 Improve MediaClient UnitTests - align with buildConfig property * With pause and resume for uploads (#3858) * With pause and resume for uploads * Dispose current upload * Make pause and resume work * Check stash validity * With java docs * minor * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Add nearby presenter unit tests (#3615) * init the test file * Add tests to check if searchthisarea button action and checkbox actions are added after initialize test * Add tests to locked unlocked nearby cases * Add tests for null cases in updateMapAndList method * Add test to check which locations are used to populate places, depending to LocationChangeType * Add tests to test users position is not followed if blue dot (current location marker) is not visible * Add tests to decide search this area method visibility on camera move * Add tests for multi filteirng of placetypes * add tests for single place type selection too * Add tests to tests search view focus gain and bottom sheet visibilities * Add tests for SearchCloseToCurrentLocation * Remove two unneeded getter and setter for isNearbyLocked, use @VisibleForTesting annotation instead * Add VisibleForTesting annotation to initializeNearbyOperations method so that it will be private by default * Add missing tests * Add tests for map updated case and add missing lines those are being tested * Add some missind method verifications * Create real latlang objects isntead of spying them * Use a real presenter object instead of a spy * Revert nonneeded @VisibleForTest annotations, instead reach via lockUnlock method * Reduce code repetitions * Do not call a test from another test method * Add some more tests * Fix minor issues * Hidden categories are not showed in suggested categories (#3853) * Localisation updates from https://translatewiki.net. * Clarify that the caption would also be used as the image title (#3876) The app uses the fist caption as the file title. This should also be communicated to the user via the info box as they would not be aware of it otherwise. * Localisation updates from https://translatewiki.net. * Added Click event for leaderboard, Fixed #3886 * Fixed Travis Co-authored-by: translatewiki.net <l10n-bot@translatewiki.net> Co-authored-by: Seán Mac Gillicuddy <seantheappdev@gmail.com> Co-authored-by: Vivek Maskara <maskaravivek@gmail.com> Co-authored-by: neslihanturan <tur.neslihan@gmail.com> Co-authored-by: Paulina <63326136+PaulinaQuintero@users.noreply.github.com> Co-authored-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>

@VisibleForTesting

* Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * #3749 Improve MediaClient UnitTests (#3846) * #3468 Switch from RvRenderer to AdapterDelegates - replace SearchDepictionsRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace UploadCategoryDepictionsRenderer * #3468 Switch from RvRenderer to AdapterDelegates - update BaseAdapter to be easier to use * #3468 Switch from RvRenderer to AdapterDelegates - replace SearchImagesRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace SearchCategoriesRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace NotificationRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace UploadDepictsRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace PlaceRenderer * #3756 Convert SearchDepictionsFragment to use Pagination - convert SearchDepictionsFragment * #3756 Convert SearchDepictionsFragment to use Pagination - fix presenter unit tests now that view is not nullable - fix Category prefix imports * #3756 Convert SearchDepictionsFragment to use Pagination - test DataSource related classes * #3756 Convert SearchDepictionsFragment to use Pagination - reset rx scheduler - ignore failing test * #3760 Convert SearchCategoriesFragment to use Pagination - extract functionality of pagination to base classes - add category pagination * #3772 Convert SearchImagesFragment to use Pagination - convert SearchImagesFragment - tidy up showing the empty view - make search fragments show snackbar with appropriate text * #3772 Convert SearchImagesFragment to use Pagination - allow viewpager to load more data * #3760 remove test that got re-added by merge * #3760 remove duplicate dependency * #3772 fix compilation * #3780 Create media using a combination of Entities & MwQueryResult - construct media with an entity - move fields from media down to contribution - move dynamic fields outside of media - remove unused constructors - remove all unnecessary fetching of captions/descriptions - bump database version * #3808 Construct media objects that depict an item id correctly - use generator to construct media for DepictedImages * #3810 Convert DepictedImagesFragment to use Pagination - extract common media paging methods - convert to DepictedImages to use pagination * #3810 Convert DepictedImagesFragment to use Pagination - rename base classes to better reflect usage * #3810 Convert DepictedImagesFragment to use Pagination - map to empty result with no pages * #3810 Convert DepictedImagesFragment to use Pagination - align test with returned values * #3780 Create media using a combination of Entities & MwQueryResult - update wikicode to align with expected behaviour * #3780 Create media using a combination of Entities & MwQueryResult - replace old site of thumbnail title with most relevant caption * #3818 Convert SubDepictionListFragment to use Pagination - replace SubDepictionList with Child and Parent Fragments - replace contracts with simple presenter declarations - move classes to appropriate packages - delete unused network models - delete duplicated paging classes * #3820 Convert CategoryImagesListFragment to use Pagination - replace CategoryImagesListFragment with CategoriesMediaFragment - disallow the construction of media objects without imageinfo * #3822 Convert SubCategoryImagesListFragment to use Pagination - convert subcategories - add continuation support in category client - rely on interfaces for callbacks of PageableMediaFragments * #3822 Convert SubCategoryImagesListFragment to use Pagination - convert parent categories - delete list fragment - creat base class to support continuation requests in clients * #3822 Convert SubCategoryImagesListFragment to use Pagination - add tests for ParentCategoriesDataSource * #3822 Convert SubCategoryImagesListFragment to use Pagination - remove no longer applicable test * #3749 Improve MediaClient UnitTests - test rewrite * #3749 Improve MediaClient UnitTests - align with buildConfig property * With pause and resume for uploads (#3858) * With pause and resume for uploads * Dispose current upload * Make pause and resume work * Check stash validity * With java docs * minor * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Add nearby presenter unit tests (#3615) * init the test file * Add tests to check if searchthisarea button action and checkbox actions are added after initialize test * Add tests to locked unlocked nearby cases * Add tests for null cases in updateMapAndList method * Add test to check which locations are used to populate places, depending to LocationChangeType * Add tests to test users position is not followed if blue dot (current location marker) is not visible * Add tests to decide search this area method visibility on camera move * Add tests for multi filteirng of placetypes * add tests for single place type selection too * Add tests to tests search view focus gain and bottom sheet visibilities * Add tests for SearchCloseToCurrentLocation * Remove two unneeded getter and setter for isNearbyLocked, use @VisibleForTesting annotation instead * Add VisibleForTesting annotation to initializeNearbyOperations method so that it will be private by default * Add missing tests * Add tests for map updated case and add missing lines those are being tested * Add some missind method verifications * Create real latlang objects isntead of spying them * Use a real presenter object instead of a spy * Revert nonneeded @VisibleForTest annotations, instead reach via lockUnlock method * Reduce code repetitions * Do not call a test from another test method * Add some more tests * Fix minor issues * Hidden categories are not showed in suggested categories (#3853) * Localisation updates from https://translatewiki.net. * Clarify that the caption would also be used as the image title (#3876) The app uses the fist caption as the file title. This should also be communicated to the user via the info box as they would not be aware of it otherwise. * Localisation updates from https://translatewiki.net. * Delete NearbyMapFragment & NearbyListFragment (#3885) * Fixes #3884 * Delete NearbyMapFragment & NearbyListFragment * Fixed NearbyParentFragmentPresenterTest * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Add more nearby tests (#3877) * more nearby tests added * Add tests for Label class * Add checkbox test javadocs * Add javadocs for label * Localisation updates from https://translatewiki.net. * Updated strings.xml Co-authored-by: translatewiki.net <l10n-bot@translatewiki.net> Co-authored-by: Seán Mac Gillicuddy <seantheappdev@gmail.com> Co-authored-by: Vivek Maskara <maskaravivek@gmail.com> Co-authored-by: neslihanturan <tur.neslihan@gmail.com> Co-authored-by: Paulina <63326136+PaulinaQuintero@users.noreply.github.com> Co-authored-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> Co-authored-by: Ashish Kumar <ashishkumar468@gmail.com>

@VisibleForTesting

* [GSoC] Fixes #3789 Updated UI of achievements activity to display level in first tab & Leaderboard in the second tab (#3794) * Updated UI of achievements activity to display level in first tab and Leaderboard in the second tab * Removed hardcoded string * Fixes #3861 Use the APIs to fetch leaderboard’s based on uploads via mobile app (all time) and display it in the Leaderboard screen. (#3865) * [GSoC] Added Unit Tests and Fixed Landscape Mode Bug (#3872) * Fixes #3861 Use the APIs to fetch leaderboard’s based on uploads via mobile app (all time) and display it in the Leaderboard screen. * Fixed Bug - missing data in landscape mode * Added Unit Tests for Leaderboard * Added JavaDocs * Updated JavaDocs * [GSoC] Added Pagination to Leaderboard (#3881) * Fixes #3861 Use the APIs to fetch leaderboard’s based on uploads via mobile app (all time) and display it in the Leaderboard screen. * Fixed Bug - missing data in landscape mode * Added Unit Tests for Leaderboard * Added JavaDocs * Updated JavaDocs * Added Pagination * Added Merge Adapter * Fixed Test Case * Added Smooth Scroll * Added Progress Bar for Paging * Fixed Gradle * [GSoC] Added option to set a new avatar (#3892) * Fixes #3861 Use the APIs to fetch leaderboard’s based on uploads via mobile app (all time) and display it in the Leaderboard screen. * Added option to set a new avatar * [GSoC] Added Click to open user profile for leaderboard (#3887) * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * #3749 Improve MediaClient UnitTests (#3846) * #3468 Switch from RvRenderer to AdapterDelegates - replace SearchDepictionsRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace UploadCategoryDepictionsRenderer * #3468 Switch from RvRenderer to AdapterDelegates - update BaseAdapter to be easier to use * #3468 Switch from RvRenderer to AdapterDelegates - replace SearchImagesRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace SearchCategoriesRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace NotificationRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace UploadDepictsRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace PlaceRenderer * #3756 Convert SearchDepictionsFragment to use Pagination - convert SearchDepictionsFragment * #3756 Convert SearchDepictionsFragment to use Pagination - fix presenter unit tests now that view is not nullable - fix Category prefix imports * #3756 Convert SearchDepictionsFragment to use Pagination - test DataSource related classes * #3756 Convert SearchDepictionsFragment to use Pagination - reset rx scheduler - ignore failing test * #3760 Convert SearchCategoriesFragment to use Pagination - extract functionality of pagination to base classes - add category pagination * #3772 Convert SearchImagesFragment to use Pagination - convert SearchImagesFragment - tidy up showing the empty view - make search fragments show snackbar with appropriate text * #3772 Convert SearchImagesFragment to use Pagination - allow viewpager to load more data * #3760 remove test that got re-added by merge * #3760 remove duplicate dependency * #3772 fix compilation * #3780 Create media using a combination of Entities & MwQueryResult - construct media with an entity - move fields from media down to contribution - move dynamic fields outside of media - remove unused constructors - remove all unnecessary fetching of captions/descriptions - bump database version * #3808 Construct media objects that depict an item id correctly - use generator to construct media for DepictedImages * #3810 Convert DepictedImagesFragment to use Pagination - extract common media paging methods - convert to DepictedImages to use pagination * #3810 Convert DepictedImagesFragment to use Pagination - rename base classes to better reflect usage * #3810 Convert DepictedImagesFragment to use Pagination - map to empty result with no pages * #3810 Convert DepictedImagesFragment to use Pagination - align test with returned values * #3780 Create media using a combination of Entities & MwQueryResult - update wikicode to align with expected behaviour * #3780 Create media using a combination of Entities & MwQueryResult - replace old site of thumbnail title with most relevant caption * #3818 Convert SubDepictionListFragment to use Pagination - replace SubDepictionList with Child and Parent Fragments - replace contracts with simple presenter declarations - move classes to appropriate packages - delete unused network models - delete duplicated paging classes * #3820 Convert CategoryImagesListFragment to use Pagination - replace CategoryImagesListFragment with CategoriesMediaFragment - disallow the construction of media objects without imageinfo * #3822 Convert SubCategoryImagesListFragment to use Pagination - convert subcategories - add continuation support in category client - rely on interfaces for callbacks of PageableMediaFragments * #3822 Convert SubCategoryImagesListFragment to use Pagination - convert parent categories - delete list fragment - creat base class to support continuation requests in clients * #3822 Convert SubCategoryImagesListFragment to use Pagination - add tests for ParentCategoriesDataSource * #3822 Convert SubCategoryImagesListFragment to use Pagination - remove no longer applicable test * #3749 Improve MediaClient UnitTests - test rewrite * #3749 Improve MediaClient UnitTests - align with buildConfig property * With pause and resume for uploads (#3858) * With pause and resume for uploads * Dispose current upload * Make pause and resume work * Check stash validity * With java docs * minor * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Add nearby presenter unit tests (#3615) * init the test file * Add tests to check if searchthisarea button action and checkbox actions are added after initialize test * Add tests to locked unlocked nearby cases * Add tests for null cases in updateMapAndList method * Add test to check which locations are used to populate places, depending to LocationChangeType * Add tests to test users position is not followed if blue dot (current location marker) is not visible * Add tests to decide search this area method visibility on camera move * Add tests for multi filteirng of placetypes * add tests for single place type selection too * Add tests to tests search view focus gain and bottom sheet visibilities * Add tests for SearchCloseToCurrentLocation * Remove two unneeded getter and setter for isNearbyLocked, use @VisibleForTesting annotation instead * Add VisibleForTesting annotation to initializeNearbyOperations method so that it will be private by default * Add missing tests * Add tests for map updated case and add missing lines those are being tested * Add some missind method verifications * Create real latlang objects isntead of spying them * Use a real presenter object instead of a spy * Revert nonneeded @VisibleForTest annotations, instead reach via lockUnlock method * Reduce code repetitions * Do not call a test from another test method * Add some more tests * Fix minor issues * Hidden categories are not showed in suggested categories (#3853) * Localisation updates from https://translatewiki.net. * Clarify that the caption would also be used as the image title (#3876) The app uses the fist caption as the file title. This should also be communicated to the user via the info box as they would not be aware of it otherwise. * Localisation updates from https://translatewiki.net. * Added Click event for leaderboard, Fixed #3886 * Fixed Travis Co-authored-by: translatewiki.net <l10n-bot@translatewiki.net> Co-authored-by: Seán Mac Gillicuddy <seantheappdev@gmail.com> Co-authored-by: Vivek Maskara <maskaravivek@gmail.com> Co-authored-by: neslihanturan <tur.neslihan@gmail.com> Co-authored-by: Paulina <63326136+PaulinaQuintero@users.noreply.github.com> Co-authored-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> * [GSoC] Added Leaderboard Filters (#3902) * Attempt to add filters * Basic Filter Working * Filter Improved * Filter Completed * Add JavaDocs * Added Test for Update Avatar * Decreased Margin of Filter * [GSoC] Updated leaderboard string (#3897) * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * #3749 Improve MediaClient UnitTests (#3846) * #3468 Switch from RvRenderer to AdapterDelegates - replace SearchDepictionsRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace UploadCategoryDepictionsRenderer * #3468 Switch from RvRenderer to AdapterDelegates - update BaseAdapter to be easier to use * #3468 Switch from RvRenderer to AdapterDelegates - replace SearchImagesRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace SearchCategoriesRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace NotificationRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace UploadDepictsRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace PlaceRenderer * #3756 Convert SearchDepictionsFragment to use Pagination - convert SearchDepictionsFragment * #3756 Convert SearchDepictionsFragment to use Pagination - fix presenter unit tests now that view is not nullable - fix Category prefix imports * #3756 Convert SearchDepictionsFragment to use Pagination - test DataSource related classes * #3756 Convert SearchDepictionsFragment to use Pagination - reset rx scheduler - ignore failing test * #3760 Convert SearchCategoriesFragment to use Pagination - extract functionality of pagination to base classes - add category pagination * #3772 Convert SearchImagesFragment to use Pagination - convert SearchImagesFragment - tidy up showing the empty view - make search fragments show snackbar with appropriate text * #3772 Convert SearchImagesFragment to use Pagination - allow viewpager to load more data * #3760 remove test that got re-added by merge * #3760 remove duplicate dependency * #3772 fix compilation * #3780 Create media using a combination of Entities & MwQueryResult - construct media with an entity - move fields from media down to contribution - move dynamic fields outside of media - remove unused constructors - remove all unnecessary fetching of captions/descriptions - bump database version * #3808 Construct media objects that depict an item id correctly - use generator to construct media for DepictedImages * #3810 Convert DepictedImagesFragment to use Pagination - extract common media paging methods - convert to DepictedImages to use pagination * #3810 Convert DepictedImagesFragment to use Pagination - rename base classes to better reflect usage * #3810 Convert DepictedImagesFragment to use Pagination - map to empty result with no pages * #3810 Convert DepictedImagesFragment to use Pagination - align test with returned values * #3780 Create media using a combination of Entities & MwQueryResult - update wikicode to align with expected behaviour * #3780 Create media using a combination of Entities & MwQueryResult - replace old site of thumbnail title with most relevant caption * #3818 Convert SubDepictionListFragment to use Pagination - replace SubDepictionList with Child and Parent Fragments - replace contracts with simple presenter declarations - move classes to appropriate packages - delete unused network models - delete duplicated paging classes * #3820 Convert CategoryImagesListFragment to use Pagination - replace CategoryImagesListFragment with CategoriesMediaFragment - disallow the construction of media objects without imageinfo * #3822 Convert SubCategoryImagesListFragment to use Pagination - convert subcategories - add continuation support in category client - rely on interfaces for callbacks of PageableMediaFragments * #3822 Convert SubCategoryImagesListFragment to use Pagination - convert parent categories - delete list fragment - creat base class to support continuation requests in clients * #3822 Convert SubCategoryImagesListFragment to use Pagination - add tests for ParentCategoriesDataSource * #3822 Convert SubCategoryImagesListFragment to use Pagination - remove no longer applicable test * #3749 Improve MediaClient UnitTests - test rewrite * #3749 Improve MediaClient UnitTests - align with buildConfig property * With pause and resume for uploads (#3858) * With pause and resume for uploads * Dispose current upload * Make pause and resume work * Check stash validity * With java docs * minor * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Add nearby presenter unit tests (#3615) * init the test file * Add tests to check if searchthisarea button action and checkbox actions are added after initialize test * Add tests to locked unlocked nearby cases * Add tests for null cases in updateMapAndList method * Add test to check which locations are used to populate places, depending to LocationChangeType * Add tests to test users position is not followed if blue dot (current location marker) is not visible * Add tests to decide search this area method visibility on camera move * Add tests for multi filteirng of placetypes * add tests for single place type selection too * Add tests to tests search view focus gain and bottom sheet visibilities * Add tests for SearchCloseToCurrentLocation * Remove two unneeded getter and setter for isNearbyLocked, use @VisibleForTesting annotation instead * Add VisibleForTesting annotation to initializeNearbyOperations method so that it will be private by default * Add missing tests * Add tests for map updated case and add missing lines those are being tested * Add some missind method verifications * Create real latlang objects isntead of spying them * Use a real presenter object instead of a spy * Revert nonneeded @VisibleForTest annotations, instead reach via lockUnlock method * Reduce code repetitions * Do not call a test from another test method * Add some more tests * Fix minor issues * Hidden categories are not showed in suggested categories (#3853) * Localisation updates from https://translatewiki.net. * Clarify that the caption would also be used as the image title (#3876) The app uses the fist caption as the file title. This should also be communicated to the user via the info box as they would not be aware of it otherwise. * Localisation updates from https://translatewiki.net. * Delete NearbyMapFragment & NearbyListFragment (#3885) * Fixes #3884 * Delete NearbyMapFragment & NearbyListFragment * Fixed NearbyParentFragmentPresenterTest * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Add more nearby tests (#3877) * more nearby tests added * Add tests for Label class * Add checkbox test javadocs * Add javadocs for label * Localisation updates from https://translatewiki.net. * Updated strings.xml Co-authored-by: translatewiki.net <l10n-bot@translatewiki.net> Co-authored-by: Seán Mac Gillicuddy <seantheappdev@gmail.com> Co-authored-by: Vivek Maskara <maskaravivek@gmail.com> Co-authored-by: neslihanturan <tur.neslihan@gmail.com> Co-authored-by: Paulina <63326136+PaulinaQuintero@users.noreply.github.com> Co-authored-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> Co-authored-by: Ashish Kumar <ashishkumar468@gmail.com> * Updated Strings * Added JavaDocs for all methods and classes * Added JavaDocs for all methods and classes * Added More JavaDocs * Revert string.xml * Revert "Revert string.xml" This reverts commit 00019b5. * Added protected * Fixed strings.xml extra changes * Revert codeStyle change * Fixed extra string change Co-authored-by: Vivek Maskara <maskaravivek@gmail.com> Co-authored-by: translatewiki.net <l10n-bot@translatewiki.net> Co-authored-by: Seán Mac Gillicuddy <seantheappdev@gmail.com> Co-authored-by: neslihanturan <tur.neslihan@gmail.com> Co-authored-by: Paulina <63326136+PaulinaQuintero@users.noreply.github.com> Co-authored-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> Co-authored-by: Ashish Kumar <ashishkumar468@gmail.com>

…#3853)

@VisibleForTesting

* [GSoC] Fixes commons-app#3789 Updated UI of achievements activity to display level in first tab & Leaderboard in the second tab (commons-app#3794) * Updated UI of achievements activity to display level in first tab and Leaderboard in the second tab * Removed hardcoded string * Fixes commons-app#3861 Use the APIs to fetch leaderboard’s based on uploads via mobile app (all time) and display it in the Leaderboard screen. (commons-app#3865) * [GSoC] Added Unit Tests and Fixed Landscape Mode Bug (commons-app#3872) * Fixes commons-app#3861 Use the APIs to fetch leaderboard’s based on uploads via mobile app (all time) and display it in the Leaderboard screen. * Fixed Bug - missing data in landscape mode * Added Unit Tests for Leaderboard * Added JavaDocs * Updated JavaDocs * [GSoC] Added Pagination to Leaderboard (commons-app#3881) * Fixes commons-app#3861 Use the APIs to fetch leaderboard’s based on uploads via mobile app (all time) and display it in the Leaderboard screen. * Fixed Bug - missing data in landscape mode * Added Unit Tests for Leaderboard * Added JavaDocs * Updated JavaDocs * Added Pagination * Added Merge Adapter * Fixed Test Case * Added Smooth Scroll * Added Progress Bar for Paging * Fixed Gradle * [GSoC] Added option to set a new avatar (commons-app#3892) * Fixes commons-app#3861 Use the APIs to fetch leaderboard’s based on uploads via mobile app (all time) and display it in the Leaderboard screen. * Added option to set a new avatar * [GSoC] Added Click to open user profile for leaderboard (commons-app#3887) * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * commons-app#3749 Improve MediaClient UnitTests (commons-app#3846) * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace SearchDepictionsRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace UploadCategoryDepictionsRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - update BaseAdapter to be easier to use * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace SearchImagesRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace SearchCategoriesRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace NotificationRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace UploadDepictsRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace PlaceRenderer * commons-app#3756 Convert SearchDepictionsFragment to use Pagination - convert SearchDepictionsFragment * commons-app#3756 Convert SearchDepictionsFragment to use Pagination - fix presenter unit tests now that view is not nullable - fix Category prefix imports * commons-app#3756 Convert SearchDepictionsFragment to use Pagination - test DataSource related classes * commons-app#3756 Convert SearchDepictionsFragment to use Pagination - reset rx scheduler - ignore failing test * commons-app#3760 Convert SearchCategoriesFragment to use Pagination - extract functionality of pagination to base classes - add category pagination * commons-app#3772 Convert SearchImagesFragment to use Pagination - convert SearchImagesFragment - tidy up showing the empty view - make search fragments show snackbar with appropriate text * commons-app#3772 Convert SearchImagesFragment to use Pagination - allow viewpager to load more data * commons-app#3760 remove test that got re-added by merge * commons-app#3760 remove duplicate dependency * commons-app#3772 fix compilation * commons-app#3780 Create media using a combination of Entities & MwQueryResult - construct media with an entity - move fields from media down to contribution - move dynamic fields outside of media - remove unused constructors - remove all unnecessary fetching of captions/descriptions - bump database version * commons-app#3808 Construct media objects that depict an item id correctly - use generator to construct media for DepictedImages * commons-app#3810 Convert DepictedImagesFragment to use Pagination - extract common media paging methods - convert to DepictedImages to use pagination * commons-app#3810 Convert DepictedImagesFragment to use Pagination - rename base classes to better reflect usage * commons-app#3810 Convert DepictedImagesFragment to use Pagination - map to empty result with no pages * commons-app#3810 Convert DepictedImagesFragment to use Pagination - align test with returned values * commons-app#3780 Create media using a combination of Entities & MwQueryResult - update wikicode to align with expected behaviour * commons-app#3780 Create media using a combination of Entities & MwQueryResult - replace old site of thumbnail title with most relevant caption * commons-app#3818 Convert SubDepictionListFragment to use Pagination - replace SubDepictionList with Child and Parent Fragments - replace contracts with simple presenter declarations - move classes to appropriate packages - delete unused network models - delete duplicated paging classes * commons-app#3820 Convert CategoryImagesListFragment to use Pagination - replace CategoryImagesListFragment with CategoriesMediaFragment - disallow the construction of media objects without imageinfo * commons-app#3822 Convert SubCategoryImagesListFragment to use Pagination - convert subcategories - add continuation support in category client - rely on interfaces for callbacks of PageableMediaFragments * commons-app#3822 Convert SubCategoryImagesListFragment to use Pagination - convert parent categories - delete list fragment - creat base class to support continuation requests in clients * commons-app#3822 Convert SubCategoryImagesListFragment to use Pagination - add tests for ParentCategoriesDataSource * commons-app#3822 Convert SubCategoryImagesListFragment to use Pagination - remove no longer applicable test * commons-app#3749 Improve MediaClient UnitTests - test rewrite * commons-app#3749 Improve MediaClient UnitTests - align with buildConfig property * With pause and resume for uploads (commons-app#3858) * With pause and resume for uploads * Dispose current upload * Make pause and resume work * Check stash validity * With java docs * minor * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Add nearby presenter unit tests (commons-app#3615) * init the test file * Add tests to check if searchthisarea button action and checkbox actions are added after initialize test * Add tests to locked unlocked nearby cases * Add tests for null cases in updateMapAndList method * Add test to check which locations are used to populate places, depending to LocationChangeType * Add tests to test users position is not followed if blue dot (current location marker) is not visible * Add tests to decide search this area method visibility on camera move * Add tests for multi filteirng of placetypes * add tests for single place type selection too * Add tests to tests search view focus gain and bottom sheet visibilities * Add tests for SearchCloseToCurrentLocation * Remove two unneeded getter and setter for isNearbyLocked, use @VisibleForTesting annotation instead * Add VisibleForTesting annotation to initializeNearbyOperations method so that it will be private by default * Add missing tests * Add tests for map updated case and add missing lines those are being tested * Add some missind method verifications * Create real latlang objects isntead of spying them * Use a real presenter object instead of a spy * Revert nonneeded @VisibleForTest annotations, instead reach via lockUnlock method * Reduce code repetitions * Do not call a test from another test method * Add some more tests * Fix minor issues * Hidden categories are not showed in suggested categories (commons-app#3853) * Localisation updates from https://translatewiki.net. * Clarify that the caption would also be used as the image title (commons-app#3876) The app uses the fist caption as the file title. This should also be communicated to the user via the info box as they would not be aware of it otherwise. * Localisation updates from https://translatewiki.net. * Added Click event for leaderboard, Fixed commons-app#3886 * Fixed Travis Co-authored-by: translatewiki.net <l10n-bot@translatewiki.net> Co-authored-by: Seán Mac Gillicuddy <seantheappdev@gmail.com> Co-authored-by: Vivek Maskara <maskaravivek@gmail.com> Co-authored-by: neslihanturan <tur.neslihan@gmail.com> Co-authored-by: Paulina <63326136+PaulinaQuintero@users.noreply.github.com> Co-authored-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> * [GSoC] Added Leaderboard Filters (commons-app#3902) * Attempt to add filters * Basic Filter Working * Filter Improved * Filter Completed * Add JavaDocs * Added Test for Update Avatar * Decreased Margin of Filter * [GSoC] Updated leaderboard string (commons-app#3897) * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * commons-app#3749 Improve MediaClient UnitTests (commons-app#3846) * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace SearchDepictionsRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace UploadCategoryDepictionsRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - update BaseAdapter to be easier to use * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace SearchImagesRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace SearchCategoriesRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace NotificationRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace UploadDepictsRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace PlaceRenderer * commons-app#3756 Convert SearchDepictionsFragment to use Pagination - convert SearchDepictionsFragment * commons-app#3756 Convert SearchDepictionsFragment to use Pagination - fix presenter unit tests now that view is not nullable - fix Category prefix imports * commons-app#3756 Convert SearchDepictionsFragment to use Pagination - test DataSource related classes * commons-app#3756 Convert SearchDepictionsFragment to use Pagination - reset rx scheduler - ignore failing test * commons-app#3760 Convert SearchCategoriesFragment to use Pagination - extract functionality of pagination to base classes - add category pagination * commons-app#3772 Convert SearchImagesFragment to use Pagination - convert SearchImagesFragment - tidy up showing the empty view - make search fragments show snackbar with appropriate text * commons-app#3772 Convert SearchImagesFragment to use Pagination - allow viewpager to load more data * commons-app#3760 remove test that got re-added by merge * commons-app#3760 remove duplicate dependency * commons-app#3772 fix compilation * commons-app#3780 Create media using a combination of Entities & MwQueryResult - construct media with an entity - move fields from media down to contribution - move dynamic fields outside of media - remove unused constructors - remove all unnecessary fetching of captions/descriptions - bump database version * commons-app#3808 Construct media objects that depict an item id correctly - use generator to construct media for DepictedImages * commons-app#3810 Convert DepictedImagesFragment to use Pagination - extract common media paging methods - convert to DepictedImages to use pagination * commons-app#3810 Convert DepictedImagesFragment to use Pagination - rename base classes to better reflect usage * commons-app#3810 Convert DepictedImagesFragment to use Pagination - map to empty result with no pages * commons-app#3810 Convert DepictedImagesFragment to use Pagination - align test with returned values * commons-app#3780 Create media using a combination of Entities & MwQueryResult - update wikicode to align with expected behaviour * commons-app#3780 Create media using a combination of Entities & MwQueryResult - replace old site of thumbnail title with most relevant caption * commons-app#3818 Convert SubDepictionListFragment to use Pagination - replace SubDepictionList with Child and Parent Fragments - replace contracts with simple presenter declarations - move classes to appropriate packages - delete unused network models - delete duplicated paging classes * commons-app#3820 Convert CategoryImagesListFragment to use Pagination - replace CategoryImagesListFragment with CategoriesMediaFragment - disallow the construction of media objects without imageinfo * commons-app#3822 Convert SubCategoryImagesListFragment to use Pagination - convert subcategories - add continuation support in category client - rely on interfaces for callbacks of PageableMediaFragments * commons-app#3822 Convert SubCategoryImagesListFragment to use Pagination - convert parent categories - delete list fragment - creat base class to support continuation requests in clients * commons-app#3822 Convert SubCategoryImagesListFragment to use Pagination - add tests for ParentCategoriesDataSource * commons-app#3822 Convert SubCategoryImagesListFragment to use Pagination - remove no longer applicable test * commons-app#3749 Improve MediaClient UnitTests - test rewrite * commons-app#3749 Improve MediaClient UnitTests - align with buildConfig property * With pause and resume for uploads (commons-app#3858) * With pause and resume for uploads * Dispose current upload * Make pause and resume work * Check stash validity * With java docs * minor * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Add nearby presenter unit tests (commons-app#3615) * init the test file * Add tests to check if searchthisarea button action and checkbox actions are added after initialize test * Add tests to locked unlocked nearby cases * Add tests for null cases in updateMapAndList method * Add test to check which locations are used to populate places, depending to LocationChangeType * Add tests to test users position is not followed if blue dot (current location marker) is not visible * Add tests to decide search this area method visibility on camera move * Add tests for multi filteirng of placetypes * add tests for single place type selection too * Add tests to tests search view focus gain and bottom sheet visibilities * Add tests for SearchCloseToCurrentLocation * Remove two unneeded getter and setter for isNearbyLocked, use @VisibleForTesting annotation instead * Add VisibleForTesting annotation to initializeNearbyOperations method so that it will be private by default * Add missing tests * Add tests for map updated case and add missing lines those are being tested * Add some missind method verifications * Create real latlang objects isntead of spying them * Use a real presenter object instead of a spy * Revert nonneeded @VisibleForTest annotations, instead reach via lockUnlock method * Reduce code repetitions * Do not call a test from another test method * Add some more tests * Fix minor issues * Hidden categories are not showed in suggested categories (commons-app#3853) * Localisation updates from https://translatewiki.net. * Clarify that the caption would also be used as the image title (commons-app#3876) The app uses the fist caption as the file title. This should also be communicated to the user via the info box as they would not be aware of it otherwise. * Localisation updates from https://translatewiki.net. * Delete NearbyMapFragment & NearbyListFragment (commons-app#3885) * Fixes commons-app#3884 * Delete NearbyMapFragment & NearbyListFragment * Fixed NearbyParentFragmentPresenterTest * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Add more nearby tests (commons-app#3877) * more nearby tests added * Add tests for Label class * Add checkbox test javadocs * Add javadocs for label * Localisation updates from https://translatewiki.net. * Updated strings.xml Co-authored-by: translatewiki.net <l10n-bot@translatewiki.net> Co-authored-by: Seán Mac Gillicuddy <seantheappdev@gmail.com> Co-authored-by: Vivek Maskara <maskaravivek@gmail.com> Co-authored-by: neslihanturan <tur.neslihan@gmail.com> Co-authored-by: Paulina <63326136+PaulinaQuintero@users.noreply.github.com> Co-authored-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> Co-authored-by: Ashish Kumar <ashishkumar468@gmail.com> * Updated Strings * Added JavaDocs for all methods and classes * Added JavaDocs for all methods and classes * Added More JavaDocs * Revert string.xml * Revert "Revert string.xml" This reverts commit 00019b5. * Added protected * Fixed strings.xml extra changes * Revert codeStyle change * Fixed extra string change Co-authored-by: Vivek Maskara <maskaravivek@gmail.com> Co-authored-by: translatewiki.net <l10n-bot@translatewiki.net> Co-authored-by: Seán Mac Gillicuddy <seantheappdev@gmail.com> Co-authored-by: neslihanturan <tur.neslihan@gmail.com> Co-authored-by: Paulina <63326136+PaulinaQuintero@users.noreply.github.com> Co-authored-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> Co-authored-by: Ashish Kumar <ashishkumar468@gmail.com>

…#3853)

@VisibleForTesting

* [GSoC] Fixes commons-app#3789 Updated UI of achievements activity to display level in first tab & Leaderboard in the second tab (commons-app#3794) * Updated UI of achievements activity to display level in first tab and Leaderboard in the second tab * Removed hardcoded string * Fixes commons-app#3861 Use the APIs to fetch leaderboard’s based on uploads via mobile app (all time) and display it in the Leaderboard screen. (commons-app#3865) * [GSoC] Added Unit Tests and Fixed Landscape Mode Bug (commons-app#3872) * Fixes commons-app#3861 Use the APIs to fetch leaderboard’s based on uploads via mobile app (all time) and display it in the Leaderboard screen. * Fixed Bug - missing data in landscape mode * Added Unit Tests for Leaderboard * Added JavaDocs * Updated JavaDocs * [GSoC] Added Pagination to Leaderboard (commons-app#3881) * Fixes commons-app#3861 Use the APIs to fetch leaderboard’s based on uploads via mobile app (all time) and display it in the Leaderboard screen. * Fixed Bug - missing data in landscape mode * Added Unit Tests for Leaderboard * Added JavaDocs * Updated JavaDocs * Added Pagination * Added Merge Adapter * Fixed Test Case * Added Smooth Scroll * Added Progress Bar for Paging * Fixed Gradle * [GSoC] Added option to set a new avatar (commons-app#3892) * Fixes commons-app#3861 Use the APIs to fetch leaderboard’s based on uploads via mobile app (all time) and display it in the Leaderboard screen. * Added option to set a new avatar * [GSoC] Added Click to open user profile for leaderboard (commons-app#3887) * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * commons-app#3749 Improve MediaClient UnitTests (commons-app#3846) * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace SearchDepictionsRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace UploadCategoryDepictionsRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - update BaseAdapter to be easier to use * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace SearchImagesRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace SearchCategoriesRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace NotificationRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace UploadDepictsRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace PlaceRenderer * commons-app#3756 Convert SearchDepictionsFragment to use Pagination - convert SearchDepictionsFragment * commons-app#3756 Convert SearchDepictionsFragment to use Pagination - fix presenter unit tests now that view is not nullable - fix Category prefix imports * commons-app#3756 Convert SearchDepictionsFragment to use Pagination - test DataSource related classes * commons-app#3756 Convert SearchDepictionsFragment to use Pagination - reset rx scheduler - ignore failing test * commons-app#3760 Convert SearchCategoriesFragment to use Pagination - extract functionality of pagination to base classes - add category pagination * commons-app#3772 Convert SearchImagesFragment to use Pagination - convert SearchImagesFragment - tidy up showing the empty view - make search fragments show snackbar with appropriate text * commons-app#3772 Convert SearchImagesFragment to use Pagination - allow viewpager to load more data * commons-app#3760 remove test that got re-added by merge * commons-app#3760 remove duplicate dependency * commons-app#3772 fix compilation * commons-app#3780 Create media using a combination of Entities & MwQueryResult - construct media with an entity - move fields from media down to contribution - move dynamic fields outside of media - remove unused constructors - remove all unnecessary fetching of captions/descriptions - bump database version * commons-app#3808 Construct media objects that depict an item id correctly - use generator to construct media for DepictedImages * commons-app#3810 Convert DepictedImagesFragment to use Pagination - extract common media paging methods - convert to DepictedImages to use pagination * commons-app#3810 Convert DepictedImagesFragment to use Pagination - rename base classes to better reflect usage * commons-app#3810 Convert DepictedImagesFragment to use Pagination - map to empty result with no pages * commons-app#3810 Convert DepictedImagesFragment to use Pagination - align test with returned values * commons-app#3780 Create media using a combination of Entities & MwQueryResult - update wikicode to align with expected behaviour * commons-app#3780 Create media using a combination of Entities & MwQueryResult - replace old site of thumbnail title with most relevant caption * commons-app#3818 Convert SubDepictionListFragment to use Pagination - replace SubDepictionList with Child and Parent Fragments - replace contracts with simple presenter declarations - move classes to appropriate packages - delete unused network models - delete duplicated paging classes * commons-app#3820 Convert CategoryImagesListFragment to use Pagination - replace CategoryImagesListFragment with CategoriesMediaFragment - disallow the construction of media objects without imageinfo * commons-app#3822 Convert SubCategoryImagesListFragment to use Pagination - convert subcategories - add continuation support in category client - rely on interfaces for callbacks of PageableMediaFragments * commons-app#3822 Convert SubCategoryImagesListFragment to use Pagination - convert parent categories - delete list fragment - creat base class to support continuation requests in clients * commons-app#3822 Convert SubCategoryImagesListFragment to use Pagination - add tests for ParentCategoriesDataSource * commons-app#3822 Convert SubCategoryImagesListFragment to use Pagination - remove no longer applicable test * commons-app#3749 Improve MediaClient UnitTests - test rewrite * commons-app#3749 Improve MediaClient UnitTests - align with buildConfig property * With pause and resume for uploads (commons-app#3858) * With pause and resume for uploads * Dispose current upload * Make pause and resume work * Check stash validity * With java docs * minor * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Add nearby presenter unit tests (commons-app#3615) * init the test file * Add tests to check if searchthisarea button action and checkbox actions are added after initialize test * Add tests to locked unlocked nearby cases * Add tests for null cases in updateMapAndList method * Add test to check which locations are used to populate places, depending to LocationChangeType * Add tests to test users position is not followed if blue dot (current location marker) is not visible * Add tests to decide search this area method visibility on camera move * Add tests for multi filteirng of placetypes * add tests for single place type selection too * Add tests to tests search view focus gain and bottom sheet visibilities * Add tests for SearchCloseToCurrentLocation * Remove two unneeded getter and setter for isNearbyLocked, use @VisibleForTesting annotation instead * Add VisibleForTesting annotation to initializeNearbyOperations method so that it will be private by default * Add missing tests * Add tests for map updated case and add missing lines those are being tested * Add some missind method verifications * Create real latlang objects isntead of spying them * Use a real presenter object instead of a spy * Revert nonneeded @VisibleForTest annotations, instead reach via lockUnlock method * Reduce code repetitions * Do not call a test from another test method * Add some more tests * Fix minor issues * Hidden categories are not showed in suggested categories (commons-app#3853) * Localisation updates from https://translatewiki.net. * Clarify that the caption would also be used as the image title (commons-app#3876) The app uses the fist caption as the file title. This should also be communicated to the user via the info box as they would not be aware of it otherwise. * Localisation updates from https://translatewiki.net. * Added Click event for leaderboard, Fixed commons-app#3886 * Fixed Travis Co-authored-by: translatewiki.net <l10n-bot@translatewiki.net> Co-authored-by: Seán Mac Gillicuddy <seantheappdev@gmail.com> Co-authored-by: Vivek Maskara <maskaravivek@gmail.com> Co-authored-by: neslihanturan <tur.neslihan@gmail.com> Co-authored-by: Paulina <63326136+PaulinaQuintero@users.noreply.github.com> Co-authored-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> * [GSoC] Added Leaderboard Filters (commons-app#3902) * Attempt to add filters * Basic Filter Working * Filter Improved * Filter Completed * Add JavaDocs * Added Test for Update Avatar * Decreased Margin of Filter * [GSoC] Updated leaderboard string (commons-app#3897) * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * commons-app#3749 Improve MediaClient UnitTests (commons-app#3846) * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace SearchDepictionsRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace UploadCategoryDepictionsRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - update BaseAdapter to be easier to use * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace SearchImagesRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace SearchCategoriesRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace NotificationRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace UploadDepictsRenderer * commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace PlaceRenderer * commons-app#3756 Convert SearchDepictionsFragment to use Pagination - convert SearchDepictionsFragment * commons-app#3756 Convert SearchDepictionsFragment to use Pagination - fix presenter unit tests now that view is not nullable - fix Category prefix imports * commons-app#3756 Convert SearchDepictionsFragment to use Pagination - test DataSource related classes * commons-app#3756 Convert SearchDepictionsFragment to use Pagination - reset rx scheduler - ignore failing test * commons-app#3760 Convert SearchCategoriesFragment to use Pagination - extract functionality of pagination to base classes - add category pagination * commons-app#3772 Convert SearchImagesFragment to use Pagination - convert SearchImagesFragment - tidy up showing the empty view - make search fragments show snackbar with appropriate text * commons-app#3772 Convert SearchImagesFragment to use Pagination - allow viewpager to load more data * commons-app#3760 remove test that got re-added by merge * commons-app#3760 remove duplicate dependency * commons-app#3772 fix compilation * commons-app#3780 Create media using a combination of Entities & MwQueryResult - construct media with an entity - move fields from media down to contribution - move dynamic fields outside of media - remove unused constructors - remove all unnecessary fetching of captions/descriptions - bump database version * commons-app#3808 Construct media objects that depict an item id correctly - use generator to construct media for DepictedImages * commons-app#3810 Convert DepictedImagesFragment to use Pagination - extract common media paging methods - convert to DepictedImages to use pagination * commons-app#3810 Convert DepictedImagesFragment to use Pagination - rename base classes to better reflect usage * commons-app#3810 Convert DepictedImagesFragment to use Pagination - map to empty result with no pages * commons-app#3810 Convert DepictedImagesFragment to use Pagination - align test with returned values * commons-app#3780 Create media using a combination of Entities & MwQueryResult - update wikicode to align with expected behaviour * commons-app#3780 Create media using a combination of Entities & MwQueryResult - replace old site of thumbnail title with most relevant caption * commons-app#3818 Convert SubDepictionListFragment to use Pagination - replace SubDepictionList with Child and Parent Fragments - replace contracts with simple presenter declarations - move classes to appropriate packages - delete unused network models - delete duplicated paging classes * commons-app#3820 Convert CategoryImagesListFragment to use Pagination - replace CategoryImagesListFragment with CategoriesMediaFragment - disallow the construction of media objects without imageinfo * commons-app#3822 Convert SubCategoryImagesListFragment to use Pagination - convert subcategories - add continuation support in category client - rely on interfaces for callbacks of PageableMediaFragments * commons-app#3822 Convert SubCategoryImagesListFragment to use Pagination - convert parent categories - delete list fragment - creat base class to support continuation requests in clients * commons-app#3822 Convert SubCategoryImagesListFragment to use Pagination - add tests for ParentCategoriesDataSource * commons-app#3822 Convert SubCategoryImagesListFragment to use Pagination - remove no longer applicable test * commons-app#3749 Improve MediaClient UnitTests - test rewrite * commons-app#3749 Improve MediaClient UnitTests - align with buildConfig property * With pause and resume for uploads (commons-app#3858) * With pause and resume for uploads * Dispose current upload * Make pause and resume work * Check stash validity * With java docs * minor * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Add nearby presenter unit tests (commons-app#3615) * init the test file * Add tests to check if searchthisarea button action and checkbox actions are added after initialize test * Add tests to locked unlocked nearby cases * Add tests for null cases in updateMapAndList method * Add test to check which locations are used to populate places, depending to LocationChangeType * Add tests to test users position is not followed if blue dot (current location marker) is not visible * Add tests to decide search this area method visibility on camera move * Add tests for multi filteirng of placetypes * add tests for single place type selection too * Add tests to tests search view focus gain and bottom sheet visibilities * Add tests for SearchCloseToCurrentLocation * Remove two unneeded getter and setter for isNearbyLocked, use @VisibleForTesting annotation instead * Add VisibleForTesting annotation to initializeNearbyOperations method so that it will be private by default * Add missing tests * Add tests for map updated case and add missing lines those are being tested * Add some missind method verifications * Create real latlang objects isntead of spying them * Use a real presenter object instead of a spy * Revert nonneeded @VisibleForTest annotations, instead reach via lockUnlock method * Reduce code repetitions * Do not call a test from another test method * Add some more tests * Fix minor issues * Hidden categories are not showed in suggested categories (commons-app#3853) * Localisation updates from https://translatewiki.net. * Clarify that the caption would also be used as the image title (commons-app#3876) The app uses the fist caption as the file title. This should also be communicated to the user via the info box as they would not be aware of it otherwise. * Localisation updates from https://translatewiki.net. * Delete NearbyMapFragment & NearbyListFragment (commons-app#3885) * Fixes commons-app#3884 * Delete NearbyMapFragment & NearbyListFragment * Fixed NearbyParentFragmentPresenterTest * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Add more nearby tests (commons-app#3877) * more nearby tests added * Add tests for Label class * Add checkbox test javadocs * Add javadocs for label * Localisation updates from https://translatewiki.net. * Updated strings.xml Co-authored-by: translatewiki.net <l10n-bot@translatewiki.net> Co-authored-by: Seán Mac Gillicuddy <seantheappdev@gmail.com> Co-authored-by: Vivek Maskara <maskaravivek@gmail.com> Co-authored-by: neslihanturan <tur.neslihan@gmail.com> Co-authored-by: Paulina <63326136+PaulinaQuintero@users.noreply.github.com> Co-authored-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> Co-authored-by: Ashish Kumar <ashishkumar468@gmail.com> * Updated Strings * Added JavaDocs for all methods and classes * Added JavaDocs for all methods and classes * Added More JavaDocs * Revert string.xml * Revert "Revert string.xml" This reverts commit 00019b5. * Added protected * Fixed strings.xml extra changes * Revert codeStyle change * Fixed extra string change Co-authored-by: Vivek Maskara <maskaravivek@gmail.com> Co-authored-by: translatewiki.net <l10n-bot@translatewiki.net> Co-authored-by: Seán Mac Gillicuddy <seantheappdev@gmail.com> Co-authored-by: neslihanturan <tur.neslihan@gmail.com> Co-authored-by: Paulina <63326136+PaulinaQuintero@users.noreply.github.com> Co-authored-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> Co-authored-by: Ashish Kumar <ashishkumar468@gmail.com>

PaulinaQuintero added 2 commits June 29, 2020 17:33

fixed the problem of the hidden categories

2a93285

fixed the problem of the hidden categories

2462c9f

tests-checker bot suggested changes Jun 29, 2020

View reviewed changes

PaulinaQuintero and others added 3 commits June 29, 2020 19:00

Merge branch 'master' into add-pquinterom

c98bab9

corrections made in other parts of the code

004369c

Merge branch 'add-pquinterom' of https://github.com/PaulinaQuintero/a…

b316aaf

…pps-android-commons into add-pquinterom

misaochan requested a review from sivaraam June 30, 2020 11:38

sivaraam requested changes Jul 2, 2020

View reviewed changes

PaulinaQuintero added 2 commits July 3, 2020 18:28

corrections made

782cffd

all corrections made

83aad51

sivaraam reviewed Jul 4, 2020

View reviewed changes

PaulinaQuintero and others added 3 commits July 4, 2020 16:09

new corrections done, removed whitespaces and corrections in response…

c37546c

…mapper

new corrections done, removed whitespaces and corrections in response…

646a287

…mapper

Revert some whitespace changes

50e4b0c

sivaraam approved these changes Jul 19, 2020

View reviewed changes

Merge remote-tracking branch 'origin/master' into hide-hidden-categories

14a3be3

sivaraam merged commit 67beb94 into commons-app:master Jul 19, 2020

ashishkumar468 pushed a commit to ashishkumar468/apps-android-commons that referenced this pull request Oct 10, 2020

Hidden categories are not showed in suggested categories (commons-app…

08ac301

…#3853)

ashishkumar468 pushed a commit to ashishkumar468/apps-android-commons that referenced this pull request Oct 10, 2020

Hidden categories are not showed in suggested categories (commons-app…

a472a6b

…#3853)

	+ "&generator=allcategories")
	+ "&generator=allcategories&prop=categoryinfo")

		Single<MwQueryResponse> searchCategoriesForPrefix(@Query("gacprefix") String prefix,
		@Query("gaclimit") int itemLimit, @Query("gacoffset") int offset);

		it.filter { page -> !page.categoryInfo().isHidden
		}.map { page -> page.title().replace(CATEGORY_PREFIX, "") }

Hidden categories are not showed in suggested categories #3853

Hidden categories are not showed in suggested categories #3853

Uh oh!

Conversation

PaulinaQuintero commented Jun 29, 2020

Uh oh!

tests-checker bot left a comment

Choose a reason for hiding this comment

Uh oh!

PaulinaQuintero commented Jun 29, 2020

Uh oh!

PaulinaQuintero commented Jun 30, 2020

Uh oh!

sivaraam left a comment

Choose a reason for hiding this comment

Uh oh!

sivaraam Jul 2, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

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!

PaulinaQuintero commented Jul 3, 2020

Uh oh!

sivaraam commented Jul 3, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sivaraam left a comment

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!

sivaraam left a comment

Choose a reason for hiding this comment

Uh oh!

sivaraam commented Jul 19, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

sivaraam Jul 2, 2020 •

edited

Loading

sivaraam commented Jul 3, 2020 •

edited

Loading