mirror of
https://github.com/meshtastic/Meshtastic-Android.git
synced 2026-04-20 22:23:37 +00:00
rename Packet to MeshLog
This commit is contained in:
parent
c2d681b11e
commit
a93d4e1dcd
14 changed files with 294 additions and 294 deletions
50
app/src/main/java/com/geeksville/mesh/ui/DebugAdapter.kt
Normal file
50
app/src/main/java/com/geeksville/mesh/ui/DebugAdapter.kt
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
package com.geeksville.mesh.ui
|
||||
|
||||
import android.content.Context
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import android.widget.TextView
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import com.geeksville.mesh.R
|
||||
import com.geeksville.mesh.database.entity.MeshLog
|
||||
import java.text.DateFormat
|
||||
import java.util.*
|
||||
|
||||
class DebugAdapter internal constructor(
|
||||
context: Context
|
||||
) : RecyclerView.Adapter<DebugAdapter.DebugViewHolder>() {
|
||||
|
||||
private val inflater: LayoutInflater = LayoutInflater.from(context)
|
||||
private var logs = emptyList<MeshLog>()
|
||||
|
||||
private val timeFormat: DateFormat =
|
||||
DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM)
|
||||
|
||||
inner class DebugViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
|
||||
val logTypeView: TextView = itemView.findViewById(R.id.type)
|
||||
val logDateReceivedView: TextView = itemView.findViewById(R.id.dateReceived)
|
||||
val logRawMessage: TextView = itemView.findViewById(R.id.rawMessage)
|
||||
}
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DebugViewHolder {
|
||||
val itemView = inflater.inflate(R.layout.adapter_debug_layout, parent, false)
|
||||
return DebugViewHolder(itemView)
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: DebugViewHolder, position: Int) {
|
||||
val current = logs[position]
|
||||
holder.logTypeView.text = current.message_type
|
||||
holder.logRawMessage.text = current.raw_message
|
||||
val date = Date(current.received_date)
|
||||
holder.logDateReceivedView.text = timeFormat.format(date)
|
||||
}
|
||||
|
||||
internal fun setLogs(logs: List<MeshLog>) {
|
||||
this.logs = logs
|
||||
notifyDataSetChanged()
|
||||
}
|
||||
|
||||
override fun getItemCount() = logs.size
|
||||
|
||||
}
|
||||
|
|
@ -10,14 +10,14 @@ import androidx.lifecycle.asLiveData
|
|||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import com.geeksville.mesh.R
|
||||
import com.geeksville.mesh.databinding.DebugFragmentBinding
|
||||
import com.geeksville.mesh.databinding.FragmentDebugBinding
|
||||
import com.geeksville.mesh.model.UIViewModel
|
||||
import dagger.hilt.android.AndroidEntryPoint
|
||||
|
||||
@AndroidEntryPoint
|
||||
class DebugFragment : Fragment() {
|
||||
|
||||
private var _binding: DebugFragmentBinding? = null
|
||||
private var _binding: FragmentDebugBinding? = null
|
||||
|
||||
// This property is only valid between onCreateView and onDestroyView.
|
||||
private val binding get() = _binding!!
|
||||
|
|
@ -28,27 +28,27 @@ class DebugFragment : Fragment() {
|
|||
inflater: LayoutInflater, container: ViewGroup?,
|
||||
savedInstanceState: Bundle?
|
||||
): View {
|
||||
_binding = DebugFragmentBinding.inflate(inflater, container, false)
|
||||
_binding = FragmentDebugBinding.inflate(inflater, container, false)
|
||||
return binding.root
|
||||
}
|
||||
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
val recyclerView = view.findViewById<RecyclerView>(R.id.packets_recyclerview)
|
||||
val adapter = PacketListAdapter(requireContext())
|
||||
val recyclerView = view.findViewById<RecyclerView>(R.id.debug_recyclerview)
|
||||
val adapter = DebugAdapter(requireContext())
|
||||
|
||||
recyclerView.adapter = adapter
|
||||
recyclerView.layoutManager = LinearLayoutManager(requireContext())
|
||||
|
||||
binding.clearButton.setOnClickListener {
|
||||
model.deleteAllPacket()
|
||||
model.deleteAllLogs()
|
||||
}
|
||||
|
||||
binding.closeButton.setOnClickListener {
|
||||
parentFragmentManager.popBackStack()
|
||||
}
|
||||
model.allPackets.asLiveData().observe(viewLifecycleOwner) { packets ->
|
||||
packets?.let { adapter.setPackets(it) }
|
||||
model.meshLog.asLiveData().observe(viewLifecycleOwner) { logs ->
|
||||
logs?.let { adapter.setLogs(it) }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
package com.geeksville.mesh.ui
|
||||
|
||||
import android.content.Context
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import android.widget.TextView
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import com.geeksville.mesh.R
|
||||
import com.geeksville.mesh.database.entity.Packet
|
||||
import java.text.DateFormat
|
||||
import java.util.*
|
||||
|
||||
class PacketListAdapter internal constructor(
|
||||
context: Context
|
||||
) : RecyclerView.Adapter<PacketListAdapter.PacketViewHolder>() {
|
||||
|
||||
private val inflater: LayoutInflater = LayoutInflater.from(context)
|
||||
private var packets = emptyList<Packet>()
|
||||
|
||||
private val timeFormat: DateFormat =
|
||||
DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM)
|
||||
|
||||
inner class PacketViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
|
||||
val packetTypeView: TextView = itemView.findViewById(R.id.type)
|
||||
val packetDateReceivedView: TextView = itemView.findViewById(R.id.dateReceived)
|
||||
val packetRawMessage: TextView = itemView.findViewById(R.id.rawMessage)
|
||||
}
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PacketViewHolder {
|
||||
val itemView = inflater.inflate(R.layout.adapter_packet_layout, parent, false)
|
||||
return PacketViewHolder(itemView)
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: PacketViewHolder, position: Int) {
|
||||
val current = packets[position]
|
||||
holder.packetTypeView.text = current.message_type
|
||||
holder.packetRawMessage.text = current.raw_message
|
||||
val date = Date(current.received_date)
|
||||
holder.packetDateReceivedView.text = timeFormat.format(date)
|
||||
}
|
||||
|
||||
internal fun setPackets(packets: List<Packet>) {
|
||||
this.packets = packets
|
||||
notifyDataSetChanged()
|
||||
}
|
||||
|
||||
override fun getItemCount() = packets.size
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue