minor code style updates here and there

This commit is contained in:
tibbi 2017-10-22 17:40:37 +02:00
parent fd1faf3071
commit ccc1b8bade
3 changed files with 9 additions and 18 deletions

View File

@ -1,10 +1,5 @@
package com.simplemobiletools.filemanager.activities package com.simplemobiletools.filemanager.activities
import android.os.Bundle
import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.activities.BaseSimpleActivity
open class SimpleActivity : BaseSimpleActivity() { open class SimpleActivity : BaseSimpleActivity()
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
}
}

View File

@ -40,8 +40,6 @@ import java.util.zip.ZipOutputStream
class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList<FileDirItem>, val listener: ItemOperationsListener?, val itemClick: (FileDirItem) -> Unit) : class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList<FileDirItem>, val listener: ItemOperationsListener?, val itemClick: (FileDirItem) -> Unit) :
RecyclerView.Adapter<ItemsAdapter.ViewHolder>() { RecyclerView.Adapter<ItemsAdapter.ViewHolder>() {
private val BUFFER = 2048
val multiSelector = MultiSelector() val multiSelector = MultiSelector()
val config = activity.config val config = activity.config
@ -70,7 +68,7 @@ class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList<FileDir
updateTitle(selectedPositions.size) updateTitle(selectedPositions.size)
} }
fun updateTitle(cnt: Int) { private fun updateTitle(cnt: Int) {
actMode?.title = "$cnt / ${mItems.size}" actMode?.title = "$cnt / ${mItems.size}"
actMode?.invalidate() actMode?.invalidate()
} }
@ -321,7 +319,7 @@ class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList<FileDir
return true return true
} }
fun zipPaths(sourcePaths: List<String>, targetPath: String): Boolean { private fun zipPaths(sourcePaths: List<String>, targetPath: String): Boolean {
val queue = LinkedList<File>() val queue = LinkedList<File>()
val fos = activity.getFileOutputStreamSync(targetPath, "application/zip") ?: return false val fos = activity.getFileOutputStreamSync(targetPath, "application/zip") ?: return false

View File

@ -31,14 +31,12 @@ class ChangeSortingDialog(val activity: SimpleActivity, val path: String = "", v
private fun setupSortRadio() { private fun setupSortRadio() {
val sortingRadio = view.sorting_dialog_radio_sorting val sortingRadio = view.sorting_dialog_radio_sorting
var sortBtn = sortingRadio.sorting_dialog_radio_name val sortBtn = when {
currSorting and SORT_BY_SIZE != 0 -> sortingRadio.sorting_dialog_radio_size
if (currSorting and SORT_BY_SIZE != 0) { currSorting and SORT_BY_DATE_MODIFIED != 0 -> sortingRadio.sorting_dialog_radio_last_modified
sortBtn = sortingRadio.sorting_dialog_radio_size currSorting and SORT_BY_EXTENSION != 0 -> sortingRadio.sorting_dialog_radio_extension
} else if (currSorting and SORT_BY_DATE_MODIFIED != 0) { else -> sortingRadio.sorting_dialog_radio_name
sortBtn = sortingRadio.sorting_dialog_radio_last_modified }
} else if (currSorting and SORT_BY_EXTENSION != 0)
sortBtn = sortingRadio.sorting_dialog_radio_extension
sortBtn.isChecked = true sortBtn.isChecked = true
} }