Merge branch 'SimpleMobileTools:master' into rewrite_sms
This commit is contained in:
commit
26533ff52e
4 changed files with 24 additions and 13 deletions
|
|
@ -141,21 +141,19 @@ class MainActivity : SimpleActivity() {
|
|||
main_menu.getToolbar().inflateMenu(R.menu.menu_main)
|
||||
main_menu.toggleHideOnScroll(true)
|
||||
main_menu.setupMenu()
|
||||
main_menu.onSearchOpenListener = {
|
||||
search_holder.fadeIn()
|
||||
conversations_fab.beGone()
|
||||
}
|
||||
|
||||
main_menu.onSearchClosedListener = {
|
||||
search_holder.animate().alpha(0f).setDuration(SHORT_ANIMATION_DURATION).withEndAction {
|
||||
search_holder.beGone()
|
||||
searchTextChanged("", true)
|
||||
}.start()
|
||||
|
||||
conversations_fab.beVisible()
|
||||
fadeOutSearch()
|
||||
}
|
||||
|
||||
main_menu.onSearchTextChangedListener = { text ->
|
||||
if (text.isNotEmpty()) {
|
||||
if (search_holder.alpha < 1f) {
|
||||
search_holder.fadeIn()
|
||||
}
|
||||
} else {
|
||||
fadeOutSearch()
|
||||
}
|
||||
searchTextChanged(text)
|
||||
}
|
||||
|
||||
|
|
@ -380,6 +378,13 @@ class MainActivity : SimpleActivity() {
|
|||
}
|
||||
}
|
||||
|
||||
private fun fadeOutSearch() {
|
||||
search_holder.animate().alpha(0f).setDuration(SHORT_ANIMATION_DURATION).withEndAction {
|
||||
search_holder.beGone()
|
||||
searchTextChanged("", true)
|
||||
}.start()
|
||||
}
|
||||
|
||||
@SuppressLint("NotifyDataSetChanged")
|
||||
private fun notifyDatasetChanged() {
|
||||
getOrCreateConversationsAdapter().notifyDataSetChanged()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue