mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-27 12:53:55 +01:00
FeaturedImages statistics rendered and Javadocs added
This commit is contained in:
parent
4d942a86c0
commit
5f45401d49
3 changed files with 38 additions and 1 deletions
|
|
@ -8,6 +8,7 @@ public class Achievements {
|
||||||
private int articlesUsingImages;
|
private int articlesUsingImages;
|
||||||
private int thanksReceived;
|
private int thanksReceived;
|
||||||
private int imagesEditedBySomeoneElse;
|
private int imagesEditedBySomeoneElse;
|
||||||
|
private int featuredImages;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the unique images used
|
* Sets the unique images used
|
||||||
|
|
@ -80,4 +81,20 @@ public class Achievements {
|
||||||
public int getImagesEditedBySomeoneElse() {
|
public int getImagesEditedBySomeoneElse() {
|
||||||
return imagesEditedBySomeoneElse;
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,8 @@ import android.view.View;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.RelativeLayout;
|
import android.widget.RelativeLayout;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import com.dinuscxj.progressbar.CircleProgressBar;
|
|
||||||
|
|
||||||
|
import com.dinuscxj.progressbar.CircleProgressBar;
|
||||||
|
|
||||||
import org.json.JSONException;
|
import org.json.JSONException;
|
||||||
import org.json.JSONObject;
|
import org.json.JSONObject;
|
||||||
|
|
@ -59,6 +59,8 @@ public class AchievementsActivity extends NavigationBaseActivity {
|
||||||
CircleProgressBar imagesUploadedProgressbar;
|
CircleProgressBar imagesUploadedProgressbar;
|
||||||
@BindView(R.id.images_used_by_wiki_progressbar)
|
@BindView(R.id.images_used_by_wiki_progressbar)
|
||||||
CircleProgressBar imagesUsedByWikiProgessbar;
|
CircleProgressBar imagesUsedByWikiProgessbar;
|
||||||
|
@BindView(R.id.image_featured)
|
||||||
|
TextView imagesFeatured;
|
||||||
@Inject
|
@Inject
|
||||||
SessionManager sessionManager;
|
SessionManager sessionManager;
|
||||||
@Inject
|
@Inject
|
||||||
|
|
@ -158,6 +160,9 @@ public class AchievementsActivity extends NavigationBaseActivity {
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* used to the count of images uploaded by user
|
||||||
|
*/
|
||||||
private void setUploadCount() {
|
private void setUploadCount() {
|
||||||
compositeDisposable.add(mediaWikiApi
|
compositeDisposable.add(mediaWikiApi
|
||||||
.getUploadCount(sessionManager.getCurrentAccount().name)
|
.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){
|
private void setUploadProgress( int uploadCount){
|
||||||
|
Log.i("uploadCount",Integer.toString(uploadCount));
|
||||||
imagesUploadedProgressbar.setProgress(100*uploadCount/25);
|
imagesUploadedProgressbar.setProgress(100*uploadCount/25);
|
||||||
imagesUploadedProgressbar.setProgressTextFormatPattern(uploadCount +"/25" );
|
imagesUploadedProgressbar.setProgressTextFormatPattern(uploadCount +"/25" );
|
||||||
}
|
}
|
||||||
|
|
@ -186,6 +196,10 @@ public class AchievementsActivity extends NavigationBaseActivity {
|
||||||
achievements.setArticlesUsingImages(object.getInt("articlesUsingImages"));
|
achievements.setArticlesUsingImages(object.getInt("articlesUsingImages"));
|
||||||
achievements.setThanksReceived(object.getInt("thanksReceived"));
|
achievements.setThanksReceived(object.getInt("thanksReceived"));
|
||||||
achievements.setImagesEditedBySomeoneElse(object.getInt("imagesEditedBySomeoneElse"));
|
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) {
|
} catch (JSONException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
|
@ -193,10 +207,15 @@ public class AchievementsActivity extends NavigationBaseActivity {
|
||||||
inflateAchievements(achievements);
|
inflateAchievements(achievements);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Used the inflate the fetched statistics of the images uploaded by user
|
||||||
|
* @param achievements
|
||||||
|
*/
|
||||||
private void inflateAchievements( Achievements achievements){
|
private void inflateAchievements( Achievements achievements){
|
||||||
thanksReceived.setText(Integer.toString(achievements.getThanksReceived()));
|
thanksReceived.setText(Integer.toString(achievements.getThanksReceived()));
|
||||||
imagesUsedByWikiProgessbar.setProgress(100*achievements.getUniqueUsedImages()/25);
|
imagesUsedByWikiProgessbar.setProgress(100*achievements.getUniqueUsedImages()/25);
|
||||||
imagesUsedByWikiProgessbar.setProgressTextFormatPattern(achievements.getUniqueUsedImages() + "/25");
|
imagesUsedByWikiProgessbar.setProgressTextFormatPattern(achievements.getUniqueUsedImages() + "/25");
|
||||||
|
imagesFeatured.setText(Integer.toString(achievements.getFeaturedImages()));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -205,6 +205,7 @@
|
||||||
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
android:text="2"
|
android:text="2"
|
||||||
|
android:id="@+id/image_featured"
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
android:layout_marginRight="44dp" />
|
android:layout_marginRight="44dp" />
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue