Skip to content

fix: Text overlapping in search fragment #651

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

Merged
merged 1 commit into from
Dec 8, 2018
Merged

fix: Text overlapping in search fragment #651

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
11 changes: 9 additions & 2 deletions app/src/main/java/org/fossasia/openevent/general/search/SearchFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ class SearchFragment : Fragment() {
it?.let { showNoInternetError(it) }
})

searchViewModel.isSearched.observe(this, Observer {
it?.let { showSearchLayout(!it) }
})

rootView.timeTextView.setOnClickListener {
val intent = Intent(activity, SearchTimeActivity::class.java)
startActivity(intent)
Expand Down Expand Up @@ -135,8 +139,6 @@ class SearchFragment : Fragment() {
override fun onQueryTextSubmit(query: String): Boolean {
// Do your search
searchViewModel.searchEvent = query
rootView.searchLinearLayout.visibility = View.GONE
rootView.fabSearch.visibility = View.GONE
if (searchViewModel.savedLocation != null && TextUtils.isEmpty(rootView.locationTextView.text.toString()) && rootView.timeTextView.text == "Anytime")
searchViewModel.loadEvents(searchViewModel.savedLocation.nullToEmpty(), searchViewModel.savedDate.nullToEmpty())
else
Expand All @@ -159,6 +161,11 @@ class SearchFragment : Fragment() {
super.onPrepareOptionsMenu(menu)
}

private fun showSearchLayout(show: Boolean) {
rootView.searchLinearLayout.visibility = if (show) View.VISIBLE else View.GONE
rootView.fabSearch.visibility = if (show) View.VISIBLE else View.GONE
}

fun handleVisibility(events: List<Event>) {
rootView.noSearchResults.visibility = if (events.isEmpty()) View.VISIBLE else View.GONE
}
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/org/fossasia/openevent/general/search/SearchViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,14 @@ class SearchViewModel(private val eventService: EventService, private val prefer
val events = MutableLiveData<List<Event>>()
val error = MutableLiveData<String>()
val showNoInternetError = MutableLiveData<Boolean>()
val isSearched = MutableLiveData<Boolean>()
var searchEvent: String? = null
val savedLocation by lazy { preference.getString(tokenKey) }
val savedDate by lazy { preference.getString(tokenKeyDate) }
val savedNextDate by lazy { preference.getString(tokenKeyNextDate) }

fun loadEvents(location: String, time: String) {
isSearched.value = true
if (!isConnected()) return
preference.putString(tokenKey, location)
val query: String = if (TextUtils.isEmpty(location))
Expand Down