From 6d1c2feb76af93fe727bef77e874a03f307fd874 Mon Sep 17 00:00:00 2001
From: Naveen <snaveen935@gmail.com>
Date: Mon, 19 Sep 2022 03:44:11 +0530
Subject: [PATCH] Show progress when loading files

---
 .../pro/fragments/ItemsFragment.kt            | 24 +++++++++++++------
 app/src/main/res/layout/items_fragment.xml    |  4 +++-
 2 files changed, 20 insertions(+), 8 deletions(-)

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 9826a5b9..9cc1e961 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
@@ -58,8 +58,8 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
 
         val properPrimaryColor = context!!.getProperPrimaryColor()
         items_fastscroller.updateColors(properPrimaryColor)
-        search_progress.setIndicatorColor(properPrimaryColor)
-        search_progress.trackColor = properPrimaryColor.adjustAlpha(LOWER_ALPHA)
+        progress_bar.setIndicatorColor(properPrimaryColor)
+        progress_bar.trackColor = properPrimaryColor.adjustAlpha(LOWER_ALPHA)
 
         if (currentPath != "") {
             breadcrumbs.updateColor(textColor)
@@ -95,6 +95,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
         scrollStates[currentPath] = getScrollState()!!
         currentPath = realPath
         showHidden = context!!.config.shouldShowHidden
+        showProgressBar()
         getItems(currentPath) { originalPath, listItems ->
             if (currentPath != originalPath) {
                 return@getItems
@@ -120,6 +121,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
                 if (context != null && currentViewType != context!!.config.getFolderViewType(currentPath)) {
                     setupLayoutManager()
                 }
+                hideProgressBar()
             }
         }
     }
@@ -298,16 +300,16 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
                 getRecyclerAdapter()?.updateItems(itemsIgnoringSearch)
                 items_placeholder.beGone()
                 items_placeholder_2.beGone()
-                search_progress.hide()
+                hideProgressBar()
             }
             searchText.length == 1 -> {
                 items_fastscroller.beGone()
                 items_placeholder.beVisible()
                 items_placeholder_2.beVisible()
-                search_progress.hide()
+                hideProgressBar()
             }
             else -> {
-                search_progress.show()
+                showProgressBar()
                 ensureBackgroundThread {
                     val files = searchFiles(searchText, currentPath)
                     files.sortBy { it.getParentPath() }
@@ -343,7 +345,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
                         items_fastscroller.beVisibleIf(listItems.isNotEmpty())
                         items_placeholder.beVisibleIf(listItems.isEmpty())
                         items_placeholder_2.beGone()
-                        search_progress.hide()
+                        hideProgressBar()
                     }
                 }
             }
@@ -404,7 +406,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
         items_fastscroller.beVisible()
         items_placeholder.beGone()
         items_placeholder_2.beGone()
-        search_progress.hide()
+        hideProgressBar()
     }
 
     private fun createNewItem() {
@@ -498,6 +500,14 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
         }
     }
 
+    private fun showProgressBar() {
+        progress_bar.show()
+    }
+
+    private fun hideProgressBar() {
+        progress_bar.hide()
+    }
+
     override fun toggleFilenameVisibility() {
         getRecyclerAdapter()?.updateDisplayFilenamesInGrid()
     }
diff --git a/app/src/main/res/layout/items_fragment.xml b/app/src/main/res/layout/items_fragment.xml
index d30b35cc..dfae248c 100644
--- a/app/src/main/res/layout/items_fragment.xml
+++ b/app/src/main/res/layout/items_fragment.xml
@@ -27,12 +27,14 @@
                 android:paddingBottom="@dimen/small_margin" />
 
             <com.google.android.material.progressindicator.LinearProgressIndicator
-                android:id="@+id/search_progress"
+                android:id="@+id/progress_bar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
                 android:indeterminate="true"
                 android:visibility="gone"
+                app:hideAnimationBehavior="outward"
+                app:showAnimationBehavior="inward"
                 app:showDelay="250"
                 tools:visibility="visible" />