mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-30 22:34:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add deletion button

Browse source
This commit is contained in:
Suchit Kar 2018-02-27 18:45:35 +05:30
parent 89245a6d5b
commit 6c38b58a29
7 changed files with 76 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/fr/free/nrw/commons/delete/DeleteActivity.java Normal file
View file

@ -0,0 +1,14 @@
package fr.free.nrw.commons.delete;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import fr.free.nrw.commons.R;
public class DeleteActivity extends AppCompatActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_delete);
}
}

20
app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
View file

@ -6,11 +6,13 @@ import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.FragmentTransaction;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView;
@ -32,6 +34,8 @@ import fr.free.nrw.commons.MediaDataExtractor;
import fr.free.nrw.commons.MediaWikiImageView;
import fr.free.nrw.commons.PageTitle;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.contributions.Contribution;
import fr.free.nrw.commons.delete.DeleteActivity;
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
import fr.free.nrw.commons.location.LatLng;
import fr.free.nrw.commons.ui.widget.CompatTextView;
@ -70,6 +74,7 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment {
private TextView coordinates;
private TextView uploadedDate;
private LinearLayout categoryContainer;
private Button delete;
private ScrollView scrollView;
private ArrayList<String> categoryNames;
private boolean categoriesLoaded = false;
@ -122,6 +127,7 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment {
license = (TextView) view.findViewById(R.id.mediaDetailLicense);
coordinates = (TextView) view.findViewById(R.id.mediaDetailCoordinates);
uploadedDate = (TextView) view.findViewById(R.id.mediaDetailuploadeddate);
delete = (Button) view.findViewById(R.id.nominateDeletion);
categoryContainer = (LinearLayout) view.findViewById(R.id.mediaDetailCategoryContainer);
licenseList = new LicenseList(getActivity());
@ -181,6 +187,12 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment {
Timber.d("MediaDetailFragment ready to display details");
displayMediaDetails(media);
}
if (media instanceof Contribution) {
Contribution c = (Contribution) media;
if (c.getState()!= Contribution.STATE_COMPLETED) {
delete.setVisibility(View.GONE);
}
}
}
private void displayMediaDetails(final Media media) {
@ -283,6 +295,14 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment {
if (media.getCoordinates() != null) {
coordinates.setOnClickListener(v -> openMap(media.getCoordinates()));
}
if (delete.getVisibility()!=View.GONE){
delete.setOnClickListener(v -> {
Bundle bundle = new Bundle();
bundle.putParcelable("media",media);
Intent deleteIntent = new Intent(getActivity(), DeleteActivity.class);
startActivity(deleteIntent);
});
}
}
private void rebuildCatList() {