Brion VIBBER has submitted this change and it was merged. Change subject: Add a progress bar to display upload progress, instead of just text ......................................................................
Add a progress bar to display upload progress, instead of just text Change-Id: Id858ce3e508031435f7ceda3b2ffe2372b0c5510 GitHub: https://github.com/wikimedia/apps-android-commons/pull/11 --- M commons/res/layout/layout_contribution.xml M commons/res/values-v14/styles.xml M commons/res/values-v9/styles.xml M commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java 4 files changed, 23 insertions(+), 8 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/commons/res/layout/layout_contribution.xml b/commons/res/layout/layout_contribution.xml index 1c7dcf0..7ca86a5 100644 --- a/commons/res/layout/layout_contribution.xml +++ b/commons/res/layout/layout_contribution.xml @@ -30,6 +30,15 @@ android:orientation="vertical" android:padding="8dp" > + <ProgressBar + android:id="@+id/contributionProgress" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + style="@style/ProgressBar" + android:indeterminateOnly="false" + android:max="100" + android:visibility="gone" + /> <TextView android:id="@+id/contributionState" diff --git a/commons/res/values-v14/styles.xml b/commons/res/values-v14/styles.xml index b2d5c7f..d5e8aa4 100644 --- a/commons/res/values-v14/styles.xml +++ b/commons/res/values-v14/styles.xml @@ -1,5 +1,5 @@ <resources> - <style name="NotificationProgress" parent="android:Widget.Holo.ProgressBar.Horizontal" /> + <style name="ProgressBar" parent="android:Widget.Holo.ProgressBar.Horizontal" /> </resources> \ No newline at end of file diff --git a/commons/res/values-v9/styles.xml b/commons/res/values-v9/styles.xml index a4c9d25..615082e 100644 --- a/commons/res/values-v9/styles.xml +++ b/commons/res/values-v9/styles.xml @@ -1,7 +1,5 @@ <resources> - <style name="NotificationText" parent="android:TextAppearance.StatusBar.EventContent" /> - - <style name="NotificationTitle" parent="android:TextAppearance.StatusBar.EventContent.Title" /> + <style name="ProgressBar" parent="android:Widget.ProgressBar.Horizontal" /> </resources> \ No newline at end of file diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java index e8b076d..8ffbaa4 100644 --- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java +++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java @@ -52,6 +52,7 @@ final TextView titleView; final TextView stateView; final TextView seqNumView; + final ProgressBar progressView; String url; @@ -60,6 +61,7 @@ titleView = (TextView)parent.findViewById(R.id.contributionTitle); stateView = (TextView)parent.findViewById(R.id.contributionState); seqNumView = (TextView)parent.findViewById(R.id.contributionSequenceNumber); + progressView = (ProgressBar)parent.findViewById(R.id.contributionProgress); } } @@ -122,23 +124,29 @@ switch(contribution.getState()) { case Contribution.STATE_COMPLETED: views.stateView.setVisibility(View.GONE); + views.progressView.setVisibility(View.GONE); views.stateView.setText(""); break; case Contribution.STATE_QUEUED: views.stateView.setVisibility(View.VISIBLE); + views.progressView.setVisibility(View.GONE); views.stateView.setText(R.string.contribution_state_queued); break; case Contribution.STATE_IN_PROGRESS: - views.stateView.setVisibility(View.VISIBLE); - views.stateView.setText(R.string.contribution_state_starting); + views.stateView.setVisibility(View.GONE); + views.progressView.setVisibility(View.VISIBLE); long total = contribution.getDataLength(); long transferred = contribution.getTransferred(); - String stateString = String.format(getString(R.string.contribution_state_in_progress), (int)(((double)transferred / (double)total) * 100)); - views.stateView.setText(stateString); + if(transferred == 0 || transferred >= total) { + views.progressView.setIndeterminate(true); + } else { + views.progressView.setProgress((int)(((double)transferred / (double)total) * 100)); + } break; case Contribution.STATE_FAILED: views.stateView.setVisibility(View.VISIBLE); views.stateView.setText(R.string.contribution_state_failed); + views.progressView.setVisibility(View.GONE); break; } -- To view, visit https://gerrit.wikimedia.org/r/69118 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id858ce3e508031435f7ceda3b2ffe2372b0c5510 Gerrit-PatchSet: 2 Gerrit-Project: apps/android/commons Gerrit-Branch: master Gerrit-Owner: SuchABot <[email protected]> Gerrit-Reviewer: Brion VIBBER <[email protected]> Gerrit-Reviewer: Yuvipanda <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
