Merge remote-tracking branch 'refs/remotes/origin/2.7.x-release'

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

@@ -144,7 +144,6 @@ public  class       ContributionsActivity
         if(!BuildConfig.FLAVOR.equalsIgnoreCase("beta")){
             setUploadCount();
         }
-
     }
 
     @Override

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java

@@ -7,6 +7,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
+import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -47,6 +48,8 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment {
     TextView waitingMessage;
     @BindView(R.id.loadingContributionsProgressBar)
     ProgressBar progressBar;
+    @BindView(R.id.swipeRefreshLayout)
+    SwipeRefreshLayout swipeRefreshLayout;
 
     @Inject
     @Named("prefs")
@@ -64,6 +67,13 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment {
         ButterKnife.bind(this, v);
 
         contributionsList.setOnItemClickListener((AdapterView.OnItemClickListener) getActivity());
+        swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                ((ContributionsListAdapter)contributionsList.getAdapter()).notifyDataSetChanged();
+                swipeRefreshLayout.setRefreshing(false);
+            }
+        });
         if (savedInstanceState != null) {
             Timber.d("Scrolling to %d", savedInstanceState.getInt("grid-position"));
             contributionsList.setSelection(savedInstanceState.getInt("grid-position"));

app/src/main/res/layout/fragment_contributions.xml

@@ -24,6 +24,11 @@
         android:id="@+id/loadingContributionsProgressBar"
         />
 
+    <android.support.v4.widget.SwipeRefreshLayout
+        android:id="@+id/swipeRefreshLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
     <GridView
         android:id="@+id/contributionsList"
         android:layout_height="match_parent"
@@ -35,5 +40,5 @@
         android:fadingEdge="none"
         android:fastScrollEnabled="true"
         />
-
+    </android.support.v4.widget.SwipeRefreshLayout>
 </RelativeLayout>