diff --git a/app/src/main/java/kr/co/vividnext/sodalive/v2/main/chat/ChatMainFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/v2/main/chat/ChatMainFragment.kt index 03a9e3ec..3b1f0a62 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/v2/main/chat/ChatMainFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/v2/main/chat/ChatMainFragment.kt @@ -3,8 +3,6 @@ package kr.co.vividnext.sodalive.v2.main.chat import android.content.Intent import android.os.Bundle import android.view.View -import android.widget.ImageView -import android.widget.LinearLayout import android.widget.Toast import androidx.core.view.isVisible import androidx.recyclerview.widget.LinearLayoutManager @@ -13,11 +11,9 @@ import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.base.BaseFragment import kr.co.vividnext.sodalive.common.LoadingDialog import kr.co.vividnext.sodalive.common.SharedPreferenceManager -import kr.co.vividnext.sodalive.settings.notification.MemberRole -import kr.co.vividnext.sodalive.v2.main.chat.recipient.DmRecipientPickerActivity import kr.co.vividnext.sodalive.databinding.FragmentV2MainChatBinding import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity -import kr.co.vividnext.sodalive.search.SearchActivity +import kr.co.vividnext.sodalive.settings.notification.MemberRole import kr.co.vividnext.sodalive.v2.access.AccessRequirement import kr.co.vividnext.sodalive.v2.access.ensureV2Access import kr.co.vividnext.sodalive.v2.chat.action.ChatActionCommand @@ -27,6 +23,7 @@ import kr.co.vividnext.sodalive.v2.main.chat.model.ChatRoomListUiItem import kr.co.vividnext.sodalive.v2.main.chat.model.ChatRoomListUiState import kr.co.vividnext.sodalive.v2.main.chat.model.ChatRoomType import kr.co.vividnext.sodalive.v2.main.chat.model.emptyMessageResId +import kr.co.vividnext.sodalive.v2.main.chat.recipient.DmRecipientPickerActivity import kr.co.vividnext.sodalive.v2.main.chat.ui.ChatRoomListAdapter import org.koin.androidx.viewmodel.ext.android.viewModel @@ -103,20 +100,6 @@ class ChatMainFragment : BaseFragment( binding.viewChatTitleBar.ivTitleBarMenu.setOnClickListener { openWithLoginGuard(CanChargeActivity::class.java) } - - val searchAction = ImageView(requireContext()).apply { - setImageResource(R.drawable.ic_bar_search) - layoutParams = LinearLayout.LayoutParams( - LinearLayout.LayoutParams.WRAP_CONTENT, - LinearLayout.LayoutParams.WRAP_CONTENT - ).apply { - marginStart = resources.getDimensionPixelSize(R.dimen.spacing_14) - } - } - searchAction.setOnClickListener { - openWithLoginGuard(SearchActivity::class.java) - } - binding.viewChatTitleBar.llTitleBarActions.addView(searchAction) } private fun openWithLoginGuard(activityClass: Class<*>) { @@ -195,6 +178,7 @@ class ChatMainFragment : BaseFragment( binding.rvChatRooms.scrollToPosition(0) } } + ChatRoomListUiState.Empty -> { lastRenderedChatContentState = null bindChatRooms(emptyList(), showEmpty = true) @@ -203,6 +187,7 @@ class ChatMainFragment : BaseFragment( refreshingChatFilter = null } } + is ChatRoomListUiState.Error -> { lastRenderedChatContentState = null if (!isChatPullRefreshing || !isRefreshForCurrentFilter) { @@ -213,6 +198,7 @@ class ChatMainFragment : BaseFragment( refreshingChatFilter = null } } + ChatRoomListUiState.Loading -> { if (!isChatPullRefreshing) { binding.tvChatEmptyMessage.isVisible = false