Add nearby list into bottom sheeet

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

@@ -22,9 +22,10 @@ import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.contributions.ContributionController;
 import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
 import fr.free.nrw.commons.location.LatLng;
+import fr.free.nrw.commons.nearby.mvp.contract.NearbyParentFragmentContract;
 import timber.log.Timber;
 
-public class NearbyListFragment extends CommonsDaggerSupportFragment {
+public class NearbyListFragment extends CommonsDaggerSupportFragment implements NearbyParentFragmentContract.ListView {
     private Bundle bundleForUpdates; // Carry information from activity about changed nearby places and current location
 
     private static final Type LIST_TYPE = new TypeToken<List<Place>>() {
@@ -124,4 +125,8 @@ public class NearbyListFragment extends CommonsDaggerSupportFragment {
         this.bundleForUpdates = bundleForUpdates;
     }
 
+    @Override
+    public void updateListFragment(List<Place> placeList) {
+        adapterFactory.updateAdapterData(placeList, (RVRendererAdapter<Place>) recyclerView.getAdapter());
+    }
 }

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

@@ -15,6 +15,7 @@ import android.view.ViewGroup;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.Button;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
@@ -23,6 +24,7 @@ import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.FragmentTransaction;
 
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
@@ -38,6 +40,8 @@ import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.maps.Style;
 
+import java.util.List;
+
 import javax.inject.Inject;
 import javax.inject.Named;
 
@@ -138,6 +142,12 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple
     @BindView(R.id.map_progress_bar)
     ProgressBar progressBar;
 
+    @BindView(R.id.container_sheet)
+    FrameLayout frameLayout;
+
+    @BindView(R.id.loading_nearby_list)
+    ConstraintLayout loadingNearbyLayout;
+
     @Inject
     LocationServiceManager locationManager;
 
@@ -182,6 +192,11 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple
     private final double CAMERA_TARGET_SHIFT_FACTOR_PORTRAIT = 0.06;
     private final double CAMERA_TARGET_SHIFT_FACTOR_LANDSCAPE = 0.04;
 
+    private com.mapbox.mapboxsdk.maps.SupportMapFragment nearbyMapFragment;
+    private fr.free.nrw.commons.nearby.NearbyListFragment nearbyListFragment;
+    private static final String TAG_RETAINED_MAP_FRAGMENT = com.mapbox.mapboxsdk.maps.SupportMapFragment.class.getSimpleName();
+    private static final String TAG_RETAINED_LIST_FRAGMENT = NearbyListFragment.class.getSimpleName();
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -195,12 +210,14 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        //initViews();
         setMapFragment(savedInstanceState);
+        setListFragment(savedInstanceState);
     }
 
     public void initViews() {
         Timber.d("init views called");
-        ButterKnife.bind(this, view);
+        //ButterKnife.bind(this, view);
         bottomSheetListBehavior = BottomSheetBehavior.from(bottomSheetList);
         bottomSheetDetailsBehavior = BottomSheetBehavior.from(bottomSheetDetails);
         bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
@@ -282,6 +299,7 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple
                 bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
             }
         });
+
     }
 
     public void setMapFragment(Bundle savedInstanceState) {
@@ -313,10 +331,10 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple
 
             // Add map fragment to parent container
             getChildFragmentManager().executePendingTransactions();
-            transaction.add(R.id.container, mapFragment, "com.mapbox.map");
+            transaction.add(R.id.container, mapFragment, TAG_RETAINED_MAP_FRAGMENT);
             transaction.commit();
         } else {
-            mapFragment = (SupportMapFragment) getChildFragmentManager().findFragmentByTag("com.mapbox.map");
+            mapFragment = (SupportMapFragment) getChildFragmentManager().findFragmentByTag(TAG_RETAINED_MAP_FRAGMENT);
         }
 
         mapFragment.getMapAsync(new OnMapReadyCallback() {
@@ -337,6 +355,31 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple
         });
     }
 
