meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor: Messages navigation to single contactKey argument

Browse source
This commit is contained in:
andrekir 2024-11-28 08:42:49 -03:00
parent 1c42bd262f
commit 44d195a4a5
5 changed files with 25 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/geeksville/mesh/ui/ContactsFragment.kt
View file

@ -70,7 +70,7 @@ class ContactsFragment : ScreenFragment("Messages"), Logging {
onLongClick(contact)
} else {
debug("calling MessagesFragment filter:${contact.contactKey}")
parentFragmentManager.navigateToMessages(contact.contactKey, contact.longName)
parentFragmentManager.navigateToMessages(contact.contactKey)
}
}

38
app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
View file

@ -34,14 +34,12 @@ import androidx.core.view.allViews
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager
import androidx.fragment.app.activityViewModels
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.asLiveData
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import com.geeksville.mesh.DataPacket
import com.geeksville.mesh.android.Logging
import com.geeksville.mesh.R
import com.geeksville.mesh.android.Logging
import com.geeksville.mesh.database.entity.QuickChatAction
import com.geeksville.mesh.databinding.MessagesFragmentBinding
import com.geeksville.mesh.model.Message
@ -54,9 +52,9 @@ import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.flow.firstOrNull
import kotlinx.coroutines.launch
internal fun FragmentManager.navigateToMessages(contactKey: String, contactName: String) {
internal fun FragmentManager.navigateToMessages(contactKey: String) {
val messagesFragment = MessagesFragment().apply {
arguments = bundleOf("contactKey" to contactKey, "contactName" to contactName)
arguments = bundleOf("contactKey" to contactKey)
}
beginTransaction()
.add(R.id.mainActivityLayout, messagesFragment)
@ -125,22 +123,20 @@ class MessagesFragment : Fragment(), Logging {
}
contactKey = arguments?.getString("contactKey").toString()
val contactName = arguments?.getString("contactName").toString()
binding.toolbar.title = contactName
val channelNumber = contactKey[0].digitToIntOrNull()
if (channelNumber == DataPacket.PKC_CHANNEL_INDEX) {
binding.toolbar.title = "$contactName🔒"
} else if (channelNumber != null && contactKey.substring(1) != DataPacket.ID_BROADCAST) {
lifecycleScope.launch {
repeatOnLifecycle(Lifecycle.State.STARTED) {
model.channels.collect { channels ->
val channelName =
channels.getChannel(channelNumber)?.name ?: "Unknown Channel"
val subtitle = "(ch: $channelNumber - $channelName)"
binding.toolbar.subtitle = subtitle
}
}
}
val channelIndex = contactKey[0].digitToIntOrNull()
val nodeId = contactKey.substring(1)
val channelName = channelIndex?.let { model.channels.value.getChannel(it)?.name }
?: "Unknown Channel"
binding.toolbar.title = when (nodeId) {
DataPacket.ID_BROADCAST -> channelName
else -> model.getUser(nodeId).longName
}
if (channelIndex == DataPacket.PKC_CHANNEL_INDEX) {
binding.toolbar.title = "${binding.toolbar.title}🔒"
} else if (nodeId != DataPacket.ID_BROADCAST) {
binding.toolbar.subtitle = "(ch: $channelIndex - $channelName)"
}
fun sendMessageInputText() {

2
app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
View file

@ -58,7 +58,7 @@ class UsersFragment : ScreenFragment("Users"), Logging {
val channel = if (hasPKC) DataPacket.PKC_CHANNEL_INDEX else node.channel
val contactKey = "$channel${user.id}"
info("calling MessagesFragment filter: $contactKey")
parentFragmentManager.navigateToMessages(contactKey, user.longName)
parentFragmentManager.navigateToMessages(contactKey)
}
private fun navigateToNodeDetails(nodeNum: Int) {