adding some top menu related improvements

tibbi · tibbi · commit 0c648d4f88e9 · 2021-05-19T21:33:55.000+02:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -58,7 +58,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:2e11262b38'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:f07ca31126'
     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/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt
@@ -414,6 +414,7 @@ class MainActivity : SimpleActivity() {
     }
 
     private fun toggleFilenameVisibility() {
+        config.displayFilenames = !config.displayFilenames
         getAllFragments().forEach {
             it?.toggleFilenameVisibility()
         }
@@ -455,8 +456,10 @@ class MainActivity : SimpleActivity() {
     }
 
     private fun changeViewType() {
-        ChangeViewTypeDialog(this, getCurrentFragment().currentPath) {
-            getCurrentFragment().refreshItems()
+        ChangeViewTypeDialog(this, getCurrentFragment().currentPath, getCurrentFragment() is ItemsFragment) {
+            getAllFragments().forEach {
+                it?.refreshItems()
+            }
         }
     }
 
@@ -472,7 +475,9 @@ class MainActivity : SimpleActivity() {
 
     private fun toggleTemporarilyShowHidden(show: Boolean) {
         config.temporarilyShowHidden = show
-        openPath(getCurrentFragment().currentPath)
+        getAllFragments().forEach {
+            it?.refreshItems()
+        }
     }
 
     private fun launchAbout() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/ChangeViewTypeDialog.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/ChangeViewTypeDialog.kt
@@ -3,14 +3,16 @@ package com.simplemobiletools.filemanager.pro.dialogs
 import android.view.View
 import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
+import com.simplemobiletools.commons.extensions.beGone
+import com.simplemobiletools.commons.extensions.beVisibleIf
 import com.simplemobiletools.commons.extensions.setupDialogStuff
 import com.simplemobiletools.commons.helpers.VIEW_TYPE_GRID
 import com.simplemobiletools.commons.helpers.VIEW_TYPE_LIST
 import com.simplemobiletools.filemanager.pro.R
 import com.simplemobiletools.filemanager.pro.extensions.config
 import kotlinx.android.synthetic.main.dialog_change_view_type.view.*
 
-class ChangeViewTypeDialog(val activity: BaseSimpleActivity, val path: String = "", val callback: () -> Unit) {
+class ChangeViewTypeDialog(val activity: BaseSimpleActivity, val path: String = "", showFolderCheck: Boolean = true, val callback: () -> Unit) {
     private var view: View
     private var config = activity.config
 
@@ -24,6 +26,11 @@ class ChangeViewTypeDialog(val activity: BaseSimpleActivity, val path: String =
             }
 
             change_view_type_dialog_radio.check(viewToCheck)
+            if (!showFolderCheck) {
+                use_for_this_folder_divider.beGone()
+                change_view_type_dialog_use_for_this_folder.beGone()
+            }
+
             change_view_type_dialog_use_for_this_folder.apply {
                 isChecked = config.hasCustomViewType(this@ChangeViewTypeDialog.path)
             }
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
@@ -477,7 +477,6 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
     }
 
     override fun toggleFilenameVisibility() {
-        context?.config?.displayFilenames = !context!!.config.displayFilenames
         getRecyclerAdapter()?.updateDisplayFilenamesInGrid()
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/RecentsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/RecentsFragment.kt
@@ -44,6 +44,7 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
     override fun setupColors(textColor: Int, adjustedPrimaryColor: Int) {}
 
     private fun getRecents(callback: (recents: ArrayList<ListItem>) -> Unit) {
+        val showHidden = context?.config?.shouldShowHidden ?: return
         val uri = MediaStore.Files.getContentUri("external")
         val projection = arrayOf(
             MediaStore.Files.FileColumns.DATA,
@@ -52,7 +53,7 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
             MediaStore.Files.FileColumns.SIZE
         )
 
-        val sortOrder = "${MediaStore.Files.FileColumns.DATE_MODIFIED} DESC LIMIT 50"
+        val sortOrder = "${MediaStore.Files.FileColumns.DATE_MODIFIED} DESC"
         val cursor = context?.contentResolver?.query(uri, projection, null, null, sortOrder)
         val listItems = arrayListOf<ListItem>()
 
@@ -64,7 +65,9 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
                     val size = cursor.getLongValue(MediaStore.Files.FileColumns.SIZE)
                     val modified = cursor.getLongValue(MediaStore.Files.FileColumns.DATE_MODIFIED) * 1000
                     val fileDirItem = ListItem(path, name, false, 0, size, modified, false)
-                    listItems.add(fileDirItem)
+                    if (showHidden || !name.startsWith(".")) {
+                        listItems.add(fileDirItem)
+                    }
                 } while (cursor.moveToNext())
             }
         }
@@ -77,12 +80,10 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
     private fun getRecyclerAdapter() = recents_list.adapter as? ItemsAdapter
 
     override fun toggleFilenameVisibility() {
-        context?.config?.displayFilenames = !context!!.config.displayFilenames
         getRecyclerAdapter()?.updateDisplayFilenamesInGrid()
     }
 
     override fun increaseColumnCount() {
-        context?.config?.fileColumnCnt = ++(recents_list.layoutManager as MyGridLayoutManager).spanCount
         columnCountChanged()
     }
 
diff --git a/app/src/main/res/layout/recents_fragment.xml b/app/src/main/res/layout/recents_fragment.xml
@@ -30,6 +30,7 @@
             android:layout_height="match_parent"
             android:clipToPadding="false"
             android:layoutAnimation="@anim/layout_animation"
+            android:paddingTop="@dimen/medium_margin"
             android:scrollbars="none"
             app:layoutManager="com.simplemobiletools.commons.views.MyGridLayoutManager" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml
@@ -1,72 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/search"
         android:icon="@drawable/ic_search_vector"
         android:title="@string/search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:showAsAction="collapseActionView|always"/>
+        app:showAsAction="collapseActionView|always" />
     <item
         android:id="@+id/go_home"
         android:icon="@drawable/ic_home_vector"
         android:title="@string/go_to_home_folder"
-        app:showAsAction="always"/>
+        app:showAsAction="always" />
     <item
         android:id="@+id/go_to_favorite"
         android:icon="@drawable/ic_folder_open_vector"
         android:title="@string/go_to_favorite"
-        app:showAsAction="always"/>
+        app:showAsAction="always" />
     <item
         android:id="@+id/sort"
         android:icon="@drawable/ic_sort_vector"
         android:title="@string/sort_by"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/add_favorite"
         android:icon="@drawable/ic_star_off_vector"
         android:title="@string/add_to_favorites"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/remove_favorite"
         android:icon="@drawable/ic_star_on_vector"
         android:title="@string/remove_from_favorites"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/toggle_filename"
         android:icon="@drawable/ic_label_vector"
         android:title="@string/toggle_filename"
         app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/set_as_home"
-        android:title="@string/set_as_home_folder"
-        app:showAsAction="never"/>
     <item
         android:id="@+id/change_view_type"
+        android:icon="@drawable/ic_change_view_vector"
         android:title="@string/change_view_type"
-        app:showAsAction="never"/>
+        app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/set_as_home"
+        android:title="@string/set_as_home_folder"
+        app:showAsAction="never" />
     <item
         android:id="@+id/temporarily_show_hidden"
         android:title="@string/temporarily_show_hidden"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/stop_showing_hidden"
         android:title="@string/stop_showing_hidden"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/increase_column_count"
         android:title="@string/increase_column_count"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/reduce_column_count"
         android:title="@string/reduce_column_count"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/settings"
         android:title="@string/settings"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/about"
         android:title="@string/about"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
 </menu>

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ android {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`dependencies {`
`61`		`- implementation 'com.github.SimpleMobileTools:Simple-Commons:2e11262b38'`
	`61`	`+ implementation 'com.github.SimpleMobileTools:Simple-Commons:f07ca31126'`
`62`	`62`	`implementation 'com.github.Stericson:RootTools:df729dcb13'`
`63`	`63`	`implementation 'com.github.Stericson:RootShell:1.6'`
`64`	`64`	`implementation 'com.alexvasilkov:gesture-views:2.5.2'`
Original file line number	Diff line number	Diff line change
`@@ -414,6 +414,7 @@ class MainActivity : SimpleActivity() {`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`private fun toggleFilenameVisibility() {`
	`417`	`+ config.displayFilenames = !config.displayFilenames`
`417`	`418`	`getAllFragments().forEach {`
`418`	`419`	`it?.toggleFilenameVisibility()`
`419`	`420`	`}`
`@@ -455,8 +456,10 @@ class MainActivity : SimpleActivity() {`
`455`	`456`	`}`
`456`	`457`
`457`	`458`	`private fun changeViewType() {`
`458`		`- ChangeViewTypeDialog(this, getCurrentFragment().currentPath) {`
`459`		`- getCurrentFragment().refreshItems()`
	`459`	`+ ChangeViewTypeDialog(this, getCurrentFragment().currentPath, getCurrentFragment() is ItemsFragment) {`
	`460`	`+ getAllFragments().forEach {`
	`461`	`+ it?.refreshItems()`
	`462`	`+ }`
`460`	`463`	`}`
`461`	`464`	`}`
`462`	`465`
`@@ -472,7 +475,9 @@ class MainActivity : SimpleActivity() {`
`472`	`475`
`473`	`476`	`private fun toggleTemporarilyShowHidden(show: Boolean) {`
`474`	`477`	`config.temporarilyShowHidden = show`
`475`		`- openPath(getCurrentFragment().currentPath)`
	`478`	`+ getAllFragments().forEach {`
	`479`	`+ it?.refreshItems()`
	`480`	`+ }`
`476`	`481`	`}`
`477`	`482`
`478`	`483`	`private fun launchAbout() {`
Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,6 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF`
`477`	`477`	`}`
`478`	`478`
`479`	`479`	`override fun toggleFilenameVisibility() {`
`480`		`- context?.config?.displayFilenames = !context!!.config.displayFilenames`
`481`	`480`	`getRecyclerAdapter()?.updateDisplayFilenamesInGrid()`
`482`	`481`	`}`
`483`	`482`