mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-27 21:03:54 +01:00
* Add layout items for nearby filter list and filter item (cherry picked from commitb96f8a68ce) * Edit nearby query (cherry picked from commit1f3c8c8deb) * Add filter items to nearby parent fragment xml (cherry picked from commitd0beadd0e0) * Add icon for green marker (cherry picked from commitf65ca0387a) * Add layout util file to organize layout utilities (cherry picked from commit5c57939245) * Add pic parameter to nearby result item (cherry picked from commit86007e4bb6) * Add pic parameter to place type (cherry picked from commit25c358b67f) * Add green marker styling (cherry picked from commit929c92d887) * Inıt search layouts on Nearby parent (cherry picked from commit2ac38a1919) * Style green markers at nearby controller (cherry picked from commit3e08f39f8e) * Edit bookmark daos to include pic to tables (cherry picked from commit48d69edf3b) * TODO foc bookmark dao item but works now (cherry picked from commitf748399720) * Style nearby filter area (cherry picked from commit6267e488b0) * fix style of filter tab (cherry picked from commit5f843bf366) * Add nearby list adapter (cherry picked from commit56334afe03) * Current status, list size is working, visibility working, filter mechanism is ready (cherry picked from commit7d75c9c589) * Filtering works (cherry picked from commit8a13cf7728) * Filter function works (cherry picked from commit78368a2c0c) * Fix style issues (cherry picked from commit2204f70255) * Add divider to recyclerview (cherry picked from commitc8100b55d7) * Hide bottom sheets accordingly (cherry picked from commitc5deba8b0b) * Code cleanup (cherry picked from commitcf8f64f3cb) * Add actions to chips * Fetch destroyed information from servers * Add destroyed places icon * Make chip filter functions work * Revert irrelevant changes * Revert accidentally replaced strings * Remove unneeded lines * Remove only places expalanation from trings * Do not filter if nearby places are not loaded * Add triple checkbox for add none and neutral * Make tri checkbox work * Fix travis issue * Add coments * fix search this area button locaton * Set initial place type state and recover it between each populate places
This commit is contained in:
parent
5c6ab3b253
commit
b3c11842f3
35 changed files with 1264 additions and 66 deletions
|
|
@ -61,7 +61,7 @@ class BookMarkLocationDaoTest {
|
|||
|
||||
|
||||
examplePlaceBookmark = Place("placeName", exampleLabel, "placeDescription"
|
||||
, exampleLocation, "placeCategory", builder.build())
|
||||
, exampleLocation, "placeCategory", builder.build(),"picName","placeDestroyed")
|
||||
testObject = BookmarkLocationsDao { client }
|
||||
}
|
||||
|
||||
|
|
@ -146,7 +146,7 @@ class BookMarkLocationDaoTest {
|
|||
assertTrue(testObject.updateBookmarkLocation(examplePlaceBookmark))
|
||||
verify(client).insert(eq(BASE_URI), captor.capture())
|
||||
captor.firstValue.let { cv ->
|
||||
assertEquals(10, cv.size())
|
||||
assertEquals(11, cv.size())
|
||||
assertEquals(examplePlaceBookmark.name, cv.getAsString(COLUMN_NAME))
|
||||
assertEquals(examplePlaceBookmark.longDescription, cv.getAsString(COLUMN_DESCRIPTION))
|
||||
assertEquals(examplePlaceBookmark.label.text, cv.getAsString(COLUMN_LABEL_TEXT))
|
||||
|
|
@ -156,6 +156,7 @@ class BookMarkLocationDaoTest {
|
|||
assertEquals(examplePlaceBookmark.siteLinks.wikipediaLink.toString(), cv.getAsString(COLUMN_WIKIPEDIA_LINK))
|
||||
assertEquals(examplePlaceBookmark.siteLinks.wikidataLink.toString(), cv.getAsString(COLUMN_WIKIDATA_LINK))
|
||||
assertEquals(examplePlaceBookmark.siteLinks.commonsLink.toString(), cv.getAsString(COLUMN_COMMONS_LINK))
|
||||
assertEquals(examplePlaceBookmark.pic.toString(), cv.getAsString(COLUMN_PIC))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue