From 7d162b6f579618851e36b2e6664704ea95d234a6 Mon Sep 17 00:00:00 2001
From: XinyuYang <Xinyu.Yang2@anu.edu.au>
Date: Fri, 17 Oct 2025 11:31:33 +1100
Subject: [PATCH] fix#6482 placeholder:now placeholder is visible

---
 .../nearby/fragments/NearbyParentFragment.kt   | 18 +++++++++++++-----
 .../res/layout/filter_search_view_layout.xml   |  4 ++++
 app/src/main/res/values/styles.xml             |  1 +
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.kt b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.kt
index 3e6e71511..8e9530283 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.kt
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.kt
@@ -31,6 +31,7 @@ import android.view.ViewGroup
 import android.view.animation.Animation
 import android.view.animation.AnimationUtils
 import android.widget.Toast
+import android.widget.EditText
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
@@ -881,11 +882,18 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
     fun initNearbyFilter() {
         binding!!.nearbyFilterList.root.visibility = View.GONE
         hideBottomSheet()
-        binding!!.nearbyFilter.searchViewLayout.searchView.apply {
-            setIconifiedByDefault(false)
-            isIconified = false
-            setQuery("", false)
-            clearFocus()
+        // Force set the hint text and ensure it's visible
+        binding!!.nearbyFilter.searchViewLayout.searchView.queryHint = getString(R.string.nearby_search_hint)
+        binding!!.nearbyFilter.searchViewLayout.searchView.setIconifiedByDefault(false)
+        binding!!.nearbyFilter.searchViewLayout.searchView.clearFocus()
+
+        // Try to access the internal EditText and set hint directly
+        try {
+            val searchEditText = binding!!.nearbyFilter.searchViewLayout.searchView.findViewById<EditText>(androidx.appcompat.R.id.search_src_text)
+            searchEditText?.hint = getString(R.string.nearby_search_hint)
+            searchEditText?.setHintTextColor(ContextCompat.getColor(requireContext(), R.color.white))
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to set hint on SearchView EditText")
         }
         binding!!.nearbyFilter.searchViewLayout.searchView.setOnQueryTextFocusChangeListener { v, hasFocus ->
             setLayoutHeightAlignedToWidth(
diff --git a/app/src/main/res/layout/filter_search_view_layout.xml b/app/src/main/res/layout/filter_search_view_layout.xml
index aa2672777..d9baf3749 100644
--- a/app/src/main/res/layout/filter_search_view_layout.xml
+++ b/app/src/main/res/layout/filter_search_view_layout.xml
@@ -18,8 +18,12 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:tint="@color/white"
+        android:textColorHint="@color/white"
         android:queryHint="@string/nearby_search_hint"
         android:searchIcon="@drawable/ic_search_white_24dp"
+        android:iconifiedByDefault="false"
+        android:queryBackground="@android:color/transparent"
+        app:searchIcon="@drawable/ic_search_white_24dp"
         app:theme="@style/WhiteSearchBarTheme"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index cdc8ce387..6f15c2424 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -148,6 +148,7 @@
 
     <style name="WhiteSearchBarTheme" parent="DarkAppTheme">
         <item name="colorControlActivated">@android:color/white</item>
+        <item name="colorControlNormal">@android:color/white</item>
     </style>
 
     <style name="DarkSpinnerTheme" parent="DarkAppTheme">