+    void setListFragment(Bundle savedInstanceState) {
+        if (savedInstanceState == null) {
+            loadingNearbyLayout.setVisibility(View.GONE);
+            frameLayout.setVisibility(View.VISIBLE);
+            FragmentTransaction fragmentTransaction = getChildFragmentManager().beginTransaction();
+            nearbyListFragment = new NearbyListFragment();
+            nearbyListFragment.setArguments(savedInstanceState);
+            fragmentTransaction.replace(R.id.container_sheet, nearbyListFragment, TAG_RETAINED_LIST_FRAGMENT);
+            // initBottomSheetBehaviour();
+            //bottomSheetListBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+            fragmentTransaction.commitAllowingStateLoss();
+        } else {
+            nearbyListFragment = (NearbyListFragment) getChildFragmentManager().findFragmentByTag(TAG_RETAINED_LIST_FRAGMENT);
+        }
+    }
+
+    /**
+     * Updates nearby list for custom location, will be used with search this area method. When you
+     * want to search for a place where you are not at.
+     * @param placeList List of places around your manually chosen target location from map.
+     */
+    private void updateListFragmentForCustomLocation(List<Place> placeList) {
+        nearbyListFragment.updateNearbyListSignificantlyForCustomLocation(placeList);
+    }
+
     /**
      * Thanks to this method we make sure NearbyMapFragment is ready and attached. So that we can
      * prevent NPE caused by null child fragment. This method is called from child fragment when
@@ -346,7 +389,7 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple
 
         Log.d("denemeTest","this:"+this+", location manager is:"+locationManager);
         nearbyParentFragmentPresenter = new NearbyParentFragmentPresenter
-                (this, mapFragment, locationManager);
+                (nearbyListFragment,this, mapFragment, locationManager);
         Timber.d("Child fragment attached");
         nearbyParentFragmentPresenter.nearbyFragmentsAreReady();
         initViews();

app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyParentFragmentContract.java

@@ -5,9 +5,12 @@ import android.view.View;
 import com.mapbox.mapboxsdk.annotations.Marker;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 
+import java.util.List;
+
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.location.LatLng;
 import fr.free.nrw.commons.location.LocationServiceManager;
+import fr.free.nrw.commons.nearby.Place;
 
 public interface NearbyParentFragmentContract {
 
@@ -41,6 +44,10 @@ public interface NearbyParentFragmentContract {
         void setBottomSheetDetailsSmaller();
     }
 
+    interface ListView {
+        void updateListFragment(List<Place> placeList);
+    }
+
     interface UserActions {
         void displayListFragmentExpanded();
         void onTabSelected();

app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyParentFragment.java

@@ -162,7 +162,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
      */
     public void childMapFragmentAttached() {
         nearbyParentFragmentPresenter = new NearbyParentFragmentPresenter
-                                (this, null, locationManager);
+                                (null,this, null, locationManager);
         Timber.d("Child fragment attached");
     }
 

app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyParentFragmentPresenter.java

@@ -32,6 +32,7 @@ public class NearbyParentFragmentPresenter
 
     private NearbyParentFragmentContract.View nearbyParentFragmentView;
     private NearbyMapContract.View nearbyMapFragmentView;
+    private NearbyParentFragmentContract.ListView nearbyListFragmentView;
     private boolean isNearbyLocked;
     private LatLng curLatLng;
 
@@ -45,9 +46,11 @@ public class NearbyParentFragmentPresenter
 
     private LocationServiceManager locationServiceManager;
 
-    public NearbyParentFragmentPresenter(NearbyParentFragmentContract.View nearbyParentFragmentView,
+    public NearbyParentFragmentPresenter(NearbyParentFragmentContract.ListView nearbyListFragmentView,
+                                         NearbyParentFragmentContract.View nearbyParentFragmentView,
                                          NearbyMapContract.View nearbyMapFragmentView,
                                          LocationServiceManager locationServiceManager) {
+        this.nearbyListFragmentView = nearbyListFragmentView;
         this.nearbyParentFragmentView = nearbyParentFragmentView;
         this.nearbyMapFragmentView = nearbyMapFragmentView;
         this.nearbyMapFragmentView.viewsAreAssignedToPresenter(this);
@@ -308,6 +311,7 @@ public class NearbyParentFragmentPresenter
         nearbyMapFragmentView.updateMapToTrackPosition(nearbyPlacesInfo.curLatLng);
         lockUnlockNearby(false); // So that new location updates wont come
         nearbyParentFragmentView.setProgressBarVisibility(false);
+        nearbyListFragmentView.updateListFragment(nearbyPlacesInfo.placeList);
     }
 
     /**
@@ -320,6 +324,7 @@ public class NearbyParentFragmentPresenter
         nearbyMapFragmentView.addCurrentLocationMarker(nearbyPlacesInfo.curLatLng);
         lockUnlockNearby(false); // So that new location updates wont come
         nearbyParentFragmentView.setProgressBarVisibility(false);
+        nearbyListFragmentView.updateListFragment(nearbyPlacesInfo.placeList);
 
     }