diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyMapFragment.java index bcd157c69..3527148d1 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyMapFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyMapFragment.java @@ -385,16 +385,11 @@ public class NearbyMapFragment extends CommonsDaggerSupportFragment , Marker selectedMarker , NearbyParentFragmentPresenter nearbyParentFragmentPresenter) { List markers = mapboxMap.addMarkers(baseMarkerList); - Log.d("deneme66","markers:"+markers.get(0).getTitle()+", baseMarkers:"+baseMarkerList.get(0).getPlace().getName()); - Log.d("deneme66","markers:"+markers.get(1).getTitle()+", baseMarkers:"+baseMarkerList.get(1).getPlace().getName()); - - //NearbyController.markerLabelList = new HashMap(); NearbyController.markerExistsMap = new HashMap(); NearbyController.markerNeedPicMap = new HashMap(); for (int i = 0; i < baseMarkerList.size(); i++) { - // An example item: - //NearbyController.markerLabelList.put(baseMarkerList.get(i).getPlace().getLabel().toString(), markers.get(i)); + NearbyBaseMarker nearbyBaseMarker = baseMarkerList.get(i); NearbyController.markerLabelList.add( new MarkerPlaceGroup(markers.get(i), bookmarkLocationDao.findBookmarkLocation(baseMarkerList.get(i).getPlace()), nearbyBaseMarker.getPlace())); diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java index 3826a620a..dec848782 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java @@ -202,11 +202,9 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment searchView.setOnQueryTextFocusChangeListener((v, hasFocus) -> { if (hasFocus) { - //Log.d("deneme33","11-"+recyclerView.getAdapter().getCount()); nearbyParentFragmentPresenter.searchViewGainedFocus(); nearbyFilterList.setVisibility(View.VISIBLE); } else { - // Log.d("deneme33","22-"+recyclerView.getAdapter().getCount()); nearbyFilterList.setVisibility(View.GONE); } }); @@ -224,10 +222,6 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment nearbyFilterList.getLayoutParams().width = (int) LayoutUtils.getScreenWidth(getActivity(), 0.75); recyclerView.setAdapter(nearbyFilterSearchRecyclerViewAdapter); LayoutUtils.setLayoutHeightAllignedToWidth(1, nearbyFilterList); - /*recyclerView.setOnItemClickListener((parent, view, position, id) -> { - Log.d("deneme33","item clicked:"+ nearbyFilterSearchRecyclerViewAdapter.get(position).toString()); - nearbyParentFragmentPresenter.filterByMarkerType(nearbyFilterSearchRecyclerViewAdapter.getItem(position).toString()); - });*/ compositeDisposable.add(RxSearchView.queryTextChanges(searchView) .takeUntil(RxView.detaches(searchView)) diff --git a/app/src/main/java/fr/free/nrw/commons/utils/LayoutUtils.java b/app/src/main/java/fr/free/nrw/commons/utils/LayoutUtils.java index f37944310..f5f2a76b8 100644 --- a/app/src/main/java/fr/free/nrw/commons/utils/LayoutUtils.java +++ b/app/src/main/java/fr/free/nrw/commons/utils/LayoutUtils.java @@ -25,7 +25,6 @@ public class LayoutUtils { public void onGlobalLayout() { view.getViewTreeObserver().removeOnGlobalLayoutListener(this); ViewGroup.LayoutParams layoutParams = view.getLayoutParams(); - Log.d("deneme7","heig:"+layoutParams.height+"weig:"+view.getWidth() * rate); layoutParams.height = (int) (view.getWidth() * rate); view.setLayoutParams(layoutParams); }