mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-05 06:33:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use current phone local to format time #74

Browse Source
This commit is contained in:
Ludovic Goix
2020-07-14 00:06:32 -04:00
parent 2d706f5a4c
commit 20b06997f0
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
View File

@@ -1,6 +1,7 @@
package com.geeksville.mesh.ui
import android.os.Bundle
import android.text.format.DateFormat
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@@ -21,7 +22,6 @@ import com.geeksville.mesh.service.MeshService
import com.google.android.material.chip.Chip
import kotlinx.android.synthetic.main.adapter_message_layout.view.*
import kotlinx.android.synthetic.main.messages_fragment.*
import java.text.SimpleDateFormat
import java.util.*
// Allows usage like email.on(EditorInfo.IME_ACTION_NEXT, { confirm() })
@@ -40,6 +40,8 @@ class MessagesFragment : ScreenFragment("Messages"), Logging {
private val model: UIViewModel by activityViewModels()
private lateinit var dateTimeFormat : java.text.DateFormat
// Provide a direct reference to each of the views within a data item
// Used to cache the views within the item layout for fast access
class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
@@ -131,7 +133,7 @@ class MessagesFragment : ScreenFragment("Messages"), Logging {
holder.messageText.text = msg.text
}
holder.messageTime.text = dateFormat.format(Date(msg.time))
holder.messageTime.text = dateTimeFormat.format(Date(msg.time))
val icon = when (msg.status) {
MessageStatus.QUEUED -> R.drawable.ic_twotone_cloud_upload_24
@@ -171,6 +173,7 @@ class MessagesFragment : ScreenFragment("Messages"), Logging {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
dateTimeFormat = DateFormat.getTimeFormat(context)
messageInputText.on(EditorInfo.IME_ACTION_DONE) {
debug("did IME action")
@@ -206,6 +209,5 @@ class MessagesFragment : ScreenFragment("Messages"), Logging {
})
}
private val dateFormat = SimpleDateFormat("h:mm a")
}