mirror of
https://github.com/SimpleMobileTools/Simple-File-Manager.git
synced 2025-06-05 22:09:15 +02:00
renaming refreshItems to refreshFragment
This commit is contained in:
@ -316,7 +316,7 @@ class MainActivity : SimpleActivity() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (refreshRecents) {
|
if (refreshRecents) {
|
||||||
recents_fragment?.refreshItems()
|
recents_fragment?.refreshFragment()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -449,7 +449,7 @@ class MainActivity : SimpleActivity() {
|
|||||||
|
|
||||||
private fun showSortingDialog() {
|
private fun showSortingDialog() {
|
||||||
ChangeSortingDialog(this, getCurrentFragment()!!.currentPath) {
|
ChangeSortingDialog(this, getCurrentFragment()!!.currentPath) {
|
||||||
(getCurrentFragment() as? ItemsFragment)?.refreshItems()
|
(getCurrentFragment() as? ItemsFragment)?.refreshFragment()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -506,7 +506,7 @@ class MainActivity : SimpleActivity() {
|
|||||||
private fun changeViewType() {
|
private fun changeViewType() {
|
||||||
ChangeViewTypeDialog(this, getCurrentFragment()!!.currentPath, getCurrentFragment() is ItemsFragment) {
|
ChangeViewTypeDialog(this, getCurrentFragment()!!.currentPath, getCurrentFragment() is ItemsFragment) {
|
||||||
getAllFragments().forEach {
|
getAllFragments().forEach {
|
||||||
it?.refreshItems()
|
it?.refreshFragment()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -524,7 +524,7 @@ class MainActivity : SimpleActivity() {
|
|||||||
private fun toggleTemporarilyShowHidden(show: Boolean) {
|
private fun toggleTemporarilyShowHidden(show: Boolean) {
|
||||||
config.temporarilyShowHidden = show
|
config.temporarilyShowHidden = show
|
||||||
getAllFragments().forEach {
|
getAllFragments().forEach {
|
||||||
it?.refreshItems()
|
it?.refreshFragment()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -214,20 +214,20 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
|
|||||||
RenameItemDialog(activity, oldPath) {
|
RenameItemDialog(activity, oldPath) {
|
||||||
activity.config.moveFavorite(oldPath, it)
|
activity.config.moveFavorite(oldPath, it)
|
||||||
activity.runOnUiThread {
|
activity.runOnUiThread {
|
||||||
listener?.refreshItems()
|
listener?.refreshFragment()
|
||||||
finishActMode()
|
finishActMode()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fileDirItems.any { it.isDirectory } -> RenameItemsDialog(activity, paths) {
|
fileDirItems.any { it.isDirectory } -> RenameItemsDialog(activity, paths) {
|
||||||
activity.runOnUiThread {
|
activity.runOnUiThread {
|
||||||
listener?.refreshItems()
|
listener?.refreshFragment()
|
||||||
finishActMode()
|
finishActMode()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else -> RenameDialog(activity, paths, false) {
|
else -> RenameDialog(activity, paths, false) {
|
||||||
activity.runOnUiThread {
|
activity.runOnUiThread {
|
||||||
listener?.refreshItems()
|
listener?.refreshFragment()
|
||||||
finishActMode()
|
finishActMode()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -258,7 +258,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
|
|||||||
activity.toggleItemVisibility(it.path, hide)
|
activity.toggleItemVisibility(it.path, hide)
|
||||||
}
|
}
|
||||||
activity.runOnUiThread {
|
activity.runOnUiThread {
|
||||||
listener?.refreshItems()
|
listener?.refreshFragment()
|
||||||
finishActMode()
|
finishActMode()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -392,18 +392,18 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
|
|||||||
sourceFile.list()?.isEmpty() == true && sourceFile.getProperSize(true) == 0L && sourceFile.getFileCount(true) == 0) {
|
sourceFile.list()?.isEmpty() == true && sourceFile.getProperSize(true) == 0L && sourceFile.getFileCount(true) == 0) {
|
||||||
val sourceFolder = sourceFile.toFileDirItem(activity)
|
val sourceFolder = sourceFile.toFileDirItem(activity)
|
||||||
activity.deleteFile(sourceFolder, true) {
|
activity.deleteFile(sourceFolder, true) {
|
||||||
listener?.refreshItems()
|
listener?.refreshFragment()
|
||||||
activity.runOnUiThread {
|
activity.runOnUiThread {
|
||||||
finishActMode()
|
finishActMode()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
listener?.refreshItems()
|
listener?.refreshFragment()
|
||||||
finishActMode()
|
finishActMode()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
listener?.refreshItems()
|
listener?.refreshFragment()
|
||||||
finishActMode()
|
finishActMode()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -423,7 +423,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
|
|||||||
}
|
}
|
||||||
|
|
||||||
activity.runOnUiThread {
|
activity.runOnUiThread {
|
||||||
listener?.refreshItems()
|
listener?.refreshFragment()
|
||||||
finishActMode()
|
finishActMode()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -450,7 +450,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
|
|||||||
if (compressPaths(paths, destination)) {
|
if (compressPaths(paths, destination)) {
|
||||||
activity.runOnUiThread {
|
activity.runOnUiThread {
|
||||||
activity.toast(R.string.compression_successful)
|
activity.toast(R.string.compression_successful)
|
||||||
listener?.refreshItems()
|
listener?.refreshFragment()
|
||||||
finishActMode()
|
finishActMode()
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -478,7 +478,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
|
|||||||
if (it) {
|
if (it) {
|
||||||
activity.toast(R.string.decompression_successful)
|
activity.toast(R.string.decompression_successful)
|
||||||
activity.runOnUiThread {
|
activity.runOnUiThread {
|
||||||
listener?.refreshItems()
|
listener?.refreshFragment()
|
||||||
finishActMode()
|
finishActMode()
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -41,7 +41,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
|
|||||||
override fun setupFragment(activity: SimpleActivity) {
|
override fun setupFragment(activity: SimpleActivity) {
|
||||||
if (this.activity == null) {
|
if (this.activity == null) {
|
||||||
this.activity = activity
|
this.activity = activity
|
||||||
items_swipe_refresh.setOnRefreshListener { refreshItems() }
|
items_swipe_refresh.setOnRefreshListener { refreshFragment() }
|
||||||
items_fab.setOnClickListener { createNewItem() }
|
items_fab.setOnClickListener { createNewItem() }
|
||||||
breadcrumbs.listener = this@ItemsFragment
|
breadcrumbs.listener = this@ItemsFragment
|
||||||
}
|
}
|
||||||
@ -386,7 +386,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
|
|||||||
private fun createNewItem() {
|
private fun createNewItem() {
|
||||||
CreateNewItemDialog(activity as SimpleActivity, currentPath) {
|
CreateNewItemDialog(activity as SimpleActivity, currentPath) {
|
||||||
if (it) {
|
if (it) {
|
||||||
refreshItems()
|
refreshFragment()
|
||||||
} else {
|
} else {
|
||||||
activity?.toast(R.string.unknown_error_occurred)
|
activity?.toast(R.string.unknown_error_occurred)
|
||||||
}
|
}
|
||||||
@ -499,7 +499,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun refreshItems() {
|
override fun refreshFragment() {
|
||||||
openPath(currentPath)
|
openPath(currentPath)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -38,5 +38,5 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
|
|||||||
|
|
||||||
abstract fun setupColors(textColor: Int, primaryColor: Int)
|
abstract fun setupColors(textColor: Int, primaryColor: Int)
|
||||||
|
|
||||||
abstract fun refreshItems()
|
abstract fun refreshFragment()
|
||||||
}
|
}
|
||||||
|
@ -27,13 +27,13 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
|
|||||||
override fun setupFragment(activity: SimpleActivity) {
|
override fun setupFragment(activity: SimpleActivity) {
|
||||||
if (this.activity == null) {
|
if (this.activity == null) {
|
||||||
this.activity = activity
|
this.activity = activity
|
||||||
recents_swipe_refresh.setOnRefreshListener { refreshItems() }
|
recents_swipe_refresh.setOnRefreshListener { refreshFragment() }
|
||||||
}
|
}
|
||||||
|
|
||||||
refreshItems()
|
refreshFragment()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun refreshItems() {
|
override fun refreshFragment() {
|
||||||
ensureBackgroundThread {
|
ensureBackgroundThread {
|
||||||
getRecents { recents ->
|
getRecents { recents ->
|
||||||
recents_swipe_refresh?.isRefreshing = false
|
recents_swipe_refresh?.isRefreshing = false
|
||||||
|
@ -11,7 +11,7 @@ import com.simplemobiletools.filemanager.pro.activities.SimpleActivity
|
|||||||
class StorageFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet) {
|
class StorageFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet) {
|
||||||
override fun setupFragment(activity: SimpleActivity) {}
|
override fun setupFragment(activity: SimpleActivity) {}
|
||||||
|
|
||||||
override fun refreshItems() {}
|
override fun refreshFragment() {}
|
||||||
|
|
||||||
override fun setupColors(textColor: Int, primaryColor: Int) {}
|
override fun setupColors(textColor: Int, primaryColor: Int) {}
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ import com.simplemobiletools.commons.models.FileDirItem
|
|||||||
import java.util.*
|
import java.util.*
|
||||||
|
|
||||||
interface ItemOperationsListener {
|
interface ItemOperationsListener {
|
||||||
fun refreshItems()
|
fun refreshFragment()
|
||||||
|
|
||||||
fun deleteFiles(files: ArrayList<FileDirItem>)
|
fun deleteFiles(files: ArrayList<FileDirItem>)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user