-
Notifications
You must be signed in to change notification settings - Fork 58
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #25 from capcom6/feature/message-details
Added: message details info
- Loading branch information
Showing
15 changed files
with
321 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
app/src/main/java/me/capcom/smsgateway/data/dao/MessageDao.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 4 additions & 1 deletion
5
app/src/main/java/me/capcom/smsgateway/modules/messages/repositories/MessagesRepository.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,10 @@ | ||
| package me.capcom.smsgateway.modules.messages.repositories | ||
|
|
||
| import androidx.lifecycle.distinctUntilChanged | ||
| import me.capcom.smsgateway.data.dao.MessageDao | ||
|
|
||
| class MessagesRepository(private val dao: MessageDao) { | ||
| val lastMessages = dao.selectLast() | ||
| val lastMessages = dao.selectLast().distinctUntilChanged() | ||
|
|
||
| fun get(id: String) = dao.get(id) | ||
| } |
23 changes: 23 additions & 0 deletions
23
app/src/main/java/me/capcom/smsgateway/modules/messages/vm/MessageDetailsViewModel.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package me.capcom.smsgateway.modules.messages.vm | ||
|
|
||
| import androidx.lifecycle.LiveData | ||
| import androidx.lifecycle.MutableLiveData | ||
| import androidx.lifecycle.ViewModel | ||
| import androidx.lifecycle.viewModelScope | ||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.launch | ||
| import me.capcom.smsgateway.data.entities.MessageWithRecipients | ||
| import me.capcom.smsgateway.modules.messages.repositories.MessagesRepository | ||
|
|
||
| class MessageDetailsViewModel( | ||
| private val messagesRepo: MessagesRepository | ||
| ) : ViewModel() { | ||
| private val _message = MutableLiveData<MessageWithRecipients>() | ||
| val message: LiveData<MessageWithRecipients> = _message | ||
|
|
||
| fun get(id: String) { | ||
| viewModelScope.launch(Dispatchers.IO) { | ||
| _message.postValue(messagesRepo.get(id)) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
app/src/main/java/me/capcom/smsgateway/ui/HolderFragment.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| package me.capcom.smsgateway.ui | ||
|
|
||
| import android.content.Context | ||
| import android.os.Bundle | ||
| import android.view.LayoutInflater | ||
| import android.view.View | ||
| import android.view.ViewGroup | ||
| import androidx.fragment.app.Fragment | ||
| import androidx.fragment.app.commit | ||
| import me.capcom.smsgateway.R | ||
|
|
||
| class HolderFragment : Fragment() { | ||
| override fun onAttach(context: Context) { | ||
| super.onAttach(context) | ||
| parentFragmentManager.commit { | ||
| setPrimaryNavigationFragment(this@HolderFragment) | ||
| } | ||
| } | ||
|
|
||
| override fun onCreateView( | ||
| inflater: LayoutInflater, container: ViewGroup?, | ||
| savedInstanceState: Bundle? | ||
| ): View? { | ||
| // Inflate the layout for this fragment | ||
| return inflater.inflate(R.layout.fragment_holder, container, false) | ||
| } | ||
|
|
||
| override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
| super.onViewCreated(view, savedInstanceState) | ||
|
|
||
| childFragmentManager.commit { | ||
| add(R.id.rootLayout, MessagesListFragment.newInstance()) | ||
| } | ||
| } | ||
|
|
||
| companion object { | ||
| fun newInstance() = | ||
| HolderFragment().apply { | ||
|
|
||
| } | ||
| } | ||
| } |
64 changes: 64 additions & 0 deletions
64
app/src/main/java/me/capcom/smsgateway/ui/MessageDetailsFragment.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| package me.capcom.smsgateway.ui | ||
|
|
||
| import android.os.Bundle | ||
| import android.view.LayoutInflater | ||
| import android.view.View | ||
| import android.view.ViewGroup | ||
| import androidx.fragment.app.Fragment | ||
| import androidx.recyclerview.widget.DividerItemDecoration | ||
| import me.capcom.smsgateway.databinding.FragmentMessageDetailsBinding | ||
| import me.capcom.smsgateway.modules.messages.vm.MessageDetailsViewModel | ||
| import me.capcom.smsgateway.ui.adapters.MessageRecipientsAdapter | ||
| import org.koin.androidx.viewmodel.ext.android.viewModel | ||
|
|
||
| class MessageDetailsFragment : Fragment() { | ||
| private val viewModel: MessageDetailsViewModel by viewModel() | ||
| private var _binding: FragmentMessageDetailsBinding? = null | ||
| private val binding get() = _binding!! | ||
|
|
||
| private val id: String | ||
| get() = requireNotNull(requireArguments().getString(ARG_ID)) { "id is null" } | ||
|
|
||
| private val recipientsAdapter by lazy { MessageRecipientsAdapter() } | ||
|
|
||
| override fun onCreateView( | ||
| inflater: LayoutInflater, container: ViewGroup?, | ||
| savedInstanceState: Bundle? | ||
| ): View? { | ||
| // Inflate the layout for this fragment | ||
| _binding = FragmentMessageDetailsBinding.inflate(inflater, container, false) | ||
| return binding.root | ||
| } | ||
|
|
||
| override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
| super.onViewCreated(view, savedInstanceState) | ||
|
|
||
| binding.recyclerViewRecipients.adapter = recipientsAdapter | ||
| binding.recyclerViewRecipients.addItemDecoration( | ||
| DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) | ||
| ) | ||
|
|
||
| viewModel.message.observe(viewLifecycleOwner) { | ||
| binding.textMessageId.text = it.message.id | ||
| binding.textMessage.text = it.message.text | ||
| binding.textMessageState.text = it.state.name | ||
| recipientsAdapter.submitList(it.recipients) | ||
| } | ||
| viewModel.get(id) | ||
| } | ||
|
|
||
| override fun onDestroyView() { | ||
| super.onDestroyView() | ||
| _binding = null | ||
| } | ||
|
|
||
| companion object { | ||
| private const val ARG_ID = "id" | ||
| fun newInstance(id: String) = | ||
| MessageDetailsFragment().apply { | ||
| arguments = Bundle().apply { | ||
| putString(ARG_ID, id) | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
app/src/main/java/me/capcom/smsgateway/ui/adapters/MessageRecipientsAdapter.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| package me.capcom.smsgateway.ui.adapters | ||
|
|
||
| import android.view.LayoutInflater | ||
| import android.view.ViewGroup | ||
| import androidx.recyclerview.widget.ListAdapter | ||
| import androidx.recyclerview.widget.RecyclerView | ||
| import me.capcom.smsgateway.data.entities.MessageRecipient | ||
| import me.capcom.smsgateway.databinding.ItemMessageBinding | ||
| import me.capcom.smsgateway.ui.styles.color | ||
|
|
||
| class MessageRecipientsAdapter : | ||
| ListAdapter<MessageRecipient, MessageRecipientsAdapter.RecipientViewHolder>( | ||
| RecipientsDiffCallback() | ||
| ) { | ||
|
|
||
| override fun onCreateViewHolder( | ||
| parent: ViewGroup, | ||
| viewType: Int | ||
| ): RecipientViewHolder { | ||
| return RecipientViewHolder.create(parent) | ||
| } | ||
|
|
||
| override fun onBindViewHolder(holder: RecipientViewHolder, position: Int) { | ||
| val message = getItem(position) | ||
|
|
||
| holder.bind(message) | ||
| } | ||
|
|
||
| class RecipientViewHolder(private val binding: ItemMessageBinding) : | ||
| RecyclerView.ViewHolder(binding.root) { | ||
| fun bind(recipient: MessageRecipient) { | ||
| binding.textViewId.text = recipient.phoneNumber | ||
| binding.textViewState.text = recipient.state.name | ||
| binding.textViewDate.text = recipient.error | ||
| binding.imageViewState.setColorFilter(recipient.state.color) | ||
| } | ||
|
|
||
| companion object { | ||
| fun create(parent: ViewGroup): RecipientViewHolder { | ||
| return RecipientViewHolder( | ||
| ItemMessageBinding.inflate( | ||
| LayoutInflater.from(parent.context), parent, false | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| class RecipientsDiffCallback : | ||
| androidx.recyclerview.widget.DiffUtil.ItemCallback<MessageRecipient>() { | ||
| override fun areItemsTheSame( | ||
| oldItem: MessageRecipient, | ||
| newItem: MessageRecipient | ||
| ): Boolean { | ||
| return oldItem.phoneNumber == newItem.phoneNumber | ||
| } | ||
|
|
||
| override fun areContentsTheSame( | ||
| oldItem: MessageRecipient, | ||
| newItem: MessageRecipient | ||
| ): Boolean { | ||
| return oldItem == newItem | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.