Commit 878305ea authored by Asel Peiris's avatar Asel Peiris

Reformatting code

parent 06d2188e
...@@ -4,12 +4,10 @@ import android.content.Context ...@@ -4,12 +4,10 @@ import android.content.Context
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import android.widget.EditText import android.widget.EditText
import android.widget.Toast
import androidx.appcompat.widget.SearchView import androidx.appcompat.widget.SearchView
import androidx.core.content.res.ResourcesCompat import androidx.core.content.res.ResourcesCompat
import chat.rocket.android.R import chat.rocket.android.R
import chat.rocket.android.util.extension.onQueryTextListener import chat.rocket.android.util.extension.onQueryTextListener
import chat.rocket.android.util.extensions.showToast
internal fun ChatRoomFragment.setupMenu(menu: Menu) { internal fun ChatRoomFragment.setupMenu(menu: Menu) {
setupSearchMessageMenuItem(menu, requireContext()) setupSearchMessageMenuItem(menu, requireContext())
...@@ -20,46 +18,44 @@ internal fun ChatRoomFragment.setupMenu(menu: Menu) { ...@@ -20,46 +18,44 @@ internal fun ChatRoomFragment.setupMenu(menu: Menu) {
internal fun ChatRoomFragment.setOnMenuItemClickListener(item: MenuItem) { internal fun ChatRoomFragment.setOnMenuItemClickListener(item: MenuItem) {
when (item.itemId) { when (item.itemId) {
MENU_ACTION_FAVORITE_UNFAVOURITE_CHAT -> presenter.toggleFavoriteChatRoom( MENU_ACTION_FAVORITE_UNFAVOURITE_CHAT -> presenter.toggleFavoriteChatRoom(
chatRoomId, chatRoomId,
isFavorite isFavorite
) )
MENU_ACTION_SHOW_DETAILS -> presenter.toChatDetails( MENU_ACTION_SHOW_DETAILS -> presenter.toChatDetails(
chatRoomId, chatRoomId,
chatRoomType, chatRoomType,
isSubscribed, isSubscribed,
disableMenu disableMenu
) )
} }
} }
private fun ChatRoomFragment.setupSearchMessageMenuItem(menu: Menu, context: Context) { private fun ChatRoomFragment.setupSearchMessageMenuItem(menu: Menu, context: Context) {
val searchItem = menu.add( val searchItem = menu.add(
Menu.NONE, Menu.NONE,
Menu.NONE, Menu.NONE,
Menu.NONE, Menu.NONE,
R.string.title_search_message R.string.title_search_message
).setActionView(SearchView(context)) ).setActionView(SearchView(context))
.setIcon(R.drawable.ic_search_white_24dp) .setIcon(R.drawable.ic_search_white_24dp)
.setShowAsActionFlags( .setShowAsActionFlags(
MenuItem.SHOW_AS_ACTION_IF_ROOM or MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW MenuItem.SHOW_AS_ACTION_IF_ROOM or MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW
) )
.setOnActionExpandListener(object : MenuItem.OnActionExpandListener { .setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
dismissEmojiKeyboard()
override fun onMenuItemActionExpand(item: MenuItem?): Boolean { removeFavoriteMenuItem(menu)
dismissEmojiKeyboard() removeDetailMenuItem(menu)
removeFavoriteMenuItem(menu) return true
removeDetailMenuItem(menu) }
return true
} override fun onMenuItemActionCollapse(item: MenuItem?): Boolean {
dismissEmojiKeyboard()
override fun onMenuItemActionCollapse(item: MenuItem?): Boolean { setupFavoriteMenuItem(menu)
dismissEmojiKeyboard() setupDetailsMenuItem(menu)
setupFavoriteMenuItem(menu) return true
setupDetailsMenuItem(menu) }
return true })
}
})
(searchItem?.actionView as? SearchView)?.let { (searchItem?.actionView as? SearchView)?.let {
// TODO: Check why we need to stylize the search text programmatically instead of by defining it in the styles.xml (ChatRoom.SearchView) // TODO: Check why we need to stylize the search text programmatically instead of by defining it in the styles.xml (ChatRoom.SearchView)
...@@ -75,7 +71,7 @@ private fun stylizeSearchView(searchView: SearchView, context: Context) { ...@@ -75,7 +71,7 @@ private fun stylizeSearchView(searchView: SearchView, context: Context) {
val searchText = searchView.findViewById<EditText>(androidx.appcompat.R.id.search_src_text) val searchText = searchView.findViewById<EditText>(androidx.appcompat.R.id.search_src_text)
searchText.setTextColor(ResourcesCompat.getColor(context.resources, R.color.color_white, null)) searchText.setTextColor(ResourcesCompat.getColor(context.resources, R.color.color_white, null))
searchText.setHintTextColor( searchText.setHintTextColor(
ResourcesCompat.getColor(context.resources, R.color.color_white, null) ResourcesCompat.getColor(context.resources, R.color.color_white, null)
) )
} }
...@@ -94,20 +90,20 @@ private fun ChatRoomFragment.setupSearchViewTextListener(searchView: SearchView) ...@@ -94,20 +90,20 @@ private fun ChatRoomFragment.setupSearchViewTextListener(searchView: SearchView)
private fun ChatRoomFragment.setupFavoriteMenuItem(menu: Menu) { private fun ChatRoomFragment.setupFavoriteMenuItem(menu: Menu) {
if (isFavorite) { if (isFavorite) {
menu.add( menu.add(
Menu.NONE, Menu.NONE,
MENU_ACTION_FAVORITE_UNFAVOURITE_CHAT, MENU_ACTION_FAVORITE_UNFAVOURITE_CHAT,
Menu.NONE, Menu.NONE,
R.string.title_unfavorite_chat R.string.title_unfavorite_chat
).setIcon(R.drawable.ic_star_yellow_24dp) ).setIcon(R.drawable.ic_star_yellow_24dp)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM) .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
} else { } else {
menu.add( menu.add(
Menu.NONE, Menu.NONE,
MENU_ACTION_FAVORITE_UNFAVOURITE_CHAT, MENU_ACTION_FAVORITE_UNFAVOURITE_CHAT,
Menu.NONE, Menu.NONE,
R.string.title_favorite_chat R.string.title_favorite_chat
).setIcon(R.drawable.ic_star_border_white_24dp) ).setIcon(R.drawable.ic_star_border_white_24dp)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM) .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
} }
} }
...@@ -121,14 +117,10 @@ private fun ChatRoomFragment.setupDetailsMenuItem(menu: Menu) { ...@@ -121,14 +117,10 @@ private fun ChatRoomFragment.setupDetailsMenuItem(menu: Menu) {
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM) .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
} }
private fun removeFavoriteMenuItem(menu: Menu){ private fun removeFavoriteMenuItem(menu: Menu) {
menu.removeItem(MENU_ACTION_FAVORITE_UNFAVOURITE_CHAT) menu.removeItem(MENU_ACTION_FAVORITE_UNFAVOURITE_CHAT)
} }
private fun removeDetailMenuItem(menu: Menu){ private fun removeDetailMenuItem(menu: Menu) {
menu.removeItem(MENU_ACTION_SHOW_DETAILS) menu.removeItem(MENU_ACTION_SHOW_DETAILS)
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment