Todo for user (commons-app#3851)

* Add a simple message

* Categories are edited

* Display categories

* read whole page

* Revert wrong changes

* Add newly added category field

* Doesnt displaey alreasy added categories

* add strings for notifications

* clean code

* Readd accidentally removed imports

* Fix edit layout style

* Fix category update messages

* Pass isWikipediaButtonDisplayed information to fragment

* Remove unused class

* Fix strings

* Fix string

* Add exeption for uncategorised images too

* Revert project.xml changes

* fix update buttonvisibility issue

* Make sure it works for auto added categories too

* make the button visible

* Make the button appear when categories are entered

* Include cancel button

* Make view updated too

* Make category view edited

* Update categories in an hacky way

* Fix unnecessary method call

* Add notes for short term fix to display added category

* Fix tests

* Fix strings

* Fix click issue

Author: neslihanturan

app/src/main/java/fr/free/nrw/commons/Media.kt

@@ -121,4 +121,14 @@ class Media constructor(
         get() = captions[Locale.getDefault().language]
             ?: captions.values.firstOrNull()
             ?: displayTitle
+
+    /**
+     * Gets the categories the file falls under.
+     * @return file categories as an ArrayList of Strings
+     */
+    var addedCategories: List<String>? = null
+        // TODO added categories should be removed. It is added for a short fix. On category update,
+        //  categories should be re-fetched instead
+        get() = field                     // getter
+        set(value) { field = value }      // setter
 }

app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt

@@ -8,6 +8,8 @@ import javax.inject.Singleton
 const val CATEGORY_PREFIX = "Category:"
 const val SUB_CATEGORY_CONTINUATION_PREFIX = "sub_category_"
 const val PARENT_CATEGORY_CONTINUATION_PREFIX = "parent_category_"
+const val CATEGORY_UNCATEGORISED = "uncategorised"
+const val CATEGORY_NEEDING_CATEGORIES = "needing categories"
 
 /**
  * Category Client to handle custom calls to Commons MediaWiki APIs

app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java

@@ -51,6 +51,7 @@ public class ContributionViewHolder extends RecyclerView.ViewHolder {
   private Contribution contribution;
   private final CompositeDisposable compositeDisposable = new CompositeDisposable();
   private final MediaClient mediaClient;
+  private boolean isWikipediaButtonDisplayed;
 
   ContributionViewHolder(final View parent, final Callback callback,
       final MediaClient mediaClient) {
@@ -160,6 +161,7 @@ private void checkIfMediaExistsOnWikipediaPage(final Contribution contribution)
   private void displayWikipediaButton(Boolean mediaExists) {
     if (!mediaExists) {
       addToWikipediaButton.setVisibility(View.VISIBLE);
+      isWikipediaButtonDisplayed = true;
       cancelButton.setVisibility(View.GONE);
       retryButton.setVisibility(View.GONE);
       imageOptions.setVisibility(View.VISIBLE);
@@ -199,7 +201,7 @@ public void deleteUpload() {
 
   @OnClick(R.id.contributionImage)
   public void imageClicked() {
-    callback.openMediaDetail(position);
+    callback.openMediaDetail(position, isWikipediaButtonDisplayed);
   }
 
   @OnClick(R.id.wikipediaButton)

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java

@@ -482,12 +482,12 @@ public void pauseUpload(Contribution contribution) {
      * contribution.
      */
     @Override
-    public void showDetail(int position) {
+    public void showDetail(int position, boolean isWikipediaButtonDisplayed) {
         if (mediaDetailPagerFragment == null || !mediaDetailPagerFragment.isVisible()) {
             mediaDetailPagerFragment = new MediaDetailPagerFragment();
             showMediaDetailPagerFragment();
         }
-        mediaDetailPagerFragment.showImage(position);
+        mediaDetailPagerFragment.showImage(position, isWikipediaButtonDisplayed);
     }
 
     @Override

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java

@@ -7,7 +7,6 @@
 import androidx.recyclerview.widget.DiffUtil;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.media.MediaClient;
-import org.wikipedia.dataclient.WikiSite;
 
     /**
  * Represents The View Adapter for the List of Contributions
@@ -75,7 +74,7 @@ public interface Callback {
 
         void deleteUpload(Contribution contribution);
 
-        void openMediaDetail(int contribution);
+        void openMediaDetail(int contribution, boolean isWikipediaPageExists);
 
         void addImageToWikipedia(Contribution contribution);
 

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java

@@ -29,9 +29,8 @@
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
-import fr.free.nrw.commons.media.MediaClient;
 import fr.free.nrw.commons.utils.DialogUtil;
-import fr.free.nrw.commons.wikidata.WikidataEditService;
+import fr.free.nrw.commons.media.MediaClient;
 import java.util.Locale;
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -244,9 +243,9 @@ public void deleteUpload(final Contribution contribution) {
   }
 
   @Override
-  public void openMediaDetail(final int position) {
+  public void openMediaDetail(final int position, boolean isWikipediaButtonDisplayed) {
     if (null != callback) {//Just being safe, ideally they won't be called when detached
-      callback.showDetail(position);
+      callback.showDetail(position, isWikipediaButtonDisplayed);
     }
   }
 
@@ -334,8 +333,8 @@ public interface Callback {
 
     void retryUpload(Contribution contribution);
 
-    void pauseUpload(Contribution contribution);
+    void showDetail(int position, boolean isWikipediaButtonDisplayed);
 
-    void showDetail(int position);
+    void pauseUpload(Contribution contribution);
   }
 }