From 5f45401d49e183ae309fd9cbd1a79b325097f0bb Mon Sep 17 00:00:00 2001
From: tanvidadu <tanvidadu1998@gmail.com>
Date: Fri, 25 May 2018 15:37:24 +0530
Subject: [PATCH]  FeaturedImages statistics rendered and Javadocs added

---
 .../commons/achievements/Achievements.java    | 17 +++++++++++++++
 .../achievements/AchievementsActivity.java    | 21 ++++++++++++++++++-
 .../main/res/layout/activity_achievements.xml |  1 +
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/achievements/Achievements.java b/app/src/main/java/fr/free/nrw/commons/achievements/Achievements.java
index f17bb582c..f4ac8d4de 100644
--- a/app/src/main/java/fr/free/nrw/commons/achievements/Achievements.java
+++ b/app/src/main/java/fr/free/nrw/commons/achievements/Achievements.java
@@ -8,6 +8,7 @@ public class Achievements {
     private int articlesUsingImages;
     private int thanksReceived;
     private int imagesEditedBySomeoneElse;
+    private int featuredImages;
 
     /**
      * Sets the unique images used
@@ -80,4 +81,20 @@ public class Achievements {
     public int getImagesEditedBySomeoneElse() {
         return imagesEditedBySomeoneElse;
     }
+
+    /**
+     *  sets the total of images featured
+     * @param featuredImages
+     */
+    public void setFeaturedImages(int featuredImages) {
+        this.featuredImages = featuredImages;
+    }
+
+    /**
+     * returns the total count of images featured
+     * @return
+     */
+    public int getFeaturedImages() {
+        return featuredImages;
+    }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java b/app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java
index 6f9800b05..f9a8b3e82 100644
--- a/app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java
@@ -15,8 +15,8 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import com.dinuscxj.progressbar.CircleProgressBar;
 
+import com.dinuscxj.progressbar.CircleProgressBar;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -59,6 +59,8 @@ public class AchievementsActivity extends NavigationBaseActivity {
     CircleProgressBar imagesUploadedProgressbar;
     @BindView(R.id.images_used_by_wiki_progressbar)
     CircleProgressBar imagesUsedByWikiProgessbar;
+    @BindView(R.id.image_featured)
+    TextView imagesFeatured;
     @Inject
     SessionManager sessionManager;
     @Inject
@@ -158,6 +160,9 @@ public class AchievementsActivity extends NavigationBaseActivity {
                 ));
     }
 
+    /**
+     * used to the count of images uploaded by user
+     */
     private void setUploadCount() {
         compositeDisposable.add(mediaWikiApi
                 .getUploadCount(sessionManager.getCurrentAccount().name)
@@ -169,7 +174,12 @@ public class AchievementsActivity extends NavigationBaseActivity {
                 ));
     }
 
+    /**
+     * used to the uploaded images progressbar
+     * @param uploadCount
+     */
     private void setUploadProgress( int uploadCount){
+        Log.i("uploadCount",Integer.toString(uploadCount));
         imagesUploadedProgressbar.setProgress(100*uploadCount/25);
         imagesUploadedProgressbar.setProgressTextFormatPattern(uploadCount +"/25" );
     }
@@ -186,6 +196,10 @@ public class AchievementsActivity extends NavigationBaseActivity {
             achievements.setArticlesUsingImages(object.getInt("articlesUsingImages"));
             achievements.setThanksReceived(object.getInt("thanksReceived"));
             achievements.setImagesEditedBySomeoneElse(object.getInt("imagesEditedBySomeoneElse"));
+            JSONObject featuredImages = object.getJSONObject("featuredImages");
+            achievements.setFeaturedImages
+                    (featuredImages.getInt("Quality_images") +
+                            featuredImages.getInt("Featured_pictures_on_Wikimedia_Commons"));
 
         } catch (JSONException e) {
             e.printStackTrace();
@@ -193,10 +207,15 @@ public class AchievementsActivity extends NavigationBaseActivity {
         inflateAchievements(achievements);
     }
 
+    /**
+     * Used the inflate the fetched statistics of the images uploaded by user
+     * @param achievements
+     */
     private void inflateAchievements( Achievements achievements){
         thanksReceived.setText(Integer.toString(achievements.getThanksReceived()));
         imagesUsedByWikiProgessbar.setProgress(100*achievements.getUniqueUsedImages()/25);
         imagesUsedByWikiProgessbar.setProgressTextFormatPattern(achievements.getUniqueUsedImages() + "/25");
+        imagesFeatured.setText(Integer.toString(achievements.getFeaturedImages()));
     }
 
     /**
diff --git a/app/src/main/res/layout/activity_achievements.xml b/app/src/main/res/layout/activity_achievements.xml
index 808343df9..56a285eca 100644
--- a/app/src/main/res/layout/activity_achievements.xml
+++ b/app/src/main/res/layout/activity_achievements.xml
@@ -205,6 +205,7 @@
                         android:layout_marginTop="@dimen/activity_margin_horizontal"
                         android:layout_marginStart="@dimen/activity_margin_horizontal"
                         android:text="2"
+                        android:id="@+id/image_featured"
                         android:layout_marginLeft="@dimen/activity_margin_horizontal"
                         android:layout_marginRight="44dp" />