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

Fix conflicts

Browse source
This commit is contained in:
neslihanturan 2017-12-11 13:38:35 +03:00 • committed by maskara
parent df884c8f79
commit 0da8b93ebb
3 changed files with 180 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,9 +3,14 @@ package fr.free.nrw.commons.nearby;
import android.graphics.Color;
import android.net.Uri;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.design.widget.BottomSheetBehavior;
import android.support.design.widget.FloatingActionButton;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@ -32,6 +37,11 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
private MapView mapView;
private List<NearbyBaseMarker> baseMarkerOptions;
private fr.free.nrw.commons.location.LatLng curLatLng;
private View bottomSheetList;
private View bottomSheetDetails;
private BottomSheetBehavior bottomSheetListBehavior;
private BottomSheetBehavior bottomSheetDetailsBehavior;
public NearbyMapFragment() {
}
@ -40,6 +50,7 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Bundle bundle = this.getArguments();
initViews();
Gson gson = new GsonBuilder()
.registerTypeAdapter(Uri.class, new UriDeserializer())
.create();
@ -73,6 +84,16 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
return mapView;
}
private void initViews() {
bottomSheetList = getActivity().findViewById(R.id.bottom_sheet);
bottomSheetListBehavior = BottomSheetBehavior.from(bottomSheetList);
bottomSheetDetails = getActivity().findViewById(R.id.bottom_sheet_details);
bottomSheetDetailsBehavior = BottomSheetBehavior.from(bottomSheetDetails);
bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
//moreInfo = getActivity().findViewById(R.id.more_info_bar);
}
private void setupMapView(Bundle savedInstanceState) {
MapboxMapOptions options = new MapboxMapOptions()
.styleUrl(Style.OUTDOORS)