diff --git a/app/build.gradle b/app/build.gradle index a550645b..b2320df0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -45,7 +45,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:4.2.8' + implementation 'com.simplemobiletools:commons:4.4.8' implementation files('../libs/RootTools.jar') diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 62592ddc..d6722f50 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,13 +17,7 @@ - - - - - - + android:theme="@style/SplashTheme"/> @@ -105,19 +99,6 @@ android:resource="@xml/provider_paths"/> - - - - - - - - + + + + + + + + val view = holder.bindView(fileDirItem, true, true) { itemView, layoutPosition -> setupView(itemView, fileDirItem) } bindViewHolder(holder, position, view) diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ManageFavoritesAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ManageFavoritesAdapter.kt index 3d4da7a1..cbda7dc6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ManageFavoritesAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ManageFavoritesAdapter.kt @@ -38,11 +38,13 @@ class ManageFavoritesAdapter(activity: BaseSimpleActivity, var favorites: ArrayL override fun getSelectableItemCount() = favorites.size + override fun getIsItemSelectable(position: Int) = true + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = createViewHolder(R.layout.item_manage_favorite, parent) override fun onBindViewHolder(holder: ViewHolder, position: Int) { val favorite = favorites[position] - val view = holder.bindView(favorite) { itemView, layoutPosition -> + val view = holder.bindView(favorite, true, true) { itemView, layoutPosition -> setupView(itemView, favorite) } bindViewHolder(holder, position, view) diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt index a2ce9c48..1f3a6994 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt @@ -161,7 +161,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb getRecyclerLayoutManager().onRestoreInstanceState(scrollStates[currentPath]) items_list.onGlobalLayout { - items_fastscroller.setScrollTo(items_list.computeVerticalScrollOffset()) + items_fastscroller.setScrollToY(items_list.computeVerticalScrollOffset()) } } } @@ -299,7 +299,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb override fun deleteFiles(files: ArrayList) { val hasFolder = files.any { it.isDirectory } val firstPath = files.firstOrNull()?.path - if (firstPath == null || firstPath.isEmpty()) { + if (firstPath == null || firstPath.isEmpty() || context == null) { return } diff --git a/app/src/main/res/menu/cab.xml b/app/src/main/res/menu/cab.xml index ba290ac4..bc84f21c 100644 --- a/app/src/main/res/menu/cab.xml +++ b/app/src/main/res/menu/cab.xml @@ -13,7 +13,7 @@ app:showAsAction="ifRoom"/>