From ccc1b8bade6681feb59ed3855daee46e8f39a60d Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 22 Oct 2017 17:40:37 +0200 Subject: [PATCH] minor code style updates here and there --- .../filemanager/activities/SimpleActivity.kt | 7 +------ .../filemanager/adapters/ItemsAdapter.kt | 6 ++---- .../filemanager/dialogs/ChangeSortingDialog.kt | 14 ++++++-------- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SimpleActivity.kt index 86b8af33..6e635cca 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SimpleActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SimpleActivity.kt @@ -1,10 +1,5 @@ package com.simplemobiletools.filemanager.activities -import android.os.Bundle import com.simplemobiletools.commons.activities.BaseSimpleActivity -open class SimpleActivity : BaseSimpleActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - } -} +open class SimpleActivity : BaseSimpleActivity() diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt index bc9d7df7..20d6b528 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt @@ -40,8 +40,6 @@ import java.util.zip.ZipOutputStream class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList, val listener: ItemOperationsListener?, val itemClick: (FileDirItem) -> Unit) : RecyclerView.Adapter() { - private val BUFFER = 2048 - val multiSelector = MultiSelector() val config = activity.config @@ -70,7 +68,7 @@ class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList, targetPath: String): Boolean { + private fun zipPaths(sourcePaths: List, targetPath: String): Boolean { val queue = LinkedList() val fos = activity.getFileOutputStreamSync(targetPath, "application/zip") ?: return false diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/ChangeSortingDialog.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/ChangeSortingDialog.kt index d545eb7d..888fb13f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/ChangeSortingDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/ChangeSortingDialog.kt @@ -31,14 +31,12 @@ class ChangeSortingDialog(val activity: SimpleActivity, val path: String = "", v private fun setupSortRadio() { val sortingRadio = view.sorting_dialog_radio_sorting - var sortBtn = sortingRadio.sorting_dialog_radio_name - - if (currSorting and SORT_BY_SIZE != 0) { - sortBtn = sortingRadio.sorting_dialog_radio_size - } else if (currSorting and SORT_BY_DATE_MODIFIED != 0) { - sortBtn = sortingRadio.sorting_dialog_radio_last_modified - } else if (currSorting and SORT_BY_EXTENSION != 0) - sortBtn = sortingRadio.sorting_dialog_radio_extension + val sortBtn = when { + currSorting and SORT_BY_SIZE != 0 -> sortingRadio.sorting_dialog_radio_size + currSorting and SORT_BY_DATE_MODIFIED != 0 -> sortingRadio.sorting_dialog_radio_last_modified + currSorting and SORT_BY_EXTENSION != 0 -> sortingRadio.sorting_dialog_radio_extension + else -> sortingRadio.sorting_dialog_radio_name + } sortBtn.isChecked = true }