Skip to content

Commit e589d0e

Browse files
pshmaskara
authored andcommitted
Dead/redundent code and import removal.
1 parent 8a430f6 commit e589d0e

File tree

8 files changed

+5
-202
lines changed

8 files changed

+5
-202
lines changed

app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
package fr.free.nrw.commons.nearby;
22

33
import android.content.Intent;
4-
import android.content.SharedPreferences;
54
import android.content.pm.PackageManager;
65
import android.net.Uri;
76
import android.os.Build;
87
import android.os.Bundle;
9-
import android.preference.PreferenceManager;
108
import android.support.annotation.NonNull;
119
import android.support.design.widget.BottomSheetBehavior;
12-
import android.support.design.widget.FloatingActionButton;
1310
import android.support.v4.app.Fragment;
1411
import android.support.v4.app.FragmentTransaction;
1512
import android.support.v4.widget.SwipeRefreshLayout;
1613
import android.support.v7.app.AlertDialog;
17-
import android.util.Log;
1814
import android.view.Menu;
1915
import android.view.MenuInflater;
2016
import android.view.MenuItem;
@@ -67,7 +63,6 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
6763

6864
private LatLng curLatLang;
6965
private Bundle bundle;
70-
private NearbyActivityMode viewMode;
7166
private Disposable placesDisposable;
7267
private boolean lockNearbyView; //Determines if the nearby places needs to be refreshed
7368
private BottomSheetBehavior bottomSheetBehavior; // Behavior for list bottom sheet

app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivityMode.java

Lines changed: 0 additions & 30 deletions
This file was deleted.

app/src/main/java/fr/free/nrw/commons/nearby/NearbyAdapterFactory.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package fr.free.nrw.commons.nearby;
22

3-
import android.support.annotation.NonNull;
4-
53
import com.pedrogomez.renderers.ListAdapteeCollection;
64
import com.pedrogomez.renderers.RVRendererAdapter;
75
import com.pedrogomez.renderers.RendererBuilder;
@@ -19,7 +17,7 @@ public RVRendererAdapter<Place> create(List<Place> placeList) {
1917
RendererBuilder<Place> builder = new RendererBuilder<Place>()
2018
.bind(Place.class, new PlaceRenderer());
2119
ListAdapteeCollection<Place> collection = new ListAdapteeCollection<>(
22-
placeList != null ? placeList : Collections.<Place>emptyList());
20+
placeList != null ? placeList : Collections.emptyList());
2321
return new RVRendererAdapter<>(builder, collection);
2422
}
2523
}

app/src/main/java/fr/free/nrw/commons/nearby/NearbyBaseMarker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private NearbyBaseMarker(Parcel in) {
3737
.registerTypeAdapter(Uri.class, new UriDeserializer())
3838
.create();
3939

40-
position((LatLng) in.readParcelable(LatLng.class.getClassLoader()));
40+
position(in.readParcelable(LatLng.class.getClassLoader()));
4141
snippet(in.readString());
4242
String iconId = in.readString();
4343
Bitmap iconBitmap = in.readParcelable(Bitmap.class.getClassLoader());

app/src/main/java/fr/free/nrw/commons/nearby/NearbyInfoDialog.java

Lines changed: 0 additions & 154 deletions
This file was deleted.

app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public View onCreateView(LayoutInflater inflater,
5454
Bundle savedInstanceState) {
5555
Timber.d("NearbyListFragment created");
5656
View view = inflater.inflate(R.layout.fragment_nearby, container, false);
57-
recyclerView = (RecyclerView) view.findViewById(R.id.listView);
57+
recyclerView = view.findViewById(R.id.listView);
5858
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
5959
adapterFactory = new NearbyAdapterFactory();
6060
return view;

app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,8 @@ public void onClick(View view) {
415415

416416
icon.setImageResource(place.getDescription().getIcon());
417417
description.setText(place.getDescription().getText());
418-
title.setText(place.name.toString());
419-
distance.setText(place.distance.toString());
418+
title.setText(place.name);
419+
distance.setText(place.distance);
420420
}
421421

422422
private void openWebView(Uri link) {

app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,13 @@
22

33
import android.content.Intent;
44
import android.net.Uri;
5-
import android.os.CountDownTimer;
6-
import android.support.annotation.NonNull;
75
import android.support.transition.TransitionManager;
8-
import android.support.v4.view.ViewCompat;
96
import android.support.v7.widget.PopupMenu;
107
import android.util.Log;
118
import android.view.LayoutInflater;
129
import android.view.MenuItem;
1310
import android.view.View;
1411
import android.view.ViewGroup;
15-
import android.view.ViewTreeObserver;
16-
import android.view.animation.Animation;
17-
import android.view.animation.AnimationUtils;
1812
import android.widget.ImageView;
1913
import android.widget.LinearLayout;
2014
import android.widget.TextView;

0 commit comments

Comments
 (0)