diff --git a/app/build.gradle b/app/build.gradle index a4579899..9a32275e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -58,7 +58,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.29.1' + implementation 'com.simplemobiletools:commons:5.29.14' 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 53a38fc5..61478043 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 @@ -202,7 +202,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList RenameDialog(activity, paths) { + else -> RenameDialog(activity, paths, false) { activity.runOnUiThread { listener?.refreshItems() finishActMode() 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 6db83309..a9a360b0 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 @@ -108,7 +108,6 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb } mView.items_fastscroller.updateBubbleColors() - mView.items_fastscroller.allowBubbleDisplay = true if (!isFirstResume) { refreshItems() } @@ -161,7 +160,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb mView.apply { activity?.runOnUiThread { items_swipe_refresh?.isRefreshing = false - mView.breadcrumbs.setBreadcrumb(currentPath) + breadcrumbs.setBreadcrumb(currentPath) if (!forceRefresh && items.hashCode() == storedItems.hashCode()) { return@runOnUiThread } @@ -173,8 +172,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb items_list.adapter = this } - items_fastscroller.allowBubbleDisplay = true - items_fastscroller.setViews(items_list, mView.items_swipe_refresh) { + items_fastscroller.setViews(items_list, items_swipe_refresh) { items_fastscroller.updateBubbleText(storedItems.getOrNull(it)?.getBubbleText(context, storedDateFormat, storedTimeFormat) ?: "") } diff --git a/build.gradle b/build.gradle index ce69eb38..007682d4 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.6.3' + classpath 'com.android.tools.build:gradle:4.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7073f765..64a344a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Mar 15 19:52:11 CET 2020 +#Fri Jun 19 20:19:02 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip