diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java index 3f94e9076..16c00a3f7 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java @@ -8,18 +8,24 @@ import android.content.Loader; import android.content.SharedPreferences; import android.database.Cursor; import android.database.DataSetObserver; +import android.graphics.PorterDuff; import android.os.Bundle; import android.support.annotation.Nullable; +import android.support.v4.content.ContextCompat; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; +import android.widget.ProgressBar; +import android.widget.TextView; import java.util.List; import javax.inject.Inject; import javax.inject.Named; +import fr.free.nrw.commons.BuildConfig; import fr.free.nrw.commons.Media; import fr.free.nrw.commons.R; import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; @@ -49,10 +55,25 @@ public class ContributionsFragment @Inject NotificationController notificationController; + public TextView numberOfUploads; + public ProgressBar numberOfUploadsProgressBar; + @Nullable @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - return super.onCreateView(inflater, container, 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(!BuildConfig.FLAVOR.equalsIgnoreCase("beta")){ + setUploadCount(); + } + + return view; } @Override diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java index c4489500b..3faf040fb 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java @@ -60,7 +60,7 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View v = inflater.inflate(R.layout.fragment_contributions, container, false); + View v = inflater.inflate(R.layout.fragment_contributions_list, container, false); ButterKnife.bind(this, v); contributionsList.setOnItemClickListener((AdapterView.OnItemClickListener) getActivity()); diff --git a/app/src/main/res/layout/fragment_contributions.xml b/app/src/main/res/layout/fragment_contributions.xml index fa53d9721..9cf4dc7b6 100644 --- a/app/src/main/res/layout/fragment_contributions.xml +++ b/app/src/main/res/layout/fragment_contributions.xml @@ -1,39 +1,64 @@ - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contributions_list.xml b/app/src/main/res/layout/fragment_contributions_list.xml new file mode 100644 index 000000000..fa53d9721 --- /dev/null +++ b/app/src/main/res/layout/fragment_contributions_list.xml @@ -0,0 +1,39 @@ + + + + + + + + + + \ No newline at end of file