Skip to content

Commit 5f45401

Browse files
committed
FeaturedImages statistics rendered and Javadocs added
1 parent 4d942a8 commit 5f45401

File tree

3 files changed

+38
-1
lines changed

3 files changed

+38
-1
lines changed

app/src/main/java/fr/free/nrw/commons/achievements/Achievements.java

+17
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ public class Achievements {
88
private int articlesUsingImages;
99
private int thanksReceived;
1010
private int imagesEditedBySomeoneElse;
11+
private int featuredImages;
1112

1213
/**
1314
* Sets the unique images used
@@ -80,4 +81,20 @@ public void setImagesEditedBySomeoneElse(int imagesEditedBySomeoneElse) {
8081
public int getImagesEditedBySomeoneElse() {
8182
return imagesEditedBySomeoneElse;
8283
}
84+
85+
/**
86+
* sets the total of images featured
87+
* @param featuredImages
88+
*/
89+
public void setFeaturedImages(int featuredImages) {
90+
this.featuredImages = featuredImages;
91+
}
92+
93+
/**
94+
* returns the total count of images featured
95+
* @return
96+
*/
97+
public int getFeaturedImages() {
98+
return featuredImages;
99+
}
83100
}

app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java

+20-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import android.widget.ImageView;
1616
import android.widget.RelativeLayout;
1717
import android.widget.TextView;
18-
import com.dinuscxj.progressbar.CircleProgressBar;
1918

19+
import com.dinuscxj.progressbar.CircleProgressBar;
2020

2121
import org.json.JSONException;
2222
import org.json.JSONObject;
@@ -59,6 +59,8 @@ public class AchievementsActivity extends NavigationBaseActivity {
5959
CircleProgressBar imagesUploadedProgressbar;
6060
@BindView(R.id.images_used_by_wiki_progressbar)
6161
CircleProgressBar imagesUsedByWikiProgessbar;
62+
@BindView(R.id.image_featured)
63+
TextView imagesFeatured;
6264
@Inject
6365
SessionManager sessionManager;
6466
@Inject
@@ -158,6 +160,9 @@ private void setAchievements() {
158160
));
159161
}
160162

163+
/**
164+
* used to the count of images uploaded by user
165+
*/
161166
private void setUploadCount() {
162167
compositeDisposable.add(mediaWikiApi
163168
.getUploadCount(sessionManager.getCurrentAccount().name)
@@ -169,7 +174,12 @@ private void setUploadCount() {
169174
));
170175
}
171176

177+
/**
178+
* used to the uploaded images progressbar
179+
* @param uploadCount
180+
*/
172181
private void setUploadProgress( int uploadCount){
182+
Log.i("uploadCount",Integer.toString(uploadCount));
173183
imagesUploadedProgressbar.setProgress(100*uploadCount/25);
174184
imagesUploadedProgressbar.setProgressTextFormatPattern(uploadCount +"/25" );
175185
}
@@ -186,17 +196,26 @@ private void parseJson(JSONObject object) {
186196
achievements.setArticlesUsingImages(object.getInt("articlesUsingImages"));
187197
achievements.setThanksReceived(object.getInt("thanksReceived"));
188198
achievements.setImagesEditedBySomeoneElse(object.getInt("imagesEditedBySomeoneElse"));
199+
JSONObject featuredImages = object.getJSONObject("featuredImages");
200+
achievements.setFeaturedImages
201+
(featuredImages.getInt("Quality_images") +
202+
featuredImages.getInt("Featured_pictures_on_Wikimedia_Commons"));
189203

190204
} catch (JSONException e) {
191205
e.printStackTrace();
192206
}
193207
inflateAchievements(achievements);
194208
}
195209

210+
/**
211+
* Used the inflate the fetched statistics of the images uploaded by user
212+
* @param achievements
213+
*/
196214
private void inflateAchievements( Achievements achievements){
197215
thanksReceived.setText(Integer.toString(achievements.getThanksReceived()));
198216
imagesUsedByWikiProgessbar.setProgress(100*achievements.getUniqueUsedImages()/25);
199217
imagesUsedByWikiProgessbar.setProgressTextFormatPattern(achievements.getUniqueUsedImages() + "/25");
218+
imagesFeatured.setText(Integer.toString(achievements.getFeaturedImages()));
200219
}
201220

202221
/**

app/src/main/res/layout/activity_achievements.xml

+1
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@
205205
android:layout_marginTop="@dimen/activity_margin_horizontal"
206206
android:layout_marginStart="@dimen/activity_margin_horizontal"
207207
android:text="2"
208+
android:id="@+id/image_featured"
208209
android:layout_marginLeft="@dimen/activity_margin_horizontal"
209210
android:layout_marginRight="44dp" />
210211

0 commit comments

Comments
 (0)