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

FeaturedImages statistics rendered and Javadocs added

Browse source
This commit is contained in:
tanvidadu 2018-05-25 15:37:24 +05:30
parent 4d942a86c0
commit 5f45401d49
3 changed files with 38 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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;
}
}

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

@ -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()));
}
/**

1
app/src/main/res/layout/activity_achievements.xml
View file

@ -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" />