Skip to content

Commit d55dc21

Browse files
committed
use a quicker way of formatting date and time at scrolling
1 parent f91c632 commit d55dc21

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ android {
5858
}
5959

6060
dependencies {
61-
implementation 'com.simplemobiletools:commons:5.26.21'
61+
implementation 'com.simplemobiletools:commons:5.26.23'
6262
implementation 'com.github.Stericson:RootTools:df729dcb13'
6363
implementation 'com.github.Stericson:RootShell:1.6'
6464
implementation 'com.alexvasilkov:gesture-views:2.5.2'

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,17 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
6262
private val hasOTGConnected = activity.hasOTGConnected()
6363
private var fontSize = 0f
6464
private var smallerFontSize = 0f
65+
private var dateFormat = ""
66+
private var timeFormat = ""
6567

6668
var adjustedPrimaryColor = activity.getAdjustedPrimaryColor()
6769

6870
init {
6971
setupDragListener(true)
7072
initDrawables()
7173
updateFontSizes()
74+
dateFormat = activity.config.dateFormat
75+
timeFormat = activity.getTimeFormat()
7276
}
7377

7478
override fun getActionMenuId() = R.menu.cab
@@ -662,6 +666,12 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
662666
notifyDataSetChanged()
663667
}
664668

669+
fun updateDateTimeFormat() {
670+
dateFormat = activity.config.dateFormat
671+
timeFormat = activity.getTimeFormat()
672+
notifyDataSetChanged()
673+
}
674+
665675
override fun onViewRecycled(holder: ViewHolder) {
666676
super.onViewRecycled(holder)
667677
if (!activity.isDestroyed && !activity.isFinishing) {
@@ -699,7 +709,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
699709
} else {
700710
item_details.text = listItem.size.formatSize()
701711
item_date.beVisible()
702-
item_date.text = listItem.modified.formatDate(activity)
712+
item_date.text = listItem.modified.formatDate(activity, dateFormat, timeFormat)
703713

704714
val drawable = fileDrawables.getOrElse(fileName.substringAfterLast(".").toLowerCase(), { fileDrawable })
705715
val options = RequestOptions()

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
4747
private var storedItems = ArrayList<ListItem>()
4848
private var storedTextColor = 0
4949
private var storedFontSize = 0
50+
private var storedDateFormat = ""
51+
private var storedTimeFormat = ""
5052

5153
lateinit var mView: View
5254

@@ -101,6 +103,10 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
101103
mView.breadcrumbs.updateFontSize(context!!.getTextSize())
102104
}
103105

106+
if (storedDateFormat != context!!.config.dateFormat || storedTimeFormat != context!!.getTimeFormat()) {
107+
getRecyclerAdapter()?.updateDateTimeFormat()
108+
}
109+
104110
mView.items_fastscroller.updateBubbleColors()
105111
mView.items_fastscroller.allowBubbleDisplay = true
106112
if (!isFirstResume) {
@@ -119,6 +125,8 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
119125
context!!.config.apply {
120126
storedTextColor = textColor
121127
storedFontSize = fontSize
128+
storedDateFormat = dateFormat
129+
storedTimeFormat = context.getTimeFormat()
122130
}
123131
}
124132

0 commit comments

Comments
 (0)