mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 12:23:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Code cleanup

Browse source
This commit is contained in:
neslihanturan 2019-10-17 11:02:54 +03:00
parent c5deba8b0b
commit cf8f64f3cb
3 changed files with 1 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyMapFragment.java
View file

@ -385,16 +385,11 @@ public class NearbyMapFragment extends CommonsDaggerSupportFragment
, Marker selectedMarker
, NearbyParentFragmentPresenter nearbyParentFragmentPresenter) {
List<Marker> 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<String, MarkerPlaceGroup>();
NearbyController.markerExistsMap = new HashMap<Boolean, Marker>();
NearbyController.markerNeedPicMap = new HashMap<Boolean, Marker>();
for (int i = 0; i < baseMarkerList.size(); i++) {
// An example item: <Park, marker of that park>
//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()));

6
app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java
View file

@ -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))

1
app/src/main/java/fr/free/nrw/commons/utils/LayoutUtils.java
View file

@ -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);
}