From d55dc217c9dd4f1fcf056b877062dc23f5ed198e Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Thu, 23 Apr 2020 20:23:15 +0200
Subject: [PATCH] use a quicker way of formatting date and time at scrolling

---
 app/build.gradle                                     |  2 +-
 .../filemanager/pro/adapters/ItemsAdapter.kt         | 12 +++++++++++-
 .../filemanager/pro/fragments/ItemsFragment.kt       |  8 ++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 60ad4f0a..d2b78c56 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -58,7 +58,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.26.21'
+    implementation 'com.simplemobiletools:commons:5.26.23'
     implementation 'com.github.Stericson:RootTools:df729dcb13'
     implementation 'com.github.Stericson:RootShell:1.6'
     implementation 'com.alexvasilkov:gesture-views:2.5.2'
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
index 95910e8a..bb948567 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
@@ -62,6 +62,8 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
     private val hasOTGConnected = activity.hasOTGConnected()
     private var fontSize = 0f
     private var smallerFontSize = 0f
+    private var dateFormat = ""
+    private var timeFormat = ""
 
     var adjustedPrimaryColor = activity.getAdjustedPrimaryColor()
 
@@ -69,6 +71,8 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
         setupDragListener(true)
         initDrawables()
         updateFontSizes()
+        dateFormat = activity.config.dateFormat
+        timeFormat = activity.getTimeFormat()
     }
 
     override fun getActionMenuId() = R.menu.cab
@@ -662,6 +666,12 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
         notifyDataSetChanged()
     }
 
+    fun updateDateTimeFormat() {
+        dateFormat = activity.config.dateFormat
+        timeFormat = activity.getTimeFormat()
+        notifyDataSetChanged()
+    }
+
     override fun onViewRecycled(holder: ViewHolder) {
         super.onViewRecycled(holder)
         if (!activity.isDestroyed && !activity.isFinishing) {
@@ -699,7 +709,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
                 } else {
                     item_details.text = listItem.size.formatSize()
                     item_date.beVisible()
-                    item_date.text = listItem.modified.formatDate(activity)
+                    item_date.text = listItem.modified.formatDate(activity, dateFormat, timeFormat)
 
                     val drawable = fileDrawables.getOrElse(fileName.substringAfterLast(".").toLowerCase(), { fileDrawable })
                     val options = RequestOptions()
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
index e30ab102..58e84548 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
@@ -47,6 +47,8 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
     private var storedItems = ArrayList<ListItem>()
     private var storedTextColor = 0
     private var storedFontSize = 0
+    private var storedDateFormat = ""
+    private var storedTimeFormat = ""
 
     lateinit var mView: View
 
@@ -101,6 +103,10 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
             mView.breadcrumbs.updateFontSize(context!!.getTextSize())
         }
 
+        if (storedDateFormat != context!!.config.dateFormat || storedTimeFormat != context!!.getTimeFormat()) {
+            getRecyclerAdapter()?.updateDateTimeFormat()
+        }
+
         mView.items_fastscroller.updateBubbleColors()
         mView.items_fastscroller.allowBubbleDisplay = true
         if (!isFirstResume) {
@@ -119,6 +125,8 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
         context!!.config.apply {
             storedTextColor = textColor
             storedFontSize = fontSize
+            storedDateFormat = dateFormat
+            storedTimeFormat = context.getTimeFormat()
         }
     }