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

Prevent upload status from overlapping with the title of upload

Browse source 
Bug: 47458
This commit is contained in:
YuviPanda 2013-04-24 01:24:14 +05:30
parent 6dae336522
commit f721b163d1
2 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
commons/res/layout/layout_contribution.xml
View file

@ -22,14 +22,24 @@
android:scaleType="centerCrop" android:scaleType="centerCrop"
/> />
<RelativeLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center|bottom" android:layout_gravity="center|bottom"
android:background="#AA000000" android:background="#AA000000"
android:orientation="vertical"
android:padding="8dp" android:padding="8dp"
> >
<TextView
android:id="@+id/contributionState"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:textAppearanceSmall"
android:textColor="#FFFFFFFF"
android:visibility="gone"
/>
<TextView <TextView
android:id="@+id/contributionTitle" android:id="@+id/contributionTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -39,15 +49,7 @@
android:maxLines="2" android:maxLines="2"
android:ellipsize="end" android:ellipsize="end"
/> />
<TextView
android:id="@+id/contributionState" </LinearLayout>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignBaseline="@id/contributionTitle"
style="?android:textAppearanceSmall"
android:textColor="#FFFFFFFF"
/>
</RelativeLayout>
</FrameLayout> </FrameLayout>

4
commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java
View file

@ -108,12 +108,15 @@ public class ContributionsListFragment extends SherlockFragment {
switch(contribution.getState()) { switch(contribution.getState()) {
case Contribution.STATE_COMPLETED: case Contribution.STATE_COMPLETED:
views.stateView.setVisibility(View.GONE);
views.stateView.setText(""); views.stateView.setText("");
break; break;
case Contribution.STATE_QUEUED: case Contribution.STATE_QUEUED:
views.stateView.setVisibility(View.VISIBLE);
views.stateView.setText(R.string.contribution_state_queued); views.stateView.setText(R.string.contribution_state_queued);
break; break;
case Contribution.STATE_IN_PROGRESS: case Contribution.STATE_IN_PROGRESS:
views.stateView.setVisibility(View.VISIBLE);
views.stateView.setText(R.string.contribution_state_starting); views.stateView.setText(R.string.contribution_state_starting);
long total = contribution.getDataLength(); long total = contribution.getDataLength();
long transferred = contribution.getTransferred(); long transferred = contribution.getTransferred();
@ -121,6 +124,7 @@ public class ContributionsListFragment extends SherlockFragment {
views.stateView.setText(stateString); views.stateView.setText(stateString);
break; break;
case Contribution.STATE_FAILED: case Contribution.STATE_FAILED:
views.stateView.setVisibility(View.VISIBLE);
views.stateView.setText(R.string.contribution_state_failed); views.stateView.setText(R.string.contribution_state_failed);
break; break;
} }