From 93be2cd33a8498a9115debd7b2215680fd358a1a Mon Sep 17 00:00:00 2001
From: Aditi Bhatnagar <aditi24.bhatnagar@gmail.com>
Date: Sun, 5 Mar 2017 02:02:40 +0530
Subject: [PATCH] Adding refresh option for Nearby

---
 .../nrw/commons/nearby/NearbyActivity.java    |  25 +++++++++++++++++-
 .../res/drawable-mdpi/ic_action_refresh.png   | Bin 0 -> 856 bytes
 app/src/main/res/menu/menu_nearby.xml         |  13 +++++++++
 app/src/main/res/values/strings.xml           |   1 +
 build.gradle                                  |   2 +-
 gradle/wrapper/gradle-wrapper.properties      |   4 +--
 6 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/drawable-mdpi/ic_action_refresh.png
 create mode 100644 app/src/main/res/menu/menu_nearby.xml

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
index c94700dda..4e1c4c05c 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
@@ -9,6 +9,9 @@ import android.os.Bundle;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 
 import fr.free.nrw.commons.R;
 
@@ -40,12 +43,32 @@ public class NearbyActivity extends AppCompatActivity {
         ft.add(R.id.container, fragment);
         ft.commit();
     }
-
+    @Override
+    public boolean onCreateOptionsMenu (Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.menu_nearby, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle item selection
+        switch (item.getItemId()) {
+            case R.id.action_refresh:
+                refreshView();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
     @Override
     protected void onResume(){
         super.onResume();
     }
 
+    protected void refreshView()
+    {
+        this.recreate();
+    }
     protected LatLng getmLatestLocation() {
         return mLatestLocation;
     }
diff --git a/app/src/main/res/drawable-mdpi/ic_action_refresh.png b/app/src/main/res/drawable-mdpi/ic_action_refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f5d2558fb4aa54734d28710db340662539af976
GIT binary patch
literal 856
zcmV-e1E>6nP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!`bk7VRCwC#TTO1_Fcc1>F3ADH0n$Bm
z4+oeYpglm?m)Q>-AhQn#C<h=1X!pP#4gd!TdumHBQWV*ae_j%M;!k=~DT(X%`ThCX
z9X%e8V959t3>=;SPk<-D6W|FLGM;1~TrQWk%{>IUvcAl+?7y}EsyNl~cV`xWj0usb
z^0^>#QB*!A^5qHv3nDX+Sn%8ph&U2Ca7f82V}v#nKqvP`<ekV^@|_4|4xcFjIgveB
z$+|}1vyB9liYEwTQDr}1EK0_-w=5uu8LU!-JnopId}I>=3DT;oz#0P93MuKE$Qew!
zsQGgw5h$&50U6~_5Xkm|XO6Wrxt8?#SRsX?6R>Jfo=z;SDJL6CWCLE<mjx^!+Vijl
z(HZxz?VF(xOq7K?k&UMEv0z-0wRCO)D?xFy(lGf_`K?0H)SCrN1b)A9NqJohNCfF^
zZx~QzGDNQggq+pCYxr(GTl4}|7g%t9|5+<)oB<XAJ4YKU$^@`dPVVaJs}eBbMCoJT
zFjNSLx{lB`S^x`ImkD?>w1ATZI?$He2V-6dwguRVt4X6o#R6`O6+c@*0IPXYv_U{q
zL&GNA+ujb_gqJ@00XBi<0*9dxu;3JDm!S~wYFeDROaLv+=A7E37y<z+LAG)t2*!rK
zKj);sueM5Io)UjJ-;EoTq}%AV=HKMKr`(t^C4g3kIw!UlP337zF6BgiIv3@}jHwG0
zn#wOVSAH+3^HZJqbR7dq<y9w2)19boz6&(3%U~Rio+RBsNBJ4NGi?|*?V=xG3Rx2k
zA<Dl>5UcA>s07HaXa?3&UVdWT4R}@vs=DrkPQaOylUbMsIQM*V-JsW}3t;W@Q_Q{u
z1_3w0WHApr(N-Os09H?K18Io{vn0^J%yfg*&V!b^&uzHCredOH8!ZMhUf}0(Ls~rp
zfvul8U=UDkKK$eO=LKY2*~&(Y)$aU^0W%Heuo;nc8!HY}uv}ngQjPVAk^jfZfx{Ev
i3Gf7X0tSsA0R{j_QJq2(iHleO0000<MNUMnLSTYO18jZ(

literal 0
HcmV?d00001

diff --git a/app/src/main/res/menu/menu_nearby.xml b/app/src/main/res/menu/menu_nearby.xml
new file mode 100644
index 000000000..d6238016f
--- /dev/null
+++ b/app/src/main/res/menu/menu_nearby.xml
@@ -0,0 +1,13 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"      tools:context=".MainActivity">
+
+    <item
+        android:id="@+id/action_refresh"
+        android:title="@string/refresh_button"
+        android:icon="@drawable/ic_action_refresh"
+        android:orderInCategory="1"
+        app:showAsAction="ifRoom"
+        />
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d0b45446e..1a019de9d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,6 +49,7 @@
   <string name="menu_upload_single">Upload</string>
   <string name="categories_search_text_hint">Search categories</string>
   <string name="menu_save_categories">Save</string>
+  <string name="refresh_button">Refresh</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">No uploads yet</item>
     <item quantity="one">1 upload</item>
diff --git a/build.gradle b/build.gradle
index 85084cc75..120b5e3e3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6f96a4519..2d2717bf3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Aug 17 16:02:52 NZST 2016
+#Fri Mar 03 19:41:57 IST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip