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

added ProgressBar

Browse source
This commit is contained in:
tanvidadu 2018-05-26 23:40:15 +05:30
parent 5f45401d49
commit 9174dbd8c7
2 changed files with 53 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,6 +13,8 @@ import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
@ -46,6 +48,8 @@ public class AchievementsActivity extends NavigationBaseActivity {
private static final double BADGE_IMAGE_WIDTH_RATIO = 0.4; private static final double BADGE_IMAGE_WIDTH_RATIO = 0.4;
private static final double BADGE_IMAGE_HEIGHT_RATIO = 0.3; private static final double BADGE_IMAGE_HEIGHT_RATIO = 0.3;
private Boolean isUploadFetched = false;
private Boolean isStatisticsFetched = false;
@BindView(R.id.achievement_badge) @BindView(R.id.achievement_badge)
ImageView imageView; ImageView imageView;
@ -61,6 +65,16 @@ public class AchievementsActivity extends NavigationBaseActivity {
CircleProgressBar imagesUsedByWikiProgessbar; CircleProgressBar imagesUsedByWikiProgessbar;
@BindView(R.id.image_featured) @BindView(R.id.image_featured)
TextView imagesFeatured; TextView imagesFeatured;
@BindView(R.id.progressBar)
ProgressBar progressBar;
@BindView(R.id.layout_image_uploaded)
RelativeLayout layoutImageUploaded;
@BindView(R.id.layout_image_reverts)
RelativeLayout layoutImageReverts;
@BindView(R.id.layout_image_used_by_wiki)
RelativeLayout layoutImageUsedByWiki;
@BindView(R.id.layout_statistics)
LinearLayout layoutStatistics;
@Inject @Inject
SessionManager sessionManager; SessionManager sessionManager;
@Inject @Inject
@ -99,6 +113,8 @@ public class AchievementsActivity extends NavigationBaseActivity {
imageView.requestLayout(); imageView.requestLayout();
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
progressBar.setVisibility(View.VISIBLE);
hideLayouts();
setAchievements(); setAchievements();
setUploadCount(); setUploadCount();
initDrawer(); initDrawer();
@ -182,6 +198,8 @@ public class AchievementsActivity extends NavigationBaseActivity {
Log.i("uploadCount",Integer.toString(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" );
isUploadFetched = true;
hideProgressBar();
} }
/** /**
@ -216,6 +234,8 @@ public class AchievementsActivity extends NavigationBaseActivity {
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())); imagesFeatured.setText(Integer.toString(achievements.getFeaturedImages()));
isStatisticsFetched = true;
hideProgressBar();
} }
/** /**
@ -230,4 +250,29 @@ public class AchievementsActivity extends NavigationBaseActivity {
context.startActivity(intent); context.startActivity(intent);
} }
/**
* to hide progressbar
*/
private void hideProgressBar() {
if (progressBar != null && isUploadFetched && isStatisticsFetched) {
progressBar.setVisibility(View.GONE);
layoutImageReverts.setVisibility(View.VISIBLE);
layoutImageUploaded.setVisibility(View.VISIBLE);
layoutImageUsedByWiki.setVisibility(View.VISIBLE);
layoutStatistics.setVisibility(View.VISIBLE);
imageView.setVisibility(View.VISIBLE);
}
}
/**
* used to hide the layouts while fetching results from api
*/
private void hideLayouts(){
layoutImageUsedByWiki.setVisibility(View.INVISIBLE);
layoutImageUploaded.setVisibility(View.INVISIBLE);
layoutImageReverts.setVisibility(View.INVISIBLE);
layoutStatistics.setVisibility(View.INVISIBLE);
imageView.setVisibility(View.INVISIBLE);
}
} }

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

@ -156,11 +156,19 @@
app:style="solid_line" /> app:style="solid_line" />
</RelativeLayout> </RelativeLayout>
<ProgressBar
android:id="@+id/progressBar"
android:layout_centerVertical="true"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</RelativeLayout> </RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/layout_statistics"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView