From 4f06542d73142b71208e7f1fd4f94a0d5e656273 Mon Sep 17 00:00:00 2001
From: Hanna Truong <u7735208@anu.edu.au>
Date: Tue, 22 Oct 2024 00:01:03 +1100
Subject: [PATCH 1/5] UI design for legend to explain the colors of the nearby
 pins

---
 .../res/layout/fragment_nearby_parent.xml     | 27 +++++++
 app/src/main/res/layout/nearby_legend.xml     | 74 +++++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 app/src/main/res/layout/nearby_legend.xml

diff --git a/app/src/main/res/layout/fragment_nearby_parent.xml b/app/src/main/res/layout/fragment_nearby_parent.xml
index e5002fe115..e1d82e6e74 100644
--- a/app/src/main/res/layout/fragment_nearby_parent.xml
+++ b/app/src/main/res/layout/fragment_nearby_parent.xml
@@ -124,6 +124,33 @@
           app:srcCompat="@drawable/ic_my_location_black_24dp"
           app:useCompatPadding="true" />
 
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+          android:id="@+id/fab_legend"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_below="@id/fab_recenter"
+          android:layout_alignParentEnd="true"
+          android:layout_alignParentRight="true"
+          android:clickable="true"
+          android:visibility="visible"
+          app:backgroundTint="@color/main_background_light"
+          app:elevation="@dimen/dimen_6"
+          app:fabSize="normal"
+          app:layout_anchorGravity="top|right|end"
+          app:srcCompat="@drawable/ic_info_outline_24dp"
+          app:useCompatPadding="true" />
+
+        <include
+          android:id="@+id/nearby_legend_layout"
+          layout="@layout/nearby_legend"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_below="@id/rl_container_wlm_month_message"
+          android:visibility="gone"
+          android:layout_marginTop="30dp"
+          android:layout_marginStart="5dp"
+          />
+
       </RelativeLayout>
 
       <FrameLayout
diff --git a/app/src/main/res/layout/nearby_legend.xml b/app/src/main/res/layout/nearby_legend.xml
new file mode 100644
index 0000000000..384bbbfd64
--- /dev/null
+++ b/app/src/main/res/layout/nearby_legend.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="wrap_content"
+  android:layout_height="wrap_content"
+  android:background="#BFFFFFFF"
+  android:orientation="vertical">
+
+  <ImageView
+    android:id="@+id/imageRed"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="0dp"
+    app:layout_constraintBottom_toTopOf="@+id/imageGreen"
+    app:layout_constraintEnd_toEndOf="@+id/imageGreen"
+    app:layout_constraintStart_toStartOf="@+id/imageGreen"
+    app:srcCompat="@drawable/ic_custom_map_marker_red" />
+
+  <TextView
+    android:id="@+id/textRed"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="0dp"
+    android:text="There is a Wikidata item here with no picture yet."
+    android:textColor="#F74D4D"
+    android:textSize="12sp"
+    app:layout_constraintBottom_toBottomOf="@+id/imageRed"
+    app:layout_constraintStart_toEndOf="@+id/imageRed"
+    app:layout_constraintTop_toTopOf="@+id/imageRed" />
+
+  <ImageView
+    android:id="@+id/imageGreen"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="0dp"
+    app:layout_constraintBottom_toTopOf="@+id/imageGrey"
+    app:layout_constraintEnd_toEndOf="@+id/imageGrey"
+    app:layout_constraintStart_toStartOf="@+id/imageGrey"
+    app:srcCompat="@drawable/ic_custom_map_marker_green" />
+
+  <TextView
+    android:id="@+id/textGreen"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="0dp"
+    android:text="There is a Wikidata item with a picture here."
+    android:textColor="#1F7123"
+    android:textSize="12sp"
+    app:layout_constraintBottom_toBottomOf="@+id/imageGreen"
+    app:layout_constraintStart_toEndOf="@+id/imageGreen"
+    app:layout_constraintTop_toTopOf="@+id/imageGreen" />
+
+  <ImageView
+    android:id="@+id/imageGrey"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="0dp"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:srcCompat="@drawable/ic_custom_map_marker_grey" />
+
+  <TextView
+    android:id="@+id/textGrey"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="The app is checking if the Wikidata item here has a picture."
+    android:textColor="#454547"
+    android:textSize="12sp"
+    app:layout_constraintBottom_toBottomOf="@+id/imageGrey"
+    app:layout_constraintStart_toEndOf="@+id/imageGrey"
+    app:layout_constraintTop_toTopOf="@+id/imageGrey" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

From 9816ba17f8f3e3ac7d180518b2104b9d97fcbd12 Mon Sep 17 00:00:00 2001
From: Hanna Truong <u7735208@anu.edu.au>
Date: Tue, 22 Oct 2024 00:09:55 +1100
Subject: [PATCH 2/5] Add listener for the button to toggle the visibility of
 the legend (make it hideable)

---
 .../nearby/fragments/NearbyParentFragment.java    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

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 8a3c0c330e..f578afc259 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
@@ -43,6 +43,7 @@
 import android.view.ViewGroup.LayoutParams;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
+import android.widget.Button;
 import android.widget.Toast;
 import androidx.activity.result.ActivityResultCallback;
 import androidx.activity.result.ActivityResultLauncher;
@@ -52,6 +53,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog.Builder;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
@@ -218,6 +220,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
     private LatLng updatedLatLng;
     private boolean searchable;
 
+    private ConstraintLayout nearbyLegend;
+
     private GridLayoutManager gridLayoutManager;
     private List<BottomSheetItem> dataList;
     private BottomSheetAdapter bottomSheetAdapter;
@@ -302,6 +306,7 @@ public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup
         progressDialog.setCancelable(false);
         progressDialog.setMessage("Saving in progress...");
         setHasOptionsMenu(true);
+
         // Inflate the layout for this fragment
         return view;
 
@@ -362,6 +367,16 @@ public void onViewCreated(@NonNull final View view, @Nullable final Bundle saved
         }
         locationPermissionsHelper = new LocationPermissionsHelper(getActivity(), locationManager,
             this);
+
+        // Set up the floating activity button to toggle the visibility of the legend
+        binding.fabLegend.setOnClickListener(v -> {
+            if (binding.nearbyLegendLayout.getRoot().getVisibility() == View.VISIBLE) {
+                binding.nearbyLegendLayout.getRoot().setVisibility(View.GONE);
+            } else {
+                binding.nearbyLegendLayout.getRoot().setVisibility(View.VISIBLE);
+            }
+        });
+
         presenter.attachView(this);
         isPermissionDenied = false;
         recenterToUserLocation = false;

From c1a719a5e133d7276a47ebeb26113dbd2cfae1e0 Mon Sep 17 00:00:00 2001
From: Hanna Truong <u7735208@anu.edu.au>
Date: Tue, 22 Oct 2024 15:31:17 +1100
Subject: [PATCH 3/5] Change wording for legend and make text localizable

---
 app/src/main/res/layout/nearby_legend.xml | 6 +++---
 app/src/main/res/values/strings.xml       | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/nearby_legend.xml b/app/src/main/res/layout/nearby_legend.xml
index 384bbbfd64..6ef7fca734 100644
--- a/app/src/main/res/layout/nearby_legend.xml
+++ b/app/src/main/res/layout/nearby_legend.xml
@@ -22,7 +22,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="0dp"
-    android:text="There is a Wikidata item here with no picture yet."
+    android:text="@string/red_pin"
     android:textColor="#F74D4D"
     android:textSize="12sp"
     app:layout_constraintBottom_toBottomOf="@+id/imageRed"
@@ -44,7 +44,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="0dp"
-    android:text="There is a Wikidata item with a picture here."
+    android:text="@string/green_prin"
     android:textColor="#1F7123"
     android:textSize="12sp"
     app:layout_constraintBottom_toBottomOf="@+id/imageGreen"
@@ -64,7 +64,7 @@
     android:id="@+id/textGrey"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="The app is checking if the Wikidata item here has a picture."
+    android:text="@string/grey_pin"
     android:textColor="#454547"
     android:textSize="12sp"
     app:layout_constraintBottom_toBottomOf="@+id/imageGrey"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b5c2dc5293..0672e165a7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -832,4 +832,7 @@ Upload your first media by tapping on the add button.</string>
   <string name="pending">Pending</string>
   <string name="failed">Failed</string>
   <string name="could_not_load_place_data">Could not load place data</string>
+  <string name="red_pin">This place has no picture yet, go take one!</string>
+  <string name="green_prin">This place has a picture already.</string>
+  <string name="grey_pin">Now checking whether this place has a picture.</string>
 </resources>

From a1633ff95089598f3b5358fe83373f04a790a1b2 Mon Sep 17 00:00:00 2001
From: Nicolas Raoul <nicolas.raoul@gmail.com>
Date: Tue, 22 Oct 2024 21:26:29 +0900
Subject: [PATCH 4/5] Fixed typo

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0672e165a7..f9de8e0513 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -833,6 +833,6 @@ Upload your first media by tapping on the add button.</string>
   <string name="failed">Failed</string>
   <string name="could_not_load_place_data">Could not load place data</string>
   <string name="red_pin">This place has no picture yet, go take one!</string>
-  <string name="green_prin">This place has a picture already.</string>
+  <string name="green_pin">This place has a picture already.</string>
   <string name="grey_pin">Now checking whether this place has a picture.</string>
 </resources>

From d876390a3e41317181938b1b7d2464b8add80879 Mon Sep 17 00:00:00 2001
From: Nicolas Raoul <nicolas.raoul@gmail.com>
Date: Tue, 22 Oct 2024 21:26:56 +0900
Subject: [PATCH 5/5] Fixed typo

---
 app/src/main/res/layout/nearby_legend.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/nearby_legend.xml b/app/src/main/res/layout/nearby_legend.xml
index 6ef7fca734..36bfab295c 100644
--- a/app/src/main/res/layout/nearby_legend.xml
+++ b/app/src/main/res/layout/nearby_legend.xml
@@ -44,7 +44,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="0dp"
-    android:text="@string/green_prin"
+    android:text="@string/green_pin"
     android:textColor="#1F7123"
     android:textSize="12sp"
     app:layout_constraintBottom_toBottomOf="@+id/imageGreen"