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

Remove number of uploads from contributions fragment since we moved it text of tab layout

Browse source
This commit is contained in:
neslihanturan 2018-09-09 18:40:21 +03:00
parent 0497737922
commit 137533f25b
3 changed files with 5 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
View file

@ -83,6 +83,11 @@ public class ContributionsActivity extends AuthenticatedActivity implements Frag
setTabAndViewPagerSynchronisation();
}
/**
* Adds number of uploads next to tab text "Contributions" then it will look like
* "Contributions (NUMBER)"
* @param uploadCount
*/
public void setNumOfUploads(int uploadCount) {
tabLayout.getTabAt(0).setText(getResources().getString(R.string.contributions_fragment) +" "+ getResources()
.getQuantityString(R.plurals.contributions_subtitle,

30
app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java
View file

@ -81,8 +81,6 @@ public class ContributionsFragment
private boolean isUploadServiceConnected;
private CompositeDisposable compositeDisposable = new CompositeDisposable();
CountDownLatch waitForContributionsListFragment = new CountDownLatch(1);
public TextView numberOfUploads;
public ProgressBar numberOfUploadsProgressBar;
private ContributionsListFragment contributionsListFragment;
private MediaDetailPagerFragment mediaDetailPagerFragment;
@ -112,11 +110,6 @@ public class ContributionsFragment
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_contributions, container, false);
numberOfUploads = view.findViewById(R.id.numOfUploads);
numberOfUploadsProgressBar = view.findViewById(R.id.progressBar);
numberOfUploadsProgressBar.setVisibility(View.VISIBLE);
numberOfUploadsProgressBar.getIndeterminateDrawable().setColorFilter(ContextCompat.getColor(getActivity(), R.color.white), PorterDuff.Mode.SRC_IN );
if (savedInstanceState != null) {
mediaDetailPagerFragment = (MediaDetailPagerFragment)getChildFragmentManager().findFragmentByTag(MEDIA_DETAIL_PAGER_FRAGMENT_TAG);
@ -164,8 +157,6 @@ public class ContributionsFragment
transaction.addToBackStack(CONTRIBUTION_LIST_FRAGMENT_TAG);
transaction.commit();
getChildFragmentManager().executePendingTransactions();
// Both should be visible and number of uploads are ready
ContributionListViewUtils.setIndicatorVisibility(numberOfUploads, numberOfUploadsProgressBar,true, false);
}
/**
@ -188,9 +179,6 @@ public class ContributionsFragment
transaction.commit();
getChildFragmentManager().executePendingTransactions();
// Make number of uploads invisible when Media Details Activity is visible
ContributionListViewUtils.setIndicatorVisibility(numberOfUploads, numberOfUploadsProgressBar,false, true);
}
/**
@ -373,14 +361,7 @@ public class ContributionsFragment
@SuppressWarnings("ConstantConditions")
private void setUploadCount() {
if (getChildFragmentManager().findFragmentByTag(MEDIA_DETAIL_PAGER_FRAGMENT_TAG) != null) {
// Means Media Details Fragment is active
ContributionListViewUtils.setIndicatorVisibility(numberOfUploads, numberOfUploadsProgressBar,false, true);
} else {
// Means Contribution List Fragment is visible to user
ContributionListViewUtils.setIndicatorVisibility(numberOfUploads, numberOfUploadsProgressBar,false, false);
}
compositeDisposable.add(mediaWikiApi
.getUploadCount(((ContributionsActivity)getActivity()).sessionManager.getCurrentAccount().name)
.subscribeOn(Schedulers.io())
@ -392,23 +373,12 @@ public class ContributionsFragment
private void displayUploadCount(Integer uploadCount) {
if (getActivity().isFinishing()
|| numberOfUploads == null
|| getResources() == null) {
return;
}
((ContributionsActivity)getActivity()).setNumOfUploads(uploadCount);
numberOfUploads.setText(getResources()
.getQuantityString(R.plurals.contributions_subtitle,
uploadCount, uploadCount));
if (getChildFragmentManager().findFragmentByTag(MEDIA_DETAIL_PAGER_FRAGMENT_TAG) != null) {
// Means Media Details Fragment is active
ContributionListViewUtils.setIndicatorVisibility(numberOfUploads, numberOfUploadsProgressBar,false, true);
} else {
// Means Contribution List Fragment is visible to user
ContributionListViewUtils.setIndicatorVisibility(numberOfUploads, numberOfUploadsProgressBar,true, false);
}
}
public void betaSetUploadCount(int betaUploadCount) {

26
app/src/main/res/layout/fragment_contributions.xml
View file

@ -28,32 +28,6 @@
</RelativeLayout>
-->
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
>
<ProgressBar
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_margin="15dp"
android:id="@+id/progressBar"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/numOfUploads"
android:visibility="gone"
android:layout_margin="15dp"
style="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle"
android:textColor="@android:color/white"
/>
</RelativeLayout>
<FrameLayout
android:layout_width="match_parent"
android:background="#000"