diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/chat/ChatFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/chat/ChatFragment.kt index 306bf01..3d87467 100644 --- a/Nabi/presentation/src/main/java/com/nabi/nabi/views/chat/ChatFragment.kt +++ b/Nabi/presentation/src/main/java/com/nabi/nabi/views/chat/ChatFragment.kt @@ -13,17 +13,12 @@ import com.nabi.nabi.utils.LoggerUtils import com.nabi.nabi.utils.UiState import com.nabi.nabi.views.OnRvItemClickListener import dagger.hilt.android.AndroidEntryPoint -import java.text.SimpleDateFormat import java.time.LocalDateTime import java.time.ZoneId import java.time.format.DateTimeFormatter -import java.util.Locale @AndroidEntryPoint class ChatFragment: BaseFragment(R.layout.fragment_chat), OnRvItemClickListener { - private val dateFormat = SimpleDateFormat("yyyy년 MM월 dd일(E)", Locale.KOREA) - private val timeFormat = SimpleDateFormat("a hh:mm", Locale.KOREA) - private val viewModel: ChatViewModel by viewModels() private lateinit var chatAdapter : ChatRvAdapter private var isLoading = false @@ -116,8 +111,12 @@ class ChatFragment: BaseFragment(R.layout.fragment_chat), O viewModel.uiState.observe(viewLifecycleOwner){ when(it){ is UiState.Loading -> {} - is UiState.Failure -> {} + is UiState.Failure -> { + isLoading = false + } is UiState.Success -> { + isLoading = false + if(it.data.isNotEmpty()){ submitCustom(processChatItems(it.data)) } @@ -218,7 +217,4 @@ class ChatFragment: BaseFragment(R.layout.fragment_chat), O binding.rvChat.scrollToPosition(filteredList.size - 1) } } - - - } \ No newline at end of file diff --git a/Nabi/presentation/src/main/res/drawable/img_default_nabi.png b/Nabi/presentation/src/main/res/drawable/img_default_nabi.png new file mode 100644 index 0000000..755aaac Binary files /dev/null and b/Nabi/presentation/src/main/res/drawable/img_default_nabi.png differ diff --git a/Nabi/presentation/src/main/res/layout/item_chat_other.xml b/Nabi/presentation/src/main/res/layout/item_chat_other.xml index f9bda19..f6bcd1e 100644 --- a/Nabi/presentation/src/main/res/layout/item_chat_other.xml +++ b/Nabi/presentation/src/main/res/layout/item_chat_other.xml @@ -13,10 +13,11 @@ android:layout_width="40dp" android:layout_height="40dp" + android:contentDescription="@null" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" - android:background="@drawable/shape_chat_other_profile"/> + android:background="@drawable/img_default_nabi" />