Merge pull request #1 from commons-app/main

Update1

Author: Adith101

app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt

@@ -182,11 +182,11 @@ class LoginActivity : AccountAuthenticatorActivity() {
 
     override fun onSaveInstanceState(outState: Bundle) {
         // if progressDialog is visible during the configuration change  then store state as  true else false so that
-        // we maintain visibility of progressDailog after configuration change
+        // we maintain visibility of progressDialog after configuration change
         if (progressDialog != null && progressDialog!!.isShowing) {
-            outState.putBoolean(saveProgressDailog, true)
+            outState.putBoolean(saveProgressDialog, true)
         } else {
-            outState.putBoolean(saveProgressDailog, false)
+            outState.putBoolean(saveProgressDialog, false)
         }
         outState.putString(
             saveErrorMessage,
@@ -206,7 +206,7 @@ class LoginActivity : AccountAuthenticatorActivity() {
         super.onRestoreInstanceState(savedInstanceState)
         binding!!.loginUsername.setText(savedInstanceState.getString(saveUsername))
         binding!!.loginPassword.setText(savedInstanceState.getString(savePassword))
-        if (savedInstanceState.getBoolean(saveProgressDailog)) {
+        if (savedInstanceState.getBoolean(saveProgressDialog)) {
             performLogin()
         }
         val errorMessage = savedInstanceState.getString(saveErrorMessage)
@@ -396,7 +396,7 @@ class LoginActivity : AccountAuthenticatorActivity() {
         fun startYourself(context: Context) =
             context.startActivity(Intent(context, LoginActivity::class.java))
 
-        const val saveProgressDailog: String = "ProgressDailog_state"
+        const val saveProgressDialog: String = "ProgressDialog_state"
         const val saveErrorMessage: String = "errorMessage"
         const val saveUsername: String = "username"
         const val savePassword: String = "password"

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

@@ -20,4 +20,8 @@ public Place getPlace() {
     public boolean getIsBookmarked() {
         return isBookmarked;
     }
+
+    public void setIsBookmarked(boolean isBookmarked) {
+        this.isBookmarked = isBookmarked;
+    }
 }

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

@@ -23,8 +23,8 @@
 
 public class NearbyController extends MapController {
 
-    private static final int MAX_RESULTS = 1000;
     private final NearbyPlaces nearbyPlaces;
+    public static final int MAX_RESULTS = 1000;
     public static double currentLocationSearchRadius = 10.0; //in kilometers
     public static LatLng currentLocation; // Users latest fetched location
     public static LatLng latestSearchLocation; // Can be current and camera target on search this area button is used

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

@@ -2,11 +2,13 @@
 
 import android.content.Context;
 import androidx.annotation.Nullable;
+import androidx.lifecycle.LifecycleCoroutineScope;
 import fr.free.nrw.commons.BaseMarker;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.location.LatLng;
 import fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType;
 import fr.free.nrw.commons.nearby.Label;
+import fr.free.nrw.commons.nearby.MarkerPlaceGroup;
 import fr.free.nrw.commons.nearby.Place;
 import java.util.List;
 
@@ -68,7 +70,7 @@ interface View {
 
         Context getContext();
 
-        void updateMapMarkers(List<BaseMarker> BaseMarkers);
+        void replaceMarkerOverlays(List<MarkerPlaceGroup> markerPlaceGroups);
 
         void filterOutAllMarkers();
 
@@ -127,5 +129,7 @@ void filterByMarkerType(List<Label> selectedLabels, int state, boolean filterFor
         void setCheckboxUnknown();
 
         void setAdvancedQuery(String query);
+
+        void toggleBookmarkedStatus(Place place);
     }
 }