Skip to content

Commit 2dafef1

Browse files
author
tanpengcheng
committed
[feat] Media add date string.
1 parent 7843b1a commit 2dafef1

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

app/src/main/java/com/tans/tfiletransporter/file/FileUtils.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ private val fileTimeFormatter by lazy {
136136
}
137137

138138

139-
fun fileDateText(targetTimeMillis: Long): String {
140-
val targetOffsetDateTime = OffsetDateTime.ofInstant(Instant.ofEpochMilli(targetTimeMillis), ZoneId.systemDefault())
139+
fun Long.fileDateText(): String {
140+
val targetOffsetDateTime = OffsetDateTime.ofInstant(Instant.ofEpochMilli(this), ZoneId.systemDefault())
141141
val targetLocalDate = targetOffsetDateTime.toLocalDate()
142142

143143
val nowLocalDate = OffsetDateTime.now(ZoneId.systemDefault()).toLocalDate()

app/src/main/java/com/tans/tfiletransporter/ui/FileTreeUI.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class FileTreeUI(
8686
val itemViewBinding = FolderItemLayoutBinding.bind(view)
8787
itemViewBinding.titleTv.text = data.name
8888
itemViewBinding.filesCountTv.text = context.getString(R.string.file_count, data.childrenCount)
89-
itemViewBinding.modifiedDateTv.text = fileDateText(data.lastModified)
89+
itemViewBinding.modifiedDateTv.text = data.lastModified.fileDateText()
9090
itemViewBinding.root.clicks(coroutineScope = coroutineScope, clickWorkOn = Dispatchers.IO) {
9191
context.supportFragmentManager.loadingDialogSuspend {
9292
val i = withContext(Dispatchers.Main) {
@@ -109,7 +109,7 @@ class FileTreeUI(
109109
dataBinder = DataBinderImpl<Pair<FileLeaf.CommonFileLeaf, Boolean>> { data, view, _ ->
110110
val itemViewBinding = FileItemLayoutBinding.bind(view)
111111
itemViewBinding.titleTv.text = data.first.name
112-
itemViewBinding.modifiedDateTv.text = fileDateText(data.first.lastModified)
112+
itemViewBinding.modifiedDateTv.text = data.first.lastModified.fileDateText()
113113
itemViewBinding.filesSizeTv.text = data.first.size.toSizeString()
114114

115115
itemViewBinding.root.clicks(coroutineScope) {

app/src/main/java/com/tans/tfiletransporter/ui/filetransport/BaseMediaFragment.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import com.tans.tfiletransporter.Settings
1313
import com.tans.tfiletransporter.databinding.BaseMediaFragmentLayoutBinding
1414
import com.tans.tfiletransporter.databinding.ImageItemLayoutBinding
1515
import com.tans.tfiletransporter.databinding.VideoAudioItemLayoutBinding
16+
import com.tans.tfiletransporter.file.fileDateText
1617
import com.tans.tfiletransporter.logs.AndroidLog
1718
import com.tans.tfiletransporter.transferproto.fileexplore.FileExplore
1819
import com.tans.tfiletransporter.transferproto.fileexplore.requestSendFilesSuspend
@@ -130,6 +131,7 @@ abstract class BaseMediaFragment(
130131
itemViewBinding.titleTv.text = data.first.title
131132
itemViewBinding.artistTv.text = requireContext().getString(R.string.media_artist_name, data.first.artist)
132133
itemViewBinding.albumTv.text = requireContext().getString(R.string.media_album_name, data.first.album)
134+
itemViewBinding.modifiedDateTv.text = (data.first.dateModified * 1000L).fileDateText()
133135
itemViewBinding.mediaSizeTv.text = data.first.size.toSizeString()
134136
itemViewBinding.root.clicks(this) {
135137
selectOrUnSelectAudio(data.first)
@@ -168,6 +170,7 @@ abstract class BaseMediaFragment(
168170
itemViewBinding.titleTv.text = data.first.title
169171
itemViewBinding.artistTv.visibility = View.INVISIBLE
170172
itemViewBinding.albumTv.visibility = View.INVISIBLE
173+
itemViewBinding.modifiedDateTv.text = (data.first.dateModified * 1000L).fileDateText()
171174
itemViewBinding.mediaSizeTv.text = data.first.size.toSizeString()
172175
itemViewBinding.root.clicks(this) {
173176
selectOrUnSelectVideo(data.first)

0 commit comments

Comments
 (0)