From c140d3c34a3348e441e7e1da7b243d74fbce00e3 Mon Sep 17 00:00:00 2001 From: neslihanturan Date: Wed, 7 Mar 2018 22:57:41 +0300 Subject: [PATCH 1/3] Remove swipe to refresh --- .../java/fr/free/nrw/commons/nearby/NearbyActivity.java | 9 --------- app/src/main/res/layout/activity_nearby.xml | 9 --------- 2 files changed, 18 deletions(-) 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 60f56241a2..25f2b5576b 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 @@ -70,7 +70,6 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp private NearbyMapFragment nearbyMapFragment; private static final String TAG_RETAINED_FRAGMENT = "RetainedFragment"; - @BindView(R.id.swipe_container) SwipeRefreshLayout swipeLayout; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -81,13 +80,6 @@ protected void onCreate(Bundle savedInstanceState) { initBottomSheetBehaviour(); initDrawer(); - swipeLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { - @Override - public void onRefresh() { - lockNearbyView(false); - refreshView(true); - } - }); } private void resumeFragment() { @@ -357,7 +349,6 @@ private void populatePlaces(List placeList) { setListFragment(); hideProgressBar(); - swipeLayout.setRefreshing(false); } private void lockNearbyView(boolean lock) { diff --git a/app/src/main/res/layout/activity_nearby.xml b/app/src/main/res/layout/activity_nearby.xml index acad6f19ea..20f2522a04 100644 --- a/app/src/main/res/layout/activity_nearby.xml +++ b/app/src/main/res/layout/activity_nearby.xml @@ -30,15 +30,6 @@ android:id="@+id/progressBar" android:layout_width="match_parent" android:layout_height="wrap_content" /> - - - Date: Wed, 7 Mar 2018 23:08:18 +0300 Subject: [PATCH 2/3] Remove refresh button and its actions --- .../nrw/commons/nearby/NearbyActivity.java | 21 +++++++------------ app/src/main/res/menu/menu_nearby.xml | 8 ------- 2 files changed, 7 insertions(+), 22 deletions(-) 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 25f2b5576b..0310fb2870 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 @@ -134,10 +134,6 @@ public boolean onCreateOptionsMenu(Menu menu) { public boolean onOptionsItemSelected(MenuItem item) { // Handle item selection switch (item.getItemId()) { - case R.id.action_refresh: - lockNearbyView(false); - refreshView(true); - return true; case R.id.action_display_list: bottomSheetBehaviorForDetails.setState(BottomSheetBehavior.STATE_HIDDEN); bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED); @@ -158,7 +154,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis switch (requestCode) { case LOCATION_REQUEST: { if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { - refreshView(false); + refreshView(); } else { //If permission not granted, go to page that says Nearby Places cannot be displayed hideProgressBar(); @@ -213,7 +209,7 @@ private void checkGps() { private void checkLocationPermission() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { if (locationManager.isLocationPermissionGranted()) { - refreshView(false); + refreshView(); } else { // Should we show an explanation? if (locationManager.isPermissionExplanationRequired(this)) { @@ -239,7 +235,7 @@ private void checkLocationPermission() { } } } else { - refreshView(false); + refreshView(); } } @@ -248,7 +244,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); if (requestCode == 1) { Timber.d("User is back from Settings page"); - refreshView(false); + refreshView(); } } @@ -298,18 +294,15 @@ public void onPause() { /** * This method should be the single point to load/refresh nearby places * - * @param isHardRefresh Should display a toast if the location hasn't changed */ - private void refreshView(boolean isHardRefresh) { + private void refreshView() { if (lockNearbyView) { return; } locationManager.registerLocationManager(); LatLng lastLocation = locationManager.getLastLocation(); if (curLatLang != null && curLatLang.equals(lastLocation)) { //refresh view only if location has changed - if (isHardRefresh) { - ViewUtil.showLongToast(this, R.string.nearby_location_has_not_changed); - } + return; } curLatLang = lastLocation; @@ -394,7 +387,7 @@ private void setListFragment() { @Override public void onLocationChanged(LatLng latLng) { - refreshView(false); + refreshView(); } public void prepareViewsForSheetPosition(int bottomSheetState) { diff --git a/app/src/main/res/menu/menu_nearby.xml b/app/src/main/res/menu/menu_nearby.xml index 383d28b609..3be3fed1e5 100644 --- a/app/src/main/res/menu/menu_nearby.xml +++ b/app/src/main/res/menu/menu_nearby.xml @@ -10,12 +10,4 @@ app:showAsAction="ifRoom" /> - - \ No newline at end of file From c9fdeeb1fe80acf6e927e96057bc85031f9ed056 Mon Sep 17 00:00:00 2001 From: neslihanturan Date: Wed, 7 Mar 2018 23:32:24 +0300 Subject: [PATCH 3/3] Add accidentally reverted part --- app/src/main/res/layout/activity_nearby.xml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/layout/activity_nearby.xml b/app/src/main/res/layout/activity_nearby.xml index 20f2522a04..a963636c01 100644 --- a/app/src/main/res/layout/activity_nearby.xml +++ b/app/src/main/res/layout/activity_nearby.xml @@ -26,10 +26,16 @@ android:layout_below="@id/toolbar" android:gravity="center_vertical" android:orientation="horizontal"> - + + + +