Skip to content

nearby: show placeholder in Nearby SearchView (Fixes #6482) #6523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

nearby: show placeholder in Nearby SearchView (Fixes #6482) #6523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/layout/filter_search_view_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
1 change: 1 addition & 0 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down