inAppCameraLocationPermissionLauncher) {
+ 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);
+ },
+ () -> 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) {
+ 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);
+ },
+ () -> {
+ ViewUtil.showLongToast(activity, R.string.in_app_camera_location_permission_denied);
+ defaultKvStore.putBoolean("inAppCameraLocationPref", false);
+ initiateCameraUpload(activity);
+ },
+ null,
+ true);
}
/**
@@ -65,44 +200,36 @@ public class ContributionController {
* Initiate gallery picker with permission
*/
public void initiateCustomGalleryPickWithPermission(final Activity activity) {
- setPickerConfiguration(activity,true);
+ setPickerConfiguration(activity, true);
PermissionUtils.checkPermissionsAndPerformAction(activity,
- Manifest.permission.WRITE_EXTERNAL_STORAGE,
- () -> {
- if (VERSION.SDK_INT >= VERSION_CODES.Q) {
- PermissionUtils.checkPermissionsAndPerformAction(
- activity,
- permission.ACCESS_MEDIA_LOCATION,
- () -> {},
- R.string.media_location_permission_denied,
- R.string.add_location_manually
- );
- }
- FilePicker.openCustomSelector(activity, 0);
- },
+ () -> FilePicker.openCustomSelector(activity, 0),
R.string.storage_permission_title,
- R.string.write_storage_permission_rationale);
+ R.string.write_storage_permission_rationale,
+ PermissionUtils.PERMISSIONS_STORAGE);
}
/**
* Open chooser for gallery uploads
*/
- private void initiateGalleryUpload(final Activity activity, final boolean allowMultipleUploads) {
+ private void initiateGalleryUpload(final Activity activity,
+ final boolean allowMultipleUploads) {
setPickerConfiguration(activity, allowMultipleUploads);
- FilePicker.openGallery(activity, 0);
+ boolean openDocumentIntentPreferred = defaultKvStore.getBoolean(
+ "openDocumentPhotoPickerPref", true);
+ FilePicker.openGallery(activity, 0, openDocumentIntentPreferred);
}
/**
* Sets configuration for file picker
*/
private void setPickerConfiguration(Activity activity,
- boolean allowMultipleUploads) {
+ boolean allowMultipleUploads) {
boolean copyToExternalStorage = defaultKvStore.getBoolean("useExternalStorage", true);
FilePicker.configuration(activity)
- .setCopyTakenPhotosToPublicGalleryAppFolder(copyToExternalStorage)
- .setAllowMultiplePickInGallery(allowMultipleUploads);
+ .setCopyTakenPhotosToPublicGalleryAppFolder(copyToExternalStorage)
+ .setAllowMultiplePickInGallery(allowMultipleUploads);
}
/**
@@ -110,42 +237,50 @@ public class ContributionController {
*/
private void initiateCameraUpload(Activity activity) {
setPickerConfiguration(activity, false);
+ if (defaultKvStore.getBoolean("inAppCameraLocationPref", false)) {
+ locationBeforeImageCapture = locationManager.getLastLocation();
+ }
+ isInAppCameraUpload = true;
FilePicker.openCameraForImage(activity, 0);
}
/**
* Attaches callback for file picker.
*/
- public void handleActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
- FilePicker.handleActivityResult(requestCode, resultCode, data, activity, new DefaultCallback() {
+ public void handleActivityResult(Activity activity, int requestCode, int resultCode,
+ Intent data) {
+ FilePicker.handleActivityResult(requestCode, resultCode, data, activity,
+ new DefaultCallback() {
- @Override
- public void onCanceled(final ImageSource source, final int type) {
- super.onCanceled(source, type);
- defaultKvStore.remove(PLACE_OBJECT);
- }
+ @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 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);
- }
- });
+ @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) {
+ Intent data) {
return FilePicker.handleExternalImagesPicked(data, activity);
}
/**
- * Returns intent to be passed to upload activity
- * Attaches place object for nearby uploads
+ * 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) {
@@ -159,7 +294,17 @@ public class ContributionController {
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;
}
-
}
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
index e7af6bcd6..b4889b6a2 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.java
@@ -12,7 +12,6 @@ import androidx.room.Update;
import io.reactivex.Completable;
import io.reactivex.Single;
import java.util.Calendar;
-import java.util.Date;
import java.util.List;
@Dao
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
index a7df59462..7ea5163bb 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java
@@ -12,14 +12,12 @@ import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AlertDialog.Builder;
import androidx.recyclerview.widget.RecyclerView;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
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;
@@ -29,29 +27,8 @@ import java.io.File;
public class ContributionViewHolder extends RecyclerView.ViewHolder {
private final Callback callback;
- @BindView(R.id.contributionImage)
- SimpleDraweeView imageView;
- @BindView(R.id.contributionTitle)
- TextView titleView;
- @BindView(R.id.authorView)
- TextView authorView;
- @BindView(R.id.contributionState)
- TextView stateView;
- @BindView(R.id.contributionSequenceNumber)
- TextView seqNumView;
- @BindView(R.id.contributionProgress)
- ProgressBar progressView;
- @BindView(R.id.image_options)
- RelativeLayout imageOptions;
- @BindView(R.id.wikipediaButton)
- ImageButton addToWikipediaButton;
- @BindView(R.id.retryButton)
- ImageButton retryButton;
- @BindView(R.id.cancelButton)
- ImageButton cancelButton;
- @BindView(R.id.pauseResumeButton)
- ImageButton pauseResumeButton;
+ LayoutContributionBinding binding;
private int position;
private Contribution contribution;
@@ -67,9 +44,16 @@ public class ContributionViewHolder extends RecyclerView.ViewHolder {
super(parent);
this.parent = parent;
this.mediaClient = mediaClient;
- ButterKnife.bind(this, parent);
this.callback = callback;
+ binding = LayoutContributionBinding.bind(parent);
+
+ binding.retryButton.setOnClickListener(v -> retryUpload());
+ binding.cancelButton.setOnClickListener(v -> deleteUpload());
+ binding.contributionImage.setOnClickListener(v -> imageClicked());
+ binding.wikipediaButton.setOnClickListener(v -> wikipediaButtonClicked());
+ binding.pauseResumeButton.setOnClickListener(v -> onPauseResumeButtonClicked());
+
/* 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());
@@ -87,14 +71,17 @@ public class ContributionViewHolder extends RecyclerView.ViewHolder {
this.contribution = contribution;
this.position = position;
- titleView.setText(contribution.getMedia().getMostRelevantCaption());
- authorView.setText(contribution.getMedia().getAuthor());
+ binding.contributionTitle.setText(contribution.getMedia().getMostRelevantCaption());
+ binding.authorView.setText(contribution.getMedia().getAuthor());
//Removes flicker of loading image.
- imageView.getHierarchy().setFadeDuration(0);
+ binding.contributionImage.getHierarchy().setFadeDuration(0);
- imageView.getHierarchy().setPlaceholderImage(R.drawable.image_placeholder);
- imageView.getHierarchy().setFailureImage(R.drawable.image_placeholder);
+ 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());
@@ -103,73 +90,77 @@ public class ContributionViewHolder extends RecyclerView.ViewHolder {
imageRequest = ImageRequestBuilder.newBuilderWithSource(Uri.parse(imageSource))
.setProgressiveRenderingEnabled(true)
.build();
- } else if(imageSource != null) {
+ }
+ 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){
- imageView.setImageRequest(imageRequest);
+ binding.contributionImage.setImageRequest(imageRequest);
}
}
- seqNumView.setText(String.valueOf(position + 1));
- seqNumView.setVisibility(View.VISIBLE);
+ binding.contributionSequenceNumber.setText(String.valueOf(position + 1));
+ binding.contributionSequenceNumber.setVisibility(View.VISIBLE);
- addToWikipediaButton.setVisibility(View.GONE);
+ binding.wikipediaButton.setVisibility(View.GONE);
switch (contribution.getState()) {
case Contribution.STATE_COMPLETED:
- stateView.setVisibility(View.GONE);
- progressView.setVisibility(View.GONE);
- imageOptions.setVisibility(View.GONE);
- stateView.setText("");
+ binding.contributionState.setVisibility(View.GONE);
+ binding.contributionProgress.setVisibility(View.GONE);
+ binding.imageOptions.setVisibility(View.GONE);
+ binding.contributionState.setText("");
checkIfMediaExistsOnWikipediaPage(contribution);
break;
case Contribution.STATE_QUEUED:
case Contribution.STATE_QUEUED_LIMITED_CONNECTION_MODE:
- progressView.setVisibility(View.GONE);
- stateView.setVisibility(View.VISIBLE);
- stateView.setText(R.string.contribution_state_queued);
- imageOptions.setVisibility(View.GONE);
+ binding.contributionProgress.setVisibility(View.GONE);
+ binding.contributionState.setVisibility(View.VISIBLE);
+ binding.contributionState.setText(R.string.contribution_state_queued);
+ binding.imageOptions.setVisibility(View.GONE);
break;
case Contribution.STATE_IN_PROGRESS:
- stateView.setVisibility(View.GONE);
- progressView.setVisibility(View.VISIBLE);
- addToWikipediaButton.setVisibility(View.GONE);
- pauseResumeButton.setVisibility(View.VISIBLE);
- cancelButton.setVisibility(View.GONE);
- retryButton.setVisibility(View.GONE);
- imageOptions.setVisibility(View.VISIBLE);
+ binding.contributionState.setVisibility(View.GONE);
+ binding.contributionProgress.setVisibility(View.VISIBLE);
+ binding.wikipediaButton.setVisibility(View.GONE);
+ binding.pauseResumeButton.setVisibility(View.VISIBLE);
+ binding.cancelButton.setVisibility(View.GONE);
+ binding.retryButton.setVisibility(View.GONE);
+ binding.imageOptions.setVisibility(View.VISIBLE);
final long total = contribution.getDataLength();
final long transferred = contribution.getTransferred();
if (transferred == 0 || transferred >= total) {
- progressView.setIndeterminate(true);
+ binding.contributionProgress.setIndeterminate(true);
} else {
- progressView.setIndeterminate(false);
- progressView.setProgress((int) (((double) transferred / (double) total) * 100));
+ binding.contributionProgress.setIndeterminate(false);
+ binding.contributionProgress.setProgress((int) (((double) transferred / (double) total) * 100));
}
break;
case Contribution.STATE_PAUSED:
- progressView.setVisibility(View.GONE);
- stateView.setVisibility(View.VISIBLE);
- stateView.setText(R.string.paused);
- cancelButton.setVisibility(View.VISIBLE);
- retryButton.setVisibility(View.GONE);
- pauseResumeButton.setVisibility(View.VISIBLE);
- imageOptions.setVisibility(View.VISIBLE);
+ binding.contributionProgress.setVisibility(View.GONE);
+ binding.contributionState.setVisibility(View.VISIBLE);
+ binding.contributionState.setText(R.string.paused);
+ binding.cancelButton.setVisibility(View.VISIBLE);
+ binding.retryButton.setVisibility(View.GONE);
+ binding.pauseResumeButton.setVisibility(View.VISIBLE);
+ binding.imageOptions.setVisibility(View.VISIBLE);
setResume();
if(pausingPopUp.isShowing()){
pausingPopUp.hide();
}
break;
case Contribution.STATE_FAILED:
- stateView.setVisibility(View.VISIBLE);
- stateView.setText(R.string.contribution_state_failed);
- progressView.setVisibility(View.GONE);
- cancelButton.setVisibility(View.VISIBLE);
- retryButton.setVisibility(View.VISIBLE);
- pauseResumeButton.setVisibility(View.GONE);
- imageOptions.setVisibility(View.VISIBLE);
+ binding.contributionState.setVisibility(View.VISIBLE);
+ binding.contributionState.setText(R.string.contribution_state_failed);
+ binding.contributionProgress.setVisibility(View.GONE);
+ binding.cancelButton.setVisibility(View.VISIBLE);
+ binding.retryButton.setVisibility(View.VISIBLE);
+ binding.pauseResumeButton.setVisibility(View.GONE);
+ binding.imageOptions.setVisibility(View.VISIBLE);
break;
}
}
@@ -203,11 +194,11 @@ public class ContributionViewHolder extends RecyclerView.ViewHolder {
*/
private void displayWikipediaButton(Boolean mediaExists) {
if (!mediaExists) {
- addToWikipediaButton.setVisibility(View.VISIBLE);
+ binding.wikipediaButton.setVisibility(View.VISIBLE);
isWikipediaButtonDisplayed = true;
- cancelButton.setVisibility(View.GONE);
- retryButton.setVisibility(View.GONE);
- imageOptions.setVisibility(View.VISIBLE);
+ binding.cancelButton.setVisibility(View.GONE);
+ binding.retryButton.setVisibility(View.GONE);
+ binding.imageOptions.setVisibility(View.VISIBLE);
}
}
@@ -229,7 +220,6 @@ public class ContributionViewHolder extends RecyclerView.ViewHolder {
/**
* Retry upload when it is failed
*/
- @OnClick(R.id.retryButton)
public void retryUpload() {
callback.retryUpload(contribution);
}
@@ -237,17 +227,14 @@ public class ContributionViewHolder extends RecyclerView.ViewHolder {
/**
* Delete a failed upload attempt
*/
- @OnClick(R.id.cancelButton)
public void deleteUpload() {
callback.deleteUpload(contribution);
}
- @OnClick(R.id.contributionImage)
public void imageClicked() {
callback.openMediaDetail(position, isWikipediaButtonDisplayed);
}
- @OnClick(R.id.wikipediaButton)
public void wikipediaButtonClicked() {
callback.addImageToWikipedia(contribution);
}
@@ -255,9 +242,8 @@ public class ContributionViewHolder extends RecyclerView.ViewHolder {
/**
* Triggers a callback for pause/resume
*/
- @OnClick(R.id.pauseResumeButton)
public void onPauseResumeButtonClicked() {
- if (pauseResumeButton.getTag().toString().equals("pause")) {
+ if (binding.pauseResumeButton.getTag().toString().equals("pause")) {
pause();
} else {
resume();
@@ -279,16 +265,16 @@ public class ContributionViewHolder extends RecyclerView.ViewHolder {
* Update pause/resume button to show pause state
*/
private void setPaused() {
- pauseResumeButton.setImageResource(R.drawable.pause_icon);
- pauseResumeButton.setTag(parent.getContext().getString(R.string.pause));
+ binding.pauseResumeButton.setImageResource(R.drawable.pause_icon);
+ binding.pauseResumeButton.setTag(parent.getContext().getString(R.string.pause));
}
/**
* Update pause/resume button to show resume state
*/
private void setResume() {
- pauseResumeButton.setImageResource(R.drawable.play_icon);
- pauseResumeButton.setTag(parent.getContext().getString(R.string.resume));
+ binding.pauseResumeButton.setImageResource(R.drawable.play_icon);
+ binding.pauseResumeButton.setTag(parent.getContext().getString(R.string.resume));
}
public ImageRequest getImageRequest() {
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
index 03e3e5611..189b2665f 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java
@@ -1,14 +1,21 @@
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.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.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;
@@ -21,6 +28,9 @@ import android.widget.CheckBox;
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;
@@ -29,17 +39,17 @@ 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 java.util.Date;
import java.util.List;
+import java.util.Map;
import javax.inject.Inject;
import javax.inject.Named;
import androidx.work.WorkManager;
-import butterknife.BindView;
-import butterknife.ButterKnife;
import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.campaigns.models.Campaign;
@@ -73,18 +83,27 @@ import io.reactivex.schedulers.Schedulers;
import timber.log.Timber;
public class ContributionsFragment
- extends CommonsDaggerSupportFragment
- implements
- OnBackStackChangedListener,
- LocationUpdateListener,
+ extends CommonsDaggerSupportFragment
+ implements
+ OnBackStackChangedListener,
+ LocationUpdateListener,
MediaDetailProvider,
- 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;
+ 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;
private CompositeDisposable compositeDisposable = new CompositeDisposable();
@@ -92,20 +111,18 @@ public class ContributionsFragment
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;
- @BindView(R.id.card_view_nearby) public NearbyNotificationCardView nearbyNotificationCardView;
- @BindView(R.id.campaigns_view) CampaignView campaignView;
- @BindView(R.id.limited_connection_enabled_layout) LinearLayout limitedConnectionEnabledLayout;
- @BindView(R.id.limited_connection_description_text_view) TextView limitedConnectionDescriptionTextView;
+
+ public FragmentContributionsBinding binding;
@Inject ContributionsPresenter contributionsPresenter;
@Inject
SessionManager sessionManager;
- private LatLng curLatLng;
+ private LatLng currentLatLng;
- private boolean firstLocationUpdate = true;
private boolean isFragmentAttachedBefore = false;
private View checkBoxView;
private CheckBox checkBox;
@@ -117,6 +134,34 @@ public class ContributionsFragment
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();
@@ -133,17 +178,21 @@ public class ContributionsFragment
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) {
- View view = inflater.inflate(R.layout.fragment_contributions, container, false);
- ButterKnife.bind(this, view);
+ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
+ @Nullable Bundle savedInstanceState) {
+
+ binding = FragmentContributionsBinding.inflate(inflater, container, false);
+
initWLMCampaign();
presenter.onAttachView(this);
contributionsPresenter.onAttachView(this);
- campaignView.setVisibility(View.GONE);
+ 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) -> {
@@ -153,6 +202,7 @@ public class ContributionsFragment
}
});
+
if (savedInstanceState != null) {
mediaDetailPagerFragment = (MediaDetailPagerFragment) getChildFragmentManager()
.findFragmentByTag(MEDIA_DETAIL_PAGER_FRAGMENT_TAG);
@@ -163,13 +213,13 @@ public class ContributionsFragment
initFragments();
if(isUserProfile) {
- limitedConnectionEnabledLayout.setVisibility(View.GONE);
+ binding.limitedConnectionEnabledLayout.setVisibility(View.GONE);
}else {
upDateUploadCount();
}
- if(shouldShowMediaDetailsFragment){
+ if (shouldShowMediaDetailsFragment) {
showMediaDetailPagerFragment();
- }else{
+ } else {
if (mediaDetailPagerFragment != null) {
removeFragment(mediaDetailPagerFragment);
}
@@ -180,9 +230,9 @@ public class ContributionsFragment
&& sessionManager.getCurrentAccount() != null && !isUserProfile) {
setUploadCount();
}
- limitedConnectionEnabledLayout.setOnClickListener(toggleDescriptionListener);
+ binding.limitedConnectionEnabledLayout.setOnClickListener(toggleDescriptionListener);
setHasOptionsMenu(true);
- return view;
+ return binding.getRoot();
}
/**
@@ -195,10 +245,13 @@ public class ContributionsFragment
}
@Override
- public void onCreateOptionsMenu(@NonNull final Menu menu, @NonNull final MenuInflater inflater) {
+ public void onCreateOptionsMenu(@NonNull final Menu menu,
+ @NonNull final MenuInflater inflater) {
// Removing contributions menu items for ProfileActivity
- if (getActivity() instanceof ProfileActivity) { return; }
+ if (getActivity() instanceof ProfileActivity) {
+ return;
+ }
inflater.inflate(R.menu.contribution_activity_notification_menu, menu);
@@ -220,7 +273,7 @@ public class ContributionsFragment
throwable -> Timber.e(throwable, "Error occurred while loading notifications")));
}
- public void scrollToTop( ){
+ public void scrollToTop() {
if (contributionsListFragment != null) {
contributionsListFragment.scrollToTop();
}
@@ -242,22 +295,17 @@ public class ContributionsFragment
.getBoolean(CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED, false);
checkable.setChecked(isEnabled);
- if (isEnabled) {
- limitedConnectionEnabledLayout.setVisibility(View.VISIBLE);
- } else {
- limitedConnectionEnabledLayout.setVisibility(View.GONE);
+ if (binding!=null) {
+ binding.limitedConnectionEnabledLayout.setVisibility(isEnabled ? View.VISIBLE : View.GONE);
}
+
checkable.setIcon((isEnabled) ? R.drawable.ic_baseline_cloud_off_24:R.drawable.ic_baseline_cloud_queue_24);
checkable.setOnMenuItemClickListener(new OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
((MainActivity) getActivity()).toggleLimitedConnectionMode();
boolean isEnabled = store.getBoolean(CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED, false);
- if (isEnabled) {
- limitedConnectionEnabledLayout.setVisibility(View.VISIBLE);
- } else {
- limitedConnectionEnabledLayout.setVisibility(View.GONE);
- }
+ binding.limitedConnectionEnabledLayout.setVisibility(isEnabled ? View.VISIBLE : View.GONE);
checkable.setIcon((isEnabled) ? R.drawable.ic_baseline_cloud_off_24:R.drawable.ic_baseline_cloud_queue_24);
return false;
}
@@ -285,28 +333,31 @@ public class ContributionsFragment
*/
private void showContributionsListFragment() {
// show nearby card view on contributions list is visible
- if (nearbyNotificationCardView != null && !isUserProfile) {
+ if (binding.cardViewNearby != null && !isUserProfile) {
if (store.getBoolean("displayNearbyCardView", true)) {
- if (nearbyNotificationCardView.cardViewVisibilityState
+ if (binding.cardViewNearby.cardViewVisibilityState
== NearbyNotificationCardView.CardViewVisibilityState.READY) {
- nearbyNotificationCardView.setVisibility(View.VISIBLE);
+ binding.cardViewNearby.setVisibility(View.VISIBLE);
}
} else {
- nearbyNotificationCardView.setVisibility(View.GONE);
+ binding.cardViewNearby.setVisibility(View.GONE);
}
}
- showFragment(contributionsListFragment, CONTRIBUTION_LIST_FRAGMENT_TAG, mediaDetailPagerFragment);
+ 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);
+ showFragment(mediaDetailPagerFragment, MEDIA_DETAIL_PAGER_FRAGMENT_TAG,
+ contributionsListFragment);
}
private void setupViewForMediaDetails() {
- campaignView.setVisibility(View.GONE);
- nearbyNotificationCardView.setVisibility(View.GONE);
+ if (binding!=null) {
+ binding.campaignsView.setVisibility(View.GONE);
+ }
}
@Override
@@ -328,7 +379,8 @@ public class ContributionsFragment
showContributionsListFragment();
}
- showFragment(contributionsListFragment, CONTRIBUTION_LIST_FRAGMENT_TAG, mediaDetailPagerFragment);
+ showFragment(contributionsListFragment, CONTRIBUTION_LIST_FRAGMENT_TAG,
+ mediaDetailPagerFragment);
}
/**
@@ -351,7 +403,7 @@ public class ContributionsFragment
transaction.addToBackStack(tag);
transaction.commit();
getChildFragmentManager().executePendingTransactions();
- }else if (!fragment.isAdded() && otherFragment != null ) {
+ } else if (!fragment.isAdded() && otherFragment != null) {
transaction.hide(otherFragment);
transaction.add(R.id.root_frame, fragment, tag);
transaction.addToBackStack(tag);
@@ -376,21 +428,21 @@ public class ContributionsFragment
@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")
- ));
+ .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) {
+ || getResources() == null) {
return;
}
- ((MainActivity)getActivity()).setNumOfUploads(uploadCount);
+ ((MainActivity) getActivity()).setNumOfUploads(uploadCount);
}
@@ -399,6 +451,7 @@ public class ContributionsFragment
super.onPause();
locationManager.removeLocationListener(this);
locationManager.unregisterLocationManager();
+ mSensorManager.unregisterListener(this);
}
@Override
@@ -410,9 +463,13 @@ public class ContributionsFragment
public void onResume() {
super.onResume();
contributionsPresenter.onAttachView(this);
- firstLocationUpdate = true;
locationManager.addLocationListener(this);
- nearbyNotificationCardView.permissionRequestButton.setOnClickListener(v -> {
+
+ if (binding==null) {
+ return;
+ }
+
+ binding.cardViewNearby.permissionRequestButton.setOnClickListener(v -> {
showNearbyCardPermissionRationale();
});
@@ -420,13 +477,20 @@ public class ContributionsFragment
if (mediaDetailPagerFragment == null && !isUserProfile) {
if (store.getBoolean("displayNearbyCardView", true)) {
checkPermissionsAndShowNearbyCardView();
- if (nearbyNotificationCardView.cardViewVisibilityState == NearbyNotificationCardView.CardViewVisibilityState.READY) {
- nearbyNotificationCardView.setVisibility(View.VISIBLE);
+
+ // 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
- nearbyNotificationCardView.setVisibility(View.GONE);
+ binding.cardViewNearby.setVisibility(View.GONE);
}
// Notification Count and Campaigns should not be set, if it is used in User Profile
@@ -435,83 +499,97 @@ public class ContributionsFragment
fetchCampaigns();
}
}
+ mSensorManager.registerListener(this, mLight, SensorManager.SENSOR_DELAY_UI);
}
private void checkPermissionsAndShowNearbyCardView() {
- if (PermissionUtils.hasPermission(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION)) {
+ 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)) {
- nearbyNotificationCardView.permissionType = NearbyNotificationCardView.PermissionType.ENABLE_LOCATION_PERMISSION;
+ && 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() {
- PermissionUtils.checkPermissionsAndPerformAction(getActivity(),
- Manifest.permission.ACCESS_FINE_LOCATION,
- this::onLocationPermissionGranted,
- this::displayYouWontSeeNearbyMessage,
- -1,
- -1);
+ nearbyLocationPermissionLauncher.launch(new String[]{permission.ACCESS_FINE_LOCATION});
}
private void onLocationPermissionGranted() {
- nearbyNotificationCardView.permissionType = NearbyNotificationCardView.PermissionType.NO_PERMISSION_NEEDED;
+ 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);
+ 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));
+ 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() {
- curLatLng = locationManager.getLastLocation();
+ currentLatLng = locationManager.getLastLocation();
compositeDisposable.add(Observable.fromCallable(() -> nearbyController
- .loadAttractionsFromLocation(curLatLng, curLatLng, true, false, 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);
- }));
+ .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 = nearbyPlacesInfo.placeList.get(0);
- String distance = formatDistanceBetween(curLatLng, closestNearbyPlace.location);
- closestNearbyPlace.setDistance(distance);
- nearbyNotificationCardView.updateContent(closestNearbyPlace);
+ 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
- nearbyNotificationCardView.setVisibility(View.GONE);
+ 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()) {
- nearbyNotificationCardView.setVisibility(View.GONE);
+ binding.cardViewNearby.setVisibility(View.GONE);
}
}
@Override
public void onDestroy() {
- try{
+ try {
compositeDisposable.clear();
getChildFragmentManager().removeOnBackStackChangedListener(this);
locationManager.unregisterLocationManager();
@@ -525,22 +603,17 @@ public class ContributionsFragment
@Override
public void onLocationChangedSignificantly(LatLng latLng) {
// Will be called if location changed more than 1000 meter
- // Do nothing on slight changes for using network efficiently
- firstLocationUpdate = false;
updateClosestNearbyCardViewInfo();
}
@Override
public void onLocationChangedSlightly(LatLng latLng) {
/* Update closest nearby notification card onLocationChangedSlightly
- If first time to update location after onResume, then no need to wait for significant
- location change. Any closest location is better than no location
- */
- if (firstLocationUpdate) {
+ */
+ try {
updateClosestNearbyCardViewInfo();
- // Turn it to false, since it is not first location update anymore. To change closest location
- // notification, we need to wait for a significant location change.
- firstLocationUpdate = false;
+ } catch (Exception e) {
+ Timber.e(e);
}
}
@@ -550,7 +623,8 @@ public class ContributionsFragment
updateClosestNearbyCardViewInfo();
}
- @Override public void onViewCreated(@NonNull View view,
+ @Override
+ public void onViewCreated(@NonNull View view,
@Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
}
@@ -562,26 +636,35 @@ public class ContributionsFragment
*/
private void fetchCampaigns() {
if (Utils.isMonumentsEnabled(new Date())) {
- campaignView.setCampaign(wlmCampaign);
- campaignView.setVisibility(View.VISIBLE);
+ if (binding!=null) {
+ binding.campaignsView.setCampaign(wlmCampaign);
+ binding.campaignsView.setVisibility(View.VISIBLE);
+ }
} else if (store.getBoolean(CampaignView.CAMPAIGNS_DEFAULT_PREFERENCE, true)) {
presenter.getCampaigns();
} else {
- campaignView.setVisibility(View.GONE);
+ if (binding!=null) {
+ binding.campaignsView.setVisibility(View.GONE);
+ }
}
}
- @Override public void showMessage(String message) {
+ @Override
+ public void showMessage(String message) {
Toast.makeText(getContext(), message, Toast.LENGTH_SHORT).show();
}
- @Override public void showCampaigns(Campaign campaign) {
+ @Override
+ public void showCampaigns(Campaign campaign) {
if (campaign != null && !isUserProfile) {
- campaignView.setCampaign(campaign);
+ if (binding!=null) {
+ binding.campaignsView.setCampaign(campaign);
+ }
}
}
- @Override public void onDestroyView() {
+ @Override
+ public void onDestroyView() {
super.onDestroyView();
presenter.onDetachView();
}
@@ -593,6 +676,17 @@ public class ContributionsFragment
}
}
+ /**
+ * Restarts the upload process for a contribution
+ *
+ * @param contribution
+ */
+ public void restartUpload(Contribution contribution) {
+ contribution.setState(Contribution.STATE_QUEUED);
+ contributionsPresenter.saveContribution(contribution);
+ Timber.d("Restarting for %s", contribution.toString());
+ }
+
/**
* Retry upload when it is failed
*
@@ -601,10 +695,25 @@ public class ContributionsFragment
@Override
public void retryUpload(Contribution contribution) {
if (NetworkUtils.isInternetConnectionEstablished(getContext())) {
- if (contribution.getState() == STATE_FAILED || contribution.getState() == STATE_PAUSED || contribution.getState()==Contribution.STATE_QUEUED_LIMITED_CONNECTION_MODE) {
- contribution.setState(Contribution.STATE_QUEUED);
- contributionsPresenter.saveContribution(contribution);
- Timber.d("Restarting for %s", contribution.toString());
+ if (contribution.getState() == STATE_PAUSED
+ || contribution.getState() == Contribution.STATE_QUEUED_LIMITED_CONNECTION_MODE) {
+ 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());
}
@@ -616,6 +725,7 @@ public class ContributionsFragment
/**
* Pauses the upload
+ *
* @param contribution
*/
@Override
@@ -639,15 +749,15 @@ public class ContributionsFragment
/**
* Replace whatever is in the current contributionsFragmentContainer view with
- * mediaDetailPagerFragment, and preserve previous state in back stack. Called when user selects a
- * contribution.
+ * 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 = new MediaDetailPagerFragment(false, true);
- if(isUserProfile) {
- ((ProfileActivity)getActivity()).setScroll(false);
+ mediaDetailPagerFragment = MediaDetailPagerFragment.newInstance(false, true);
+ if (isUserProfile) {
+ ((ProfileActivity) getActivity()).setScroll(false);
}
showMediaDetailPagerFragment();
}
@@ -672,24 +782,26 @@ public class ContributionsFragment
public boolean backButtonClicked() {
if (mediaDetailPagerFragment != null && mediaDetailPagerFragment.isVisible()) {
if (store.getBoolean("displayNearbyCardView", true) && !isUserProfile) {
- if (nearbyNotificationCardView.cardViewVisibilityState == NearbyNotificationCardView.CardViewVisibilityState.READY) {
- nearbyNotificationCardView.setVisibility(View.VISIBLE);
+ if (binding.cardViewNearby.cardViewVisibilityState == NearbyNotificationCardView.CardViewVisibilityState.READY) {
+ binding.cardViewNearby.setVisibility(View.VISIBLE);
}
} else {
- nearbyNotificationCardView.setVisibility(View.GONE);
+ binding.cardViewNearby.setVisibility(View.GONE);
}
removeFragment(mediaDetailPagerFragment);
- showFragment(contributionsListFragment, CONTRIBUTION_LIST_FRAGMENT_TAG, mediaDetailPagerFragment);
- if(isUserProfile) {
+ showFragment(contributionsListFragment, CONTRIBUTION_LIST_FRAGMENT_TAG,
+ mediaDetailPagerFragment);
+ if (isUserProfile) {
// Fragment is associated with ProfileActivity
// Enable ParentViewPager Scroll
- ((ProfileActivity)getActivity()).setScroll(true);
- }else {
+ ((ProfileActivity) getActivity()).setScroll(true);
+ } else {
fetchCampaigns();
}
if (getActivity() instanceof MainActivity) {
// Fragment is associated with MainActivity
- ((BaseActivity) getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(false);
+ ((BaseActivity) getActivity()).getSupportActionBar()
+ .setDisplayHomeAsUpEnabled(false);
((MainActivity) getActivity()).showTabs();
}
return true;
@@ -709,11 +821,11 @@ public class ContributionsFragment
void upDateUploadCount() {
WorkManager.getInstance(getContext())
.getWorkInfosForUniqueWorkLiveData(UploadWorker.class.getSimpleName()).observe(
- getViewLifecycleOwner(), workInfos -> {
- if (workInfos.size() > 0) {
- setUploadCount();
- }
- });
+ getViewLifecycleOwner(), workInfos -> {
+ if (workInfos.size() > 0) {
+ setUploadCount();
+ }
+ });
}
@@ -724,29 +836,40 @@ public class ContributionsFragment
*/
@Override
public void refreshNominatedMedia(int index) {
- if(mediaDetailPagerFragment != null && !contributionsListFragment.isVisible()) {
+ if (mediaDetailPagerFragment != null && !contributionsListFragment.isVisible()) {
removeFragment(mediaDetailPagerFragment);
- mediaDetailPagerFragment = new MediaDetailPagerFragment(false, true);
+ mediaDetailPagerFragment = MediaDetailPagerFragment.newInstance(false, true);
mediaDetailPagerFragment.showImage(index);
showMediaDetailPagerFragment();
}
}
- // click listener to toggle description that means uses can press the limited connection
- // banner and description will hide. Tap again to show description.
- private View.OnClickListener toggleDescriptionListener = new View.OnClickListener() {
+ // click listener to toggle description that means uses can press the limited connection
+ // banner and description will hide. Tap again to show description.
+ private View.OnClickListener toggleDescriptionListener = new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- View view2 = limitedConnectionDescriptionTextView;
- if (view2.getVisibility() == View.GONE) {
- view2.setVisibility(View.VISIBLE);
- } else {
- view2.setVisibility(View.GONE);
- }
- }
- };
+ @Override
+ public void onClick(View view) {
+ View view2 = binding.limitedConnectionDescriptionTextView;
+ if (view2.getVisibility() == View.GONE) {
+ view2.setVisibility(View.VISIBLE);
+ } else {
+ view2.setVisibility(View.GONE);
+ }
+ }
+ };
+ /**
+ * 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/ContributionsListContract.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListContract.java
index ed671b9e5..e3ec66b73 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListContract.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListContract.java
@@ -1,7 +1,6 @@
package fr.free.nrw.commons.contributions;
import fr.free.nrw.commons.BasePresenter;
-import java.util.List;
/**
* The contract for Contributions list View & Presenter
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
index 13155f37b..2dbe8aff0 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
@@ -4,6 +4,7 @@ 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.res.Configuration;
import android.net.Uri;
@@ -16,11 +17,12 @@ import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.TextView;
+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.appcompat.widget.AppCompatTextView;
+import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentManager;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@@ -28,26 +30,25 @@ import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
import androidx.recyclerview.widget.RecyclerView.ItemAnimator;
import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener;
import androidx.recyclerview.widget.SimpleItemAnimator;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import fr.free.nrw.commons.CommonsApplication;
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.databinding.FragmentContributionsListBinding;
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
-import fr.free.nrw.commons.utils.DialogUtil;
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.Locale;
+import java.util.Map;
import java.util.Objects;
import javax.inject.Inject;
import javax.inject.Named;
import org.apache.commons.lang3.StringUtils;
-import org.wikipedia.dataclient.WikiSite;
-import fr.free.nrw.commons.profile.ProfileActivity;
+import fr.free.nrw.commons.wikidata.model.WikiSite;
/**
@@ -60,63 +61,72 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment impl
private static final String RV_STATE = "rv_scroll_state";
- @BindView(R.id.contributionsList)
- RecyclerView rvContributionsList;
- @BindView(R.id.loadingContributionsProgressBar)
- ProgressBar progressBar;
- @BindView(R.id.fab_plus)
- FloatingActionButton fabPlus;
- @BindView(R.id.fab_camera)
- FloatingActionButton fabCamera;
- @BindView(R.id.fab_gallery)
- FloatingActionButton fabGallery;
- @BindView(R.id.noContributionsYet)
- TextView noContributionsYet;
- @BindView(R.id.fab_layout)
- LinearLayout fab_layout;
- @BindView(R.id.fab_custom_gallery)
- FloatingActionButton fabCustomGallery;
-
@Inject
SystemThemeUtils systemThemeUtils;
- @BindView(R.id.tv_contributions_of_user)
- AppCompatTextView tvContributionsOfUser;
-
@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;
- private ContributionsListAdapter adapter;
+ @VisibleForTesting
+ protected RecyclerView rvContributionsList;
- @Nullable private Callback callback;
+ @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;
- String userName;
+ private String userName;
+
+ private ActivityResultLauncher inAppCameraLocationPermissionLauncher = 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) {
+ controller.locationPermissionCallback.onLocationPermissionGranted();
+ } else {
+ if (shouldShowRequestPermissionRationale(permission.ACCESS_FINE_LOCATION)) {
+ controller.handleShowRationaleFlowCameraLocation(getActivity(),
+ inAppCameraLocationPermissionLauncher);
+ } 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) {
+ 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
@@ -133,21 +143,36 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment impl
public View onCreateView(
final LayoutInflater inflater, @Nullable final ViewGroup container,
@Nullable final Bundle savedInstanceState) {
- final View view = inflater.inflate(R.layout.fragment_contributions_list, container, false);
- ButterKnife.bind(this, view);
+ 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)) {
- tvContributionsOfUser.setVisibility(GONE);
- fab_layout.setVisibility(VISIBLE);
+ binding.tvContributionsOfUser.setVisibility(GONE);
+ binding.fabLayout.setVisibility(VISIBLE);
} else {
- tvContributionsOfUser.setVisibility(VISIBLE);
- tvContributionsOfUser.setText(getString(R.string.contributions_of_user, userName));
- fab_layout.setVisibility(GONE);
+ binding.tvContributionsOfUser.setVisibility(VISIBLE);
+ binding.tvContributionsOfUser.setText(getString(R.string.contributions_of_user, userName));
+ binding.fabLayout.setVisibility(GONE);
}
initAdapter();
- return view;
+
+ return binding.getRoot();
+ }
+
+ @Override
+ public void onDestroyView() {
+ binding = null;
+ super.onDestroyView();
}
@Override
@@ -280,7 +305,7 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment impl
public void onConfigurationChanged(final Configuration newConfig) {
super.onConfigurationChanged(newConfig);
// check orientation
- fab_layout.setOrientation(newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE ?
+ binding.fabLayout.setOrientation(newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE ?
LinearLayout.HORIZONTAL : LinearLayout.VERTICAL);
rvContributionsList
.setLayoutManager(
@@ -295,22 +320,29 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment impl
}
private void setListeners() {
- fabPlus.setOnClickListener(view -> animateFAB(isFabOpen));
- fabCamera.setOnClickListener(view -> {
- controller.initiateCameraPick(getActivity());
+ binding.fabPlus.setOnClickListener(view -> animateFAB(isFabOpen));
+ binding.fabCamera.setOnClickListener(view -> {
+ controller.initiateCameraPick(getActivity(), inAppCameraLocationPermissionLauncher);
animateFAB(isFabOpen);
});
- fabGallery.setOnClickListener(view -> {
+ binding.fabCamera.setOnLongClickListener(view -> {
+ ViewUtil.showShortToast(getContext(),R.string.add_contribution_from_camera);
+ return true;
+ });
+ binding.fabGallery.setOnClickListener(view -> {
controller.initiateGalleryPick(getActivity(), true);
animateFAB(isFabOpen);
});
+ binding.fabGallery.setOnLongClickListener(view -> {
+ ViewUtil.showShortToast(getContext(),R.string.menu_from_gallery);
+ return true;
+ });
}
/**
* Launch Custom Selector.
*/
- @OnClick(R.id.fab_custom_gallery)
- void launchCustomSelector(){
+ protected void launchCustomSelector() {
controller.initiateCustomGalleryPickWithPermission(getActivity());
animateFAB(isFabOpen);
}
@@ -321,25 +353,25 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment impl
private void animateFAB(final boolean isFabOpen) {
this.isFabOpen = !isFabOpen;
- if (fabPlus.isShown()) {
- if (isFabOpen) {
- fabPlus.startAnimation(rotate_backward);
- fabCamera.startAnimation(fab_close);
- fabGallery.startAnimation(fab_close);
- fabCustomGallery.startAnimation(fab_close);
- fabCamera.hide();
- fabGallery.hide();
- fabCustomGallery.hide();
- } else {
- fabPlus.startAnimation(rotate_forward);
- fabCamera.startAnimation(fab_open);
- fabGallery.startAnimation(fab_open);
- fabCustomGallery.startAnimation(fab_open);
- fabCamera.show();
- fabGallery.show();
- fabCustomGallery.show();
- }
- 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;
}
}
@@ -348,7 +380,7 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment impl
*/
@Override
public void showWelcomeTip(final boolean shouldShow) {
- noContributionsYet.setVisibility(shouldShow ? VISIBLE : GONE);
+ binding.noContributionsYet.setVisibility(shouldShow ? VISIBLE : GONE);
}
/**
@@ -358,12 +390,12 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment impl
*/
@Override
public void showProgress(final boolean shouldShow) {
- progressBar.setVisibility(shouldShow ? VISIBLE : GONE);
+ binding.loadingContributionsProgressBar.setVisibility(shouldShow ? VISIBLE : GONE);
}
@Override
public void showNoContributionsUI(final boolean shouldShow) {
- noContributionsYet.setVisibility(shouldShow ? VISIBLE : GONE);
+ binding.noContributionsYet.setVisibility(shouldShow ? VISIBLE : GONE);
}
@Override
@@ -393,14 +425,15 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment impl
@Override
public void deleteUpload(final Contribution contribution) {
DialogUtil.showAlertDialog(getActivity(),
- String.format(getString(R.string.cancelling_upload),
- Locale.getDefault().getDisplayLanguage()),
- String.format(getString(R.string.cancel_upload_dialog),
- Locale.getDefault().getDisplayLanguage()),
- "YES", "NO",
+ String.format(Locale.getDefault(),
+ getString(R.string.cancelling_upload)),
+ String.format(Locale.getDefault(),
+ getString(R.string.cancel_upload_dialog)),
+ String.format(Locale.getDefault(), getString(R.string.yes)), String.format(Locale.getDefault(), getString(R.string.no)),
() -> {
ViewUtil.showShortToast(getContext(), R.string.cancelling_upload);
contributionsListPresenter.deleteUpload(contribution);
+ CommonsApplication.cancelledUploads.add(contribution.getPageId());
}, () -> {
// Do nothing
});
@@ -422,8 +455,7 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment impl
public void addImageToWikipedia(Contribution contribution) {
DialogUtil.showAlertDialog(getActivity(),
getString(R.string.add_picture_to_wikipedia_article_title),
- String.format(getString(R.string.add_picture_to_wikipedia_article_desc),
- Locale.getDefault().getDisplayLanguage()),
+ getString(R.string.add_picture_to_wikipedia_article_desc),
() -> {
showAddImageToWikipediaInstructions(contribution);
}, () -> {
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsPresenter.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsPresenter.java
index 002e8bc95..f676f193a 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsPresenter.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsPresenter.java
@@ -1,18 +1,12 @@
package fr.free.nrw.commons.contributions;
import androidx.work.ExistingWorkPolicy;
-import androidx.work.OneTimeWorkRequest;
-import androidx.work.WorkManager;
import fr.free.nrw.commons.MediaDataExtractor;
import fr.free.nrw.commons.contributions.ContributionsContract.UserActionListener;
import fr.free.nrw.commons.di.CommonsApplicationModule;
-import fr.free.nrw.commons.upload.worker.UploadWorker;
+import fr.free.nrw.commons.upload.worker.WorkRequestHelper;
import io.reactivex.Scheduler;
import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Consumer;
-import java.util.Collections;
-import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
@@ -76,11 +70,7 @@ public class ContributionsPresenter implements UserActionListener {
compositeDisposable.add(repository
.save(contribution)
.subscribeOn(ioThreadScheduler)
- .subscribe(() -> {
- WorkManager.getInstance(view.getContext().getApplicationContext())
- .enqueueUniqueWork(
- UploadWorker.class.getSimpleName(),
- ExistingWorkPolicy.KEEP, OneTimeWorkRequest.from(UploadWorker.class));
- }));
+ .subscribe(() -> WorkRequestHelper.Companion.makeOneTimeWorkRequest(
+ view.getContext().getApplicationContext(), ExistingWorkPolicy.KEEP)));
}
}
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java
index 46ecc1bb8..63bde1be9 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java
@@ -1,28 +1,24 @@
package fr.free.nrw.commons.contributions;
import android.Manifest.permission;
+import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
-import android.widget.FrameLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
+import androidx.viewpager.widget.ViewPager;
import androidx.work.ExistingWorkPolicy;
-import androidx.work.OneTimeWorkRequest;
-import androidx.work.WorkManager;
-import butterknife.BindView;
-import butterknife.ButterKnife;
+import fr.free.nrw.commons.databinding.MainBinding;
import fr.free.nrw.commons.CommonsApplication;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.WelcomeActivity;
@@ -45,9 +41,13 @@ import fr.free.nrw.commons.notification.NotificationController;
import fr.free.nrw.commons.quiz.QuizChecker;
import fr.free.nrw.commons.settings.SettingsFragment;
import fr.free.nrw.commons.theme.BaseActivity;
-import fr.free.nrw.commons.upload.worker.UploadWorker;
+import fr.free.nrw.commons.upload.worker.WorkRequestHelper;
import fr.free.nrw.commons.utils.PermissionUtils;
import fr.free.nrw.commons.utils.ViewUtilWrapper;
+import io.reactivex.Completable;
+import io.reactivex.schedulers.Schedulers;
+import java.util.Collections;
+import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
import timber.log.Timber;
@@ -59,14 +59,8 @@ public class MainActivity extends BaseActivity
SessionManager sessionManager;
@Inject
ContributionController controller;
- @BindView(R.id.toolbar)
- Toolbar toolbar;
- @BindView(R.id.pager)
- public UnswipableViewPager viewPager;
- @BindView(R.id.fragmentContainer)
- public FrameLayout fragmentContainer;
- @BindView(R.id.fragment_main_nav_tab_layout)
- NavTabLayout tabLayout;
+ @Inject
+ ContributionDao contributionDao;
private ContributionsFragment contributionsFragment;
private NearbyParentFragment nearbyParentFragment;
@@ -91,6 +85,11 @@ public class MainActivity extends BaseActivity
public Menu menu;
+ public MainBinding binding;
+
+ NavTabLayout tabLayout;
+
+
/**
* Consumers should be simply using this method to use this activity.
*
@@ -118,11 +117,13 @@ public class MainActivity extends BaseActivity
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ binding = MainBinding.inflate(getLayoutInflater());
+ setContentView(binding.getRoot());
+ setSupportActionBar(binding.toolbarBinding.toolbar);
+ tabLayout = binding.fragmentMainNavTabLayout;
loadLocale();
- setContentView(R.layout.main);
- ButterKnife.bind(this);
- setSupportActionBar(toolbar);
- toolbar.setNavigationOnClickListener(view -> {
+
+ binding.toolbarBinding.toolbar.setNavigationOnClickListener(view -> {
onSupportNavigateUp();
});
/*
@@ -139,6 +140,10 @@ public class MainActivity extends BaseActivity
setTitle(getString(R.string.navigation_item_explore));
setUpLoggedOutPager();
} else {
+ if (applicationKvStore.getBoolean("firstrun", true)) {
+ applicationKvStore.putBoolean("hasAlreadyLaunchedBigMultiupload", false);
+ applicationKvStore.putBoolean("hasAlreadyLaunchedCategoriesDialog", false);
+ }
if(savedInstanceState == null){
//starting a fresh fragment.
// Open Last opened screen if it is Contributions or Nearby, otherwise Contributions
@@ -152,15 +157,29 @@ public class MainActivity extends BaseActivity
}
}
setUpPager();
+ /**
+ * Ask the user for media location access just after login
+ * so that location in the EXIF metadata of the images shared by the user
+ * is retained on devices running Android 10 or above
+ */
+ if (VERSION.SDK_INT >= VERSION_CODES.Q) {
+ PermissionUtils.checkPermissionsAndPerformAction(
+ this,
+ () -> {},
+ R.string.media_location_permission_denied,
+ R.string.add_location_manually,
+ permission.ACCESS_MEDIA_LOCATION);
+ }
+ checkAndResumeStuckUploads();
}
}
public void setSelectedItemId(int id) {
- tabLayout.setSelectedItemId(id);
+ binding.fragmentMainNavTabLayout.setSelectedItemId(id);
}
private void setUpPager() {
- tabLayout.setOnNavigationItemSelectedListener(navListener = (item) -> {
+ binding.fragmentMainNavTabLayout.setOnNavigationItemSelectedListener(navListener = (item) -> {
if (!item.getTitle().equals(getString(R.string.more))) {
// do not change title for more fragment
setTitle(item.getTitle());
@@ -175,7 +194,7 @@ public class MainActivity extends BaseActivity
private void setUpLoggedOutPager() {
loadFragment(ExploreFragment.newInstance(),false);
- tabLayout.setOnNavigationItemSelectedListener(item -> {
+ binding.fragmentMainNavTabLayout.setOnNavigationItemSelectedListener(item -> {
if (!item.getTitle().equals(getString(R.string.more))) {
// do not change title for more fragment
setTitle(item.getTitle());
@@ -237,11 +256,11 @@ public class MainActivity extends BaseActivity
}
public void hideTabs() {
- tabLayout.setVisibility(View.GONE);
+ binding.fragmentMainNavTabLayout.setVisibility(View.GONE);
}
public void showTabs() {
- tabLayout.setVisibility(View.VISIBLE);
+ binding.fragmentMainNavTabLayout.setVisibility(View.VISIBLE);
}
/**
@@ -259,6 +278,34 @@ public class MainActivity extends BaseActivity
}
}
+ /**
+ * Resume the uploads that got stuck because of the app being killed
+ * or the device being rebooted.
+ *
+ * When the app is terminated or the device is restarted, contributions remain in the
+ * 'STATE_IN_PROGRESS' state. This status persists and doesn't change during these events.
+ * So, retrieving contributions labeled as 'STATE_IN_PROGRESS'
+ * from the database will provide the list of uploads that appear as stuck on opening the app again
+ */
+ @SuppressLint("CheckResult")
+ private void checkAndResumeStuckUploads() {
+ List stuckUploads = contributionDao.getContribution(
+ Collections.singletonList(Contribution.STATE_IN_PROGRESS))
+ .subscribeOn(Schedulers.io())
+ .blockingGet();
+ Timber.d("Resuming " + stuckUploads.size() + " uploads...");
+ if(!stuckUploads.isEmpty()) {
+ for(Contribution contribution: stuckUploads) {
+ contribution.setState(Contribution.STATE_QUEUED);
+ Completable.fromAction(() -> contributionDao.saveSynchronous(contribution))
+ .subscribeOn(Schedulers.io())
+ .subscribe();
+ }
+ WorkRequestHelper.Companion.makeOneTimeWorkRequest(
+ this, ExistingWorkPolicy.APPEND_OR_REPLACE);
+ }
+ }
+
@Override
protected void onPostCreate(@Nullable Bundle savedInstanceState) {
super.onPostCreate(savedInstanceState);
@@ -268,7 +315,7 @@ public class MainActivity extends BaseActivity
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
- outState.putInt("viewPagerCurrentItem", viewPager.getCurrentItem());
+ outState.putInt("viewPagerCurrentItem", binding.pager.getCurrentItem());
outState.putString("activeFragment", activeFragment.name());
}
@@ -347,6 +394,21 @@ public class MainActivity extends BaseActivity
}
}
+ /**
+ * Retry all failed uploads as soon as the user returns to the app
+ */
+ @SuppressLint("CheckResult")
+ private void retryAllFailedUploads() {
+ contributionDao.
+ getContribution(Collections.singletonList(Contribution.STATE_FAILED))
+ .subscribeOn(Schedulers.io())
+ .subscribe(failedUploads -> {
+ for (Contribution contribution: failedUploads) {
+ contributionsFragment.retryUpload(contribution);
+ }
+ });
+ }
+
public void toggleLimitedConnectionMode() {
defaultKvStore.putBoolean(CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED,
!defaultKvStore
@@ -356,10 +418,8 @@ public class MainActivity extends BaseActivity
viewUtilWrapper
.showShortToast(getBaseContext(), getString(R.string.limited_connection_enabled));
} else {
- WorkManager.getInstance(getApplicationContext()).enqueueUniqueWork(
- UploadWorker.class.getSimpleName(),
- ExistingWorkPolicy.APPEND_OR_REPLACE, OneTimeWorkRequest.from(UploadWorker.class));
-
+ WorkRequestHelper.Companion.makeOneTimeWorkRequest(getApplicationContext(),
+ ExistingWorkPolicy.APPEND_OR_REPLACE);
viewUtilWrapper
.showShortToast(getBaseContext(), getString(R.string.limited_connection_disabled));
}
@@ -368,8 +428,6 @@ public class MainActivity extends BaseActivity
public void centerMapToPlace(Place place) {
setSelectedItemId(NavTab.NEARBY.code());
nearbyParentFragment.setNearbyParentFragmentInstanceReadyCallback(new NearbyParentFragmentInstanceReadyCallback() {
- // if mapBox initialize in nearbyParentFragment then MapReady() function called
- // so that nearbyParentFragemt.centerMaptoPlace(place) not throw any null pointer exception
@Override
public void onReady() {
nearbyParentFragment.centerMapToPlace(place);
@@ -390,8 +448,11 @@ public class MainActivity extends BaseActivity
if ((applicationKvStore.getBoolean("firstrun", true)) &&
(!applicationKvStore.getBoolean("login_skipped"))) {
+ defaultKvStore.putBoolean("inAppCameraFirstRun", true);
WelcomeActivity.startYourself(this);
}
+
+ retryAllFailedUploads();
}
@Override
@@ -407,7 +468,7 @@ public class MainActivity extends BaseActivity
* Public method to show nearby from the reference of this.
*/
public void showNearby() {
- tabLayout.setSelectedItemId(NavTab.NEARBY.code());
+ binding.fragmentMainNavTabLayout.setSelectedItemId(NavTab.NEARBY.code());
}
public enum ActiveFragment {
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/SetWallpaperWorker.java b/app/src/main/java/fr/free/nrw/commons/contributions/SetWallpaperWorker.java
new file mode 100644
index 000000000..c9b55a83c
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/SetWallpaperWorker.java
@@ -0,0 +1,130 @@
+package fr.free.nrw.commons.contributions;
+
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.WallpaperManager;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.net.Uri;
+import android.os.Build;
+import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
+import androidx.work.Data;
+import androidx.work.Worker;
+import androidx.work.WorkerParameters;
+import com.facebook.common.executors.CallerThreadExecutor;
+import com.facebook.common.references.CloseableReference;
+import com.facebook.datasource.DataSource;
+import com.facebook.drawee.backends.pipeline.Fresco;
+import com.facebook.imagepipeline.core.ImagePipeline;
+import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber;
+import com.facebook.imagepipeline.image.CloseableImage;
+import com.facebook.imagepipeline.request.ImageRequest;
+import com.facebook.imagepipeline.request.ImageRequestBuilder;
+import fr.free.nrw.commons.R;
+import java.io.IOException;
+import timber.log.Timber;
+
+public class SetWallpaperWorker extends Worker {
+
+ private static final String NOTIFICATION_CHANNEL_ID = "set_wallpaper_channel";
+ private static final int NOTIFICATION_ID = 1;
+
+ public SetWallpaperWorker(@NonNull Context context, @NonNull WorkerParameters params) {
+ super(context, params);
+ }
+
+ @NonNull
+ @Override
+ public Result doWork() {
+ Context context = getApplicationContext();
+ createNotificationChannel(context);
+ showProgressNotification(context);
+
+ String imageUrl = getInputData().getString("imageUrl");
+ if (imageUrl == null) {
+ return Result.failure();
+ }
+
+ ImageRequest imageRequest = ImageRequestBuilder
+ .newBuilderWithSource(Uri.parse(imageUrl))
+ .build();
+
+ ImagePipeline imagePipeline = Fresco.getImagePipeline();
+ final DataSource>
+ dataSource = imagePipeline.fetchDecodedImage(imageRequest, context);
+
+ dataSource.subscribe(new BaseBitmapDataSubscriber() {
+ @Override
+ public void onNewResultImpl(@Nullable Bitmap bitmap) {
+ if (dataSource.isFinished() && bitmap != null) {
+ Timber.d("Bitmap loaded from url %s", imageUrl.toString());
+ setWallpaper(context, Bitmap.createBitmap(bitmap));
+ dataSource.close();
+ }
+ }
+
+ @Override
+ public void onFailureImpl(DataSource dataSource) {
+ Timber.d("Error getting bitmap from image url %s", imageUrl.toString());
+ showNotification(context, "Setting Wallpaper Failed", "Failed to download image.");
+ if (dataSource != null) {
+ dataSource.close();
+ }
+ }
+ }, CallerThreadExecutor.getInstance());
+
+ return Result.success();
+ }
+
+ private void setWallpaper(Context context, Bitmap bitmap) {
+ WallpaperManager wallpaperManager = WallpaperManager.getInstance(context);
+
+ try {
+ wallpaperManager.setBitmap(bitmap);
+ showNotification(context, "Wallpaper Set", "Wallpaper has been updated successfully.");
+
+ } catch (Exception e) {
+ Timber.e(e, "Error setting wallpaper");
+ showNotification(context, "Setting Wallpaper Failed", " "+e.getLocalizedMessage());
+ }
+ }
+
+ private void showProgressNotification(Context context) {
+ NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+ NotificationCompat.Builder builder = new NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ID)
+ .setSmallIcon(R.drawable.commons_logo)
+ .setContentTitle("Setting Wallpaper")
+ .setContentText("Please wait...")
+ .setPriority(NotificationCompat.PRIORITY_HIGH)
+ .setOngoing(true)
+ .setProgress(0, 0, true);
+ notificationManager.notify(NOTIFICATION_ID, builder.build());
+ }
+
+ private void showNotification(Context context, String title, String content) {
+ NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+ NotificationCompat.Builder builder = new NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ID)
+ .setSmallIcon(R.drawable.commons_logo)
+ .setContentTitle(title)
+ .setContentText(content)
+ .setPriority(NotificationCompat.PRIORITY_HIGH)
+ .setOngoing(false);
+ notificationManager.notify(NOTIFICATION_ID, builder.build());
+ }
+
+ private void createNotificationChannel(Context context) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ CharSequence name = "Wallpaper Setting";
+ String description = "Notifications for wallpaper setting progress";
+ int importance = NotificationManager.IMPORTANCE_HIGH;
+ NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, name, importance);
+ channel.setDescription(description);
+ NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+ notificationManager.createNotificationChannel(channel);
+ }
+ }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/helper/OnSwipeTouchListener.kt b/app/src/main/java/fr/free/nrw/commons/customselector/helper/OnSwipeTouchListener.kt
index 89cbb8fb4..f454a3af8 100644
--- a/app/src/main/java/fr/free/nrw/commons/customselector/helper/OnSwipeTouchListener.kt
+++ b/app/src/main/java/fr/free/nrw/commons/customselector/helper/OnSwipeTouchListener.kt
@@ -16,7 +16,7 @@ open class OnSwipeTouchListener(context: Context?) : View.OnTouchListener {
private val SWIPE_THRESHOLD_WIDTH = (getScreenResolution(context!!)).first / 3
private val SWIPE_VELOCITY_THRESHOLD = 1000
- override fun onTouch(view: View?, motionEvent: MotionEvent?): Boolean {
+ override fun onTouch(view: View?, motionEvent: MotionEvent): Boolean {
return gestureDetector.onTouchEvent(motionEvent)
}
@@ -32,7 +32,7 @@ open class OnSwipeTouchListener(context: Context?) : View.OnTouchListener {
inner class GestureListener : GestureDetector.SimpleOnGestureListener() {
- override fun onDown(e: MotionEvent?): Boolean {
+ override fun onDown(e: MotionEvent): Boolean {
return true
}
diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt
index 4180f0082..47784153e 100644
--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt
+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt
@@ -13,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide
import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
import fr.free.nrw.commons.R
+import fr.free.nrw.commons.contributions.Contribution
import fr.free.nrw.commons.customselector.helper.ImageHelper
import fr.free.nrw.commons.customselector.helper.ImageHelper.CUSTOM_SELECTOR_PREFERENCE_KEY
import fr.free.nrw.commons.customselector.helper.ImageHelper.SHOW_ALREADY_ACTIONED_IMAGES_PREFERENCE_KEY
@@ -85,6 +86,8 @@ class ImageAdapter(
*/
private var actionableImagesMap: TreeMap = TreeMap()
+ private var uploadingContributionList: List = ArrayList()
+
/**
* Stores already added positions of actionable images
*/
@@ -119,6 +122,7 @@ class ImageAdapter(
* Bind View holder, load image, selected view, click listeners.
*/
override fun onBindViewHolder(holder: ImageViewHolder, position: Int) {
+
var image=images[position]
holder.image.setImageDrawable (null)
if (context.contentResolver.getType(image.uri) == null) {
@@ -151,13 +155,12 @@ class ImageAdapter(
val isSelected = selectedIndex != -1
if (isSelected) {
- holder.itemSelected(selectedImages.size)
+ holder.itemSelected()
} else {
holder.itemUnselected()
}
-
imageLoader.queryAndSetView(
- holder, image, ioDispatcher, defaultDispatcher
+ holder, image, ioDispatcher, defaultDispatcher ,uploadingContributionList
)
scope.launch {
val sharedPreferences: SharedPreferences =
@@ -168,15 +171,17 @@ class ImageAdapter(
// If the position is not already visited, that means the position is new then
// finds the next actionable image position from all images
if (!alreadyAddedPositions.contains(position)) {
- processThumbnailForActionedImage(holder, position)
+ processThumbnailForActionedImage(holder, position, uploadingContributionList)
// If the position is already visited, that means the image is already present
// inside map, so it will fetch the image from the map and load in the holder
} else {
val actionableImages: List = ArrayList(actionableImagesMap.values)
- image = actionableImages[position]
- Glide.with(holder.image).load(image.uri)
- .thumbnail(0.3f).into(holder.image)
+ if(actionableImages.size > position) {
+ image = actionableImages[position]
+ Glide.with(holder.image).load(image.uri)
+ .thumbnail(0.3f).into(holder.image)
+ }
}
// If switch is turned off, it just fetches the image from all images without any
@@ -204,11 +209,12 @@ class ImageAdapter(
*/
suspend fun processThumbnailForActionedImage(
holder: ImageViewHolder,
- position: Int
+ position: Int,
+ uploadingContributionList: List
) {
val next = imageLoader.nextActionableImage(
allImages, ioDispatcher, defaultDispatcher,
- nextImagePosition
+ nextImagePosition, uploadingContributionList
)
// If next actionable image is found, saves it, as the the search for
@@ -328,12 +334,13 @@ class ImageAdapter(
/**
* Initialize the data set.
*/
- fun init(newImages: List, fixedImages: List, emptyMap: TreeMap) {
+ fun init(newImages: List, fixedImages: List, emptyMap: TreeMap, uploadedImages: List = ArrayList()) {
allImages = fixedImages
val oldImageList:ArrayList = images
val newImageList:ArrayList = ArrayList(newImages)
actionableImagesMap = emptyMap
alreadyAddedPositions = ArrayList()
+ uploadingContributionList = uploadedImages
nextImagePosition = 0
reachedEndOfFolder = false
selectedImages = ArrayList()
@@ -355,15 +362,56 @@ class ImageAdapter(
/**
* Refresh the data in the adapter
*/
- fun refresh(newImages: List, fixedImages: List) {
+ fun refresh(newImages: List, fixedImages: List, uploadingImages: List = ArrayList()) {
numberOfSelectedImagesMarkedAsNotForUpload = 0
- selectedImages.clear()
images.clear()
selectedImages = arrayListOf()
- init(newImages, fixedImages, TreeMap())
+ init(newImages, fixedImages, TreeMap(),uploadingImages)
notifyDataSetChanged()
}
+ /**
+ * Clear selected images and empty the list.
+ */
+ fun clearSelectedImages(){
+ numberOfSelectedImagesMarkedAsNotForUpload = 0
+ selectedImages.clear()
+ selectedImages = arrayListOf()
+ }
+
+
+ /**
+ * Remove image from actionable images map.
+ */
+ fun removeImageFromActionableImageMap(image: Image) {
+ val sharedPreferences: SharedPreferences =
+ context.getSharedPreferences(CUSTOM_SELECTOR_PREFERENCE_KEY, 0)
+ val showAlreadyActionedImages =
+ sharedPreferences.getBoolean(SHOW_ALREADY_ACTIONED_IMAGES_PREFERENCE_KEY, true)
+
+ if(showAlreadyActionedImages) {
+ refresh(allImages, allImages, uploadingContributionList)
+ } else {
+ val iterator = actionableImagesMap.entries.iterator()
+ var index = 0
+
+ while (iterator.hasNext()) {
+ val entry = iterator.next()
+ if (entry.value == image) {
+ imagePositionAsPerIncreasingOrder -= 1
+ iterator.remove()
+ alreadyAddedPositions.removeAt(alreadyAddedPositions.size - 1)
+ notifyItemRemoved(index)
+ notifyItemRangeChanged(index, itemCount )
+ break
+ }
+ index++
+ }
+ }
+
+ }
+
+
/**
* Returns the total number of items in the data set held by the adapter.
*
@@ -407,17 +455,16 @@ class ImageAdapter(
*/
class ImageViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {
val image: ImageView = itemView.findViewById(R.id.image_thumbnail)
- private val selectedNumber: TextView = itemView.findViewById(R.id.selected_count)
private val uploadedGroup: Group = itemView.findViewById(R.id.uploaded_group)
+ private val uploadingGroup: Group = itemView.findViewById(R.id.uploading_group)
private val notForUploadGroup: Group = itemView.findViewById(R.id.not_for_upload_group)
private val selectedGroup: Group = itemView.findViewById(R.id.selected_group)
/**
* Item selected view.
*/
- fun itemSelected(index: Int) {
+ fun itemSelected() {
selectedGroup.visibility = View.VISIBLE
- selectedNumber.text = index.toString()
}
/**
@@ -434,6 +481,13 @@ class ImageAdapter(
uploadedGroup.visibility = View.VISIBLE
}
+ /**
+ * Item is uploading
+ */
+ fun itemUploading() {
+ uploadingGroup.visibility = View.VISIBLE
+ }
+
/**
* Item is not for upload view
*/
@@ -452,6 +506,13 @@ class ImageAdapter(
return notForUploadGroup.visibility == View.VISIBLE
}
+ /**
+ * Item is not uploading
+ */
+ fun itemNotUploading() {
+ uploadingGroup.visibility = View.GONE
+ }
+
/**
* Item Not Uploaded view.
*/
@@ -513,4 +574,4 @@ class ImageAdapter(
return images[position].date
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt
index 0bd7bbf7b..7cf0229cb 100644
--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt
@@ -30,6 +30,7 @@ import fr.free.nrw.commons.upload.FileUtilsWrapper
import fr.free.nrw.commons.utils.CustomSelectorUtils
import kotlinx.coroutines.*
import java.io.File
+import java.lang.Integer.max
import javax.inject.Inject
@@ -66,6 +67,22 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL
*/
private lateinit var prefs: SharedPreferences
+ /**
+ * Maximum number of images that can be selected.
+ */
+ private val uploadLimit: Int = 20
+
+ /**
+ * Flag that is marked true when the amount
+ * of selected images is greater than the upload limit.
+ */
+ private var uploadLimitExceeded: Boolean = false
+
+ /**
+ * Tracks the amount by which the upload limit has been exceeded.
+ */
+ private var uploadLimitExceededBy: Int = 0
+
/**
* View Model Factory.
*/
@@ -95,6 +112,8 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL
*/
var imageFragment: ImageFragment? = null
+ private var progressDialogText:String=""
+
/**
* onCreate Activity, sets theme, initialises the view model, setup view.
*/
@@ -140,7 +159,7 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL
data!!
.getParcelableArrayListExtra(CustomSelectorConstants.NEW_SELECTED_IMAGES)!!
val shouldRefresh = data.getBooleanExtra(SHOULD_REFRESH, false)
- imageFragment!!.passSelectedImages(selectedImages, shouldRefresh)
+ imageFragment?.passSelectedImages(selectedImages, shouldRefresh)
}
}
@@ -187,17 +206,18 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL
markAsNotForUpload(arrayListOf())
return
}
- var i = 0
- while (i < selectedImages.size) {
- val path = selectedImages[i].path
+
+ val iterator = selectedImages.iterator()
+ while (iterator.hasNext()) {
+ val image = iterator.next()
+ val path = image.path
val file = File(path)
if (!file.exists()) {
- selectedImages.removeAt(i)
- i--
+ iterator.remove()
}
- i++
}
markAsNotForUpload(selectedImages)
+ toolbarBinding.imageLimitError.visibility = View.INVISIBLE
}
/**
@@ -221,56 +241,63 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL
*/
private fun insertIntoNotForUpload(images: ArrayList) {
scope.launch {
+ withContext(Dispatchers.Main) {
+ imageFragment?.showMarkUnmarkProgressDialog(text = progressDialogText)
+ }
+
var allImagesAlreadyNotForUpload = true
- images.forEach {
+ images.forEach { image ->
val imageSHA1 = CustomSelectorUtils.getImageSHA1(
- it.uri,
+ image.uri,
ioDispatcher,
fileUtilsWrapper,
contentResolver
)
val exists = notForUploadStatusDao.find(imageSHA1)
-
- // If image exists in not for upload table make allImagesAlreadyNotForUpload false
if (exists < 1) {
allImagesAlreadyNotForUpload = false
}
}
- // if all images is not already marked as not for upload, insert all images in
- // not for upload table
if (!allImagesAlreadyNotForUpload) {
- images.forEach {
+ // Insert or delete images as necessary, but the UI updates should be posted back to the main thread
+ images.forEach { image ->
val imageSHA1 = CustomSelectorUtils.getImageSHA1(
- it.uri,
+ image.uri,
ioDispatcher,
fileUtilsWrapper,
contentResolver
)
- notForUploadStatusDao.insert(
- NotForUploadStatus(
- imageSHA1
- )
- )
+ notForUploadStatusDao.insert(NotForUploadStatus(imageSHA1))
+ }
+ withContext(Dispatchers.Main) {
+ images.forEach { image ->
+ imageFragment?.removeImage(image)
+ }
+ imageFragment?.clearSelectedImages()
}
-
- // if all images is already marked as not for upload, delete all images from
- // not for upload table
} else {
- images.forEach {
+ images.forEach { image ->
val imageSHA1 = CustomSelectorUtils.getImageSHA1(
- it.uri,
+ image.uri,
ioDispatcher,
fileUtilsWrapper,
contentResolver
)
notForUploadStatusDao.deleteNotForUploadWithImageSHA1(imageSHA1)
}
+
+ withContext(Dispatchers.Main) {
+ imageFragment?.refresh()
+ }
}
- imageFragment!!.refresh()
- val bottomLayout: ConstraintLayout = findViewById(R.id.bottom_layout)
- bottomLayout.visibility = View.GONE
+ withContext(Dispatchers.Main) {
+ imageFragment?.dismissMarkUnmarkProgressDialog()
+ val bottomLayout: ConstraintLayout = findViewById(R.id.bottom_layout)
+ bottomLayout.visibility = View.GONE
+ changeTitle(bucketName, 0)
+ }
}
}
@@ -284,10 +311,17 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL
/**
* Change the title of the toolbar.
*/
- private fun changeTitle(title: String) {
- val titleText = findViewById(R.id.title)
- if (titleText != null) {
- titleText.text = title
+ private fun changeTitle(title: String, selectedImageCount:Int) {
+ if (title.isNotEmpty()){
+ val titleText = findViewById(R.id.title)
+ var titleWithAppendedImageCount = title
+ if (selectedImageCount > 0) {
+ titleWithAppendedImageCount += " (${resources.getQuantityString(R.plurals.custom_picker_images_selected_title_appendix,
+ selectedImageCount, selectedImageCount)})"
+ }
+ if (titleText != null) {
+ titleText.text = titleWithAppendedImageCount
+ }
}
}
@@ -297,6 +331,10 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL
private fun setUpToolbar() {
val back: ImageButton = findViewById(R.id.back)
back.setOnClickListener { onBackPressed() }
+
+ val limitError: ImageButton = findViewById(R.id.image_limit_error)
+ limitError.visibility = View.INVISIBLE
+ limitError.setOnClickListener { displayUploadLimitWarning() }
}
/**
@@ -308,7 +346,7 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL
.addToBackStack(null)
.commit()
- changeTitle(folderName)
+ changeTitle(folderName, 0)
bucketId = folderId
bucketName = folderName
@@ -323,8 +361,21 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL
selectedNotForUploadImages: Int
) {
viewModel.selectedImages.value = selectedImages
+ changeTitle(bucketName, selectedImages.size)
- if (selectedNotForUploadImages > 0) {
+ uploadLimitExceeded = selectedImages.size > uploadLimit
+ uploadLimitExceededBy = max(selectedImages.size - uploadLimit,0)
+
+ if (uploadLimitExceeded && selectedNotForUploadImages == 0) {
+ toolbarBinding.imageLimitError.visibility = View.VISIBLE
+ bottomSheetBinding.upload.text = resources.getString(
+ R.string.custom_selector_button_limit_text, uploadLimit)
+ } else {
+ toolbarBinding.imageLimitError.visibility = View.INVISIBLE
+ bottomSheetBinding.upload.text = resources.getString(R.string.upload)
+ }
+
+ if (uploadLimitExceeded || selectedNotForUploadImages > 0) {
bottomSheetBinding.upload.isEnabled = false
bottomSheetBinding.upload.alpha = 0.5f
} else {
@@ -334,8 +385,14 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL
bottomSheetBinding.notForUpload.text =
when (selectedImages.size == selectedNotForUploadImages) {
- true -> getString(R.string.unmark_as_not_for_upload)
- else -> getString(R.string.mark_as_not_for_upload)
+ true -> {
+ progressDialogText=getString(R.string.unmarking_as_not_for_upload)
+ getString(R.string.unmark_as_not_for_upload)
+ }
+ else -> {
+ progressDialogText=getString(R.string.marking_as_not_for_upload)
+ getString(R.string.mark_as_not_for_upload)
+ }
}
val bottomLayout: ConstraintLayout = findViewById(R.id.bottom_layout)
@@ -366,22 +423,22 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL
* Get the selected images. Remove any non existent file, forward the data to finish selector.
*/
fun onDone() {
- val selectedImages = viewModel.selectedImages.value
- if (selectedImages.isNullOrEmpty()) {
- finishPickImages(arrayListOf())
- return
- }
- var i = 0
- while (i < selectedImages.size) {
- val path = selectedImages[i].path
- val file = File(path)
- if (!file.exists()) {
- selectedImages.removeAt(i)
- i--
+ val selectedImages = viewModel.selectedImages.value
+ if (selectedImages.isNullOrEmpty()) {
+ finishPickImages(arrayListOf())
+ return
}
- i++
- }
- finishPickImages(selectedImages)
+ var i = 0
+ while (i < selectedImages.size) {
+ val path = selectedImages[i].path
+ val file = File(path)
+ if (!file.exists()) {
+ selectedImages.removeAt(i)
+ i--
+ }
+ i++
+ }
+ finishPickImages(selectedImages)
}
/**
@@ -404,10 +461,24 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL
val fragment = supportFragmentManager.findFragmentById(R.id.fragment_container)
if (fragment != null && fragment is FolderFragment) {
isImageFragmentOpen = false
- changeTitle(getString(R.string.custom_selector_title))
+ changeTitle(getString(R.string.custom_selector_title), 0)
}
}
+ /**
+ * Displays a dialog explaining the upload limit warning.
+ */
+ private fun displayUploadLimitWarning() {
+ val dialog = Dialog(this)
+ dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
+ dialog.setContentView(R.layout.custom_selector_limit_dialog)
+ (dialog.findViewById(R.id.btn_dismiss_limit_warning) as Button).setOnClickListener()
+ { dialog.dismiss() }
+ (dialog.findViewById(R.id.upload_limit_warning) as TextView).text = resources.getString(
+ R.string.custom_selector_over_limit_warning, uploadLimit, uploadLimitExceededBy)
+ dialog.show()
+ }
+
/**
* On activity destroy
* If image fragment is open, overwrite its attributes otherwise discard the values.
@@ -426,4 +497,4 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL
const val FOLDER_NAME: String = "FolderName"
const val ITEM_ID: String = "ItemId"
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/FolderFragment.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/FolderFragment.kt
index 6e9253ced..0f546e788 100644
--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/FolderFragment.kt
+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/FolderFragment.kt
@@ -93,7 +93,7 @@ class FolderFragment : CommonsDaggerSupportFragment() {
*/
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
_binding = FragmentCustomSelectorBinding.inflate(inflater, container, false)
- folderAdapter = FolderAdapter(activity!!, activity as FolderClickListener)
+ folderAdapter = FolderAdapter(requireActivity(), activity as FolderClickListener)
gridLayoutManager = GridLayoutManager(context, columnCount())
selectorRV = binding?.selectorRv
loader = binding?.loader
@@ -159,4 +159,4 @@ class FolderFragment : CommonsDaggerSupportFragment() {
return 2
// todo change column count depending on the orientation of the device.
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFileLoader.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFileLoader.kt
index 88076f19c..bc4d179a2 100644
--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFileLoader.kt
+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFileLoader.kt
@@ -11,7 +11,9 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import java.io.File
-import java.util.*
+import java.util.Calendar
+import java.util.Date
+import java.util.Locale
import kotlin.coroutines.CoroutineContext
/**
@@ -90,6 +92,12 @@ class ImageFileLoader(val context: Context) : CoroutineScope{
}
if (file != null && file.exists() && name != null && path != null && bucketName != null) {
+ val extension = path.substringAfterLast(".", "")
+ // Check if the extension is one of the allowed types
+ if (extension.lowercase(Locale.ROOT) !in arrayOf("jpg", "jpeg", "png", "svg", "gif", "tiff", "webp", "xcf")) {
+ continue
+ }
+
val uri = ContentUris.withAppendedId(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, id)
val calendar = Calendar.getInstance()
@@ -130,4 +138,4 @@ class ImageFileLoader(val context: Context) : CoroutineScope{
* Sha1 for image (original image).
*
*/
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt
index f2500b5d3..842531dd2 100644
--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt
+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt
@@ -9,37 +9,41 @@ import android.view.View
import android.view.ViewGroup
import android.widget.ProgressBar
import android.widget.Switch
+import androidx.appcompat.app.AlertDialog
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
+import fr.free.nrw.commons.contributions.Contribution
+import fr.free.nrw.commons.contributions.ContributionDao
import fr.free.nrw.commons.customselector.database.NotForUploadStatusDao
import fr.free.nrw.commons.customselector.database.UploadedStatusDao
import fr.free.nrw.commons.customselector.helper.ImageHelper
-import fr.free.nrw.commons.customselector.listeners.PassDataListener
import fr.free.nrw.commons.customselector.helper.ImageHelper.CUSTOM_SELECTOR_PREFERENCE_KEY
import fr.free.nrw.commons.customselector.helper.ImageHelper.SHOW_ALREADY_ACTIONED_IMAGES_PREFERENCE_KEY
import fr.free.nrw.commons.customselector.listeners.ImageSelectListener
+import fr.free.nrw.commons.customselector.listeners.PassDataListener
import fr.free.nrw.commons.customselector.listeners.RefreshUIListener
import fr.free.nrw.commons.customselector.model.CallbackStatus
import fr.free.nrw.commons.customselector.model.Image
import fr.free.nrw.commons.customselector.model.Result
import fr.free.nrw.commons.customselector.ui.adapter.ImageAdapter
import fr.free.nrw.commons.databinding.FragmentCustomSelectorBinding
+import fr.free.nrw.commons.databinding.ProgressDialogBinding
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment
import fr.free.nrw.commons.media.MediaClient
import fr.free.nrw.commons.theme.BaseActivity
import fr.free.nrw.commons.upload.FileProcessor
import fr.free.nrw.commons.upload.FileUtilsWrapper
+import io.reactivex.schedulers.Schedulers
import java.util.*
import javax.inject.Inject
-import kotlin.collections.ArrayList
/**
* Custom Selector Image Fragment.
*/
-class ImageFragment: CommonsDaggerSupportFragment(), RefreshUIListener, PassDataListener {
+class ImageFragment : CommonsDaggerSupportFragment(), RefreshUIListener, PassDataListener {
private var _binding: FragmentCustomSelectorBinding? = null
private val binding get() = _binding
@@ -57,7 +61,7 @@ class ImageFragment: CommonsDaggerSupportFragment(), RefreshUIListener, PassData
/**
* View model for images.
*/
- private var viewModel: CustomSelectorViewModel? = null
+ private var viewModel: CustomSelectorViewModel? = null
/**
* View Elements.
@@ -99,6 +103,10 @@ class ImageFragment: CommonsDaggerSupportFragment(), RefreshUIListener, PassData
*/
private var progressLayout: ConstraintLayout? = null
+ private lateinit var progressDialog: AlertDialog
+ private lateinit var progressDialogLayout: ProgressDialogBinding
+
+
/**
* NotForUploadStatus Dao class for database operations
*/
@@ -129,6 +137,9 @@ class ImageFragment: CommonsDaggerSupportFragment(), RefreshUIListener, PassData
@Inject
lateinit var mediaClient: MediaClient
+ @Inject
+ lateinit var contributionDao: ContributionDao
+
companion object {
/**
@@ -163,7 +174,9 @@ class ImageFragment: CommonsDaggerSupportFragment(), RefreshUIListener, PassData
super.onCreate(savedInstanceState)
bucketId = arguments?.getLong(BUCKET_ID)
lastItemId = arguments?.getLong(LAST_ITEM_ID, 0)
- viewModel = ViewModelProvider(requireActivity(),customSelectorViewModelFactory).get(CustomSelectorViewModel::class.java)
+ viewModel = ViewModelProvider(requireActivity(), customSelectorViewModelFactory).get(
+ CustomSelectorViewModel::class.java
+ )
}
/**
@@ -171,17 +184,22 @@ class ImageFragment: CommonsDaggerSupportFragment(), RefreshUIListener, PassData
* Init imageAdapter, gridLayoutManger.
* SetUp recycler view.
*/
- override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? {
_binding = FragmentCustomSelectorBinding.inflate(inflater, container, false)
- imageAdapter = ImageAdapter(requireActivity(), activity as ImageSelectListener, imageLoader!!)
- gridLayoutManager = GridLayoutManager(context,getSpanCount())
- with(binding?.selectorRv){
+ imageAdapter =
+ ImageAdapter(requireActivity(), activity as ImageSelectListener, imageLoader!!)
+ gridLayoutManager = GridLayoutManager(context, getSpanCount())
+ with(binding?.selectorRv) {
this?.layoutManager = gridLayoutManager
this?.setHasFixedSize(true)
this?.adapter = imageAdapter
}
- viewModel?.result?.observe(viewLifecycleOwner, Observer{
+ viewModel?.result?.observe(viewLifecycleOwner, Observer {
handleResult(it)
})
@@ -194,9 +212,16 @@ class ImageFragment: CommonsDaggerSupportFragment(), RefreshUIListener, PassData
val sharedPreferences: SharedPreferences =
requireContext().getSharedPreferences(CUSTOM_SELECTOR_PREFERENCE_KEY, MODE_PRIVATE)
- showAlreadyActionedImages = sharedPreferences.getBoolean(SHOW_ALREADY_ACTIONED_IMAGES_PREFERENCE_KEY, true)
+ showAlreadyActionedImages =
+ sharedPreferences.getBoolean(SHOW_ALREADY_ACTIONED_IMAGES_PREFERENCE_KEY, true)
switch?.isChecked = showAlreadyActionedImages
+ val builder = AlertDialog.Builder(requireActivity())
+ builder.setCancelable(false)
+ progressDialogLayout = ProgressDialogBinding.inflate(layoutInflater, container, false)
+ builder.setView(progressDialogLayout.root)
+ progressDialog = builder.create()
+
return binding?.root
}
@@ -217,7 +242,8 @@ class ImageFragment: CommonsDaggerSupportFragment(), RefreshUIListener, PassData
editor.apply()
}
- imageAdapter.init(allImages, allImages, TreeMap())
+ val uploadingContributions = getUploadingContributions()
+ imageAdapter.init(allImages, allImages, TreeMap(), uploadingContributions)
imageAdapter.notifyDataSetChanged()
}
@@ -236,13 +262,15 @@ class ImageFragment: CommonsDaggerSupportFragment(), RefreshUIListener, PassData
/**
* Handle view model result.
*/
- private fun handleResult(result:Result){
- if(result.status is CallbackStatus.SUCCESS){
+ private fun handleResult(result: Result) {
+ if (result.status is CallbackStatus.SUCCESS) {
val images = result.images
- if(images.isNotEmpty()) {
+
+ val uploadingContributions = getUploadingContributions()
+ if (images.isNotEmpty()) {
filteredImages = ImageHelper.filterImages(images, bucketId)
allImages = ArrayList(filteredImages)
- imageAdapter.init(filteredImages, allImages, TreeMap())
+ imageAdapter.init(filteredImages, allImages, TreeMap(), uploadingContributions)
selectorRV?.let {
it.visibility = View.VISIBLE
lastItemId?.let { pos ->
@@ -250,18 +278,18 @@ class ImageFragment: CommonsDaggerSupportFragment(), RefreshUIListener, PassData
.scrollToPosition(ImageHelper.getIndexFromId(filteredImages, pos))
}
}
- }
- else{
+ } else {
binding?.emptyText?.let {
it.visibility = View.VISIBLE
}
- selectorRV?.let{
+ selectorRV?.let {
it.visibility = View.GONE
}
}
}
loader?.let {
- it.visibility = if (result.status is CallbackStatus.FETCHING) View.VISIBLE else View.GONE
+ it.visibility =
+ if (result.status is CallbackStatus.FETCHING) View.VISIBLE else View.GONE
}
}
@@ -317,19 +345,61 @@ class ImageFragment: CommonsDaggerSupportFragment(), RefreshUIListener, PassData
}
override fun refresh() {
- imageAdapter.refresh(filteredImages, allImages)
+ imageAdapter.refresh(filteredImages, allImages, getUploadingContributions())
}
+ /**
+ * Removes the image from the actionable image map
+ */
+ fun removeImage(image : Image){
+ imageAdapter.removeImageFromActionableImageMap(image)
+ }
+
+ /**
+ * Clears the selected images
+ */
+ fun clearSelectedImages() {
+ imageAdapter.clearSelectedImages()
+ }
/**
* Passes selected images and other information from Activity to Fragment and connects it with
* the adapter
*/
- override fun passSelectedImages(selectedImages: ArrayList, shouldRefresh: Boolean){
+ override fun passSelectedImages(selectedImages: ArrayList, shouldRefresh: Boolean) {
imageAdapter.setSelectedImages(selectedImages)
+ val uploadingContributions = getUploadingContributions()
+
if (!showAlreadyActionedImages && shouldRefresh) {
- imageAdapter.init(filteredImages, allImages, TreeMap())
+ imageAdapter.init(filteredImages, allImages, TreeMap(), uploadingContributions)
imageAdapter.setSelectedImages(selectedImages)
}
}
-}
\ No newline at end of file
+
+ /**
+ * Shows mark/unmark progress dialog
+ */
+ fun showMarkUnmarkProgressDialog(text: String) {
+ if (!progressDialog.isShowing) {
+ progressDialogLayout.progressDialogText.text = text
+ progressDialog.show()
+ }
+ }
+
+ /**
+ * Dismisses mark/unmark progress dialog
+ */
+ fun dismissMarkUnmarkProgressDialog() {
+ if (progressDialog.isShowing) {
+ progressDialog.dismiss()
+ }
+ }
+
+ private fun getUploadingContributions(): List {
+
+ return contributionDao.getContribution(
+ listOf(Contribution.STATE_IN_PROGRESS, Contribution.STATE_FAILED, Contribution.STATE_QUEUED, Contribution.STATE_PAUSED)
+ )?.subscribeOn(Schedulers.io())?.blockingGet() ?: emptyList()
+ }
+
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageLoader.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageLoader.kt
index 8b2bd4f17..4e3ad0902 100644
--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageLoader.kt
+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageLoader.kt
@@ -3,6 +3,7 @@ package fr.free.nrw.commons.customselector.ui.selector
import android.content.Context
import android.content.SharedPreferences
import android.net.Uri
+import fr.free.nrw.commons.contributions.Contribution
import fr.free.nrw.commons.customselector.database.NotForUploadStatusDao
import fr.free.nrw.commons.customselector.database.UploadedStatus
import fr.free.nrw.commons.customselector.database.UploadedStatusDao
@@ -75,7 +76,8 @@ class ImageLoader @Inject constructor(
holder: ImageViewHolder,
image: Image,
ioDispatcher: CoroutineDispatcher,
- defaultDispatcher: CoroutineDispatcher
+ defaultDispatcher: CoroutineDispatcher,
+ uploadedContributionsList : List
) {
/**
@@ -84,6 +86,7 @@ class ImageLoader @Inject constructor(
mapHolderImage[holder] = image
holder.itemNotUploaded()
holder.itemForUpload()
+ holder.itemNotUploading()
scope.launch {
var result: Result = Result.NOTFOUND
@@ -214,6 +217,17 @@ class ImageLoader @Inject constructor(
holder.itemNotForUpload()
} else holder.itemForUpload()
}
+
+ if (uploadedContributionsList.isNotEmpty()) {
+ for (contribution in uploadedContributionsList ) {
+ if (contribution.contentUri == image.uri && showAlreadyActionedImages) {
+ holder.itemUploading()
+ break
+ } else {
+ holder.itemNotUploading()
+ }
+ }
+ }
}
}
@@ -223,17 +237,22 @@ class ImageLoader @Inject constructor(
suspend fun nextActionableImage(
allImages: List, ioDispatcher: CoroutineDispatcher,
defaultDispatcher: CoroutineDispatcher,
- nextImagePosition: Int
+ nextImagePosition: Int,
+ currentlyUploadingImages: List
): Int {
var next: Int
-
// Traversing from given position to the end
for (i in nextImagePosition until allImages.size){
- val it = allImages[i]
- val imageSHA1: String = when (mapImageSHA1[it.uri] != null) {
- true -> mapImageSHA1[it.uri]!!
+ val currentImage = allImages[i]
+
+ if (currentlyUploadingImages.any { it.contentUri == currentImage.uri }) {
+ continue // Skip this image as it's currently being uploaded
+ }
+
+ val imageSHA1: String = when (mapImageSHA1[currentImage.uri] != null) {
+ true -> mapImageSHA1[currentImage.uri]!!
else -> CustomSelectorUtils.getImageSHA1(
- it.uri,
+ currentImage.uri,
ioDispatcher,
fileUtilsWrapper,
context.contentResolver
@@ -253,7 +272,7 @@ class ImageLoader @Inject constructor(
// If the image is not present in the already uploaded table, checks for its
// modified SHA1 in already uploaded table
if (next <= 0) {
- val modifiedImageSha1 = getSHA1(it, defaultDispatcher)
+ val modifiedImageSha1 = getSHA1(currentImage, defaultDispatcher)
next = uploadedStatusDao.findByModifiedImageSHA1(
modifiedImageSha1,
true
@@ -360,4 +379,4 @@ class ImageLoader @Inject constructor(
const val INVALIDATE_DAY_COUNT: Long = 7
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt b/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt
index 49c95343a..594f087c8 100644
--- a/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt
+++ b/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt
@@ -6,6 +6,8 @@ import androidx.room.TypeConverters
import fr.free.nrw.commons.contributions.Contribution
import fr.free.nrw.commons.contributions.ContributionDao
import fr.free.nrw.commons.customselector.database.*
+import fr.free.nrw.commons.nearby.Place
+import fr.free.nrw.commons.nearby.PlaceDao
import fr.free.nrw.commons.review.ReviewDao
import fr.free.nrw.commons.review.ReviewEntity
import fr.free.nrw.commons.upload.depicts.Depicts
@@ -15,10 +17,11 @@ import fr.free.nrw.commons.upload.depicts.DepictsDao
* The database for accessing the respective DAOs
*
*/
-@Database(entities = [Contribution::class, Depicts::class, UploadedStatus::class, NotForUploadStatus::class, ReviewEntity::class], version = 15, exportSchema = false)
+@Database(entities = [Contribution::class, Depicts::class, UploadedStatus::class, NotForUploadStatus::class, ReviewEntity::class, Place::class], version = 18, exportSchema = false)
@TypeConverters(Converters::class)
abstract class AppDatabase : RoomDatabase() {
abstract fun contributionDao(): ContributionDao
+ abstract fun PlaceDao(): PlaceDao
abstract fun DepictsDao(): DepictsDao;
abstract fun UploadedStatusDao(): UploadedStatusDao;
abstract fun NotForUploadStatusDao(): NotForUploadStatusDao
diff --git a/app/src/main/java/fr/free/nrw/commons/db/Converters.java b/app/src/main/java/fr/free/nrw/commons/db/Converters.java
index 6f0c8c1fc..a70cdc815 100644
--- a/app/src/main/java/fr/free/nrw/commons/db/Converters.java
+++ b/app/src/main/java/fr/free/nrw/commons/db/Converters.java
@@ -8,8 +8,10 @@ import fr.free.nrw.commons.CommonsApplication;
import fr.free.nrw.commons.contributions.ChunkInfo;
import fr.free.nrw.commons.di.ApplicationlessInjection;
import fr.free.nrw.commons.location.LatLng;
+import fr.free.nrw.commons.nearby.Sitelinks;
import fr.free.nrw.commons.upload.WikidataPlace;
import fr.free.nrw.commons.upload.structure.depictions.DepictedItem;
+import java.lang.reflect.Type;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -134,6 +136,18 @@ public class Converters {
return readObjectWithTypeToken(depictedItems, new TypeToken>() {});
}
+ @TypeConverter
+ public static Sitelinks sitelinksFromString(String value) {
+ Type type = new TypeToken() {}.getType();
+ return new Gson().fromJson(value, type);
+ }
+
+ @TypeConverter
+ public static String fromSitelinks(Sitelinks sitelinks) {
+ Gson gson = new Gson();
+ return gson.toJson(sitelinks);
+ }
+
private static String writeObjectToString(Object object) {
return object == null ? null : getGson().toJson(object);
}
diff --git a/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java b/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java
index 841b0624f..02f7d418e 100644
--- a/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java
+++ b/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java
@@ -13,6 +13,7 @@ import fr.free.nrw.commons.BuildConfig;
import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.actions.PageEditClient;
+import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException;
import fr.free.nrw.commons.notification.NotificationHelper;
import fr.free.nrw.commons.review.ReviewController;
import fr.free.nrw.commons.utils.ViewUtilWrapper;
@@ -66,7 +67,13 @@ public class DeleteHelper {
return delete(media, reason)
.flatMapSingle(result -> Single.just(showDeletionNotification(context, media, result)))
- .firstOrError();
+ .firstOrError()
+ .onErrorResumeNext(throwable -> {
+ if (throwable instanceof InvalidLoginTokenException) {
+ return Single.error(throwable);
+ }
+ return Single.error(throwable);
+ });
}
/**
@@ -104,22 +111,30 @@ public class DeleteHelper {
}
return pageEditClient.prependEdit(media.getFilename(), fileDeleteString + "\n", summary)
- .flatMap(result -> {
- if (result) {
- return pageEditClient.edit("Commons:Deletion_requests/" + media.getFilename(), subpageString + "\n", summary);
- }
- throw new RuntimeException("Failed to nominate for deletion");
- }).flatMap(result -> {
- if (result) {
- return pageEditClient.appendEdit("Commons:Deletion_requests/" + date, logPageString + "\n", summary);
- }
- throw new RuntimeException("Failed to nominate for deletion");
- }).flatMap(result -> {
- if (result) {
- return pageEditClient.appendEdit("User_Talk:" + creator, userPageString + "\n", summary);
- }
- throw new RuntimeException("Failed to nominate for deletion");
- });
+ .onErrorResumeNext(throwable -> {
+ if (throwable instanceof InvalidLoginTokenException) {
+ return Observable.error(throwable);
+ }
+ return Observable.error(throwable);
+ })
+ .flatMap(result -> {
+ if (result) {
+ return pageEditClient.edit("Commons:Deletion_requests/" + media.getFilename(), subpageString + "\n", summary);
+ }
+ return Observable.error(new RuntimeException("Failed to nominate for deletion"));
+ })
+ .flatMap(result -> {
+ if (result) {
+ return pageEditClient.appendEdit("Commons:Deletion_requests/" + date, logPageString + "\n", summary);
+ }
+ return Observable.error(new RuntimeException("Failed to nominate for deletion"));
+ })
+ .flatMap(result -> {
+ if (result) {
+ return pageEditClient.appendEdit("User_Talk:" + creator, userPageString + "\n", summary);
+ }
+ return Observable.error(new RuntimeException("Failed to nominate for deletion"));
+ });
}
private boolean showDeletionNotification(Context context, Media media, boolean result) {
@@ -205,6 +220,8 @@ public class DeleteHelper {
});
alert.setPositiveButton(context.getString(R.string.ok), (dialogInterface, i) -> {
+ reviewCallback.disableButtons();
+
String reason = getLocalizedResources(context, Locale.ENGLISH).getString(R.string.delete_helper_ask_alert_set_positive_button_reason) + " ";
@@ -224,13 +241,15 @@ public class DeleteHelper {
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(aBoolean -> {
- if (aBoolean) {
- reviewCallback.onSuccess();
+ reviewCallback.onSuccess();
+ }, throwable -> {
+ if (throwable instanceof InvalidLoginTokenException) {
+ reviewCallback.onTokenException((InvalidLoginTokenException) throwable);
} else {
reviewCallback.onFailure();
}
+ reviewCallback.enableButtons();
});
-
});
alert.setNegativeButton(context.getString(R.string.cancel), (dialog, which) -> reviewCallback.onFailure());
d = alert.create();
diff --git a/app/src/main/java/fr/free/nrw/commons/delete/ReasonBuilder.java b/app/src/main/java/fr/free/nrw/commons/delete/ReasonBuilder.java
index 715c83742..35d682248 100644
--- a/app/src/main/java/fr/free/nrw/commons/delete/ReasonBuilder.java
+++ b/app/src/main/java/fr/free/nrw/commons/delete/ReasonBuilder.java
@@ -2,7 +2,7 @@ package fr.free.nrw.commons.delete;
import android.content.Context;
-import org.wikipedia.util.DateUtil;
+import fr.free.nrw.commons.utils.DateUtil;
import java.util.Date;
import java.util.Locale;
diff --git a/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt b/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt
index 8d7795f5e..3ec9a9723 100644
--- a/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt
@@ -1,16 +1,21 @@
package fr.free.nrw.commons.description
+
import android.app.ProgressDialog
import android.content.Intent
import android.os.Bundle
import android.os.Parcelable
+import android.speech.RecognizerIntent
import android.view.View
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
+import fr.free.nrw.commons.CommonsApplication
+import fr.free.nrw.commons.Media
import fr.free.nrw.commons.R
+import fr.free.nrw.commons.auth.SessionManager
+import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException
import fr.free.nrw.commons.databinding.ActivityDescriptionEditBinding
import fr.free.nrw.commons.description.EditDescriptionConstants.LIST_OF_DESCRIPTION_AND_CAPTION
-import fr.free.nrw.commons.description.EditDescriptionConstants.UPDATED_WIKITEXT
import fr.free.nrw.commons.description.EditDescriptionConstants.WIKITEXT
import fr.free.nrw.commons.recentlanguages.RecentLanguagesDao
import fr.free.nrw.commons.settings.Prefs
@@ -18,8 +23,13 @@ import fr.free.nrw.commons.theme.BaseActivity
import fr.free.nrw.commons.upload.UploadMediaDetail
import fr.free.nrw.commons.upload.UploadMediaDetailAdapter
import fr.free.nrw.commons.utils.DialogUtil.showAlertDialog
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.functions.Consumer
+import io.reactivex.schedulers.Schedulers
+import timber.log.Timber
import javax.inject.Inject
+
/**
* Activity for populating and editing existing description and caption
*/
@@ -40,6 +50,11 @@ class DescriptionEditActivity : BaseActivity(), UploadMediaDetailAdapter.EventLi
*/
var wikiText: String? = null
+ /**
+ * Media object
+ */
+ var media: Media? = null
+
/**
* Saved language
*/
@@ -55,6 +70,15 @@ class DescriptionEditActivity : BaseActivity(), UploadMediaDetailAdapter.EventLi
private lateinit var binding: ActivityDescriptionEditBinding
+ private val REQUEST_CODE_FOR_VOICE_INPUT = 1213
+
+ private var descriptionAndCaptions: ArrayList? = null
+
+ @Inject lateinit var descriptionEditHelper: DescriptionEditHelper
+
+ @Inject lateinit var sessionManager: SessionManager
+
+
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -62,13 +86,21 @@ class DescriptionEditActivity : BaseActivity(), UploadMediaDetailAdapter.EventLi
setContentView(binding.root)
val bundle = intent.extras
- val descriptionAndCaptions: ArrayList =
- bundle!!.getParcelableArrayList(LIST_OF_DESCRIPTION_AND_CAPTION)!!
- wikiText = bundle.getString(WIKITEXT)
- savedLanguageValue = bundle.getString(Prefs.DESCRIPTION_LANGUAGE)!!
+
+ if (savedInstanceState != null) {
+ descriptionAndCaptions = savedInstanceState.getParcelableArrayList(LIST_OF_DESCRIPTION_AND_CAPTION)
+ wikiText = savedInstanceState.getString(WIKITEXT)
+ savedLanguageValue = savedInstanceState.getString(Prefs.DESCRIPTION_LANGUAGE)!!
+ media = savedInstanceState.getParcelable("media")
+ } else {
+ descriptionAndCaptions =
+ bundle!!.getParcelableArrayList(LIST_OF_DESCRIPTION_AND_CAPTION)!!
+ wikiText = bundle.getString(WIKITEXT)
+ savedLanguageValue = bundle.getString(Prefs.DESCRIPTION_LANGUAGE)!!
+ media = bundle.getParcelable("media")
+ }
initRecyclerView(descriptionAndCaptions)
- binding.btnAddDescription.setOnClickListener(::onButtonAddDescriptionClicked)
binding.btnEditSubmit.setOnClickListener(::onSubmitButtonClicked)
binding.toolbarBackButton.setOnClickListener(::onBackButtonClicked)
}
@@ -78,7 +110,7 @@ class DescriptionEditActivity : BaseActivity(), UploadMediaDetailAdapter.EventLi
* @param descriptionAndCaptions list of description and caption
*/
private fun initRecyclerView(descriptionAndCaptions: ArrayList?) {
- uploadMediaDetailAdapter = UploadMediaDetailAdapter(
+ uploadMediaDetailAdapter = UploadMediaDetailAdapter(this,
savedLanguageValue, descriptionAndCaptions, recentLanguagesDao)
uploadMediaDetailAdapter.setCallback { titleStringID: Int, messageStringId: Int ->
showInfoAlert(
@@ -107,17 +139,20 @@ class DescriptionEditActivity : BaseActivity(), UploadMediaDetailAdapter.EventLi
override fun onPrimaryCaptionTextChange(isNotEmpty: Boolean) {}
- private fun onBackButtonClicked(view: View) {
- onBackPressed()
- }
-
- private fun onButtonAddDescriptionClicked(view: View) {
+ /**
+ * Adds new language item to RecyclerView
+ */
+ override fun addLanguage() {
val uploadMediaDetail = UploadMediaDetail()
uploadMediaDetail.isManuallyAdded = true //This was manually added by the user
uploadMediaDetailAdapter.addDescription(uploadMediaDetail)
rvDescriptions!!.smoothScrollToPosition(uploadMediaDetailAdapter.itemCount - 1)
}
+ private fun onBackButtonClicked(view: View) {
+ onBackPressedDispatcher.onBackPressed()
+ }
+
private fun onSubmitButtonClicked(view: View) {
showLoggingProgressBar()
val uploadMediaDetails = uploadMediaDetailAdapter.items
@@ -151,22 +186,85 @@ class DescriptionEditActivity : BaseActivity(), UploadMediaDetailAdapter.EventLi
buffer.append(uploadDetails.languageCode)
buffer.append("|1=")
buffer.append(uploadDetails.descriptionText)
- buffer.append("}}, ")
+ buffer.append("}}")
}
}
buffer.replace(", $".toRegex(), "")
buffer.append(descriptionEnd)
}
- val returningIntent = Intent()
- returningIntent.putExtra(UPDATED_WIKITEXT, buffer.toString())
- returningIntent.putParcelableArrayListExtra(
- LIST_OF_DESCRIPTION_AND_CAPTION,
- uploadMediaDetails as ArrayList
- )
- setResult(RESULT_OK, returningIntent)
+ editDescription(media!!, buffer.toString(), uploadMediaDetails as ArrayList)
+
finish()
}
+ /**
+ * Edits description and caption
+ * @param media media object
+ * @param updatedWikiText updated wiki text
+ * @param uploadMediaDetails descriptions and captions
+ */
+ private fun editDescription(media : Media, updatedWikiText : String, uploadMediaDetails : ArrayList){
+
+ try {
+ descriptionEditHelper?.addDescription(
+ applicationContext, media,
+ updatedWikiText
+ )
+ ?.subscribeOn(Schedulers.io())
+ ?.observeOn(AndroidSchedulers.mainThread())
+ ?.subscribe(Consumer { s: Boolean? -> Timber.d("Descriptions are added.") })?.let {
+ compositeDisposable.add(
+ it
+ )
+ }
+ } catch (e : InvalidLoginTokenException) {
+ val username: String? = sessionManager?.userName
+ val logoutListener = CommonsApplication.BaseLogoutListener(
+ this,
+ getString(R.string.invalid_login_message),
+ username
+ )
+
+ val commonsApplication = CommonsApplication.getInstance()
+ if (commonsApplication != null ){
+ commonsApplication.clearApplicationData(this,logoutListener)
+ }
+ }
+
+
+ val updatedCaptions = LinkedHashMap()
+ for (mediaDetail in uploadMediaDetails) {
+ try {
+ compositeDisposable.add(
+ descriptionEditHelper!!.addCaption(
+ applicationContext, media,
+ mediaDetail.languageCode, mediaDetail.captionText
+ )
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe { s: Boolean? ->
+ updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText
+ media.captions = updatedCaptions
+ Timber.d("Caption is added.")
+ })
+ }
+ catch (e : InvalidLoginTokenException) {
+ val username = sessionManager.userName
+ val logoutListener = CommonsApplication.BaseLogoutListener(
+ this,
+ getString(R.string.invalid_login_message),
+ username
+ )
+
+ val commonsApplication = CommonsApplication.getInstance()
+ if (commonsApplication != null ){
+ commonsApplication.clearApplicationData(this,logoutListener)
+ }
+ }
+
+ }
+ }
+
private fun showLoggingProgressBar() {
progressDialog = ProgressDialog(this)
progressDialog!!.isIndeterminate = true
@@ -175,4 +273,24 @@ class DescriptionEditActivity : BaseActivity(), UploadMediaDetailAdapter.EventLi
progressDialog!!.setCanceledOnTouchOutside(false)
progressDialog!!.show()
}
-}
\ No newline at end of file
+
+ override
+ fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+ super.onActivityResult(requestCode, resultCode, data);
+ if (requestCode == REQUEST_CODE_FOR_VOICE_INPUT) {
+ if (resultCode == RESULT_OK && data != null) {
+ val result = data.getStringArrayListExtra( RecognizerIntent.EXTRA_RESULTS )
+ uploadMediaDetailAdapter.handleSpeechResult(result!![0]) }
+ else { Timber.e("Error %s", resultCode) }
+ }
+ }
+ override fun onSaveInstanceState(outState: Bundle) {
+ super.onSaveInstanceState(outState)
+
+ outState.putParcelableArrayList(LIST_OF_DESCRIPTION_AND_CAPTION, uploadMediaDetailAdapter.items as ArrayList)
+ outState.putString(WIKITEXT, wikiText)
+ outState.putString(Prefs.DESCRIPTION_LANGUAGE, savedLanguageValue)
+ //save Media
+ outState.putParcelable("media", media)
+ }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java b/app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java
index 6a9277906..0df9685c1 100644
--- a/app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java
+++ b/app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java
@@ -14,6 +14,7 @@ import fr.free.nrw.commons.description.DescriptionEditActivity;
import fr.free.nrw.commons.explore.depictions.WikidataItemDetailsActivity;
import fr.free.nrw.commons.explore.SearchActivity;
import fr.free.nrw.commons.media.ZoomableActivity;
+import fr.free.nrw.commons.nearby.WikidataFeedback;
import fr.free.nrw.commons.notification.NotificationActivity;
import fr.free.nrw.commons.profile.ProfileActivity;
import fr.free.nrw.commons.review.ReviewActivity;
@@ -79,4 +80,7 @@ public abstract class ActivityBuilderModule {
@ContributesAndroidInjector
abstract ZoomableActivity bindZoomableActivity();
+
+ @ContributesAndroidInjector
+ abstract WikidataFeedback bindWikiFeedback();
}
diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java
index 33896f768..1390bd8ef 100644
--- a/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java
+++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java
@@ -2,10 +2,11 @@ package fr.free.nrw.commons.di;
import com.google.gson.Gson;
+import fr.free.nrw.commons.actions.PageEditClient;
import fr.free.nrw.commons.explore.categories.CategoriesModule;
import fr.free.nrw.commons.navtab.MoreBottomSheetFragment;
import fr.free.nrw.commons.navtab.MoreBottomSheetLoggedOutFragment;
-import fr.free.nrw.commons.navtab.NavTabLayout;
+import fr.free.nrw.commons.nearby.NearbyController;
import fr.free.nrw.commons.upload.worker.UploadWorker;
import javax.inject.Singleton;
@@ -69,6 +70,9 @@ public interface CommonsApplicationComponent extends AndroidInjector>()
+ private lateinit var binding: ActivityEditBinding
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ binding = ActivityEditBinding.inflate(layoutInflater)
+ setContentView(binding.root)
+ supportActionBar?.title = ""
+ val intent = intent
+ imageUri = intent.getStringExtra("image") ?: ""
+ vm = ViewModelProvider(this).get(EditViewModel::class.java)
+ val sourceExif = imageUri.toUri().path?.let { ExifInterface(it) }
+ val exifTags = arrayOf(
+ ExifInterface.TAG_APERTURE,
+ ExifInterface.TAG_DATETIME,
+ ExifInterface.TAG_EXPOSURE_TIME,
+ ExifInterface.TAG_FLASH,
+ ExifInterface.TAG_FOCAL_LENGTH,
+ ExifInterface.TAG_GPS_ALTITUDE,
+ ExifInterface.TAG_GPS_ALTITUDE_REF,
+ ExifInterface.TAG_GPS_DATESTAMP,
+ ExifInterface.TAG_GPS_LATITUDE,
+ ExifInterface.TAG_GPS_LATITUDE_REF,
+ ExifInterface.TAG_GPS_LONGITUDE,
+ ExifInterface.TAG_GPS_LONGITUDE_REF,
+ ExifInterface.TAG_GPS_PROCESSING_METHOD,
+ ExifInterface.TAG_GPS_TIMESTAMP,
+ ExifInterface.TAG_IMAGE_LENGTH,
+ ExifInterface.TAG_IMAGE_WIDTH,
+ ExifInterface.TAG_ISO,
+ ExifInterface.TAG_MAKE,
+ ExifInterface.TAG_MODEL,
+ ExifInterface.TAG_ORIENTATION,
+ ExifInterface.TAG_WHITE_BALANCE,
+ ExifInterface.WHITEBALANCE_AUTO,
+ ExifInterface.WHITEBALANCE_MANUAL
+ )
+ for (tag in exifTags) {
+ val attribute = sourceExif?.getAttribute(tag.toString())
+ sourceExifAttributeList.add(Pair(tag.toString(), attribute))
+ }
+
+ init()
+ }
+
+ /**
+ * Initializes the ImageView and associated UI elements.
+ *
+ * This function sets up the ImageView for displaying an image, adjusts its view bounds,
+ * and scales the initial image to fit within the ImageView. It also sets click listeners
+ * for the "Rotate" and "Save" buttons.
+ */
+ private fun init() {
+ binding.iv.adjustViewBounds = true
+ binding.iv.scaleType = ImageView.ScaleType.MATRIX
+ binding.iv.post(Runnable {
+ val options = BitmapFactory.Options()
+ options.inJustDecodeBounds = true
+ BitmapFactory.decodeFile(imageUri, options)
+
+ val bitmapWidth = options.outWidth
+ val bitmapHeight = options.outHeight
+
+ // Check if the bitmap dimensions exceed a certain threshold
+ val maxBitmapSize = 2000 // Set your maximum size here
+ if (bitmapWidth > maxBitmapSize || bitmapHeight > maxBitmapSize) {
+ val scaleFactor = calculateScaleFactor(bitmapWidth, bitmapHeight, maxBitmapSize)
+ options.inSampleSize = scaleFactor
+ options.inJustDecodeBounds = false
+ val scaledBitmap = BitmapFactory.decodeFile(imageUri, options)
+ binding.iv.setImageBitmap(scaledBitmap)
+ // Update the ImageView with the scaled bitmap
+ val scale = binding.iv.measuredWidth.toFloat() / scaledBitmap.width.toFloat()
+ binding.iv.layoutParams.height = (scale * scaledBitmap.height).toInt()
+ binding.iv.imageMatrix = scaleMatrix(scale, scale)
+ } else {
+
+ options.inJustDecodeBounds = false
+ val bitmap = BitmapFactory.decodeFile(imageUri, options)
+ binding.iv.setImageBitmap(bitmap)
+
+ val scale = binding.iv.measuredWidth.toFloat() / bitmapWidth.toFloat()
+ binding.iv.layoutParams.height = (scale * bitmapHeight).toInt()
+ binding.iv.imageMatrix = scaleMatrix(scale, scale)
+ }
+ })
+ binding.rotateBtn.setOnClickListener {
+ animateImageHeight()
+ }
+ binding.btnSave.setOnClickListener {
+ getRotatedImage()
+ }
+ }
+
+ var imageRotation = 0
+
+ /**
+ * Animates the height, rotation, and scale of an ImageView to provide a smooth
+ * transition effect when rotating an image by 90 degrees.
+ *
+ * This function calculates the new height, rotation, and scale for the ImageView
+ * based on the current image rotation angle and animates the changes using a
+ * ValueAnimator. It also disables a rotate button during the animation to prevent
+ * further rotation actions.
+ */
+ private fun animateImageHeight() {
+ val drawableWidth: Float = binding.iv.getDrawable().getIntrinsicWidth().toFloat()
+ val drawableHeight: Float = binding.iv.getDrawable().getIntrinsicHeight().toFloat()
+ val viewWidth: Float = binding.iv.getMeasuredWidth().toFloat()
+ val viewHeight: Float = binding.iv.getMeasuredHeight().toFloat()
+ val rotation = imageRotation % 360
+ val newRotation = rotation + 90
+
+ val newViewHeight: Int
+ val imageScale: Float
+ val newImageScale: Float
+
+ Timber.d("Rotation $rotation")
+ Timber.d("new Rotation $newRotation")
+
+
+ if (rotation == 0 || rotation == 180) {
+ imageScale = viewWidth / drawableWidth
+ newImageScale = viewWidth / drawableHeight
+ newViewHeight = (drawableWidth * newImageScale).toInt()
+ } else if (rotation == 90 || rotation == 270) {
+ imageScale = viewWidth / drawableHeight
+ newImageScale = viewWidth / drawableWidth
+ newViewHeight = (drawableHeight * newImageScale).toInt()
+ } else {
+ throw UnsupportedOperationException("rotation can 0, 90, 180 or 270. \${rotation} is unsupported")
+ }
+
+ val animator = ValueAnimator.ofFloat(0f, 1f).setDuration(1000L)
+
+ animator.interpolator = AccelerateDecelerateInterpolator()
+
+ animator.addListener(object : AnimatorListener {
+ override fun onAnimationStart(animation: Animator) {
+ binding.rotateBtn.setEnabled(false)
+ }
+
+ override fun onAnimationEnd(animation: Animator) {
+ imageRotation = newRotation % 360
+ binding.rotateBtn.setEnabled(true)
+ }
+
+ override fun onAnimationCancel(animation: Animator) {
+ }
+
+ override fun onAnimationRepeat(animation: Animator) {
+ }
+
+ })
+
+ animator.addUpdateListener { animation ->
+ val animVal = animation.animatedValue as Float
+ val complementaryAnimVal = 1 - animVal
+ val animatedHeight =
+ (complementaryAnimVal * viewHeight + animVal * newViewHeight).toInt()
+ val animatedScale = complementaryAnimVal * imageScale + animVal * newImageScale
+ val animatedRotation = complementaryAnimVal * rotation + animVal * newRotation
+ binding.iv.getLayoutParams().height = animatedHeight
+ val matrix: Matrix = rotationMatrix(
+ animatedRotation,
+ drawableWidth / 2,
+ drawableHeight / 2
+ )
+ matrix.postScale(
+ animatedScale,
+ animatedScale,
+ drawableWidth / 2,
+ drawableHeight / 2
+ )
+ matrix.postTranslate(
+ -(drawableWidth - binding.iv.getMeasuredWidth()) / 2,
+ -(drawableHeight - binding.iv.getMeasuredHeight()) / 2
+ )
+ binding.iv.setImageMatrix(matrix)
+ binding.iv.requestLayout()
+ }
+
+ animator.start()
+ }
+
+ /**
+ * Rotates and edits the current image, copies EXIF data, and returns the edited image path.
+ *
+ * This function retrieves the path of the current image specified by `imageUri`,
+ * rotates it based on the `imageRotation` angle using the `rotateImage` method
+ * from the `vm`, and updates the EXIF attributes of the
+ * rotated image based on the `sourceExifAttributeList`. It then copies the EXIF data
+ * using the `copyExifData` method, creates an Intent to return the edited image's file path
+ * as a result, and finishes the current activity.
+ */
+ fun getRotatedImage() {
+
+ val filePath = imageUri.toUri().path
+ val file = filePath?.let { File(it) }
+
+
+ val rotatedImage = file?.let { vm.rotateImage(imageRotation, it) }
+ if (rotatedImage == null) {
+ Toast.makeText(this, "Failed to rotate to image", Toast.LENGTH_LONG).show()
+ }
+ val editedImageExif: ExifInterface?
+ if (rotatedImage?.path != null) {
+ editedImageExif = ExifInterface(rotatedImage.path)
+ copyExifData(editedImageExif)
+ }
+ val resultIntent = Intent()
+ resultIntent.putExtra("editedImageFilePath", rotatedImage?.toUri()?.path ?: "Error");
+ setResult(RESULT_OK, resultIntent);
+ finish();
+ }
+
+ /**
+ * Copies EXIF data from sourceExifAttributeList to the provided ExifInterface object.
+ *
+ * This function iterates over the `sourceExifAttributeList` and sets the EXIF attributes
+ * on the provided `editedImageExif` object.
+ *
+ * @param editedImageExif The ExifInterface object for the edited image.
+ */
+ private fun copyExifData(editedImageExif: ExifInterface?) {
+
+ for (attr in sourceExifAttributeList) {
+ Log.d("Tag is ${attr.first}", "Value is ${attr.second}")
+ editedImageExif!!.setAttribute(attr.first, attr.second)
+ Log.d("Tag is ${attr.first}", "Value is ${attr.second}")
+ }
+
+ editedImageExif?.saveAttributes()
+ }
+
+ /**
+ * Calculates the scale factor to be used for scaling down a bitmap based on its original
+ * dimensions and the maximum allowed size.
+ * @param originalWidth The original width of the bitmap.
+ * @param originalHeight The original height of the bitmap.
+ * @param maxSize The maximum allowed size for either width or height.
+ * @return The scale factor to be used for scaling down the bitmap.
+ * If the bitmap is smaller than or equal to the maximum size in both dimensions,
+ * the scale factor is 1.
+ * If the bitmap is larger than the maximum size in either dimension,
+ * the scale factor is calculated as the largest power of 2 that is less than or equal
+ * to the ratio of the original dimension to the maximum size.
+ * The scale factor ensures that the scaled bitmap will fit within the maximum size
+ * while maintaining aspect ratio.
+ */
+ private fun calculateScaleFactor(originalWidth: Int, originalHeight: Int, maxSize: Int): Int {
+ var scaleFactor = 1
+
+ if (originalWidth > maxSize || originalHeight > maxSize) {
+ // Calculate the largest power of 2 that is less than or equal to the desired width and height
+ val widthRatio = Math.ceil((originalWidth.toDouble() / maxSize.toDouble())).toInt()
+ val heightRatio = Math.ceil((originalHeight.toDouble() / maxSize.toDouble())).toInt()
+
+ scaleFactor = if (widthRatio > heightRatio) widthRatio else heightRatio
+ }
+
+ return scaleFactor
+ }
+
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/fr/free/nrw/commons/edit/EditViewModel.kt b/app/src/main/java/fr/free/nrw/commons/edit/EditViewModel.kt
new file mode 100644
index 000000000..80db0f1ab
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/edit/EditViewModel.kt
@@ -0,0 +1,27 @@
+package fr.free.nrw.commons.edit
+
+import androidx.lifecycle.ViewModel
+import java.io.File
+
+/**
+ * ViewModel for image editing operations.
+ *
+ * This ViewModel class is responsible for managing image editing operations, such as
+ * rotating images. It utilizes a TransformImage implementation to perform image transformations.
+ */
+class EditViewModel() : ViewModel() {
+
+ // Ideally should be injected using DI
+ private val transformImage: TransformImage = TransformImageImpl()
+
+ /**
+ * Rotates the specified image file by the given degree.
+ *
+ * @param degree The degree by which to rotate the image.
+ * @param imageFile The File representing the image to be rotated.
+ * @return The rotated image File, or null if the rotation operation fails.
+ */
+ fun rotateImage(degree: Int, imageFile: File): File? {
+ return transformImage.rotateImage(imageFile, degree)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/fr/free/nrw/commons/edit/TransformImage.kt b/app/src/main/java/fr/free/nrw/commons/edit/TransformImage.kt
new file mode 100644
index 000000000..4c3607a8e
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/edit/TransformImage.kt
@@ -0,0 +1,21 @@
+package fr.free.nrw.commons.edit
+
+import java.io.File
+
+/**
+ * Interface for image transformation operations.
+ *
+ * This interface defines a contract for image transformation operations, allowing
+ * implementations to provide specific functionality for tasks like rotating images.
+ */
+interface TransformImage {
+
+ /**
+ * Rotates the specified image file by the given degree.
+ *
+ * @param imageFile The File representing the image to be rotated.
+ * @param degree The degree by which to rotate the image.
+ * @return The rotated image File, or null if the rotation operation fails.
+ */
+ fun rotateImage(imageFile: File, degree : Int ):File?
+}
\ No newline at end of file
diff --git a/app/src/main/java/fr/free/nrw/commons/edit/TransformImageImpl.kt b/app/src/main/java/fr/free/nrw/commons/edit/TransformImageImpl.kt
new file mode 100644
index 000000000..fb96ca044
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/edit/TransformImageImpl.kt
@@ -0,0 +1,74 @@
+package fr.free.nrw.commons.edit
+
+import android.mediautil.image.jpeg.LLJTran
+import android.mediautil.image.jpeg.LLJTranException
+import android.os.Environment
+import timber.log.Timber
+import java.io.BufferedOutputStream
+import java.io.File
+import java.io.FileOutputStream
+
+/**
+ * Implementation of the TransformImage interface for image rotation operations.
+ *
+ * This class provides an implementation for the TransformImage interface, right now it exposes a
+ * function for rotating images by a specified degree using the LLJTran library. Right now it reads
+ * the input image file, performs the rotation, and saves the rotated image to a new file.
+ */
+class TransformImageImpl() : TransformImage {
+
+ /**
+ * Rotates the specified image file by the given degree.
+ *
+ * @param imageFile The File representing the image to be rotated.
+ * @param degree The degree by which to rotate the image.
+ * @return The rotated image File, or null if the rotation operation fails.
+ */
+ override fun rotateImage(imageFile: File, degree : Int): File? {
+
+ Timber.tag("Trying to rotate image").d("Starting")
+
+ val path = Environment.getExternalStoragePublicDirectory(
+ Environment.DIRECTORY_DOWNLOADS
+ )
+
+ val imagePath = System.currentTimeMillis()
+ val file: File = File(path, "$imagePath.jpg")
+
+ val output = file
+
+ val rotated = try {
+ val lljTran = LLJTran(imageFile)
+ lljTran.read(
+ LLJTran.READ_ALL,
+ false,
+ ) // This could throw an LLJTranException. I am not catching it for now... Let's see.
+ lljTran.transform(
+ when(degree){
+ 90 -> LLJTran.ROT_90
+ 180 -> LLJTran.ROT_180
+ 270 -> LLJTran.ROT_270
+ else -> {
+ LLJTran.ROT_90
+ }
+ },
+ LLJTran.OPT_DEFAULTS or LLJTran.OPT_XFORM_ORIENTATION
+ )
+ BufferedOutputStream(FileOutputStream(output)).use { writer ->
+ lljTran.save(writer, LLJTran.OPT_WRITE_ALL )
+ }
+ lljTran.freeMemory()
+ true
+ } catch (e: LLJTranException) {
+ Timber.tag("Error").d(e)
+ return null
+ false
+ }
+
+ if (rotated) {
+ Timber.tag("Done rotating image").d("Done")
+ Timber.tag("Add").d(output.absolutePath)
+ }
+ return output
+ }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/ExploreFragment.java b/app/src/main/java/fr/free/nrw/commons/explore/ExploreFragment.java
index 470aea3df..c66cd5163 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/ExploreFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/explore/ExploreFragment.java
@@ -11,12 +11,11 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
-import butterknife.BindView;
-import butterknife.ButterKnife;
import com.google.android.material.tabs.TabLayout;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.ViewPagerAdapter;
import fr.free.nrw.commons.contributions.MainActivity;
+import fr.free.nrw.commons.databinding.FragmentExploreBinding;
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
import fr.free.nrw.commons.kvstore.JsonKvStore;
import fr.free.nrw.commons.theme.BaseActivity;
@@ -33,10 +32,8 @@ public class ExploreFragment extends CommonsDaggerSupportFragment {
private static final String EXPLORE_MAP = "Map";
private static final String MEDIA_DETAILS_FRAGMENT_TAG = "MediaDetailsFragment";
- @BindView(R.id.tab_layout)
- TabLayout tabLayout;
- @BindView(R.id.viewPager)
- ParentViewPager viewPager;
+
+ public FragmentExploreBinding binding;
ViewPagerAdapter viewPagerAdapter;
private ExploreListRootFragment featuredRootFragment;
private ExploreListRootFragment mobileRootFragment;
@@ -46,7 +43,10 @@ public class ExploreFragment extends CommonsDaggerSupportFragment {
public JsonKvStore applicationKvStore;
public void setScroll(boolean canScroll){
- viewPager.setCanScroll(canScroll);
+ if (binding != null)
+ {
+ binding.viewPager.setCanScroll(canScroll);
+ }
}
@NonNull
@@ -56,22 +56,17 @@ public class ExploreFragment extends CommonsDaggerSupportFragment {
return fragment;
}
- @Override
- public void onCreate(@Nullable final Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- }
-
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- View view = inflater.inflate(R.layout.fragment_explore, container, false);
- ButterKnife.bind(this, view);
+ binding = FragmentExploreBinding.inflate(inflater, container, false);
+
viewPagerAdapter = new ViewPagerAdapter(getChildFragmentManager());
- viewPager.setAdapter(viewPagerAdapter);
- viewPager.setId(R.id.viewPager);
- tabLayout.setupWithViewPager(viewPager);
- viewPager.addOnPageChangeListener(new OnPageChangeListener() {
+ binding.viewPager.setAdapter(viewPagerAdapter);
+ binding.viewPager.setId(R.id.viewPager);
+ binding.tabLayout.setupWithViewPager(binding.viewPager);
+ binding.viewPager.addOnPageChangeListener(new OnPageChangeListener() {
@Override
public void onPageScrolled(int position, float positionOffset,
int positionOffsetPixels) {
@@ -81,9 +76,9 @@ public class ExploreFragment extends CommonsDaggerSupportFragment {
@Override
public void onPageSelected(int position) {
if (position == 2) {
- viewPager.setCanScroll(false);
+ binding.viewPager.setCanScroll(false);
} else {
- viewPager.setCanScroll(true);
+ binding.viewPager.setCanScroll(true);
}
}
@@ -94,7 +89,7 @@ public class ExploreFragment extends CommonsDaggerSupportFragment {
});
setTabs();
setHasOptionsMenu(true);
- return view;
+ return binding.getRoot();
}
/**
@@ -133,13 +128,13 @@ public class ExploreFragment extends CommonsDaggerSupportFragment {
}
public boolean onBackPressed() {
- if (tabLayout.getSelectedTabPosition() == 0) {
+ if (binding.tabLayout.getSelectedTabPosition() == 0) {
if (featuredRootFragment.backPressed()) {
((BaseActivity) getActivity()).getSupportActionBar()
.setDisplayHomeAsUpEnabled(false);
return true;
}
- } else if (tabLayout.getSelectedTabPosition() == 1) { //Mobile root fragment
+ } else if (binding.tabLayout.getSelectedTabPosition() == 1) { //Mobile root fragment
if (mobileRootFragment.backPressed()) {
((BaseActivity) getActivity()).getSupportActionBar()
.setDisplayHomeAsUpEnabled(false);
@@ -180,6 +175,12 @@ public class ExploreFragment extends CommonsDaggerSupportFragment {
return super.onOptionsItemSelected(item);
}
}
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ binding = null;
+ }
}
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/ExploreListRootFragment.java b/app/src/main/java/fr/free/nrw/commons/explore/ExploreListRootFragment.java
index 1b32d1423..f3948caa7 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/ExploreListRootFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/explore/ExploreListRootFragment.java
@@ -9,12 +9,11 @@ import android.widget.FrameLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
-import butterknife.BindView;
-import butterknife.ButterKnife;
import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.category.CategoryImagesCallback;
import fr.free.nrw.commons.contributions.MainActivity;
+import fr.free.nrw.commons.databinding.FragmentFeaturedRootBinding;
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
import fr.free.nrw.commons.explore.categories.media.CategoriesMediaFragment;
import fr.free.nrw.commons.media.MediaDetailPagerFragment;
@@ -26,8 +25,7 @@ public class ExploreListRootFragment extends CommonsDaggerSupportFragment implem
private MediaDetailPagerFragment mediaDetails;
private CategoriesMediaFragment listFragment;
- @BindView(R.id.explore_container)
- FrameLayout container;
+ private FragmentFeaturedRootBinding binding;
public ExploreListRootFragment() {
//empty constructor necessary otherwise crashes on recreate
@@ -47,9 +45,9 @@ public class ExploreListRootFragment extends CommonsDaggerSupportFragment implem
@Nullable final ViewGroup container,
@Nullable final Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- View view = inflater.inflate(R.layout.fragment_featured_root, container, false);
- ButterKnife.bind(this, view);
- return view;
+
+ binding = FragmentFeaturedRootBinding.inflate(inflater, container, false);
+ return binding.getRoot();
}
@Override
@@ -109,9 +107,13 @@ public class ExploreListRootFragment extends CommonsDaggerSupportFragment implem
@Override
public void onMediaClicked(int position) {
- container.setVisibility(View.VISIBLE);
- ((ExploreFragment) getParentFragment()).tabLayout.setVisibility(View.GONE);
- mediaDetails = new MediaDetailPagerFragment(false, true);
+ if (binding!=null) {
+ binding.exploreContainer.setVisibility(View.VISIBLE);
+ }
+ if (((ExploreFragment) getParentFragment()).binding!=null) {
+ ((ExploreFragment) getParentFragment()).binding.tabLayout.setVisibility(View.GONE);
+ }
+ mediaDetails = MediaDetailPagerFragment.newInstance(false, true);
((ExploreFragment) getParentFragment()).setScroll(false);
setFragment(mediaDetails, listFragment);
mediaDetails.showImage(position);
@@ -185,16 +187,29 @@ public class ExploreListRootFragment extends CommonsDaggerSupportFragment implem
*/
public boolean backPressed() {
if (null != mediaDetails && mediaDetails.isVisible()) {
- ((ExploreFragment) getParentFragment()).tabLayout.setVisibility(View.VISIBLE);
+ if (((ExploreFragment) getParentFragment()).binding != null) {
+ ((ExploreFragment) getParentFragment()).binding.tabLayout.setVisibility(View.VISIBLE);
+ }
removeFragment(mediaDetails);
((ExploreFragment) getParentFragment()).setScroll(true);
setFragment(listFragment, mediaDetails);
((MainActivity) getActivity()).showTabs();
return true;
} else {
- ((MainActivity) getActivity()).setSelectedItemId(NavTab.CONTRIBUTIONS.code());
+ if (((MainActivity) getActivity()) != null) {
+ ((MainActivity) getActivity()).setSelectedItemId(NavTab.CONTRIBUTIONS.code());
+ }
+ }
+ if (((MainActivity) getActivity()) != null) {
+ ((MainActivity) getActivity()).showTabs();
}
- ((MainActivity) getActivity()).showTabs();
return false;
}
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+
+ binding = null;
+ }
}
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/ExploreMapRootFragment.java b/app/src/main/java/fr/free/nrw/commons/explore/ExploreMapRootFragment.java
index 385cd886a..2653b4409 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/ExploreMapRootFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/explore/ExploreMapRootFragment.java
@@ -9,12 +9,11 @@ import android.widget.FrameLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
-import butterknife.BindView;
-import butterknife.ButterKnife;
import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.category.CategoryImagesCallback;
import fr.free.nrw.commons.contributions.MainActivity;
+import fr.free.nrw.commons.databinding.FragmentFeaturedRootBinding;
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
import fr.free.nrw.commons.explore.map.ExploreMapFragment;
import fr.free.nrw.commons.media.MediaDetailPagerFragment;
@@ -26,8 +25,7 @@ public class ExploreMapRootFragment extends CommonsDaggerSupportFragment impleme
private MediaDetailPagerFragment mediaDetails;
private ExploreMapFragment mapFragment;
- @BindView(R.id.explore_container)
- FrameLayout container;
+ private FragmentFeaturedRootBinding binding;
public ExploreMapRootFragment() {
//empty constructor necessary otherwise crashes on recreate
@@ -54,9 +52,10 @@ public class ExploreMapRootFragment extends CommonsDaggerSupportFragment impleme
@Nullable final ViewGroup container,
@Nullable final Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- View view = inflater.inflate(R.layout.fragment_featured_root, container, false);
- ButterKnife.bind(this, view);
- return view;
+
+ binding = FragmentFeaturedRootBinding.inflate(inflater, container, false);
+
+ return binding.getRoot();
}
@Override
@@ -116,9 +115,9 @@ public class ExploreMapRootFragment extends CommonsDaggerSupportFragment impleme
@Override
public void onMediaClicked(int position) {
- container.setVisibility(View.VISIBLE);
- ((ExploreFragment) getParentFragment()).tabLayout.setVisibility(View.GONE);
- mediaDetails = new MediaDetailPagerFragment(false, true);
+ binding.exploreContainer.setVisibility(View.VISIBLE);
+ ((ExploreFragment) getParentFragment()).binding.tabLayout.setVisibility(View.GONE);
+ mediaDetails = MediaDetailPagerFragment.newInstance(false, true);
((ExploreFragment) getParentFragment()).setScroll(false);
setFragment(mediaDetails, mapFragment);
mediaDetails.showImage(position);
@@ -192,7 +191,7 @@ public class ExploreMapRootFragment extends CommonsDaggerSupportFragment impleme
*/
public boolean backPressed() {
if (null != mediaDetails && mediaDetails.isVisible()) {
- ((ExploreFragment) getParentFragment()).tabLayout.setVisibility(View.VISIBLE);
+ ((ExploreFragment) getParentFragment()).binding.tabLayout.setVisibility(View.VISIBLE);
removeFragment(mediaDetails);
((ExploreFragment) getParentFragment()).setScroll(true);
setFragment(mapFragment, mediaDetails);
@@ -213,4 +212,11 @@ public class ExploreMapRootFragment extends CommonsDaggerSupportFragment impleme
((MainActivity) getActivity()).showTabs();
return false;
}
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+
+ binding = null;
+ }
}
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java b/app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java
index 6701d2c27..7717f2deb 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java
@@ -3,23 +3,17 @@ package fr.free.nrw.commons.explore;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.SearchView;
import androidx.annotation.NonNull;
-import androidx.appcompat.widget.Toolbar;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
-import androidx.viewpager.widget.ViewPager;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import com.google.android.material.tabs.TabLayout;
import com.jakewharton.rxbinding2.view.RxView;
import com.jakewharton.rxbinding2.widget.RxSearchView;
import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.ViewPagerAdapter;
import fr.free.nrw.commons.category.CategoryImagesCallback;
+import fr.free.nrw.commons.databinding.ActivitySearchBinding;
import fr.free.nrw.commons.explore.categories.search.SearchCategoryFragment;
import fr.free.nrw.commons.explore.depictions.search.SearchDepictionsFragment;
import fr.free.nrw.commons.explore.media.SearchMediaFragment;
@@ -45,13 +39,6 @@ import timber.log.Timber;
public class SearchActivity extends BaseActivity
implements MediaDetailPagerFragment.MediaDetailProvider, CategoryImagesCallback {
- @BindView(R.id.toolbar_search) Toolbar toolbar;
- @BindView(R.id.searchHistoryContainer) FrameLayout searchHistoryContainer;
- @BindView(R.id.mediaContainer) FrameLayout mediaContainer;
- @BindView(R.id.searchBox) SearchView searchView;
- @BindView(R.id.tab_layout) TabLayout tabLayout;
- @BindView(R.id.viewPager) ViewPager viewPager;
-
@Inject
RecentSearchesDao recentSearchesDao;
@@ -63,25 +50,28 @@ public class SearchActivity extends BaseActivity
private MediaDetailPagerFragment mediaDetails;
ViewPagerAdapter viewPagerAdapter;
+ private ActivitySearchBinding binding;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_search);
- ButterKnife.bind(this);
+ binding = ActivitySearchBinding.inflate(getLayoutInflater());
+ setContentView(binding.getRoot());
+
setTitle(getString(R.string.title_activity_search));
- setSupportActionBar(toolbar);
+ setSupportActionBar(binding.toolbarSearch);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
- toolbar.setNavigationOnClickListener(v->onBackPressed());
+ binding.toolbarSearch.setNavigationOnClickListener(v->onBackPressed());
supportFragmentManager = getSupportFragmentManager();
setSearchHistoryFragment();
viewPagerAdapter = new ViewPagerAdapter(getSupportFragmentManager());
- viewPager.setAdapter(viewPagerAdapter);
- viewPager.setOffscreenPageLimit(2); // Because we want all the fragments to be alive
- tabLayout.setupWithViewPager(viewPager);
+ binding.viewPager.setAdapter(viewPagerAdapter);
+ binding.viewPager.setOffscreenPageLimit(2); // Because we want all the fragments to be alive
+ binding.tabLayout.setupWithViewPager(binding.viewPager);
setTabs();
- searchView.setQueryHint(getString(R.string.search_commons));
- searchView.onActionViewExpanded();
- searchView.clearFocus();
+ binding.searchBox.setQueryHint(getString(R.string.search_commons));
+ binding.searchBox.onActionViewExpanded();
+ binding.searchBox.clearFocus();
}
@@ -113,8 +103,8 @@ public class SearchActivity extends BaseActivity
viewPagerAdapter.setTabData(fragmentList, titleList);
viewPagerAdapter.notifyDataSetChanged();
- compositeDisposable.add(RxSearchView.queryTextChanges(searchView)
- .takeUntil(RxView.detaches(searchView))
+ compositeDisposable.add(RxSearchView.queryTextChanges(binding.searchBox)
+ .takeUntil(RxView.detaches(binding.searchBox))
.debounce(500, TimeUnit.MILLISECONDS)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(this::handleSearch, Timber::e
@@ -124,9 +114,9 @@ public class SearchActivity extends BaseActivity
private void handleSearch(final CharSequence query) {
if (!TextUtils.isEmpty(query)) {
saveRecentSearch(query.toString());
- viewPager.setVisibility(View.VISIBLE);
- tabLayout.setVisibility(View.VISIBLE);
- searchHistoryContainer.setVisibility(View.GONE);
+ binding.viewPager.setVisibility(View.VISIBLE);
+ binding.tabLayout.setVisibility(View.VISIBLE);
+ binding.searchHistoryContainer.setVisibility(View.GONE);
if (FragmentUtils.isFragmentUIActive(searchDepictionsFragment)) {
searchDepictionsFragment.onQueryUpdated(query.toString());
@@ -144,10 +134,10 @@ public class SearchActivity extends BaseActivity
else {
//Open RecentSearchesFragment
recentSearchesFragment.updateRecentSearches();
- viewPager.setVisibility(View.GONE);
- tabLayout.setVisibility(View.GONE);
+ binding.viewPager.setVisibility(View.GONE);
+ binding.tabLayout.setVisibility(View.GONE);
setSearchHistoryFragment();
- searchHistoryContainer.setVisibility(View.VISIBLE);
+ binding.searchHistoryContainer.setVisibility(View.VISIBLE);
}
}
@@ -215,13 +205,13 @@ public class SearchActivity extends BaseActivity
@Override
public void onMediaClicked(int index) {
ViewUtil.hideKeyboard(this.findViewById(R.id.searchBox));
- tabLayout.setVisibility(View.GONE);
- viewPager.setVisibility(View.GONE);
- mediaContainer.setVisibility(View.VISIBLE);
- searchView.setVisibility(View.GONE);// to remove searchview when mediaDetails fragment open
+ binding.tabLayout.setVisibility(View.GONE);
+ binding.viewPager.setVisibility(View.GONE);
+ binding.mediaContainer.setVisibility(View.VISIBLE);
+ binding.searchBox.setVisibility(View.GONE);// to remove searchview when mediaDetails fragment open
if (mediaDetails == null || !mediaDetails.isVisible()) {
// set isFeaturedImage true for featured images, to include author field on media detail
- mediaDetails = new MediaDetailPagerFragment(false, true);
+ mediaDetails = MediaDetailPagerFragment.newInstance(false, true);
supportFragmentManager
.beginTransaction()
.hide(supportFragmentManager.getFragments().get(supportFragmentManager.getBackStackEntryCount()))
@@ -269,12 +259,12 @@ public class SearchActivity extends BaseActivity
}
if (getSupportFragmentManager().getBackStackEntryCount() == 1) {
// back to search so show search toolbar and hide navigation toolbar
- searchView.setVisibility(View.VISIBLE);//set the searchview
- tabLayout.setVisibility(View.VISIBLE);
- viewPager.setVisibility(View.VISIBLE);
- mediaContainer.setVisibility(View.GONE);
+ binding.searchBox.setVisibility(View.VISIBLE);//set the searchview
+ binding.tabLayout.setVisibility(View.VISIBLE);
+ binding.viewPager.setVisibility(View.VISIBLE);
+ binding.mediaContainer.setVisibility(View.GONE);
} else {
- toolbar.setVisibility(View.GONE);
+ binding.toolbarSearch.setVisibility(View.GONE);
}
super.onBackPressed();
}
@@ -284,15 +274,16 @@ public class SearchActivity extends BaseActivity
* @param query Recent Search Query
*/
public void updateText(String query) {
- searchView.setQuery(query, true);
+ binding.searchBox.setQuery(query, true);
// Clear focus of searchView now. searchView.clearFocus(); does not seem to work Check the below link for more details.
// https://stackoverflow.com/questions/6117967/how-to-remove-focus-without-setting-focus-to-another-control/15481511
- viewPager.requestFocus();
+ binding.viewPager.requestFocus();
}
@Override protected void onDestroy() {
super.onDestroy();
//Dispose the disposables when the activity is destroyed
compositeDisposable.dispose();
+ binding = null;
}
}
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictsClient.kt b/app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictsClient.kt
index 931520e5b..e01e12f55 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictsClient.kt
+++ b/app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictsClient.kt
@@ -7,11 +7,11 @@ import fr.free.nrw.commons.upload.depicts.DepictsInterface
import fr.free.nrw.commons.upload.structure.depictions.DepictedItem
import fr.free.nrw.commons.upload.structure.depictions.get
import fr.free.nrw.commons.wikidata.WikidataProperties
+import fr.free.nrw.commons.wikidata.model.DataValue
import fr.free.nrw.commons.wikidata.model.DepictSearchItem
+import fr.free.nrw.commons.wikidata.model.Entities
+import fr.free.nrw.commons.wikidata.model.Statement_partial
import io.reactivex.Single
-import org.wikipedia.wikidata.DataValue
-import org.wikipedia.wikidata.Entities
-import org.wikipedia.wikidata.Statement_partial
import java.util.*
import javax.inject.Inject
import javax.inject.Singleton
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/WikidataItemDetailsActivity.java b/app/src/main/java/fr/free/nrw/commons/explore/depictions/WikidataItemDetailsActivity.java
index 6f250ef60..cf7269123 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/depictions/WikidataItemDetailsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/explore/depictions/WikidataItemDetailsActivity.java
@@ -13,8 +13,6 @@ import androidx.appcompat.widget.Toolbar;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.viewpager.widget.ViewPager;
-import butterknife.BindView;
-import butterknife.ButterKnife;
import com.google.android.material.snackbar.Snackbar;
import com.google.android.material.tabs.TabLayout;
import fr.free.nrw.commons.Media;
@@ -23,6 +21,7 @@ import fr.free.nrw.commons.Utils;
import fr.free.nrw.commons.ViewPagerAdapter;
import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao;
import fr.free.nrw.commons.category.CategoryImagesCallback;
+import fr.free.nrw.commons.databinding.ActivityWikidataItemDetailsBinding;
import fr.free.nrw.commons.explore.depictions.child.ChildDepictionsFragment;
import fr.free.nrw.commons.explore.depictions.media.DepictedImagesFragment;
import fr.free.nrw.commons.explore.depictions.parent.ParentDepictionsFragment;
@@ -57,14 +56,7 @@ public class WikidataItemDetailsActivity extends BaseActivity implements MediaDe
@Inject
DepictModel depictModel;
private String wikidataItemName;
- @BindView(R.id.mediaContainer)
- FrameLayout mediaContainer;
- @BindView(R.id.tab_layout)
- TabLayout tabLayout;
- @BindView(R.id.viewPager)
- ViewPager viewPager;
- @BindView(R.id.toolbar)
- Toolbar toolbar;
+ private ActivityWikidataItemDetailsBinding binding;
ViewPagerAdapter viewPagerAdapter;
private DepictedItem wikidataItem;
@@ -72,19 +64,20 @@ public class WikidataItemDetailsActivity extends BaseActivity implements MediaDe
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_wikidata_item_details);
- ButterKnife.bind(this);
+
+ binding = ActivityWikidataItemDetailsBinding.inflate(getLayoutInflater());
+ setContentView(binding.getRoot());
compositeDisposable = new CompositeDisposable();
supportFragmentManager = getSupportFragmentManager();
viewPagerAdapter = new ViewPagerAdapter(getSupportFragmentManager());
- viewPager.setAdapter(viewPagerAdapter);
- viewPager.setOffscreenPageLimit(2);
- tabLayout.setupWithViewPager(viewPager);
+ binding.viewPager.setAdapter(viewPagerAdapter);
+ binding.viewPager.setOffscreenPageLimit(2);
+ binding.tabLayout.setupWithViewPager(binding.viewPager);
final DepictedItem depictedItem = getIntent().getParcelableExtra(
WikidataConstants.BOOKMARKS_ITEMS);
wikidataItem = depictedItem;
- setSupportActionBar(toolbar);
+ setSupportActionBar(binding.toolbarBinding.toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
setTabs();
setPageTitle();
@@ -137,7 +130,7 @@ public class WikidataItemDetailsActivity extends BaseActivity implements MediaDe
fragmentList.add(parentDepictionsFragment);
titleList.add(getResources().getString(R.string.title_for_parent_classes));
viewPagerAdapter.setTabData(fragmentList, titleList);
- viewPager.setOffscreenPageLimit(2);
+ binding.viewPager.setOffscreenPageLimit(2);
viewPagerAdapter.notifyDataSetChanged();
}
@@ -148,12 +141,12 @@ public class WikidataItemDetailsActivity extends BaseActivity implements MediaDe
*/
@Override
public void onMediaClicked(int position) {
- tabLayout.setVisibility(View.GONE);
- viewPager.setVisibility(View.GONE);
- mediaContainer.setVisibility(View.VISIBLE);
+ binding.tabLayout.setVisibility(View.GONE);
+ binding.viewPager.setVisibility(View.GONE);
+ binding.mediaContainer.setVisibility(View.VISIBLE);
if (mediaDetailPagerFragment == null || !mediaDetailPagerFragment.isVisible()) {
// set isFeaturedImage true for featured images, to include author field on media detail
- mediaDetailPagerFragment = new MediaDetailPagerFragment(false, true);
+ mediaDetailPagerFragment = MediaDetailPagerFragment.newInstance(false, true);
FragmentManager supportFragmentManager = getSupportFragmentManager();
supportFragmentManager
.beginTransaction()
@@ -183,9 +176,9 @@ public class WikidataItemDetailsActivity extends BaseActivity implements MediaDe
@Override
public void onBackPressed() {
if (supportFragmentManager.getBackStackEntryCount() == 1){
- tabLayout.setVisibility(View.VISIBLE);
- viewPager.setVisibility(View.VISIBLE);
- mediaContainer.setVisibility(View.GONE);
+ binding.tabLayout.setVisibility(View.VISIBLE);
+ binding.viewPager.setVisibility(View.VISIBLE);
+ binding.mediaContainer.setVisibility(View.GONE);
}
super.onBackPressed();
}
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapCalls.java b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapCalls.java
index 0d8b1de57..ec426942c 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapCalls.java
+++ b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapCalls.java
@@ -20,11 +20,11 @@ public class ExploreMapCalls {
/**
* Calls method to query Commons for uploads around a location
*
- * @param curLatLng coordinates of search location
+ * @param currentLatLng coordinates of search location
* @return list of places obtained
*/
- List callCommonsQuery(final LatLng curLatLng) {
- String coordinates = curLatLng.getLatitude() + "|" + curLatLng.getLongitude();
+ List callCommonsQuery(final LatLng currentLatLng) {
+ String coordinates = currentLatLng.getLatitude() + "|" + currentLatLng.getLongitude();
return mediaClient.getMediaListFromGeoSearch(coordinates).blockingGet();
}
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapContract.java b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapContract.java
index 4a9adba48..feb66bf55 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapContract.java
+++ b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapContract.java
@@ -1,45 +1,34 @@
package fr.free.nrw.commons.explore.map;
import android.content.Context;
-import com.mapbox.mapboxsdk.annotations.Marker;
-import com.mapbox.mapboxsdk.camera.CameraUpdate;
+import fr.free.nrw.commons.BaseMarker;
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.nearby.NearbyBaseMarker;
-import fr.free.nrw.commons.nearby.Place;
import java.util.List;
public class ExploreMapContract {
interface View {
boolean isNetworkConnectionEstablished();
- void populatePlaces(LatLng curlatLng,LatLng searchLatLng);
- void checkPermissionsAndPerformAction();
+ void populatePlaces(LatLng curlatLng);
+ void askForLocationPermission();
void recenterMap(LatLng curLatLng);
- void showLocationOffDialog();
- void openLocationSettings();
void hideBottomDetailsSheet();
- void displayBottomSheetWithInfo(Marker marker);
- void addOnCameraMoveListener();
+ LatLng getMapCenter();
+ LatLng getMapFocus();
+ LatLng getLastMapFocus();
+ void addMarkersToMap(final List nearbyBaseMarkers);
+ void clearAllMarkers();
void addSearchThisAreaButtonAction();
void setSearchThisAreaButtonVisibility(boolean isVisible);
void setProgressBarVisibility(boolean isVisible);
boolean isDetailsBottomSheetVisible();
boolean isSearchThisAreaButtonVisible();
- void addCurrentLocationMarker(LatLng curLatLng);
- void updateMapToTrackPosition(LatLng curLatLng);
Context getContext();
- LatLng getCameraTarget();
- void centerMapToPlace(Place placeToCenter);
LatLng getLastLocation();
- com.mapbox.mapboxsdk.geometry.LatLng getLastFocusLocation();
- boolean isCurrentLocationMarkerVisible();
- void setProjectorLatLngBounds();
void disableFABRecenter();
void enableFABRecenter();
- void addNearbyMarkersToMapBoxMap(final List nearbyBaseMarkers, final Marker selectedMarker);
- void setMapBoundaries(CameraUpdate cameaUpdate);
void setFABRecenterAction(android.view.View.OnClickListener onClickListener);
boolean backButtonClicked();
}
@@ -51,9 +40,6 @@ public class ExploreMapContract {
void detachView();
void setActionListeners(JsonKvStore applicationKvStore);
boolean backButtonClicked();
- void onCameraMove(com.mapbox.mapboxsdk.geometry.LatLng latLng);
- void markerUnselected();
- void markerSelected(Marker marker);
}
}
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapController.java b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapController.java
index 72a4b216b..c944f75a1 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapController.java
+++ b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapController.java
@@ -14,13 +14,11 @@ import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.bumptech.glide.request.target.CustomTarget;
import com.bumptech.glide.request.transition.Transition;
-import com.mapbox.mapboxsdk.annotations.IconFactory;
-import com.mapbox.mapboxsdk.annotations.Marker;
+import fr.free.nrw.commons.BaseMarker;
import fr.free.nrw.commons.MapController;
import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.location.LatLng;
-import fr.free.nrw.commons.nearby.NearbyBaseMarker;
import fr.free.nrw.commons.nearby.Place;
import fr.free.nrw.commons.utils.ImageUtils;
import fr.free.nrw.commons.utils.LocationUtils;
@@ -33,6 +31,7 @@ import javax.inject.Inject;
import timber.log.Timber;
public class ExploreMapController extends MapController {
+
private final ExploreMapCalls exploreMapCalls;
public LatLng latestSearchLocation; // Can be current and camera target on search this area button is used
public LatLng currentLocation; // current location of user
@@ -46,13 +45,18 @@ public class ExploreMapController extends MapController {
}
/**
- * Takes location as parameter and returns ExplorePlaces info that holds curLatLng, mediaList, explorePlaceList and boundaryCoordinates
- * @param curLatLng is current geolocation
- * @param searchLatLng is the location that we want to search around
- * @param checkingAroundCurrentLocation is a boolean flag. True if we want to check around current location, false if another location
- * @return explorePlacesInfo info that holds curLatLng, mediaList, explorePlaceList and boundaryCoordinates
+ * Takes location as parameter and returns ExplorePlaces info that holds currentLatLng, mediaList,
+ * explorePlaceList and boundaryCoordinates
+ *
+ * @param currentLatLng is current geolocation
+ * @param searchLatLng is the location that we want to search around
+ * @param checkingAroundCurrentLocation is a boolean flag. True if we want to check around
+ * current location, false if another location
+ * @return explorePlacesInfo info that holds currentLatLng, mediaList, explorePlaceList and
+ * boundaryCoordinates
*/
- public ExplorePlacesInfo loadAttractionsFromLocation(LatLng curLatLng, LatLng searchLatLng, boolean checkingAroundCurrentLocation) {
+ public ExplorePlacesInfo loadAttractionsFromLocation(LatLng currentLatLng, LatLng searchLatLng,
+ boolean checkingAroundCurrentLocation) {
if (searchLatLng == null) {
Timber.d("Loading attractions explore map, but search is null");
@@ -61,7 +65,7 @@ public class ExploreMapController extends MapController {
ExplorePlacesInfo explorePlacesInfo = new ExplorePlacesInfo();
try {
- explorePlacesInfo.curLatLng = curLatLng;
+ explorePlacesInfo.currentLatLng = currentLatLng;
latestSearchLocation = searchLatLng;
List mediaList = exploreMapCalls.callCommonsQuery(searchLatLng);
@@ -74,18 +78,23 @@ public class ExploreMapController extends MapController {
Timber.d("Sorting places by distance...");
final Map distances = new HashMap<>();
for (Media media : mediaList) {
- distances.put(media, computeDistanceBetween(media.getCoordinates(), searchLatLng));
+ distances.put(media,
+ computeDistanceBetween(media.getCoordinates(), searchLatLng));
// Find boundaries with basic find max approach
- if (media.getCoordinates().getLatitude() < boundaryCoordinates[0].getLatitude()) {
+ if (media.getCoordinates().getLatitude()
+ < boundaryCoordinates[0].getLatitude()) {
boundaryCoordinates[0] = media.getCoordinates();
}
- if (media.getCoordinates().getLatitude() > boundaryCoordinates[1].getLatitude()) {
+ if (media.getCoordinates().getLatitude()
+ > boundaryCoordinates[1].getLatitude()) {
boundaryCoordinates[1] = media.getCoordinates();
}
- if (media.getCoordinates().getLongitude() < boundaryCoordinates[2].getLongitude()) {
+ if (media.getCoordinates().getLongitude()
+ < boundaryCoordinates[2].getLongitude()) {
boundaryCoordinates[2] = media.getCoordinates();
}
- if (media.getCoordinates().getLongitude() > boundaryCoordinates[3].getLongitude()) {
+ if (media.getCoordinates().getLongitude()
+ > boundaryCoordinates[3].getLongitude()) {
boundaryCoordinates[3] = media.getCoordinates();
}
}
@@ -96,7 +105,8 @@ public class ExploreMapController extends MapController {
// Sets latestSearchRadius to maximum distance among boundaries and search location
for (LatLng bound : boundaryCoordinates) {
- double distance = LocationUtils.commonsLatLngToMapBoxLatLng(bound).distanceTo(LocationUtils.commonsLatLngToMapBoxLatLng(latestSearchLocation));
+ double distance = LocationUtils.calculateDistance(bound.getLatitude(),
+ bound.getLongitude(), searchLatLng.getLatitude(), searchLatLng.getLongitude());
if (distance > latestSearchRadius) {
latestSearchRadius = distance;
}
@@ -105,7 +115,7 @@ public class ExploreMapController extends MapController {
// Our radius searched around us, will be used to understand when user search their own location, we will follow them
if (checkingAroundCurrentLocation) {
currentLocationSearchRadius = latestSearchRadius;
- currentLocation = curLatLng;
+ currentLocation = currentLatLng;
}
} catch (Exception e) {
e.printStackTrace();
@@ -115,42 +125,42 @@ public class ExploreMapController extends MapController {
/**
* Loads attractions from location for map view, we need to return places in Place data type
+ *
* @return baseMarkerOptions list that holds nearby places with their icons
*/
- public static List loadAttractionsFromLocationToBaseMarkerOptions(
- LatLng curLatLng,
+ public static List loadAttractionsFromLocationToBaseMarkerOptions(
+ LatLng currentLatLng,
final List placeList,
Context context,
NearbyBaseMarkerThumbCallback callback,
- Marker selectedMarker,
- boolean shouldTrackPosition,
ExplorePlacesInfo explorePlacesInfo) {
- List baseMarkerOptions = new ArrayList<>();
+ List baseMarkerList = new ArrayList<>();
if (placeList == null) {
- return baseMarkerOptions;
+ return baseMarkerList;
}
VectorDrawableCompat vectorDrawable = null;
try {
vectorDrawable = VectorDrawableCompat.create(
- context.getResources(), R.drawable.ic_custom_map_marker, context.getTheme());
+ context.getResources(), R.drawable.ic_custom_map_marker_dark, context.getTheme());
} catch (Resources.NotFoundException e) {
// ignore when running tests.
}
if (vectorDrawable != null) {
for (Place explorePlace : placeList) {
- final NearbyBaseMarker nearbyBaseMarker = new NearbyBaseMarker();
- String distance = formatDistanceBetween(curLatLng, explorePlace.location);
+ final BaseMarker baseMarker = new BaseMarker();
+ String distance = formatDistanceBetween(currentLatLng, explorePlace.location);
explorePlace.setDistance(distance);
- nearbyBaseMarker.title(explorePlace.name.substring(5, explorePlace.name.lastIndexOf(".")));
- nearbyBaseMarker.position(
- new com.mapbox.mapboxsdk.geometry.LatLng(
+ baseMarker.setTitle(
+ explorePlace.name.substring(5, explorePlace.name.lastIndexOf(".")));
+ baseMarker.setPosition(
+ new fr.free.nrw.commons.location.LatLng(
explorePlace.location.getLatitude(),
- explorePlace.location.getLongitude()));
- nearbyBaseMarker.place(explorePlace);
+ explorePlace.location.getLongitude(), 0));
+ baseMarker.setPlace(explorePlace);
Glide.with(context)
.asBitmap()
@@ -160,12 +170,15 @@ public class ExploreMapController extends MapController {
.into(new CustomTarget() {
// We add icons to markers when bitmaps are ready
@Override
- public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition transition) {
- nearbyBaseMarker.setIcon(IconFactory.getInstance(context).fromBitmap(
- ImageUtils.addRedBorder(resource, 6, context)));
- baseMarkerOptions.add(nearbyBaseMarker);
- if (baseMarkerOptions.size() == placeList.size()) { // if true, we added all markers to list and can trigger thumbs ready callback
- callback.onNearbyBaseMarkerThumbsReady(baseMarkerOptions, explorePlacesInfo, selectedMarker, shouldTrackPosition);
+ public void onResourceReady(@NonNull Bitmap resource,
+ @Nullable Transition transition) {
+ baseMarker.setIcon(
+ ImageUtils.addRedBorder(resource, 6, context));
+ baseMarkerList.add(baseMarker);
+ if (baseMarkerList.size()
+ == placeList.size()) { // if true, we added all markers to list and can trigger thumbs ready callback
+ callback.onNearbyBaseMarkerThumbsReady(baseMarkerList,
+ explorePlacesInfo);
}
}
@@ -177,20 +190,24 @@ public class ExploreMapController extends MapController {
@Override
public void onLoadFailed(@Nullable final Drawable errorDrawable) {
super.onLoadFailed(errorDrawable);
- nearbyBaseMarker.setIcon(IconFactory.getInstance(context).fromResource(R.drawable.image_placeholder_96));
- baseMarkerOptions.add(nearbyBaseMarker);
- if (baseMarkerOptions.size() == placeList.size()) { // if true, we added all markers to list and can trigger thumbs ready callback
- callback.onNearbyBaseMarkerThumbsReady(baseMarkerOptions, explorePlacesInfo, selectedMarker, shouldTrackPosition);
+ baseMarker.fromResource(context, R.drawable.image_placeholder_96);
+ baseMarkerList.add(baseMarker);
+ if (baseMarkerList.size()
+ == placeList.size()) { // if true, we added all markers to list and can trigger thumbs ready callback
+ callback.onNearbyBaseMarkerThumbsReady(baseMarkerList,
+ explorePlacesInfo);
}
}
});
}
}
- return baseMarkerOptions;
+ return baseMarkerList;
}
interface NearbyBaseMarkerThumbCallback {
+
// Callback to notify thumbnails of explore markers are added as icons and ready
- void onNearbyBaseMarkerThumbsReady(List baseMarkers, ExplorePlacesInfo explorePlacesInfo, Marker selectedMarker, boolean shouldTrackPosition);
+ void onNearbyBaseMarkerThumbsReady(List baseMarkers,
+ ExplorePlacesInfo explorePlacesInfo);
}
}
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.java b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.java
index d2e6a432b..52a5571e9 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.java
@@ -2,94 +2,94 @@ package fr.free.nrw.commons.explore.map;
import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.LOCATION_SIGNIFICANTLY_CHANGED;
import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.LOCATION_SLIGHTLY_CHANGED;
-import static fr.free.nrw.commons.utils.MapUtils.CAMERA_TARGET_SHIFT_FACTOR_LANDSCAPE;
-import static fr.free.nrw.commons.utils.MapUtils.CAMERA_TARGET_SHIFT_FACTOR_PORTRAIT;
import static fr.free.nrw.commons.utils.MapUtils.ZOOM_LEVEL;
import android.Manifest;
+import android.Manifest.permission;
import android.annotation.SuppressLint;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.PackageManager;
-import android.content.res.Configuration;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.location.Location;
import android.location.LocationManager;
import android.os.Bundle;
+import android.preference.PreferenceManager;
import android.provider.Settings;
import android.text.Html;
-import android.view.Gravity;
import android.view.LayoutInflater;
-import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-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.appcompat.widget.AppCompatTextView;
-import butterknife.BindView;
-import butterknife.ButterKnife;
+import androidx.core.content.ContextCompat;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.snackbar.Snackbar;
-import com.mapbox.mapboxsdk.annotations.Icon;
-import com.mapbox.mapboxsdk.annotations.IconFactory;
-import com.mapbox.mapboxsdk.annotations.Marker;
-import com.mapbox.mapboxsdk.annotations.MarkerOptions;
-import com.mapbox.mapboxsdk.annotations.Polygon;
-import com.mapbox.mapboxsdk.annotations.PolygonOptions;
-import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.camera.CameraUpdate;
-import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
-import com.mapbox.mapboxsdk.geometry.LatLngBounds;
-import com.mapbox.mapboxsdk.maps.MapView;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.Style;
-import com.mapbox.mapboxsdk.maps.UiSettings;
-import com.mapbox.pluginscalebar.ScaleBarOptions;
-import com.mapbox.pluginscalebar.ScaleBarPlugin;
+import fr.free.nrw.commons.BaseMarker;
import fr.free.nrw.commons.MapController;
-import fr.free.nrw.commons.MapStyle;
import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.Utils;
import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao;
+import fr.free.nrw.commons.databinding.FragmentExploreMapBinding;
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
import fr.free.nrw.commons.explore.ExploreMapRootFragment;
import fr.free.nrw.commons.explore.paging.LiveDataConverter;
+import fr.free.nrw.commons.filepicker.Constants;
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.location.LocationUpdateListener;
import fr.free.nrw.commons.media.MediaClient;
-import fr.free.nrw.commons.nearby.NearbyBaseMarker;
-import fr.free.nrw.commons.nearby.NearbyMarker;
import fr.free.nrw.commons.nearby.Place;
import fr.free.nrw.commons.utils.DialogUtil;
-import fr.free.nrw.commons.utils.ExecutorUtils;
-import fr.free.nrw.commons.utils.LocationUtils;
import fr.free.nrw.commons.utils.MapUtils;
import fr.free.nrw.commons.utils.NetworkUtils;
import fr.free.nrw.commons.utils.PermissionUtils;
import fr.free.nrw.commons.utils.SystemThemeUtils;
-import fr.free.nrw.commons.utils.UiUtils;
import fr.free.nrw.commons.utils.ViewUtil;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
-import java.util.Arrays;
+import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
+import org.osmdroid.events.MapEventsReceiver;
+import org.osmdroid.events.MapListener;
+import org.osmdroid.events.ScrollEvent;
+import org.osmdroid.events.ZoomEvent;
+import org.osmdroid.tileprovider.tilesource.TileSourceFactory;
+import org.osmdroid.util.GeoPoint;
+import org.osmdroid.util.constants.GeoConstants;
+import org.osmdroid.views.CustomZoomButtonsController;
+import org.osmdroid.views.overlay.ItemizedIconOverlay.OnItemGestureListener;
+import org.osmdroid.views.overlay.ItemizedOverlayWithFocus;
+import org.osmdroid.views.overlay.MapEventsOverlay;
+import org.osmdroid.views.overlay.Overlay;
+import org.osmdroid.views.overlay.OverlayItem;
+import org.osmdroid.views.overlay.ScaleBarOverlay;
+import org.osmdroid.views.overlay.ScaleDiskOverlay;
+import org.osmdroid.views.overlay.TilesOverlay;
import timber.log.Timber;
public class ExploreMapFragment extends CommonsDaggerSupportFragment
- implements ExploreMapContract.View, LocationUpdateListener {
+ implements ExploreMapContract.View, LocationUpdateListener, LocationPermissionCallback {
private BottomSheetBehavior bottomSheetDetailsBehavior;
private BroadcastReceiver broadcastReceiver;
@@ -97,20 +97,13 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
private Snackbar snackbar;
private boolean isDarkTheme;
private boolean isPermissionDenied;
- private fr.free.nrw.commons.location.LatLng lastKnownLocation; // lask location of user
+ private fr.free.nrw.commons.location.LatLng lastKnownLocation; // last location of user
private fr.free.nrw.commons.location.LatLng lastFocusLocation; // last location that map is focused
public List mediaList;
private boolean recenterToUserLocation; // true is recenter is needed (ie. when current location is in visible map boundaries)
-
-
- private MapboxMap.OnCameraMoveListener cameraMoveListener;
- private MapboxMap mapBox;
- private Place lastPlaceToCenter; // the last place that we centered the map
- private boolean isMapBoxReady;
- private Marker selectedMarker; // the marker that user selected
- private LatLngBounds projectorLatLngBounds; // current windows borders
- private Marker currentLocationMarker;
- private Polygon currentLocationPolygon;
+ private BaseMarker clickedMarker;
+ private GeoPoint mapCenter;
+ private GeoPoint lastMapFocus;
IntentFilter intentFilter = new IntentFilter(MapUtils.NETWORK_INTENT_ACTION);
@Inject
@@ -121,29 +114,46 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
LocationServiceManager locationManager;
@Inject
ExploreMapController exploreMapController;
- @Inject @Named("default_preferences")
+ @Inject
+ @Named("default_preferences")
JsonKvStore applicationKvStore;
@Inject
BookmarkLocationsDao bookmarkLocationDao; // May be needed in future if we want to integrate bookmarking explore places
@Inject
SystemThemeUtils systemThemeUtils;
+ LocationPermissionsHelper locationPermissionsHelper;
private ExploreMapPresenter presenter;
- @BindView(R.id.map_view) MapView mapView;
- @BindView(R.id.bottom_sheet_details) View bottomSheetDetails;
- @BindView(R.id.map_progress_bar) ProgressBar progressBar;
- @BindView(R.id.fab_recenter) FloatingActionButton fabRecenter;
- @BindView(R.id.search_this_area_button) Button searchThisAreaButton;
- @BindView(R.id.tv_attribution) AppCompatTextView tvAttribution;
-
- @BindView(R.id.directionsButton) LinearLayout directionsButton;
- @BindView(R.id.commonsButton) LinearLayout commonsButton;
- @BindView(R.id.mediaDetailsButton) LinearLayout mediaDetailsButton;
- @BindView(R.id.description) TextView description;
- @BindView(R.id.title) TextView title;
- @BindView(R.id.category) TextView distance;
+ public FragmentExploreMapBinding binding;
+ private ActivityResultLauncher activityResultLauncher = registerForActivityResult(
+ new ActivityResultContracts.RequestPermission(), isGranted -> {
+ if (isGranted) {
+ locationPermissionGranted();
+ } else {
+ if (shouldShowRequestPermissionRationale(permission.ACCESS_FINE_LOCATION)) {
+ DialogUtil.showAlertDialog(getActivity(),
+ getActivity().getString(R.string.location_permission_title),
+ getActivity().getString(R.string.location_permission_rationale_explore),
+ getActivity().getString(android.R.string.ok),
+ getActivity().getString(android.R.string.cancel),
+ () -> {
+ askForLocationPermission();
+ },
+ null,
+ null,
+ false);
+ } else {
+ if (isPermissionDenied) {
+ locationPermissionsHelper.showAppSettingsDialog(getActivity(),
+ R.string.explore_map_needs_location);
+ }
+ Timber.d("The user checked 'Don't ask again' or denied the permission twice");
+ isPermissionDenied = true;
+ }
+ }
+ });
@NonNull
public static ExploreMapFragment newInstance() {
@@ -152,30 +162,23 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
return fragment;
}
- @Override
- public void onCreate(@Nullable final Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- }
-
@Override
public View onCreateView(
@NonNull LayoutInflater inflater,
ViewGroup container,
Bundle savedInstanceState
) {
- View v = inflater.inflate(R.layout.fragment_explore_map, container, false);
- ButterKnife.bind(this, v);
- return v;
+ binding = FragmentExploreMapBinding.inflate(getLayoutInflater());
+ return binding.getRoot();
}
@Override
public void onViewCreated(@NonNull final View view, @Nullable final Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
- mapView.onStart();
setSearchThisAreaButtonVisibility(false);
- tvAttribution.setText(Html.fromHtml(getString(R.string.map_attribution)));
+ binding.tvAttribution.setText(Html.fromHtml(getString(R.string.map_attribution)));
initNetworkBroadCastReceiver();
-
+ locationPermissionsHelper = new LocationPermissionsHelper(getActivity(),locationManager,this);
if (presenter == null) {
presenter = new ExploreMapPresenter(bookmarkLocationDao);
}
@@ -183,74 +186,133 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
isDarkTheme = systemThemeUtils.isDeviceInNightMode();
isPermissionDenied = false;
- cameraMoveListener= () -> presenter.onCameraMove(mapBox.getCameraPosition().target);
presenter.attachView(this);
- recenterToUserLocation = false;
- mapView.onCreate(savedInstanceState);
- mapView.getMapAsync(mapBoxMap -> {
- mapBox = mapBoxMap;
- initViews();
- presenter.setActionListeners(applicationKvStore);
- mapBoxMap.setStyle(isDarkTheme? MapStyle.DARK :
- MapStyle.OUTDOORS, style -> {
- final UiSettings uiSettings = mapBoxMap.getUiSettings();
- uiSettings.setCompassGravity(Gravity.BOTTOM | Gravity.LEFT);
- uiSettings.setCompassMargins(12, 0, 0, 24);
- uiSettings.setLogoEnabled(false);
- uiSettings.setAttributionEnabled(false);
- uiSettings.setRotateGesturesEnabled(false);
- isMapBoxReady = true;
- performMapReadyActions();
- final CameraPosition cameraPosition = new CameraPosition.Builder()
- .target(new com.mapbox.mapboxsdk.geometry.LatLng(51.50550, -0.07520))
- .zoom(MapUtils.ZOOM_OUT)
- .build();
- mapBoxMap.setCameraPosition(cameraPosition);
- final ScaleBarPlugin scaleBarPlugin = new ScaleBarPlugin(mapView, mapBoxMap);
- final int color = isDarkTheme ? R.color.bottom_bar_light : R.color.bottom_bar_dark;
- final ScaleBarOptions scaleBarOptions = new ScaleBarOptions(getContext())
- .setTextColor(color)
- .setTextSize(R.dimen.description_text_size)
- .setBarHeight(R.dimen.tiny_gap)
- .setBorderWidth(R.dimen.miniscule_margin)
- .setMarginTop(R.dimen.tiny_padding)
- .setMarginLeft(R.dimen.tiny_padding)
- .setTextBarMargin(R.dimen.tiny_padding);
- scaleBarPlugin.create(scaleBarOptions);
- });
+ initViews();
+ presenter.setActionListeners(applicationKvStore);
+
+ org.osmdroid.config.Configuration.getInstance().load(this.getContext(),
+ PreferenceManager.getDefaultSharedPreferences(this.getContext()));
+
+ binding.mapView.setTileSource(TileSourceFactory.WIKIMEDIA);
+ binding.mapView.setTilesScaledToDpi(true);
+
+ org.osmdroid.config.Configuration.getInstance().getAdditionalHttpRequestProperties().put(
+ "Referer", "http://maps.wikimedia.org/"
+ );
+
+ ScaleBarOverlay scaleBarOverlay = new ScaleBarOverlay(binding.mapView);
+ scaleBarOverlay.setScaleBarOffset(15, 25);
+ Paint barPaint = new Paint();
+ barPaint.setARGB(200, 255, 250, 250);
+ scaleBarOverlay.setBackgroundPaint(barPaint);
+ scaleBarOverlay.enableScaleBar();
+ binding.mapView.getOverlays().add(scaleBarOverlay);
+ binding.mapView.getZoomController().setVisibility(CustomZoomButtonsController.Visibility.NEVER);
+ binding.mapView.setMultiTouchControls(true);
+ binding.mapView.getController().setZoom(ZOOM_LEVEL);
+ performMapReadyActions();
+
+ binding.mapView.getOverlays().add(new MapEventsOverlay(new MapEventsReceiver() {
+ @Override
+ public boolean singleTapConfirmedHelper(GeoPoint p) {
+ if (clickedMarker != null) {
+ removeMarker(clickedMarker);
+ addMarkerToMap(clickedMarker);
+ binding.mapView.invalidate();
+ } else {
+ Timber.e("CLICKED MARKER IS NULL");
+ }
+ if (bottomSheetDetailsBehavior.getState() == BottomSheetBehavior.STATE_EXPANDED) {
+ // Back should first hide the bottom sheet if it is expanded
+ bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+ } else if (isDetailsBottomSheetVisible()) {
+ hideBottomDetailsSheet();
+ }
+ return true;
+ }
+
+ @Override
+ public boolean longPressHelper(GeoPoint p) {
+ return false;
+ }
+ }));
+
+ binding.mapView.addMapListener(new MapListener() {
+ @Override
+ public boolean onScroll(ScrollEvent event) {
+ if (getLastMapFocus() != null) {
+ Location mylocation = new Location("");
+ Location dest_location = new Location("");
+ dest_location.setLatitude(binding.mapView.getMapCenter().getLatitude());
+ dest_location.setLongitude(binding.mapView.getMapCenter().getLongitude());
+ mylocation.setLatitude(getLastMapFocus().getLatitude());
+ mylocation.setLongitude(getLastMapFocus().getLongitude());
+ Float distance = mylocation.distanceTo(dest_location);//in meters
+ if (getLastMapFocus() != null) {
+ if (isNetworkConnectionEstablished() && (event.getX() > 0
+ || event.getY() > 0)) {
+ if (distance > 2000.0) {
+ setSearchThisAreaButtonVisibility(true);
+ } else {
+ setSearchThisAreaButtonVisibility(false);
+ }
+ }
+ } else {
+ setSearchThisAreaButtonVisibility(false);
+ }
+ }
+
+ return true;
+ }
+
+ @Override
+ public boolean onZoom(ZoomEvent event) {
+ return false;
+ }
+
});
+ if (!locationPermissionsHelper.checkLocationPermission(getActivity())) {
+ askForLocationPermission();
+ }
}
@Override
public void onResume() {
super.onResume();
- mapView.onResume();
+ binding.mapView.onResume();
presenter.attachView(this);
registerNetworkReceiver();
- if (isResumed()) {
- if (!isPermissionDenied && !applicationKvStore
- .getBoolean("doNotAskForLocationPermission", false)) {
- startTheMap();
- } else {
- startMapWithoutPermission();
- }
+ if (isResumed()) {
+ if (locationPermissionsHelper.checkLocationPermission(getActivity())) {
+ performMapReadyActions();
+ } else {
+ startMapWithoutPermission();
}
+ }
}
- private void startTheMap() {
- mapView.onStart();
- performMapReadyActions();
+ @Override
+ public void onPause() {
+ super.onPause();
+ // unregistering the broadcastReceiver, as it was causing an exception and a potential crash
+ unregisterNetworkReceiver();
+ }
+
+
+ /**
+ * Unregisters the networkReceiver
+ */
+ private void unregisterNetworkReceiver() {
+ if (getActivity() != null) {
+ getActivity().unregisterReceiver(broadcastReceiver);
+ }
}
private void startMapWithoutPermission() {
- mapView.onStart();
- applicationKvStore.putBoolean("doNotAskForLocationPermission", true);
lastKnownLocation = MapUtils.defaultLatLng;
- MapUtils.centerMapToDefaultLatLng(mapBox);
- if (mapBox != null) {
- addOnCameraMoveListener();
- }
+ moveCameraToPosition(
+ new GeoPoint(lastKnownLocation.getLatitude(), lastKnownLocation.getLongitude()));
presenter.onMapReady(exploreMapController);
}
@@ -261,15 +323,18 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
}
private void performMapReadyActions() {
- if (isMapBoxReady) {
- if(!applicationKvStore.getBoolean("doNotAskForLocationPermission", false) ||
- PermissionUtils.hasPermission(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION)){
- checkPermissionsAndPerformAction();
- }else{
- isPermissionDenied = true;
- addOnCameraMoveListener();
- }
+ if (isDarkTheme) {
+ binding.mapView.getOverlayManager().getTilesOverlay()
+ .setColorFilter(TilesOverlay.INVERT_COLORS);
}
+ if (applicationKvStore.getBoolean("doNotAskForLocationPermission", false) &&
+ !locationPermissionsHelper.checkLocationPermission(getActivity())) {
+ isPermissionDenied = true;
+ }
+ lastKnownLocation = MapUtils.defaultLatLng;
+ moveCameraToPosition(
+ new GeoPoint(lastKnownLocation.getLatitude(), lastKnownLocation.getLongitude()));
+ presenter.onMapReady(exploreMapController);
}
private void initViews() {
@@ -285,36 +350,20 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
*/
@SuppressLint("ClickableViewAccessibility")
private void initBottomSheets() {
- bottomSheetDetailsBehavior = BottomSheetBehavior.from(bottomSheetDetails);
+ bottomSheetDetailsBehavior = BottomSheetBehavior.from(binding.bottomSheetDetailsBinding.getRoot());
bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
- bottomSheetDetails.setVisibility(View.VISIBLE);
-
- mapView.setOnTouchListener((v, event) -> {
-
- // Motion event is triggered two times on a touch event, one as ACTION_UP
- // and other as ACTION_DOWN, we only want one trigger per touch event.
-
- if(event.getAction() == MotionEvent.ACTION_DOWN) {
- if (bottomSheetDetailsBehavior.getState()
- == BottomSheetBehavior.STATE_EXPANDED) {
- bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
- } else if (bottomSheetDetailsBehavior.getState()
- == BottomSheetBehavior.STATE_COLLAPSED) {
- bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
- }
- }
- return false;
- });
+ binding.bottomSheetDetailsBinding.getRoot().setVisibility(View.VISIBLE);
}
/**
* Defines how bottom sheets will act on click
*/
private void setBottomSheetCallbacks() {
- bottomSheetDetails.setOnClickListener(v -> {
+ binding.bottomSheetDetailsBinding.getRoot().setOnClickListener(v -> {
if (bottomSheetDetailsBehavior.getState() == BottomSheetBehavior.STATE_COLLAPSED) {
bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
- } else if (bottomSheetDetailsBehavior.getState() == BottomSheetBehavior.STATE_EXPANDED) {
+ } else if (bottomSheetDetailsBehavior.getState()
+ == BottomSheetBehavior.STATE_EXPANDED) {
bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
}
});
@@ -323,25 +372,21 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
@Override
public void onLocationChangedSignificantly(LatLng latLng) {
Timber.d("Location significantly changed");
- if (isMapBoxReady && latLng != null &&!isUserBrowsing()) {
- handleLocationUpdate(latLng,LOCATION_SIGNIFICANTLY_CHANGED);
+ if (latLng != null) {
+ handleLocationUpdate(latLng, LOCATION_SIGNIFICANTLY_CHANGED);
}
}
- private boolean isUserBrowsing() {
- final boolean isUserBrowsing = lastKnownLocation!=null && !presenter.areLocationsClose(getCameraTarget(), lastKnownLocation);
- return isUserBrowsing;
- }
-
@Override
public void onLocationChangedSlightly(LatLng latLng) {
Timber.d("Location slightly changed");
- if (isMapBoxReady && latLng != null &&!isUserBrowsing()) {//If the map has never ever shown the current location, lets do it know
- handleLocationUpdate(latLng,LOCATION_SLIGHTLY_CHANGED);
+ if (latLng != null) {//If the map has never ever shown the current location, lets do it know
+ handleLocationUpdate(latLng, LOCATION_SLIGHTLY_CHANGED);
}
}
- private void handleLocationUpdate(final fr.free.nrw.commons.location.LatLng latLng, final LocationServiceManager.LocationChangeType locationChangeType){
+ private void handleLocationUpdate(final fr.free.nrw.commons.location.LatLng latLng,
+ final LocationServiceManager.LocationChangeType locationChangeType) {
lastKnownLocation = latLng;
exploreMapController.currentLocation = lastKnownLocation;
presenter.updateMap(locationChangeType);
@@ -358,85 +403,87 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
}
@Override
- public void populatePlaces(LatLng curLatLng, LatLng searchLatLng) {
+ public void populatePlaces(LatLng currentLatLng) {
final Observable nearbyPlacesInfoObservable;
- if (curLatLng == null) {
- checkPermissionsAndPerformAction();
+ if (currentLatLng == null) {
return;
}
- if (searchLatLng.equals(lastFocusLocation) || lastFocusLocation == null || recenterToUserLocation) { // Means we are checking around current location
- nearbyPlacesInfoObservable = presenter.loadAttractionsFromLocation(curLatLng, searchLatLng, true);
+ if (currentLatLng.equals(getLastMapFocus())) { // Means we are checking around current location
+ nearbyPlacesInfoObservable = presenter.loadAttractionsFromLocation(currentLatLng,
+ getLastMapFocus(), true);
} else {
- nearbyPlacesInfoObservable = presenter.loadAttractionsFromLocation(curLatLng, searchLatLng, false);
+ nearbyPlacesInfoObservable = presenter.loadAttractionsFromLocation(getLastMapFocus(),
+ currentLatLng, false);
}
compositeDisposable.add(nearbyPlacesInfoObservable
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(explorePlacesInfo -> {
- updateMapMarkers(explorePlacesInfo, isCurrentLocationMarkerVisible());
mediaList = explorePlacesInfo.mediaList;
- lastFocusLocation = searchLatLng;
+ if(mediaList == null) {
+ showResponseMessage(getString(R.string.no_pictures_in_this_area));
+ }
+ updateMapMarkers(explorePlacesInfo);
+ lastMapFocus = new GeoPoint(currentLatLng.getLatitude(), currentLatLng.getLongitude());
},
throwable -> {
Timber.d(throwable);
- showErrorMessage(getString(R.string.error_fetching_nearby_places)+throwable.getLocalizedMessage());
+ // Not showing the user, throwable localizedErrorMessage
+ showErrorMessage(getString(R.string.error_fetching_nearby_places));
+
setProgressBarVisibility(false);
presenter.lockUnlockNearby(false);
}));
- if(recenterToUserLocation) {
+ if (recenterToUserLocation) {
recenterToUserLocation = false;
}
}
/**
* Updates map markers according to latest situation
+ *
* @param explorePlacesInfo holds several information as current location, marker list etc.
*/
- private void updateMapMarkers(final MapController.ExplorePlacesInfo explorePlacesInfo, final boolean shouldTrackPosition) {
- presenter.updateMapMarkers(explorePlacesInfo, selectedMarker,shouldTrackPosition);
+ private void updateMapMarkers(final MapController.ExplorePlacesInfo explorePlacesInfo) {
+ presenter.updateMapMarkers(explorePlacesInfo);
}
private void showErrorMessage(final String message) {
ViewUtil.showLongToast(getActivity(), message);
}
+ private void showResponseMessage(final String message) {
+ ViewUtil.showLongSnackbar(getView(), message);
+ }
+
@Override
- public void checkPermissionsAndPerformAction() {
- Timber.d("Checking permission and perfoming action");
- PermissionUtils.checkPermissionsAndPerformAction(getActivity(),
- Manifest.permission.ACCESS_FINE_LOCATION,
- () -> locationPermissionGranted(),
- () -> isPermissionDenied = true,
- R.string.location_permission_title,
- R.string.location_permission_rationale_nearby);
+ public void askForLocationPermission() {
+ Timber.d("Asking for location permission");
+ activityResultLauncher.launch(permission.ACCESS_FINE_LOCATION);
}
private void locationPermissionGranted() {
isPermissionDenied = false;
applicationKvStore.putBoolean("doNotAskForLocationPermission", false);
lastKnownLocation = locationManager.getLastLocation();
- fr.free.nrw.commons.location.LatLng target=lastFocusLocation;
- if(null == lastFocusLocation){
- target = lastKnownLocation;
- }
+ fr.free.nrw.commons.location.LatLng target = lastKnownLocation;
if (lastKnownLocation != null) {
- final CameraPosition position = new CameraPosition.Builder()
- .target(LocationUtils.commonsLatLngToMapBoxLatLng(target)) // Sets the new camera position
- .zoom(ZOOM_LEVEL) // Same zoom level
- .build();
- mapBox.moveCamera(CameraUpdateFactory.newCameraPosition(position));
- }
- else if(locationManager.isGPSProviderEnabled() || locationManager.isNetworkProviderEnabled()){
+ GeoPoint targetP = new GeoPoint(target.getLatitude(), target.getLongitude());
+ mapCenter = targetP;
+ binding.mapView.getController().setCenter(targetP);
+ recenterMarkerToPosition(targetP);
+ moveCameraToPosition(targetP);
+ } else if (locationManager.isGPSProviderEnabled()
+ || locationManager.isNetworkProviderEnabled()) {
locationManager.requestLocationUpdatesFromProvider(LocationManager.NETWORK_PROVIDER);
locationManager.requestLocationUpdatesFromProvider(LocationManager.GPS_PROVIDER);
setProgressBarVisibility(true);
}
else {
- Toast.makeText(getContext(), getString(R.string.nearby_location_not_available), Toast.LENGTH_LONG).show();
+ locationPermissionsHelper.showLocationOffDialog(getActivity(), R.string.ask_to_turn_location_on_text);
}
presenter.onMapReady(exploreMapController);
registerUnregisterLocationListener(false);
- addOnCameraMoveListener();
}
public void registerUnregisterLocationListener(final boolean removeLocationListener) {
@@ -444,44 +491,49 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
}
@Override
- public void recenterMap(LatLng curLatLng) {
- if (isPermissionDenied || curLatLng == null) {
- recenterToUserLocation = true;
- checkPermissionsAndPerformAction();
- if (!isPermissionDenied && !(locationManager.isNetworkProviderEnabled() || locationManager.isGPSProviderEnabled())) {
- showLocationOffDialog();
+ public void recenterMap(LatLng currentLatLng) {
+ // if user has denied permission twice, then show dialog
+ if (isPermissionDenied) {
+ if (locationPermissionsHelper.checkLocationPermission(getActivity())) {
+ // this will run when user has given permission by opening app's settings
+ isPermissionDenied = false;
+ recenterMap(currentLatLng);
+ } else {
+ askForLocationPermission();
}
+ } else {
+ if (!locationPermissionsHelper.checkLocationPermission(getActivity())) {
+ askForLocationPermission();
+ } else {
+ locationPermissionGranted();
+ }
+ }
+ if (currentLatLng == null) {
+ recenterToUserLocation = true;
return;
}
- addCurrentLocationMarker(curLatLng);
- final CameraPosition position;
- position = new CameraPosition.Builder()
- .target(new com.mapbox.mapboxsdk.geometry.LatLng(curLatLng.getLatitude(), curLatLng.getLongitude(), 0)) // Sets the new camera position
- .zoom(mapBox.getCameraPosition().zoom) // Same zoom level
- .build();
-
- mapBox.animateCamera(CameraUpdateFactory.newCameraPosition(position), 1000);
- }
-
- @Override
- public void showLocationOffDialog() {
- // This creates a dialog box that prompts the user to enable location
- DialogUtil
- .showAlertDialog(getActivity(), getString(R.string.ask_to_turn_location_on), getString(R.string.nearby_needs_location),
- getString(R.string.yes), getString(R.string.no), this::openLocationSettings, null);
- }
-
- @Override
- public void openLocationSettings() {
- // This method opens the location settings of the device along with a followup toast.
- final Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
- final PackageManager packageManager = getActivity().getPackageManager();
-
- if (intent.resolveActivity(packageManager)!= null) {
- startActivity(intent);
- Toast.makeText(getContext(), R.string.recommend_high_accuracy_mode, Toast.LENGTH_LONG).show();
- } else {
- Toast.makeText(getContext(), R.string.cannot_open_location_settings, Toast.LENGTH_LONG).show();
+ recenterMarkerToPosition(new GeoPoint(currentLatLng.getLatitude(), currentLatLng.getLongitude()));
+ binding.mapView.getController()
+ .animateTo(new GeoPoint(currentLatLng.getLatitude(), currentLatLng.getLongitude()));
+ if (lastMapFocus != null) {
+ Location mylocation = new Location("");
+ Location dest_location = new Location("");
+ dest_location.setLatitude(binding.mapView.getMapCenter().getLatitude());
+ dest_location.setLongitude(binding.mapView.getMapCenter().getLongitude());
+ mylocation.setLatitude(lastMapFocus.getLatitude());
+ mylocation.setLongitude(lastMapFocus.getLongitude());
+ Float distance = mylocation.distanceTo(dest_location);//in meters
+ if (lastMapFocus != null) {
+ if (isNetworkConnectionEstablished()) {
+ if (distance > 2000.0) {
+ setSearchThisAreaButtonVisibility(true);
+ } else {
+ setSearchThisAreaButtonVisibility(false);
+ }
+ }
+ } else {
+ setSearchThisAreaButtonVisibility(false);
+ }
}
}
@@ -490,79 +542,59 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
}
- @Override
- public void displayBottomSheetWithInfo(final Marker marker) {
- selectedMarker = marker;
- final NearbyMarker nearbyMarker = (NearbyMarker) marker;
- final Place place = nearbyMarker.getNearbyBaseMarker().getPlace();
- passInfoToSheet(place);
- bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
- }
-
/**
* Same bottom sheet carries information for all nearby places, so we need to pass information
* (title, description, distance and links) to view on nearby marker click
+ *
* @param place Place of clicked nearby marker
*/
private void passInfoToSheet(final Place place) {
- directionsButton.setOnClickListener(view -> Utils.handleGeoCoordinates(getActivity(),
+ binding.bottomSheetDetailsBinding.directionsButton.setOnClickListener(view -> Utils.handleGeoCoordinates(getActivity(),
place.getLocation()));
- commonsButton.setVisibility(place.hasCommonsLink()?View.VISIBLE:View.GONE);
- commonsButton.setOnClickListener(view -> Utils.handleWebUrl(getContext(), place.siteLinks.getCommonsLink()));
+ binding.bottomSheetDetailsBinding.commonsButton.setVisibility(place.hasCommonsLink() ? View.VISIBLE : View.GONE);
+ binding.bottomSheetDetailsBinding.commonsButton.setOnClickListener(
+ view -> Utils.handleWebUrl(getContext(), place.siteLinks.getCommonsLink()));
int index = 0;
for (Media media : mediaList) {
if (media.getFilename().equals(place.name)) {
int finalIndex = index;
- mediaDetailsButton.setOnClickListener(view -> {
+ binding.bottomSheetDetailsBinding.mediaDetailsButton.setOnClickListener(view -> {
((ExploreMapRootFragment) getParentFragment()).onMediaClicked(finalIndex);
});
}
- index ++;
+ index++;
}
- title.setText(place.name.substring(5, place.name.lastIndexOf(".")));
- distance.setText(place.distance);
+ binding.bottomSheetDetailsBinding.title.setText(place.name.substring(5, place.name.lastIndexOf(".")));
+ binding.bottomSheetDetailsBinding.category.setText(place.distance);
// Remove label since it is double information
String descriptionText = place.getLongDescription()
- .replace(place.getName() + " (","");
- descriptionText = (descriptionText.equals(place.getLongDescription()) ? descriptionText : descriptionText.replaceFirst(".$",""));
+ .replace(place.getName() + " (", "");
+ descriptionText = (descriptionText.equals(place.getLongDescription()) ? descriptionText
+ : descriptionText.replaceFirst(".$", ""));
// Set the short description after we remove place name from long description
- description.setText(descriptionText);
- }
-
-
- @Override
- public void addOnCameraMoveListener() {
- mapBox.addOnCameraMoveListener(cameraMoveListener);
+ binding.bottomSheetDetailsBinding.description.setText(descriptionText);
}
@Override
public void addSearchThisAreaButtonAction() {
- searchThisAreaButton.setOnClickListener(presenter.onSearchThisAreaClicked());
+ binding.searchThisAreaButton.setOnClickListener(presenter.onSearchThisAreaClicked());
}
@Override
public void setSearchThisAreaButtonVisibility(boolean isVisible) {
- if (isVisible) {
- searchThisAreaButton.setVisibility(View.VISIBLE);
- } else {
- searchThisAreaButton.setVisibility(View.GONE);
- }
+ binding.searchThisAreaButton.setVisibility(isVisible ? View.VISIBLE : View.GONE);
}
@Override
public void setProgressBarVisibility(boolean isVisible) {
- if (isVisible) {
- progressBar.setVisibility(View.VISIBLE);
- } else {
- progressBar.setVisibility(View.GONE);
- }
+ binding.mapProgressBar.setVisibility(isVisible ? View.VISIBLE : View.GONE);
}
@Override
public boolean isDetailsBottomSheetVisible() {
- if (bottomSheetDetails.getVisibility() == View.VISIBLE) {
+ if (binding.bottomSheetDetailsBinding.getRoot().getVisibility() == View.VISIBLE) {
return true;
} else {
return false;
@@ -571,139 +603,7 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
@Override
public boolean isSearchThisAreaButtonVisible() {
- if (searchThisAreaButton.getVisibility() == View.VISIBLE) {
- return true;
- } else {
- return false;
- }
- }
-
- /**
- * Removes old current location marker and adds a new one to display current location
- * @param curLatLng current location of user
- */
- @Override
- public void addCurrentLocationMarker(LatLng curLatLng) {
- if (null != curLatLng && !isPermissionDenied) {
- ExecutorUtils.get().submit(() -> {
- mapView.post(() -> removeCurrentLocationMarker());
- Timber.d("Adds current location marker");
-
- final Icon icon = IconFactory.getInstance(getContext())
- .fromResource(R.drawable.current_location_marker);
-
- final MarkerOptions currentLocationMarkerOptions = new MarkerOptions()
- .position(new com.mapbox.mapboxsdk.geometry.LatLng(curLatLng.getLatitude(),
- curLatLng.getLongitude()));
- currentLocationMarkerOptions.setIcon(icon); // Set custom icon
- mapView.post(
- () -> currentLocationMarker = mapBox.addMarker(currentLocationMarkerOptions));
-
- final List circle = UiUtils
- .createCircleArray(curLatLng.getLatitude(), curLatLng.getLongitude(),
- curLatLng.getAccuracy() * 2, 100);
-
- final PolygonOptions currentLocationPolygonOptions = new PolygonOptions()
- .addAll(circle)
- .strokeColor(getResources().getColor(R.color.current_marker_stroke))
- .fillColor(getResources().getColor(R.color.current_marker_fill));
- mapView.post(
- () -> currentLocationPolygon = mapBox
- .addPolygon(currentLocationPolygonOptions));
- });
- } else {
- Timber.d("not adding current location marker..current location is null");
- }
- }
-
- @Override
- public boolean isCurrentLocationMarkerVisible() {
- if (projectorLatLngBounds == null || currentLocationMarker == null) {
- Timber.d("Map projection bounds are null");
- return false;
- } else {
- Timber.d("Current location marker %s" , projectorLatLngBounds.contains(currentLocationMarker.getPosition()) ? "visible" : "invisible");
- return projectorLatLngBounds.contains(currentLocationMarker.getPosition());
- }
- }
-
- /**
- * Sets boundaries of visible region in terms of geolocation
- */
- @Override
- public void setProjectorLatLngBounds() {
- projectorLatLngBounds = mapBox.getProjection().getVisibleRegion().latLngBounds;
- }
-
- /**
- * Removes old current location marker
- */
- private void removeCurrentLocationMarker() {
- if (currentLocationMarker != null && mapBox!=null) {
- mapBox.removeMarker(currentLocationMarker);
- if (currentLocationPolygon != null) {
- mapBox.removePolygon(currentLocationPolygon);
- }
- }
- }
-
- /**
- * Update map camera to trac users current position
- * @param curLatLng
- */
- @Override
- public void updateMapToTrackPosition(LatLng curLatLng) {
- Timber.d("Updates map camera to track user position");
- final CameraPosition cameraPosition;
- if(isPermissionDenied){
- cameraPosition = new CameraPosition.Builder().target
- (LocationUtils.commonsLatLngToMapBoxLatLng(curLatLng)).build();
- }else{
- cameraPosition = new CameraPosition.Builder().target
- (LocationUtils.commonsLatLngToMapBoxLatLng(curLatLng)).build();
- }
- if(null!=mapBox) {
- mapBox.setCameraPosition(cameraPosition);
- mapBox.animateCamera(CameraUpdateFactory
- .newCameraPosition(cameraPosition), 1000);
- }
- }
-
- @Override
- public LatLng getCameraTarget() {
- return mapBox == null ? null : LocationUtils.mapBoxLatLngToCommonsLatLng(mapBox.getCameraPosition().target);
- }
-
- /**
- * Centers map to a given place
- * @param place place to center
- */
- @Override
- public void centerMapToPlace(Place place) {
- MapUtils.centerMapToPlace(place, mapBox, lastPlaceToCenter, getActivity());
- Timber.d("Map is centered to place");
- final double cameraShift;
- if (null != place) {
- lastPlaceToCenter = place;
- }
-
- if (null != lastPlaceToCenter) {
- final Configuration configuration = getActivity().getResources().getConfiguration();
- if (configuration.orientation == Configuration.ORIENTATION_PORTRAIT) {
- cameraShift = CAMERA_TARGET_SHIFT_FACTOR_PORTRAIT;
- } else {
- cameraShift = CAMERA_TARGET_SHIFT_FACTOR_LANDSCAPE;
- }
- final CameraPosition position = new CameraPosition.Builder()
- .target(LocationUtils.commonsLatLngToMapBoxLatLng(
- new fr.free.nrw.commons.location.LatLng(
- lastPlaceToCenter.location.getLatitude() - cameraShift,
- lastPlaceToCenter.getLocation().getLongitude(),
- 0))) // Sets the new camera position
- .zoom(mapBox.getCameraPosition().zoom) // Same zoom level
- .build();
- mapBox.animateCamera(CameraUpdateFactory.newCameraPosition(position), 1000);
- }
+ return binding.bottomSheetDetailsBinding.getRoot().getVisibility() == View.VISIBLE;
}
@Override
@@ -714,55 +614,260 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
return lastKnownLocation;
}
- @Override
- public com.mapbox.mapboxsdk.geometry.LatLng getLastFocusLocation() {
- return lastFocusLocation == null? null : LocationUtils.commonsLatLngToMapBoxLatLng(lastFocusLocation);
- }
-
@Override
public void disableFABRecenter() {
- fabRecenter.setEnabled(false);
+ binding.fabRecenter.setEnabled(false);
}
@Override
public void enableFABRecenter() {
- fabRecenter.setEnabled(true);
+ binding.fabRecenter.setEnabled(true);
}
+ /**
+ * Adds a markers to the map based on the list of NearbyBaseMarker.
+ *
+ * @param nearbyBaseMarkers The NearbyBaseMarker object representing the markers to be added.
+ */
@Override
- public void addNearbyMarkersToMapBoxMap(List nearbyBaseMarkers, Marker selectedMarker) {
- mapBox.clear();
- if (isMapBoxReady && mapBox != null) {
- mapBox.addMarkers(nearbyBaseMarkers);
- setMapMarkerActions(selectedMarker);
+ public void addMarkersToMap(List nearbyBaseMarkers) {
+ clearAllMarkers();
+ for (int i = 0; i < nearbyBaseMarkers.size(); i++) {
+ addMarkerToMap(nearbyBaseMarkers.get(i));
+ }
+ binding.mapView.invalidate();
+ }
+
+ /**
+ * Adds a marker to the map based on the specified NearbyBaseMarker.
+ *
+ * @param nearbyBaseMarker The NearbyBaseMarker object representing the marker to be added.
+ */
+ private void addMarkerToMap(BaseMarker nearbyBaseMarker) {
+ ArrayList items = new ArrayList<>();
+ Bitmap icon = nearbyBaseMarker.getIcon();
+ Drawable d = new BitmapDrawable(getResources(), icon);
+ GeoPoint point = new GeoPoint(
+ nearbyBaseMarker.getPlace().location.getLatitude(),
+ nearbyBaseMarker.getPlace().location.getLongitude());
+ OverlayItem item = new OverlayItem(nearbyBaseMarker.getPlace().name, null,
+ point);
+ item.setMarker(d);
+ items.add(item);
+ ItemizedOverlayWithFocus overlay = new ItemizedOverlayWithFocus(items,
+ new OnItemGestureListener() {
+ @Override
+ public boolean onItemSingleTapUp(int index, OverlayItem item) {
+ final Place place = nearbyBaseMarker.getPlace();
+ if (clickedMarker != null) {
+ removeMarker(clickedMarker);
+ addMarkerToMap(clickedMarker);
+ bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+ bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
+ }
+ clickedMarker = nearbyBaseMarker;
+ passInfoToSheet(place);
+ return true;
+ }
+
+ @Override
+ public boolean onItemLongPress(int index, OverlayItem item) {
+ return false;
+ }
+ }, getContext());
+
+ overlay.setFocusItemsOnTap(true);
+ binding.mapView.getOverlays().add(overlay); // Add the overlay to the map
+ }
+
+ /**
+ * Removes a marker from the map based on the specified NearbyBaseMarker.
+ *
+ * @param nearbyBaseMarker The NearbyBaseMarker object representing the marker to be removed.
+ */
+ private void removeMarker(BaseMarker nearbyBaseMarker) {
+ Place place = nearbyBaseMarker.getPlace();
+ List overlays = binding.mapView.getOverlays();
+ ItemizedOverlayWithFocus item;
+
+ for (int i = 0; i < overlays.size(); i++) {
+ if (overlays.get(i) instanceof ItemizedOverlayWithFocus) {
+ item = (ItemizedOverlayWithFocus) overlays.get(i);
+ OverlayItem overlayItem = item.getItem(0);
+
+ if (place.location.getLatitude() == overlayItem.getPoint().getLatitude()
+ && place.location.getLongitude() == overlayItem.getPoint().getLongitude()) {
+ binding.mapView.getOverlays().remove(i);
+ binding.mapView.invalidate();
+ break;
+ }
+ }
}
}
- private void setMapMarkerActions(final Marker selectedMarker) {
- if (mapBox != null) {
- mapBox.setOnInfoWindowCloseListener(marker -> {
- if (marker == selectedMarker) {
- presenter.markerUnselected();
+ /**
+ * Clears all markers from the map and resets certain map overlays and gestures. After clearing
+ * markers, it re-adds a scale bar overlay and rotation gesture overlay to the map.
+ */
+ @Override
+ public void clearAllMarkers() {
+ binding.mapView.getOverlayManager().clear();
+ GeoPoint geoPoint = mapCenter;
+ if (geoPoint != null) {
+ List overlays = binding.mapView.getOverlays();
+ ScaleDiskOverlay diskOverlay =
+ new ScaleDiskOverlay(this.getContext(),
+ geoPoint, 2000, GeoConstants.UnitOfMeasure.foot);
+ Paint circlePaint = new Paint();
+ circlePaint.setColor(Color.rgb(128, 128, 128));
+ circlePaint.setStyle(Paint.Style.STROKE);
+ circlePaint.setStrokeWidth(2f);
+ diskOverlay.setCirclePaint2(circlePaint);
+ Paint diskPaint = new Paint();
+ diskPaint.setColor(Color.argb(40, 128, 128, 128));
+ diskPaint.setStyle(Paint.Style.FILL_AND_STROKE);
+ diskOverlay.setCirclePaint1(diskPaint);
+ diskOverlay.setDisplaySizeMin(900);
+ diskOverlay.setDisplaySizeMax(1700);
+ binding.mapView.getOverlays().add(diskOverlay);
+ org.osmdroid.views.overlay.Marker startMarker = new org.osmdroid.views.overlay.Marker(
+ binding.mapView);
+ startMarker.setPosition(geoPoint);
+ startMarker.setAnchor(org.osmdroid.views.overlay.Marker.ANCHOR_CENTER,
+ org.osmdroid.views.overlay.Marker.ANCHOR_BOTTOM);
+ startMarker.setIcon(
+ ContextCompat.getDrawable(this.getContext(), R.drawable.current_location_marker));
+ startMarker.setTitle("Your Location");
+ startMarker.setTextLabelFontSize(24);
+ binding.mapView.getOverlays().add(startMarker);
+ }
+ ScaleBarOverlay scaleBarOverlay = new ScaleBarOverlay(binding.mapView);
+ scaleBarOverlay.setScaleBarOffset(15, 25);
+ Paint barPaint = new Paint();
+ barPaint.setARGB(200, 255, 250, 250);
+ scaleBarOverlay.setBackgroundPaint(barPaint);
+ scaleBarOverlay.enableScaleBar();
+ binding.mapView.getOverlays().add(scaleBarOverlay);
+ binding.mapView.getOverlays().add(new MapEventsOverlay(new MapEventsReceiver() {
+ @Override
+ public boolean singleTapConfirmedHelper(GeoPoint p) {
+ if (clickedMarker != null) {
+ removeMarker(clickedMarker);
+ addMarkerToMap(clickedMarker);
+ binding.mapView.invalidate();
+ } else {
+ Timber.e("CLICKED MARKER IS NULL");
}
- });
+ if (bottomSheetDetailsBehavior.getState() == BottomSheetBehavior.STATE_EXPANDED) {
+ // Back should first hide the bottom sheet if it is expanded
+ bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+ } else if (isDetailsBottomSheetVisible()) {
+ hideBottomDetailsSheet();
+ }
+ return true;
+ }
- mapBox.setOnMarkerClickListener(marker -> {
- if (marker instanceof NearbyMarker) {
- presenter.markerSelected(marker);
- }
+ @Override
+ public boolean longPressHelper(GeoPoint p) {
return false;
- });
+ }
+ }));
+ binding.mapView.setMultiTouchControls(true);
+ }
+
+ /**
+ * Recenters the map view to the specified GeoPoint and updates the marker to indicate the new
+ * position.
+ *
+ * @param geoPoint The GeoPoint representing the new center position for the map.
+ */
+ private void recenterMarkerToPosition(GeoPoint geoPoint) {
+ if (geoPoint != null) {
+ binding.mapView.getController().setCenter(geoPoint);
+ List overlays = binding.mapView.getOverlays();
+ for (int i = 0; i < overlays.size(); i++) {
+ if (overlays.get(i) instanceof org.osmdroid.views.overlay.Marker) {
+ binding.mapView.getOverlays().remove(i);
+ } else if (overlays.get(i) instanceof ScaleDiskOverlay) {
+ binding.mapView.getOverlays().remove(i);
+ }
+ }
+ ScaleDiskOverlay diskOverlay =
+ new ScaleDiskOverlay(this.getContext(),
+ geoPoint, 2000, GeoConstants.UnitOfMeasure.foot);
+ Paint circlePaint = new Paint();
+ circlePaint.setColor(Color.rgb(128, 128, 128));
+ circlePaint.setStyle(Paint.Style.STROKE);
+ circlePaint.setStrokeWidth(2f);
+ diskOverlay.setCirclePaint2(circlePaint);
+ Paint diskPaint = new Paint();
+ diskPaint.setColor(Color.argb(40, 128, 128, 128));
+ diskPaint.setStyle(Paint.Style.FILL_AND_STROKE);
+ diskOverlay.setCirclePaint1(diskPaint);
+ diskOverlay.setDisplaySizeMin(900);
+ diskOverlay.setDisplaySizeMax(1700);
+ binding.mapView.getOverlays().add(diskOverlay);
+ org.osmdroid.views.overlay.Marker startMarker = new org.osmdroid.views.overlay.Marker(
+ binding.mapView);
+ startMarker.setPosition(geoPoint);
+ startMarker.setAnchor(org.osmdroid.views.overlay.Marker.ANCHOR_CENTER,
+ org.osmdroid.views.overlay.Marker.ANCHOR_BOTTOM);
+ startMarker.setIcon(
+ ContextCompat.getDrawable(this.getContext(), R.drawable.current_location_marker));
+ startMarker.setTitle("Your Location");
+ startMarker.setTextLabelFontSize(24);
+ binding.mapView.getOverlays().add(startMarker);
}
}
+ /**
+ * Moves the camera of the map view to the specified GeoPoint using an animation.
+ *
+ * @param geoPoint The GeoPoint representing the new camera position for the map.
+ */
+ private void moveCameraToPosition(GeoPoint geoPoint) {
+ binding.mapView.getController().animateTo(geoPoint);
+ }
+
@Override
- public void setMapBoundaries(CameraUpdate cameaUpdate) {
- mapBox.easeCamera(cameaUpdate);
+ public fr.free.nrw.commons.location.LatLng getLastMapFocus() {
+ return lastMapFocus == null ? getMapCenter() : new fr.free.nrw.commons.location.LatLng(
+ lastMapFocus.getLatitude(), lastMapFocus.getLongitude(), 100);
+ }
+
+ @Override
+ public fr.free.nrw.commons.location.LatLng getMapCenter() {
+ fr.free.nrw.commons.location.LatLng latLnge = null;
+ if (mapCenter != null) {
+ latLnge = new fr.free.nrw.commons.location.LatLng(
+ mapCenter.getLatitude(), mapCenter.getLongitude(), 100);
+ } else {
+ if (applicationKvStore.getString("LastLocation") != null) {
+ final String[] locationLatLng
+ = applicationKvStore.getString("LastLocation").split(",");
+ lastKnownLocation
+ = new fr.free.nrw.commons.location.LatLng(Double.parseDouble(locationLatLng[0]),
+ Double.parseDouble(locationLatLng[1]), 1f);
+ latLnge = lastKnownLocation;
+ } else {
+ latLnge = new fr.free.nrw.commons.location.LatLng(51.506255446947776,
+ -0.07483536015053005, 1f);
+ }
+ }
+ moveCameraToPosition(new GeoPoint(latLnge.getLatitude(),latLnge.getLongitude()));
+ return latLnge;
+ }
+
+ @Override
+ public fr.free.nrw.commons.location.LatLng getMapFocus() {
+ fr.free.nrw.commons.location.LatLng mapFocusedLatLng = new fr.free.nrw.commons.location.LatLng(
+ binding.mapView.getMapCenter().getLatitude(), binding.mapView.getMapCenter().getLongitude(), 100);
+ return mapFocusedLatLng;
}
@Override
public void setFABRecenterAction(OnClickListener onClickListener) {
- fabRecenter.setOnClickListener(onClickListener);
+ binding.fabRecenter.setOnClickListener(onClickListener);
}
@Override
@@ -795,7 +900,8 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
}
} else {
if (snackbar == null) {
- snackbar = Snackbar.make(getView(), R.string.no_internet, Snackbar.LENGTH_INDEFINITE);
+ snackbar = Snackbar.make(getView(), R.string.no_internet,
+ Snackbar.LENGTH_INDEFINITE);
setSearchThisAreaButtonVisibility(false);
setProgressBarVisibility(false);
}
@@ -807,4 +913,10 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
}
};
}
+
+ @Override
+ public void onLocationPermissionDenied(String toastMessage) {}
+
+ @Override
+ public void onLocationPermissionGranted() {}
}
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapPresenter.java b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapPresenter.java
index fc20bdbfe..94b9cf5ad 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapPresenter.java
+++ b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapPresenter.java
@@ -4,10 +4,9 @@ import static fr.free.nrw.commons.location.LocationServiceManager.LocationChange
import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.SEARCH_CUSTOM_AREA;
+import android.location.Location;
import android.view.View;
-import com.mapbox.mapboxsdk.annotations.Marker;
-import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
-import com.mapbox.mapboxsdk.geometry.LatLngBounds;
+import fr.free.nrw.commons.BaseMarker;
import fr.free.nrw.commons.MapController;
import fr.free.nrw.commons.MapController.ExplorePlacesInfo;
import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao;
@@ -15,8 +14,6 @@ import fr.free.nrw.commons.explore.map.ExploreMapController.NearbyBaseMarkerThum
import fr.free.nrw.commons.kvstore.JsonKvStore;
import fr.free.nrw.commons.location.LatLng;
import fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType;
-import fr.free.nrw.commons.nearby.NearbyBaseMarker;
-import fr.free.nrw.commons.utils.LocationUtils;
import io.reactivex.Observable;
import java.lang.reflect.Proxy;
import java.util.List;
@@ -25,10 +22,10 @@ import timber.log.Timber;
public class ExploreMapPresenter
implements ExploreMapContract.UserActions,
NearbyBaseMarkerThumbCallback {
+
BookmarkLocationsDao bookmarkLocationDao;
private boolean isNearbyLocked;
- private boolean placesLoadedOnce;
- private LatLng curLatLng;
+ private LatLng currentLatLng;
private ExploreMapController exploreMapController;
private static final ExploreMapContract.View DUMMY = (ExploreMapContract.View) Proxy
@@ -54,7 +51,7 @@ public class ExploreMapPresenter
);
private ExploreMapContract.View exploreMapFragmentView = DUMMY;
- public ExploreMapPresenter(BookmarkLocationsDao bookmarkLocationDao){
+ public ExploreMapPresenter(BookmarkLocationsDao bookmarkLocationDao) {
this.bookmarkLocationDao = bookmarkLocationDao;
}
@@ -71,14 +68,6 @@ public class ExploreMapPresenter
return;
}
- LatLng lastLocation = exploreMapFragmentView.getLastLocation();
- curLatLng = lastLocation;
-
- if (curLatLng == null) {
- Timber.d("Skipping update of nearby places as location is unavailable");
- return;
- }
-
/**
* Significant changed - Markers and current location will be updated together
* Slightly changed - Only current position marker will be updated
@@ -87,24 +76,21 @@ public class ExploreMapPresenter
Timber.d("LOCATION_SIGNIFICANTLY_CHANGED");
lockUnlockNearby(true);
exploreMapFragmentView.setProgressBarVisibility(true);
- exploreMapFragmentView.populatePlaces(curLatLng, lastLocation);
-
+ exploreMapFragmentView.populatePlaces(exploreMapFragmentView.getMapCenter());
} else if (locationChangeType.equals(SEARCH_CUSTOM_AREA)) {
Timber.d("SEARCH_CUSTOM_AREA");
lockUnlockNearby(true);
exploreMapFragmentView.setProgressBarVisibility(true);
- exploreMapFragmentView.populatePlaces(curLatLng, exploreMapFragmentView.getCameraTarget());
+ exploreMapFragmentView.populatePlaces(exploreMapFragmentView.getMapFocus());
} else { // Means location changed slightly, ie user is walking or driving.
Timber.d("Means location changed slightly");
- if (exploreMapFragmentView.isCurrentLocationMarkerVisible()){ // Means user wants to see their live location
- exploreMapFragmentView.recenterMap(curLatLng);
- }
}
}
/**
* Nearby updates takes time, since they are network operations. During update time, we don't
* want to get any other calls from user. So locking nearby.
+ *
* @param isNearbyLocked true means lock, false means unlock
*/
@Override
@@ -133,7 +119,7 @@ public class ExploreMapPresenter
@Override
public void setActionListeners(JsonKvStore applicationKvStore) {
exploreMapFragmentView.setFABRecenterAction(v -> {
- exploreMapFragmentView.recenterMap(curLatLng);
+ exploreMapFragmentView.recenterMap(currentLatLng);
});
}
@@ -143,29 +129,9 @@ public class ExploreMapPresenter
return exploreMapFragmentView.backButtonClicked();
}
- @Override
- public void onCameraMove(com.mapbox.mapboxsdk.geometry.LatLng latLng) {
- exploreMapFragmentView.setProjectorLatLngBounds();
- // If our nearby markers are calculated at least once
- if (exploreMapController.latestSearchLocation != null) {
- double distance = latLng.distanceTo
- (LocationUtils.commonsLatLngToMapBoxLatLng(exploreMapController.latestSearchLocation));
- if (exploreMapFragmentView.isNetworkConnectionEstablished()) {
- if (distance > exploreMapController.latestSearchRadius && exploreMapController.latestSearchRadius != 0) {
- exploreMapFragmentView.setSearchThisAreaButtonVisibility(true);
- } else {
- exploreMapFragmentView.setSearchThisAreaButtonVisibility(false);
- }
- }
- } else {
- exploreMapFragmentView.setSearchThisAreaButtonVisibility(false);
- }
- }
-
public void onMapReady(ExploreMapController exploreMapController) {
this.exploreMapController = exploreMapController;
- exploreMapFragmentView.addSearchThisAreaButtonAction();
- if(null != exploreMapFragmentView) {
+ if (null != exploreMapFragmentView) {
exploreMapFragmentView.addSearchThisAreaButtonAction();
initializeMapOperations();
}
@@ -174,69 +140,48 @@ public class ExploreMapPresenter
public void initializeMapOperations() {
lockUnlockNearby(false);
updateMap(LOCATION_SIGNIFICANTLY_CHANGED);
- exploreMapFragmentView.addSearchThisAreaButtonAction();
}
- public Observable loadAttractionsFromLocation(LatLng curLatLng, LatLng searchLatLng, boolean checkingAroundCurrent) {
+ public Observable loadAttractionsFromLocation(LatLng currentLatLng,
+ LatLng searchLatLng, boolean checkingAroundCurrent) {
return Observable
.fromCallable(() -> exploreMapController
- .loadAttractionsFromLocation(curLatLng, searchLatLng,checkingAroundCurrent));
+ .loadAttractionsFromLocation(currentLatLng, searchLatLng, checkingAroundCurrent));
}
/**
* Populates places for custom location, should be used for finding nearby places around a
* location where you are not at.
+ *
* @param explorePlacesInfo This variable has placeToCenter list information and distances.
*/
public void updateMapMarkers(
- MapController.ExplorePlacesInfo explorePlacesInfo, Marker selectedMarker, boolean shouldTrackPosition) {
- exploreMapFragmentView.setMapBoundaries(CameraUpdateFactory.newLatLngBounds(getLatLngBounds(explorePlacesInfo.boundaryCoordinates), 50));
- prepareNearbyBaseMarkers(explorePlacesInfo, selectedMarker, shouldTrackPosition);
+ MapController.ExplorePlacesInfo explorePlacesInfo) {
+ if (explorePlacesInfo.mediaList != null) {
+ prepareNearbyBaseMarkers(explorePlacesInfo);
+ } else {
+ lockUnlockNearby(false); // So that new location updates wont come
+ exploreMapFragmentView.setProgressBarVisibility(false);
+ }
}
- void prepareNearbyBaseMarkers(MapController.ExplorePlacesInfo explorePlacesInfo, Marker selectedMarker, boolean shouldTrackPosition) {
+ void prepareNearbyBaseMarkers(MapController.ExplorePlacesInfo explorePlacesInfo) {
exploreMapController
- .loadAttractionsFromLocationToBaseMarkerOptions(explorePlacesInfo.curLatLng, // Curlatlang will be used to calculate distances
+ .loadAttractionsFromLocationToBaseMarkerOptions(explorePlacesInfo.currentLatLng,
+ // Curlatlang will be used to calculate distances
explorePlacesInfo.explorePlaceList,
exploreMapFragmentView.getContext(),
this,
- selectedMarker,
- shouldTrackPosition,
explorePlacesInfo);
}
@Override
- public void onNearbyBaseMarkerThumbsReady(List baseMarkers, ExplorePlacesInfo explorePlacesInfo, Marker selectedMarker, boolean shouldTrackPosition) {
- if(null != exploreMapFragmentView) {
- exploreMapFragmentView.addNearbyMarkersToMapBoxMap(baseMarkers, selectedMarker);
- exploreMapFragmentView.addCurrentLocationMarker(explorePlacesInfo.curLatLng);
- if(shouldTrackPosition){
- exploreMapFragmentView.updateMapToTrackPosition(explorePlacesInfo.curLatLng);
- }
+ public void onNearbyBaseMarkerThumbsReady(List baseMarkers,
+ ExplorePlacesInfo explorePlacesInfo) {
+ if (null != exploreMapFragmentView) {
+ exploreMapFragmentView.addMarkersToMap(baseMarkers);
lockUnlockNearby(false); // So that new location updates wont come
exploreMapFragmentView.setProgressBarVisibility(false);
- handleCenteringTaskIfAny();
- }
- }
-
- private LatLngBounds getLatLngBounds(LatLng[] boundaries) {
- LatLngBounds latLngBounds = new LatLngBounds.Builder()
- .include(LocationUtils.commonsLatLngToMapBoxLatLng(boundaries[0]))
- .include(LocationUtils.commonsLatLngToMapBoxLatLng(boundaries[1]))
- .include(LocationUtils.commonsLatLngToMapBoxLatLng(boundaries[2]))
- .include(LocationUtils.commonsLatLngToMapBoxLatLng(boundaries[3]))
- .build();
- return latLngBounds;
- }
-
- /**
- * Some centering task may need to wait for map to be ready, if they are requested before
- * map is ready. So we will remember it when the map is ready
- */
- private void handleCenteringTaskIfAny() {
- if (!placesLoadedOnce) {
- placesLoadedOnce = true;
- exploreMapFragmentView.centerMapToPlace(null);
}
}
@@ -245,7 +190,7 @@ public class ExploreMapPresenter
// Lock map operations during search this area operation
exploreMapFragmentView.setSearchThisAreaButtonVisibility(false);
- if (searchCloseToCurrentLocation()){
+ if (searchCloseToCurrentLocation()) {
updateMap(LOCATION_SIGNIFICANTLY_CHANGED);
} else {
updateMap(SEARCH_CUSTOM_AREA);
@@ -254,40 +199,29 @@ public class ExploreMapPresenter
}
/**
- * Returns true if search this area button is used around our current location, so that
- * we can continue following our current location again
+ * Returns true if search this area button is used around our current location, so that we can
+ * continue following our current location again
+ *
* @return Returns true if search this area button is used around our current location
*/
public boolean searchCloseToCurrentLocation() {
- if (null == exploreMapFragmentView.getLastFocusLocation() || exploreMapController.latestSearchRadius == 0) {
+ if (null == exploreMapFragmentView.getLastMapFocus()) {
return true;
}
- double distance = LocationUtils.commonsLatLngToMapBoxLatLng(exploreMapFragmentView.getCameraTarget())
- .distanceTo(exploreMapFragmentView.getLastFocusLocation());
- if (distance > exploreMapController.currentLocationSearchRadius * 3 / 4) {
+
+ Location mylocation = new Location("");
+ Location dest_location = new Location("");
+ dest_location.setLatitude(exploreMapFragmentView.getMapFocus().getLatitude());
+ dest_location.setLongitude(exploreMapFragmentView.getMapFocus().getLongitude());
+ mylocation.setLatitude(exploreMapFragmentView.getLastMapFocus().getLatitude());
+ mylocation.setLongitude(exploreMapFragmentView.getLastMapFocus().getLongitude());
+ Float distance = mylocation.distanceTo(dest_location);
+
+ if (distance > 2000.0 * 3 / 4) {
return false;
} else {
return true;
}
}
- @Override
- public void markerUnselected() {
- exploreMapFragmentView.hideBottomDetailsSheet();
- }
-
- @Override
- public void markerSelected(Marker marker) {
- exploreMapFragmentView.displayBottomSheetWithInfo(marker);
- }
-
- public boolean areLocationsClose(LatLng cameraTarget, LatLng lastKnownLocation) {
- double distance = LocationUtils.commonsLatLngToMapBoxLatLng(cameraTarget)
- .distanceTo(LocationUtils.commonsLatLngToMapBoxLatLng(lastKnownLocation));
- if (distance > exploreMapController.currentLocationSearchRadius * 3 / 4) {
- return false;
- } else {
- return true;
- }
- }
}
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/media/MediaConverter.kt b/app/src/main/java/fr/free/nrw/commons/explore/media/MediaConverter.kt
index 11101db23..162cfa2f2 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/media/MediaConverter.kt
+++ b/app/src/main/java/fr/free/nrw/commons/explore/media/MediaConverter.kt
@@ -6,12 +6,12 @@ import fr.free.nrw.commons.upload.structure.depictions.get
import fr.free.nrw.commons.utils.CommonsDateUtil
import fr.free.nrw.commons.utils.MediaDataExtractorUtil
import fr.free.nrw.commons.wikidata.WikidataProperties
+import fr.free.nrw.commons.wikidata.model.DataValue
+import fr.free.nrw.commons.wikidata.model.Entities
import org.apache.commons.lang3.StringUtils
-import org.wikipedia.dataclient.mwapi.MwQueryPage
-import org.wikipedia.gallery.ExtMetadata
-import org.wikipedia.gallery.ImageInfo
-import org.wikipedia.wikidata.DataValue
-import org.wikipedia.wikidata.Entities
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage
+import fr.free.nrw.commons.wikidata.model.gallery.ExtMetadata
+import fr.free.nrw.commons.wikidata.model.gallery.ImageInfo
import java.text.ParseException
import java.util.*
import javax.inject.Inject
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/media/PageableMediaFragment.kt b/app/src/main/java/fr/free/nrw/commons/explore/media/PageableMediaFragment.kt
index b14588669..19e0a91cd 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/media/PageableMediaFragment.kt
+++ b/app/src/main/java/fr/free/nrw/commons/explore/media/PageableMediaFragment.kt
@@ -18,7 +18,7 @@ abstract class PageableMediaFragment : BasePagingFragment(), MediaDetailP
* ViewBinding
*/
private var _binding: FragmentSearchPaginatedBinding? = null
- private val binding get() = _binding
+ private val binding get() = _binding!!
override val pagedListAdapter by lazy {
PagedMediaAdapter(categoryImagesCallback::onMediaClicked)
@@ -43,9 +43,9 @@ abstract class PageableMediaFragment : BasePagingFragment(), MediaDetailP
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
- ): View? {
+ ): View {
_binding = FragmentSearchPaginatedBinding.inflate(inflater, container, false)
- return binding?.root
+ return binding.root
}
private val simpleDataObserver =
@@ -66,7 +66,7 @@ abstract class PageableMediaFragment : BasePagingFragment(), MediaDetailP
pagedListAdapter.currentList?.get(position)?.takeIf { it.filename != null }
.also {
pagedListAdapter.currentList?.loadAround(position)
- binding?.paginatedSearchResultsList?.scrollToPosition(position)
+ binding.paginatedSearchResultsList.scrollToPosition(position)
}
override fun getTotalMediaCount(): Int = pagedListAdapter.itemCount
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/media/PagedMediaAdapter.kt b/app/src/main/java/fr/free/nrw/commons/explore/media/PagedMediaAdapter.kt
index 7e74e0f35..c1e641b56 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/media/PagedMediaAdapter.kt
+++ b/app/src/main/java/fr/free/nrw/commons/explore/media/PagedMediaAdapter.kt
@@ -6,9 +6,9 @@ import androidx.paging.PagedListAdapter
import androidx.recyclerview.widget.DiffUtil
import fr.free.nrw.commons.Media
import fr.free.nrw.commons.R
+import fr.free.nrw.commons.databinding.LayoutCategoryImagesBinding
import fr.free.nrw.commons.explore.paging.BaseViewHolder
import fr.free.nrw.commons.explore.paging.inflate
-import kotlinx.android.synthetic.main.layout_category_images.*
class PagedMediaAdapter(private val onImageClicked: (Int) -> Unit) :
PagedListAdapter(object : DiffUtil.ItemCallback() {
@@ -32,17 +32,19 @@ class PagedMediaAdapter(private val onImageClicked: (Int) -> Unit) :
class SearchImagesViewHolder(containerView: View, val onImageClicked: (Int) -> Unit) :
BaseViewHolder>(containerView) {
+ val binding = LayoutCategoryImagesBinding.bind(itemView)
+
override fun bind(item: Pair) {
val media = item.first
- categoryImageView.setOnClickListener { onImageClicked(item.second) }
- categoryImageTitle.text = media.mostRelevantCaption
- categoryImageView.setImageURI(media.thumbUrl)
+ binding.categoryImageView.setOnClickListener { onImageClicked(item.second) }
+ binding.categoryImageTitle.text = media.mostRelevantCaption
+ binding.categoryImageView.setImageURI(media.thumbUrl)
if (media.author?.isNotEmpty() == true) {
- categoryImageAuthor.visibility = View.VISIBLE
- categoryImageAuthor.text =
+ binding.categoryImageAuthor.visibility = View.VISIBLE
+ binding.categoryImageAuthor.text =
containerView.context.getString(R.string.image_uploaded_by, media.user)
} else {
- categoryImageAuthor.visibility = View.GONE
+ binding.categoryImageAuthor.visibility = View.GONE
}
}
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/paging/BasePagingFragment.kt b/app/src/main/java/fr/free/nrw/commons/explore/paging/BasePagingFragment.kt
index a1b2b976f..e61f0dc30 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/paging/BasePagingFragment.kt
+++ b/app/src/main/java/fr/free/nrw/commons/explore/paging/BasePagingFragment.kt
@@ -14,10 +14,9 @@ import androidx.paging.PagedList
import androidx.paging.PagedListAdapter
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.MergeAdapter
-import fr.free.nrw.commons.R
+import fr.free.nrw.commons.databinding.FragmentSearchPaginatedBinding
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment
import fr.free.nrw.commons.utils.ViewUtil
-import kotlinx.android.synthetic.main.fragment_search_paginated.*
abstract class BasePagingFragment : CommonsDaggerSupportFragment(),
@@ -30,15 +29,14 @@ abstract class BasePagingFragment : CommonsDaggerSupportFragment(),
private val mergeAdapter by lazy { MergeAdapter(pagedListAdapter, loadingAdapter) }
private var searchResults: LiveData>? = null
- override fun onCreateView(
- inflater: LayoutInflater,
- container: ViewGroup?,
- savedInstanceState: Bundle?
- ) = inflater.inflate(R.layout.fragment_search_paginated, container, false)
+ private var binding : FragmentSearchPaginatedBinding? = null
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
- paginatedSearchResultsList.apply {
+ val binding = FragmentSearchPaginatedBinding.bind(view)
+ this.binding = binding
+
+ binding.paginatedSearchResultsList.apply {
layoutManager = GridLayoutManager(context, if (isPortrait) 1 else 2)
adapter = mergeAdapter
}
@@ -53,7 +51,7 @@ abstract class BasePagingFragment : CommonsDaggerSupportFragment(),
*/
override fun onConfigurationChanged(newConfig: Configuration) {
super.onConfigurationChanged(newConfig)
- paginatedSearchResultsList.apply {
+ binding!!.paginatedSearchResultsList.apply {
layoutManager = GridLayoutManager(context, if (isPortrait) 1 else 2)
}
}
@@ -77,15 +75,15 @@ abstract class BasePagingFragment : CommonsDaggerSupportFragment(),
}
override fun hideInitialLoadProgress() {
- paginatedSearchInitialLoadProgress.visibility = GONE
+ binding!!.paginatedSearchInitialLoadProgress.visibility = GONE
}
override fun showInitialLoadInProgress() {
- paginatedSearchInitialLoadProgress.visibility = VISIBLE
+ binding!!.paginatedSearchInitialLoadProgress.visibility = VISIBLE
}
override fun showSnackbar() {
- ViewUtil.showShortSnackbar(paginatedSearchResultsList, errorTextId)
+ ViewUtil.showShortSnackbar(binding!!.paginatedSearchResultsList, errorTextId)
}
fun onQueryUpdated(query: String) {
@@ -93,14 +91,14 @@ abstract class BasePagingFragment : CommonsDaggerSupportFragment(),
}
override fun showEmptyText(query: String) {
- contentNotFound.text = getEmptyText(query)
- contentNotFound.visibility = VISIBLE
+ binding!!.contentNotFound.text = getEmptyText(query)
+ binding!!.contentNotFound.visibility = VISIBLE
}
abstract fun getEmptyText(query: String): String
override fun hideEmptyText() {
- contentNotFound.visibility = GONE
+ binding!!.contentNotFound.visibility = GONE
}
}
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/paging/FooterAdapter.kt b/app/src/main/java/fr/free/nrw/commons/explore/paging/FooterAdapter.kt
index d166e5145..7c6460967 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/paging/FooterAdapter.kt
+++ b/app/src/main/java/fr/free/nrw/commons/explore/paging/FooterAdapter.kt
@@ -8,8 +8,8 @@ import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import fr.free.nrw.commons.R
+import fr.free.nrw.commons.databinding.ListItemLoadMoreBinding
import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.list_item_load_more.*
class FooterAdapter(private val onRefreshClicked: () -> Unit) :
ListAdapter(object :
@@ -45,8 +45,10 @@ open class FooterViewHolder(override val containerView: View) :
class LoadingViewHolder(containerView: View) : FooterViewHolder(containerView)
class RefreshViewHolder(containerView: View, onRefreshClicked: () -> Unit) :
FooterViewHolder(containerView) {
+ val binding = ListItemLoadMoreBinding.bind(itemView)
+
init {
- listItemLoadMoreButton.setOnClickListener { onRefreshClicked() }
+ binding.listItemLoadMoreButton.setOnClickListener { onRefreshClicked() }
}
}
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java b/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java
index e3b607106..cd98651f0 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java
@@ -7,15 +7,11 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
-import butterknife.BindView;
-import butterknife.ButterKnife;
import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.databinding.FragmentSearchHistoryBinding;
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
import fr.free.nrw.commons.explore.SearchActivity;
import java.util.List;
@@ -29,42 +25,39 @@ public class RecentSearchesFragment extends CommonsDaggerSupportFragment {
@Inject
RecentSearchesDao recentSearchesDao;
- @BindView(R.id.recent_searches_list)
- ListView recentSearchesList;
List recentSearches;
ArrayAdapter adapter;
- @BindView(R.id.recent_searches_delete_button)
- ImageView recent_searches_delete_button;
- @BindView(R.id.recent_searches_text_view)
- TextView recent_searches_text_view;
+
+ private FragmentSearchHistoryBinding binding;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
- View rootView = inflater.inflate(R.layout.fragment_search_history, container, false);
- ButterKnife.bind(this, rootView);
+ binding = FragmentSearchHistoryBinding.inflate(inflater, container, false);
+
recentSearches = recentSearchesDao.recentSearches(10);
if (recentSearches.isEmpty()) {
- recent_searches_delete_button.setVisibility(View.GONE);
- recent_searches_text_view.setText(R.string.no_recent_searches);
+ binding.recentSearchesDeleteButton.setVisibility(View.GONE);
+ binding.recentSearchesTextView.setText(R.string.no_recent_searches);
}
- recent_searches_delete_button.setOnClickListener(v -> {
+ binding.recentSearchesDeleteButton.setOnClickListener(v -> {
showDeleteRecentAlertDialog(requireContext());
});
adapter = new ArrayAdapter<>(requireContext(), R.layout.item_recent_searches,
recentSearches);
- recentSearchesList.setAdapter(adapter);
- recentSearchesList.setOnItemClickListener((parent, view, position, id) -> (
+ binding.recentSearchesList.setAdapter(adapter);
+ binding.recentSearchesList.setOnItemClickListener((parent, view, position, id) -> (
(SearchActivity) getContext()).updateText(recentSearches.get(position)));
- recentSearchesList.setOnItemLongClickListener((parent, view, position, id) -> {
+ binding.recentSearchesList.setOnItemLongClickListener((parent, view, position, id) -> {
showDeleteAlertDialog(requireContext(), position);
return true;
});
updateRecentSearches();
- return rootView;
+
+ return binding.getRoot();
}
private void showDeleteRecentAlertDialog(@NonNull final Context context) {
@@ -80,15 +73,17 @@ public class RecentSearchesFragment extends CommonsDaggerSupportFragment {
private void setDeleteRecentPositiveButton(@NonNull final Context context,
final DialogInterface dialog) {
recentSearchesDao.deleteAll();
- recent_searches_delete_button.setVisibility(View.GONE);
- recent_searches_text_view.setText(R.string.no_recent_searches);
- Toast.makeText(getContext(), getString(R.string.search_history_deleted),
- Toast.LENGTH_SHORT).show();
- recentSearches = recentSearchesDao.recentSearches(10);
- adapter = new ArrayAdapter<>(context, R.layout.item_recent_searches,
- recentSearches);
- recentSearchesList.setAdapter(adapter);
- adapter.notifyDataSetChanged();
+ if (binding != null) {
+ binding.recentSearchesDeleteButton.setVisibility(View.GONE);
+ binding.recentSearchesTextView.setText(R.string.no_recent_searches);
+ Toast.makeText(getContext(), getString(R.string.search_history_deleted),
+ Toast.LENGTH_SHORT).show();
+ recentSearches = recentSearchesDao.recentSearches(10);
+ adapter = new ArrayAdapter<>(context, R.layout.item_recent_searches,
+ recentSearches);
+ binding.recentSearchesList.setAdapter(adapter);
+ adapter.notifyDataSetChanged();
+ }
dialog.dismiss();
}
@@ -108,8 +103,10 @@ public class RecentSearchesFragment extends CommonsDaggerSupportFragment {
recentSearches = recentSearchesDao.recentSearches(10);
adapter = new ArrayAdapter<>(context, R.layout.item_recent_searches,
recentSearches);
- recentSearchesList.setAdapter(adapter);
- adapter.notifyDataSetChanged();
+ if (binding != null){
+ binding.recentSearchesList.setAdapter(adapter);
+ adapter.notifyDataSetChanged();
+ }
dialog.dismiss();
}
@@ -131,8 +128,19 @@ public class RecentSearchesFragment extends CommonsDaggerSupportFragment {
adapter.notifyDataSetChanged();
if (!recentSearches.isEmpty()) {
- recent_searches_delete_button.setVisibility(View.VISIBLE);
- recent_searches_text_view.setText(R.string.search_recent_header);
+ if (binding!= null) {
+ binding.recentSearchesDeleteButton.setVisibility(View.VISIBLE);
+ binding.recentSearchesTextView.setText(R.string.search_recent_header);
+ }
+ }
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+
+ if (binding != null) {
+ binding = null;
}
}
}
diff --git a/app/src/main/java/fr/free/nrw/commons/feedback/FeedbackContentCreator.java b/app/src/main/java/fr/free/nrw/commons/feedback/FeedbackContentCreator.java
index 5fe0cac4e..839858b3e 100644
--- a/app/src/main/java/fr/free/nrw/commons/feedback/FeedbackContentCreator.java
+++ b/app/src/main/java/fr/free/nrw/commons/feedback/FeedbackContentCreator.java
@@ -12,7 +12,8 @@ import java.util.Locale;
* from feedback information
*/
public class FeedbackContentCreator {
- private StringBuilder stringBuilder;
+ private StringBuilder sectionTextBuilder;
+ private StringBuilder sectionTitleBuilder;
private Feedback feedback;
private Context context;
@@ -28,71 +29,80 @@ public class FeedbackContentCreator {
public void init() {
// Localization is not needed here, because this ends up on a page where developers read the feedback, so English is the most convenient.
- stringBuilder = new StringBuilder();
- stringBuilder.append("== ");
- stringBuilder.append("Feedback from ");
- stringBuilder.append(AccountUtil.getUserName(context));
- stringBuilder.append(" for version ");
- stringBuilder.append(feedback.getVersion());
- stringBuilder.append(" ==");
- stringBuilder.append("\n");
- stringBuilder.append(feedback.getTitle());
- stringBuilder.append("\n");
- stringBuilder.append("\n");
+ /*
+ * Construct the feedback section title
+ */
+ sectionTitleBuilder = new StringBuilder();
+ sectionTitleBuilder.append("Feedback from ");
+ sectionTitleBuilder.append(AccountUtil.getUserName(context));
+ sectionTitleBuilder.append(" for version ");
+ sectionTitleBuilder.append(feedback.getVersion());
+
+ /*
+ * Construct the feedback section text
+ */
+ sectionTextBuilder = new StringBuilder();
+ sectionTextBuilder.append("\n");
+ sectionTextBuilder.append(feedback.getTitle());
+ sectionTextBuilder.append("\n");
+ sectionTextBuilder.append("\n");
if (feedback.getApiLevel() != null) {
- stringBuilder.append("* ");
- stringBuilder.append(LangCodeUtils.getLocalizedResources(context,
+ sectionTextBuilder.append("* ");
+ sectionTextBuilder.append(LangCodeUtils.getLocalizedResources(context,
Locale.ENGLISH).getString(R.string.api_level));
- stringBuilder.append(": ");
- stringBuilder.append(feedback.getApiLevel());
- stringBuilder.append("\n");
+ sectionTextBuilder.append(": ");
+ sectionTextBuilder.append(feedback.getApiLevel());
+ sectionTextBuilder.append("\n");
}
if (feedback.getAndroidVersion() != null) {
- stringBuilder.append("* ");
- stringBuilder.append(LangCodeUtils.getLocalizedResources(context,
+ sectionTextBuilder.append("* ");
+ sectionTextBuilder.append(LangCodeUtils.getLocalizedResources(context,
Locale.ENGLISH).getString(R.string.android_version));
- stringBuilder.append(": ");
- stringBuilder.append(feedback.getAndroidVersion());
- stringBuilder.append("\n");
+ sectionTextBuilder.append(": ");
+ sectionTextBuilder.append(feedback.getAndroidVersion());
+ sectionTextBuilder.append("\n");
}
if (feedback.getDeviceManufacturer() != null) {
- stringBuilder.append("* ");
- stringBuilder.append(LangCodeUtils.getLocalizedResources(context,
+ sectionTextBuilder.append("* ");
+ sectionTextBuilder.append(LangCodeUtils.getLocalizedResources(context,
Locale.ENGLISH).getString(R.string.device_manufacturer));
- stringBuilder.append(": ");
- stringBuilder.append(feedback.getDeviceManufacturer());
- stringBuilder.append("\n");
+ sectionTextBuilder.append(": ");
+ sectionTextBuilder.append(feedback.getDeviceManufacturer());
+ sectionTextBuilder.append("\n");
}
if (feedback.getDeviceModel() != null) {
- stringBuilder.append("* ");
- stringBuilder.append(LangCodeUtils.getLocalizedResources(context,
+ sectionTextBuilder.append("* ");
+ sectionTextBuilder.append(LangCodeUtils.getLocalizedResources(context,
Locale.ENGLISH).getString(R.string.device_model));
- stringBuilder.append(": ");
- stringBuilder.append(feedback.getDeviceModel());
- stringBuilder.append("\n");
+ sectionTextBuilder.append(": ");
+ sectionTextBuilder.append(feedback.getDeviceModel());
+ sectionTextBuilder.append("\n");
}
if (feedback.getDevice() != null) {
- stringBuilder.append("* ");
- stringBuilder.append(LangCodeUtils.getLocalizedResources(context,
+ sectionTextBuilder.append("* ");
+ sectionTextBuilder.append(LangCodeUtils.getLocalizedResources(context,
Locale.ENGLISH).getString(R.string.device_name));
- stringBuilder.append(": ");
- stringBuilder.append(feedback.getDevice());
- stringBuilder.append("\n");
+ sectionTextBuilder.append(": ");
+ sectionTextBuilder.append(feedback.getDevice());
+ sectionTextBuilder.append("\n");
}
if (feedback.getNetworkType() != null) {
- stringBuilder.append("* ");
- stringBuilder.append(LangCodeUtils.getLocalizedResources(context,
+ sectionTextBuilder.append("* ");
+ sectionTextBuilder.append(LangCodeUtils.getLocalizedResources(context,
Locale.ENGLISH).getString(R.string.network_type));
- stringBuilder.append(": ");
- stringBuilder.append(feedback.getNetworkType());
- stringBuilder.append("\n");
+ sectionTextBuilder.append(": ");
+ sectionTextBuilder.append(feedback.getNetworkType());
+ sectionTextBuilder.append("\n");
}
- stringBuilder.append("~~~~");
- stringBuilder.append("\n");
+ sectionTextBuilder.append("~~~~");
+ sectionTextBuilder.append("\n");
}
- @Override
- public String toString() {
- return stringBuilder.toString();
+ public String getSectionText() {
+ return sectionTextBuilder.toString();
+ }
+
+ public String getSectionTitle() {
+ return sectionTitleBuilder.toString();
}
}
diff --git a/app/src/main/java/fr/free/nrw/commons/feedback/FeedbackDialog.java b/app/src/main/java/fr/free/nrw/commons/feedback/FeedbackDialog.java
index fb4893ea3..2308623ec 100644
--- a/app/src/main/java/fr/free/nrw/commons/feedback/FeedbackDialog.java
+++ b/app/src/main/java/fr/free/nrw/commons/feedback/FeedbackDialog.java
@@ -3,14 +3,17 @@ package fr.free.nrw.commons.feedback;
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
+import android.text.Html;
+import android.text.Spanned;
+import android.text.method.LinkMovementMethod;
import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Toast;
+import android.view.WindowManager.LayoutParams;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.databinding.DialogFeedbackBinding;
import fr.free.nrw.commons.feedback.model.Feedback;
import fr.free.nrw.commons.utils.ConfigUtils;
import fr.free.nrw.commons.utils.DeviceInfoUtil;
+import java.util.Objects;
/**
* Feedback dialog that asks user for message and
@@ -21,15 +24,21 @@ public class FeedbackDialog extends Dialog {
private OnFeedbackSubmitCallback onFeedbackSubmitCallback;
+ private Spanned feedbackDestinationHtml;
+
public FeedbackDialog(Context context, OnFeedbackSubmitCallback onFeedbackSubmitCallback) {
super(context);
this.onFeedbackSubmitCallback = onFeedbackSubmitCallback;
+ feedbackDestinationHtml = Html.fromHtml(context.getString(R.string.feedback_destination_note));
}
@Override
protected void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
dialogFeedbackBinding = DialogFeedbackBinding.inflate(getLayoutInflater());
+ dialogFeedbackBinding.feedbackDestination.setText(feedbackDestinationHtml);
+ dialogFeedbackBinding.feedbackDestination.setMovementMethod(LinkMovementMethod.getInstance());
+ Objects.requireNonNull(getWindow()).setSoftInputMode(LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
final View view = dialogFeedbackBinding.getRoot();
setContentView(view);
dialogFeedbackBinding.btnSubmitFeedback.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/java/fr/free/nrw/commons/filepicker/Constants.java b/app/src/main/java/fr/free/nrw/commons/filepicker/Constants.java
index c25461740..3c9299c1a 100644
--- a/app/src/main/java/fr/free/nrw/commons/filepicker/Constants.java
+++ b/app/src/main/java/fr/free/nrw/commons/filepicker/Constants.java
@@ -7,6 +7,8 @@ public interface Constants {
* Provides the request codes utilised by the FilePicker
*/
interface RequestCodes {
+ int LOCATION = 1;
+ int STORAGE = 2;
int FILE_PICKER_IMAGE_IDENTIFICATOR = 0b1101101100; //876
int SOURCE_CHOOSER = 1 << 15;
diff --git a/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java b/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java
index bc43cb154..08453a95d 100644
--- a/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java
+++ b/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java
@@ -1,5 +1,7 @@
package fr.free.nrw.commons.filepicker;
+import static fr.free.nrw.commons.filepicker.PickedFiles.singleFileList;
+
import android.app.Activity;
import android.content.ClipData;
import android.content.Context;
@@ -8,13 +10,11 @@ import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.net.Uri;
-import androidx.preference.PreferenceManager;
import android.provider.MediaStore;
import android.text.TextUtils;
-
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-
+import androidx.preference.PreferenceManager;
import fr.free.nrw.commons.customselector.model.Image;
import fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivity;
import java.io.File;
@@ -23,8 +23,6 @@ import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
-import static fr.free.nrw.commons.filepicker.PickedFiles.singleFileList;
-
public class FilePicker implements Constants {
private static final String KEY_PHOTO_URI = "photo_uri";
@@ -46,11 +44,15 @@ public class FilePicker implements Constants {
return uri;
}
- private static Intent createGalleryIntent(@NonNull Context context, int type) {
+ private static Intent createGalleryIntent(@NonNull Context context, int type,
+ boolean openDocumentIntentPreferred) {
// storing picked image type to shared preferences
storeType(context, type);
- return plainGalleryPickerIntent()
- .putExtra(Intent.EXTRA_ALLOW_MULTIPLE, configuration(context).allowsMultiplePickingInGallery());
+ //Supported types are SVG, PNG and JPEG,GIF, TIFF, WebP, XCF
+ final String[] mimeTypes = { "image/jpg","image/png","image/jpeg", "image/gif", "image/tiff", "image/webp", "image/xcf", "image/svg+xml", "image/webp"};
+ return plainGalleryPickerIntent(openDocumentIntentPreferred)
+ .putExtra(Intent.EXTRA_ALLOW_MULTIPLE, configuration(context).allowsMultiplePickingInGallery())
+ .putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes);
}
/**
@@ -105,8 +107,8 @@ public class FilePicker implements Constants {
*
* @param type Custom type of your choice, which will be returned with the images
*/
- public static void openGallery(Activity activity, int type) {
- Intent intent = createGalleryIntent(activity, type);
+ public static void openGallery(Activity activity, int type, boolean openDocumentIntentPreferred) {
+ Intent intent = createGalleryIntent(activity, type, openDocumentIntentPreferred);
activity.startActivityForResult(intent, RequestCodes.PICK_PICTURE_FROM_GALLERY);
}
@@ -200,8 +202,41 @@ public class FilePicker implements Constants {
return data == null || (data.getData() == null && data.getClipData() == null);
}
- private static Intent plainGalleryPickerIntent() {
- Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+ private static Intent plainGalleryPickerIntent(boolean openDocumentIntentPreferred) {
+ /*
+ * Asking for ACCESS_MEDIA_LOCATION at runtime solved the location-loss issue
+ * in the custom selector in Contributions fragment.
+ * Detailed discussion: https://github.com/commons-app/apps-android-commons/issues/5015
+ *
+ * This permission check, however, was insufficient to fix location-loss in
+ * the regular selector in Contributions fragment and Nearby fragment,
+ * especially on some devices running Android 13 that use the new Photo Picker by default.
+ *
+ * New Photo Picker: https://developer.android.com/training/data-storage/shared/photopicker
+ *
+ * The new Photo Picker introduced by Android redacts location tags from EXIF metadata.
+ * Reported on the Google Issue Tracker: https://issuetracker.google.com/issues/243294058
+ * Status: Won't fix (Intended behaviour)
+ *
+ * Switched intent from ACTION_GET_CONTENT to ACTION_OPEN_DOCUMENT (by default; can
+ * be changed through the Setting page) as:
+ *
+ * ACTION_GET_CONTENT opens the 'best application' for choosing that kind of data
+ * The best application is the new Photo Picker that redacts the location tags
+ *
+ * ACTION_OPEN_DOCUMENT, however, displays the various DocumentsProvider instances
+ * installed on the device, letting the user interactively navigate through them.
+ *
+ * So, this allows us to use the traditional file picker that does not redact location tags
+ * from EXIF.
+ *
+ */
+ Intent intent;
+ if (openDocumentIntentPreferred) {
+ intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+ } else {
+ intent = new Intent(Intent.ACTION_GET_CONTENT);
+ }
intent.setType("image/*");
return intent;
}
@@ -369,4 +404,4 @@ public class FilePicker implements Constants {
void onCanceled(FilePicker.ImageSource source, int type);
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/filepicker/PickedFiles.java b/app/src/main/java/fr/free/nrw/commons/filepicker/PickedFiles.java
index ea5983173..ca1abba62 100644
--- a/app/src/main/java/fr/free/nrw/commons/filepicker/PickedFiles.java
+++ b/app/src/main/java/fr/free/nrw/commons/filepicker/PickedFiles.java
@@ -56,18 +56,13 @@ public class PickedFiles implements Constants {
* @param in input stream of source file.
* @param file destination file
*/
- private static void writeToFile(InputStream in, File file) {
- try {
- OutputStream out = new FileOutputStream(file);
+ private static void writeToFile(InputStream in, File file) throws IOException {
+ try (OutputStream out = new FileOutputStream(file)) {
byte[] buf = new byte[1024];
int len;
while ((len = in.read(buf)) > 0) {
out.write(buf, 0, len);
}
- out.close();
- in.close();
- } catch (Exception e) {
- e.printStackTrace();
}
}
@@ -79,8 +74,9 @@ public class PickedFiles implements Constants {
* @throws IOException (File input stream exception)
*/
private static void copyFile(File src, File dst) throws IOException {
- InputStream in = new FileInputStream(src);
- writeToFile(in, dst);
+ try (InputStream in = new FileInputStream(src)) {
+ writeToFile(in, dst);
+ }
}
/**
@@ -157,11 +153,12 @@ public class PickedFiles implements Constants {
* @return Uploadable file ready for tag redaction.
*/
public static UploadableFile pickedExistingPicture(@NonNull Context context, Uri photoUri) throws IOException, SecurityException {// SecurityException for those file providers who share URI but forget to grant necessary permissions
- InputStream pictureInputStream = context.getContentResolver().openInputStream(photoUri);
File directory = tempImageDirectory(context);
File photoFile = new File(directory, UUID.randomUUID().toString() + "." + getMimeType(context, photoUri));
if (photoFile.createNewFile()) {
- writeToFile(pictureInputStream, photoFile);
+ try (InputStream pictureInputStream = context.getContentResolver().openInputStream(photoUri)) {
+ writeToFile(pictureInputStream, photoFile);
+ }
} else {
throw new IOException("could not create photoFile to write upon");
}
diff --git a/app/src/main/java/fr/free/nrw/commons/filepicker/UploadableFile.java b/app/src/main/java/fr/free/nrw/commons/filepicker/UploadableFile.java
index 7df1cc964..1fe306a8b 100644
--- a/app/src/main/java/fr/free/nrw/commons/filepicker/UploadableFile.java
+++ b/app/src/main/java/fr/free/nrw/commons/filepicker/UploadableFile.java
@@ -10,13 +10,11 @@ import android.os.Parcelable;
import androidx.annotation.Nullable;
import androidx.exifinterface.media.ExifInterface;
+import fr.free.nrw.commons.upload.FileUtils;
import java.io.File;
import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.Date;
-
-import fr.free.nrw.commons.upload.FileUtils;
+import timber.log.Timber;
public class UploadableFile implements Parcelable {
public static final Creator CREATOR = new Creator() {
@@ -41,7 +39,7 @@ public class UploadableFile implements Parcelable {
public UploadableFile(File file) {
this.file = file;
- this.contentUri = Uri.parse(file.getAbsolutePath());
+ this.contentUri = Uri.fromFile(new File(file.getPath()));
}
public UploadableFile(Parcel in) {
@@ -74,7 +72,6 @@ public class UploadableFile implements Parcelable {
return 0;
}
-
/**
* First try to get the file creation date from EXIF else fall back to CP
* @param context
@@ -118,6 +115,24 @@ public class UploadableFile implements Parcelable {
}
}
+ /**
+ * Indicate whether the EXIF contains the location (both latitude and longitude).
+ *
+ * @return whether the location exists for the file's EXIF
+ */
+ public boolean hasLocation() {
+ try {
+ ExifInterface exif = new ExifInterface(file.getAbsolutePath());
+ final String latitude = exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE);
+ final String longitude = exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE);
+ return latitude != null && longitude != null;
+ } catch (IOException | NumberFormatException | IndexOutOfBoundsException e) {
+ Timber.tag("UploadableFile");
+ Timber.d(e);
+ }
+ return false;
+ }
+
/**
* Get filePath creation date from uri from EXIF
*
@@ -143,13 +158,9 @@ public class UploadableFile implements Parcelable {
}
}
}
-
- } catch (IOException e) {
- e.printStackTrace();
- } catch (NumberFormatException e) {
- e.printStackTrace();
- } catch (IndexOutOfBoundsException e) {
- e.printStackTrace();
+ } catch (IOException | NumberFormatException | IndexOutOfBoundsException e) {
+ Timber.tag("UploadableFile");
+ Timber.d(e);
}
return null;
}
diff --git a/data-client/src/main/java/org/wikipedia/language/AppLanguageLookUpTable.java b/app/src/main/java/fr/free/nrw/commons/language/AppLanguageLookUpTable.java
similarity index 98%
rename from data-client/src/main/java/org/wikipedia/language/AppLanguageLookUpTable.java
rename to app/src/main/java/fr/free/nrw/commons/language/AppLanguageLookUpTable.java
index e08f09130..a0286a7ef 100644
--- a/data-client/src/main/java/org/wikipedia/language/AppLanguageLookUpTable.java
+++ b/app/src/main/java/fr/free/nrw/commons/language/AppLanguageLookUpTable.java
@@ -1,4 +1,4 @@
-package org.wikipedia.language;
+package fr.free.nrw.commons.language;
import android.content.Context;
import android.content.res.Resources;
@@ -8,8 +8,7 @@ import androidx.annotation.ArrayRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import org.wikipedia.dataclient.R;
-
+import fr.free.nrw.commons.R;
import java.lang.ref.SoftReference;
import java.util.Arrays;
import java.util.List;
diff --git a/app/src/main/java/fr/free/nrw/commons/location/LatLng.java b/app/src/main/java/fr/free/nrw/commons/location/LatLng.java
index 5a378b803..4970fc54f 100644
--- a/app/src/main/java/fr/free/nrw/commons/location/LatLng.java
+++ b/app/src/main/java/fr/free/nrw/commons/location/LatLng.java
@@ -38,7 +38,10 @@ public class LatLng implements Parcelable {
this.latitude = Math.max(-90.0D, Math.min(90.0D, latitude));
this.accuracy = accuracy;
}
-
+ /**
+ * An alternate constructor for this class.
+ * @param in A parcelable which contains the latitude, longitude, and accuracy
+ */
public LatLng(Parcel in) {
latitude = in.readDouble();
longitude = in.readDouble();
@@ -165,7 +168,7 @@ public class LatLng implements Parcelable {
}
public Uri getGmmIntentUri() {
- return Uri.parse("geo:0,0?q=" + latitude + "," + longitude);
+ return Uri.parse("geo:" + latitude + "," + longitude + "?z=16");
}
@Override
diff --git a/app/src/main/java/fr/free/nrw/commons/location/LocationPermissionsHelper.java b/app/src/main/java/fr/free/nrw/commons/location/LocationPermissionsHelper.java
new file mode 100644
index 000000000..77e089c9c
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/location/LocationPermissionsHelper.java
@@ -0,0 +1,186 @@
+package fr.free.nrw.commons.location;
+
+import android.Manifest;
+import android.Manifest.permission;
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.provider.Settings;
+import android.widget.Toast;
+import androidx.core.app.ActivityCompat;
+import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.filepicker.Constants.RequestCodes;
+import fr.free.nrw.commons.utils.DialogUtil;
+import fr.free.nrw.commons.utils.PermissionUtils;
+
+/**
+ * Helper class to handle location permissions.
+ *
+ * Location flow for fragments containing a map is as follows:
+ * Case 1: When location permission has never been asked for or denied before
+ * Check if permission is already granted or not.
+ * If not already granted, ask for it (if it isn't denied twice before).
+ * If now user grants permission, go to Case 3/4, else go to Case 2.
+ *
+ * Case 2: When location permission is just asked but has been denied
+ * Shows a toast to tell the user why location permission is needed.
+ * Also shows a rationale to the user, on agreeing to which, we go back to Case 1.
+ * Show current location / nearby pins / nearby images according to the default location.
+ *
+ * Case 3: When location permission are already granted, but location services are off
+ * Asks the user to turn on the location service, using a dialog.
+ * If the user rejects, checks for the last known location and shows stuff using that location.
+ * Also displays a toast telling the user why location should be turned on.
+ *
+ * Case 4: When location permission has been granted and location services are also on
+ * Do whatever is required by that particular activity / fragment using current location.
+ *
+ */
+public class LocationPermissionsHelper {
+
+ Activity activity;
+ LocationServiceManager locationManager;
+ LocationPermissionCallback callback;
+
+ public LocationPermissionsHelper(Activity activity, LocationServiceManager locationManager,
+ LocationPermissionCallback callback) {
+ this.activity = activity;
+ this.locationManager = locationManager;
+ this.callback = callback;
+ }
+
+ /**
+ * Ask for location permission if the user agrees on attaching location with pictures and the
+ * app does not have the access to location
+ *
+ * @param dialogTitleResource Resource id of the title of the dialog
+ * @param dialogTextResource Resource id of the text of the dialog
+ */
+ public void requestForLocationAccess(
+ int dialogTitleResource,
+ int dialogTextResource
+ ) {
+ if (checkLocationPermission(activity)) {
+ callback.onLocationPermissionGranted();
+ } else {
+ if (ActivityCompat.shouldShowRequestPermissionRationale(activity,
+ permission.ACCESS_FINE_LOCATION)) {
+ DialogUtil.showAlertDialog(activity, activity.getString(dialogTitleResource),
+ activity.getString(dialogTextResource),
+ activity.getString(android.R.string.ok),
+ activity.getString(android.R.string.cancel),
+ () -> {
+ ActivityCompat.requestPermissions(activity,
+ new String[]{permission.ACCESS_FINE_LOCATION}, 1);
+ },
+ () -> callback.onLocationPermissionDenied(
+ activity.getString(R.string.upload_map_location_access)),
+ null,
+ false);
+ } else {
+ ActivityCompat.requestPermissions(activity,
+ new String[]{permission.ACCESS_FINE_LOCATION},
+ RequestCodes.LOCATION);
+ }
+ }
+ }
+
+ /**
+ * Shows a dialog for user to open the settings page and turn on location services
+ *
+ * @param activity Activity object
+ * @param dialogTextResource int id of the required string resource
+ */
+ public void showLocationOffDialog(Activity activity, int dialogTextResource) {
+ DialogUtil
+ .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),
+ () -> openLocationSettings(activity),
+ () -> Toast.makeText(activity, activity.getString(dialogTextResource),
+ Toast.LENGTH_LONG).show()
+ );
+ }
+
+ /**
+ * Opens the location access page in settings, for user to turn on location services
+ *
+ * @param activity Activtiy object
+ */
+ public void openLocationSettings(Activity activity) {
+ final Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+ final PackageManager packageManager = activity.getPackageManager();
+
+ if (intent.resolveActivity(packageManager) != null) {
+ activity.startActivity(intent);
+ } else {
+ Toast.makeText(activity, R.string.cannot_open_location_settings, Toast.LENGTH_LONG)
+ .show();
+ }
+ }
+
+ /**
+ * Shows a dialog for user to open the app's settings page and give location permission
+ *
+ * @param activity Activity object
+ * @param dialogTextResource int id of the required string resource
+ */
+ public void showAppSettingsDialog(Activity activity, int dialogTextResource) {
+ DialogUtil
+ .showAlertDialog(activity, activity.getString(R.string.location_permission_title),
+ activity.getString(dialogTextResource),
+ activity.getString(R.string.title_app_shortcut_setting),
+ activity.getString(R.string.cancel),
+ () -> openAppSettings(activity),
+ () -> Toast.makeText(activity, activity.getString(dialogTextResource),
+ Toast.LENGTH_LONG).show()
+ );
+ }
+
+ /**
+ * Opens detailed settings page of the app for the user to turn on location services
+ *
+ * @param activity Activity object
+ */
+ public void openAppSettings(Activity activity) {
+ Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+ Uri uri = Uri.fromParts("package", activity.getPackageName(), null);
+ intent.setData(uri);
+ activity.startActivity(intent);
+ }
+
+
+ /**
+ * Check if apps have access to location even after having individual access
+ *
+ * @return Returns true if location services are on and false otherwise
+ */
+ public boolean isLocationAccessToAppsTurnedOn() {
+ return (locationManager.isNetworkProviderEnabled()
+ || locationManager.isGPSProviderEnabled());
+ }
+
+ /**
+ * Checks if location permission is already granted or not
+ *
+ * @param activity Activity object
+ * @return Returns true if location permission is granted and false otherwise
+ */
+ public boolean checkLocationPermission(Activity activity) {
+ return PermissionUtils.hasPermission(activity,
+ new String[]{Manifest.permission.ACCESS_FINE_LOCATION});
+ }
+
+ /**
+ * Handle onPermissionDenied within individual classes based on the requirements
+ */
+ public interface LocationPermissionCallback {
+
+ void onLocationPermissionDenied(String toastMessage);
+
+ void onLocationPermissionGranted();
+ }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/location/LocationServiceManager.java b/app/src/main/java/fr/free/nrw/commons/location/LocationServiceManager.java
index 09a4230cc..4c7289ea5 100644
--- a/app/src/main/java/fr/free/nrw/commons/location/LocationServiceManager.java
+++ b/app/src/main/java/fr/free/nrw/commons/location/LocationServiceManager.java
@@ -1,6 +1,5 @@
package fr.free.nrw.commons.location;
-import static com.mapbox.mapboxsdk.Mapbox.getApplicationContext;
import android.Manifest.permission;
import android.app.Activity;
import android.content.Context;
@@ -9,7 +8,6 @@ import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.os.Bundle;
-import android.util.Log;
import androidx.core.app.ActivityCompat;
import java.util.HashSet;
import java.util.List;
@@ -21,8 +19,8 @@ import timber.log.Timber;
public class LocationServiceManager implements LocationListener {
// Maybe these values can be improved for efficiency
- private static final long MIN_LOCATION_UPDATE_REQUEST_TIME_IN_MILLIS = 2 * 60 * 100;
- private static final long MIN_LOCATION_UPDATE_REQUEST_DISTANCE_IN_METERS = 10;
+ private static final long MIN_LOCATION_UPDATE_REQUEST_TIME_IN_MILLIS = 10 * 100;
+ private static final long MIN_LOCATION_UPDATE_REQUEST_DISTANCE_IN_METERS = 1;
private LocationManager locationManager;
private Location lastLocation;
@@ -30,6 +28,7 @@ public class LocationServiceManager implements LocationListener {
private final List locationListeners = new CopyOnWriteArrayList<>();
private boolean isLocationManagerRegistered = false;
private Set locationExplanationDisplayed = new HashSet<>();
+ private Context context;
/**
* Constructs a new instance of LocationServiceManager.
@@ -37,6 +36,7 @@ public class LocationServiceManager implements LocationListener {
* @param context the context
*/
public LocationServiceManager(Context context) {
+ this.context = context;
this.locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
}
@@ -58,10 +58,10 @@ public class LocationServiceManager implements LocationListener {
Location bestLocation = null;
for (String provider : providers) {
Location l=null;
- if (ActivityCompat.checkSelfPermission(getApplicationContext(), permission.ACCESS_FINE_LOCATION)
- != PackageManager.PERMISSION_GRANTED
- && ActivityCompat.checkSelfPermission(getApplicationContext(), permission.ACCESS_COARSE_LOCATION)
- != PackageManager.PERMISSION_GRANTED) {
+ if (ActivityCompat.checkSelfPermission(context, permission.ACCESS_FINE_LOCATION)
+ == PackageManager.PERMISSION_GRANTED
+ && ActivityCompat.checkSelfPermission(context, permission.ACCESS_COARSE_LOCATION)
+ == PackageManager.PERMISSION_GRANTED) {
l = locationManager.getLastKnownLocation(provider);
}
if (l == null) {
diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaClient.kt b/app/src/main/java/fr/free/nrw/commons/media/MediaClient.kt
index 6a86bcdaf..72ec08924 100644
--- a/app/src/main/java/fr/free/nrw/commons/media/MediaClient.kt
+++ b/app/src/main/java/fr/free/nrw/commons/media/MediaClient.kt
@@ -5,10 +5,10 @@ import fr.free.nrw.commons.Media
import fr.free.nrw.commons.category.ContinuationClient
import fr.free.nrw.commons.explore.media.MediaConverter
import fr.free.nrw.commons.utils.CommonsDateUtil
+import fr.free.nrw.commons.wikidata.model.Entities
import io.reactivex.Single
-import org.wikipedia.dataclient.mwapi.MwQueryPage
-import org.wikipedia.dataclient.mwapi.MwQueryResponse
-import org.wikipedia.wikidata.Entities
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
import java.util.*
import javax.inject.Inject
import javax.inject.Singleton
@@ -130,6 +130,17 @@ class MediaClient @Inject constructor(
.map { it.first() }
}
+ /**
+ * Fetches Media object from the imageInfo API but suppress (known) errors
+ *
+ * @param titles the tiles to be searched for. Can be filename or template name
+ * @return
+ */
+ fun getMediaSuppressingErrors(titles: String?): Single {
+ return responseMapper(mediaInterface.getMediaSuppressingErrors(titles))
+ .map { it.first() }
+ }
+
/**
* The method returns the picture of the day
*
diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
index 04d39937d..e3fdf7dec 100644
--- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
@@ -12,16 +12,17 @@ import static fr.free.nrw.commons.description.EditDescriptionConstants.WIKITEXT;
import static fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragment.LAST_LOCATION;
import static fr.free.nrw.commons.utils.LangCodeUtils.getLocalizedResources;
-import android.Manifest;
import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.content.Context;
import android.content.Intent;
+import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.graphics.drawable.Animatable;
import android.net.Uri;
import android.os.Bundle;
import android.text.Editable;
+import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.KeyEvent;
import android.view.LayoutInflater;
@@ -30,45 +31,41 @@ import android.view.View.OnKeyListener;
import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.view.ViewTreeObserver.OnGlobalLayoutListener;
-import android.webkit.WebView;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.EditText;
-import android.widget.FrameLayout;
import android.widget.LinearLayout;
-import android.widget.ListView;
-import android.widget.ProgressBar;
-import android.widget.ScrollView;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentTransaction;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
import com.facebook.drawee.backends.pipeline.Fresco;
import com.facebook.drawee.controller.BaseControllerListener;
import com.facebook.drawee.controller.ControllerListener;
import com.facebook.drawee.interfaces.DraweeController;
-import com.facebook.drawee.view.SimpleDraweeView;
import com.facebook.imagepipeline.image.ImageInfo;
import com.facebook.imagepipeline.request.ImageRequest;
-import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.geometry.LatLng;
+import fr.free.nrw.commons.BuildConfig;
+import fr.free.nrw.commons.CameraPosition;
+import fr.free.nrw.commons.CommonsApplication;
import fr.free.nrw.commons.LocationPicker.LocationPicker;
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.actions.ThanksClient;
import fr.free.nrw.commons.auth.AccountUtil;
import fr.free.nrw.commons.auth.SessionManager;
+import fr.free.nrw.commons.auth.csrf.CsrfTokenClient;
+import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException;
import fr.free.nrw.commons.category.CategoryClient;
import fr.free.nrw.commons.category.CategoryDetailsActivity;
import fr.free.nrw.commons.category.CategoryEditHelper;
import fr.free.nrw.commons.contributions.ContributionsFragment;
import fr.free.nrw.commons.coordinates.CoordinateEditHelper;
+import fr.free.nrw.commons.databinding.FragmentMediaDetailBinding;
import fr.free.nrw.commons.delete.DeleteHelper;
import fr.free.nrw.commons.delete.ReasonBuilder;
import fr.free.nrw.commons.description.DescriptionEditActivity;
@@ -78,6 +75,7 @@ import fr.free.nrw.commons.explore.depictions.WikidataItemDetailsActivity;
import fr.free.nrw.commons.kvstore.JsonKvStore;
import fr.free.nrw.commons.location.LocationServiceManager;
import fr.free.nrw.commons.profile.ProfileActivity;
+import fr.free.nrw.commons.review.ReviewHelper;
import fr.free.nrw.commons.settings.Prefs;
import fr.free.nrw.commons.ui.widget.HtmlTextView;
import fr.free.nrw.commons.upload.categories.UploadCategoriesFragment;
@@ -85,7 +83,10 @@ import fr.free.nrw.commons.upload.depicts.DepictsFragment;
import fr.free.nrw.commons.upload.UploadMediaDetail;
import fr.free.nrw.commons.utils.DialogUtil;
import fr.free.nrw.commons.utils.PermissionUtils;
+import fr.free.nrw.commons.utils.ViewUtil;
import fr.free.nrw.commons.utils.ViewUtilWrapper;
+import io.reactivex.Observable;
+import io.reactivex.ObservableSource;
import io.reactivex.Single;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
@@ -98,20 +99,25 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
+import java.util.concurrent.Callable;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.inject.Inject;
import javax.inject.Named;
import org.apache.commons.lang3.StringUtils;
-import org.wikipedia.language.AppLanguageLookUpTable;
-import org.wikipedia.util.DateUtil;
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage;
+import fr.free.nrw.commons.language.AppLanguageLookUpTable;
+import fr.free.nrw.commons.utils.DateUtil;
import timber.log.Timber;
public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
CategoryEditHelper.Callback {
- private static final int REQUEST_CODE = 1001 ;
- private static final int REQUEST_CODE_EDIT_DESCRIPTION = 1002 ;
+ private static final int REQUEST_CODE = 1001;
+ private static final int REQUEST_CODE_EDIT_DESCRIPTION = 1002;
+ private static final String IMAGE_BACKGROUND_COLOR = "image_background_color";
+ static final int DEFAULT_IMAGE_BACKGROUND_COLOR = 0;
+
private boolean editable;
private boolean isCategoryImage;
private MediaDetailPagerFragment.MediaDetailProvider detailProvider;
@@ -148,6 +154,8 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
@Inject
DeleteHelper deleteHelper;
@Inject
+ ReviewHelper reviewHelper;
+ @Inject
CategoryEditHelper categoryEditHelper;
@Inject
CoordinateEditHelper coordinateEditHelper;
@@ -158,83 +166,17 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
@Inject
CategoryClient categoryClient;
@Inject
+ ThanksClient thanksClient;
+ @Inject
@Named("default_preferences")
JsonKvStore applicationKvStore;
private int initialListTop = 0;
- @BindView(R.id.description_webview)
- WebView descriptionWebView;
- @BindView(R.id.mediaDetailFrameLayout)
- FrameLayout frameLayout;
- @BindView(R.id.mediaDetailImageView)
- SimpleDraweeView image;
- @BindView(R.id.mediaDetailImageViewSpacer)
- LinearLayout imageSpacer;
- @BindView(R.id.mediaDetailTitle)
- TextView title;
- @BindView(R.id.caption_layout)
- LinearLayout captionLayout;
- @BindView(R.id.depicts_layout)
- LinearLayout depictsLayout;
- @BindView(R.id.depictionsEditButton)
- Button depictEditButton;
- @BindView(R.id.media_detail_caption)
- TextView mediaCaption;
- @BindView(R.id.mediaDetailDesc)
- HtmlTextView desc;
- @BindView(R.id.mediaDetailAuthor)
- TextView author;
- @BindView(R.id.mediaDetailLicense)
- TextView license;
- @BindView(R.id.mediaDetailCoordinates)
- TextView coordinates;
- @BindView(R.id.mediaDetailuploadeddate)
- TextView uploadedDate;
- @BindView(R.id.mediaDetailDisc)
- TextView mediaDiscussion;
- @BindView(R.id.seeMore)
- TextView seeMore;
- @BindView(R.id.nominatedDeletionBanner)
- LinearLayout nominatedForDeletion;
- @BindView(R.id.mediaDetailCategoryContainer)
- LinearLayout categoryContainer;
- @BindView(R.id.categoryEditButton)
- Button categoryEditButton;
- @BindView(R.id.media_detail_depiction_container)
- LinearLayout depictionContainer;
- @BindView(R.id.authorLinearLayout)
- LinearLayout authorLayout;
- @BindView(R.id.nominateDeletion)
- Button delete;
- @BindView(R.id.mediaDetailScrollView)
- ScrollView scrollView;
- @BindView(R.id.toDoLayout)
- LinearLayout toDoLayout;
- @BindView(R.id.toDoReason)
- TextView toDoReason;
- @BindView(R.id.coordinate_edit)
- Button coordinateEditButton;
- @BindView(R.id.dummy_caption_description_container)
- LinearLayout showCaptionAndDescriptionContainer;
- @BindView(R.id.show_caption_description_textview)
- TextView showCaptionDescriptionTextView;
- @BindView(R.id.caption_listview)
- ListView captionsListView;
- @BindView(R.id.caption_label)
- TextView captionLabel;
- @BindView(R.id.description_label)
- TextView descriptionLabel;
- @BindView(R.id.pb_circular)
- ProgressBar progressBar;
+ private FragmentMediaDetailBinding binding;
String descriptionHtmlCode;
- @BindView(R.id.progressBarDeletion)
- ProgressBar progressBarDeletion;
- @BindView(R.id.progressBarEdit)
- ProgressBar progressBarEditDescription;
- @BindView(R.id.progressBarEditCategory)
- ProgressBar progressBarEditCategory;
- @BindView(R.id.description_edit)
- Button editDescription;
+
+
+
private ArrayList categoryNames = new ArrayList<>();
private String categorySearchQuery;
@@ -283,7 +225,7 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
}
private void getScrollPosition() {
- initialListTop = scrollView.getScrollY();
+ initialListTop = binding.mediaDetailScrollView.getScrollY();
}
@Override
@@ -322,28 +264,45 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
reasonListEnglishMappings.add(getLocalizedResources(getContext(), Locale.ENGLISH).getString(R.string.deletion_reason_no_longer_want_public));
reasonListEnglishMappings.add(getLocalizedResources(getContext(), Locale.ENGLISH).getString(R.string.deletion_reason_bad_for_my_privacy));
- final View view = inflater.inflate(R.layout.fragment_media_detail, container, false);
+ binding = FragmentMediaDetailBinding.inflate(inflater, container, false);
+ final View view = binding.getRoot();
- ButterKnife.bind(this,view);
- Utils.setUnderlinedText(seeMore, R.string.nominated_see_more, requireContext());
+
+ Utils.setUnderlinedText(binding.seeMore, R.string.nominated_see_more, requireContext());
if (isCategoryImage){
- authorLayout.setVisibility(VISIBLE);
+ binding.authorLinearLayout.setVisibility(VISIBLE);
} else {
- authorLayout.setVisibility(GONE);
+ binding.authorLinearLayout.setVisibility(GONE);
}
if (!sessionManager.isUserLoggedIn()) {
- categoryEditButton.setVisibility(GONE);
+ binding.categoryEditButton.setVisibility(GONE);
}
if(applicationKvStore.getBoolean("login_skipped")){
- delete.setVisibility(GONE);
- coordinateEditButton.setVisibility(GONE);
+ binding.nominateDeletion.setVisibility(GONE);
+ binding.coordinateEdit.setVisibility(GONE);
}
handleBackEvent(view);
+ //set onCLick listeners
+ binding.mediaDetailLicense.setOnClickListener(v -> onMediaDetailLicenceClicked());
+ binding.mediaDetailCoordinates.setOnClickListener(v -> onMediaDetailCoordinatesClicked());
+ binding.sendThanks.setOnClickListener(v -> sendThanksToAuthor());
+ binding.dummyCaptionDescriptionContainer.setOnClickListener(v -> showCaptionAndDescription());
+ binding.mediaDetailImageView.setOnClickListener(v -> launchZoomActivity(binding.mediaDetailImageView));
+ binding.categoryEditButton.setOnClickListener(v -> onCategoryEditButtonClicked());
+ binding.depictionsEditButton.setOnClickListener(v -> onDepictionsEditButtonClicked());
+ binding.seeMore.setOnClickListener(v -> onSeeMoreClicked());
+ binding.mediaDetailAuthor.setOnClickListener(v -> onAuthorViewClicked());
+ binding.nominateDeletion.setOnClickListener(v -> onDeleteButtonClicked());
+ binding.descriptionEdit.setOnClickListener(v -> onDescriptionEditClicked());
+ binding.coordinateEdit.setOnClickListener(v -> onUpdateCoordinatesClicked());
+ binding.copyWikicode.setOnClickListener(v -> onCopyWikicodeClicked());
+
+
/**
* Gets the height of the frame layout as soon as the view is ready and updates aspect ratio
* of the picture.
@@ -351,31 +310,27 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
view.post(new Runnable() {
@Override
public void run() {
- frameLayoutHeight = frameLayout.getMeasuredHeight();
- updateAspectRatio(scrollView.getWidth());
+ frameLayoutHeight = binding.mediaDetailFrameLayout.getMeasuredHeight();
+ updateAspectRatio(binding.mediaDetailScrollView.getWidth());
}
});
return view;
}
- @OnClick(R.id.mediaDetailImageViewSpacer)
public void launchZoomActivity(final View view) {
- final boolean permission = PermissionUtils.
- hasPermission(getActivity(), Manifest.permission.READ_EXTERNAL_STORAGE);
-
- if (permission) {
+ final boolean hasPermission = PermissionUtils.hasPermission(getActivity(), PermissionUtils.PERMISSIONS_STORAGE);
+ if (hasPermission) {
launchZoomActivityAfterPermissionCheck(view);
- }
- else {
+ } else {
PermissionUtils.checkPermissionsAndPerformAction(getActivity(),
- Manifest.permission.READ_EXTERNAL_STORAGE,
() -> {
launchZoomActivityAfterPermissionCheck(view);
},
R.string.storage_permission_title,
- R.string.read_storage_permission_rationale
- );
+ R.string.read_storage_permission_rationale,
+ PermissionUtils.PERMISSIONS_STORAGE
+ );
}
}
@@ -390,6 +345,15 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
zoomableIntent.setData(Uri.parse(media.getImageUrl()));
zoomableIntent.putExtra(
ZoomableActivity.ZoomableActivityConstants.ORIGIN, "MediaDetails");
+
+ int backgroundColor = getImageBackgroundColor();
+ if (backgroundColor != DEFAULT_IMAGE_BACKGROUND_COLOR) {
+ zoomableIntent.putExtra(
+ ZoomableActivity.ZoomableActivityConstants.PHOTO_BACKGROUND_COLOR,
+ backgroundColor
+ );
+ }
+
ctx.startActivity(
zoomableIntent
);
@@ -404,7 +368,7 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
// in the case when MediaDetailPagerFragment is directly started by the CategoryImagesActivity
if (getParentFragment() instanceof ContributionsFragment) {
((ContributionsFragment) (getParentFragment()
- .getParentFragment())).nearbyNotificationCardView
+ .getParentFragment())).binding.cardViewNearby
.setVisibility(View.GONE);
}
}
@@ -419,46 +383,55 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
enableProgressBar();
}
- scrollView.getViewTreeObserver().addOnGlobalLayoutListener(
+ if (AccountUtil.getUserName(getContext()) != null && media != null
+ && AccountUtil.getUserName(getContext()).equals(media.getAuthor())) {
+ binding.sendThanks.setVisibility(GONE);
+ } else {
+ binding.sendThanks.setVisibility(VISIBLE);
+ }
+
+ binding.mediaDetailScrollView.getViewTreeObserver().addOnGlobalLayoutListener(
new OnGlobalLayoutListener() {
@Override
public void onGlobalLayout() {
if (getContext() == null) {
return;
}
- scrollView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
- oldWidthOfImageView = scrollView.getWidth();
+ binding.mediaDetailScrollView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+ oldWidthOfImageView = binding.mediaDetailScrollView.getWidth();
if(media != null) {
displayMediaDetails();
}
}
}
);
+ binding.progressBarEdit.setVisibility(GONE);
+ binding.descriptionEdit.setVisibility(VISIBLE);
}
@Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
- scrollView.getViewTreeObserver().addOnGlobalLayoutListener(
+ binding.mediaDetailScrollView.getViewTreeObserver().addOnGlobalLayoutListener(
new OnGlobalLayoutListener() {
@Override
public void onGlobalLayout() {
/**
* We update the height of the frame layout as the configuration changes.
*/
- frameLayout.post(new Runnable() {
+ binding.mediaDetailFrameLayout.post(new Runnable() {
@Override
public void run() {
- frameLayoutHeight = frameLayout.getMeasuredHeight();
- updateAspectRatio(scrollView.getWidth());
+ frameLayoutHeight = binding.mediaDetailFrameLayout.getMeasuredHeight();
+ updateAspectRatio(binding.mediaDetailScrollView.getWidth());
}
});
- if (scrollView.getWidth() != oldWidthOfImageView) {
+ if (binding.mediaDetailScrollView.getWidth() != oldWidthOfImageView) {
if (newWidthOfImageView == 0) {
- newWidthOfImageView = scrollView.getWidth();
+ newWidthOfImageView = binding.mediaDetailScrollView.getWidth();
updateAspectRatio(newWidthOfImageView);
}
- scrollView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+ binding.mediaDetailScrollView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
}
}
}
@@ -510,36 +483,36 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
}
private void onDiscussionLoaded(String discussion) {
- mediaDiscussion.setText(prettyDiscussion(discussion.trim()));
+ binding.mediaDetailDisc.setText(prettyDiscussion(discussion.trim()));
}
private void onDeletionPageExists(Boolean deletionPageExists) {
if (deletionPageExists){
if(applicationKvStore.getBoolean(String.format(NOMINATING_FOR_DELETION_MEDIA, media.getImageUrl()), false)) {
applicationKvStore.remove(String.format(NOMINATING_FOR_DELETION_MEDIA, media.getImageUrl()));
- progressBarDeletion.setVisibility(GONE);
+ binding.progressBarDeletion.setVisibility(GONE);
}
- delete.setVisibility(GONE);
- nominatedForDeletion.setVisibility(VISIBLE);
+ binding.nominateDeletion.setVisibility(GONE);
+ binding.nominatedDeletionBanner.setVisibility(VISIBLE);
} else if (!isCategoryImage) {
- delete.setVisibility(VISIBLE);
- nominatedForDeletion.setVisibility(GONE);
+ binding.nominateDeletion.setVisibility(VISIBLE);
+ binding.nominatedDeletionBanner.setVisibility(GONE);
}
}
private void onDepictionsLoaded(List idAndCaptions){
- depictsLayout.setVisibility(idAndCaptions.isEmpty() ? GONE : VISIBLE);
- depictEditButton.setVisibility(idAndCaptions.isEmpty() ? GONE : VISIBLE);
+ binding.depictsLayout.setVisibility(idAndCaptions.isEmpty() ? GONE : VISIBLE);
+ binding.depictionsEditButton.setVisibility(idAndCaptions.isEmpty() ? GONE : VISIBLE);
buildDepictionList(idAndCaptions);
}
/**
* By clicking on the edit depictions button, it will send user to depict fragment
*/
- @OnClick(R.id.depictionsEditButton)
+
public void onDepictionsEditButtonClicked() {
- depictionContainer.removeAllViews();
- depictEditButton.setVisibility(GONE);
+ binding.mediaDetailDepictionContainer.removeAllViews();
+ binding.depictionsEditButton.setVisibility(GONE);
final Fragment depictsFragment = new DepictsFragment();
final Bundle bundle = new Bundle();
bundle.putParcelable("Existing_Depicts", media);
@@ -564,8 +537,8 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
private void updateAspectRatio(int scrollWidth) {
if (imageInfoCache != null) {
int finalHeight = (scrollWidth*imageInfoCache.getHeight()) / imageInfoCache.getWidth();
- ViewGroup.LayoutParams params = image.getLayoutParams();
- ViewGroup.LayoutParams spacerParams = imageSpacer.getLayoutParams();
+ ViewGroup.LayoutParams params = binding.mediaDetailImageView.getLayoutParams();
+ ViewGroup.LayoutParams spacerParams = binding.mediaDetailImageViewSpacer.getLayoutParams();
params.width = scrollWidth;
if(finalHeight > frameLayoutHeight - minimumHeightOfMetadata) {
@@ -577,8 +550,8 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
}
params.height = finalHeight;
spacerParams.height = finalHeight;
- image.setLayoutParams(params);
- imageSpacer.setLayoutParams(spacerParams);
+ binding.mediaDetailImageView.setLayoutParams(params);
+ binding.mediaDetailImageViewSpacer.setLayoutParams(spacerParams);
}
}
@@ -586,12 +559,12 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
@Override
public void onIntermediateImageSet(String id, @Nullable ImageInfo imageInfo) {
imageInfoCache = imageInfo;
- updateAspectRatio(scrollView.getWidth());
+ updateAspectRatio(binding.mediaDetailScrollView.getWidth());
}
@Override
public void onFinalImageSet(String id, @Nullable ImageInfo imageInfo, @Nullable Animatable animatable) {
imageInfoCache = imageInfo;
- updateAspectRatio(scrollView.getWidth());
+ updateAspectRatio(binding.mediaDetailScrollView.getWidth());
}
};
@@ -601,17 +574,22 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
* - when the high resolution image is available, it replaces the low resolution image
*/
private void setupImageView() {
+ int imageBackgroundColor = getImageBackgroundColor();
+ if (imageBackgroundColor != DEFAULT_IMAGE_BACKGROUND_COLOR) {
+ binding.mediaDetailImageView.setBackgroundColor(imageBackgroundColor);
+ }
- image.getHierarchy().setPlaceholderImage(R.drawable.image_placeholder);
- image.getHierarchy().setFailureImage(R.drawable.image_placeholder);
+ binding.mediaDetailImageView.getHierarchy().setPlaceholderImage(R.drawable.image_placeholder);
+ binding.mediaDetailImageView.getHierarchy().setFailureImage(R.drawable.image_placeholder);
DraweeController controller = Fresco.newDraweeControllerBuilder()
- .setLowResImageRequest(ImageRequest.fromUri(media != null ? media.getThumbUrl() : null))
- .setImageRequest(ImageRequest.fromUri(media != null ? media.getImageUrl() : null))
- .setControllerListener(aspectRatioListener)
- .setOldController(image.getController())
- .build();
- image.setController(controller);
+ .setLowResImageRequest(ImageRequest.fromUri(media != null ? media.getThumbUrl() : null))
+ .setRetainImageOnFailure(true)
+ .setImageRequest(ImageRequest.fromUri(media != null ? media.getImageUrl() : null))
+ .setControllerListener(aspectRatioListener)
+ .setOldController(binding.mediaDetailImageView.getController())
+ .build();
+ binding.mediaDetailImageView.setController(controller);
}
private void updateToDoWarning() {
@@ -640,10 +618,10 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
if (toDoNeeded) {
toDoMessage = getString(R.string.todo_improve) + "\n" + toDoMessage;
- toDoLayout.setVisibility(VISIBLE);
- toDoReason.setText(toDoMessage);
+ binding.toDoLayout.setVisibility(VISIBLE);
+ binding.toDoReason.setText(toDoMessage);
} else {
- toDoLayout.setVisibility(GONE);
+ binding.toDoLayout.setVisibility(GONE);
}
}
@@ -660,24 +638,24 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
private void setTextFields(Media media) {
setupImageView();
- title.setText(media.getDisplayTitle());
- desc.setHtmlText(prettyDescription(media));
- license.setText(prettyLicense(media));
- coordinates.setText(prettyCoordinates(media));
- uploadedDate.setText(prettyUploadedDate(media));
+ binding.mediaDetailTitle.setText(media.getDisplayTitle());
+ binding.mediaDetailDesc.setHtmlText(prettyDescription(media));
+ binding.mediaDetailLicense.setText(prettyLicense(media));
+ binding.mediaDetailCoordinates.setText(prettyCoordinates(media));
+ binding.mediaDetailuploadeddate.setText(prettyUploadedDate(media));
if (prettyCaption(media).equals(getContext().getString(R.string.detail_caption_empty))) {
- captionLayout.setVisibility(GONE);
+ binding.captionLayout.setVisibility(GONE);
} else {
- mediaCaption.setText(prettyCaption(media));
+ binding.mediaDetailCaption.setText(prettyCaption(media));
}
categoryNames.clear();
categoryNames.addAll(media.getCategories());
if (media.getAuthor() == null || media.getAuthor().equals("")) {
- authorLayout.setVisibility(GONE);
+ binding.authorLinearLayout.setVisibility(GONE);
} else {
- author.setText(media.getAuthor());
+ binding.mediaDetailAuthor.setText(media.getAuthor());
}
}
@@ -700,7 +678,7 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
// Stick in a filler element.
allCategories.add(getString(R.string.detail_panel_cats_none));
}
- categoryEditButton.setVisibility(VISIBLE);
+ binding.categoryEditButton.setVisibility(VISIBLE);
rebuildCatList(allCategories);
}
@@ -723,13 +701,13 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
* @param idAndCaptions
*/
private void buildDepictionList(List idAndCaptions) {
- depictionContainer.removeAllViews();
+ binding.mediaDetailDepictionContainer.removeAllViews();
String locale = Locale.getDefault().getLanguage();
for (IdAndCaptions idAndCaption : idAndCaptions) {
- depictionContainer.addView(buildDepictLabel(
+ binding.mediaDetailDepictionContainer.addView(buildDepictLabel(
getDepictionCaption(idAndCaption, locale),
idAndCaption.getId(),
- depictionContainer
+ binding.mediaDetailDepictionContainer
));
}
}
@@ -745,7 +723,6 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
return idAndCaption.getCaptions().values().iterator().next();
}
- @OnClick(R.id.mediaDetailLicense)
public void onMediaDetailLicenceClicked(){
String url = media.getLicenseUrl();
if (!StringUtils.isBlank(url) && getActivity() != null) {
@@ -755,26 +732,101 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
}
}
- @OnClick(R.id.mediaDetailCoordinates)
public void onMediaDetailCoordinatesClicked(){
if (media.getCoordinates() != null && getActivity() != null) {
Utils.handleGeoCoordinates(getActivity(), media.getCoordinates());
}
}
- @OnClick(R.id.copyWikicode)
- public void onCopyWikicodeClicked(){
- String data = "[[" + media.getFilename() + "|thumb|" + media.getFallbackDescription() + "]]";
- Utils.copy("wikiCode",data,getContext());
+ public void onCopyWikicodeClicked() {
+ String data =
+ "[[" + media.getFilename() + "|thumb|" + media.getFallbackDescription() + "]]";
+ Utils.copy("wikiCode", data, getContext());
Timber.d("Generated wikidata copy code: %s", data);
- Toast.makeText(getContext(), getString(R.string.wikicode_copied), Toast.LENGTH_SHORT).show();
+ Toast.makeText(getContext(), getString(R.string.wikicode_copied), Toast.LENGTH_SHORT)
+ .show();
+ }
+
+ /**
+ * Sends thanks to author if the author is not the user
+ */
+ public void sendThanksToAuthor() {
+ String fileName = media.getFilename();
+ if (TextUtils.isEmpty(fileName)) {
+ Toast.makeText(getContext(), getString(R.string.error_sending_thanks),
+ Toast.LENGTH_SHORT).show();
+ return;
+ }
+ compositeDisposable.add(reviewHelper.getFirstRevisionOfFile(fileName)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(revision -> sendThanks(getContext(), revision)));
+ }
+
+ /**
+ * Api call for sending thanks to the author when the author is not the user
+ * and display toast depending on the result
+ * @param context context
+ * @param firstRevision the revision id of the image
+ */
+ @SuppressLint({"CheckResult", "StringFormatInvalid"})
+ void sendThanks(Context context, MwQueryPage.Revision firstRevision) {
+ ViewUtil.showShortToast(context,
+ context.getString(R.string.send_thank_toast, media.getDisplayTitle()));
+
+ if (firstRevision == null) {
+ return;
+ }
+
+ Observable.defer((Callable>) () -> thanksClient.thank(
+ firstRevision.getRevisionId()))
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(result -> {
+ displayThanksToast(getContext(), result);
+ }, throwable -> {
+ if (throwable instanceof InvalidLoginTokenException) {
+ final String username = sessionManager.getUserName();
+ final CommonsApplication.BaseLogoutListener logoutListener = new CommonsApplication.BaseLogoutListener(
+ getActivity(),
+ requireActivity().getString(R.string.invalid_login_message),
+ username
+ );
+
+ CommonsApplication.getInstance().clearApplicationData(
+ requireActivity(), logoutListener);
+ } else {
+ Timber.e(throwable);
+ }
+ });
+ }
+
+ /**
+ * Method to display toast when api call to thank the author is completed
+ * @param context context
+ * @param result true if success, false otherwise
+ */
+ @SuppressLint("StringFormatInvalid")
+ private void displayThanksToast(final Context context, final boolean result) {
+ final String message;
+ final String title;
+ if (result) {
+ title = context.getString(R.string.send_thank_success_title);
+ message = context.getString(R.string.send_thank_success_message,
+ media.getDisplayTitle());
+ } else {
+ title = context.getString(R.string.send_thank_failure_title);
+ message = context.getString(R.string.send_thank_failure_message,
+ media.getDisplayTitle());
+ }
+
+ ViewUtil.showShortToast(context, message);
}
- @OnClick(R.id.categoryEditButton)
public void onCategoryEditButtonClicked(){
- progressBarEditCategory.setVisibility(VISIBLE);
- categoryEditButton.setVisibility(GONE);
+ binding.progressBarEditCategory.setVisibility(VISIBLE);
+ binding.categoryEditButton.setVisibility(GONE);
getWikiText();
}
@@ -795,8 +847,8 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
* @param s WikiText
*/
private void gotoCategoryEditor(final String s) {
- categoryEditButton.setVisibility(VISIBLE);
- progressBarEditCategory.setVisibility(GONE);
+ binding.categoryEditButton.setVisibility(VISIBLE);
+ binding.progressBarEditCategory.setVisibility(GONE);
final Fragment categoriesFragment = new UploadCategoriesFragment();
final Bundle bundle = new Bundle();
bundle.putParcelable("Existing_Categories", media);
@@ -808,7 +860,6 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
transaction.commit();
}
- @OnClick(R.id.coordinate_edit)
public void onUpdateCoordinatesClicked(){
goToLocationPickerActivity();
}
@@ -837,18 +888,17 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
}
}
- startActivityForResult(new LocationPicker.IntentBuilder()
- .defaultLocation(new CameraPosition.Builder()
- .target(new LatLng(defaultLatitude, defaultLongitude))
- .zoom(16).build())
+
+ startActivity(new LocationPicker.IntentBuilder()
+ .defaultLocation(new CameraPosition(defaultLatitude,defaultLongitude,16.0))
.activityKey("MediaActivity")
- .build(getActivity()), REQUEST_CODE);
+ .media(media)
+ .build(getActivity()));
}
- @OnClick(R.id.description_edit)
public void onDescriptionEditClicked() {
- progressBarEditDescription.setVisibility(VISIBLE);
- editDescription.setVisibility(GONE);
+ binding.progressBarEdit.setVisibility(VISIBLE);
+ binding.descriptionEdit.setVisibility(GONE);
getDescriptionList();
}
@@ -936,8 +986,9 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
bundle.putParcelableArrayList(LIST_OF_DESCRIPTION_AND_CAPTION, descriptionAndCaptions);
bundle.putString(WIKITEXT, s);
bundle.putString(Prefs.DESCRIPTION_LANGUAGE, applicationKvStore.getString(Prefs.DESCRIPTION_LANGUAGE, ""));
+ bundle.putParcelable("media", media);
intent.putExtras(bundle);
- startActivityForResult(intent, REQUEST_CODE_EDIT_DESCRIPTION);
+ startActivity(intent);
}
/**
@@ -1020,67 +1071,67 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
@Nullable final Intent data) {
super.onActivityResult(requestCode, resultCode, data);
- if (requestCode == REQUEST_CODE && resultCode == RESULT_OK) {
+ if (requestCode == REQUEST_CODE_EDIT_DESCRIPTION && resultCode == RESULT_OK) {
+ final String updatedWikiText = data.getStringExtra(UPDATED_WIKITEXT);
- assert data != null;
- final CameraPosition cameraPosition = LocationPicker.getCameraPosition(data);
+ try {
+ compositeDisposable.add(descriptionEditHelper.addDescription(getContext(), media,
+ updatedWikiText)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(s -> {
+ Timber.d("Descriptions are added.");
+ }));
+ } catch (Exception e) {
+ if (e.getLocalizedMessage().equals(CsrfTokenClient.ANONYMOUS_TOKEN_MESSAGE)) {
+ final String username = sessionManager.getUserName();
+ final CommonsApplication.BaseLogoutListener logoutListener = new CommonsApplication.BaseLogoutListener(
+ getActivity(),
+ requireActivity().getString(R.string.invalid_login_message),
+ username
+ );
- if (cameraPosition != null) {
-
- final String latitude = String.valueOf(cameraPosition.target.getLatitude());
- final String longitude = String.valueOf(cameraPosition.target.getLongitude());
- final String accuracy = String.valueOf(cameraPosition.target.getAltitude());
- String currentLatitude = null;
- String currentLongitude = null;
-
- if (media.getCoordinates() != null) {
- currentLatitude = String.valueOf(media.getCoordinates().getLatitude());
- currentLongitude = String.valueOf(media.getCoordinates().getLongitude());
- }
-
- if (!latitude.equals(currentLatitude) || !longitude.equals(currentLongitude)) {
- updateCoordinates(latitude, longitude, accuracy);
- } else if (media.getCoordinates() == null) {
- updateCoordinates(latitude, longitude, accuracy);
+ CommonsApplication.getInstance().clearApplicationData(
+ requireActivity(), logoutListener);
}
}
- } else if (requestCode == REQUEST_CODE_EDIT_DESCRIPTION && resultCode == RESULT_OK) {
- final String updatedWikiText = data.getStringExtra(UPDATED_WIKITEXT);
- compositeDisposable.add(descriptionEditHelper.addDescription(getContext(), media,
- updatedWikiText)
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(s -> {
- Timber.d("Descriptions are added.");
- }));
-
final ArrayList uploadMediaDetails
= data.getParcelableArrayListExtra(LIST_OF_DESCRIPTION_AND_CAPTION);
LinkedHashMap updatedCaptions = new LinkedHashMap<>();
for (UploadMediaDetail mediaDetail:
uploadMediaDetails) {
- compositeDisposable.add(descriptionEditHelper.addCaption(getContext(), media,
- mediaDetail.getLanguageCode(), mediaDetail.getCaptionText())
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(s -> {
- updateCaptions(mediaDetail, updatedCaptions);
- Timber.d("Caption is added.");
- }));
- }
- progressBarEditDescription.setVisibility(GONE);
- editDescription.setVisibility(VISIBLE);
+ try {
+ compositeDisposable.add(descriptionEditHelper.addCaption(getContext(), media,
+ mediaDetail.getLanguageCode(), mediaDetail.getCaptionText())
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(s -> {
+ updateCaptions(mediaDetail, updatedCaptions);
+ Timber.d("Caption is added.");
+ }));
- } else if (requestCode == REQUEST_CODE && resultCode == RESULT_CANCELED) {
- viewUtil.showShortToast(getContext(),
- Objects.requireNonNull(getContext())
- .getString(R.string.coordinates_picking_unsuccessful));
+ } catch (Exception e) {
+ if (e.getLocalizedMessage().equals(CsrfTokenClient.ANONYMOUS_TOKEN_MESSAGE)) {
+ final String username = sessionManager.getUserName();
+ final CommonsApplication.BaseLogoutListener logoutListener = new CommonsApplication.BaseLogoutListener(
+ getActivity(),
+ requireActivity().getString(R.string.invalid_login_message),
+ username
+ );
+
+ CommonsApplication.getInstance().clearApplicationData(
+ requireActivity(), logoutListener);
+ }
+ }
+ }
+ binding.progressBarEdit.setVisibility(GONE);
+ binding.descriptionEdit.setVisibility(VISIBLE);
} else if (requestCode == REQUEST_CODE_EDIT_DESCRIPTION && resultCode == RESULT_CANCELED) {
- progressBarEditDescription.setVisibility(GONE);
- editDescription.setVisibility(VISIBLE);
+ binding.progressBarEdit.setVisibility(GONE);
+ binding.descriptionEdit.setVisibility(VISIBLE);
}
}
@@ -1095,26 +1146,7 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
media.setCaptions(updatedCaptions);
}
- /**
- * Fetched coordinates are replaced with existing coordinates by a POST API call.
- * @param Latitude to be added
- * @param Longitude to be added
- * @param Accuracy to be added
- */
- public void updateCoordinates(final String Latitude, final String Longitude,
- final String Accuracy) {
- compositeDisposable.add(coordinateEditHelper.makeCoordinatesEdit(getContext(), media,
- Latitude, Longitude, Accuracy)
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(s -> {
- Timber.d("Coordinates are added.");
- coordinates.setText(prettyCoordinates(media));
- }));
- }
-
@SuppressLint("StringFormatInvalid")
- @OnClick(R.id.nominateDeletion)
public void onDeleteButtonClicked(){
if (AccountUtil.getUserName(getContext()) != null && AccountUtil.getUserName(getContext()).equals(media.getAuthor())) {
final ArrayAdapter languageAdapter = new ArrayAdapter<>(getActivity(),
@@ -1220,18 +1252,22 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
});
}
- @OnClick(R.id.seeMore)
public void onSeeMoreClicked(){
- if (nominatedForDeletion.getVisibility() == VISIBLE && getActivity() != null) {
+ if (binding.nominatedDeletionBanner.getVisibility() == VISIBLE && getActivity() != null) {
Utils.handleWebUrl(getActivity(), Uri.parse(media.getPageTitle().getMobileUri()));
}
}
- @OnClick(R.id.mediaDetailAuthor)
public void onAuthorViewClicked() {
if (media == null || media.getUser() == null) {
return;
}
+ if (sessionManager.getUserName() == null) {
+ String userProfileLink = BuildConfig.COMMONS_URL + "/wiki/User:" + media.getUser();
+ Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(userProfileLink));
+ startActivity(browserIntent);
+ return;
+ }
ProfileActivity.startYourself(getActivity(), media.getUser(), !Objects
.equals(sessionManager.getUserName(), media.getUser()));
}
@@ -1240,15 +1276,15 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
* Enable Progress Bar and Update delete button text.
*/
private void enableProgressBar() {
- progressBarDeletion.setVisibility(VISIBLE);
- delete.setText("Nominating for Deletion");
+ binding.progressBarDeletion.setVisibility(VISIBLE);
+ binding.nominateDeletion.setText("Nominating for Deletion");
isDeleted = true;
}
private void rebuildCatList(List categories) {
- categoryContainer.removeAllViews();
+ binding.mediaDetailCategoryContainer.removeAllViews();
for (String category : categories) {
- categoryContainer.addView(buildCatLabel(sanitise(category), categoryContainer));
+ binding.mediaDetailCategoryContainer.addView(buildCatLabel(sanitise(category), binding.mediaDetailCategoryContainer));
}
}
@@ -1314,7 +1350,12 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
}
private String prettyDescription(Media media) {
- final String description = chooseDescription(media);
+ String description = chooseDescription(media);
+ if (!description.isEmpty()) {
+ // Remove img tag that sometimes appears as a blue square in the app,
+ // see https://github.com/commons-app/apps-android-commons/issues/4345
+ description = description.replaceAll("[<](/)?img[^>]*[>]", "");
+ }
return description.isEmpty() ? getString(R.string.detail_description_empty)
: description;
}
@@ -1374,13 +1415,12 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
}
}
- @OnClick(R.id.show_caption_description_textview)
void showCaptionAndDescription() {
- if (showCaptionAndDescriptionContainer.getVisibility() == GONE) {
- showCaptionAndDescriptionContainer.setVisibility(VISIBLE);
+ if (binding.dummyCaptionDescriptionContainer.getVisibility() == GONE) {
+ binding.dummyCaptionDescriptionContainer.setVisibility(VISIBLE);
setUpCaptionAndDescriptionLayout();
} else {
- showCaptionAndDescriptionContainer.setVisibility(GONE);
+ binding.dummyCaptionDescriptionContainer.setVisibility(GONE);
}
}
@@ -1391,12 +1431,12 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
List captions = getCaptions();
if (descriptionHtmlCode == null) {
- progressBar.setVisibility(VISIBLE);
+ binding.showCaptionsBinding.pbCircular.setVisibility(VISIBLE);
}
getDescription();
CaptionListViewAdapter adapter = new CaptionListViewAdapter(captions);
- captionsListView.setAdapter(adapter);
+ binding.showCaptionsBinding.captionListview.setAdapter(adapter);
}
/**
@@ -1419,7 +1459,8 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
}
private void getDescription() {
- compositeDisposable.add(mediaDataExtractor.getHtmlOfPage(media.getFilename())
+ compositeDisposable.add(mediaDataExtractor.getHtmlOfPage(
+ Objects.requireNonNull(media.getFilename()))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(this::extractDescription, Timber::e));
@@ -1437,9 +1478,9 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
descriptionHtmlCode = descriptionHtmlCode + s.toCharArray()[i];
}
- descriptionWebView
+ binding.showCaptionsBinding.descriptionWebview
.loadDataWithBaseURL(null, descriptionHtmlCode, "text/html", "utf-8", null);
- progressBar.setVisibility(GONE);
+ binding.showCaptionsBinding.pbCircular.setVisibility(GONE);
}
/**
@@ -1452,8 +1493,8 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
@Override
public boolean onKey(View view, int keycode, KeyEvent keyEvent) {
if (keycode == KeyEvent.KEYCODE_BACK) {
- if (showCaptionAndDescriptionContainer.getVisibility() == VISIBLE) {
- showCaptionAndDescriptionContainer.setVisibility(GONE);
+ if (binding.dummyCaptionDescriptionContainer.getVisibility() == VISIBLE) {
+ binding.dummyCaptionDescriptionContainer.setVisibility(GONE);
return true;
}
}
@@ -1467,4 +1508,28 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
public interface Callback {
void nominatingForDeletion(int index);
}
+
+ /**
+ * Called when the image background color is changed.
+ * You should pass a useable color, not a resource id.
+ * @param color
+ */
+ public void onImageBackgroundChanged(int color) {
+ int currentColor = getImageBackgroundColor();
+ if (currentColor == color) {
+ return;
+ }
+
+ binding.mediaDetailImageView.setBackgroundColor(color);
+ getImageBackgroundColorPref().edit().putInt(IMAGE_BACKGROUND_COLOR, color).apply();
+ }
+
+ private SharedPreferences getImageBackgroundColorPref() {
+ return getContext().getSharedPreferences(IMAGE_BACKGROUND_COLOR + media.getPageId(), Context.MODE_PRIVATE);
+ }
+
+ private int getImageBackgroundColor() {
+ SharedPreferences imageBackgroundColorPref = this.getImageBackgroundColorPref();
+ return imageBackgroundColorPref.getInt(IMAGE_BACKGROUND_COLOR, DEFAULT_IMAGE_BACKGROUND_COLOR);
+ }
}
diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailInterface.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailInterface.java
deleted file mode 100644
index f595f5a83..000000000
--- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailInterface.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package fr.free.nrw.commons.media;
-
-import io.reactivex.Observable;
-import io.reactivex.Single;
-import org.wikipedia.dataclient.Service;
-import org.wikipedia.dataclient.mwapi.MwQueryResponse;
-import org.wikipedia.wikidata.Entities;
-import retrofit2.Call;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-/**
- * Interface for interacting with Commons Structured Data related APIs
- */
-public interface MediaDetailInterface {
-
- /**
- * Fetches entity using file name
- *
- * @param filename name of the file to be used for fetching captions
- */
- @GET("w/api.php?action=wbgetentities&props=labels&format=json&languagefallback=1&sites=commonswiki")
- Observable fetchEntitiesByFileName(@Query("languages") String language, @Query("titles") String filename);
-
- /**
- * Gets labels for Depictions using Entity Id from MediaWikiAPI
- * @param entityId EntityId (Ex: Q81566) of the depict entity
- *
- */
- @GET("/w/api.php?format=json&action=wbgetentities&props=labels&languagefallback=1")
- Single getEntity(@Query("ids") String entityId);
-
- /**
- * Fetches caption using wikibaseIdentifier
- *
- * @param wikibaseIdentifier pageId for the media
- */
- @GET("/w/api.php?action=wbgetentities&props=labels&format=json&languagefallback=1&sites=commonswiki")
- Observable getEntityForImage(@Query("languages") String language, @Query("ids") String wikibaseIdentifier);
-
- /**
- * Fetches current wikitext
- * @param title file name
- * @return Single
- */
- @GET(
- Service.MW_API_PREFIX +
- "action=query&prop=revisions&rvprop=content|timestamp&rvlimit=1&converttitles="
- )
- Single getWikiText(
- @Query("titles") String title
- );
-
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailInterface.kt b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailInterface.kt
new file mode 100644
index 000000000..a77271d78
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailInterface.kt
@@ -0,0 +1,53 @@
+package fr.free.nrw.commons.media
+
+import fr.free.nrw.commons.wikidata.WikidataConstants
+import fr.free.nrw.commons.wikidata.model.Entities
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
+import io.reactivex.Observable
+import io.reactivex.Single
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+/**
+ * Interface for interacting with Commons Structured Data related APIs
+ */
+interface MediaDetailInterface {
+ /**
+ * Fetches entity using file name
+ *
+ * @param filename name of the file to be used for fetching captions
+ */
+ @GET("w/api.php?action=wbgetentities&props=labels&format=json&languagefallback=1&sites=commonswiki")
+ fun fetchEntitiesByFileName(
+ @Query("languages") language: String?,
+ @Query("titles") filename: String?
+ ): Observable
+
+ /**
+ * Gets labels for Depictions using Entity Id from MediaWikiAPI
+ * @param entityId EntityId (Ex: Q81566) of the depict entity
+ */
+ @GET("/w/api.php?format=json&action=wbgetentities&props=labels&languagefallback=1")
+ fun getEntity(@Query("ids") entityId: String?): Single
+
+ /**
+ * Fetches caption using wikibaseIdentifier
+ *
+ * @param wikibaseIdentifier pageId for the media
+ */
+ @GET("/w/api.php?action=wbgetentities&props=labels&format=json&languagefallback=1&sites=commonswiki")
+ fun getEntityForImage(
+ @Query("languages") language: String?,
+ @Query("ids") wikibaseIdentifier: String?
+ ): Observable
+
+ /**
+ * Fetches current wikitext
+ * @param title file name
+ * @return Single
+ */
+ @GET(WikidataConstants.MW_API_PREFIX + "action=query&prop=revisions&rvprop=content|timestamp&rvlimit=1&converttitles=")
+ fun getWikiText(
+ @Query("titles") title: String?
+ ): Single
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
index 3195796c5..f6ef824e7 100644
--- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
@@ -2,9 +2,13 @@ package fr.free.nrw.commons.media;
import static fr.free.nrw.commons.Utils.handleWebUrl;
-import android.annotation.SuppressLint;
+import android.os.Handler;
+import android.os.Looper;
+import android.widget.ProgressBar;
import android.content.ActivityNotFoundException;
import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
import android.net.Uri;
import android.os.Bundle;
import android.view.LayoutInflater;
@@ -18,12 +22,11 @@ import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.viewpager.widget.ViewPager;
-import butterknife.BindView;
-import butterknife.ButterKnife;
import com.google.android.material.snackbar.Snackbar;
import fr.free.nrw.commons.CommonsApplication;
import fr.free.nrw.commons.Media;
@@ -34,6 +37,7 @@ import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesContentProvider;
import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao;
import fr.free.nrw.commons.contributions.Contribution;
import fr.free.nrw.commons.contributions.MainActivity;
+import fr.free.nrw.commons.databinding.FragmentMediaDetailPagerBinding;
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
import fr.free.nrw.commons.profile.ProfileActivity;
@@ -41,9 +45,14 @@ import fr.free.nrw.commons.utils.DownloadUtils;
import fr.free.nrw.commons.utils.ImageUtils;
import fr.free.nrw.commons.utils.NetworkUtils;
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 java.net.URL;
import java.util.ArrayList;
import java.util.Objects;
+import java.util.concurrent.Callable;
import javax.inject.Inject;
import timber.log.Timber;
@@ -59,8 +68,9 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple
private static CompositeDisposable compositeDisposable = new CompositeDisposable();
- @BindView(R.id.mediaDetailsPager) ViewPager pager;
- private Boolean editable;
+ private FragmentMediaDetailPagerBinding binding;
+
+ private boolean editable;
private boolean isFeaturedImage;
private boolean isWikipediaButtonDisplayed;
MediaDetailAdapter adapter;
@@ -69,6 +79,11 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple
private boolean isFromFeaturedRootFragment;
private int position;
+ /**
+ * ProgressBar used to indicate the loading status of media items.
+ */
+ private ProgressBar imageProgressBar;
+
private ArrayList removedItems=new ArrayList();
public void clearRemoved(){
@@ -78,30 +93,39 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple
return removedItems;
}
- private MediaDetailPagerFragment() {}; // Constructor calls made to be explicit
- @SuppressLint("ValidFragment")
- public MediaDetailPagerFragment(Boolean editable, boolean isFeaturedImage) {
- this.editable = editable;
- this.isFeaturedImage = isFeaturedImage;
- isFromFeaturedRootFragment = false;
+
+ /**
+ * Use this factory method to create a new instance of this fragment using the provided
+ * parameters.
+ *
+ * This method will create a new instance of MediaDetailPagerFragment and the arguments will be
+ * saved to a bundle which will be later available in the {@link #onCreate(Bundle)}
+ * @param editable
+ * @param isFeaturedImage
+ * @return
+ */
+ public static MediaDetailPagerFragment newInstance(boolean editable, boolean isFeaturedImage) {
+ MediaDetailPagerFragment mediaDetailPagerFragment = new MediaDetailPagerFragment();
+ Bundle args = new Bundle();
+ args.putBoolean("is_editable", editable);
+ args.putBoolean("is_featured_image", isFeaturedImage);
+ mediaDetailPagerFragment.setArguments(args);
+ return mediaDetailPagerFragment;
}
- @SuppressLint("ValidFragment")
- public MediaDetailPagerFragment(Boolean editable, boolean isFeaturedImage, int position) {
- this.editable = editable;
- this.isFeaturedImage = isFeaturedImage;
- isFromFeaturedRootFragment = true;
- this.position = position;
- }
+ public MediaDetailPagerFragment() {
+ // Required empty public constructor
+ };
+
@Override
public View onCreateView(LayoutInflater inflater,
ViewGroup container,
Bundle savedInstanceState) {
- View view = inflater.inflate(R.layout.fragment_media_detail_pager, container, false);
- ButterKnife.bind(this,view);
- pager.addOnPageChangeListener(this);
-
+ binding = FragmentMediaDetailPagerBinding.inflate(inflater, container, false);
+ binding.mediaDetailsPager.addOnPageChangeListener(this);
+ // Initialize the ProgressBar by finding it in the layout
+ imageProgressBar = binding.getRoot().findViewById(R.id.itemProgressBar);
adapter = new MediaDetailAdapter(getChildFragmentManager());
// ActionBar is now supported in both activities - if this crashes something is quite wrong
@@ -115,7 +139,7 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple
// If fragment is associated with ProfileActivity, then hide the tabLayout
if (getActivity() instanceof ProfileActivity) {
- ((ProfileActivity)getActivity()).tabLayout.setVisibility(View.GONE);
+ ((ProfileActivity)getActivity()).setTabLayoutVisibility(false);
}
// Else if fragment is associated with MainActivity then hide that tab layout
@@ -123,22 +147,22 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple
((MainActivity)getActivity()).hideTabs();
}
- pager.setAdapter(adapter);
+ binding.mediaDetailsPager.setAdapter(adapter);
if (savedInstanceState != null) {
final int pageNumber = savedInstanceState.getInt("current-page");
- pager.setCurrentItem(pageNumber, false);
+ binding.mediaDetailsPager.setCurrentItem(pageNumber, false);
getActivity().invalidateOptionsMenu();
}
adapter.notifyDataSetChanged();
- return view;
+ return binding.getRoot();
}
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
- outState.putInt("current-page", pager.getCurrentItem());
+ outState.putInt("current-page", binding.mediaDetailsPager.getCurrentItem());
outState.putBoolean("editable", editable);
outState.putBoolean("isFeaturedImage", isFeaturedImage);
}
@@ -147,8 +171,9 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (savedInstanceState != null) {
- editable = savedInstanceState.getBoolean("editable");
- isFeaturedImage = savedInstanceState.getBoolean("isFeaturedImage");
+ editable = savedInstanceState.getBoolean("editable", false);
+ isFeaturedImage = savedInstanceState.getBoolean("isFeaturedImage", false);
+
}
setHasOptionsMenu(true);
initProvider();
@@ -177,7 +202,8 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple
return true;
}
- Media m = provider.getMediaAtPosition(pager.getCurrentItem());
+ Media m = provider.getMediaAtPosition(binding.mediaDetailsPager.getCurrentItem());
+ MediaDetailFragment mediaDetailFragment = this.adapter.getCurrentMediaDetailFragment();
switch (item.getItemId()) {
case R.id.menu_bookmark_current_image:
boolean bookmarkExists = bookmarkDao.updateBookmark(bookmark);
@@ -231,6 +257,16 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple
return true;
case R.id.menu_view_report:
showReportDialog(m);
+ case R.id.menu_view_set_white_background:
+ if (mediaDetailFragment != null) {
+ mediaDetailFragment.onImageBackgroundChanged(ContextCompat.getColor(getContext(), R.color.white));
+ }
+ return true;
+ case R.id.menu_view_set_black_background:
+ if (mediaDetailFragment != null) {
+ mediaDetailFragment.onImageBackgroundChanged(ContextCompat.getColor(getContext(), R.color.black));
+ }
+ return true;
default:
return super.onOptionsItemSelected(item);
}
@@ -337,7 +373,7 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple
if (!editable) { // Disable menu options for editable views
menu.clear(); // see http://stackoverflow.com/a/8495697/17865
inflater.inflate(R.menu.fragment_image_detail, menu);
- if (pager != null) {
+ if (binding.mediaDetailsPager != null) {
MediaDetailProvider provider = getMediaDetailProvider();
if(provider == null) {
return;
@@ -346,7 +382,7 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple
if (isFromFeaturedRootFragment) {
position = this.position;
} else {
- position = pager.getCurrentItem();
+ position = binding.mediaDetailsPager.getCurrentItem();
}
Media m = provider.getMediaAtPosition(position);
@@ -360,6 +396,17 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple
if (m.getUser() != null) {
menu.findItem(R.id.menu_view_user_page).setEnabled(true).setVisible(true);
}
+
+ try {
+ URL mediaUrl = new URL(m.getImageUrl());
+ this.handleBackgroundColorMenuItems(
+ () -> BitmapFactory.decodeStream(mediaUrl.openConnection().getInputStream()),
+ menu
+ );
+ } catch (Exception e) {
+ Timber.e("Cant detect media transparency");
+ }
+
// Initialize bookmark object
bookmark = new Bookmark(
m.getFilename(),
@@ -410,16 +457,35 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple
}
}
+ /**
+ * Decide wether or not we should display the background color menu items
+ * We display them if the image is transparent
+ * @param getBitmap
+ * @param menu
+ */
+ private void handleBackgroundColorMenuItems(Callable getBitmap, Menu menu) {
+ Observable.fromCallable(
+ getBitmap
+ ).subscribeOn(Schedulers.newThread())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(image -> {
+ if (image.hasAlpha()) {
+ menu.findItem(R.id.menu_view_set_white_background).setVisible(true).setEnabled(true);
+ menu.findItem(R.id.menu_view_set_black_background).setVisible(true).setEnabled(true);
+ }
+ });
+ }
+
private void updateBookmarkState(MenuItem item) {
boolean isBookmarked = bookmarkDao.findBookmark(bookmark);
if(isBookmarked) {
- if(removedItems.contains(pager.getCurrentItem())) {
- removedItems.remove(new Integer(pager.getCurrentItem()));
+ if(removedItems.contains(binding.mediaDetailsPager.getCurrentItem())) {
+ removedItems.remove(new Integer(binding.mediaDetailsPager.getCurrentItem()));
}
}
else {
- if(!removedItems.contains(pager.getCurrentItem())) {
- removedItems.add(pager.getCurrentItem());
+ if(!removedItems.contains(binding.mediaDetailsPager.getCurrentItem())) {
+ removedItems.add(binding.mediaDetailsPager.getCurrentItem());
}
}
int icon = isBookmarked ? R.drawable.menu_ic_round_star_filled_24px : R.drawable.menu_ic_round_star_border_24px;
@@ -440,19 +506,27 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple
* @param position current item that to be shown
*/
private void setViewPagerCurrentItem(int position) {
- final Boolean[] currentItemNotShown = {true};
- Runnable runnable = new Runnable() {
+
+ final Handler handler = new Handler(Looper.getMainLooper());
+ final Runnable runnable = new Runnable() {
@Override
public void run() {
- while(currentItemNotShown[0]){
- if(adapter.getCount() > position){
- pager.setCurrentItem(position, false);
- currentItemNotShown[0] = false;
- }
+ // Show the ProgressBar while waiting for the item to load
+ imageProgressBar.setVisibility(View.VISIBLE);
+ // Check if the adapter has enough items loaded
+ if(adapter.getCount() > position){
+ // Set the current item in the ViewPager
+ binding.mediaDetailsPager.setCurrentItem(position, false);
+ // Hide the ProgressBar once the item is loaded
+ imageProgressBar.setVisibility(View.GONE);
+ } else {
+ // If the item is not ready yet, post the Runnable again
+ handler.post(this);
}
}
};
- new Thread(runnable).start();
+ // Start the Runnable
+ handler.post(runnable);
}
/**
@@ -529,7 +603,7 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple
Timber.d("Skipping getItem. Returning as activity is destroyed!");
return null;
}
- pager.postDelayed(() -> getActivity().invalidateOptionsMenu(), 5);
+ binding.mediaDetailsPager.postDelayed(() -> getActivity().invalidateOptionsMenu(), 5);
}
if (isFromFeaturedRootFragment) {
return MediaDetailFragment.forMedia(position+i, editable, isFeaturedImage, isWikipediaButtonDisplayed);
@@ -555,6 +629,18 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple
return mCurrentFragment;
}
+ /**
+ * If current fragment is of type MediaDetailFragment, return it, otherwise return null.
+ * @return MediaDetailFragment
+ */
+ public MediaDetailFragment getCurrentMediaDetailFragment() {
+ if (mCurrentFragment instanceof MediaDetailFragment) {
+ return (MediaDetailFragment) mCurrentFragment;
+ }
+
+ return null;
+ }
+
/**
* Called to inform the adapter of which item is currently considered to be the "primary",
* that is the one show to the user as the current page.
diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaInterface.java b/app/src/main/java/fr/free/nrw/commons/media/MediaInterface.java
deleted file mode 100644
index ee66c41ae..000000000
--- a/app/src/main/java/fr/free/nrw/commons/media/MediaInterface.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package fr.free.nrw.commons.media;
-
-import io.reactivex.Single;
-import java.util.Map;
-import org.wikipedia.dataclient.mwapi.MwQueryResponse;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-import retrofit2.http.QueryMap;
-
-/**
- * Interface for interacting with Commons media related APIs
- */
-public interface MediaInterface {
- String MEDIA_PARAMS="&prop=imageinfo|coordinates&iiprop=url|extmetadata|user&&iiurlwidth=640" +
- "&iiextmetadatafilter=DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal" +
- "|Artist|LicenseShortName|LicenseUrl";
-
- /**
- * fetches category detail(title, hidden) for each category along with File information
- */
- String MEDIA_PARAMS_WITH_CATEGORY_DETAILS ="&clprop=hidden&prop=categories|imageinfo&iiprop=url|extmetadata|user&&iiurlwidth=640" +
- "&iiextmetadatafilter=DateTime|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal" +
- "|Artist|LicenseShortName|LicenseUrl";
-
- /**
- * Checks if a page exists or not.
- *
- * @param title the title of the page to be checked
- * @return
- */
- @GET("w/api.php?action=query&format=json&formatversion=2")
- Single checkPageExistsUsingTitle(@Query("titles") String title);
-
- /**
- * Check if file exists
- *
- * @param aisha1 the SHA of the media file to be checked
- * @return
- */
- @GET("w/api.php?action=query&format=json&formatversion=2&list=allimages")
- Single checkFileExistsUsingSha(@Query("aisha1") String aisha1);
-
- /**
- * This method retrieves a list of Media objects filtered using image generator query
- *
- * @param category the category name. Must start with "Category:"
- * @param itemLimit how many images are returned
- * @param continuation the continuation string from the previous query or empty map
- * @return
- */
- @GET("w/api.php?action=query&format=json&formatversion=2" + //Basic parameters
- "&generator=categorymembers&gcmtype=file&gcmsort=timestamp&gcmdir=desc" + //Category parameters
- MEDIA_PARAMS)
- Single getMediaListFromCategory(@Query("gcmtitle") String category, @Query("gcmlimit") int itemLimit, @QueryMap Map continuation);
-
-
- /**
- * This method retrieves a list of Media objects for a given user name
- *
- * @param username user's Wikimedia Commons username.
- * @param itemLimit how many images are returned
- * @param continuation the continuation string from the previous query or empty map
- * @return
- */
- @GET("w/api.php?action=query&format=json&formatversion=2" + //Basic parameters
- "&generator=allimages&gaisort=timestamp&gaidir=older" + MEDIA_PARAMS)
- Single getMediaListForUser(@Query("gaiuser") String username,
- @Query("gailimit") int itemLimit, @QueryMap(encoded = true) Map continuation);
-
- /**
- * This method retrieves a list of Media objects filtered using image generator query
- *
- * @param keyword the searched keyword
- * @param itemLimit how many images are returned
- * @param offset the offset in the result set
- * @return
- */
- @GET("w/api.php?action=query&format=json&formatversion=2" + //Basic parameters
- "&generator=search&gsrwhat=text&gsrnamespace=6" + //Search parameters
- MEDIA_PARAMS)
- Single getMediaListFromSearch(@Query("gsrsearch") String keyword,
- @Query("gsrlimit") int itemLimit, @Query("gsroffset") int offset);
-
- /**
- * This method retrieves a list of Media objects filtered using list geosearch query. Example: https://commons.wikimedia.org/w/api.php?action=query&format=json&formatversion=2&generator=geosearch&ggsnamespace=6&prop=imageinfo|coordinates&iiprop=url|extmetadata|user&&iiurlwidth=640&iiextmetadatafilter=DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName|LicenseUrl&ggscoord=37.45579%7C-122.31369&ggslimit=30&ggsradius=10000
- *
- * @param location the search location
- * @param itemLimit how many images are returned
- * @return
- */
- @GET("w/api.php?action=query&format=json&formatversion=2" + //Basic parameters
- "&generator=geosearch&ggsnamespace=6" + //Search parameters
- MEDIA_PARAMS)
- Single getMediaListFromGeoSearch(@Query("ggscoord") String location, @Query("ggslimit") int itemLimit, @Query("ggsradius") int radius);
-
- /**
- * Fetches Media object from the imageInfo API
- *
- * @param title the tiles to be searched for. Can be filename or template name
- * @return
- */
- @GET("w/api.php?action=query&format=json&formatversion=2" +
- MEDIA_PARAMS_WITH_CATEGORY_DETAILS)
- Single getMedia(@Query("titles") String title);
-
- /**
- * Fetches Media object from the imageInfo API
- *
- * @param pageIds the ids to be searched for
- * @return
- */
- @GET("w/api.php?action=query&format=json&formatversion=2" +
- MEDIA_PARAMS)
- Single getMediaById(@Query("pageids") String pageIds);
-
- /**
- * Fetches Media object from the imageInfo API
- * Passes an image generator parameter
- *
- * @param title the tiles to be searched for. Can be filename or template name
- * @return
- */
- @GET("w/api.php?action=query&format=json&formatversion=2&generator=images" +
- MEDIA_PARAMS)
- Single getMediaWithGenerator(@Query("titles") String title);
-
- @GET("w/api.php?format=json&action=parse&prop=text")
- Single getPageHtml(@Query("page") String title);
-
- /**
- * Fetches caption using file name
- *
- * @param filename name of the file to be used for fetching captions
- * */
- @GET("w/api.php?action=wbgetentities&props=labels&format=json&languagefallback=1")
- Single fetchCaptionByFilename(@Query("language") String language, @Query("titles") String filename);
-
- /**
- * Fetches list of images from a depiction entity
- * @param query depictionEntityId
- * @param srlimit the number of items to fetch
- * @param sroffset number od depictions already fetched, this is useful in implementing pagination
- */
- @GET("w/api.php?action=query&format=json&formatversion=2" + //Basic parameters
- "&generator=search&gsrnamespace=6" + //Search parameters
- MEDIA_PARAMS)
- Single fetchImagesForDepictedItem(@Query("gsrsearch") String query,
- @Query("gsrlimit")String srlimit, @Query("gsroffset") String sroffset);
-
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaInterface.kt b/app/src/main/java/fr/free/nrw/commons/media/MediaInterface.kt
new file mode 100644
index 000000000..c1b2f7ab5
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/media/MediaInterface.kt
@@ -0,0 +1,182 @@
+package fr.free.nrw.commons.media
+
+import fr.free.nrw.commons.OkHttpConnectionFactory.UnsuccessfulResponseInterceptor.SUPPRESS_ERROR_LOG_HEADER
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
+import io.reactivex.Single
+import retrofit2.http.GET
+import retrofit2.http.Headers
+import retrofit2.http.Query
+import retrofit2.http.QueryMap
+
+/**
+ * Interface for interacting with Commons media related APIs
+ */
+interface MediaInterface {
+ /**
+ * Checks if a page exists or not.
+ *
+ * @param title the title of the page to be checked
+ * @return
+ */
+ @GET("w/api.php?action=query&format=json&formatversion=2")
+ fun checkPageExistsUsingTitle(@Query("titles") title: String?): Single
+
+ /**
+ * Check if file exists
+ *
+ * @param aisha1 the SHA of the media file to be checked
+ * @return
+ */
+ @GET("w/api.php?action=query&format=json&formatversion=2&list=allimages")
+ fun checkFileExistsUsingSha(@Query("aisha1") aisha1: String?): Single
+
+ /**
+ * This method retrieves a list of Media objects filtered using image generator query
+ *
+ * @param category the category name. Must start with "Category:"
+ * @param itemLimit how many images are returned
+ * @param continuation the continuation string from the previous query or empty map
+ * @return
+ */
+ @GET(
+ "w/api.php?action=query&format=json&formatversion=2" + //Basic parameters
+ "&generator=categorymembers&gcmtype=file&gcmsort=timestamp&gcmdir=desc$MEDIA_PARAMS" //Category parameters
+ )
+ fun getMediaListFromCategory(
+ @Query("gcmtitle") category: String?,
+ @Query("gcmlimit") itemLimit: Int,
+ @QueryMap continuation: Map
+ ): Single
+
+ /**
+ * This method retrieves a list of Media objects for a given user name
+ *
+ * @param username user's Wikimedia Commons username.
+ * @param itemLimit how many images are returned
+ * @param continuation the continuation string from the previous query or empty map
+ * @return
+ */
+ @GET(
+ "w/api.php?action=query&format=json&formatversion=2" + //Basic parameters
+ "&generator=allimages&gaisort=timestamp&gaidir=older$MEDIA_PARAMS"
+ )
+ fun getMediaListForUser(
+ @Query("gaiuser") username: String?,
+ @Query("gailimit") itemLimit: Int,
+ @QueryMap(encoded = true) continuation: Map
+ ): Single
+
+ /**
+ * This method retrieves a list of Media objects filtered using image generator query
+ *
+ * @param keyword the searched keyword
+ * @param itemLimit how many images are returned
+ * @param offset the offset in the result set
+ * @return
+ */
+ @GET(
+ "w/api.php?action=query&format=json&formatversion=2" + //Basic parameters
+ "&generator=search&gsrwhat=text&gsrnamespace=6$MEDIA_PARAMS" //Search parameters
+ )
+ fun getMediaListFromSearch(
+ @Query("gsrsearch") keyword: String?,
+ @Query("gsrlimit") itemLimit: Int, @Query("gsroffset") offset: Int
+ ): Single
+
+ /**
+ * This method retrieves a list of Media objects filtered using list geosearch query. Example: https://commons.wikimedia.org/w/api.php?action=query&format=json&formatversion=2&generator=geosearch&ggsnamespace=6&prop=imageinfo|coordinates&iiprop=url|extmetadata|user&&iiurlwidth=640&iiextmetadatafilter=DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName|LicenseUrl&ggscoord=37.45579%7C-122.31369&ggslimit=30&ggsradius=10000
+ *
+ * @param location the search location
+ * @param itemLimit how many images are returned
+ * @return
+ */
+ @GET(
+ "w/api.php?action=query&format=json&formatversion=2" + //Basic parameters
+ "&generator=geosearch&ggsnamespace=6$MEDIA_PARAMS" //Search parameters
+ )
+ fun getMediaListFromGeoSearch(
+ @Query("ggscoord") location: String?,
+ @Query("ggslimit") itemLimit: Int,
+ @Query("ggsradius") radius: Int
+ ): Single
+
+ /**
+ * Fetches Media object from the imageInfo API
+ *
+ * @param title the tiles to be searched for. Can be filename or template name
+ * @return
+ */
+ @GET("w/api.php?action=query&format=json&formatversion=2$MEDIA_PARAMS_WITH_CATEGORY_DETAILS")
+ fun getMedia(@Query("titles") title: String?): Single
+
+ /**
+ * Fetches Media object from the imageInfo API but suppress (known) errors
+ *
+ * @param title the tiles to be searched for. Can be filename or template name
+ * @return
+ */
+ @GET("w/api.php?action=query&format=json&formatversion=2$MEDIA_PARAMS_WITH_CATEGORY_DETAILS")
+ @Headers(SUPPRESS_ERROR_LOG_HEADER)
+ fun getMediaSuppressingErrors(@Query("titles") title: String?): Single
+
+ /**
+ * Fetches Media object from the imageInfo API
+ *
+ * @param pageIds the ids to be searched for
+ * @return
+ */
+ @GET("w/api.php?action=query&format=json&formatversion=2$MEDIA_PARAMS")
+ @Headers(SUPPRESS_ERROR_LOG_HEADER)
+ fun getMediaById(@Query("pageids") pageIds: String?): Single
+
+ /**
+ * Fetches Media object from the imageInfo API
+ * Passes an image generator parameter
+ *
+ * @param title the tiles to be searched for. Can be filename or template name
+ * @return
+ */
+ @GET("w/api.php?action=query&format=json&formatversion=2&generator=images$MEDIA_PARAMS")
+ fun getMediaWithGenerator(@Query("titles") title: String?): Single
+
+ @GET("w/api.php?format=json&action=parse&prop=text")
+ @Headers(SUPPRESS_ERROR_LOG_HEADER)
+ fun getPageHtml(@Query("page") title: String?): Single
+
+ /**
+ * Fetches caption using file name
+ *
+ * @param filename name of the file to be used for fetching captions
+ */
+ @GET("w/api.php?action=wbgetentities&props=labels&format=json&languagefallback=1")
+ fun fetchCaptionByFilename(
+ @Query("language") language: String?,
+ @Query("titles") filename: String?
+ ): Single
+
+ /**
+ * Fetches list of images from a depiction entity
+ * @param query depictionEntityId
+ * @param srlimit the number of items to fetch
+ * @param sroffset number od depictions already fetched, this is useful in implementing pagination
+ */
+ @GET(
+ "w/api.php?action=query&format=json&formatversion=2" + //Basic parameters
+ "&generator=search&gsrnamespace=6$MEDIA_PARAMS" //Search parameters
+ )
+ fun fetchImagesForDepictedItem(
+ @Query("gsrsearch") query: String?,
+ @Query("gsrlimit") srlimit: String?, @Query("gsroffset") sroffset: String?
+ ): Single
+
+ companion object {
+ const val MEDIA_PARAMS =
+ "&prop=imageinfo|coordinates&iiprop=url|extmetadata|user&&iiurlwidth=640&iiextmetadatafilter=DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName|LicenseUrl"
+
+ /**
+ * fetches category detail(title, hidden) for each category along with File information
+ */
+ const val MEDIA_PARAMS_WITH_CATEGORY_DETAILS =
+ "&clprop=hidden&prop=categories|imageinfo&iiprop=url|extmetadata|user&&iiurlwidth=640&iiextmetadatafilter=DateTime|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName|LicenseUrl"
+ }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/media/MwParseResponse.java b/app/src/main/java/fr/free/nrw/commons/media/MwParseResponse.java
index c65874532..28df3811a 100644
--- a/app/src/main/java/fr/free/nrw/commons/media/MwParseResponse.java
+++ b/app/src/main/java/fr/free/nrw/commons/media/MwParseResponse.java
@@ -3,7 +3,7 @@ package fr.free.nrw.commons.media;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
-import org.wikipedia.dataclient.mwapi.MwResponse;
+import fr.free.nrw.commons.wikidata.mwapi.MwResponse;
public class MwParseResponse extends MwResponse {
@Nullable
diff --git a/app/src/main/java/fr/free/nrw/commons/media/WikidataMediaClient.kt b/app/src/main/java/fr/free/nrw/commons/media/WikidataMediaClient.kt
index d14123d21..9fb728443 100644
--- a/app/src/main/java/fr/free/nrw/commons/media/WikidataMediaClient.kt
+++ b/app/src/main/java/fr/free/nrw/commons/media/WikidataMediaClient.kt
@@ -4,10 +4,10 @@ import fr.free.nrw.commons.BetaConstants
import fr.free.nrw.commons.Media
import fr.free.nrw.commons.category.ContinuationClient
import fr.free.nrw.commons.explore.media.MediaConverter
+import fr.free.nrw.commons.wikidata.model.Entities
import io.reactivex.Single
-import org.wikipedia.dataclient.mwapi.MwQueryPage
-import org.wikipedia.dataclient.mwapi.MwQueryResponse
-import org.wikipedia.wikidata.Entities
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
import javax.inject.Inject
import javax.inject.Singleton
diff --git a/app/src/main/java/fr/free/nrw/commons/media/WikidataMediaInterface.java b/app/src/main/java/fr/free/nrw/commons/media/WikidataMediaInterface.java
deleted file mode 100644
index 62e270ab9..000000000
--- a/app/src/main/java/fr/free/nrw/commons/media/WikidataMediaInterface.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package fr.free.nrw.commons.media;
-
-import static fr.free.nrw.commons.media.MediaInterface.MEDIA_PARAMS;
-
-import io.reactivex.Single;
-import org.wikipedia.dataclient.mwapi.MwQueryResponse;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-/**
- * Interface for getting Wikidata images from production server
- */
-public interface WikidataMediaInterface {
-
- /**
- * Fetches list of images from a depiction entity
- * @param query depictionEntityId ex. "haswbstatement:P180=Q9394"
- * @param srlimit the number of items to fetch
- * @param sroffset number of depictions already fetched,
- * this is useful in implementing pagination
- * @return Single
- */
- @GET("w/api.php?action=query&format=json&formatversion=2" + //Basic parameters
- "&generator=search&gsrnamespace=6" + //Search parameters
- MEDIA_PARAMS)
- Single fetchImagesForDepictedItem(@Query("gsrsearch") String query,
- @Query("gsrlimit")String srlimit, @Query("gsroffset") String sroffset);
-
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/media/WikidataMediaInterface.kt b/app/src/main/java/fr/free/nrw/commons/media/WikidataMediaInterface.kt
new file mode 100644
index 000000000..f250f7ac7
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/media/WikidataMediaInterface.kt
@@ -0,0 +1,29 @@
+package fr.free.nrw.commons.media
+
+import fr.free.nrw.commons.media.MediaInterface.Companion.MEDIA_PARAMS
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
+import io.reactivex.Single
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+/**
+ * Interface for getting Wikidata images from production server
+ */
+interface WikidataMediaInterface {
+ /**
+ * Fetches list of images from a depiction entity
+ * @param query depictionEntityId ex. "haswbstatement:P180=Q9394"
+ * @param srlimit the number of items to fetch
+ * @param sroffset number of depictions already fetched,
+ * this is useful in implementing pagination
+ * @return Single
+ */
+ @GET(
+ "w/api.php?action=query&format=json&formatversion=2" + //Basic parameters
+ "&generator=search&gsrnamespace=6$MEDIA_PARAMS" //Search parameters
+ )
+ fun fetchImagesForDepictedItem(
+ @Query("gsrsearch") query: String?,
+ @Query("gsrlimit") srlimit: String?, @Query("gsroffset") sroffset: String?
+ ): Single
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/media/ZoomableActivity.kt b/app/src/main/java/fr/free/nrw/commons/media/ZoomableActivity.kt
index a679f908d..615dd78ee 100644
--- a/app/src/main/java/fr/free/nrw/commons/media/ZoomableActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/media/ZoomableActivity.kt
@@ -13,9 +13,8 @@ import android.widget.Button
import android.widget.ProgressBar
import android.widget.TextView
import android.widget.Toast
+import androidx.core.content.ContextCompat
import androidx.lifecycle.ViewModelProvider
-import butterknife.BindView
-import butterknife.ButterKnife
import com.facebook.drawee.backends.pipeline.Fresco
import com.facebook.drawee.controller.BaseControllerListener
import com.facebook.drawee.controller.ControllerListener
@@ -37,6 +36,7 @@ import fr.free.nrw.commons.customselector.model.Image
import fr.free.nrw.commons.customselector.model.Result
import fr.free.nrw.commons.customselector.ui.selector.CustomSelectorViewModel
import fr.free.nrw.commons.customselector.ui.selector.CustomSelectorViewModelFactory
+import fr.free.nrw.commons.databinding.ActivityZoomableBinding
import fr.free.nrw.commons.media.zoomControllers.zoomable.DoubleTapGestureListener
import fr.free.nrw.commons.media.zoomControllers.zoomable.ZoomableDraweeView
import fr.free.nrw.commons.theme.BaseActivity
@@ -66,17 +66,9 @@ class ZoomableActivity : BaseActivity() {
*/
private lateinit var prefs: SharedPreferences
- @JvmField
- @BindView(R.id.zoomable)
- var photo: ZoomableDraweeView? = null
-
- @JvmField
- @BindView(R.id.zoom_progress_bar)
- var spinner: ProgressBar? = null
-
- @JvmField
- @BindView(R.id.selection_count)
- var selectedCount: TextView? = null
+ private lateinit var binding: ActivityZoomableBinding
+
+ var photoBackgroundColor: Int? = null
/**
* Total images present in folder
@@ -142,8 +134,8 @@ class ZoomableActivity : BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- setContentView(R.layout.activity_zoomable)
- ButterKnife.bind(this)
+ binding = ActivityZoomableBinding.inflate(layoutInflater)
+ setContentView(binding.root)
prefs = applicationContext.getSharedPreferences(
ImageHelper.CUSTOM_SELECTOR_PREFERENCE_KEY,
@@ -180,6 +172,13 @@ class ZoomableActivity : BaseActivity() {
).apply()
}
}
+
+ val backgroundColor = intent.getIntExtra(ZoomableActivityConstants.PHOTO_BACKGROUND_COLOR,
+ MediaDetailFragment.DEFAULT_IMAGE_BACKGROUND_COLOR);
+
+ if (backgroundColor != MediaDetailFragment.DEFAULT_IMAGE_BACKGROUND_COLOR) {
+ photoBackgroundColor = backgroundColor
+ }
}
/**
@@ -196,7 +195,7 @@ class ZoomableActivity : BaseActivity() {
/**
* Handle view model result.
*/
- private fun handleResult(result: Result){
+ private fun handleResult(result: Result) {
if(result.status is CallbackStatus.SUCCESS){
val images = result.images
if(images.isNotEmpty()) {
@@ -211,7 +210,7 @@ class ZoomableActivity : BaseActivity() {
onSwipe()
}
}
- spinner?.let {
+ binding.zoomProgressBar?.let {
it.visibility = if (result.status is CallbackStatus.FETCHING) View.VISIBLE else View.GONE
}
}
@@ -226,7 +225,7 @@ class ZoomableActivity : BaseActivity() {
sharedPreferences.getBoolean(ImageHelper.SHOW_ALREADY_ACTIONED_IMAGES_PREFERENCE_KEY, true)
if (!images.isNullOrEmpty()) {
- photo!!.setOnTouchListener(object : OnSwipeTouchListener(this) {
+ binding.zoomable!!.setOnTouchListener(object : OnSwipeTouchListener(this) {
// Swipe left to view next image in the folder. (if available)
override fun onSwipeLeft() {
super.onSwipeLeft()
@@ -261,7 +260,7 @@ class ZoomableActivity : BaseActivity() {
* Handles down swipe action
*/
private fun onDownSwiped() {
- if (photo?.zoomableController?.isIdentity == false)
+ if (binding.zoomable?.zoomableController?.isIdentity == false)
return
scope.launch {
@@ -323,7 +322,7 @@ class ZoomableActivity : BaseActivity() {
* Handles up swipe action
*/
private fun onUpSwiped() {
- if (photo?.zoomableController?.isIdentity == false)
+ if (binding.zoomable?.zoomableController?.isIdentity == false)
return
scope.launch {
@@ -388,7 +387,7 @@ class ZoomableActivity : BaseActivity() {
* Handles right swipe action
*/
private fun onRightSwiped(showAlreadyActionedImages: Boolean) {
- if (photo?.zoomableController?.isIdentity == false)
+ if (binding.zoomable?.zoomableController?.isIdentity == false)
return
if (showAlreadyActionedImages) {
@@ -422,7 +421,7 @@ class ZoomableActivity : BaseActivity() {
* Handles left swipe action
*/
private fun onLeftSwiped(showAlreadyActionedImages: Boolean) {
- if (photo?.zoomableController?.isIdentity == false)
+ if (binding.zoomable?.zoomableController?.isIdentity == false)
return
if (showAlreadyActionedImages) {
@@ -548,15 +547,15 @@ class ZoomableActivity : BaseActivity() {
* Unselect item UI
*/
private fun itemUnselected() {
- selectedCount!!.visibility = View.INVISIBLE
+ binding.selectionCount.visibility = View.INVISIBLE
}
/**
* Select item UI
*/
private fun itemSelected(i: Int) {
- selectedCount!!.visibility = View.VISIBLE
- selectedCount!!.text = i.toString()
+ binding.selectionCount.visibility = View.VISIBLE
+ binding.selectionCount.text = i.toString()
}
/**
@@ -576,11 +575,11 @@ class ZoomableActivity : BaseActivity() {
object : BaseControllerListener() {
override fun onSubmit(id: String, callerContext: Any) {
// Sometimes the spinner doesn't appear when rapidly switching between images, this fixes that
- spinner!!.visibility = View.VISIBLE
+ binding.zoomProgressBar.visibility = View.VISIBLE
}
override fun onIntermediateImageSet(id: String, imageInfo: ImageInfo?) {
- spinner!!.visibility = View.GONE
+ binding.zoomProgressBar.visibility = View.GONE
}
override fun onFinalImageSet(
@@ -588,7 +587,7 @@ class ZoomableActivity : BaseActivity() {
imageInfo: ImageInfo?,
animatable: Animatable?
) {
- spinner!!.visibility = View.GONE
+ binding.zoomProgressBar.visibility = View.GONE
}
}
@@ -599,15 +598,21 @@ class ZoomableActivity : BaseActivity() {
.setProgressBarImage(ProgressBarDrawable())
.setProgressBarImageScaleType(ScalingUtils.ScaleType.FIT_CENTER)
.build()
- photo!!.hierarchy = hierarchy
- photo!!.setAllowTouchInterceptionWhileZoomed(true)
- photo!!.setIsLongpressEnabled(false)
- photo!!.setTapListener(DoubleTapGestureListener(photo))
+ with(binding.zoomable!!) {
+ setHierarchy(hierarchy)
+ setAllowTouchInterceptionWhileZoomed(true)
+ setIsLongpressEnabled(false)
+ setTapListener(DoubleTapGestureListener(this))
+ }
val controller: DraweeController = Fresco.newDraweeControllerBuilder()
.setUri(imageUri)
.setControllerListener(loadingListener)
.build()
- photo!!.controller = controller
+ binding.zoomable!!.controller = controller
+
+ if (photoBackgroundColor != null) {
+ binding.zoomable!!.setBackgroundColor(photoBackgroundColor!!)
+ }
if (!images.isNullOrEmpty()) {
val selectedIndex = getImagePosition(selectedImages, images!![position])
@@ -667,5 +672,7 @@ class ZoomableActivity : BaseActivity() {
* the custom picker.
*/
const val ORIGIN = "Origin";
+
+ const val PHOTO_BACKGROUND_COLOR = "photo_background_color"
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/CategoryApi.java b/app/src/main/java/fr/free/nrw/commons/mwapi/CategoryApi.java
index bf31b8a54..f810d0480 100644
--- a/app/src/main/java/fr/free/nrw/commons/mwapi/CategoryApi.java
+++ b/app/src/main/java/fr/free/nrw/commons/mwapi/CategoryApi.java
@@ -17,8 +17,8 @@ import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import okhttp3.ResponseBody;
-import org.wikipedia.dataclient.mwapi.MwQueryPage;
-import org.wikipedia.dataclient.mwapi.MwQueryResponse;
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage;
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse;
import timber.log.Timber;
/**
diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java b/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java
index eb963f0ff..8d6b74231 100644
--- a/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java
+++ b/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java
@@ -7,13 +7,14 @@ import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.gson.Gson;
-import fr.free.nrw.commons.auth.SessionManager;
import fr.free.nrw.commons.campaigns.CampaignResponseDTO;
import fr.free.nrw.commons.explore.depictions.DepictsClient;
import fr.free.nrw.commons.location.LatLng;
import fr.free.nrw.commons.nearby.Place;
+import fr.free.nrw.commons.nearby.model.ItemsClass;
import fr.free.nrw.commons.nearby.model.NearbyResponse;
import fr.free.nrw.commons.nearby.model.NearbyResultItem;
+import fr.free.nrw.commons.nearby.model.PlaceBindings;
import fr.free.nrw.commons.profile.achievements.FeaturedImages;
import fr.free.nrw.commons.profile.achievements.FeedbackResponse;
import fr.free.nrw.commons.profile.leaderboard.LeaderboardResponse;
@@ -28,6 +29,8 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import javax.inject.Inject;
import javax.inject.Singleton;
import okhttp3.HttpUrl;
@@ -47,7 +50,6 @@ public class OkHttpJsonApiClient {
private final OkHttpClient okHttpClient;
private final DepictsClient depictsClient;
private final HttpUrl wikiMediaToolforgeUrl;
- private final HttpUrl wikiMediaTestToolforgeUrl;
private final String sparqlQueryUrl;
private final String campaignsUrl;
private final Gson gson;
@@ -57,14 +59,12 @@ public class OkHttpJsonApiClient {
public OkHttpJsonApiClient(OkHttpClient okHttpClient,
DepictsClient depictsClient,
HttpUrl wikiMediaToolforgeUrl,
- HttpUrl wikiMediaTestToolforgeUrl,
String sparqlQueryUrl,
String campaignsUrl,
Gson gson) {
this.okHttpClient = okHttpClient;
this.depictsClient = depictsClient;
this.wikiMediaToolforgeUrl = wikiMediaToolforgeUrl;
- this.wikiMediaTestToolforgeUrl = wikiMediaTestToolforgeUrl;
this.sparqlQueryUrl = sparqlQueryUrl;
this.campaignsUrl = campaignsUrl;
this.gson = gson;
@@ -83,7 +83,7 @@ public class OkHttpJsonApiClient {
@NonNull
public Observable getLeaderboard(String userName, String duration,
String category, String limit, String offset) {
- final String fetchLeaderboardUrlTemplate = wikiMediaTestToolforgeUrl
+ final String fetchLeaderboardUrlTemplate = wikiMediaToolforgeUrl
+ LEADERBOARD_END_POINT;
String url = String.format(Locale.ENGLISH,
fetchLeaderboardUrlTemplate,
@@ -129,7 +129,7 @@ public class OkHttpJsonApiClient {
*/
@NonNull
public Single setAvatar(String username, String avatar) {
- final String urlTemplate = wikiMediaTestToolforgeUrl
+ final String urlTemplate = wikiMediaToolforgeUrl
+ UPDATE_AVATAR_END_POINT;
return Single.fromCallable(() -> {
String url = String.format(Locale.ENGLISH,
@@ -273,16 +273,15 @@ public class OkHttpJsonApiClient {
/**
* Make API Call to get Nearby Places
*
- * @param cur Search lat long
- * @param language Language
- * @param radius Search Radius
- * @param shouldQueryForMonuments : Should we query for monuments
+ * @param cur Search lat long
+ * @param language Language
+ * @param radius Search Radius
* @return
* @throws Exception
*/
@Nullable
public List getNearbyPlaces(final LatLng cur, final String language, final double radius,
- final boolean shouldQueryForMonuments, final String customQuery)
+ final String customQuery)
throws Exception {
Timber.d("Fetching nearby items at radius %s", radius);
@@ -290,10 +289,9 @@ public class OkHttpJsonApiClient {
final String wikidataQuery;
if (customQuery != null) {
wikidataQuery = customQuery;
- } else if (!shouldQueryForMonuments) {
- wikidataQuery = FileUtils.readFromResource("/queries/nearby_query.rq");
} else {
- wikidataQuery = FileUtils.readFromResource("/queries/nearby_query_monuments.rq");
+ wikidataQuery = FileUtils.readFromResource(
+ "/queries/radius_query_for_upload_wizard.rq");
}
final String query = wikidataQuery
.replace("${RAD}", String.format(Locale.ROOT, "%.2f", radius))
@@ -311,6 +309,74 @@ public class OkHttpJsonApiClient {
.url(urlBuilder.build())
.build();
+ final Response response = okHttpClient.newCall(request).execute();
+ if (response.body() != null && response.isSuccessful()) {
+ final String json = response.body().string();
+ final NearbyResponse nearbyResponse = gson.fromJson(json, NearbyResponse.class);
+ final List bindings = nearbyResponse.getResults().getBindings();
+ final List places = new ArrayList<>();
+ for (final NearbyResultItem item : bindings) {
+ final Place placeFromNearbyItem = Place.from(item);
+ placeFromNearbyItem.setMonument(false);
+ places.add(placeFromNearbyItem);
+ }
+ return places;
+ }
+ throw new Exception(response.message());
+ }
+
+ /**
+ * Retrieves nearby places based on screen coordinates and optional query parameters.
+ *
+ * @param screenTopRight The top right corner of the screen (latitude, longitude).
+ * @param screenBottomLeft The bottom left corner of the screen (latitude, longitude).
+ * @param language The language for the query.
+ * @param shouldQueryForMonuments Flag indicating whether to include monuments in the query.
+ * @param customQuery Optional custom SPARQL query to use instead of default
+ * queries.
+ * @return A list of nearby places.
+ * @throws Exception If an error occurs during the retrieval process.
+ */
+ @Nullable
+ public List
@@ -15,7 +15,7 @@ Initially started by the Wikimedia Foundation, this app is now maintained by gra
## Documentation
-We try to have an extensive documentation at our [documentation repository][4]:
+Our [documentation repository][4] contains extensive documentation for users, contributors, and developers alike:
* [User Documentation][5]
* [Contributor Documentation][6]
@@ -29,11 +29,11 @@ Thank you all for your work!
| [
