From b68256d7f0d6d28ca20622e2df194ceaf2791301 Mon Sep 17 00:00:00 2001 From: parneet-guraya Date: Wed, 23 Oct 2024 07:06:42 +0530 Subject: [PATCH] add space after , Signed-off-by: parneet-guraya --- .../locations/BookmarkLocationsFragment.java | 11 +++++----- .../contributions/ContributionController.java | 20 +++++++++---------- .../ContributionsListFragment.java | 16 +++++++-------- .../ui/selector/CustomSelectorActivity.kt | 2 +- .../nrw/commons/filepicker/FilePicker.java | 4 ++-- .../commons/nearby/PlaceAdapterDelegate.kt | 2 +- .../fragments/CommonPlaceClickActions.kt | 2 +- .../fragments/NearbyParentFragment.java | 14 ++++++------- .../commons/settings/SettingsFragment.java | 4 ++-- .../ui/selector/CustomSelectorActivityTest.kt | 2 +- .../UploadMediaDetailFragmentUnitTest.kt | 4 ++-- 11 files changed, 40 insertions(+), 41 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsFragment.java b/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsFragment.java index adfa5d35d..f5ce556c4 100644 --- a/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsFragment.java @@ -38,16 +38,16 @@ public class BookmarkLocationsFragment extends DaggerFragment { private final ActivityResultLauncher cameraPickLauncherForResult = registerForActivityResult(new StartActivityForResult(), result -> { - contributionController.handleActivityResultWithCallback(requireActivity(),callbacks -> { - contributionController.onPictureReturnedFromCamera(result,requireActivity(),callbacks); + contributionController.handleActivityResultWithCallback(requireActivity(), callbacks -> { + contributionController.onPictureReturnedFromCamera(result, requireActivity(), callbacks); }); }); private final ActivityResultLauncher galleryPickLauncherForResult = registerForActivityResult(new StartActivityForResult(), result -> { - contributionController.handleActivityResultWithCallback(requireActivity(),callbacks -> { - contributionController.onPictureReturnedFromGallery(result,requireActivity(),callbacks); + contributionController.handleActivityResultWithCallback(requireActivity(), callbacks -> { + contributionController.onPictureReturnedFromGallery(result, requireActivity(), callbacks); }); }); @@ -63,7 +63,7 @@ public class BookmarkLocationsFragment extends DaggerFragment { contributionController.locationPermissionCallback.onLocationPermissionGranted(); } else { if (shouldShowRequestPermissionRationale(permission.ACCESS_FINE_LOCATION)) { - contributionController.handleShowRationaleFlowCameraLocation(getActivity(), inAppCameraLocationPermissionLauncher,cameraPickLauncherForResult); + contributionController.handleShowRationaleFlowCameraLocation(getActivity(), inAppCameraLocationPermissionLauncher, cameraPickLauncherForResult); } else { contributionController.locationPermissionCallback.onLocationPermissionDenied(getActivity().getString(R.string.in_app_camera_location_permission_denied)); } @@ -104,7 +104,6 @@ public class BookmarkLocationsFragment extends DaggerFragment { inAppCameraLocationPermissionLauncher, galleryPickLauncherForResult, cameraPickLauncherForResult - ); binding.listView.setAdapter(adapter); } diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java index 56356b3ce..fcfd32974 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java @@ -82,7 +82,7 @@ public class ContributionController { createDialogsAndHandleLocationPermissions(activity, inAppCameraLocationPermissionLauncher, resultLauncher); } else { - initiateCameraUpload(activity,resultLauncher); + initiateCameraUpload(activity, resultLauncher); } }, R.string.storage_permission_title, @@ -152,7 +152,7 @@ public class ContributionController { () -> { Toast.makeText(activity, activity.getString(toastTextResource), Toast.LENGTH_LONG).show(); - initiateCameraUpload(activity,resultLauncher); + initiateCameraUpload(activity, resultLauncher); } ); } @@ -210,8 +210,8 @@ public class ContributionController { /** * Initiate gallery picker */ - public void initiateGalleryPick(final Activity activity,ActivityResultLauncher resultLauncher ,final boolean allowMultipleUploads) { - initiateGalleryUpload(activity,resultLauncher ,allowMultipleUploads); + public void initiateGalleryPick(final Activity activity, ActivityResultLauncher resultLauncher, final boolean allowMultipleUploads) { + initiateGalleryUpload(activity, resultLauncher, allowMultipleUploads); } /** @@ -221,7 +221,7 @@ public class ContributionController { setPickerConfiguration(activity, true); PermissionUtils.checkPermissionsAndPerformAction(activity, - () -> FilePicker.openCustomSelector(activity, resultLauncher,0), + () -> FilePicker.openCustomSelector(activity, resultLauncher, 0), R.string.storage_permission_title, R.string.write_storage_permission_rationale, PermissionUtils.PERMISSIONS_STORAGE); @@ -234,7 +234,7 @@ public class ContributionController { private void initiateGalleryUpload(final Activity activity, ActivityResultLauncher resultLauncher, final boolean allowMultipleUploads) { setPickerConfiguration(activity, allowMultipleUploads); - FilePicker.openGallery(activity, resultLauncher,0, isDocumentPhotoPickerPreferred()); + FilePicker.openGallery(activity, resultLauncher, 0, isDocumentPhotoPickerPreferred()); } /** @@ -257,7 +257,7 @@ public class ContributionController { locationBeforeImageCapture = locationManager.getLastLocation(); } isInAppCameraUpload = true; - FilePicker.openCameraForImage(activity, resultLauncher,0); + FilePicker.openCameraForImage(activity, resultLauncher, 0); } private boolean isDocumentPhotoPickerPreferred(){ @@ -270,16 +270,16 @@ public class ContributionController { if(isDocumentPhotoPickerPreferred()){ FilePicker.onPictureReturnedFromDocuments(result, activity, callbacks); } else { - FilePicker.onPictureReturnedFromGallery(result,activity,callbacks); + FilePicker.onPictureReturnedFromGallery(result, activity, callbacks); } } public void onPictureReturnedFromCustomSelector(ActivityResult result, Activity activity, @NonNull FilePicker.Callbacks callbacks) { - FilePicker.onPictureReturnedFromCustomSelector(result,activity,callbacks); + FilePicker.onPictureReturnedFromCustomSelector(result, activity, callbacks); } public void onPictureReturnedFromCamera(ActivityResult result, Activity activity, @NonNull FilePicker.Callbacks callbacks) { - FilePicker.onPictureReturnedFromCamera(result,activity,callbacks); + FilePicker.onPictureReturnedFromCamera(result, activity, callbacks); } /** diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java index 998f46f17..509d1eb95 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java @@ -101,24 +101,24 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment impl private final ActivityResultLauncher galleryPickLauncherForResult = registerForActivityResult(new StartActivityForResult(), result -> { - controller.handleActivityResultWithCallback(requireActivity(),callbacks -> { - controller.onPictureReturnedFromGallery(result,requireActivity(),callbacks); + controller.handleActivityResultWithCallback(requireActivity(), callbacks -> { + controller.onPictureReturnedFromGallery(result, requireActivity(), callbacks); }); }); private final ActivityResultLauncher customSelectorLauncherForResult = registerForActivityResult(new StartActivityForResult(), result -> { - controller.handleActivityResultWithCallback(requireActivity(),callbacks -> { - controller.onPictureReturnedFromCustomSelector(result,requireActivity(),callbacks); + controller.handleActivityResultWithCallback(requireActivity(), callbacks -> { + controller.onPictureReturnedFromCustomSelector(result, requireActivity(), callbacks); }); }); private final ActivityResultLauncher cameraPickLauncherForResult = registerForActivityResult(new StartActivityForResult(), result -> { - controller.handleActivityResultWithCallback(requireActivity(),callbacks -> { - controller.onPictureReturnedFromCamera(result,requireActivity(),callbacks); + controller.handleActivityResultWithCallback(requireActivity(), callbacks -> { + controller.onPictureReturnedFromCamera(result, requireActivity(), callbacks); }); }); @@ -356,7 +356,7 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment impl return true; }); binding.fabGallery.setOnClickListener(view -> { - controller.initiateGalleryPick(getActivity(), galleryPickLauncherForResult,true); + controller.initiateGalleryPick(getActivity(), galleryPickLauncherForResult, true); animateFAB(isFabOpen); }); binding.fabGallery.setOnLongClickListener(view -> { @@ -369,7 +369,7 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment impl * Launch Custom Selector. */ protected void launchCustomSelector() { - controller.initiateCustomGalleryPickWithPermission(getActivity(),customSelectorLauncherForResult); + controller.initiateCustomGalleryPickWithPermission(getActivity(), customSelectorLauncherForResult); animateFAB(isFabOpen); } diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt index 44eaedb69..959db52f3 100644 --- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt +++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt @@ -231,7 +231,7 @@ class CustomSelectorActivity : * When data will be send from full screen mode, it will be passed to fragment */ private fun onFullScreenDataReceived(result: ActivityResult){ - if (result.resultCode == Activity.RESULT_OK) { + if (result.resultCode == Activity.RESULT_OK) { val selectedImages: ArrayList = result.data!! .getParcelableArrayListExtra(CustomSelectorConstants.NEW_SELECTED_IMAGES)!! diff --git a/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java b/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java index 96d70606b..b64db24c5 100644 --- a/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java +++ b/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java @@ -109,7 +109,7 @@ public class FilePicker implements Constants { * * @param type Custom type of your choice, which will be returned with the images */ - public static void openGallery(Activity activity,ActivityResultLauncher resultLauncher,int type, boolean openDocumentIntentPreferred) { + public static void openGallery(Activity activity, ActivityResultLauncher resultLauncher, int type, boolean openDocumentIntentPreferred) { Intent intent = createGalleryIntent(activity, type, openDocumentIntentPreferred); resultLauncher.launch(intent); } @@ -117,7 +117,7 @@ public class FilePicker implements Constants { /** * Opens Custom Selector */ - public static void openCustomSelector(Activity activity,ActivityResultLauncher resultLauncher,int type) { + public static void openCustomSelector(Activity activity, ActivityResultLauncher resultLauncher, int type) { Intent intent = createCustomSelectorIntent(activity, type); resultLauncher.launch(intent); } diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceAdapterDelegate.kt b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceAdapterDelegate.kt index 5855a1c7c..a4ea3cd5b 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceAdapterDelegate.kt +++ b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceAdapterDelegate.kt @@ -50,7 +50,7 @@ fun placeAdapterDelegate( nearbyButtonLayout.cameraButton.setOnClickListener { onCameraClicked(item, inAppCameraLocationPermissionLauncher, cameraPickLauncherForResult) } nearbyButtonLayout.cameraButton.setOnLongClickListener { onCameraLongPressed() } - nearbyButtonLayout.galleryButton.setOnClickListener { onGalleryClicked(item,galleryPickLauncherForResult) } + nearbyButtonLayout.galleryButton.setOnClickListener { onGalleryClicked(item, galleryPickLauncherForResult) } nearbyButtonLayout.galleryButton.setOnLongClickListener { onGalleryLongPressed() } bookmarkButtonImage.setOnClickListener { val isBookmarked = bookmarkLocationDao.updateBookmarkLocation(item) diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/CommonPlaceClickActions.kt b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/CommonPlaceClickActions.kt index 096ca42d9..a4d6b14b7 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/CommonPlaceClickActions.kt +++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/CommonPlaceClickActions.kt @@ -79,7 +79,7 @@ class CommonPlaceClickActions } else { Timber.d("Gallery button tapped. Image title: ${place.getName()}Image desc: ${place.getLongDescription()}") storeSharedPrefs(place) - contributionController.initiateGalleryPick(activity, galleryPickLauncherForResult,false) + contributionController.initiateGalleryPick(activity, galleryPickLauncherForResult, false) } } diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java index 201a868ce..7a7d5cdcb 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java @@ -230,24 +230,24 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment private final ActivityResultLauncher galleryPickLauncherForResult = registerForActivityResult(new StartActivityForResult(), result -> { - controller.handleActivityResultWithCallback(requireActivity(),callbacks -> { - controller.onPictureReturnedFromGallery(result,requireActivity(),callbacks); + controller.handleActivityResultWithCallback(requireActivity(), callbacks -> { + controller.onPictureReturnedFromGallery(result, requireActivity(), callbacks); }); }); private final ActivityResultLauncher customSelectorLauncherForResult = registerForActivityResult(new StartActivityForResult(), result -> { - controller.handleActivityResultWithCallback(requireActivity(),callbacks -> { - controller.onPictureReturnedFromCustomSelector(result,requireActivity(),callbacks); + controller.handleActivityResultWithCallback(requireActivity(), callbacks -> { + controller.onPictureReturnedFromCustomSelector(result, requireActivity(), callbacks); }); }); private final ActivityResultLauncher cameraPickLauncherForResult = registerForActivityResult(new StartActivityForResult(), result -> { - controller.handleActivityResultWithCallback(requireActivity(),callbacks -> { - controller.onPictureReturnedFromCamera(result,requireActivity(),callbacks); + controller.handleActivityResultWithCallback(requireActivity(), callbacks -> { + controller.onPictureReturnedFromCamera(result, requireActivity(), callbacks); }); }); @@ -2247,7 +2247,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment if (binding.fabCustomGallery.isShown()) { Timber.d("Gallery button tapped. Place: %s", selectedPlace.toString()); storeSharedPrefs(selectedPlace); - controller.initiateCustomGalleryPickWithPermission(getActivity(),customSelectorLauncherForResult); + controller.initiateCustomGalleryPickWithPermission(getActivity(), customSelectorLauncherForResult); } }); } diff --git a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java index 6c9e4c547..5e631425b 100644 --- a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java @@ -90,8 +90,8 @@ public class SettingsFragment extends PreferenceFragmentCompat { private final ActivityResultLauncher cameraPickLauncherForResult = registerForActivityResult(new StartActivityForResult(), result -> { - contributionController.handleActivityResultWithCallback(requireActivity(),callbacks -> { - contributionController.onPictureReturnedFromCamera(result,requireActivity(),callbacks); + contributionController.handleActivityResultWithCallback(requireActivity(), callbacks -> { + contributionController.onPictureReturnedFromCamera(result, requireActivity(), callbacks); }); }); diff --git a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivityTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivityTest.kt index 5e92b19ff..b1d66ee4d 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivityTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivityTest.kt @@ -106,7 +106,7 @@ class CustomSelectorActivityTest { @Throws(Exception::class) fun testResultLauncher() { val intent = Mockito.mock(Intent::class.java) - val activityResult = ActivityResult(Activity.RESULT_OK,intent) + val activityResult = ActivityResult(Activity.RESULT_OK, intent) val func = activity.javaClass.getDeclaredMethod( "onFullScreenDataReceived", diff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragmentUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragmentUnitTest.kt index cbb7d28f3..169bcd5c0 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragmentUnitTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragmentUnitTest.kt @@ -364,12 +364,12 @@ class UploadMediaDetailFragmentUnitTest { `when`(latLng.latitude).thenReturn(0.0) `when`(latLng.longitude).thenReturn(0.0) `when`(uploadItem.gpsCoords).thenReturn(imageCoordinates) - val activityResult = ActivityResult(Activity.RESULT_OK,intent) + val activityResult = ActivityResult(Activity.RESULT_OK, intent) val handleResultMethod = UploadMediaDetailFragment::class.java.getDeclaredMethod("onCameraPosition", ActivityResult::class.java) handleResultMethod.isAccessible = true - handleResultMethod.invoke(fragment,activityResult) + handleResultMethod.invoke(fragment, activityResult) Mockito.verify(presenter, Mockito.times(0)).getImageQuality(0, location, activity) }