mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-27 21:03:54 +01:00
* Resolved merged conflicts * Resolved merge conflicts and updated workflow * Updated Location Flow and merged conflicts * Update flow and merge conflicts * Fixed LocationPicker's location flow * Removed redundant code from LocationPermissionsHelper * Fixed Explore fragment crashing and incorrect behaviour * Updated LocationPicker Flow * Fixed Nearby not working as intended * Final update to location flow of all maps * Added the reqested changes and fixed bugs * Resolved requested change in in-app camera location flow * Fixed In-app camera location flow * Resolved conflicts in ContributionsListFragment * Updated java doc as requested * Resolved nearby card dialog not being shown * Optimised LocationPermissionsHelper javadoc * Made requested changes for preference check * Added javadoc and requested comment for later reference * Implemented requested code changes * Fixed failing test due to changes made during PR * Added string resource for ExploreMapFragment * Changed string resource for rationale dialog * Added standard location flow information in LocationPermissionsHelper * Added javadoc for doNotAskForLocationPermission * Removed unused import * Updated javadoc * Removed values-yue-hant * Fix some merge conflict errors * Fix minor errors due to mergre conflicts * Fix some refactor errors * Fixed minor bug due to merging conflicts * Delete app/src/main/res/values-yue-hant directory * Final changes to NearbyParentFragment * Fixes #5686 map coordinates set to image coords * Removed some redundant code from recenterMap * Removed one test whose method no longer exists * Removed unused method from contract of nearby * Removed redundant method from NearbyParentFragment * nearby: add a FIXME about the possibly redudant code --------- Co-authored-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
This commit is contained in:
parent
1f2e31d45b
commit
04f9ef4819
16 changed files with 421 additions and 297 deletions
|
|
@ -71,7 +71,6 @@ class NearbyParentFragmentPresenterTest {
|
|||
verify(nearbyParentFragmentView).`setProgressBarVisibility`(true)
|
||||
assertTrue(null == nearbyParentFragmentView.mapCenter)
|
||||
verify(nearbyParentFragmentView).populatePlaces(null)
|
||||
verify(nearbyParentFragmentView).addSearchThisAreaButtonAction()
|
||||
verify(nearbyParentFragmentView).setCheckBoxAction()
|
||||
}
|
||||
|
||||
|
|
@ -121,7 +120,7 @@ class NearbyParentFragmentPresenterTest {
|
|||
/**
|
||||
* Test updateMapAndList method returns with zero interactions when last location is null
|
||||
*/
|
||||
@Test @Ignore
|
||||
@Test
|
||||
fun testUpdateMapAndListWhenLastLocationIsNull() {
|
||||
whenever(nearbyParentFragmentView.isNetworkConnectionEstablished()).thenReturn(true)
|
||||
whenever(nearbyParentFragmentView.getLastLocation()).thenReturn(null)
|
||||
|
|
|
|||
|
|
@ -379,12 +379,4 @@ class NearbyParentFragmentUnitTest {
|
|||
Assert.assertEquals(shadowActivity.nextStartedActivityForResult, null)
|
||||
}
|
||||
|
||||
@Test @Ignore
|
||||
@Throws(Exception::class)
|
||||
fun testShowLocationOffDialog() {
|
||||
fragment.showLocationOffDialog()
|
||||
val dialog: AlertDialog = ShadowAlertDialog.getLatestDialog() as AlertDialog
|
||||
Assert.assertEquals(dialog.isShowing, true)
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue