resultLauncher) {
- DialogUtil.showAlertDialog(activity, activity.getString(R.string.location_permission_title),
- activity.getString(R.string.in_app_camera_location_permission_rationale),
- activity.getString(android.R.string.ok),
- activity.getString(android.R.string.cancel),
- () -> {
- createDialogsAndHandleLocationPermissions(activity,
- inAppCameraLocationPermissionLauncher, resultLauncher);
- },
- () -> locationPermissionCallback.onLocationPermissionDenied(
- activity.getString(R.string.in_app_camera_location_permission_denied)),
- null,
- false);
- }
-
- /**
- * Suggest user to attach location information with pictures. If the user selects "Yes", then:
- *
- * Location is taken from the EXIF if the default camera application does not redact location
- * tags.
- *
- * Otherwise, if the EXIF metadata does not have location information, then location captured by
- * the app is used
- *
- * @param activity
- */
- private void askUserToAllowLocationAccess(Activity activity,
- ActivityResultLauncher inAppCameraLocationPermissionLauncher,
- ActivityResultLauncher resultLauncher) {
- DialogUtil.showAlertDialog(activity,
- activity.getString(R.string.in_app_camera_location_permission_title),
- activity.getString(R.string.in_app_camera_location_access_explanation),
- activity.getString(R.string.option_allow),
- activity.getString(R.string.option_dismiss),
- () -> {
- defaultKvStore.putBoolean("inAppCameraLocationPref", true);
- createDialogsAndHandleLocationPermissions(activity,
- inAppCameraLocationPermissionLauncher, resultLauncher);
- },
- () -> {
- ViewUtil.showLongToast(activity, R.string.in_app_camera_location_permission_denied);
- defaultKvStore.putBoolean("inAppCameraLocationPref", false);
- initiateCameraUpload(activity, resultLauncher);
- },
- null,
- true);
- }
-
- /**
- * Initiate gallery picker
- */
- public void initiateGalleryPick(final Activity activity, ActivityResultLauncher resultLauncher, final boolean allowMultipleUploads) {
- initiateGalleryUpload(activity, resultLauncher, allowMultipleUploads);
- }
-
- /**
- * Initiate gallery picker with permission
- */
- public void initiateCustomGalleryPickWithPermission(final Activity activity, ActivityResultLauncher resultLauncher) {
- setPickerConfiguration(activity, true);
-
- PermissionUtils.checkPermissionsAndPerformAction(activity,
- () -> FilePicker.openCustomSelector(activity, resultLauncher, 0),
- R.string.storage_permission_title,
- R.string.write_storage_permission_rationale,
- PermissionUtils.PERMISSIONS_STORAGE);
- }
-
-
- /**
- * Open chooser for gallery uploads
- */
- private void initiateGalleryUpload(final Activity activity, ActivityResultLauncher resultLauncher,
- final boolean allowMultipleUploads) {
- setPickerConfiguration(activity, allowMultipleUploads);
- FilePicker.openGallery(activity, resultLauncher, 0, isDocumentPhotoPickerPreferred());
- }
-
- /**
- * Sets configuration for file picker
- */
- private void setPickerConfiguration(Activity activity,
- boolean allowMultipleUploads) {
- boolean copyToExternalStorage = defaultKvStore.getBoolean("useExternalStorage", true);
- FilePicker.configuration(activity)
- .setCopyTakenPhotosToPublicGalleryAppFolder(copyToExternalStorage)
- .setAllowMultiplePickInGallery(allowMultipleUploads);
- }
-
- /**
- * Initiate camera upload by opening camera
- */
- private void initiateCameraUpload(Activity activity, ActivityResultLauncher resultLauncher) {
- setPickerConfiguration(activity, false);
- if (defaultKvStore.getBoolean("inAppCameraLocationPref", false)) {
- locationBeforeImageCapture = locationManager.getLastLocation();
- }
- isInAppCameraUpload = true;
- FilePicker.openCameraForImage(activity, resultLauncher, 0);
- }
-
- private boolean isDocumentPhotoPickerPreferred(){
- return defaultKvStore.getBoolean(
- "openDocumentPhotoPickerPref", true);
- }
-
- public void onPictureReturnedFromGallery(ActivityResult result, Activity activity, FilePicker.Callbacks callbacks){
-
- if(isDocumentPhotoPickerPreferred()){
- FilePicker.onPictureReturnedFromDocuments(result, activity, callbacks);
- } else {
- FilePicker.onPictureReturnedFromGallery(result, activity, callbacks);
- }
- }
-
- public void onPictureReturnedFromCustomSelector(ActivityResult result, Activity activity, @NonNull FilePicker.Callbacks callbacks) {
- FilePicker.onPictureReturnedFromCustomSelector(result, activity, callbacks);
- }
-
- public void onPictureReturnedFromCamera(ActivityResult result, Activity activity, @NonNull FilePicker.Callbacks callbacks) {
- FilePicker.onPictureReturnedFromCamera(result, activity, callbacks);
- }
-
- /**
- * Attaches callback for file picker.
- */
- public void handleActivityResultWithCallback(Activity activity, FilePicker.HandleActivityResult handleActivityResult) {
-
- handleActivityResult.onHandleActivityResult(new DefaultCallback() {
-
- @Override
- public void onCanceled(final ImageSource source, final int type) {
- super.onCanceled(source, type);
- defaultKvStore.remove(PLACE_OBJECT);
- }
-
- @Override
- public void onImagePickerError(Exception e, FilePicker.ImageSource source,
- int type) {
- ViewUtil.showShortToast(activity, R.string.error_occurred_in_picking_images);
- }
-
- @Override
- public void onImagesPicked(@NonNull List imagesFiles,
- FilePicker.ImageSource source, int type) {
- Intent intent = handleImagesPicked(activity, imagesFiles);
- activity.startActivity(intent);
- }
- });
- }
-
- public List handleExternalImagesPicked(Activity activity,
- Intent data) {
- return FilePicker.handleExternalImagesPicked(data, activity);
- }
-
- /**
- * Returns intent to be passed to upload activity Attaches place object for nearby uploads and
- * location before image capture if in-app camera is used
- */
- private Intent handleImagesPicked(Context context,
- List imagesFiles) {
- Intent shareIntent = new Intent(context, UploadActivity.class);
- shareIntent.setAction(ACTION_INTERNAL_UPLOADS);
- shareIntent
- .putParcelableArrayListExtra(UploadActivity.EXTRA_FILES, new ArrayList<>(imagesFiles));
- Place place = defaultKvStore.getJson(PLACE_OBJECT, Place.class);
-
- if (place != null) {
- shareIntent.putExtra(PLACE_OBJECT, place);
- }
-
- if (locationBeforeImageCapture != null) {
- shareIntent.putExtra(
- UploadActivity.LOCATION_BEFORE_IMAGE_CAPTURE,
- locationBeforeImageCapture);
- }
-
- shareIntent.putExtra(
- UploadActivity.IN_APP_CAMERA_UPLOAD,
- isInAppCameraUpload
- );
- isInAppCameraUpload = false; // reset the flag for next use
- return shareIntent;
- }
-
- /**
- * Fetches the contributions with the state "IN_PROGRESS", "QUEUED" and "PAUSED" and then it
- * populates the `pendingContributionList`.
- **/
- void getPendingContributions() {
- final PagedList.Config pagedListConfig =
- (new PagedList.Config.Builder())
- .setPrefetchDistance(50)
- .setPageSize(10).build();
- Factory factory;
- factory = repository.fetchContributionsWithStates(
- Arrays.asList(Contribution.STATE_IN_PROGRESS, Contribution.STATE_QUEUED,
- Contribution.STATE_PAUSED));
-
- LivePagedListBuilder livePagedListBuilder = new LivePagedListBuilder(factory,
- pagedListConfig);
- pendingContributionList = livePagedListBuilder.build();
- }
-
- /**
- * Fetches the contributions with the state "FAILED" and populates the
- * `failedContributionList`.
- **/
- void getFailedContributions() {
- final PagedList.Config pagedListConfig =
- (new PagedList.Config.Builder())
- .setPrefetchDistance(50)
- .setPageSize(10).build();
- Factory factory;
- factory = repository.fetchContributionsWithStates(
- Collections.singletonList(Contribution.STATE_FAILED));
-
- LivePagedListBuilder livePagedListBuilder = new LivePagedListBuilder(factory,
- pagedListConfig);
- failedContributionList = livePagedListBuilder.build();
- }
-
- /**
- * Fetches the contributions with the state "IN_PROGRESS", "QUEUED", "PAUSED" and "FAILED" and
- * then it populates the `failedAndPendingContributionList`.
- **/
- void getFailedAndPendingContributions() {
- final PagedList.Config pagedListConfig =
- (new PagedList.Config.Builder())
- .setPrefetchDistance(50)
- .setPageSize(10).build();
- Factory factory;
- factory = repository.fetchContributionsWithStates(
- Arrays.asList(Contribution.STATE_IN_PROGRESS, Contribution.STATE_QUEUED,
- Contribution.STATE_PAUSED, Contribution.STATE_FAILED));
-
- LivePagedListBuilder livePagedListBuilder = new LivePagedListBuilder(factory,
- pagedListConfig);
- failedAndPendingContributionList = livePagedListBuilder.build();
- }
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.kt
new file mode 100644
index 0000000000..296391c6df
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.kt
@@ -0,0 +1,474 @@
+package fr.free.nrw.commons.contributions
+
+import android.Manifest.permission
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.widget.Toast
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.ActivityResultLauncher
+import androidx.lifecycle.LiveData
+import androidx.paging.LivePagedListBuilder
+import androidx.paging.PagedList
+import fr.free.nrw.commons.R
+import fr.free.nrw.commons.filepicker.DefaultCallback
+import fr.free.nrw.commons.filepicker.FilePicker
+import fr.free.nrw.commons.filepicker.FilePicker.HandleActivityResult
+import fr.free.nrw.commons.filepicker.FilePicker.configuration
+import fr.free.nrw.commons.filepicker.FilePicker.handleExternalImagesPicked
+import fr.free.nrw.commons.filepicker.FilePicker.onPictureReturnedFromDocuments
+import fr.free.nrw.commons.filepicker.FilePicker.openCameraForImage
+import fr.free.nrw.commons.filepicker.FilePicker.openCustomSelector
+import fr.free.nrw.commons.filepicker.FilePicker.openGallery
+import fr.free.nrw.commons.filepicker.UploadableFile
+import fr.free.nrw.commons.kvstore.JsonKvStore
+import fr.free.nrw.commons.location.LatLng
+import fr.free.nrw.commons.location.LocationPermissionsHelper
+import fr.free.nrw.commons.location.LocationPermissionsHelper.LocationPermissionCallback
+import fr.free.nrw.commons.location.LocationServiceManager
+import fr.free.nrw.commons.nearby.Place
+import fr.free.nrw.commons.upload.UploadActivity
+import fr.free.nrw.commons.utils.DialogUtil.showAlertDialog
+import fr.free.nrw.commons.utils.PermissionUtils.PERMISSIONS_STORAGE
+import fr.free.nrw.commons.utils.PermissionUtils.checkPermissionsAndPerformAction
+import fr.free.nrw.commons.utils.ViewUtil.showLongToast
+import fr.free.nrw.commons.utils.ViewUtil.showShortToast
+import fr.free.nrw.commons.wikidata.WikidataConstants.PLACE_OBJECT
+import java.util.Arrays
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class ContributionController @Inject constructor(@param:Named("default_preferences") private val defaultKvStore: JsonKvStore) {
+ private var locationBeforeImageCapture: LatLng? = null
+ private var isInAppCameraUpload = false
+ @JvmField
+ var locationPermissionCallback: LocationPermissionCallback? = null
+ private var locationPermissionsHelper: LocationPermissionsHelper? = null
+
+ // Temporarily disabled, see issue [https://github.com/commons-app/apps-android-commons/issues/5847]
+ // LiveData> failedAndPendingContributionList;
+ @JvmField
+ var pendingContributionList: LiveData>? = null
+ @JvmField
+ var failedContributionList: LiveData>? = null
+
+ @JvmField
+ @Inject
+ var locationManager: LocationServiceManager? = null
+
+ @JvmField
+ @Inject
+ var repository: ContributionsRepository? = null
+
+ /**
+ * Check for permissions and initiate camera click
+ */
+ fun initiateCameraPick(
+ activity: Activity,
+ inAppCameraLocationPermissionLauncher: ActivityResultLauncher>,
+ resultLauncher: ActivityResultLauncher
+ ) {
+ val useExtStorage = defaultKvStore.getBoolean("useExternalStorage", true)
+ if (!useExtStorage) {
+ initiateCameraUpload(activity, resultLauncher)
+ return
+ }
+
+ checkPermissionsAndPerformAction(
+ activity,
+ {
+ if (defaultKvStore.getBoolean("inAppCameraFirstRun")) {
+ defaultKvStore.putBoolean("inAppCameraFirstRun", false)
+ askUserToAllowLocationAccess(
+ activity,
+ inAppCameraLocationPermissionLauncher,
+ resultLauncher
+ )
+ } else if (defaultKvStore.getBoolean("inAppCameraLocationPref")) {
+ createDialogsAndHandleLocationPermissions(
+ activity,
+ inAppCameraLocationPermissionLauncher, resultLauncher
+ )
+ } else {
+ initiateCameraUpload(activity, resultLauncher)
+ }
+ },
+ R.string.storage_permission_title,
+ R.string.write_storage_permission_rationale,
+ *PERMISSIONS_STORAGE
+ )
+ }
+
+ /**
+ * Asks users to provide location access
+ *
+ * @param activity
+ */
+ private fun createDialogsAndHandleLocationPermissions(
+ activity: Activity,
+ inAppCameraLocationPermissionLauncher: ActivityResultLauncher>?,
+ resultLauncher: ActivityResultLauncher
+ ) {
+ locationPermissionCallback = object : LocationPermissionCallback {
+ override fun onLocationPermissionDenied(toastMessage: String) {
+ Toast.makeText(
+ activity,
+ toastMessage,
+ Toast.LENGTH_LONG
+ ).show()
+ initiateCameraUpload(activity, resultLauncher)
+ }
+
+ override fun onLocationPermissionGranted() {
+ if (!locationPermissionsHelper!!.isLocationAccessToAppsTurnedOn()) {
+ showLocationOffDialog(
+ activity, R.string.in_app_camera_needs_location,
+ R.string.in_app_camera_location_unavailable, resultLauncher
+ )
+ } else {
+ initiateCameraUpload(activity, resultLauncher)
+ }
+ }
+ }
+
+ locationPermissionsHelper = LocationPermissionsHelper(
+ activity, locationManager!!, locationPermissionCallback
+ )
+ inAppCameraLocationPermissionLauncher?.launch(
+ arrayOf(permission.ACCESS_FINE_LOCATION)
+ )
+ }
+
+ /**
+ * Shows a dialog alerting the user about location services being off and asking them to turn it
+ * on
+ * TODO: Add a seperate callback in LocationPermissionsHelper for this.
+ * Ref: https://github.com/commons-app/apps-android-commons/pull/5494/files#r1510553114
+ *
+ * @param activity Activity reference
+ * @param dialogTextResource Resource id of text to be shown in dialog
+ * @param toastTextResource Resource id of text to be shown in toast
+ * @param resultLauncher
+ */
+ private fun showLocationOffDialog(
+ activity: Activity, dialogTextResource: Int,
+ toastTextResource: Int, resultLauncher: ActivityResultLauncher
+ ) {
+ showAlertDialog(activity,
+ activity.getString(R.string.ask_to_turn_location_on),
+ activity.getString(dialogTextResource),
+ activity.getString(R.string.title_app_shortcut_setting),
+ activity.getString(R.string.cancel),
+ { locationPermissionsHelper!!.openLocationSettings(activity) },
+ {
+ Toast.makeText(
+ activity, activity.getString(toastTextResource),
+ Toast.LENGTH_LONG
+ ).show()
+ initiateCameraUpload(activity, resultLauncher)
+ }
+ )
+ }
+
+ fun handleShowRationaleFlowCameraLocation(
+ activity: Activity,
+ inAppCameraLocationPermissionLauncher: ActivityResultLauncher>?,
+ resultLauncher: ActivityResultLauncher
+ ) {
+ showAlertDialog(
+ activity, activity.getString(R.string.location_permission_title),
+ activity.getString(R.string.in_app_camera_location_permission_rationale),
+ activity.getString(android.R.string.ok),
+ activity.getString(android.R.string.cancel),
+ {
+ createDialogsAndHandleLocationPermissions(
+ activity,
+ inAppCameraLocationPermissionLauncher, resultLauncher
+ )
+ },
+ {
+ locationPermissionCallback!!.onLocationPermissionDenied(
+ activity.getString(R.string.in_app_camera_location_permission_denied)
+ )
+ },
+ null
+ )
+ }
+
+ /**
+ * Suggest user to attach location information with pictures. If the user selects "Yes", then:
+ *
+ *
+ * Location is taken from the EXIF if the default camera application does not redact location
+ * tags.
+ *
+ *
+ * Otherwise, if the EXIF metadata does not have location information, then location captured by
+ * the app is used
+ *
+ * @param activity
+ */
+ private fun askUserToAllowLocationAccess(
+ activity: Activity,
+ inAppCameraLocationPermissionLauncher: ActivityResultLauncher>,
+ resultLauncher: ActivityResultLauncher
+ ) {
+ showAlertDialog(
+ activity,
+ activity.getString(R.string.in_app_camera_location_permission_title),
+ activity.getString(R.string.in_app_camera_location_access_explanation),
+ activity.getString(R.string.option_allow),
+ activity.getString(R.string.option_dismiss),
+ {
+ defaultKvStore.putBoolean("inAppCameraLocationPref", true)
+ createDialogsAndHandleLocationPermissions(
+ activity,
+ inAppCameraLocationPermissionLauncher, resultLauncher
+ )
+ },
+ {
+ showLongToast(activity, R.string.in_app_camera_location_permission_denied)
+ defaultKvStore.putBoolean("inAppCameraLocationPref", false)
+ initiateCameraUpload(activity, resultLauncher)
+ },
+ null
+ )
+ }
+
+ /**
+ * Initiate gallery picker
+ */
+ fun initiateGalleryPick(
+ activity: Activity,
+ resultLauncher: ActivityResultLauncher,
+ allowMultipleUploads: Boolean
+ ) {
+ initiateGalleryUpload(activity, resultLauncher, allowMultipleUploads)
+ }
+
+ /**
+ * Initiate gallery picker with permission
+ */
+ fun initiateCustomGalleryPickWithPermission(
+ activity: Activity,
+ resultLauncher: ActivityResultLauncher
+ ) {
+ setPickerConfiguration(activity, true)
+
+ checkPermissionsAndPerformAction(
+ activity,
+ { openCustomSelector(activity, resultLauncher, 0) },
+ R.string.storage_permission_title,
+ R.string.write_storage_permission_rationale,
+ *PERMISSIONS_STORAGE
+ )
+ }
+
+
+ /**
+ * Open chooser for gallery uploads
+ */
+ private fun initiateGalleryUpload(
+ activity: Activity, resultLauncher: ActivityResultLauncher,
+ allowMultipleUploads: Boolean
+ ) {
+ setPickerConfiguration(activity, allowMultipleUploads)
+ openGallery(activity, resultLauncher, 0, isDocumentPhotoPickerPreferred)
+ }
+
+ /**
+ * Sets configuration for file picker
+ */
+ private fun setPickerConfiguration(
+ activity: Activity,
+ allowMultipleUploads: Boolean
+ ) {
+ val copyToExternalStorage = defaultKvStore.getBoolean("useExternalStorage", true)
+ configuration(activity)
+ .setCopyTakenPhotosToPublicGalleryAppFolder(copyToExternalStorage)
+ .setAllowMultiplePickInGallery(allowMultipleUploads)
+ }
+
+ /**
+ * Initiate camera upload by opening camera
+ */
+ private fun initiateCameraUpload(
+ activity: Activity,
+ resultLauncher: ActivityResultLauncher
+ ) {
+ setPickerConfiguration(activity, false)
+ if (defaultKvStore.getBoolean("inAppCameraLocationPref", false)) {
+ locationBeforeImageCapture = locationManager!!.getLastLocation()
+ }
+ isInAppCameraUpload = true
+ openCameraForImage(activity, resultLauncher, 0)
+ }
+
+ private val isDocumentPhotoPickerPreferred: Boolean
+ get() = defaultKvStore.getBoolean(
+ "openDocumentPhotoPickerPref", true
+ )
+
+ fun onPictureReturnedFromGallery(
+ result: ActivityResult,
+ activity: Activity,
+ callbacks: FilePicker.Callbacks
+ ) {
+ if (isDocumentPhotoPickerPreferred) {
+ onPictureReturnedFromDocuments(result, activity, callbacks)
+ } else {
+ FilePicker.onPictureReturnedFromGallery(result, activity, callbacks)
+ }
+ }
+
+ fun onPictureReturnedFromCustomSelector(
+ result: ActivityResult,
+ activity: Activity,
+ callbacks: FilePicker.Callbacks
+ ) {
+ FilePicker.onPictureReturnedFromCustomSelector(result, activity, callbacks)
+ }
+
+ fun onPictureReturnedFromCamera(
+ result: ActivityResult,
+ activity: Activity,
+ callbacks: FilePicker.Callbacks
+ ) {
+ FilePicker.onPictureReturnedFromCamera(result, activity, callbacks)
+ }
+
+ /**
+ * Attaches callback for file picker.
+ */
+ fun handleActivityResultWithCallback(
+ activity: Activity,
+ handleActivityResult: HandleActivityResult
+ ) {
+ handleActivityResult.onHandleActivityResult(object : DefaultCallback() {
+ override fun onCanceled(source: FilePicker.ImageSource, type: Int) {
+ super.onCanceled(source, type)
+ defaultKvStore.remove(PLACE_OBJECT)
+ }
+
+ override fun onImagePickerError(
+ e: Exception, source: FilePicker.ImageSource,
+ type: Int
+ ) {
+ showShortToast(activity, R.string.error_occurred_in_picking_images)
+ }
+
+ override fun onImagesPicked(
+ imagesFiles: List,
+ source: FilePicker.ImageSource, type: Int
+ ) {
+ val intent = handleImagesPicked(activity, imagesFiles)
+ activity.startActivity(intent)
+ }
+ })
+ }
+
+ fun handleExternalImagesPicked(
+ activity: Activity,
+ data: Intent?
+ ): List {
+ return handleExternalImagesPicked(data, activity)
+ }
+
+ /**
+ * Returns intent to be passed to upload activity Attaches place object for nearby uploads and
+ * location before image capture if in-app camera is used
+ */
+ private fun handleImagesPicked(
+ context: Context,
+ imagesFiles: List
+ ): Intent {
+ val shareIntent = Intent(context, UploadActivity::class.java)
+ shareIntent.setAction(ACTION_INTERNAL_UPLOADS)
+ shareIntent
+ .putParcelableArrayListExtra(UploadActivity.EXTRA_FILES, ArrayList(imagesFiles))
+ val place = defaultKvStore.getJson(PLACE_OBJECT, Place::class.java)
+
+ if (place != null) {
+ shareIntent.putExtra(PLACE_OBJECT, place)
+ }
+
+ if (locationBeforeImageCapture != null) {
+ shareIntent.putExtra(
+ UploadActivity.LOCATION_BEFORE_IMAGE_CAPTURE,
+ locationBeforeImageCapture
+ )
+ }
+
+ shareIntent.putExtra(
+ UploadActivity.IN_APP_CAMERA_UPLOAD,
+ isInAppCameraUpload
+ )
+ isInAppCameraUpload = false // reset the flag for next use
+ return shareIntent
+ }
+
+ val pendingContributions: Unit
+ /**
+ * Fetches the contributions with the state "IN_PROGRESS", "QUEUED" and "PAUSED" and then it
+ * populates the `pendingContributionList`.
+ */
+ get() {
+ val pagedListConfig =
+ (PagedList.Config.Builder())
+ .setPrefetchDistance(50)
+ .setPageSize(10).build()
+ val factory = repository!!.fetchContributionsWithStates(
+ Arrays.asList(
+ Contribution.STATE_IN_PROGRESS, Contribution.STATE_QUEUED,
+ Contribution.STATE_PAUSED
+ )
+ )
+
+ val livePagedListBuilder = LivePagedListBuilder(factory, pagedListConfig)
+ pendingContributionList = livePagedListBuilder.build()
+ }
+
+ val failedContributions: Unit
+ /**
+ * Fetches the contributions with the state "FAILED" and populates the
+ * `failedContributionList`.
+ */
+ get() {
+ val pagedListConfig =
+ (PagedList.Config.Builder())
+ .setPrefetchDistance(50)
+ .setPageSize(10).build()
+ val factory = repository!!.fetchContributionsWithStates(
+ listOf(Contribution.STATE_FAILED)
+ )
+
+ val livePagedListBuilder = LivePagedListBuilder(factory, pagedListConfig)
+ failedContributionList = livePagedListBuilder.build()
+ }
+
+ /**
+ * Temporarily disabled, see issue [https://github.com/commons-app/apps-android-commons/issues/5847]
+ * Fetches the contributions with the state "IN_PROGRESS", "QUEUED", "PAUSED" and "FAILED" and
+ * then it populates the `failedAndPendingContributionList`.
+ */
+ // void getFailedAndPendingContributions() {
+ // final PagedList.Config pagedListConfig =
+ // (new PagedList.Config.Builder())
+ // .setPrefetchDistance(50)
+ // .setPageSize(10).build();
+ // Factory factory;
+ // factory = repository.fetchContributionsWithStates(
+ // Arrays.asList(Contribution.STATE_IN_PROGRESS, Contribution.STATE_QUEUED,
+ // Contribution.STATE_PAUSED, Contribution.STATE_FAILED));
+ //
+ // LivePagedListBuilder livePagedListBuilder = new LivePagedListBuilder(factory,
+ // pagedListConfig);
+ // failedAndPendingContributionList = livePagedListBuilder.build();
+ // }
+
+ companion object {
+ const val ACTION_INTERNAL_UPLOADS: String = "internalImageUploads"
+ }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.java
deleted file mode 100644
index 2e375145cc..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package fr.free.nrw.commons.contributions;
-
-import android.database.sqlite.SQLiteException;
-import androidx.paging.DataSource;
-import androidx.room.Dao;
-import androidx.room.Delete;
-import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
-import androidx.room.Query;
-import androidx.room.Transaction;
-import androidx.room.Update;
-import io.reactivex.Completable;
-import io.reactivex.Single;
-import java.util.Calendar;
-import java.util.List;
-import timber.log.Timber;
-
-@Dao
-public abstract class ContributionDao {
-
- @Query("SELECT * FROM contribution order by media_dateUploaded DESC")
- abstract DataSource.Factory fetchContributions();
-
- @Insert(onConflict = OnConflictStrategy.REPLACE)
- public abstract void saveSynchronous(Contribution contribution);
-
- public Completable save(final Contribution contribution) {
- return Completable
- .fromAction(() -> {
- contribution.setDateModified(Calendar.getInstance().getTime());
- if (contribution.getDateUploadStarted() == null) {
- contribution.setDateUploadStarted(Calendar.getInstance().getTime());
- }
- saveSynchronous(contribution);
- });
- }
-
- @Transaction
- public void deleteAndSaveContribution(final Contribution oldContribution,
- final Contribution newContribution) {
- deleteSynchronous(oldContribution);
- saveSynchronous(newContribution);
- }
-
- @Insert(onConflict = OnConflictStrategy.REPLACE)
- public abstract Single> save(List contribution);
-
- @Delete
- public abstract void deleteSynchronous(Contribution contribution);
-
- /**
- * Deletes contributions with specific states from the database.
- *
- * @param states The states of the contributions to delete.
- * @throws SQLiteException If an SQLite error occurs.
- */
- @Query("DELETE FROM contribution WHERE state IN (:states)")
- public abstract void deleteContributionsWithStatesSynchronous(List states)
- throws SQLiteException;
-
- public Completable delete(final Contribution contribution) {
- return Completable
- .fromAction(() -> deleteSynchronous(contribution));
- }
-
- /**
- * Deletes contributions with specific states from the database.
- *
- * @param states The states of the contributions to delete.
- * @return A Completable indicating the result of the operation.
- */
- public Completable deleteContributionsWithStates(List states) {
- return Completable
- .fromAction(() -> deleteContributionsWithStatesSynchronous(states));
- }
-
- @Query("SELECT * from contribution WHERE media_filename=:fileName")
- public abstract List getContributionWithTitle(String fileName);
-
- @Query("SELECT * from contribution WHERE pageId=:pageId")
- public abstract Contribution getContribution(String pageId);
-
- @Query("SELECT * from contribution WHERE state IN (:states) order by media_dateUploaded DESC")
- public abstract Single> getContribution(List states);
-
- /**
- * Gets contributions with specific states in descending order by the date they were uploaded.
- *
- * @param states The states of the contributions to fetch.
- * @return A DataSource factory for paginated contributions with the specified states.
- */
- @Query("SELECT * from contribution WHERE state IN (:states) order by media_dateUploaded DESC")
- public abstract DataSource.Factory getContributions(
- List states);
-
- /**
- * Gets contributions with specific states in ascending order by the date the upload started.
- *
- * @param states The states of the contributions to fetch.
- * @return A DataSource factory for paginated contributions with the specified states.
- */
- @Query("SELECT * from contribution WHERE state IN (:states) order by dateUploadStarted ASC")
- public abstract DataSource.Factory getContributionsSortedByDateUploadStarted(
- List states);
-
- @Query("SELECT COUNT(*) from contribution WHERE state in (:toUpdateStates)")
- public abstract Single getPendingUploads(int[] toUpdateStates);
-
- @Query("Delete FROM contribution")
- public abstract void deleteAll() throws SQLiteException;
-
- @Update
- public abstract void updateSynchronous(Contribution contribution);
-
- /**
- * Updates the state of contributions with specific states.
- *
- * @param states The current states of the contributions to update.
- * @param newState The new state to set.
- */
- @Query("UPDATE contribution SET state = :newState WHERE state IN (:states)")
- public abstract void updateContributionsState(List states, int newState);
-
- public Completable update(final Contribution contribution) {
- return Completable
- .fromAction(() -> {
- contribution.setDateModified(Calendar.getInstance().getTime());
- updateSynchronous(contribution);
- });
- }
-
- /**
- * Updates the state of contributions with specific states asynchronously.
- *
- * @param states The current states of the contributions to update.
- * @param newState The new state to set.
- * @return A Completable indicating the result of the operation.
- */
- public Completable updateContributionsWithStates(List states, int newState) {
- return Completable
- .fromAction(() -> {
- updateContributionsState(states, newState);
- });
- }
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.kt
new file mode 100644
index 0000000000..50faa13408
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.kt
@@ -0,0 +1,148 @@
+package fr.free.nrw.commons.contributions
+
+import android.database.sqlite.SQLiteException
+import androidx.paging.DataSource
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import androidx.room.Update
+import io.reactivex.Completable
+import io.reactivex.Single
+import java.util.Calendar
+
+@Dao
+abstract class ContributionDao {
+ @Query("SELECT * FROM contribution order by media_dateUploaded DESC")
+ abstract fun fetchContributions(): DataSource.Factory
+
+ @Insert(onConflict = OnConflictStrategy.REPLACE)
+ abstract fun saveSynchronous(contribution: Contribution)
+
+ fun save(contribution: Contribution): Completable {
+ return Completable
+ .fromAction {
+ contribution.dateModified = Calendar.getInstance().time
+ if (contribution.dateUploadStarted == null) {
+ contribution.dateUploadStarted = Calendar.getInstance().time
+ }
+ saveSynchronous(contribution)
+ }
+ }
+
+ @Transaction
+ open fun deleteAndSaveContribution(
+ oldContribution: Contribution,
+ newContribution: Contribution
+ ) {
+ deleteSynchronous(oldContribution)
+ saveSynchronous(newContribution)
+ }
+
+ @Insert(onConflict = OnConflictStrategy.REPLACE)
+ abstract fun save(contribution: List): Single>
+
+ @Delete
+ abstract fun deleteSynchronous(contribution: Contribution)
+
+ /**
+ * Deletes contributions with specific states from the database.
+ *
+ * @param states The states of the contributions to delete.
+ * @throws SQLiteException If an SQLite error occurs.
+ */
+ @Query("DELETE FROM contribution WHERE state IN (:states)")
+ @Throws(SQLiteException::class)
+ abstract fun deleteContributionsWithStatesSynchronous(states: List)
+
+ fun delete(contribution: Contribution): Completable {
+ return Completable
+ .fromAction { deleteSynchronous(contribution) }
+ }
+
+ /**
+ * Deletes contributions with specific states from the database.
+ *
+ * @param states The states of the contributions to delete.
+ * @return A Completable indicating the result of the operation.
+ */
+ fun deleteContributionsWithStates(states: List): Completable {
+ return Completable
+ .fromAction { deleteContributionsWithStatesSynchronous(states) }
+ }
+
+ @Query("SELECT * from contribution WHERE media_filename=:fileName")
+ abstract fun getContributionWithTitle(fileName: String): List
+
+ @Query("SELECT * from contribution WHERE pageId=:pageId")
+ abstract fun getContribution(pageId: String): Contribution
+
+ @Query("SELECT * from contribution WHERE state IN (:states) order by media_dateUploaded DESC")
+ abstract fun getContribution(states: List): Single>
+
+ /**
+ * Gets contributions with specific states in descending order by the date they were uploaded.
+ *
+ * @param states The states of the contributions to fetch.
+ * @return A DataSource factory for paginated contributions with the specified states.
+ */
+ @Query("SELECT * from contribution WHERE state IN (:states) order by media_dateUploaded DESC")
+ abstract fun getContributions(
+ states: List
+ ): DataSource.Factory
+
+ /**
+ * Gets contributions with specific states in ascending order by the date the upload started.
+ *
+ * @param states The states of the contributions to fetch.
+ * @return A DataSource factory for paginated contributions with the specified states.
+ */
+ @Query("SELECT * from contribution WHERE state IN (:states) order by dateUploadStarted ASC")
+ abstract fun getContributionsSortedByDateUploadStarted(
+ states: List
+ ): DataSource.Factory
+
+ @Query("SELECT COUNT(*) from contribution WHERE state in (:toUpdateStates)")
+ abstract fun getPendingUploads(toUpdateStates: IntArray): Single
+
+ @Query("Delete FROM contribution")
+ @Throws(SQLiteException::class)
+ abstract fun deleteAll()
+
+ @Update
+ abstract fun updateSynchronous(contribution: Contribution)
+
+ /**
+ * Updates the state of contributions with specific states.
+ *
+ * @param states The current states of the contributions to update.
+ * @param newState The new state to set.
+ */
+ @Query("UPDATE contribution SET state = :newState WHERE state IN (:states)")
+ abstract fun updateContributionsState(states: List, newState: Int)
+
+ fun update(contribution: Contribution): Completable {
+ return Completable.fromAction {
+ contribution.dateModified = Calendar.getInstance().time
+ updateSynchronous(contribution)
+ }
+ }
+
+
+
+ /**
+ * Updates the state of contributions with specific states asynchronously.
+ *
+ * @param states The current states of the contributions to update.
+ * @param newState The new state to set.
+ * @return A Completable indicating the result of the operation.
+ */
+ fun updateContributionsWithStates(states: List, newState: Int): Completable {
+ return Completable
+ .fromAction {
+ updateContributionsState(states, newState)
+ }
+ }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java
deleted file mode 100644
index 568ac9a37e..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package fr.free.nrw.commons.contributions;
-
-import android.net.Uri;
-import android.text.TextUtils;
-import android.view.View;
-import android.webkit.URLUtil;
-import android.widget.ImageButton;
-import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AlertDialog.Builder;
-import androidx.recyclerview.widget.RecyclerView;
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.facebook.imagepipeline.request.ImageRequest;
-import com.facebook.imagepipeline.request.ImageRequestBuilder;
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.contributions.ContributionsListAdapter.Callback;
-import fr.free.nrw.commons.databinding.LayoutContributionBinding;
-import fr.free.nrw.commons.media.MediaClient;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
-import java.io.File;
-
-public class ContributionViewHolder extends RecyclerView.ViewHolder {
-
- private final Callback callback;
-
- LayoutContributionBinding binding;
-
- private int position;
- private Contribution contribution;
- private final CompositeDisposable compositeDisposable = new CompositeDisposable();
- private final MediaClient mediaClient;
- private boolean isWikipediaButtonDisplayed;
- private AlertDialog pausingPopUp;
- private View parent;
- private ImageRequest imageRequest;
-
- ContributionViewHolder(final View parent, final Callback callback,
- final MediaClient mediaClient) {
- super(parent);
- this.parent = parent;
- this.mediaClient = mediaClient;
- this.callback = callback;
-
- binding = LayoutContributionBinding.bind(parent);
-
- binding.contributionImage.setOnClickListener(v -> imageClicked());
- binding.wikipediaButton.setOnClickListener(v -> wikipediaButtonClicked());
-
- /* Set a dialog indicating that the upload is being paused. This is needed because pausing
- an upload might take a dozen seconds. */
- AlertDialog.Builder builder = new Builder(parent.getContext());
- builder.setCancelable(false);
- builder.setView(R.layout.progress_dialog);
- pausingPopUp = builder.create();
- }
-
- public void init(final int position, final Contribution contribution) {
-
- //handling crashes when the contribution is null.
- if (null == contribution) {
- return;
- }
-
- this.contribution = contribution;
- this.position = position;
- binding.contributionTitle.setText(contribution.getMedia().getMostRelevantCaption());
- binding.authorView.setText(contribution.getMedia().getAuthor());
-
- //Removes flicker of loading image.
- binding.contributionImage.getHierarchy().setFadeDuration(0);
-
- binding.contributionImage.getHierarchy().setPlaceholderImage(R.drawable.image_placeholder);
- binding.contributionImage.getHierarchy().setFailureImage(R.drawable.image_placeholder);
-
- final String imageSource = chooseImageSource(contribution.getMedia().getThumbUrl(),
- contribution.getLocalUri());
- if (!TextUtils.isEmpty(imageSource)) {
- if (URLUtil.isHttpsUrl(imageSource)) {
- imageRequest = ImageRequestBuilder.newBuilderWithSource(Uri.parse(imageSource))
- .setProgressiveRenderingEnabled(true)
- .build();
- } else if (URLUtil.isFileUrl(imageSource)) {
- imageRequest = ImageRequest.fromUri(Uri.parse(imageSource));
- } else if (imageSource != null) {
- final File file = new File(imageSource);
- imageRequest = ImageRequest.fromFile(file);
- }
-
- if (imageRequest != null) {
- binding.contributionImage.setImageRequest(imageRequest);
- }
- }
-
- binding.contributionSequenceNumber.setText(String.valueOf(position + 1));
- binding.contributionSequenceNumber.setVisibility(View.VISIBLE);
- binding.wikipediaButton.setVisibility(View.GONE);
- binding.contributionState.setVisibility(View.GONE);
- binding.contributionProgress.setVisibility(View.GONE);
- binding.imageOptions.setVisibility(View.GONE);
- binding.contributionState.setText("");
- checkIfMediaExistsOnWikipediaPage(contribution);
-
- }
-
- /**
- * Checks if a media exists on the corresponding Wikipedia article Currently the check is made
- * for the device's current language Wikipedia
- *
- * @param contribution
- */
- private void checkIfMediaExistsOnWikipediaPage(final Contribution contribution) {
- if (contribution.getWikidataPlace() == null
- || contribution.getWikidataPlace().getWikipediaArticle() == null) {
- return;
- }
- final String wikipediaArticle = contribution.getWikidataPlace().getWikipediaPageTitle();
- compositeDisposable.add(mediaClient.doesPageContainMedia(wikipediaArticle)
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(mediaExists -> {
- displayWikipediaButton(mediaExists);
- }));
- }
-
- /**
- * Handle action buttons visibility if the corresponding wikipedia page doesn't contain any
- * media. This method needs to control the state of just the scenario where media does not
- * exists as other scenarios are already handled in the init method.
- *
- * @param mediaExists
- */
- private void displayWikipediaButton(Boolean mediaExists) {
- if (!mediaExists) {
- binding.wikipediaButton.setVisibility(View.VISIBLE);
- isWikipediaButtonDisplayed = true;
- binding.imageOptions.setVisibility(View.VISIBLE);
- }
- }
-
- /**
- * Returns the image source for the image view, first preference is given to thumbUrl if that is
- * null, moves to local uri and if both are null return null
- *
- * @param thumbUrl
- * @param localUri
- * @return
- */
- @Nullable
- private String chooseImageSource(final String thumbUrl, final Uri localUri) {
- return !TextUtils.isEmpty(thumbUrl) ? thumbUrl :
- localUri != null ? localUri.toString() :
- null;
- }
-
- public void imageClicked() {
- callback.openMediaDetail(position, isWikipediaButtonDisplayed);
- }
-
- public void wikipediaButtonClicked() {
- callback.addImageToWikipedia(contribution);
- }
-
- public ImageRequest getImageRequest() {
- return imageRequest;
- }
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.kt
new file mode 100644
index 0000000000..899ef458f6
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.kt
@@ -0,0 +1,182 @@
+package fr.free.nrw.commons.contributions
+
+import android.net.Uri
+import android.text.TextUtils
+import android.view.View
+import android.webkit.URLUtil
+import androidx.appcompat.app.AlertDialog
+import androidx.recyclerview.widget.RecyclerView
+import com.facebook.imagepipeline.request.ImageRequest
+import com.facebook.imagepipeline.request.ImageRequestBuilder
+import fr.free.nrw.commons.Media
+import fr.free.nrw.commons.utils.MediaAttributionUtil
+import fr.free.nrw.commons.MediaDataExtractor
+import fr.free.nrw.commons.R
+import fr.free.nrw.commons.databinding.LayoutContributionBinding
+import fr.free.nrw.commons.media.MediaClient
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
+import timber.log.Timber
+import java.io.File
+
+class ContributionViewHolder internal constructor(
+ parent: View,
+ private val callback: ContributionsListAdapter.Callback,
+ private val compositeDisposable: CompositeDisposable,
+ private val mediaClient: MediaClient,
+ private val mediaDataExtractor: MediaDataExtractor
+) : RecyclerView.ViewHolder(parent) {
+ var binding: LayoutContributionBinding = LayoutContributionBinding.bind(parent)
+
+ private var position = 0
+ private var contribution: Contribution? = null
+ private var isWikipediaButtonDisplayed = false
+ private val pausingPopUp: AlertDialog
+ var imageRequest: ImageRequest? = null
+ private set
+
+ init {
+ binding.contributionImage.setOnClickListener { v: View? -> imageClicked() }
+ binding.wikipediaButton.setOnClickListener { v: View? -> wikipediaButtonClicked() }
+
+ /* Set a dialog indicating that the upload is being paused. This is needed because pausing
+an upload might take a dozen seconds. */
+ val builder = AlertDialog.Builder(
+ parent.context
+ )
+ builder.setCancelable(false)
+ builder.setView(R.layout.progress_dialog)
+ pausingPopUp = builder.create()
+ }
+
+ fun init(position: Int, contribution: Contribution?) {
+ //handling crashes when the contribution is null.
+
+ if (null == contribution) {
+ return
+ }
+
+ this.contribution = contribution
+ this.position = position
+ binding.contributionTitle.text = contribution.media.mostRelevantCaption
+ setAuthorText(contribution.media)
+
+ //Removes flicker of loading image.
+ binding.contributionImage.hierarchy.fadeDuration = 0
+
+ binding.contributionImage.hierarchy.setPlaceholderImage(R.drawable.image_placeholder)
+ binding.contributionImage.hierarchy.setFailureImage(R.drawable.image_placeholder)
+
+ val imageSource = chooseImageSource(
+ contribution.media.thumbUrl,
+ contribution.localUri
+ )
+ if (!TextUtils.isEmpty(imageSource)) {
+ if (URLUtil.isHttpsUrl(imageSource)) {
+ imageRequest = ImageRequestBuilder.newBuilderWithSource(Uri.parse(imageSource))
+ .setProgressiveRenderingEnabled(true)
+ .build()
+ } else if (URLUtil.isFileUrl(imageSource)) {
+ imageRequest = ImageRequest.fromUri(Uri.parse(imageSource))
+ } else if (imageSource != null) {
+ val file = File(imageSource)
+ imageRequest = ImageRequest.fromFile(file)
+ }
+
+ if (imageRequest != null) {
+ binding.contributionImage.setImageRequest(imageRequest)
+ }
+ }
+
+ binding.contributionSequenceNumber.text = (position + 1).toString()
+ binding.contributionSequenceNumber.visibility = View.VISIBLE
+ binding.wikipediaButton.visibility = View.GONE
+ binding.contributionState.visibility = View.GONE
+ binding.contributionProgress.visibility = View.GONE
+ binding.imageOptions.visibility = View.GONE
+ binding.contributionState.text = ""
+ checkIfMediaExistsOnWikipediaPage(contribution)
+ }
+
+ fun updateAttribution() {
+ if (contribution != null) {
+ val media = contribution!!.media
+ if (!media.getAttributedAuthor().isNullOrEmpty()) {
+ return
+ }
+ compositeDisposable.addAll(
+ mediaDataExtractor.fetchCreatorIdsAndLabels(media)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(
+ { idAndLabels ->
+ media.creatorName = MediaAttributionUtil.getCreatorName(idAndLabels)
+ setAuthorText(media)
+ },
+ { t: Throwable? -> Timber.e(t) })
+ )
+ }
+ }
+
+ private fun setAuthorText(media: Media) {
+ binding.authorView.text = MediaAttributionUtil.getTagLine(media, itemView.context)
+ }
+
+ /**
+ * Checks if a media exists on the corresponding Wikipedia article Currently the check is made
+ * for the device's current language Wikipedia
+ *
+ * @param contribution
+ */
+ private fun checkIfMediaExistsOnWikipediaPage(contribution: Contribution) {
+ if (contribution.wikidataPlace == null
+ || contribution.wikidataPlace!!.wikipediaArticle == null
+ ) {
+ return
+ }
+ val wikipediaArticle = contribution.wikidataPlace!!.getWikipediaPageTitle()
+ compositeDisposable.add(
+ mediaClient.doesPageContainMedia(wikipediaArticle)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe { mediaExists: Boolean ->
+ displayWikipediaButton(mediaExists)
+ })
+ }
+
+ /**
+ * Handle action buttons visibility if the corresponding wikipedia page doesn't contain any
+ * media. This method needs to control the state of just the scenario where media does not
+ * exists as other scenarios are already handled in the init method.
+ *
+ * @param mediaExists
+ */
+ private fun displayWikipediaButton(mediaExists: Boolean) {
+ if (!mediaExists) {
+ binding.wikipediaButton.visibility = View.VISIBLE
+ isWikipediaButtonDisplayed = true
+ binding.imageOptions.visibility = View.VISIBLE
+ }
+ }
+
+ /**
+ * Returns the image source for the image view, first preference is given to thumbUrl if that is
+ * null, moves to local uri and if both are null return null
+ *
+ * @param thumbUrl
+ * @param localUri
+ * @return
+ */
+ private fun chooseImageSource(thumbUrl: String?, localUri: Uri?): String? {
+ return if (!TextUtils.isEmpty(thumbUrl)) thumbUrl else localUri?.toString()
+ }
+
+ fun imageClicked() {
+ callback.openMediaDetail(position, isWikipediaButtonDisplayed)
+ }
+
+ fun wikipediaButtonClicked() {
+ callback.addImageToWikipedia(contribution)
+ }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContract.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContract.java
deleted file mode 100644
index 4397803328..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContract.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package fr.free.nrw.commons.contributions;
-
-import android.content.Context;
-import fr.free.nrw.commons.BasePresenter;
-
-/**
- * The contract for Contributions View & Presenter
- */
-public class ContributionsContract {
-
- public interface View {
-
- void showMessage(String localizedMessage);
-
- Context getContext();
- }
-
- public interface UserActionListener extends BasePresenter {
-
- Contribution getContributionsWithTitle(String uri);
-
- }
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContract.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContract.kt
new file mode 100644
index 0000000000..7027950e37
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContract.kt
@@ -0,0 +1,19 @@
+package fr.free.nrw.commons.contributions
+
+import android.content.Context
+import fr.free.nrw.commons.BasePresenter
+
+/**
+ * The contract for Contributions View & Presenter
+ */
+interface ContributionsContract {
+
+ interface View {
+ fun showMessage(localizedMessage: String)
+ fun getContext(): Context?
+ }
+
+ interface UserActionListener : BasePresenter {
+ fun getContributionsWithTitle(uri: String): Contribution
+ }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java
deleted file mode 100644
index a840aa8e11..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java
+++ /dev/null
@@ -1,943 +0,0 @@
-package fr.free.nrw.commons.contributions;
-
-import static android.content.Context.SENSOR_SERVICE;
-import static fr.free.nrw.commons.contributions.Contribution.STATE_FAILED;
-import static fr.free.nrw.commons.contributions.Contribution.STATE_PAUSED;
-import static fr.free.nrw.commons.nearby.fragments.NearbyParentFragment.WLM_URL;
-import static fr.free.nrw.commons.profile.ProfileActivity.KEY_USERNAME;
-import static fr.free.nrw.commons.utils.ImageUtils.IMAGE_OK;
-import static fr.free.nrw.commons.utils.LengthUtils.computeBearing;
-import static fr.free.nrw.commons.utils.LengthUtils.formatDistanceBetween;
-
-import android.Manifest;
-import android.Manifest.permission;
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.Intent;
-import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.MenuItem.OnMenuItemClickListener;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-import androidx.activity.result.ActivityResultCallback;
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager.OnBackStackChangedListener;
-import androidx.fragment.app.FragmentTransaction;
-import fr.free.nrw.commons.CommonsApplication;
-import fr.free.nrw.commons.Utils;
-import fr.free.nrw.commons.auth.SessionManager;
-import fr.free.nrw.commons.databinding.FragmentContributionsBinding;
-import fr.free.nrw.commons.notification.models.Notification;
-import fr.free.nrw.commons.notification.NotificationController;
-import fr.free.nrw.commons.profile.ProfileActivity;
-import fr.free.nrw.commons.theme.BaseActivity;
-import fr.free.nrw.commons.upload.UploadProgressActivity;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import javax.inject.Inject;
-import javax.inject.Named;
-import androidx.work.WorkManager;
-import fr.free.nrw.commons.Media;
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.campaigns.models.Campaign;
-import fr.free.nrw.commons.campaigns.CampaignView;
-import fr.free.nrw.commons.campaigns.CampaignsPresenter;
-import fr.free.nrw.commons.campaigns.ICampaignsView;
-import fr.free.nrw.commons.contributions.ContributionsListFragment.Callback;
-import fr.free.nrw.commons.contributions.MainActivity.ActiveFragment;
-import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
-import fr.free.nrw.commons.kvstore.JsonKvStore;
-import fr.free.nrw.commons.location.LatLng;
-import fr.free.nrw.commons.location.LocationServiceManager;
-import fr.free.nrw.commons.location.LocationUpdateListener;
-import fr.free.nrw.commons.media.MediaDetailPagerFragment;
-import fr.free.nrw.commons.media.MediaDetailPagerFragment.MediaDetailProvider;
-import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
-import fr.free.nrw.commons.nearby.NearbyController;
-import fr.free.nrw.commons.nearby.NearbyNotificationCardView;
-import fr.free.nrw.commons.nearby.Place;
-import fr.free.nrw.commons.notification.NotificationActivity;
-import fr.free.nrw.commons.upload.worker.UploadWorker;
-import fr.free.nrw.commons.utils.ConfigUtils;
-import fr.free.nrw.commons.utils.DialogUtil;
-import fr.free.nrw.commons.utils.NetworkUtils;
-import fr.free.nrw.commons.utils.PermissionUtils;
-import fr.free.nrw.commons.utils.ViewUtil;
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
-import timber.log.Timber;
-
-public class ContributionsFragment
- extends CommonsDaggerSupportFragment
- implements
- OnBackStackChangedListener,
- LocationUpdateListener,
- MediaDetailProvider,
- SensorEventListener,
- ICampaignsView, ContributionsContract.View, Callback {
-
- @Inject
- @Named("default_preferences")
- JsonKvStore store;
- @Inject
- NearbyController nearbyController;
- @Inject
- OkHttpJsonApiClient okHttpJsonApiClient;
- @Inject
- CampaignsPresenter presenter;
- @Inject
- LocationServiceManager locationManager;
- @Inject
- NotificationController notificationController;
- @Inject
- ContributionController contributionController;
-
- private CompositeDisposable compositeDisposable = new CompositeDisposable();
-
- private ContributionsListFragment contributionsListFragment;
- private static final String CONTRIBUTION_LIST_FRAGMENT_TAG = "ContributionListFragmentTag";
- private MediaDetailPagerFragment mediaDetailPagerFragment;
- static final String MEDIA_DETAIL_PAGER_FRAGMENT_TAG = "MediaDetailFragmentTag";
- private static final int MAX_RETRIES = 10;
-
- public FragmentContributionsBinding binding;
-
- @Inject
- ContributionsPresenter contributionsPresenter;
-
- @Inject
- SessionManager sessionManager;
-
- private LatLng currentLatLng;
-
- private boolean isFragmentAttachedBefore = false;
- private View checkBoxView;
- private CheckBox checkBox;
-
- public TextView notificationCount;
-
- public TextView pendingUploadsCountTextView;
-
- public TextView uploadsErrorTextView;
-
- public ImageView pendingUploadsImageView;
-
- private Campaign wlmCampaign;
-
- String userName;
- private boolean isUserProfile;
-
- private SensorManager mSensorManager;
- private Sensor mLight;
- private float direction;
- private ActivityResultLauncher nearbyLocationPermissionLauncher = registerForActivityResult(
- new ActivityResultContracts.RequestMultiplePermissions(),
- new ActivityResultCallback>() {
- @Override
- public void onActivityResult(Map result) {
- boolean areAllGranted = true;
- for (final boolean b : result.values()) {
- areAllGranted = areAllGranted && b;
- }
-
- if (areAllGranted) {
- onLocationPermissionGranted();
- } else {
- if (shouldShowRequestPermissionRationale(
- Manifest.permission.ACCESS_FINE_LOCATION)
- && store.getBoolean("displayLocationPermissionForCardView", true)
- && !store.getBoolean("doNotAskForLocationPermission", false)
- && (((MainActivity) getActivity()).activeFragment
- == ActiveFragment.CONTRIBUTIONS)) {
- binding.cardViewNearby.permissionType = NearbyNotificationCardView.PermissionType.ENABLE_LOCATION_PERMISSION;
- } else {
- displayYouWontSeeNearbyMessage();
- }
- }
- }
- });
-
- @NonNull
- public static ContributionsFragment newInstance() {
- ContributionsFragment fragment = new ContributionsFragment();
- fragment.setRetainInstance(true);
- return fragment;
- }
-
- private boolean shouldShowMediaDetailsFragment;
-
- @Override
- public void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- if (getArguments() != null && getArguments().getString(KEY_USERNAME) != null) {
- userName = getArguments().getString(KEY_USERNAME);
- isUserProfile = true;
- }
- mSensorManager = (SensorManager) getActivity().getSystemService(SENSOR_SERVICE);
- mLight = mSensorManager.getDefaultSensor(Sensor.TYPE_ORIENTATION);
- }
-
- @Nullable
- @Override
- public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
- @Nullable Bundle savedInstanceState) {
-
- binding = FragmentContributionsBinding.inflate(inflater, container, false);
-
- initWLMCampaign();
- presenter.onAttachView(this);
- contributionsPresenter.onAttachView(this);
- binding.campaignsView.setVisibility(View.GONE);
- checkBoxView = View.inflate(getActivity(), R.layout.nearby_permission_dialog, null);
- checkBox = (CheckBox) checkBoxView.findViewById(R.id.never_ask_again);
- checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
- if (isChecked) {
- // Do not ask for permission on activity start again
- store.putBoolean("displayLocationPermissionForCardView", false);
- }
- });
-
- if (savedInstanceState != null) {
- mediaDetailPagerFragment = (MediaDetailPagerFragment) getChildFragmentManager()
- .findFragmentByTag(MEDIA_DETAIL_PAGER_FRAGMENT_TAG);
- contributionsListFragment = (ContributionsListFragment) getChildFragmentManager()
- .findFragmentByTag(CONTRIBUTION_LIST_FRAGMENT_TAG);
- shouldShowMediaDetailsFragment = savedInstanceState.getBoolean("mediaDetailsVisible");
- }
-
- initFragments();
- if (!isUserProfile) {
- upDateUploadCount();
- }
- if (shouldShowMediaDetailsFragment) {
- showMediaDetailPagerFragment();
- } else {
- if (mediaDetailPagerFragment != null) {
- removeFragment(mediaDetailPagerFragment);
- }
- showContributionsListFragment();
- }
-
- if (!ConfigUtils.isBetaFlavour() && sessionManager.isUserLoggedIn()
- && sessionManager.getCurrentAccount() != null && !isUserProfile) {
- setUploadCount();
- }
- setHasOptionsMenu(true);
- return binding.getRoot();
- }
-
- /**
- * Initialise the campaign object for WML
- */
- private void initWLMCampaign() {
- wlmCampaign = new Campaign(getString(R.string.wlm_campaign_title),
- getString(R.string.wlm_campaign_description), Utils.getWLMStartDate().toString(),
- Utils.getWLMEndDate().toString(), WLM_URL, true);
- }
-
- @Override
- public void onCreateOptionsMenu(@NonNull final Menu menu,
- @NonNull final MenuInflater inflater) {
-
- // Removing contributions menu items for ProfileActivity
- if (getActivity() instanceof ProfileActivity) {
- return;
- }
-
- inflater.inflate(R.menu.contribution_activity_notification_menu, menu);
-
- MenuItem notificationsMenuItem = menu.findItem(R.id.notifications);
- final View notification = notificationsMenuItem.getActionView();
- notificationCount = notification.findViewById(R.id.notification_count_badge);
- MenuItem uploadMenuItem = menu.findItem(R.id.upload_tab);
- final View uploadMenuItemActionView = uploadMenuItem.getActionView();
- pendingUploadsCountTextView = uploadMenuItemActionView.findViewById(
- R.id.pending_uploads_count_badge);
- uploadsErrorTextView = uploadMenuItemActionView.findViewById(
- R.id.uploads_error_count_badge);
- pendingUploadsImageView = uploadMenuItemActionView.findViewById(
- R.id.pending_uploads_image_view);
- if (pendingUploadsImageView != null) {
- pendingUploadsImageView.setOnClickListener(view -> {
- startActivity(new Intent(getContext(), UploadProgressActivity.class));
- });
- }
- if (pendingUploadsCountTextView != null) {
- pendingUploadsCountTextView.setOnClickListener(view -> {
- startActivity(new Intent(getContext(), UploadProgressActivity.class));
- });
- }
- if (uploadsErrorTextView != null) {
- uploadsErrorTextView.setOnClickListener(view -> {
- startActivity(new Intent(getContext(), UploadProgressActivity.class));
- });
- }
- notification.setOnClickListener(view -> {
- NotificationActivity.startYourself(getContext(), "unread");
- });
- }
-
- @SuppressLint("CheckResult")
- public void setNotificationCount() {
- compositeDisposable.add(notificationController.getNotifications(false)
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(this::initNotificationViews,
- throwable -> Timber.e(throwable, "Error occurred while loading notifications")));
- }
-
- /**
- * Sets the visibility of the upload icon based on the number of failed and pending
- * contributions.
- */
- public void setUploadIconVisibility() {
- contributionController.getFailedAndPendingContributions();
- contributionController.failedAndPendingContributionList.observe(getViewLifecycleOwner(),
- list -> {
- updateUploadIcon(list.size());
- });
- }
-
- /**
- * Sets the count for the upload icon based on the number of pending and failed contributions.
- */
- public void setUploadIconCount() {
- contributionController.getPendingContributions();
- contributionController.pendingContributionList.observe(getViewLifecycleOwner(),
- list -> {
- updatePendingIcon(list.size());
- });
- contributionController.getFailedContributions();
- contributionController.failedContributionList.observe(getViewLifecycleOwner(), list -> {
- updateErrorIcon(list.size());
- });
- }
-
- public void scrollToTop() {
- if (contributionsListFragment != null) {
- contributionsListFragment.scrollToTop();
- }
- }
-
- private void initNotificationViews(List notificationList) {
- Timber.d("Number of notifications is %d", notificationList.size());
- if (notificationList.isEmpty()) {
- notificationCount.setVisibility(View.GONE);
- } else {
- notificationCount.setVisibility(View.VISIBLE);
- notificationCount.setText(String.valueOf(notificationList.size()));
- }
- }
-
- @Override
- public void onAttach(Context context) {
- super.onAttach(context);
- /*
- - There are some operations we need auth, so we need to make sure isAuthCookieAcquired.
- - And since we use same retained fragment doesn't want to make all network operations
- all over again on same fragment attached to recreated activity, we do this network
- operations on first time fragment attached to an activity. Then they will be retained
- until fragment life time ends.
- */
- if (!isFragmentAttachedBefore && getActivity() != null) {
- isFragmentAttachedBefore = true;
- }
- }
-
- /**
- * Replace FrameLayout with ContributionsListFragment, user will see contributions list. Creates
- * new one if null.
- */
- private void showContributionsListFragment() {
- // show nearby card view on contributions list is visible
- if (binding.cardViewNearby != null && !isUserProfile) {
- if (store.getBoolean("displayNearbyCardView", true)) {
- if (binding.cardViewNearby.cardViewVisibilityState
- == NearbyNotificationCardView.CardViewVisibilityState.READY) {
- binding.cardViewNearby.setVisibility(View.VISIBLE);
- }
- } else {
- binding.cardViewNearby.setVisibility(View.GONE);
- }
- }
- showFragment(contributionsListFragment, CONTRIBUTION_LIST_FRAGMENT_TAG,
- mediaDetailPagerFragment);
- }
-
- private void showMediaDetailPagerFragment() {
- // hide nearby card view on media detail is visible
- setupViewForMediaDetails();
- showFragment(mediaDetailPagerFragment, MEDIA_DETAIL_PAGER_FRAGMENT_TAG,
- contributionsListFragment);
- }
-
- private void setupViewForMediaDetails() {
- if (binding != null) {
- binding.campaignsView.setVisibility(View.GONE);
- }
- }
-
- @Override
- public void onBackStackChanged() {
- fetchCampaigns();
- }
-
- private void initFragments() {
- if (null == contributionsListFragment) {
- contributionsListFragment = new ContributionsListFragment();
- Bundle contributionsListBundle = new Bundle();
- contributionsListBundle.putString(KEY_USERNAME, userName);
- contributionsListFragment.setArguments(contributionsListBundle);
- }
-
- if (shouldShowMediaDetailsFragment) {
- showMediaDetailPagerFragment();
- } else {
- showContributionsListFragment();
- }
-
- showFragment(contributionsListFragment, CONTRIBUTION_LIST_FRAGMENT_TAG,
- mediaDetailPagerFragment);
- }
-
- /**
- * Replaces the root frame layout with the given fragment
- *
- * @param fragment
- * @param tag
- * @param otherFragment
- */
- private void showFragment(Fragment fragment, String tag, Fragment otherFragment) {
- FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
- if (fragment.isAdded() && otherFragment != null) {
- transaction.hide(otherFragment);
- transaction.show(fragment);
- transaction.addToBackStack(tag);
- transaction.commit();
- getChildFragmentManager().executePendingTransactions();
- } else if (fragment.isAdded() && otherFragment == null) {
- transaction.show(fragment);
- transaction.addToBackStack(tag);
- transaction.commit();
- getChildFragmentManager().executePendingTransactions();
- } else if (!fragment.isAdded() && otherFragment != null) {
- transaction.hide(otherFragment);
- transaction.add(R.id.root_frame, fragment, tag);
- transaction.addToBackStack(tag);
- transaction.commit();
- getChildFragmentManager().executePendingTransactions();
- } else if (!fragment.isAdded()) {
- transaction.replace(R.id.root_frame, fragment, tag);
- transaction.addToBackStack(tag);
- transaction.commit();
- getChildFragmentManager().executePendingTransactions();
- }
- }
-
- public void removeFragment(Fragment fragment) {
- getChildFragmentManager()
- .beginTransaction()
- .remove(fragment)
- .commit();
- getChildFragmentManager().executePendingTransactions();
- }
-
- @SuppressWarnings("ConstantConditions")
- private void setUploadCount() {
- compositeDisposable.add(okHttpJsonApiClient
- .getUploadCount(((MainActivity) getActivity()).sessionManager.getCurrentAccount().name)
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(this::displayUploadCount,
- t -> Timber.e(t, "Fetching upload count failed")
- ));
- }
-
- private void displayUploadCount(Integer uploadCount) {
- if (getActivity().isFinishing()
- || getResources() == null) {
- return;
- }
-
- ((MainActivity) getActivity()).setNumOfUploads(uploadCount);
-
- }
-
- @Override
- public void onPause() {
- super.onPause();
- locationManager.removeLocationListener(this);
- locationManager.unregisterLocationManager();
- mSensorManager.unregisterListener(this);
- }
-
- @Override
- public void onSaveInstanceState(Bundle outState) {
- super.onSaveInstanceState(outState);
- }
-
- @Override
- public void onResume() {
- super.onResume();
- contributionsPresenter.onAttachView(this);
- locationManager.addLocationListener(this);
-
- if (binding == null) {
- return;
- }
-
- binding.cardViewNearby.permissionRequestButton.setOnClickListener(v -> {
- showNearbyCardPermissionRationale();
- });
-
- // Notification cards should only be seen on contributions list, not in media details
- if (mediaDetailPagerFragment == null && !isUserProfile) {
- if (store.getBoolean("displayNearbyCardView", true)) {
- checkPermissionsAndShowNearbyCardView();
-
- // Calling nearby card to keep showing it even when user clicks on it and comes back
- try {
- updateClosestNearbyCardViewInfo();
- } catch (Exception e) {
- Timber.e(e);
- }
- if (binding.cardViewNearby.cardViewVisibilityState
- == NearbyNotificationCardView.CardViewVisibilityState.READY) {
- binding.cardViewNearby.setVisibility(View.VISIBLE);
- }
-
- } else {
- // Hide nearby notification card view if related shared preferences is false
- binding.cardViewNearby.setVisibility(View.GONE);
- }
-
- // Notification Count and Campaigns should not be set, if it is used in User Profile
- if (!isUserProfile) {
- setNotificationCount();
- fetchCampaigns();
- setUploadIconVisibility();
- setUploadIconCount();
- }
- }
- mSensorManager.registerListener(this, mLight, SensorManager.SENSOR_DELAY_UI);
- }
-
- private void checkPermissionsAndShowNearbyCardView() {
- if (PermissionUtils.hasPermission(getActivity(),
- new String[]{Manifest.permission.ACCESS_FINE_LOCATION})) {
- onLocationPermissionGranted();
- } else if (shouldShowRequestPermissionRationale(Manifest.permission.ACCESS_FINE_LOCATION)
- && store.getBoolean("displayLocationPermissionForCardView", true)
- && !store.getBoolean("doNotAskForLocationPermission", false)
- && (((MainActivity) getActivity()).activeFragment == ActiveFragment.CONTRIBUTIONS)) {
- binding.cardViewNearby.permissionType = NearbyNotificationCardView.PermissionType.ENABLE_LOCATION_PERMISSION;
- showNearbyCardPermissionRationale();
- }
- }
-
- private void requestLocationPermission() {
- nearbyLocationPermissionLauncher.launch(new String[]{permission.ACCESS_FINE_LOCATION});
- }
-
- private void onLocationPermissionGranted() {
- binding.cardViewNearby.permissionType = NearbyNotificationCardView.PermissionType.NO_PERMISSION_NEEDED;
- locationManager.registerLocationManager();
- }
-
- private void showNearbyCardPermissionRationale() {
- DialogUtil.showAlertDialog(getActivity(),
- getString(R.string.nearby_card_permission_title),
- getString(R.string.nearby_card_permission_explanation),
- this::requestLocationPermission,
- this::displayYouWontSeeNearbyMessage,
- checkBoxView,
- false);
- }
-
- private void displayYouWontSeeNearbyMessage() {
- ViewUtil.showLongToast(getActivity(),
- getResources().getString(R.string.unable_to_display_nearest_place));
- // Set to true as the user doesn't want the app to ask for location permission anymore
- store.putBoolean("doNotAskForLocationPermission", true);
- }
-
-
- private void updateClosestNearbyCardViewInfo() {
- currentLatLng = locationManager.getLastLocation();
- compositeDisposable.add(Observable.fromCallable(() -> nearbyController
- .loadAttractionsFromLocation(currentLatLng, currentLatLng, true,
- false)) // thanks to boolean, it will only return closest result
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(this::updateNearbyNotification,
- throwable -> {
- Timber.d(throwable);
- updateNearbyNotification(null);
- }));
- }
-
- private void updateNearbyNotification(
- @Nullable NearbyController.NearbyPlacesInfo nearbyPlacesInfo) {
- if (nearbyPlacesInfo != null && nearbyPlacesInfo.placeList != null
- && nearbyPlacesInfo.placeList.size() > 0) {
- Place closestNearbyPlace = null;
- // Find the first nearby place that has no image and exists
- for (Place place : nearbyPlacesInfo.placeList) {
- if (place.pic.equals("") && place.exists) {
- closestNearbyPlace = place;
- break;
- }
- }
-
- if (closestNearbyPlace == null) {
- binding.cardViewNearby.setVisibility(View.GONE);
- } else {
- String distance = formatDistanceBetween(currentLatLng, closestNearbyPlace.location);
- closestNearbyPlace.setDistance(distance);
- direction = (float) computeBearing(currentLatLng, closestNearbyPlace.location);
- binding.cardViewNearby.updateContent(closestNearbyPlace);
- }
- } else {
- // Means that no close nearby place is found
- binding.cardViewNearby.setVisibility(View.GONE);
- }
-
- // Prevent Nearby banner from appearing in Media Details, fixing bug https://github.com/commons-app/apps-android-commons/issues/4731
- if (mediaDetailPagerFragment != null && !contributionsListFragment.isVisible()) {
- binding.cardViewNearby.setVisibility(View.GONE);
- }
- }
-
- @Override
- public void onDestroy() {
- try {
- compositeDisposable.clear();
- getChildFragmentManager().removeOnBackStackChangedListener(this);
- locationManager.unregisterLocationManager();
- locationManager.removeLocationListener(this);
- super.onDestroy();
- } catch (IllegalArgumentException | IllegalStateException exception) {
- Timber.e(exception);
- }
- }
-
- @Override
- public void onLocationChangedSignificantly(LatLng latLng) {
- // Will be called if location changed more than 1000 meter
- updateClosestNearbyCardViewInfo();
- }
-
- @Override
- public void onLocationChangedSlightly(LatLng latLng) {
- /* Update closest nearby notification card onLocationChangedSlightly
- */
- try {
- updateClosestNearbyCardViewInfo();
- } catch (Exception e) {
- Timber.e(e);
- }
- }
-
- @Override
- public void onLocationChangedMedium(LatLng latLng) {
- // Update closest nearby card view if location changed more than 500 meters
- updateClosestNearbyCardViewInfo();
- }
-
- @Override
- public void onViewCreated(@NonNull View view,
- @Nullable Bundle savedInstanceState) {
- super.onViewCreated(view, savedInstanceState);
- }
-
- /**
- * As the home screen has limited space, we have choosen to show either campaigns or WLM card.
- * The WLM Card gets the priority over monuments, so if the WLM is going on we show that instead
- * of campaigns on the campaigns card
- */
- private void fetchCampaigns() {
- if (Utils.isMonumentsEnabled(new Date())) {
- if (binding != null) {
- binding.campaignsView.setCampaign(wlmCampaign);
- binding.campaignsView.setVisibility(View.VISIBLE);
- }
- } else if (store.getBoolean(CampaignView.CAMPAIGNS_DEFAULT_PREFERENCE, true)) {
- presenter.getCampaigns();
- } else {
- if (binding != null) {
- binding.campaignsView.setVisibility(View.GONE);
- }
- }
- }
-
- @Override
- public void showMessage(String message) {
- Toast.makeText(getContext(), message, Toast.LENGTH_SHORT).show();
- }
-
- @Override
- public void showCampaigns(Campaign campaign) {
- if (campaign != null && !isUserProfile) {
- if (binding != null) {
- binding.campaignsView.setCampaign(campaign);
- }
- }
- }
-
- @Override
- public void onDestroyView() {
- super.onDestroyView();
- presenter.onDetachView();
- }
-
- @Override
- public void notifyDataSetChanged() {
- if (mediaDetailPagerFragment != null) {
- mediaDetailPagerFragment.notifyDataSetChanged();
- }
- }
-
- /**
- * Notify the viewpager that number of items have changed.
- */
- @Override
- public void viewPagerNotifyDataSetChanged() {
- if (mediaDetailPagerFragment != null) {
- mediaDetailPagerFragment.notifyDataSetChanged();
- }
- }
-
- /**
- * Updates the visibility and text of the pending uploads count TextView based on the given
- * count.
- *
- * @param pendingCount The number of pending uploads.
- */
- public void updatePendingIcon(int pendingCount) {
- if (pendingUploadsCountTextView != null) {
- if (pendingCount != 0) {
- pendingUploadsCountTextView.setVisibility(View.VISIBLE);
- pendingUploadsCountTextView.setText(String.valueOf(pendingCount));
- } else {
- pendingUploadsCountTextView.setVisibility(View.INVISIBLE);
- }
- }
- }
-
- /**
- * Updates the visibility and text of the error uploads TextView based on the given count.
- *
- * @param errorCount The number of error uploads.
- */
- public void updateErrorIcon(int errorCount) {
- if (uploadsErrorTextView != null) {
- if (errorCount != 0) {
- uploadsErrorTextView.setVisibility(View.VISIBLE);
- uploadsErrorTextView.setText(String.valueOf(errorCount));
- } else {
- uploadsErrorTextView.setVisibility(View.GONE);
- }
- }
- }
-
- /**
- * Updates the visibility of the pending uploads ImageView based on the given count.
- *
- * @param count The number of pending uploads.
- */
- public void updateUploadIcon(int count) {
- if (pendingUploadsImageView != null) {
- if (count != 0) {
- pendingUploadsImageView.setVisibility(View.VISIBLE);
- } else {
- pendingUploadsImageView.setVisibility(View.GONE);
- }
- }
- }
-
- /**
- * Replace whatever is in the current contributionsFragmentContainer view with
- * mediaDetailPagerFragment, and preserve previous state in back stack. Called when user selects
- * a contribution.
- */
- @Override
- public void showDetail(int position, boolean isWikipediaButtonDisplayed) {
- if (mediaDetailPagerFragment == null || !mediaDetailPagerFragment.isVisible()) {
- mediaDetailPagerFragment = MediaDetailPagerFragment.newInstance(false, true);
- if (isUserProfile) {
- ((ProfileActivity) getActivity()).setScroll(false);
- }
- showMediaDetailPagerFragment();
- }
- mediaDetailPagerFragment.showImage(position, isWikipediaButtonDisplayed);
- }
-
- @Override
- public Media getMediaAtPosition(int i) {
- return contributionsListFragment.getMediaAtPosition(i);
- }
-
- @Override
- public int getTotalMediaCount() {
- return contributionsListFragment.getTotalMediaCount();
- }
-
- @Override
- public Integer getContributionStateAt(int position) {
- return contributionsListFragment.getContributionStateAt(position);
- }
-
- public boolean backButtonClicked() {
- if (mediaDetailPagerFragment != null && mediaDetailPagerFragment.isVisible()) {
- if (store.getBoolean("displayNearbyCardView", true) && !isUserProfile) {
- if (binding.cardViewNearby.cardViewVisibilityState
- == NearbyNotificationCardView.CardViewVisibilityState.READY) {
- binding.cardViewNearby.setVisibility(View.VISIBLE);
- }
- } else {
- binding.cardViewNearby.setVisibility(View.GONE);
- }
- removeFragment(mediaDetailPagerFragment);
- showFragment(contributionsListFragment, CONTRIBUTION_LIST_FRAGMENT_TAG,
- mediaDetailPagerFragment);
- if (isUserProfile) {
- // Fragment is associated with ProfileActivity
- // Enable ParentViewPager Scroll
- ((ProfileActivity) getActivity()).setScroll(true);
- } else {
- fetchCampaigns();
- }
- if (getActivity() instanceof MainActivity) {
- // Fragment is associated with MainActivity
- ((BaseActivity) getActivity()).getSupportActionBar()
- .setDisplayHomeAsUpEnabled(false);
- ((MainActivity) getActivity()).showTabs();
- }
- return true;
- }
- return false;
- }
-
- // Getter for mediaDetailPagerFragment
- public MediaDetailPagerFragment getMediaDetailPagerFragment() {
- return mediaDetailPagerFragment;
- }
-
-
- /**
- * this function updates the number of contributions
- */
- void upDateUploadCount() {
- WorkManager.getInstance(getContext())
- .getWorkInfosForUniqueWorkLiveData(UploadWorker.class.getSimpleName()).observe(
- getViewLifecycleOwner(), workInfos -> {
- if (workInfos.size() > 0) {
- setUploadCount();
- }
- });
- }
-
-
- /**
- * Restarts the upload process for a contribution
- *
- * @param contribution
- */
- public void restartUpload(Contribution contribution) {
- contribution.setDateUploadStarted(Calendar.getInstance().getTime());
- if (contribution.getState() == Contribution.STATE_FAILED) {
- if (contribution.getErrorInfo() == null) {
- contribution.setChunkInfo(null);
- contribution.setTransferred(0);
- }
- contributionsPresenter.checkDuplicateImageAndRestartContribution(contribution);
- } else {
- contribution.setState(Contribution.STATE_QUEUED);
- contributionsPresenter.saveContribution(contribution);
- Timber.d("Restarting for %s", contribution.toString());
- }
- }
-
- /**
- * Retry upload when it is failed
- *
- * @param contribution contribution to be retried
- */
- public void retryUpload(Contribution contribution) {
- if (NetworkUtils.isInternetConnectionEstablished(getContext())) {
- if (contribution.getState() == STATE_PAUSED) {
- restartUpload(contribution);
- } else if (contribution.getState() == STATE_FAILED) {
- int retries = contribution.getRetries();
- // TODO: Improve UX. Additional details: https://github.com/commons-app/apps-android-commons/pull/5257#discussion_r1304662562
- /* Limit the number of retries for a failed upload
- to handle cases like invalid filename as such uploads
- will never be successful */
- if (retries < MAX_RETRIES) {
- contribution.setRetries(retries + 1);
- Timber.d("Retried uploading %s %d times", contribution.getMedia().getFilename(),
- retries + 1);
- restartUpload(contribution);
- } else {
- // TODO: Show the exact reason for failure
- Toast.makeText(getContext(),
- R.string.retry_limit_reached, Toast.LENGTH_SHORT).show();
- }
- } else {
- Timber.d("Skipping re-upload for non-failed %s", contribution.toString());
- }
- } else {
- ViewUtil.showLongToast(getContext(), R.string.this_function_needs_network_connection);
- }
-
- }
-
- /**
- * Reload media detail fragment once media is nominated
- *
- * @param index item position that has been nominated
- */
- @Override
- public void refreshNominatedMedia(int index) {
- if (mediaDetailPagerFragment != null && !contributionsListFragment.isVisible()) {
- removeFragment(mediaDetailPagerFragment);
- mediaDetailPagerFragment = MediaDetailPagerFragment.newInstance(false, true);
- mediaDetailPagerFragment.showImage(index);
- showMediaDetailPagerFragment();
- }
- }
-
- /**
- * When the device rotates, rotate the Nearby banner's compass arrow in tandem.
- */
- @Override
- public void onSensorChanged(SensorEvent event) {
- float rotateDegree = Math.round(event.values[0]);
- binding.cardViewNearby.rotateCompass(rotateDegree, direction);
- }
-
- @Override
- public void onAccuracyChanged(Sensor sensor, int accuracy) {
- // Nothing to do.
- }
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.kt
new file mode 100644
index 0000000000..f293ccc440
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.kt
@@ -0,0 +1,999 @@
+package fr.free.nrw.commons.contributions
+
+import android.Manifest.permission
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.hardware.Sensor
+import android.hardware.SensorEvent
+import android.hardware.SensorEventListener
+import android.hardware.SensorManager
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.CheckBox
+import android.widget.CompoundButton
+import android.widget.ImageView
+import android.widget.TextView
+import android.widget.Toast
+import androidx.activity.result.ActivityResultCallback
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.lifecycle.Observer
+import androidx.paging.PagedList
+import androidx.work.WorkInfo
+import androidx.work.WorkManager
+import fr.free.nrw.commons.MapController.NearbyPlacesInfo
+import fr.free.nrw.commons.Media
+import fr.free.nrw.commons.R
+import fr.free.nrw.commons.Utils
+import fr.free.nrw.commons.auth.SessionManager
+import fr.free.nrw.commons.campaigns.CampaignView
+import fr.free.nrw.commons.campaigns.CampaignsPresenter
+import fr.free.nrw.commons.campaigns.ICampaignsView
+import fr.free.nrw.commons.campaigns.models.Campaign
+import fr.free.nrw.commons.contributions.MainActivity.ActiveFragment
+import fr.free.nrw.commons.databinding.FragmentContributionsBinding
+import fr.free.nrw.commons.di.CommonsDaggerSupportFragment
+import fr.free.nrw.commons.kvstore.JsonKvStore
+import fr.free.nrw.commons.location.LatLng
+import fr.free.nrw.commons.location.LocationServiceManager
+import fr.free.nrw.commons.location.LocationUpdateListener
+import fr.free.nrw.commons.media.MediaDetailPagerFragment
+import fr.free.nrw.commons.media.MediaDetailPagerFragment.MediaDetailProvider
+import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient
+import fr.free.nrw.commons.nearby.NearbyController
+import fr.free.nrw.commons.nearby.NearbyNotificationCardView
+import fr.free.nrw.commons.nearby.Place
+import fr.free.nrw.commons.nearby.fragments.NearbyParentFragment
+import fr.free.nrw.commons.notification.NotificationActivity.Companion.startYourself
+import fr.free.nrw.commons.notification.NotificationController
+import fr.free.nrw.commons.notification.models.Notification
+import fr.free.nrw.commons.profile.ProfileActivity
+import fr.free.nrw.commons.theme.BaseActivity
+import fr.free.nrw.commons.upload.UploadProgressActivity
+import fr.free.nrw.commons.upload.worker.UploadWorker
+import fr.free.nrw.commons.utils.ConfigUtils.isBetaFlavour
+import fr.free.nrw.commons.utils.DialogUtil.showAlertDialog
+import fr.free.nrw.commons.utils.LengthUtils.computeBearing
+import fr.free.nrw.commons.utils.LengthUtils.formatDistanceBetween
+import fr.free.nrw.commons.utils.NetworkUtils.isInternetConnectionEstablished
+import fr.free.nrw.commons.utils.PermissionUtils.hasPermission
+import fr.free.nrw.commons.utils.ViewUtil.showLongToast
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
+import timber.log.Timber
+import java.util.Calendar
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Named
+
+class ContributionsFragment : CommonsDaggerSupportFragment(), FragmentManager.OnBackStackChangedListener,
+ LocationUpdateListener, MediaDetailProvider, SensorEventListener, ICampaignsView,
+ ContributionsContract.View, ContributionsListFragment.Callback {
+ @JvmField
+ @Inject
+ @Named("default_preferences")
+ var store: JsonKvStore? = null
+
+ @JvmField
+ @Inject
+ var nearbyController: NearbyController? = null
+
+ @JvmField
+ @Inject
+ var okHttpJsonApiClient: OkHttpJsonApiClient? = null
+
+ @JvmField
+ @Inject
+ var presenter: CampaignsPresenter? = null
+
+ @JvmField
+ @Inject
+ var locationManager: LocationServiceManager? = null
+
+ @JvmField
+ @Inject
+ var notificationController: NotificationController? = null
+
+ @JvmField
+ @Inject
+ var contributionController: ContributionController? = null
+
+ override var compositeDisposable: CompositeDisposable = CompositeDisposable()
+
+ private var contributionsListFragment: ContributionsListFragment? = null
+
+ // Getter for mediaDetailPagerFragment
+ var mediaDetailPagerFragment: MediaDetailPagerFragment? = null
+ private set
+ var binding: FragmentContributionsBinding? = null
+
+ @JvmField
+ @Inject
+ var contributionsPresenter: ContributionsPresenter? = null
+
+ @JvmField
+ @Inject
+ var sessionManager: SessionManager? = null
+
+ private var currentLatLng: LatLng? = null
+
+ private var isFragmentAttachedBefore = false
+ private var checkBoxView: View? = null
+ private var checkBox: CheckBox? = null
+
+ var notificationCount: TextView? = null
+
+ var pendingUploadsCountTextView: TextView? = null
+
+ var uploadsErrorTextView: TextView? = null
+
+ var pendingUploadsImageView: ImageView? = null
+
+ private var wlmCampaign: Campaign? = null
+
+ var userName: String? = null
+ private var isUserProfile = false
+
+ private var mSensorManager: SensorManager? = null
+ private var mLight: Sensor? = null
+ private var direction = 0f
+ private val nearbyLocationPermissionLauncher =
+ registerForActivityResult, Map>(
+ ActivityResultContracts.RequestMultiplePermissions(),
+ object : ActivityResultCallback> {
+ override fun onActivityResult(result: Map) {
+ var areAllGranted = true
+ for (b in result.values) {
+ areAllGranted = areAllGranted && b
+ }
+
+ if (areAllGranted) {
+ onLocationPermissionGranted()
+ } else {
+ if (shouldShowRequestPermissionRationale(
+ permission.ACCESS_FINE_LOCATION
+ )
+ && store!!.getBoolean("displayLocationPermissionForCardView", true)
+ && !store!!.getBoolean("doNotAskForLocationPermission", false)
+ && ((activity as MainActivity).activeFragment
+ == ActiveFragment.CONTRIBUTIONS)
+ ) {
+ binding!!.cardViewNearby.permissionType =
+ NearbyNotificationCardView.PermissionType.ENABLE_LOCATION_PERMISSION
+ } else {
+ displayYouWontSeeNearbyMessage()
+ }
+ }
+ }
+ })
+
+ private var shouldShowMediaDetailsFragment = false
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ if (arguments != null && requireArguments().getString(ProfileActivity.KEY_USERNAME) != null) {
+ userName = requireArguments().getString(ProfileActivity.KEY_USERNAME)
+ isUserProfile = true
+ }
+ mSensorManager = requireActivity().getSystemService(Context.SENSOR_SERVICE) as SensorManager
+ mLight = mSensorManager!!.getDefaultSensor(Sensor.TYPE_ORIENTATION)
+ }
+
+ override fun onCreateView(
+ inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? {
+ binding = FragmentContributionsBinding.inflate(inflater, container, false)
+
+ initWLMCampaign()
+ presenter!!.onAttachView(this)
+ contributionsPresenter!!.onAttachView(this)
+ binding!!.campaignsView.visibility = View.GONE
+ checkBoxView = View.inflate(activity, R.layout.nearby_permission_dialog, null)
+ checkBox = checkBoxView?.findViewById(R.id.never_ask_again) as CheckBox
+ checkBox!!.setOnCheckedChangeListener { buttonView: CompoundButton?, isChecked: Boolean ->
+ if (isChecked) {
+ // Do not ask for permission on activity start again
+ store!!.putBoolean("displayLocationPermissionForCardView", false)
+ }
+ }
+
+ if (savedInstanceState != null) {
+ mediaDetailPagerFragment = childFragmentManager
+ .findFragmentByTag(MEDIA_DETAIL_PAGER_FRAGMENT_TAG) as MediaDetailPagerFragment?
+ contributionsListFragment = childFragmentManager
+ .findFragmentByTag(CONTRIBUTION_LIST_FRAGMENT_TAG) as ContributionsListFragment?
+ shouldShowMediaDetailsFragment = savedInstanceState.getBoolean("mediaDetailsVisible")
+ }
+
+ initFragments()
+ if (!isUserProfile) {
+ upDateUploadCount()
+ }
+ if (shouldShowMediaDetailsFragment) {
+ showMediaDetailPagerFragment()
+ } else {
+ if (mediaDetailPagerFragment != null) {
+ removeFragment(mediaDetailPagerFragment!!)
+ }
+ showContributionsListFragment()
+ }
+
+ if (!isBetaFlavour && sessionManager!!.isUserLoggedIn
+ && sessionManager!!.currentAccount != null && !isUserProfile
+ ) {
+ setUploadCount()
+ }
+ setHasOptionsMenu(true)
+ return binding!!.root
+ }
+
+ /**
+ * Initialise the campaign object for WML
+ */
+ private fun initWLMCampaign() {
+ wlmCampaign = Campaign(
+ getString(R.string.wlm_campaign_title),
+ getString(R.string.wlm_campaign_description), Utils.getWLMStartDate().toString(),
+ Utils.getWLMEndDate().toString(), NearbyParentFragment.WLM_URL, true
+ )
+ }
+
+ override fun onCreateOptionsMenu(
+ menu: Menu,
+ inflater: MenuInflater
+ ) {
+ // Removing contributions menu items for ProfileActivity
+
+ if (activity is ProfileActivity) {
+ return
+ }
+
+ inflater.inflate(R.menu.contribution_activity_notification_menu, menu)
+
+ val notificationsMenuItem = menu.findItem(R.id.notifications)
+ val notification = notificationsMenuItem.actionView
+ notificationCount = notification!!.findViewById(R.id.notification_count_badge)
+ val uploadMenuItem = menu.findItem(R.id.upload_tab)
+ val uploadMenuItemActionView = uploadMenuItem.actionView
+ pendingUploadsCountTextView = uploadMenuItemActionView!!.findViewById(
+ R.id.pending_uploads_count_badge
+ )
+ uploadsErrorTextView = uploadMenuItemActionView.findViewById(
+ R.id.uploads_error_count_badge
+ )
+ pendingUploadsImageView = uploadMenuItemActionView.findViewById(
+ R.id.pending_uploads_image_view
+ )
+ if (pendingUploadsImageView != null) {
+ pendingUploadsImageView!!.setOnClickListener { view: View? ->
+ startActivity(
+ Intent(
+ context,
+ UploadProgressActivity::class.java
+ )
+ )
+ }
+ }
+ if (pendingUploadsCountTextView != null) {
+ pendingUploadsCountTextView!!.setOnClickListener { view: View? ->
+ startActivity(
+ Intent(
+ context,
+ UploadProgressActivity::class.java
+ )
+ )
+ }
+ }
+ if (uploadsErrorTextView != null) {
+ uploadsErrorTextView!!.setOnClickListener { view: View? ->
+ startActivity(
+ Intent(
+ context,
+ UploadProgressActivity::class.java
+ )
+ )
+ }
+ }
+ notification.setOnClickListener { view: View? ->
+ context?.let {
+ startYourself(
+ it, "unread"
+ )
+ }
+ }
+ }
+
+ @SuppressLint("CheckResult")
+ fun setNotificationCount() {
+ compositeDisposable.add(
+ notificationController!!.getNotifications(false)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(
+ { notificationList: List ->
+ this.initNotificationViews(
+ notificationList
+ )
+ },
+ { throwable: Throwable? ->
+ Timber.e(
+ throwable,
+ "Error occurred while loading notifications"
+ )
+ })
+ )
+ }
+
+ /**
+ * Temporarily disabled, see issue [https://github.com/commons-app/apps-android-commons/issues/5847]
+ * Sets the visibility of the upload icon based on the number of failed and pending
+ * contributions.
+ */
+ // public void setUploadIconVisibility() {
+ // contributionController.getFailedAndPendingContributions();
+ // contributionController.failedAndPendingContributionList.observe(getViewLifecycleOwner(),
+ // list -> {
+ // updateUploadIcon(list.size());
+ // });
+ // }
+ /**
+ * Sets the count for the upload icon based on the number of pending and failed contributions.
+ */
+ fun setUploadIconCount() {
+ contributionController!!.pendingContributions
+ contributionController!!.pendingContributionList!!.observe(
+ viewLifecycleOwner,
+ Observer> { list: PagedList ->
+ updatePendingIcon(list.size)
+ })
+ contributionController!!.failedContributions
+ contributionController!!.failedContributionList!!.observe(
+ viewLifecycleOwner,
+ Observer> { list: PagedList ->
+ updateErrorIcon(list.size)
+ })
+ }
+
+ fun scrollToTop() {
+ if (contributionsListFragment != null) {
+ contributionsListFragment!!.scrollToTop()
+ }
+ }
+
+ private fun initNotificationViews(notificationList: List) {
+ Timber.d("Number of notifications is %d", notificationList.size)
+ if (notificationList.isEmpty()) {
+ notificationCount!!.visibility = View.GONE
+ } else {
+ notificationCount!!.visibility = View.VISIBLE
+ notificationCount!!.text = notificationList.size.toString()
+ }
+ }
+
+ override fun onAttach(context: Context) {
+ super.onAttach(context)
+ /*
+ - There are some operations we need auth, so we need to make sure isAuthCookieAcquired.
+ - And since we use same retained fragment doesn't want to make all network operations
+ all over again on same fragment attached to recreated activity, we do this network
+ operations on first time fragment attached to an activity. Then they will be retained
+ until fragment life time ends.
+ */
+ if (!isFragmentAttachedBefore && activity != null) {
+ isFragmentAttachedBefore = true
+ }
+ }
+
+ /**
+ * Replace FrameLayout with ContributionsListFragment, user will see contributions list. Creates
+ * new one if null.
+ */
+ private fun showContributionsListFragment() {
+ // show nearby card view on contributions list is visible
+ if (binding!!.cardViewNearby != null && !isUserProfile) {
+ if (store!!.getBoolean("displayNearbyCardView", true)) {
+ if (binding!!.cardViewNearby.cardViewVisibilityState
+ == NearbyNotificationCardView.CardViewVisibilityState.READY
+ ) {
+ binding!!.cardViewNearby.visibility = View.VISIBLE
+ }
+ } else {
+ binding!!.cardViewNearby.visibility = View.GONE
+ }
+ }
+ showFragment(
+ contributionsListFragment!!, CONTRIBUTION_LIST_FRAGMENT_TAG,
+ mediaDetailPagerFragment
+ )
+ }
+
+ private fun showMediaDetailPagerFragment() {
+ // hide nearby card view on media detail is visible
+ setupViewForMediaDetails()
+ showFragment(
+ mediaDetailPagerFragment!!, MEDIA_DETAIL_PAGER_FRAGMENT_TAG,
+ contributionsListFragment
+ )
+ }
+
+ private fun setupViewForMediaDetails() {
+ if (binding != null) {
+ binding!!.campaignsView.visibility = View.GONE
+ }
+ }
+
+ override fun onBackStackChanged() {
+ fetchCampaigns()
+ }
+
+ private fun initFragments() {
+ if (null == contributionsListFragment) {
+ contributionsListFragment = ContributionsListFragment()
+ val contributionsListBundle = Bundle()
+ contributionsListBundle.putString(ProfileActivity.KEY_USERNAME, userName)
+ contributionsListFragment!!.arguments = contributionsListBundle
+ }
+
+ if (shouldShowMediaDetailsFragment) {
+ showMediaDetailPagerFragment()
+ } else {
+ showContributionsListFragment()
+ }
+
+ showFragment(
+ contributionsListFragment!!, CONTRIBUTION_LIST_FRAGMENT_TAG,
+ mediaDetailPagerFragment
+ )
+ }
+
+ /**
+ * Replaces the root frame layout with the given fragment
+ *
+ * @param fragment
+ * @param tag
+ * @param otherFragment
+ */
+ private fun showFragment(fragment: Fragment, tag: String, otherFragment: Fragment?) {
+ val transaction = childFragmentManager.beginTransaction()
+ if (fragment.isAdded && otherFragment != null) {
+ transaction.hide(otherFragment)
+ transaction.show(fragment)
+ transaction.addToBackStack(tag)
+ transaction.commit()
+ childFragmentManager.executePendingTransactions()
+ } else if (fragment.isAdded && otherFragment == null) {
+ transaction.show(fragment)
+ transaction.addToBackStack(tag)
+ transaction.commit()
+ childFragmentManager.executePendingTransactions()
+ } else if (!fragment.isAdded && otherFragment != null) {
+ transaction.hide(otherFragment)
+ transaction.add(R.id.root_frame, fragment, tag)
+ transaction.addToBackStack(tag)
+ transaction.commit()
+ childFragmentManager.executePendingTransactions()
+ } else if (!fragment.isAdded) {
+ transaction.replace(R.id.root_frame, fragment, tag)
+ transaction.addToBackStack(tag)
+ transaction.commit()
+ childFragmentManager.executePendingTransactions()
+ }
+ }
+
+ fun removeFragment(fragment: Fragment) {
+ childFragmentManager
+ .beginTransaction()
+ .remove(fragment)
+ .commit()
+ childFragmentManager.executePendingTransactions()
+ }
+
+ private fun setUploadCount() {
+ okHttpJsonApiClient
+ ?.getUploadCount(sessionManager?.currentAccount!!.name)
+ ?.subscribeOn(Schedulers.io())
+ ?.observeOn(AndroidSchedulers.mainThread())?.let {
+ compositeDisposable.add(
+ it
+ .subscribe(
+ { uploadCount: Int -> this.displayUploadCount(uploadCount) },
+ { t: Throwable? -> Timber.e(t, "Fetching upload count failed") }
+ ))
+ }
+ }
+
+ private fun displayUploadCount(uploadCount: Int) {
+ if (requireActivity().isFinishing
+ || resources == null
+ ) {
+ return
+ }
+
+ (activity as MainActivity).setNumOfUploads(uploadCount)
+ }
+
+ override fun onPause() {
+ super.onPause()
+ locationManager!!.removeLocationListener(this)
+ locationManager!!.unregisterLocationManager()
+ mSensorManager!!.unregisterListener(this)
+ }
+
+ override fun onSaveInstanceState(outState: Bundle) {
+ super.onSaveInstanceState(outState)
+ }
+
+ override fun onResume() {
+ super.onResume()
+ contributionsPresenter!!.onAttachView(this)
+ locationManager!!.addLocationListener(this)
+
+ if (binding == null) {
+ return
+ }
+
+ binding!!.cardViewNearby.permissionRequestButton.setOnClickListener { v: View? ->
+ showNearbyCardPermissionRationale()
+ }
+
+ // Notification cards should only be seen on contributions list, not in media details
+ if (mediaDetailPagerFragment == null && !isUserProfile) {
+ if (store!!.getBoolean("displayNearbyCardView", true)) {
+ checkPermissionsAndShowNearbyCardView()
+
+ // Calling nearby card to keep showing it even when user clicks on it and comes back
+ try {
+ updateClosestNearbyCardViewInfo()
+ } catch (e: Exception) {
+ Timber.e(e)
+ }
+ if (binding!!.cardViewNearby.cardViewVisibilityState
+ == NearbyNotificationCardView.CardViewVisibilityState.READY
+ ) {
+ binding!!.cardViewNearby.visibility = View.VISIBLE
+ }
+ } else {
+ // Hide nearby notification card view if related shared preferences is false
+ binding!!.cardViewNearby.visibility = View.GONE
+ }
+
+ // Notification Count and Campaigns should not be set, if it is used in User Profile
+ if (!isUserProfile) {
+ setNotificationCount()
+ fetchCampaigns()
+ // Temporarily disabled, see issue [https://github.com/commons-app/apps-android-commons/issues/5847]
+ // setUploadIconVisibility();
+ setUploadIconCount()
+ }
+ }
+ mSensorManager!!.registerListener(this, mLight, SensorManager.SENSOR_DELAY_UI)
+ }
+
+ private fun checkPermissionsAndShowNearbyCardView() {
+ if (hasPermission(
+ requireActivity(),
+ arrayOf(permission.ACCESS_FINE_LOCATION)
+ )
+ ) {
+ onLocationPermissionGranted()
+ } else if (shouldShowRequestPermissionRationale(permission.ACCESS_FINE_LOCATION)
+ && store!!.getBoolean("displayLocationPermissionForCardView", true)
+ && !store!!.getBoolean("doNotAskForLocationPermission", false)
+ && ((activity as MainActivity).activeFragment == ActiveFragment.CONTRIBUTIONS)
+ ) {
+ binding!!.cardViewNearby.permissionType =
+ NearbyNotificationCardView.PermissionType.ENABLE_LOCATION_PERMISSION
+ showNearbyCardPermissionRationale()
+ }
+ }
+
+ private fun requestLocationPermission() {
+ nearbyLocationPermissionLauncher.launch(arrayOf(permission.ACCESS_FINE_LOCATION))
+ }
+
+ private fun onLocationPermissionGranted() {
+ binding!!.cardViewNearby.permissionType =
+ NearbyNotificationCardView.PermissionType.NO_PERMISSION_NEEDED
+ locationManager!!.registerLocationManager()
+ }
+
+ private fun showNearbyCardPermissionRationale() {
+ showAlertDialog(
+ requireActivity(),
+ getString(R.string.nearby_card_permission_title),
+ getString(R.string.nearby_card_permission_explanation),
+ { this.requestLocationPermission() },
+ { this.displayYouWontSeeNearbyMessage() },
+ checkBoxView
+ )
+ }
+
+ private fun displayYouWontSeeNearbyMessage() {
+ showLongToast(
+ requireActivity(),
+ resources.getString(R.string.unable_to_display_nearest_place)
+ )
+ // Set to true as the user doesn't want the app to ask for location permission anymore
+ store!!.putBoolean("doNotAskForLocationPermission", true)
+ }
+
+
+ private fun updateClosestNearbyCardViewInfo() {
+ currentLatLng = locationManager!!.getLastLocation()
+ compositeDisposable.add(Observable.fromCallable {
+ nearbyController?.loadAttractionsFromLocation(
+ currentLatLng, currentLatLng, true,
+ false
+ )
+ } // thanks to boolean, it will only return closest result
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(
+ { nearbyPlacesInfo: NearbyPlacesInfo? ->
+ this.updateNearbyNotification(
+ nearbyPlacesInfo
+ )
+ },
+ { throwable: Throwable? ->
+ Timber.d(throwable)
+ updateNearbyNotification(null)
+ })
+ )
+ }
+
+ private fun updateNearbyNotification(
+ nearbyPlacesInfo: NearbyPlacesInfo?
+ ) {
+ if (nearbyPlacesInfo?.placeList != null && nearbyPlacesInfo.placeList.size > 0) {
+ var closestNearbyPlace: Place? = null
+ // Find the first nearby place that has no image and exists
+ for (place in nearbyPlacesInfo.placeList) {
+ if (place.pic == "" && place.exists) {
+ closestNearbyPlace = place
+ break
+ }
+ }
+
+ if (closestNearbyPlace == null) {
+ binding!!.cardViewNearby.visibility = View.GONE
+ } else {
+ val distance = formatDistanceBetween(currentLatLng, closestNearbyPlace.location)
+ closestNearbyPlace.setDistance(distance)
+ direction = computeBearing(currentLatLng!!, closestNearbyPlace.location).toFloat()
+ binding!!.cardViewNearby.updateContent(closestNearbyPlace)
+ }
+ } else {
+ // Means that no close nearby place is found
+ binding!!.cardViewNearby.visibility = View.GONE
+ }
+
+ // Prevent Nearby banner from appearing in Media Details, fixing bug https://github.com/commons-app/apps-android-commons/issues/4731
+ if (mediaDetailPagerFragment != null && !contributionsListFragment!!.isVisible) {
+ binding!!.cardViewNearby.visibility = View.GONE
+ }
+ }
+
+ override fun onDestroy() {
+ try {
+ compositeDisposable.clear()
+ childFragmentManager.removeOnBackStackChangedListener(this)
+ locationManager!!.unregisterLocationManager()
+ locationManager!!.removeLocationListener(this)
+ super.onDestroy()
+ } catch (exception: IllegalArgumentException) {
+ Timber.e(exception)
+ } catch (exception: IllegalStateException) {
+ Timber.e(exception)
+ }
+ }
+
+ override fun onLocationChangedSignificantly(latLng: LatLng) {
+ // Will be called if location changed more than 1000 meter
+ updateClosestNearbyCardViewInfo()
+ }
+
+ override fun onLocationChangedSlightly(latLng: LatLng) {
+ /* Update closest nearby notification card onLocationChangedSlightly
+ */
+ try {
+ updateClosestNearbyCardViewInfo()
+ } catch (e: Exception) {
+ Timber.e(e)
+ }
+ }
+
+ override fun onLocationChangedMedium(latLng: LatLng) {
+ // Update closest nearby card view if location changed more than 500 meters
+ updateClosestNearbyCardViewInfo()
+ }
+
+ override fun onViewCreated(
+ view: View,
+ savedInstanceState: Bundle?
+ ) {
+ super.onViewCreated(view, savedInstanceState)
+ }
+
+ /**
+ * As the home screen has limited space, we have choosen to show either campaigns or WLM card.
+ * The WLM Card gets the priority over monuments, so if the WLM is going on we show that instead
+ * of campaigns on the campaigns card
+ */
+ private fun fetchCampaigns() {
+ if (Utils.isMonumentsEnabled(Date())) {
+ if (binding != null) {
+ binding!!.campaignsView.setCampaign(wlmCampaign)
+ binding!!.campaignsView.visibility = View.VISIBLE
+ }
+ } else if (store!!.getBoolean(CampaignView.CAMPAIGNS_DEFAULT_PREFERENCE, true)) {
+ presenter!!.getCampaigns()
+ } else {
+ if (binding != null) {
+ binding!!.campaignsView.visibility = View.GONE
+ }
+ }
+ }
+
+ override fun showMessage(message: String) {
+ Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
+ }
+
+ override fun showCampaigns(campaign: Campaign?) {
+ if (campaign != null && !isUserProfile) {
+ if (binding != null) {
+ binding!!.campaignsView.setCampaign(campaign)
+ }
+ }
+ }
+
+ override fun onDestroyView() {
+ super.onDestroyView()
+ presenter!!.onDetachView()
+ }
+
+ override fun notifyDataSetChanged() {
+ if (mediaDetailPagerFragment != null) {
+ mediaDetailPagerFragment!!.notifyDataSetChanged()
+ }
+ }
+
+ /**
+ * Notify the viewpager that number of items have changed.
+ */
+ override fun viewPagerNotifyDataSetChanged() {
+ if (mediaDetailPagerFragment != null) {
+ mediaDetailPagerFragment!!.notifyDataSetChanged()
+ }
+ }
+
+ /**
+ * Updates the visibility and text of the pending uploads count TextView based on the given
+ * count.
+ *
+ * @param pendingCount The number of pending uploads.
+ */
+ fun updatePendingIcon(pendingCount: Int) {
+ if (pendingUploadsCountTextView != null) {
+ if (pendingCount != 0) {
+ pendingUploadsCountTextView!!.visibility = View.VISIBLE
+ pendingUploadsCountTextView!!.text = pendingCount.toString()
+ } else {
+ pendingUploadsCountTextView!!.visibility = View.INVISIBLE
+ }
+ }
+ }
+
+ /**
+ * Updates the visibility and text of the error uploads TextView based on the given count.
+ *
+ * @param errorCount The number of error uploads.
+ */
+ fun updateErrorIcon(errorCount: Int) {
+ if (uploadsErrorTextView != null) {
+ if (errorCount != 0) {
+ uploadsErrorTextView!!.visibility = View.VISIBLE
+ uploadsErrorTextView!!.text = errorCount.toString()
+ } else {
+ uploadsErrorTextView!!.visibility = View.GONE
+ }
+ }
+ }
+
+ /**
+ * Temporarily disabled, see issue [https://github.com/commons-app/apps-android-commons/issues/5847]
+ * @param count The number of pending uploads.
+ */
+ // public void updateUploadIcon(int count) {
+ // if (pendingUploadsImageView != null) {
+ // if (count != 0) {
+ // pendingUploadsImageView.setVisibility(View.VISIBLE);
+ // } else {
+ // pendingUploadsImageView.setVisibility(View.GONE);
+ // }
+ // }
+ // }
+ /**
+ * Replace whatever is in the current contributionsFragmentContainer view with
+ * mediaDetailPagerFragment, and preserve previous state in back stack. Called when user selects
+ * a contribution.
+ */
+ override fun showDetail(position: Int, isWikipediaButtonDisplayed: Boolean) {
+ if (mediaDetailPagerFragment == null || !mediaDetailPagerFragment!!.isVisible) {
+ mediaDetailPagerFragment = MediaDetailPagerFragment.newInstance(false, true)
+ if (isUserProfile) {
+ (activity as ProfileActivity).setScroll(false)
+ }
+ showMediaDetailPagerFragment()
+ }
+ mediaDetailPagerFragment!!.showImage(position, isWikipediaButtonDisplayed)
+ }
+
+ override fun getMediaAtPosition(i: Int): Media? {
+ return contributionsListFragment!!.getMediaAtPosition(i)
+ }
+
+ override fun getTotalMediaCount(): Int {
+ return contributionsListFragment!!.totalMediaCount
+ }
+
+ override fun getContributionStateAt(position: Int): Int {
+ return contributionsListFragment!!.getContributionStateAt(position)
+ }
+
+ fun backButtonClicked(): Boolean {
+ if (mediaDetailPagerFragment != null && mediaDetailPagerFragment!!.isVisible) {
+ if (store!!.getBoolean("displayNearbyCardView", true) && !isUserProfile) {
+ if (binding!!.cardViewNearby.cardViewVisibilityState
+ == NearbyNotificationCardView.CardViewVisibilityState.READY
+ ) {
+ binding!!.cardViewNearby.visibility = View.VISIBLE
+ }
+ } else {
+ binding!!.cardViewNearby.visibility = View.GONE
+ }
+ removeFragment(mediaDetailPagerFragment!!)
+ showFragment(
+ contributionsListFragment!!, CONTRIBUTION_LIST_FRAGMENT_TAG,
+ mediaDetailPagerFragment
+ )
+ if (isUserProfile) {
+ // Fragment is associated with ProfileActivity
+ // Enable ParentViewPager Scroll
+ (activity as ProfileActivity).setScroll(true)
+ } else {
+ fetchCampaigns()
+ }
+ if (activity is MainActivity) {
+ // Fragment is associated with MainActivity
+ (activity as BaseActivity).supportActionBar
+ ?.setDisplayHomeAsUpEnabled(false)
+ (activity as MainActivity).showTabs()
+ }
+ return true
+ }
+ return false
+ }
+
+
+ /**
+ * this function updates the number of contributions
+ */
+ fun upDateUploadCount() {
+ context?.let {
+ WorkManager.getInstance(it)
+ .getWorkInfosForUniqueWorkLiveData(UploadWorker::class.java.simpleName).observe(
+ viewLifecycleOwner
+ ) { workInfos: List ->
+ if (workInfos.size > 0) {
+ setUploadCount()
+ }
+ }
+ }
+ }
+
+
+ /**
+ * Restarts the upload process for a contribution
+ *
+ * @param contribution
+ */
+ fun restartUpload(contribution: Contribution) {
+ contribution.dateUploadStarted = Calendar.getInstance().time
+ if (contribution.state == Contribution.STATE_FAILED) {
+ if (contribution.errorInfo == null) {
+ contribution.chunkInfo = null
+ contribution.transferred = 0
+ }
+ contributionsPresenter!!.checkDuplicateImageAndRestartContribution(contribution)
+ } else {
+ contribution.state = Contribution.STATE_QUEUED
+ contributionsPresenter!!.saveContribution(contribution)
+ Timber.d("Restarting for %s", contribution.toString())
+ }
+ }
+
+ /**
+ * Retry upload when it is failed
+ *
+ * @param contribution contribution to be retried
+ */
+ fun retryUpload(contribution: Contribution) {
+ if (isInternetConnectionEstablished(context)) {
+ if (contribution.state == Contribution.STATE_PAUSED) {
+ restartUpload(contribution)
+ } else if (contribution.state == Contribution.STATE_FAILED) {
+ val retries = contribution.retries
+ // TODO: Improve UX. Additional details: https://github.com/commons-app/apps-android-commons/pull/5257#discussion_r1304662562
+ /* Limit the number of retries for a failed upload
+ to handle cases like invalid filename as such uploads
+ will never be successful */
+ if (retries < MAX_RETRIES) {
+ contribution.retries = retries + 1
+ Timber.d(
+ "Retried uploading %s %d times", contribution.media.filename,
+ retries + 1
+ )
+ restartUpload(contribution)
+ } else {
+ // TODO: Show the exact reason for failure
+ Toast.makeText(
+ context,
+ R.string.retry_limit_reached, Toast.LENGTH_SHORT
+ ).show()
+ }
+ } else {
+ Timber.d("Skipping re-upload for non-failed %s", contribution.toString())
+ }
+ } else {
+ context?.let { showLongToast(it, R.string.this_function_needs_network_connection) }
+ }
+ }
+
+ /**
+ * Reload media detail fragment once media is nominated
+ *
+ * @param index item position that has been nominated
+ */
+ override fun refreshNominatedMedia(index: Int) {
+ if (mediaDetailPagerFragment != null && !contributionsListFragment!!.isVisible) {
+ removeFragment(mediaDetailPagerFragment!!)
+ mediaDetailPagerFragment = MediaDetailPagerFragment.newInstance(false, true)
+ mediaDetailPagerFragment?.showImage(index)
+ showMediaDetailPagerFragment()
+ }
+ }
+
+ /**
+ * When the device rotates, rotate the Nearby banner's compass arrow in tandem.
+ */
+ override fun onSensorChanged(event: SensorEvent) {
+ val rotateDegree = Math.round(event.values[0]).toFloat()
+ binding!!.cardViewNearby.rotateCompass(rotateDegree, direction)
+ }
+
+ override fun onAccuracyChanged(sensor: Sensor, accuracy: Int) {
+ // Nothing to do.
+ }
+
+ companion object {
+ private const val CONTRIBUTION_LIST_FRAGMENT_TAG = "ContributionListFragmentTag"
+ const val MEDIA_DETAIL_PAGER_FRAGMENT_TAG: String = "MediaDetailFragmentTag"
+ private const val MAX_RETRIES = 10
+
+ @JvmStatic
+ fun newInstance(): ContributionsFragment {
+ val fragment = ContributionsFragment()
+ fragment.retainInstance = true
+ return fragment
+ }
+ }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java
deleted file mode 100644
index 3f9e8d5413..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java
+++ /dev/null
@@ -1,77 +0,0 @@
- package fr.free.nrw.commons.contributions;
-
-import android.view.LayoutInflater;
-import android.view.ViewGroup;
-import androidx.annotation.NonNull;
-import androidx.paging.PagedListAdapter;
-import androidx.recyclerview.widget.DiffUtil;
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.media.MediaClient;
-
- /**
- * Represents The View Adapter for the List of Contributions
- */
-public class ContributionsListAdapter extends
- PagedListAdapter {
-
- private final Callback callback;
- private final MediaClient mediaClient;
-
- ContributionsListAdapter(final Callback callback,
- final MediaClient mediaClient) {
- super(DIFF_CALLBACK);
- this.callback = callback;
- this.mediaClient = mediaClient;
- }
-
- /**
- * Uses DiffUtil to calculate the changes in the list
- * It has methods that check ID and the content of the items to determine if its a new item
- */
- private static final DiffUtil.ItemCallback DIFF_CALLBACK =
- new DiffUtil.ItemCallback() {
- @Override
- public boolean areItemsTheSame(final Contribution oldContribution, final Contribution newContribution) {
- return oldContribution.getPageId().equals(newContribution.getPageId());
- }
-
- @Override
- public boolean areContentsTheSame(final Contribution oldContribution, final Contribution newContribution) {
- return oldContribution.equals(newContribution);
- }
- };
-
- /**
- * Initializes the view holder with contribution data
- */
- @Override
- public void onBindViewHolder(@NonNull ContributionViewHolder holder, int position) {
- holder.init(position, getItem(position));
- }
-
- Contribution getContributionForPosition(final int position) {
- return getItem(position);
- }
-
- /**
- * Creates the new View Holder which will be used to display items(contributions) using the
- * onBindViewHolder(viewHolder,position)
- */
- @NonNull
- @Override
- public ContributionViewHolder onCreateViewHolder(@NonNull final ViewGroup parent,
- final int viewType) {
- final ContributionViewHolder viewHolder = new ContributionViewHolder(
- LayoutInflater.from(parent.getContext())
- .inflate(R.layout.layout_contribution, parent, false),
- callback, mediaClient);
- return viewHolder;
- }
-
- public interface Callback {
-
- void openMediaDetail(int contribution, boolean isWikipediaPageExists);
-
- void addImageToWikipedia(Contribution contribution);
- }
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.kt
new file mode 100644
index 0000000000..e5f721721e
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.kt
@@ -0,0 +1,77 @@
+package fr.free.nrw.commons.contributions
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.paging.PagedListAdapter
+import androidx.recyclerview.widget.DiffUtil
+import fr.free.nrw.commons.MediaDataExtractor
+import fr.free.nrw.commons.R
+import fr.free.nrw.commons.media.MediaClient
+import io.reactivex.disposables.CompositeDisposable
+
+/**
+ * Represents The View Adapter for the List of Contributions
+ */
+class ContributionsListAdapter internal constructor(
+ private val callback: Callback,
+ private val mediaClient: MediaClient,
+ private val mediaDataExtractor: MediaDataExtractor,
+ private val compositeDisposable: CompositeDisposable
+) : PagedListAdapter(DIFF_CALLBACK) {
+ /**
+ * Initializes the view holder with contribution data
+ */
+ override fun onBindViewHolder(holder: ContributionViewHolder, position: Int) {
+ holder.init(position, getItem(position))
+ holder.updateAttribution()
+ }
+
+ fun getContributionForPosition(position: Int): Contribution? {
+ return getItem(position)
+ }
+
+ /**
+ * Creates the new View Holder which will be used to display items(contributions) using the
+ * onBindViewHolder(viewHolder,position)
+ */
+ override fun onCreateViewHolder(
+ parent: ViewGroup,
+ viewType: Int
+ ): ContributionViewHolder {
+ val viewHolder = ContributionViewHolder(
+ LayoutInflater.from(parent.context)
+ .inflate(R.layout.layout_contribution, parent, false),
+ callback, compositeDisposable, mediaClient, mediaDataExtractor
+ )
+ return viewHolder
+ }
+
+ interface Callback {
+ fun openMediaDetail(contribution: Int, isWikipediaPageExists: Boolean)
+
+ fun addImageToWikipedia(contribution: Contribution?)
+ }
+
+ companion object {
+ /**
+ * Uses DiffUtil to calculate the changes in the list
+ * It has methods that check ID and the content of the items to determine if its a new item
+ */
+ private val DIFF_CALLBACK: DiffUtil.ItemCallback =
+ object : DiffUtil.ItemCallback() {
+ override fun areItemsTheSame(
+ oldContribution: Contribution,
+ newContribution: Contribution
+ ): Boolean {
+ return oldContribution.pageId == newContribution.pageId
+ }
+
+ override fun areContentsTheSame(
+ oldContribution: Contribution,
+ newContribution: Contribution
+ ): Boolean {
+ return oldContribution == newContribution
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListContract.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListContract.java
deleted file mode 100644
index 58bd2783dd..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListContract.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package fr.free.nrw.commons.contributions;
-
-import fr.free.nrw.commons.BasePresenter;
-
-/**
- * The contract for Contributions list View & Presenter
- */
-public class ContributionsListContract {
-
- public interface View {
-
- void showWelcomeTip(boolean numberOfUploads);
-
- void showProgress(boolean shouldShow);
-
- void showNoContributionsUI(boolean shouldShow);
- }
-
- public interface UserActionListener extends BasePresenter {
- }
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListContract.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListContract.kt
new file mode 100644
index 0000000000..c6b8dd8a89
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListContract.kt
@@ -0,0 +1,21 @@
+package fr.free.nrw.commons.contributions
+
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import fr.free.nrw.commons.BasePresenter
+
+/**
+ * The contract for Contributions list View & Presenter
+ */
+class ContributionsListContract {
+ interface View {
+ fun showWelcomeTip(numberOfUploads: Boolean)
+
+ fun showProgress(shouldShow: Boolean)
+
+ fun showNoContributionsUI(shouldShow: Boolean)
+ }
+
+ interface UserActionListener : BasePresenter {
+ fun refreshList(swipeRefreshLayout: SwipeRefreshLayout?)
+ }
+}
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
deleted file mode 100644
index 509d1eb95b..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
+++ /dev/null
@@ -1,525 +0,0 @@
-package fr.free.nrw.commons.contributions;
-
-import static android.view.View.GONE;
-import static android.view.View.VISIBLE;
-import static fr.free.nrw.commons.di.NetworkingModule.NAMED_LANGUAGE_WIKI_PEDIA_WIKI_SITE;
-
-import android.Manifest.permission;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Configuration;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Parcelable;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.widget.LinearLayout;
-import androidx.activity.result.ActivityResultCallback;
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts.RequestMultiplePermissions;
-import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.FragmentManager;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
-import androidx.recyclerview.widget.RecyclerView.ItemAnimator;
-import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener;
-import androidx.recyclerview.widget.SimpleItemAnimator;
-import fr.free.nrw.commons.Media;
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.Utils;
-import fr.free.nrw.commons.auth.SessionManager;
-import fr.free.nrw.commons.contributions.ContributionsListAdapter.Callback;
-import fr.free.nrw.commons.databinding.FragmentContributionsListBinding;
-import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
-import fr.free.nrw.commons.media.MediaClient;
-import fr.free.nrw.commons.profile.ProfileActivity;
-import fr.free.nrw.commons.utils.DialogUtil;
-import fr.free.nrw.commons.utils.SystemThemeUtils;
-import fr.free.nrw.commons.utils.ViewUtil;
-import java.util.Map;
-import java.util.Objects;
-import javax.inject.Inject;
-import javax.inject.Named;
-import org.apache.commons.lang3.StringUtils;
-import fr.free.nrw.commons.wikidata.model.WikiSite;
-
-
-/**
- * Created by root on 01.06.2018.
- */
-
-public class ContributionsListFragment extends CommonsDaggerSupportFragment implements
- ContributionsListContract.View, Callback,
- WikipediaInstructionsDialogFragment.Callback {
-
- private static final String RV_STATE = "rv_scroll_state";
-
- @Inject
- SystemThemeUtils systemThemeUtils;
- @Inject
- ContributionController controller;
- @Inject
- MediaClient mediaClient;
- @Named(NAMED_LANGUAGE_WIKI_PEDIA_WIKI_SITE)
- @Inject
- WikiSite languageWikipediaSite;
- @Inject
- ContributionsListPresenter contributionsListPresenter;
- @Inject
- SessionManager sessionManager;
-
- private FragmentContributionsListBinding binding;
- private Animation fab_close;
- private Animation fab_open;
- private Animation rotate_forward;
- private Animation rotate_backward;
- private boolean isFabOpen;
- @VisibleForTesting
- protected RecyclerView rvContributionsList;
-
- @VisibleForTesting
- protected ContributionsListAdapter adapter;
-
- @Nullable
- @VisibleForTesting
- protected Callback callback;
-
- private final int SPAN_COUNT_LANDSCAPE = 3;
- private final int SPAN_COUNT_PORTRAIT = 1;
-
- private int contributionsSize;
- private String userName;
-
- private final ActivityResultLauncher galleryPickLauncherForResult =
- registerForActivityResult(new StartActivityForResult(),
- result -> {
- 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);
- });
- });
-
- private final ActivityResultLauncher cameraPickLauncherForResult =
- registerForActivityResult(new StartActivityForResult(),
- result -> {
- controller.handleActivityResultWithCallback(requireActivity(), callbacks -> {
- controller.onPictureReturnedFromCamera(result, requireActivity(), callbacks);
- });
- });
-
- private ActivityResultLauncher inAppCameraLocationPermissionLauncher = registerForActivityResult(
- new RequestMultiplePermissions(),
- new ActivityResultCallback>() {
- @Override
- public void onActivityResult(Map result) {
- boolean areAllGranted = true;
- for (final boolean b : result.values()) {
- areAllGranted = areAllGranted && b;
- }
-
- if (areAllGranted) {
- controller.locationPermissionCallback.onLocationPermissionGranted();
- } else {
- if (shouldShowRequestPermissionRationale(permission.ACCESS_FINE_LOCATION)) {
- controller.handleShowRationaleFlowCameraLocation(getActivity(),
- inAppCameraLocationPermissionLauncher, cameraPickLauncherForResult);
- } else {
- controller.locationPermissionCallback.onLocationPermissionDenied(
- getActivity().getString(
- R.string.in_app_camera_location_permission_denied));
- }
- }
- }
- });
-
-
- @Override
- public void onCreate(
- @Nullable @org.jetbrains.annotations.Nullable final Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- //Now that we are allowing this fragment to be started for
- // any userName- we expect it to be passed as an argument
- if (getArguments() != null) {
- userName = getArguments().getString(ProfileActivity.KEY_USERNAME);
- }
-
- if (StringUtils.isEmpty(userName)) {
- userName = sessionManager.getUserName();
- }
- }
-
- @Override
- public View onCreateView(
- final LayoutInflater inflater, @Nullable final ViewGroup container,
- @Nullable final Bundle savedInstanceState) {
- binding = FragmentContributionsListBinding.inflate(
- inflater, container, false
- );
- rvContributionsList = binding.contributionsList;
-
- contributionsListPresenter.onAttachView(this);
- binding.fabCustomGallery.setOnClickListener(v -> launchCustomSelector());
- binding.fabCustomGallery.setOnLongClickListener(view -> {
- ViewUtil.showShortToast(getContext(), R.string.custom_selector_title);
- return true;
- });
-
- if (Objects.equals(sessionManager.getUserName(), userName)) {
- binding.tvContributionsOfUser.setVisibility(GONE);
- binding.fabLayout.setVisibility(VISIBLE);
- } else {
- binding.tvContributionsOfUser.setVisibility(VISIBLE);
- binding.tvContributionsOfUser.setText(
- getString(R.string.contributions_of_user, userName));
- binding.fabLayout.setVisibility(GONE);
- }
-
- initAdapter();
-
- return binding.getRoot();
- }
-
- @Override
- public void onDestroyView() {
- binding = null;
- super.onDestroyView();
- }
-
- @Override
- public void onAttach(Context context) {
- super.onAttach(context);
- if (getParentFragment() != null && getParentFragment() instanceof ContributionsFragment) {
- callback = ((ContributionsFragment) getParentFragment());
- }
- }
-
- @Override
- public void onDetach() {
- super.onDetach();
- callback = null;//To avoid possible memory leak
- }
-
- private void initAdapter() {
- adapter = new ContributionsListAdapter(this, mediaClient);
- }
-
- @Override
- public void onViewCreated(final View view, @Nullable final Bundle savedInstanceState) {
- super.onViewCreated(view, savedInstanceState);
- initRecyclerView();
- initializeAnimations();
- setListeners();
- }
-
- private void initRecyclerView() {
- final GridLayoutManager layoutManager = new GridLayoutManager(getContext(),
- getSpanCount(getResources().getConfiguration().orientation));
- rvContributionsList.setLayoutManager(layoutManager);
-
- //Setting flicker animation of recycler view to false.
- final ItemAnimator animator = rvContributionsList.getItemAnimator();
- if (animator instanceof SimpleItemAnimator) {
- ((SimpleItemAnimator) animator).setSupportsChangeAnimations(false);
- }
-
- contributionsListPresenter.setup(userName,
- Objects.equals(sessionManager.getUserName(), userName));
- contributionsListPresenter.contributionList.observe(getViewLifecycleOwner(), list -> {
- contributionsSize = list.size();
- adapter.submitList(list);
- if (callback != null) {
- callback.notifyDataSetChanged();
- }
- });
- rvContributionsList.setAdapter(adapter);
- adapter.registerAdapterDataObserver(new AdapterDataObserver() {
- @Override
- public void onItemRangeInserted(int positionStart, int itemCount) {
- super.onItemRangeInserted(positionStart, itemCount);
- contributionsSize = adapter.getItemCount();
- if (callback != null) {
- callback.notifyDataSetChanged();
- }
- if (itemCount > 0 && positionStart == 0) {
- if (adapter.getContributionForPosition(positionStart) != null) {
- rvContributionsList
- .scrollToPosition(0);//Newly upload items are always added to the top
- }
- }
- }
-
- /**
- * Called whenever items in the list have changed
- * Calls viewPagerNotifyDataSetChanged() that will notify the viewpager
- */
- @Override
- public void onItemRangeChanged(final int positionStart, final int itemCount) {
- super.onItemRangeChanged(positionStart, itemCount);
- if (callback != null) {
- callback.viewPagerNotifyDataSetChanged();
- }
- }
- });
-
- //Fab close on touch outside (Scrolling or taping on item triggers this action).
- rvContributionsList.addOnItemTouchListener(new OnItemTouchListener() {
-
- /**
- * Silently observe and/or take over touch events sent to the RecyclerView before
- * they are handled by either the RecyclerView itself or its child views.
- */
- @Override
- public boolean onInterceptTouchEvent(@NonNull RecyclerView rv, @NonNull MotionEvent e) {
- if (e.getAction() == MotionEvent.ACTION_DOWN) {
- if (isFabOpen) {
- animateFAB(isFabOpen);
- }
- }
- return false;
- }
-
- /**
- * Process a touch event as part of a gesture that was claimed by returning true
- * from a previous call to {@link #onInterceptTouchEvent}.
- *
- * @param rv
- * @param e MotionEvent describing the touch event. All coordinates are in the
- * RecyclerView's coordinate system.
- */
- @Override
- public void onTouchEvent(@NonNull RecyclerView rv, @NonNull MotionEvent e) {
- //required abstract method DO NOT DELETE
- }
-
- /**
- * Called when a child of RecyclerView does not want RecyclerView and its ancestors
- * to intercept touch events with {@link ViewGroup#onInterceptTouchEvent(MotionEvent)}.
- *
- * @param disallowIntercept True if the child does not want the parent to intercept
- * touch events.
- */
- @Override
- public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {
- //required abstract method DO NOT DELETE
- }
-
- });
- }
-
- private int getSpanCount(final int orientation) {
- return orientation == Configuration.ORIENTATION_LANDSCAPE ?
- SPAN_COUNT_LANDSCAPE : SPAN_COUNT_PORTRAIT;
- }
-
- @Override
- public void onConfigurationChanged(final Configuration newConfig) {
- super.onConfigurationChanged(newConfig);
- // check orientation
- binding.fabLayout.setOrientation(
- newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE ?
- LinearLayout.HORIZONTAL : LinearLayout.VERTICAL);
- rvContributionsList
- .setLayoutManager(
- new GridLayoutManager(getContext(), getSpanCount(newConfig.orientation)));
- }
-
- private void initializeAnimations() {
- fab_open = AnimationUtils.loadAnimation(getActivity(), R.anim.fab_open);
- fab_close = AnimationUtils.loadAnimation(getActivity(), R.anim.fab_close);
- rotate_forward = AnimationUtils.loadAnimation(getActivity(), R.anim.rotate_forward);
- rotate_backward = AnimationUtils.loadAnimation(getActivity(), R.anim.rotate_backward);
- }
-
- private void setListeners() {
- binding.fabPlus.setOnClickListener(view -> animateFAB(isFabOpen));
- binding.fabCamera.setOnClickListener(view -> {
- controller.initiateCameraPick(getActivity(), inAppCameraLocationPermissionLauncher, cameraPickLauncherForResult);
- animateFAB(isFabOpen);
- });
- binding.fabCamera.setOnLongClickListener(view -> {
- ViewUtil.showShortToast(getContext(), R.string.add_contribution_from_camera);
- return true;
- });
- binding.fabGallery.setOnClickListener(view -> {
- controller.initiateGalleryPick(getActivity(), galleryPickLauncherForResult, true);
- animateFAB(isFabOpen);
- });
- binding.fabGallery.setOnLongClickListener(view -> {
- ViewUtil.showShortToast(getContext(), R.string.menu_from_gallery);
- return true;
- });
- }
-
- /**
- * Launch Custom Selector.
- */
- protected void launchCustomSelector() {
- controller.initiateCustomGalleryPickWithPermission(getActivity(), customSelectorLauncherForResult);
- animateFAB(isFabOpen);
- }
-
- public void scrollToTop() {
- rvContributionsList.smoothScrollToPosition(0);
- }
-
- private void animateFAB(final boolean isFabOpen) {
- this.isFabOpen = !isFabOpen;
- if (binding.fabPlus.isShown()) {
- if (isFabOpen) {
- binding.fabPlus.startAnimation(rotate_backward);
- binding.fabCamera.startAnimation(fab_close);
- binding.fabGallery.startAnimation(fab_close);
- binding.fabCustomGallery.startAnimation(fab_close);
- binding.fabCamera.hide();
- binding.fabGallery.hide();
- binding.fabCustomGallery.hide();
- } else {
- binding.fabPlus.startAnimation(rotate_forward);
- binding.fabCamera.startAnimation(fab_open);
- binding.fabGallery.startAnimation(fab_open);
- binding.fabCustomGallery.startAnimation(fab_open);
- binding.fabCamera.show();
- binding.fabGallery.show();
- binding.fabCustomGallery.show();
- }
- this.isFabOpen = !isFabOpen;
- }
- }
-
- /**
- * Shows welcome message if user has no contributions yet i.e. new user.
- */
- @Override
- public void showWelcomeTip(final boolean shouldShow) {
- binding.noContributionsYet.setVisibility(shouldShow ? VISIBLE : GONE);
- }
-
- /**
- * Responsible to set progress bar invisible and visible
- *
- * @param shouldShow True when contributions list should be hidden.
- */
- @Override
- public void showProgress(final boolean shouldShow) {
- binding.loadingContributionsProgressBar.setVisibility(shouldShow ? VISIBLE : GONE);
- }
-
- @Override
- public void showNoContributionsUI(final boolean shouldShow) {
- binding.noContributionsYet.setVisibility(shouldShow ? VISIBLE : GONE);
- }
-
- @Override
- public void onSaveInstanceState(@NonNull Bundle outState) {
- super.onSaveInstanceState(outState);
- final GridLayoutManager layoutManager = (GridLayoutManager) rvContributionsList
- .getLayoutManager();
- outState.putParcelable(RV_STATE, layoutManager.onSaveInstanceState());
- }
-
- @Override
- public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
- super.onViewStateRestored(savedInstanceState);
- if (null != savedInstanceState) {
- final Parcelable savedRecyclerLayoutState = savedInstanceState.getParcelable(RV_STATE);
- rvContributionsList.getLayoutManager().onRestoreInstanceState(savedRecyclerLayoutState);
- }
- }
-
- @Override
- public void openMediaDetail(final int position, boolean isWikipediaButtonDisplayed) {
- if (null != callback) {//Just being safe, ideally they won't be called when detached
- callback.showDetail(position, isWikipediaButtonDisplayed);
- }
- }
-
- /**
- * Handle callback for wikipedia icon clicked
- *
- * @param contribution
- */
- @Override
- public void addImageToWikipedia(Contribution contribution) {
- DialogUtil.showAlertDialog(getActivity(),
- getString(R.string.add_picture_to_wikipedia_article_title),
- getString(R.string.add_picture_to_wikipedia_article_desc),
- () -> {
- showAddImageToWikipediaInstructions(contribution);
- }, () -> {
- // do nothing
- });
- }
-
- /**
- * Display confirmation dialog with instructions when the user tries to add image to wikipedia
- *
- * @param contribution
- */
- private void showAddImageToWikipediaInstructions(Contribution contribution) {
- FragmentManager fragmentManager = getFragmentManager();
- WikipediaInstructionsDialogFragment fragment = WikipediaInstructionsDialogFragment
- .newInstance(contribution);
- fragment.setCallback(this::onConfirmClicked);
- fragment.show(fragmentManager, "WikimediaFragment");
- }
-
-
- public Media getMediaAtPosition(final int i) {
- if (adapter.getContributionForPosition(i) != null) {
- return adapter.getContributionForPosition(i).getMedia();
- }
- return null;
- }
-
- public int getTotalMediaCount() {
- return contributionsSize;
- }
-
- /**
- * Open the editor for the language Wikipedia
- *
- * @param contribution
- */
- @Override
- public void onConfirmClicked(@Nullable Contribution contribution, boolean copyWikicode) {
- if (copyWikicode) {
- String wikicode = contribution.getMedia().getWikiCode();
- Utils.copy("wikicode", wikicode, getContext());
- }
-
- final String url =
- languageWikipediaSite.mobileUrl() + "/wiki/" + contribution.getWikidataPlace()
- .getWikipediaPageTitle();
- Utils.handleWebUrl(getContext(), Uri.parse(url));
- }
-
- public Integer getContributionStateAt(int position) {
- return adapter.getContributionForPosition(position).getState();
- }
-
- public interface Callback {
-
- void notifyDataSetChanged();
-
- void showDetail(int position, boolean isWikipediaButtonDisplayed);
-
- // Notify the viewpager that number of items have changed.
- void viewPagerNotifyDataSetChanged();
-
- }
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.kt
new file mode 100644
index 0000000000..9ecb35b249
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.kt
@@ -0,0 +1,556 @@
+package fr.free.nrw.commons.contributions
+
+import android.Manifest.permission
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.content.res.Configuration
+import android.net.Uri
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import android.view.animation.Animation
+import android.view.animation.AnimationUtils
+import android.widget.LinearLayout
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts.RequestMultiplePermissions
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
+import androidx.annotation.VisibleForTesting
+import androidx.paging.PagedList
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver
+import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener
+import androidx.recyclerview.widget.SimpleItemAnimator
+import fr.free.nrw.commons.Media
+import fr.free.nrw.commons.MediaDataExtractor
+import fr.free.nrw.commons.R
+import fr.free.nrw.commons.Utils
+import fr.free.nrw.commons.auth.SessionManager
+import fr.free.nrw.commons.contributions.WikipediaInstructionsDialogFragment.Companion.newInstance
+import fr.free.nrw.commons.databinding.FragmentContributionsListBinding
+import fr.free.nrw.commons.di.CommonsDaggerSupportFragment
+import fr.free.nrw.commons.di.NetworkingModule
+import fr.free.nrw.commons.filepicker.FilePicker
+import fr.free.nrw.commons.media.MediaClient
+import fr.free.nrw.commons.profile.ProfileActivity
+import fr.free.nrw.commons.utils.DialogUtil.showAlertDialog
+import fr.free.nrw.commons.utils.SystemThemeUtils
+import fr.free.nrw.commons.utils.ViewUtil.showShortToast
+import fr.free.nrw.commons.wikidata.model.WikiSite
+import org.apache.commons.lang3.StringUtils
+import javax.inject.Inject
+import javax.inject.Named
+
+
+/**
+ * Created by root on 01.06.2018.
+ */
+class ContributionsListFragment : CommonsDaggerSupportFragment(), ContributionsListContract.View,
+ ContributionsListAdapter.Callback, WikipediaInstructionsDialogFragment.Callback {
+ @JvmField
+ @Inject
+ var systemThemeUtils: SystemThemeUtils? = null
+
+ @JvmField
+ @Inject
+ var controller: ContributionController? = null
+
+ @JvmField
+ @Inject
+ var mediaClient: MediaClient? = null
+
+ @JvmField
+ @Inject
+ var mediaDataExtractor: MediaDataExtractor? = null
+
+ @JvmField
+ @Named(NetworkingModule.NAMED_LANGUAGE_WIKI_PEDIA_WIKI_SITE)
+ @Inject
+ var languageWikipediaSite: WikiSite? = null
+
+ @JvmField
+ @Inject
+ var contributionsListPresenter: ContributionsListPresenter? = null
+
+ @JvmField
+ @Inject
+ var sessionManager: SessionManager? = null
+
+ private var binding: FragmentContributionsListBinding? = null
+ private var fab_close: Animation? = null
+ private var fab_open: Animation? = null
+ private var rotate_forward: Animation? = null
+ private var rotate_backward: Animation? = null
+ private var isFabOpen = false
+
+ private lateinit var inAppCameraLocationPermissionLauncher: ActivityResultLauncher>
+
+ @VisibleForTesting
+ var rvContributionsList: RecyclerView? = null
+
+ @VisibleForTesting
+ var adapter: ContributionsListAdapter? = null
+
+ @VisibleForTesting
+ var callback: Callback? = null
+
+ private val SPAN_COUNT_LANDSCAPE = 3
+ private val SPAN_COUNT_PORTRAIT = 1
+
+ private var contributionsSize = 0
+ private var userName: String? = null
+
+ private val galleryPickLauncherForResult = registerForActivityResult(
+ StartActivityForResult()
+ ) { result: ActivityResult? ->
+ controller!!.handleActivityResultWithCallback(requireActivity()
+ ) { callbacks: FilePicker.Callbacks? ->
+ controller!!.onPictureReturnedFromGallery(
+ result!!, requireActivity(), callbacks!!
+ )
+ }
+ }
+
+ private val customSelectorLauncherForResult = registerForActivityResult(
+ StartActivityForResult()
+ ) { result: ActivityResult? ->
+ controller!!.handleActivityResultWithCallback(requireActivity()
+ ) { callbacks: FilePicker.Callbacks? ->
+ controller!!.onPictureReturnedFromCustomSelector(
+ result!!, requireActivity(), callbacks!!
+ )
+ }
+ }
+
+ private val cameraPickLauncherForResult = registerForActivityResult(
+ StartActivityForResult()
+ ) { result: ActivityResult? ->
+ controller!!.handleActivityResultWithCallback(requireActivity()
+ ) { callbacks: FilePicker.Callbacks? ->
+ controller!!.onPictureReturnedFromCamera(
+ result!!, requireActivity(), callbacks!!
+ )
+ }
+ }
+
+ @SuppressLint("NewApi")
+ override fun onCreate(
+ savedInstanceState: Bundle?
+ ) {
+ super.onCreate(savedInstanceState)
+ //Now that we are allowing this fragment to be started for
+ // any userName- we expect it to be passed as an argument
+ if (arguments != null) {
+ userName = requireArguments().getString(ProfileActivity.KEY_USERNAME)
+ }
+
+ if (StringUtils.isEmpty(userName)) {
+ userName = sessionManager!!.userName
+ }
+ inAppCameraLocationPermissionLauncher =
+ registerForActivityResult(RequestMultiplePermissions()) { result ->
+ val areAllGranted = result.values.all { it }
+
+ if (areAllGranted) {
+ controller?.locationPermissionCallback?.onLocationPermissionGranted()
+ } else {
+ activity?.let { currentActivity ->
+ if (currentActivity.shouldShowRequestPermissionRationale(permission.ACCESS_FINE_LOCATION)) {
+ controller?.handleShowRationaleFlowCameraLocation(
+ currentActivity,
+ inAppCameraLocationPermissionLauncher, // Pass launcher
+ cameraPickLauncherForResult
+ )
+ } else {
+ controller?.locationPermissionCallback?.onLocationPermissionDenied(
+ currentActivity.getString(R.string.in_app_camera_location_permission_denied)
+ )
+ }
+ }
+ }
+ }
+ }
+
+ override fun onCreateView(
+ inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? {
+ binding = FragmentContributionsListBinding.inflate(
+ inflater, container, false
+ )
+ rvContributionsList = binding!!.contributionsList
+
+ contributionsListPresenter!!.onAttachView(this)
+ binding!!.fabCustomGallery.setOnClickListener { v: View? -> launchCustomSelector() }
+ binding!!.fabCustomGallery.setOnLongClickListener { view: View? ->
+ showShortToast(context, fr.free.nrw.commons.R.string.custom_selector_title)
+ true
+ }
+
+ if (sessionManager!!.userName == userName) {
+ binding!!.tvContributionsOfUser.visibility = View.GONE
+ binding!!.fabLayout.visibility = View.VISIBLE
+ } else {
+ binding!!.tvContributionsOfUser.visibility = View.VISIBLE
+ binding!!.tvContributionsOfUser.text =
+ getString(fr.free.nrw.commons.R.string.contributions_of_user, userName)
+ binding!!.fabLayout.visibility = View.GONE
+ }
+
+ initAdapter()
+
+ // pull down to refresh only enabled for self user.
+ if (sessionManager!!.userName == userName) {
+ binding!!.swipeRefreshLayout.setOnRefreshListener {
+ contributionsListPresenter!!.refreshList(
+ binding!!.swipeRefreshLayout
+ )
+ }
+ } else {
+ binding!!.swipeRefreshLayout.isEnabled = false
+ }
+
+ return binding!!.root
+ }
+
+ override fun onDestroyView() {
+ binding = null
+ super.onDestroyView()
+ }
+
+ override fun onAttach(context: Context) {
+ super.onAttach(context)
+ if (parentFragment != null && parentFragment is ContributionsFragment) {
+ callback = (parentFragment as ContributionsFragment)
+ }
+ }
+
+ override fun onDetach() {
+ super.onDetach()
+ callback = null //To avoid possible memory leak
+ }
+
+ private fun initAdapter() {
+ adapter = ContributionsListAdapter(this, mediaClient!!, mediaDataExtractor!!, compositeDisposable)
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ initRecyclerView()
+ initializeAnimations()
+ setListeners()
+ }
+
+ private fun initRecyclerView() {
+ val layoutManager = GridLayoutManager(
+ context,
+ getSpanCount(resources.configuration.orientation)
+ )
+ rvContributionsList!!.layoutManager = layoutManager
+
+ //Setting flicker animation of recycler view to false.
+ val animator = rvContributionsList!!.itemAnimator
+ if (animator is SimpleItemAnimator) {
+ animator.supportsChangeAnimations = false
+ }
+
+ contributionsListPresenter!!.setup(
+ userName,
+ sessionManager!!.userName == userName
+ )
+ contributionsListPresenter!!.contributionList?.observe(
+ viewLifecycleOwner
+ ) { list: PagedList? ->
+ if (list != null) {
+ contributionsSize = list.size
+ }
+ adapter!!.submitList(list)
+ if (callback != null) {
+ callback!!.notifyDataSetChanged()
+ }
+ }
+ rvContributionsList!!.adapter = adapter
+ adapter!!.registerAdapterDataObserver(object : AdapterDataObserver() {
+ override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
+ super.onItemRangeInserted(positionStart, itemCount)
+ contributionsSize = adapter!!.itemCount
+ if (callback != null) {
+ callback!!.notifyDataSetChanged()
+ }
+ if (itemCount > 0 && positionStart == 0) {
+ if (adapter!!.getContributionForPosition(positionStart) != null) {
+ rvContributionsList!!
+ .scrollToPosition(0) //Newly upload items are always added to the top
+ }
+ }
+ }
+
+ /**
+ * Called whenever items in the list have changed
+ * Calls viewPagerNotifyDataSetChanged() that will notify the viewpager
+ */
+ override fun onItemRangeChanged(positionStart: Int, itemCount: Int) {
+ super.onItemRangeChanged(positionStart, itemCount)
+ if (callback != null) {
+ callback!!.viewPagerNotifyDataSetChanged()
+ }
+ }
+ })
+
+ //Fab close on touch outside (Scrolling or taping on item triggers this action).
+ rvContributionsList!!.addOnItemTouchListener(object : OnItemTouchListener {
+ /**
+ * Silently observe and/or take over touch events sent to the RecyclerView before
+ * they are handled by either the RecyclerView itself or its child views.
+ */
+ override fun onInterceptTouchEvent(rv: RecyclerView, e: MotionEvent): Boolean {
+ if (e.action == MotionEvent.ACTION_DOWN) {
+ if (isFabOpen) {
+ animateFAB(isFabOpen)
+ }
+ }
+ return false
+ }
+
+ /**
+ * Process a touch event as part of a gesture that was claimed by returning true
+ * from a previous call to [.onInterceptTouchEvent].
+ *
+ * @param rv
+ * @param e MotionEvent describing the touch event. All coordinates are in the
+ * RecyclerView's coordinate system.
+ */
+ override fun onTouchEvent(rv: RecyclerView, e: MotionEvent) {
+ //required abstract method DO NOT DELETE
+ }
+
+ /**
+ * Called when a child of RecyclerView does not want RecyclerView and its ancestors
+ * to intercept touch events with [ViewGroup.onInterceptTouchEvent].
+ *
+ * @param disallowIntercept True if the child does not want the parent to intercept
+ * touch events.
+ */
+ override fun onRequestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
+ //required abstract method DO NOT DELETE
+ }
+ })
+ }
+
+ private fun getSpanCount(orientation: Int): Int {
+ return if (orientation == Configuration.ORIENTATION_LANDSCAPE) SPAN_COUNT_LANDSCAPE else SPAN_COUNT_PORTRAIT
+ }
+
+ override fun onConfigurationChanged(newConfig: Configuration) {
+ super.onConfigurationChanged(newConfig)
+ // check orientation
+ binding!!.fabLayout.orientation =
+ if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) LinearLayout.HORIZONTAL else LinearLayout.VERTICAL
+ rvContributionsList
+ ?.setLayoutManager(
+ GridLayoutManager(context, getSpanCount(newConfig.orientation))
+ )
+ }
+
+ private fun initializeAnimations() {
+ fab_open = AnimationUtils.loadAnimation(activity, fr.free.nrw.commons.R.anim.fab_open)
+ fab_close = AnimationUtils.loadAnimation(activity, fr.free.nrw.commons.R.anim.fab_close)
+ rotate_forward = AnimationUtils.loadAnimation(activity, fr.free.nrw.commons.R.anim.rotate_forward)
+ rotate_backward = AnimationUtils.loadAnimation(activity, fr.free.nrw.commons.R.anim.rotate_backward)
+ }
+
+ private fun setListeners() {
+ binding!!.fabPlus.setOnClickListener { view: View? -> animateFAB(isFabOpen) }
+ binding!!.fabCamera.setOnClickListener { view: View? ->
+ controller!!.initiateCameraPick(
+ requireActivity(),
+ inAppCameraLocationPermissionLauncher,
+ cameraPickLauncherForResult
+ )
+ animateFAB(isFabOpen)
+ }
+ binding!!.fabCamera.setOnLongClickListener { view: View? ->
+ showShortToast(
+ context,
+ fr.free.nrw.commons.R.string.add_contribution_from_camera
+ )
+ true
+ }
+ binding!!.fabGallery.setOnClickListener { view: View? ->
+ controller!!.initiateGalleryPick(requireActivity(), galleryPickLauncherForResult, true)
+ animateFAB(isFabOpen)
+ }
+ binding!!.fabGallery.setOnLongClickListener { view: View? ->
+ showShortToast(context, fr.free.nrw.commons.R.string.menu_from_gallery)
+ true
+ }
+ }
+
+ /**
+ * Launch Custom Selector.
+ */
+ protected fun launchCustomSelector() {
+ controller!!.initiateCustomGalleryPickWithPermission(
+ requireActivity(),
+ customSelectorLauncherForResult
+ )
+ animateFAB(isFabOpen)
+ }
+
+ fun scrollToTop() {
+ rvContributionsList!!.smoothScrollToPosition(0)
+ }
+
+ private fun animateFAB(isFabOpen: Boolean) {
+ this.isFabOpen = !isFabOpen
+ if (binding!!.fabPlus.isShown) {
+ if (isFabOpen) {
+ binding!!.fabPlus.startAnimation(rotate_backward)
+ binding!!.fabCamera.startAnimation(fab_close)
+ binding!!.fabGallery.startAnimation(fab_close)
+ binding!!.fabCustomGallery.startAnimation(fab_close)
+ binding!!.fabCamera.hide()
+ binding!!.fabGallery.hide()
+ binding!!.fabCustomGallery.hide()
+ } else {
+ binding!!.fabPlus.startAnimation(rotate_forward)
+ binding!!.fabCamera.startAnimation(fab_open)
+ binding!!.fabGallery.startAnimation(fab_open)
+ binding!!.fabCustomGallery.startAnimation(fab_open)
+ binding!!.fabCamera.show()
+ binding!!.fabGallery.show()
+ binding!!.fabCustomGallery.show()
+ }
+ this.isFabOpen = !isFabOpen
+ }
+ }
+
+ /**
+ * Shows welcome message if user has no contributions yet i.e. new user.
+ */
+ override fun showWelcomeTip(shouldShow: Boolean) {
+ binding!!.noContributionsYet.visibility =
+ if (shouldShow) View.VISIBLE else View.GONE
+ }
+
+ /**
+ * Responsible to set progress bar invisible and visible
+ *
+ * @param shouldShow True when contributions list should be hidden.
+ */
+ override fun showProgress(shouldShow: Boolean) {
+ binding!!.loadingContributionsProgressBar.visibility =
+ if (shouldShow) View.VISIBLE else View.GONE
+ }
+
+ override fun showNoContributionsUI(shouldShow: Boolean) {
+ binding!!.noContributionsYet.visibility =
+ if (shouldShow) View.VISIBLE else View.GONE
+ }
+
+ override fun onSaveInstanceState(outState: Bundle) {
+ super.onSaveInstanceState(outState)
+ val layoutManager = rvContributionsList
+ ?.getLayoutManager() as GridLayoutManager?
+ outState.putParcelable(RV_STATE, layoutManager!!.onSaveInstanceState())
+ }
+
+ override fun onViewStateRestored(savedInstanceState: Bundle?) {
+ super.onViewStateRestored(savedInstanceState)
+ if (null != savedInstanceState) {
+ val savedRecyclerLayoutState = savedInstanceState.getParcelable(RV_STATE)
+ rvContributionsList!!.layoutManager!!.onRestoreInstanceState(savedRecyclerLayoutState)
+ }
+ }
+
+ override fun openMediaDetail(position: Int, isWikipediaButtonDisplayed: Boolean) {
+ if (null != callback) { //Just being safe, ideally they won't be called when detached
+ callback!!.showDetail(position, isWikipediaButtonDisplayed)
+ }
+ }
+
+ /**
+ * Handle callback for wikipedia icon clicked
+ *
+ * @param contribution
+ */
+ override fun addImageToWikipedia(contribution: Contribution?) {
+ showAlertDialog(
+ requireActivity(),
+ getString(fr.free.nrw.commons.R.string.add_picture_to_wikipedia_article_title),
+ getString(fr.free.nrw.commons.R.string.add_picture_to_wikipedia_article_desc),
+ {
+ if (contribution != null) {
+ showAddImageToWikipediaInstructions(contribution)
+ }
+ }, {})
+ }
+
+ /**
+ * Display confirmation dialog with instructions when the user tries to add image to wikipedia
+ *
+ * @param contribution
+ */
+ private fun showAddImageToWikipediaInstructions(contribution: Contribution) {
+ val fragmentManager = fragmentManager
+ val fragment = newInstance(contribution)
+ fragment.callback =
+ WikipediaInstructionsDialogFragment.Callback { contribution: Contribution?, copyWikicode: Boolean ->
+ this.onConfirmClicked(
+ contribution,
+ copyWikicode
+ )
+ }
+ fragment.show(fragmentManager!!, "WikimediaFragment")
+ }
+
+
+ fun getMediaAtPosition(i: Int): Media? {
+ if (adapter!!.getContributionForPosition(i) != null) {
+ return adapter!!.getContributionForPosition(i)!!.media
+ }
+ return null
+ }
+
+ val totalMediaCount: Int
+ get() = contributionsSize
+
+ /**
+ * Open the editor for the language Wikipedia
+ *
+ * @param contribution
+ */
+ override fun onConfirmClicked(contribution: Contribution?, copyWikicode: Boolean) {
+ if (copyWikicode) {
+ val wikicode = contribution!!.media.wikiCode
+ Utils.copy("wikicode", wikicode, context)
+ }
+
+ val url =
+ languageWikipediaSite!!.mobileUrl() + "/wiki/" + (contribution!!.wikidataPlace
+ ?.getWikipediaPageTitle())
+ Utils.handleWebUrl(context, Uri.parse(url))
+ }
+
+ fun getContributionStateAt(position: Int): Int {
+ return adapter!!.getContributionForPosition(position)!!.state
+ }
+
+ interface Callback {
+ fun notifyDataSetChanged()
+
+ fun showDetail(position: Int, isWikipediaButtonDisplayed: Boolean)
+
+ // Notify the viewpager that number of items have changed.
+ fun viewPagerNotifyDataSetChanged()
+ }
+
+ companion object {
+ private const val RV_STATE = "rv_scroll_state"
+ }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListPresenter.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListPresenter.java
deleted file mode 100644
index 42495889d8..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListPresenter.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package fr.free.nrw.commons.contributions;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.LiveData;
-import androidx.paging.DataSource;
-import androidx.paging.DataSource.Factory;
-import androidx.paging.LivePagedListBuilder;
-import androidx.paging.PagedList;
-import fr.free.nrw.commons.contributions.ContributionsListContract.UserActionListener;
-import fr.free.nrw.commons.di.CommonsApplicationModule;
-import io.reactivex.Scheduler;
-import io.reactivex.disposables.CompositeDisposable;
-import java.util.Arrays;
-import java.util.Collections;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-/**
- * The presenter class for Contributions
- */
-public class ContributionsListPresenter implements UserActionListener {
-
- private final ContributionBoundaryCallback contributionBoundaryCallback;
- private final ContributionsRepository repository;
- private final Scheduler ioThreadScheduler;
-
- private final CompositeDisposable compositeDisposable;
- private final ContributionsRemoteDataSource contributionsRemoteDataSource;
-
- LiveData> contributionList;
-
- @Inject
- ContributionsListPresenter(
- final ContributionBoundaryCallback contributionBoundaryCallback,
- final ContributionsRemoteDataSource contributionsRemoteDataSource,
- final ContributionsRepository repository,
- @Named(CommonsApplicationModule.IO_THREAD) final Scheduler ioThreadScheduler) {
- this.contributionBoundaryCallback = contributionBoundaryCallback;
- this.repository = repository;
- this.ioThreadScheduler = ioThreadScheduler;
- this.contributionsRemoteDataSource = contributionsRemoteDataSource;
- compositeDisposable = new CompositeDisposable();
- }
-
- @Override
- public void onAttachView(final ContributionsListContract.View view) {
- }
-
- /**
- * Setup the paged list. This method sets the configuration for paged list and ties it up with
- * the live data object. This method can be tweaked to update the lazy loading behavior of the
- * contributions list
- */
- void setup(String userName, boolean isSelf) {
- final PagedList.Config pagedListConfig =
- (new PagedList.Config.Builder())
- .setPrefetchDistance(50)
- .setPageSize(10).build();
- Factory factory;
- boolean shouldSetBoundaryCallback;
- if (!isSelf) {
- //We don't want to persist contributions for other user's, therefore
- // creating a new DataSource for them
- contributionsRemoteDataSource.setUserName(userName);
- factory = new Factory() {
- @NonNull
- @Override
- public DataSource create() {
- return contributionsRemoteDataSource;
- }
- };
- shouldSetBoundaryCallback = false;
- } else {
- contributionBoundaryCallback.setUserName(userName);
- shouldSetBoundaryCallback = true;
- factory = repository.fetchContributionsWithStates(
- Collections.singletonList(Contribution.STATE_COMPLETED));
- }
-
- LivePagedListBuilder livePagedListBuilder = new LivePagedListBuilder(factory,
- pagedListConfig);
- if (shouldSetBoundaryCallback) {
- livePagedListBuilder.setBoundaryCallback(contributionBoundaryCallback);
- }
-
- contributionList = livePagedListBuilder.build();
- }
-
- @Override
- public void onDetachView() {
- compositeDisposable.clear();
- contributionsRemoteDataSource.dispose();
- contributionBoundaryCallback.dispose();
- }
-
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListPresenter.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListPresenter.kt
new file mode 100644
index 0000000000..1421c17578
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListPresenter.kt
@@ -0,0 +1,91 @@
+package fr.free.nrw.commons.contributions
+
+import androidx.lifecycle.LiveData
+import androidx.paging.DataSource
+import androidx.paging.LivePagedListBuilder
+import androidx.paging.PagedList
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import fr.free.nrw.commons.di.CommonsApplicationModule
+import io.reactivex.Scheduler
+import io.reactivex.disposables.CompositeDisposable
+import javax.inject.Inject
+import javax.inject.Named
+
+/**
+ * The presenter class for Contributions
+ */
+class ContributionsListPresenter @Inject internal constructor(
+ private val contributionBoundaryCallback: ContributionBoundaryCallback,
+ private val contributionsRemoteDataSource: ContributionsRemoteDataSource,
+ private val repository: ContributionsRepository,
+ @param:Named(CommonsApplicationModule.IO_THREAD) private val ioThreadScheduler: Scheduler
+) : ContributionsListContract.UserActionListener {
+ private val compositeDisposable = CompositeDisposable()
+
+ var contributionList: LiveData>? = null
+
+ override fun onAttachView(view: ContributionsListContract.View) {
+ }
+
+ /**
+ * Setup the paged list. This method sets the configuration for paged list and ties it up with
+ * the live data object. This method can be tweaked to update the lazy loading behavior of the
+ * contributions list
+ */
+ fun setup(userName: String?, isSelf: Boolean) {
+ val pagedListConfig =
+ (PagedList.Config.Builder())
+ .setPrefetchDistance(50)
+ .setPageSize(10).build()
+ val factory: DataSource.Factory
+ val shouldSetBoundaryCallback: Boolean
+ if (!isSelf) {
+ //We don't want to persist contributions for other user's, therefore
+ // creating a new DataSource for them
+ contributionsRemoteDataSource.userName = userName
+ factory = object : DataSource.Factory() {
+ override fun create(): DataSource {
+ return contributionsRemoteDataSource
+ }
+ }
+ shouldSetBoundaryCallback = false
+ } else {
+ contributionBoundaryCallback.userName = userName
+ shouldSetBoundaryCallback = true
+ factory = repository.fetchContributionsWithStates(
+ listOf(Contribution.STATE_COMPLETED)
+ )
+ }
+
+ val livePagedListBuilder: LivePagedListBuilder = LivePagedListBuilder(
+ factory,
+ pagedListConfig
+ )
+ if (shouldSetBoundaryCallback) {
+ livePagedListBuilder.setBoundaryCallback(contributionBoundaryCallback)
+ }
+
+ contributionList = livePagedListBuilder.build()
+ }
+
+ override fun onDetachView() {
+ compositeDisposable.clear()
+ contributionsRemoteDataSource.dispose()
+ contributionBoundaryCallback.dispose()
+ }
+
+ /**
+ * It is used to refresh list.
+ *
+ * @param swipeRefreshLayout used to stop refresh animation when
+ * refresh finishes.
+ */
+ override fun refreshList(swipeRefreshLayout: SwipeRefreshLayout?) {
+ contributionBoundaryCallback.refreshList {
+ if (swipeRefreshLayout != null) {
+ swipeRefreshLayout.isRefreshing = false
+ }
+ Unit
+ }
+ }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsLocalDataSource.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsLocalDataSource.java
deleted file mode 100644
index 77dcd5df96..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsLocalDataSource.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package fr.free.nrw.commons.contributions;
-
-import androidx.paging.DataSource.Factory;
-import fr.free.nrw.commons.kvstore.JsonKvStore;
-import io.reactivex.Completable;
-import io.reactivex.Single;
-import java.util.ArrayList;
-import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-/**
- * The LocalDataSource class for Contributions
- */
-class ContributionsLocalDataSource {
-
- private final ContributionDao contributionDao;
- private final JsonKvStore defaultKVStore;
-
- @Inject
- public ContributionsLocalDataSource(
- @Named("default_preferences") final JsonKvStore defaultKVStore,
- final ContributionDao contributionDao) {
- this.defaultKVStore = defaultKVStore;
- this.contributionDao = contributionDao;
- }
-
- /**
- * Fetch default number of contributions to be show, based on user preferences
- */
- public String getString(final String key) {
- return defaultKVStore.getString(key);
- }
-
- /**
- * Fetch default number of contributions to be show, based on user preferences
- */
- public long getLong(final String key) {
- return defaultKVStore.getLong(key);
- }
-
- /**
- * Get contribution object from cursor
- *
- * @param uri
- * @return
- */
- public Contribution getContributionWithFileName(final String uri) {
- final List contributionWithUri = contributionDao.getContributionWithTitle(
- uri);
- if (!contributionWithUri.isEmpty()) {
- return contributionWithUri.get(0);
- }
- return null;
- }
-
- /**
- * Remove a contribution from the contributions table
- *
- * @param contribution
- * @return
- */
- public Completable deleteContribution(final Contribution contribution) {
- return contributionDao.delete(contribution);
- }
-
- /**
- * Deletes contributions with specific states.
- *
- * @param states The states of the contributions to delete.
- * @return A Completable indicating the result of the operation.
- */
- public Completable deleteContributionsWithStates(List states) {
- return contributionDao.deleteContributionsWithStates(states);
- }
-
- public Factory getContributions() {
- return contributionDao.fetchContributions();
- }
-
- /**
- * Fetches contributions with specific states.
- *
- * @param states The states of the contributions to fetch.
- * @return A DataSource factory for paginated contributions with the specified states.
- */
- public Factory getContributionsWithStates(List states) {
- return contributionDao.getContributions(states);
- }
-
- /**
- * Fetches contributions with specific states sorted by the date the upload started.
- *
- * @param states The states of the contributions to fetch.
- * @return A DataSource factory for paginated contributions with the specified states sorted by
- * date upload started.
- */
- public Factory getContributionsWithStatesSortedByDateUploadStarted(
- List states) {
- return contributionDao.getContributionsSortedByDateUploadStarted(states);
- }
-
- public Single> saveContributions(final List contributions) {
- final List contributionList = new ArrayList<>();
- for (final Contribution contribution : contributions) {
- final Contribution oldContribution = contributionDao.getContribution(
- contribution.getPageId());
- if (oldContribution != null) {
- contribution.setWikidataPlace(oldContribution.getWikidataPlace());
- }
- contributionList.add(contribution);
- }
- return contributionDao.save(contributionList);
- }
-
- public Completable saveContributions(Contribution contribution) {
- return contributionDao.save(contribution);
- }
-
- public void set(final String key, final long value) {
- defaultKVStore.putLong(key, value);
- }
-
- public Completable updateContribution(final Contribution contribution) {
- return contributionDao.update(contribution);
- }
-
- public Completable updateContributionsWithStates(List states, int newState) {
- return contributionDao.updateContributionsWithStates(states, newState);
- }
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsLocalDataSource.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsLocalDataSource.kt
new file mode 100644
index 0000000000..a35cc15db6
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsLocalDataSource.kt
@@ -0,0 +1,121 @@
+package fr.free.nrw.commons.contributions
+
+import androidx.paging.DataSource
+import fr.free.nrw.commons.kvstore.JsonKvStore
+import io.reactivex.Completable
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Named
+
+/**
+ * The LocalDataSource class for Contributions
+ */
+class ContributionsLocalDataSource @Inject constructor(
+ @param:Named("default_preferences") private val defaultKVStore: JsonKvStore,
+ private val contributionDao: ContributionDao
+) {
+ /**
+ * Fetch default number of contributions to be show, based on user preferences
+ */
+ fun getString(key: String): String? {
+ return defaultKVStore.getString(key)
+ }
+
+ /**
+ * Fetch default number of contributions to be show, based on user preferences
+ */
+ fun getLong(key: String): Long {
+ return defaultKVStore.getLong(key)
+ }
+
+ /**
+ * Get contribution object from cursor
+ *
+ * @param uri
+ * @return
+ */
+ fun getContributionWithFileName(uri: String): Contribution {
+ val contributionWithUri = contributionDao.getContributionWithTitle(uri)
+ if (contributionWithUri.isNotEmpty()) {
+ return contributionWithUri[0]
+ }
+ throw IllegalArgumentException("Contribution not found for URI: $uri")
+ }
+
+ /**
+ * Remove a contribution from the contributions table
+ *
+ * @param contribution
+ * @return
+ */
+ fun deleteContribution(contribution: Contribution): Completable {
+ return contributionDao.delete(contribution)
+ }
+
+ /**
+ * Deletes contributions with specific states.
+ *
+ * @param states The states of the contributions to delete.
+ * @return A Completable indicating the result of the operation.
+ */
+ fun deleteContributionsWithStates(states: List): Completable {
+ return contributionDao.deleteContributionsWithStates(states)
+ }
+
+ fun getContributions(): DataSource.Factory {
+ return contributionDao.fetchContributions()
+ }
+
+ /**
+ * Fetches contributions with specific states.
+ *
+ * @param states The states of the contributions to fetch.
+ * @return A DataSource factory for paginated contributions with the specified states.
+ */
+ fun getContributionsWithStates(states: List