diff --git a/app/build.gradle b/app/build.gradle
index d0459fe6..33bb03be 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,13 +9,12 @@ if (keystorePropertiesFile.exists()) {
}
android {
- compileSdkVersion 29
- buildToolsVersion "29.0.3"
+ compileSdkVersion 30
defaultConfig {
applicationId "com.simplemobiletools.filemanager.pro"
minSdkVersion 21
- targetSdkVersion 29
+ targetSdkVersion 30
versionCode 110
versionName "6.10.1"
multiDexEnabled true
@@ -58,7 +57,7 @@ android {
}
dependencies {
- implementation 'com.github.SimpleMobileTools:Simple-Commons:5079455be9'
+ implementation 'com.github.SimpleMobileTools:Simple-Commons:51f1996098'
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/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3f67a418..728a26c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
+
-
-
-
-
Unit) {
+ actionOnPermission = null
+ if (hasStoragePermission()) {
+ callback(true)
+ } else {
+ if (isRPlus()) {
+ ConfirmationAdvancedDialog(this, "", R.string.access_storage_prompt, R.string.ok, 0) { success ->
+ if (success ) {
+ isAskingPermissions = true
+ actionOnPermission = callback
+ try {
+ val intent = Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION)
+ intent.addCategory("android.intent.category.DEFAULT")
+ intent.data = Uri.parse("package:$packageName")
+ startActivityForResult(intent, MANAGE_STORAGE_RC)
+ } catch (e: Exception) {
+ showErrorToast(e)
+ val intent = Intent()
+ intent.action = Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION
+ startActivityForResult(intent, MANAGE_STORAGE_RC)
+ }
+ } else {
+ finish()
+ }
+ }
+ } else {
+ handlePermission(PERMISSION_WRITE_STORAGE, callback)
+ }
+ }
+ }
+
+ @SuppressLint("NewApi")
+ private fun hasStoragePermission(): Boolean {
+ return if (isRPlus()) {
+ Environment.isExternalStorageManager()
+ } else {
+ hasPermission(PERMISSION_WRITE_STORAGE)
+ }
+ }
+
+ @SuppressLint("NewApi")
+ override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
+ super.onActivityResult(requestCode, resultCode, resultData)
+ isAskingPermissions = false
+ if (requestCode == MANAGE_STORAGE_RC && isRPlus()) {
+ actionOnPermission?.invoke(Environment.isExternalStorageManager())
+ }
+ }
+
private fun initFileManager(refreshRecents: Boolean) {
if (intent.action == Intent.ACTION_VIEW && intent.data != null) {
val data = intent.data
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt
index 6d89e220..7a6e236b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt
@@ -61,6 +61,9 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
ensureBackgroundThread {
reFetchItems()
}
+
+ val adjustedPrimaryColor = getAdjustedPrimaryColor()
+ mimetypes_fastscroller.updateColors(adjustedPrimaryColor, adjustedPrimaryColor.getContrastColor())
}
override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -130,13 +133,13 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
lastSearchedText = searchText
when {
searchText.isEmpty() -> {
- mimetypes_list.beVisible()
+ mimetypes_fastscroller.beVisible()
getRecyclerAdapter()?.updateItems(storedItems)
mimetypes_placeholder.beGoneIf(storedItems.isNotEmpty())
mimetypes_placeholder_2.beGone()
}
searchText.length == 1 -> {
- mimetypes_list.beGone()
+ mimetypes_fastscroller.beGone()
mimetypes_placeholder.beVisible()
mimetypes_placeholder_2.beVisible()
}
@@ -150,14 +153,9 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
runOnUiThread {
getRecyclerAdapter()?.updateItems(listItems, text)
- mimetypes_list.beVisibleIf(listItems.isNotEmpty())
+ mimetypes_fastscroller.beVisibleIf(listItems.isNotEmpty())
mimetypes_placeholder.beVisibleIf(listItems.isEmpty())
mimetypes_placeholder_2.beGone()
-
- mimetypes_list.onGlobalLayout {
- items_fastscroller.setScrollToY(mimetypes_list.computeVerticalScrollOffset())
- calculateContentHeight(listItems)
- }
}
}
}
@@ -232,7 +230,7 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
isSearchOpen = false
lastSearchedText = ""
- mimetypes_list.beVisible()
+ mimetypes_fastscroller.beVisible()
mimetypes_placeholder.beGoneIf(storedItems.isNotEmpty())
mimetypes_placeholder_2.beGone()
}
@@ -321,7 +319,7 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
}
storedItems = items
- ItemsAdapter(this as SimpleActivity, storedItems, this, mimetypes_list, false, items_fastscroller, null) {
+ ItemsAdapter(this as SimpleActivity, storedItems, this, mimetypes_list, false, null) {
tryOpenPathIntent((it as ListItem).path, false)
}.apply {
setupZoomListener(zoomListener)
@@ -332,13 +330,6 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
mimetypes_list.scheduleLayoutAnimation()
}
- val dateFormat = config.dateFormat
- val timeFormat = getTimeFormat()
- items_fastscroller.setViews(mimetypes_list) {
- val listItem = getRecyclerAdapter()?.listItems?.getOrNull(it)
- items_fastscroller.updateBubbleText(listItem?.getBubbleText(this, dateFormat, timeFormat) ?: "")
- }
-
mimetypes_placeholder.beVisibleIf(items.isEmpty())
}
@@ -390,18 +381,9 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
invalidateOptionsMenu()
getRecyclerAdapter()?.apply {
notifyItemRangeChanged(0, listItems.size)
- calculateContentHeight(listItems)
}
}
- private fun calculateContentHeight(items: MutableList) {
- val layoutManager = mimetypes_list.layoutManager as MyGridLayoutManager
- val thumbnailHeight = layoutManager.getChildAt(0)?.height ?: 0
- val fullHeight = ((items.size - 1) / layoutManager.spanCount + 1) * thumbnailHeight
- items_fastscroller.setContentHeight(fullHeight)
- items_fastscroller.setScrollToY(mimetypes_list.computeVerticalScrollOffset())
- }
-
private fun setupLayoutManager() {
if (config.getFolderViewType(currentMimeType) == VIEW_TYPE_GRID) {
currentViewType = VIEW_TYPE_GRID
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/DecompressItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/DecompressItemsAdapter.kt
index 9c3c561c..abc7a9a9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/DecompressItemsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/DecompressItemsAdapter.kt
@@ -12,7 +12,6 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
import com.bumptech.glide.request.RequestOptions
import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor
-import com.simplemobiletools.commons.extensions.getFileSignature
import com.simplemobiletools.commons.extensions.getTextSize
import com.simplemobiletools.commons.extensions.getTimeFormat
import com.simplemobiletools.commons.helpers.getFilePlaceholderDrawables
@@ -25,7 +24,7 @@ import kotlinx.android.synthetic.main.item_file_dir_list.view.*
import java.util.*
class DecompressItemsAdapter(activity: SimpleActivity, var listItems: MutableList, recyclerView: MyRecyclerView, itemClick: (Any) -> Unit) :
- MyRecyclerViewAdapter(activity, recyclerView, null, itemClick) {
+ MyRecyclerViewAdapter(activity, recyclerView, itemClick) {
private lateinit var fileDrawable: Drawable
private lateinit var folderDrawable: Drawable
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 67f3bc68..b4b3d241 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
@@ -24,13 +24,13 @@ import com.bumptech.glide.load.resource.bitmap.CenterCrop
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
import com.bumptech.glide.request.RequestOptions
+import com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
import com.simplemobiletools.commons.dialogs.*
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.*
import com.simplemobiletools.commons.models.FileDirItem
import com.simplemobiletools.commons.models.RadioItem
-import com.simplemobiletools.commons.views.FastScroller
import com.simplemobiletools.commons.views.MyRecyclerView
import com.simplemobiletools.filemanager.pro.R
import com.simplemobiletools.filemanager.pro.activities.SimpleActivity
@@ -47,19 +47,19 @@ import kotlinx.android.synthetic.main.item_file_dir_list.view.item_frame
import kotlinx.android.synthetic.main.item_file_dir_list.view.item_icon
import kotlinx.android.synthetic.main.item_file_dir_list.view.item_name
import kotlinx.android.synthetic.main.item_section.view.*
+import java.io.BufferedInputStream
import java.io.Closeable
import java.io.File
-import java.io.FileInputStream
import java.util.*
import java.util.zip.ZipEntry
-import java.util.zip.ZipFile
+import java.util.zip.ZipInputStream
import java.util.zip.ZipOutputStream
class ItemsAdapter(
activity: SimpleActivity, var listItems: MutableList, val listener: ItemOperationsListener?, recyclerView: MyRecyclerView,
- val isPickMultipleIntent: Boolean, fastScroller: FastScroller?, val swipeRefreshLayout: SwipeRefreshLayout?, itemClick: (Any) -> Unit
+ val isPickMultipleIntent: Boolean, val swipeRefreshLayout: SwipeRefreshLayout?, itemClick: (Any) -> Unit
) :
- MyRecyclerViewAdapter(activity, recyclerView, fastScroller, itemClick) {
+ MyRecyclerViewAdapter(activity, recyclerView, itemClick), RecyclerViewFastScroller.OnPopupTextUpdate {
private val TYPE_FILE_DIR = 1
private val TYPE_SECTION = 2
@@ -326,16 +326,29 @@ class ItemsAdapter(
}
}
+ @SuppressLint("NewApi")
private fun addFileUris(path: String, paths: ArrayList) {
if (activity.getIsPathDirectory(path)) {
val shouldShowHidden = activity.config.shouldShowHidden
- if (activity.isPathOnOTG(path)) {
- activity.getDocumentFile(path)?.listFiles()?.filter { if (shouldShowHidden) true else !it.name!!.startsWith(".") }?.forEach {
- addFileUris(it.uri.toString(), paths)
+ when {
+ activity.isRestrictedSAFOnlyRoot(path) -> {
+ activity.getAndroidSAFFileItems(path, shouldShowHidden, false) { files ->
+ files.forEach {
+ addFileUris(activity.getAndroidSAFUri(it.path).toString(), paths)
+ }
+ }
}
- } else {
- File(path).listFiles()?.filter { if (shouldShowHidden) true else !it.name.startsWith('.') }?.forEach {
- addFileUris(it.absolutePath, paths)
+
+ activity.isPathOnOTG(path) -> {
+ activity.getDocumentFile(path)?.listFiles()?.filter { if (shouldShowHidden) true else !it.name!!.startsWith(".") }?.forEach {
+ addFileUris(it.uri.toString(), paths)
+ }
+ }
+
+ else -> {
+ File(path).listFiles()?.filter { if (shouldShowHidden) true else !it.name.startsWith('.') }?.forEach {
+ addFileUris(it.absolutePath, paths)
+ }
}
}
} else {
@@ -390,20 +403,30 @@ class ItemsAdapter(
activity.copyMoveFilesTo(files, source, it, isCopyOperation, false, activity.config.shouldShowHidden) {
if (!isCopyOperation) {
files.forEach { sourceFileDir ->
- val sourceFile = File(sourceFileDir.path)
- if (activity.getDoesFilePathExist(source) && activity.getIsPathDirectory(source) &&
- sourceFile.list()?.isEmpty() == true && sourceFile.getProperSize(true) == 0L && sourceFile.getFileCount(true) == 0
- ) {
- val sourceFolder = sourceFile.toFileDirItem(activity)
- activity.deleteFile(sourceFolder, true) {
+ val sourcePath = sourceFileDir.path
+ if (activity.isRestrictedSAFOnlyRoot(sourcePath) && activity.getDoesFilePathExist(sourcePath)) {
+ activity.deleteFile(sourceFileDir, true) {
listener?.refreshFragment()
activity.runOnUiThread {
finishActMode()
}
}
} else {
- listener?.refreshFragment()
- finishActMode()
+ val sourceFile = File(sourcePath)
+ if (activity.getDoesFilePathExist(source) && activity.getIsPathDirectory(source) &&
+ sourceFile.list()?.isEmpty() == true && sourceFile.getProperSize(true) == 0L && sourceFile.getFileCount(true) == 0
+ ) {
+ val sourceFolder = sourceFile.toFileDirItem(activity)
+ activity.deleteFile(sourceFolder, true) {
+ listener?.refreshFragment()
+ activity.runOnUiThread {
+ finishActMode()
+ }
+ }
+ } else {
+ listener?.refreshFragment()
+ finishActMode()
+ }
}
}
} else {
@@ -443,22 +466,27 @@ class ItemsAdapter(
CompressAsDialog(activity, firstPath) {
val destination = it
- activity.handleSAFDialog(firstPath) {
- if (!it) {
- return@handleSAFDialog
+ activity.handleAndroidSAFDialog(firstPath) { granted ->
+ if (!granted) {
+ return@handleAndroidSAFDialog
}
+ activity.handleSAFDialog(firstPath) {
+ if (!it) {
+ return@handleSAFDialog
+ }
- activity.toast(R.string.compressing)
- val paths = getSelectedFileDirItems().map { it.path }
- ensureBackgroundThread {
- if (compressPaths(paths, destination)) {
- activity.runOnUiThread {
- activity.toast(R.string.compression_successful)
- listener?.refreshFragment()
- finishActMode()
+ activity.toast(R.string.compressing)
+ val paths = getSelectedFileDirItems().map { it.path }
+ ensureBackgroundThread {
+ if (compressPaths(paths, destination)) {
+ activity.runOnUiThread {
+ activity.toast(R.string.compression_successful)
+ listener?.refreshFragment()
+ finishActMode()
+ }
+ } else {
+ activity.toast(R.string.compressing_failed)
}
- } else {
- activity.toast(R.string.compressing_failed)
}
}
}
@@ -478,103 +506,108 @@ class ItemsAdapter(
}
val paths = getSelectedFileDirItems().asSequence().map { it.path }.filter { it.isZipFile() }.toList()
- tryDecompressingPaths(paths) {
- if (it) {
- activity.toast(R.string.decompression_successful)
+ ensureBackgroundThread {
+ tryDecompressingPaths(paths) { success ->
activity.runOnUiThread {
- listener?.refreshFragment()
- finishActMode()
+ if (success) {
+ activity.toast(R.string.decompression_successful)
+ listener?.refreshFragment()
+ finishActMode()
+ } else {
+ activity.toast(R.string.decompressing_failed)
+ }
}
- } else {
- activity.toast(R.string.decompressing_failed)
}
}
}
}
private fun tryDecompressingPaths(sourcePaths: List, callback: (success: Boolean) -> Unit) {
- sourcePaths.forEach {
- try {
- val zipFile = ZipFile(it)
- val entries = zipFile.entries()
- val fileDirItems = ArrayList()
- while (entries.hasMoreElements()) {
- val entry = entries.nextElement()
- val currPath = if (entry.isDirectory) it else "${it.getParentPath().trimEnd('/')}/${entry.name}"
- val fileDirItem = FileDirItem(currPath, entry.name, entry.isDirectory, 0, entry.size)
- fileDirItems.add(fileDirItem)
- }
-
- val destinationPath = fileDirItems.first().getParentPath().trimEnd('/')
- activity.checkConflicts(fileDirItems, destinationPath, 0, LinkedHashMap()) {
- ensureBackgroundThread {
- decompressPaths(sourcePaths, it, callback)
+ sourcePaths.forEach { path ->
+ ZipInputStream(BufferedInputStream(activity.getFileInputStreamSync(path))).use { zipInputStream ->
+ try {
+ val fileDirItems = ArrayList()
+ var entry = zipInputStream.nextEntry
+ while (entry != null) {
+ val currPath = if (entry.isDirectory) path else "${path.getParentPath().trimEnd('/')}/${entry.name}"
+ val fileDirItem = FileDirItem(currPath, entry.name, entry.isDirectory, 0, entry.size)
+ fileDirItems.add(fileDirItem)
+ zipInputStream.closeEntry()
+ entry = zipInputStream.nextEntry
}
+ zipInputStream.closeEntry()
+ val destinationPath = fileDirItems.first().getParentPath().trimEnd('/')
+ activity.checkConflicts(fileDirItems, destinationPath, 0, LinkedHashMap()) {
+ ensureBackgroundThread {
+ decompressPaths(sourcePaths, it, callback)
+ }
+ }
+ } catch (exception: Exception) {
+ activity.showErrorToast(exception)
}
- } catch (exception: Exception) {
- activity.showErrorToast(exception)
}
}
}
private fun decompressPaths(paths: List, conflictResolutions: LinkedHashMap, callback: (success: Boolean) -> Unit) {
- paths.forEach {
- try {
- val zipFile = ZipFile(it)
- val entries = zipFile.entries()
- val zipFileName = it.getFilenameFromPath()
- val newFolderName = zipFileName.subSequence(0, zipFileName.length - 4)
- while (entries.hasMoreElements()) {
- val entry = entries.nextElement()
- val parentPath = it.getParentPath()
- val newPath = "$parentPath/$newFolderName/${entry.name.trimEnd('/')}"
+ paths.forEach { path ->
+ val zipInputStream = ZipInputStream(BufferedInputStream(activity.getFileInputStreamSync(path)))
+ zipInputStream.use {
+ try {
+ var entry = zipInputStream.nextEntry
+ val zipFileName = path.getFilenameFromPath()
+ val newFolderName = zipFileName.subSequence(0, zipFileName.length - 4)
+ while (entry != null) {
+ val parentPath = path.getParentPath()
+ val newPath = "$parentPath/$newFolderName/${entry.name.trimEnd('/')}"
- val resolution = getConflictResolution(conflictResolutions, newPath)
- val doesPathExist = activity.getDoesFilePathExist(newPath)
- if (doesPathExist && resolution == CONFLICT_OVERWRITE) {
- val fileDirItem = FileDirItem(newPath, newPath.getFilenameFromPath(), entry.isDirectory)
- if (activity.getIsPathDirectory(it)) {
- activity.deleteFolderBg(fileDirItem, false) {
- if (it) {
- extractEntry(newPath, entry, zipFile)
- } else {
- callback(false)
- }
- }
- } else {
- activity.deleteFileBg(fileDirItem, false) {
- if (it) {
- extractEntry(newPath, entry, zipFile)
- } else {
- callback(false)
+ val resolution = getConflictResolution(conflictResolutions, newPath)
+ val doesPathExist = activity.getDoesFilePathExist(newPath)
+ if (doesPathExist && resolution == CONFLICT_OVERWRITE) {
+ val fileDirItem = FileDirItem(newPath, newPath.getFilenameFromPath(), entry.isDirectory)
+ if (activity.getIsPathDirectory(path)) {
+ activity.deleteFolderBg(fileDirItem, false) {
+ if (it) {
+ extractEntry(newPath, entry, zipInputStream)
+ } else {
+ callback(false)
+ }
+ }
+ } else {
+ activity.deleteFileBg(fileDirItem, false) {
+ if (it) {
+ extractEntry(newPath, entry, zipInputStream)
+ } else {
+ callback(false)
+ }
}
}
+ } else if (!doesPathExist) {
+ extractEntry(newPath, entry, zipInputStream)
}
- } else if (!doesPathExist) {
- extractEntry(newPath, entry, zipFile)
+
+ zipInputStream.closeEntry()
+ entry = zipInputStream.nextEntry
}
+ callback(true)
+ } catch (e: Exception) {
+ activity.showErrorToast(e)
+ callback(false)
}
- callback(true)
- } catch (e: Exception) {
- activity.showErrorToast(e)
- callback(false)
}
}
}
- private fun extractEntry(newPath: String, entry: ZipEntry, zipFile: ZipFile) {
+ private fun extractEntry(newPath: String, entry: ZipEntry, zipInputStream: ZipInputStream) {
if (entry.isDirectory) {
if (!activity.createDirectorySync(newPath) && !activity.getDoesFilePathExist(newPath)) {
val error = String.format(activity.getString(R.string.could_not_create_file), newPath)
activity.showErrorToast(error)
}
} else {
- val ins = zipFile.getInputStream(entry)
- ins.use {
- val fos = activity.getFileOutputStreamSync(newPath, newPath.getMimeType())
- if (fos != null) {
- ins.copyTo(fos)
- }
+ val fos = activity.getFileOutputStreamSync(newPath, newPath.getMimeType())
+ if (fos != null) {
+ zipInputStream.copyTo(fos)
}
}
}
@@ -589,44 +622,64 @@ class ItemsAdapter(
}
}
+ @SuppressLint("NewApi")
private fun compressPaths(sourcePaths: List, targetPath: String): Boolean {
- val queue = LinkedList()
+ val queue = LinkedList()
val fos = activity.getFileOutputStreamSync(targetPath, "application/zip") ?: return false
val zout = ZipOutputStream(fos)
var res: Closeable = fos
try {
- sourcePaths.forEach {
+ sourcePaths.forEach { currentPath ->
var name: String
- var mainFile = File(it)
- val base = mainFile.parentFile.toURI()
+ var mainFilePath = currentPath
+ val base = "${mainFilePath.getParentPath()}/"
res = zout
- queue.push(mainFile)
- if (activity.getIsPathDirectory(mainFile.absolutePath)) {
- name = "${mainFile.name.trimEnd('/')}/"
+ queue.push(mainFilePath)
+ if (activity.getIsPathDirectory(mainFilePath)) {
+ name = "${mainFilePath.getFilenameFromPath()}/"
zout.putNextEntry(ZipEntry(name))
}
while (!queue.isEmpty()) {
- mainFile = queue.pop()
- if (activity.getIsPathDirectory(mainFile.absolutePath)) {
- for (file in mainFile.listFiles()) {
- name = base.relativize(file.toURI()).path
- if (activity.getIsPathDirectory(file.absolutePath)) {
- queue.push(file)
- name = "${name.trimEnd('/')}/"
- zout.putNextEntry(ZipEntry(name))
- } else {
- zout.putNextEntry(ZipEntry(name))
- FileInputStream(file).copyTo(zout)
- zout.closeEntry()
+ mainFilePath = queue.pop()
+ if (activity.getIsPathDirectory(mainFilePath)) {
+ if (activity.isRestrictedSAFOnlyRoot(mainFilePath)) {
+ activity.getAndroidSAFFileItems(mainFilePath, true) { files ->
+ for (file in files) {
+ name = file.path.relativizeWith(base)
+ if (activity.getIsPathDirectory(file.path)) {
+ queue.push(file.path)
+ name = "${name.trimEnd('/')}/"
+ zout.putNextEntry(ZipEntry(name))
+ } else {
+ zout.putNextEntry(ZipEntry(name))
+ activity.getFileInputStreamSync(file.path)!!.copyTo(zout)
+ zout.closeEntry()
+ }
+ }
+ }
+ } else {
+ val mainFile = File(mainFilePath)
+ for (file in mainFile.listFiles()) {
+ name = file.path.relativizeWith(base)
+ if (activity.getIsPathDirectory(file.absolutePath)) {
+ queue.push(file.absolutePath)
+ name = "${name.trimEnd('/')}/"
+ zout.putNextEntry(ZipEntry(name))
+ } else {
+ zout.putNextEntry(ZipEntry(name))
+ activity.getFileInputStreamSync(file.path)!!.copyTo(zout)
+ zout.closeEntry()
+ }
}
}
+
} else {
- name = if (base.path == it) it.getFilenameFromPath() else base.relativize(mainFile.toURI()).path
+ name = if (base == currentPath) currentPath.getFilenameFromPath() else mainFilePath.relativizeWith(base)
zout.putNextEntry(ZipEntry(name))
- FileInputStream(mainFile).copyTo(zout)
+ activity.getFileInputStreamSync(mainFilePath)!!.copyTo(zout)
zout.closeEntry()
}
}
@@ -708,7 +761,6 @@ class ItemsAdapter(
textToHighlight = highlightText
notifyDataSetChanged()
}
- fastScroller?.measureRecyclerView()
}
fun updateFontSizes() {
@@ -833,7 +885,9 @@ class ItemsAdapter(
path
}
- if (hasOTGConnected && itemToLoad is String && activity.isPathOnOTG(itemToLoad) && baseConfig.OTGTreeUri.isNotEmpty() && baseConfig.OTGPartition.isNotEmpty()) {
+ if (activity.isRestrictedSAFOnlyRoot(path)) {
+ itemToLoad = activity.getAndroidSAFUri(path)
+ } else if (hasOTGConnected && itemToLoad is String && activity.isPathOnOTG(itemToLoad) && baseConfig.OTGTreeUri.isNotEmpty() && baseConfig.OTGPartition.isNotEmpty()) {
itemToLoad = getOTGPublicPath(itemToLoad)
}
@@ -846,4 +900,6 @@ class ItemsAdapter(
fileDrawable = resources.getDrawable(R.drawable.ic_file_generic)
fileDrawables = getFilePlaceholderDrawables(activity)
}
+
+ override fun onChange(position: Int) = listItems.getOrNull(position)?.getBubbleText(activity, dateFormat, timeFormat) ?: ""
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ManageFavoritesAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ManageFavoritesAdapter.kt
index 43801fe3..3c281b5a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ManageFavoritesAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ManageFavoritesAdapter.kt
@@ -12,8 +12,10 @@ import com.simplemobiletools.filemanager.pro.extensions.config
import kotlinx.android.synthetic.main.item_manage_favorite.view.*
import java.util.*
-class ManageFavoritesAdapter(activity: BaseSimpleActivity, var favorites: ArrayList, val listener: RefreshRecyclerViewListener?,
- recyclerView: MyRecyclerView, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, null, itemClick) {
+class ManageFavoritesAdapter(
+ activity: BaseSimpleActivity, var favorites: ArrayList, val listener: RefreshRecyclerViewListener?,
+ recyclerView: MyRecyclerView, itemClick: (Any) -> Unit
+) : MyRecyclerViewAdapter(activity, recyclerView, itemClick) {
private val config = activity.config
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CreateNewItemDialog.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CreateNewItemDialog.kt
index 2131dd0d..86fb1370 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CreateNewItemDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CreateNewItemDialog.kt
@@ -3,6 +3,7 @@ package com.simplemobiletools.filemanager.pro.dialogs
import android.view.View
import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.commons.extensions.*
+import com.simplemobiletools.commons.helpers.isRPlus
import com.simplemobiletools.filemanager.pro.R
import com.simplemobiletools.filemanager.pro.activities.SimpleActivity
import com.simplemobiletools.filemanager.pro.helpers.RootHelpers
@@ -15,41 +16,62 @@ class CreateNewItemDialog(val activity: SimpleActivity, val path: String, val ca
init {
AlertDialog.Builder(activity)
- .setPositiveButton(R.string.ok, null)
- .setNegativeButton(R.string.cancel, null)
- .create().apply {
- activity.setupDialogStuff(view, this, R.string.create_new) {
- showKeyboard(view.item_name)
- getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(View.OnClickListener {
- val name = view.item_name.value
- if (name.isEmpty()) {
- activity.toast(R.string.empty_name)
- } else if (name.isAValidFilename()) {
- val newPath = "$path/$name"
- if (activity.getDoesFilePathExist(newPath)) {
- activity.toast(R.string.name_taken)
- return@OnClickListener
- }
+ .setPositiveButton(R.string.ok, null)
+ .setNegativeButton(R.string.cancel, null)
+ .create().apply {
+ activity.setupDialogStuff(view, this, R.string.create_new) {
+ showKeyboard(view.item_name)
+ getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(View.OnClickListener {
+ val name = view.item_name.value
+ if (name.isEmpty()) {
+ activity.toast(R.string.empty_name)
+ } else if (name.isAValidFilename()) {
+ val newPath = "$path/$name"
+ if (activity.getDoesFilePathExist(newPath)) {
+ activity.toast(R.string.name_taken)
+ return@OnClickListener
+ }
- if (view.dialog_radio_group.checkedRadioButtonId == R.id.dialog_radio_directory) {
- createDirectory(newPath, this) {
- callback(it)
- }
- } else {
- createFile(newPath, this) {
- callback(it)
- }
+ if (view.dialog_radio_group.checkedRadioButtonId == R.id.dialog_radio_directory) {
+ createDirectory(newPath, this) {
+ callback(it)
}
} else {
- activity.toast(R.string.invalid_name)
+ createFile(newPath, this) {
+ callback(it)
+ }
}
- })
- }
+ } else {
+ activity.toast(R.string.invalid_name)
+ }
+ })
}
+ }
}
private fun createDirectory(path: String, alertDialog: AlertDialog, callback: (Boolean) -> Unit) {
when {
+ isRPlus() || path.startsWith(activity.internalStoragePath, true) -> {
+ if (activity.isRestrictedSAFOnlyRoot(path)) {
+ activity.handleAndroidSAFDialog(path) {
+ if (!it) {
+ callback(false)
+ return@handleAndroidSAFDialog
+ }
+ if (activity.createAndroidSAFDirectory(path)) {
+ success(alertDialog)
+ } else {
+ val error = String.format(activity.getString(R.string.could_not_create_folder), path)
+ activity.showErrorToast(error)
+ callback(false)
+ }
+ }
+ } else {
+ if (File(path).mkdirs()) {
+ success(alertDialog)
+ }
+ }
+ }
activity.needsStupidWritePermissions(path) -> activity.handleSAFDialog(path) {
if (!it) {
return@handleSAFDialog
@@ -65,11 +87,6 @@ class CreateNewItemDialog(val activity: SimpleActivity, val path: String, val ca
documentFile.createDirectory(path.getFilenameFromPath())
success(alertDialog)
}
- path.startsWith(activity.internalStoragePath, true) -> {
- if (File(path).mkdirs()) {
- success(alertDialog)
- }
- }
else -> {
RootHelpers(activity).createFileFolder(path, false) {
if (it) {
@@ -85,6 +102,22 @@ class CreateNewItemDialog(val activity: SimpleActivity, val path: String, val ca
private fun createFile(path: String, alertDialog: AlertDialog, callback: (Boolean) -> Unit) {
try {
when {
+ activity.isRestrictedSAFOnlyRoot(path) -> {
+ activity.handleAndroidSAFDialog(path) {
+ if (!it) {
+ callback(false)
+ return@handleAndroidSAFDialog
+ }
+ if (activity.createAndroidSAFFile(path)) {
+ success(alertDialog)
+ } else {
+ val error = String.format(activity.getString(R.string.could_not_create_file), path)
+ activity.showErrorToast(error)
+ callback(false)
+ }
+ }
+ }
+
activity.needsStupidWritePermissions(path) -> {
activity.handleSAFDialog(path) {
if (!it) {
@@ -102,7 +135,8 @@ class CreateNewItemDialog(val activity: SimpleActivity, val path: String, val ca
success(alertDialog)
}
}
- path.startsWith(activity.internalStoragePath, true) -> {
+
+ isRPlus() || path.startsWith(activity.internalStoragePath, true) -> {
if (File(path).createNewFile()) {
success(alertDialog)
}
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 18287c09..9d1d1d3d 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
@@ -1,5 +1,6 @@
package com.simplemobiletools.filemanager.pro.fragments
+import android.annotation.SuppressLint
import android.content.Context
import android.os.Parcelable
import android.util.AttributeSet
@@ -51,7 +52,6 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
override fun onResume(textColor: Int, primaryColor: Int) {
context!!.updateTextColors(this)
- items_fastscroller.updatePrimaryColor()
storedItems = ArrayList()
getRecyclerAdapter()?.apply {
updatePrimaryColor(primaryColor)
@@ -59,14 +59,19 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
initDrawables()
}
- breadcrumbs.updateColor(textColor)
- items_fastscroller.updateBubbleColors()
+ items_fastscroller.updateColors(primaryColor, primaryColor.getContrastColor())
+
+ if (currentPath != "") {
+ breadcrumbs.updateColor(textColor)
+ }
items_swipe_refresh.isEnabled = activity?.config?.enablePullToRefresh != false
}
override fun setupFontSize() {
getRecyclerAdapter()?.updateFontSizes()
- breadcrumbs.updateFontSize(context!!.getTextSize())
+ if (currentPath != "") {
+ breadcrumbs.updateFontSize(context!!.getTextSize())
+ }
}
override fun setupDateTimeFormat() {
@@ -121,10 +126,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
breadcrumbs.updateFontSize(context!!.getTextSize())
}
- ItemsAdapter(
- activity as SimpleActivity, storedItems, this, items_list, isPickMultipleIntent, items_fastscroller,
- items_swipe_refresh
- ) {
+ ItemsAdapter(activity as SimpleActivity, storedItems, this, items_list, isPickMultipleIntent, items_swipe_refresh) {
if ((it as? ListItem)?.isSectionTitle == true) {
openDirectory(it.mPath)
searchClosed()
@@ -140,18 +142,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
items_list.scheduleLayoutAnimation()
}
- val dateFormat = context!!.config.dateFormat
- val timeFormat = context!!.getTimeFormat()
- items_fastscroller.setViews(items_list, items_swipe_refresh) {
- val listItem = getRecyclerAdapter()?.listItems?.getOrNull(it)
- items_fastscroller.updateBubbleText(listItem?.getBubbleText(context, dateFormat, timeFormat) ?: "")
- }
-
getRecyclerLayoutManager().onRestoreInstanceState(scrollStates[currentPath])
- items_list.onGlobalLayout {
- items_fastscroller.setScrollToY(items_list.computeVerticalScrollOffset())
- calculateContentHeight(storedItems)
- }
}
}
@@ -159,12 +150,24 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
private fun getRecyclerLayoutManager() = (items_list.layoutManager as MyGridLayoutManager)
+ @SuppressLint("NewApi")
private fun getItems(path: String, callback: (originalPath: String, items: ArrayList) -> Unit) {
skipItemUpdating = false
ensureBackgroundThread {
if (activity?.isDestroyed == false && activity?.isFinishing == false) {
val config = context!!.config
- if (context!!.isPathOnOTG(path) && config.OTGTreeUri.isNotEmpty()) {
+ if (context.isRestrictedSAFOnlyRoot(path)) {
+ activity?.handleAndroidSAFDialog(path) {
+ if (!it) {
+ activity?.toast(R.string.no_storage_permissions)
+ return@handleAndroidSAFDialog
+ }
+ val getProperChildCount = context!!.config.getFolderViewType(currentPath) == VIEW_TYPE_LIST
+ context.getAndroidSAFFileItems(path, context.config.shouldShowHidden, getProperChildCount) { fileItems ->
+ callback(path, getListItemsFromFileDirItems(fileItems))
+ }
+ }
+ } else if (context!!.isPathOnOTG(path) && config.OTGTreeUri.isNotEmpty()) {
val getProperFileSize = context!!.config.getFolderSorting(currentPath) and SORT_BY_SIZE != 0
context!!.getOTGItems(path, config.shouldShowHidden, getProperFileSize) {
callback(path, getListItemsFromFileDirItems(it))
@@ -203,7 +206,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
if (getProperChildCount) {
items.filter { it.mIsDirectory }.forEach {
if (context != null) {
- val childrenCount = it.getDirectChildrenCount(context!!, showHidden)
+ val childrenCount = it.getDirectChildrenCount(activity as BaseSimpleActivity, showHidden)
if (childrenCount != 0) {
activity?.runOnUiThread {
getRecyclerAdapter()?.updateChildCount(it.mPath, childrenCount)
@@ -223,7 +226,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
var lastModified = lastModifieds.remove(curPath)
val isDirectory = if (lastModified != null) false else file.isDirectory
- val children = if (isDirectory && getProperChildCount) file.getDirectChildrenCount(showHidden) else 0
+ val children = if (isDirectory && getProperChildCount) file.getDirectChildrenCount(context, showHidden) else 0
val size = if (isDirectory) {
if (isSortingBySize) {
file.getProperSize(showHidden)
@@ -275,13 +278,13 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
when {
searchText.isEmpty() -> {
- items_list.beVisible()
+ items_fastscroller.beVisible()
getRecyclerAdapter()?.updateItems(storedItems)
items_placeholder.beGone()
items_placeholder_2.beGone()
}
searchText.length == 1 -> {
- items_list.beGone()
+ items_fastscroller.beGone()
items_placeholder.beVisible()
items_placeholder_2.beVisible()
}
@@ -318,14 +321,9 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
activity?.runOnUiThread {
getRecyclerAdapter()?.updateItems(listItems, text)
- items_list.beVisibleIf(listItems.isNotEmpty())
+ items_fastscroller.beVisibleIf(listItems.isNotEmpty())
items_placeholder.beVisibleIf(listItems.isEmpty())
items_placeholder_2.beGone()
-
- items_list.onGlobalLayout {
- items_fastscroller.setScrollToY(items_list.computeVerticalScrollOffset())
- calculateContentHeight(listItems)
- }
}
}
}
@@ -377,13 +375,13 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
isSearchOpen = false
if (!skipItemUpdating) {
getRecyclerAdapter()?.updateItems(storedItems)
- calculateContentHeight(storedItems)
}
+
skipItemUpdating = false
lastSearchedText = ""
items_swipe_refresh.isEnabled = activity?.config?.enablePullToRefresh != false
- items_list.beVisible()
+ items_fastscroller.beVisible()
items_placeholder.beGone()
items_placeholder_2.beGone()
}
@@ -458,14 +456,6 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
}
}
- private fun calculateContentHeight(items: MutableList) {
- val layoutManager = items_list.layoutManager as MyGridLayoutManager
- val thumbnailHeight = layoutManager.getChildAt(0)?.height ?: 0
- val fullHeight = ((items.size - 1) / layoutManager.spanCount + 1) * thumbnailHeight
- items_fastscroller.setContentHeight(fullHeight)
- items_fastscroller.setScrollToY(items_list.computeVerticalScrollOffset())
- }
-
override fun increaseColumnCount() {
if (currentViewType == VIEW_TYPE_GRID) {
context?.config?.fileColumnCnt = ++(items_list.layoutManager as MyGridLayoutManager).spanCount
@@ -484,7 +474,6 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
activity?.invalidateOptionsMenu()
getRecyclerAdapter()?.apply {
notifyItemRangeChanged(0, listItems.size)
- calculateContentHeight(listItems)
}
}
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
index 2d724f5e..1c11f054 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/RecentsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/RecentsFragment.kt
@@ -1,14 +1,14 @@
package com.simplemobiletools.filemanager.pro.fragments
+import android.content.ContentResolver
import android.content.Context
import android.provider.MediaStore.Files
import android.provider.MediaStore.Files.FileColumns
import android.util.AttributeSet
+import androidx.core.os.bundleOf
import androidx.recyclerview.widget.GridLayoutManager
import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.VIEW_TYPE_GRID
-import com.simplemobiletools.commons.helpers.VIEW_TYPE_LIST
-import com.simplemobiletools.commons.helpers.ensureBackgroundThread
+import com.simplemobiletools.commons.helpers.*
import com.simplemobiletools.commons.models.FileDirItem
import com.simplemobiletools.commons.views.MyGridLayoutManager
import com.simplemobiletools.filemanager.pro.R
@@ -24,6 +24,8 @@ import kotlinx.android.synthetic.main.recents_fragment.view.*
import java.util.*
class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet), ItemOperationsListener {
+ private val RECENTS_LIMIT = 50
+
override fun setupFragment(activity: SimpleActivity) {
if (this.activity == null) {
this.activity = activity
@@ -53,7 +55,7 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
return
}
- ItemsAdapter(activity as SimpleActivity, recents, this, recents_list, isPickMultipleIntent, null, recents_swipe_refresh) {
+ ItemsAdapter(activity as SimpleActivity, recents, this, recents_list, isPickMultipleIntent, recents_swipe_refresh) {
clickedPath((it as FileDirItem).path)
}.apply {
recents_list.adapter = this
@@ -122,17 +124,33 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
FileColumns.SIZE
)
- val sortOrder = "${FileColumns.DATE_MODIFIED} DESC LIMIT 50"
-
- context?.queryCursor(uri, projection, sortOrder = sortOrder, showErrors = true) { cursor ->
- val path = cursor.getStringValue(FileColumns.DATA)
- val name = cursor.getStringValue(FileColumns.DISPLAY_NAME) ?: path.getFilenameFromPath()
- val size = cursor.getLongValue(FileColumns.SIZE)
- val modified = cursor.getLongValue(FileColumns.DATE_MODIFIED) * 1000
- val fileDirItem = ListItem(path, name, false, 0, size, modified, false)
- if ((showHidden || !name.startsWith(".")) && activity?.getDoesFilePathExist(path) == true) {
- listItems.add(fileDirItem)
+ try {
+ if (isOreoPlus()) {
+ val queryArgs = bundleOf(
+ ContentResolver.QUERY_ARG_LIMIT to RECENTS_LIMIT,
+ ContentResolver.QUERY_ARG_SORT_COLUMNS to arrayOf(FileColumns.DATE_MODIFIED),
+ ContentResolver.QUERY_ARG_SORT_DIRECTION to ContentResolver.QUERY_SORT_DIRECTION_DESCENDING
+ )
+ context?.contentResolver?.query(uri, projection, queryArgs, null)
+ } else {
+ val sortOrder = "${FileColumns.DATE_MODIFIED} DESC LIMIT $RECENTS_LIMIT"
+ context?.contentResolver?.query(uri, projection, null, null, sortOrder)
+ }?.use { cursor ->
+ if (cursor.moveToFirst()) {
+ do {
+ val path = cursor.getStringValue(FileColumns.DATA)
+ val name = cursor.getStringValue(FileColumns.DISPLAY_NAME) ?: path.getFilenameFromPath()
+ val size = cursor.getLongValue(FileColumns.SIZE)
+ val modified = cursor.getLongValue(FileColumns.DATE_MODIFIED) * 1000
+ val fileDirItem = ListItem(path, name, false, 0, size, modified, false)
+ if ((showHidden || !name.startsWith(".")) && activity?.getDoesFilePathExist(path) == true) {
+ listItems.add(fileDirItem)
+ }
+ } while (cursor.moveToNext())
+ }
}
+ } catch (e: Exception) {
+ activity?.showErrorToast(e)
}
activity?.runOnUiThread {
diff --git a/app/src/main/res/drawable/ic_decompress_vector.xml b/app/src/main/res/drawable/ic_decompress_vector.xml
index dbc02d31..c4411729 100644
--- a/app/src/main/res/drawable/ic_decompress_vector.xml
+++ b/app/src/main/res/drawable/ic_decompress_vector.xml
@@ -1,9 +1,3 @@
-
-
+
+
diff --git a/app/src/main/res/drawable/ic_home_vector.xml b/app/src/main/res/drawable/ic_home_vector.xml
index df0f6832..d409807a 100644
--- a/app/src/main/res/drawable/ic_home_vector.xml
+++ b/app/src/main/res/drawable/ic_home_vector.xml
@@ -1,9 +1,3 @@
-
-
+
+
diff --git a/app/src/main/res/drawable/ic_storage_vector.xml b/app/src/main/res/drawable/ic_storage_vector.xml
index 80565aae..d620cacb 100644
--- a/app/src/main/res/drawable/ic_storage_vector.xml
+++ b/app/src/main/res/drawable/ic_storage_vector.xml
@@ -1,9 +1,3 @@
-
-
+
+
diff --git a/app/src/main/res/layout/activity_mimetypes.xml b/app/src/main/res/layout/activity_mimetypes.xml
index 3b377baf..b50e0a79 100644
--- a/app/src/main/res/layout/activity_mimetypes.xml
+++ b/app/src/main/res/layout/activity_mimetypes.xml
@@ -35,24 +35,20 @@
android:textStyle="italic"
android:visibility="gone" />
-
+ android:layout_height="wrap_content">
-
+
-
-
-
+
diff --git a/app/src/main/res/layout/items_fragment.xml b/app/src/main/res/layout/items_fragment.xml
index 19834892..9ef0a3cd 100644
--- a/app/src/main/res/layout/items_fragment.xml
+++ b/app/src/main/res/layout/items_fragment.xml
@@ -60,27 +60,22 @@
android:textStyle="italic"
android:visibility="gone" />
-
-
-
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/breadcrumbs">
-
+
-
+
diff --git a/app/src/main/res/menu/cab.xml b/app/src/main/res/menu/cab.xml
index b179b77b..050c0845 100644
--- a/app/src/main/res/menu/cab.xml
+++ b/app/src/main/res/menu/cab.xml
@@ -13,12 +13,12 @@
app:showAsAction="always"/>
+
+