updating Commons and kotlin

This commit is contained in:
tibbi
2017-07-09 22:24:37 +02:00
parent 417d40c405
commit 1dcfb9e817
4 changed files with 27 additions and 9 deletions

View File

@ -32,13 +32,13 @@ android {
} }
dependencies { dependencies {
compile 'com.simplemobiletools:commons:2.21.15' compile 'com.simplemobiletools:commons:2.22.4'
compile 'com.bignerdranch.android:recyclerview-multiselect:0.2' compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
} }
buildscript { buildscript {
ext.kotlin_version = '1.1.2-5' ext.kotlin_version = '1.1.3-2'
repositories { repositories {
mavenCentral() mavenCentral()
} }

View File

@ -3,6 +3,7 @@ package com.simplemobiletools.filemanager.adapters
import android.content.Intent import android.content.Intent
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.net.Uri import android.net.Uri
import android.os.Build
import android.support.v7.view.ActionMode import android.support.v7.view.ActionMode
import android.support.v7.widget.RecyclerView import android.support.v7.widget.RecyclerView
import android.util.SparseArray import android.util.SparseArray
@ -11,11 +12,17 @@ import com.bignerdranch.android.multiselector.ModalMultiSelectorCallback
import com.bignerdranch.android.multiselector.MultiSelector import com.bignerdranch.android.multiselector.MultiSelector
import com.bignerdranch.android.multiselector.SwappingHolder import com.bignerdranch.android.multiselector.SwappingHolder
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.bumptech.glide.load.engine.DiskCacheStrategy
import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
import com.bumptech.glide.request.RequestOptions
import com.simplemobiletools.commons.dialogs.ConfirmationDialog import com.simplemobiletools.commons.dialogs.ConfirmationDialog
import com.simplemobiletools.commons.dialogs.FilePickerDialog import com.simplemobiletools.commons.dialogs.FilePickerDialog
import com.simplemobiletools.commons.dialogs.PropertiesDialog import com.simplemobiletools.commons.dialogs.PropertiesDialog
import com.simplemobiletools.commons.dialogs.RenameItemDialog import com.simplemobiletools.commons.dialogs.RenameItemDialog
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.formatSize
import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor
import com.simplemobiletools.commons.extensions.getMimeTypeFromPath
import com.simplemobiletools.commons.extensions.toast
import com.simplemobiletools.commons.models.FileDirItem import com.simplemobiletools.commons.models.FileDirItem
import com.simplemobiletools.filemanager.R import com.simplemobiletools.filemanager.R
import com.simplemobiletools.filemanager.activities.SimpleActivity import com.simplemobiletools.filemanager.activities.SimpleActivity
@ -321,8 +328,13 @@ class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList<FileDir
item_icon.setImageDrawable(folderDrawable) item_icon.setImageDrawable(folderDrawable)
item_details.text = getChildrenCnt(fileDirItem) item_details.text = getChildrenCnt(fileDirItem)
} else { } else {
val options = RequestOptions()
.diskCacheStrategy(DiskCacheStrategy.RESOURCE)
.error(fileDrawable)
.centerCrop()
val path = fileDirItem.path val path = fileDirItem.path
Glide.with(activity).load(path).diskCacheStrategy(path.getCacheStrategy()).error(fileDrawable).centerCrop().crossFade().into(item_icon) Glide.with(activity).load(path).transition(DrawableTransitionOptions.withCrossFade()).apply(options).into(item_icon)
item_details.text = fileDirItem.size.formatSize() item_details.text = fileDirItem.size.formatSize()
} }
@ -359,7 +371,9 @@ class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList<FileDir
} }
fun stopLoad() { fun stopLoad() {
Glide.clear(view.item_icon) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && !activity.isDestroyed) {
Glide.with(activity).clear(view.item_icon)
}
} }
} }

View File

@ -6,6 +6,7 @@ import android.net.Uri
import android.os.Bundle import android.os.Bundle
import android.os.Parcelable import android.os.Parcelable
import android.support.v4.app.Fragment import android.support.v4.app.Fragment
import android.support.v7.widget.DividerItemDecoration
import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.LinearLayoutManager
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
@ -14,7 +15,6 @@ import android.webkit.MimeTypeMap
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.models.FileDirItem import com.simplemobiletools.commons.models.FileDirItem
import com.simplemobiletools.commons.views.MyScalableRecyclerView import com.simplemobiletools.commons.views.MyScalableRecyclerView
import com.simplemobiletools.commons.views.RecyclerViewDivider
import com.simplemobiletools.filemanager.PATH import com.simplemobiletools.filemanager.PATH
import com.simplemobiletools.filemanager.R import com.simplemobiletools.filemanager.R
import com.simplemobiletools.filemanager.SCROLL_STATE import com.simplemobiletools.filemanager.SCROLL_STATE
@ -93,7 +93,12 @@ class ItemsFragment : Fragment(), ItemsAdapter.ItemOperationsListener {
this.adapter = ItemsAdapter(activity as SimpleActivity, mItems, this@ItemsFragment) { this.adapter = ItemsAdapter(activity as SimpleActivity, mItems, this@ItemsFragment) {
itemClicked(it) itemClicked(it)
} }
addItemDecoration(RecyclerViewDivider(context))
DividerItemDecoration(context, DividerItemDecoration.VERTICAL).apply {
setDrawable(context.resources.getDrawable(com.simplemobiletools.commons.R.drawable.divider))
addItemDecoration(this)
}
isDragSelectionEnabled = true isDragSelectionEnabled = true
} }
items_fastscroller.setViews(items_list, items_swipe_refresh) items_fastscroller.setViews(items_list, items_swipe_refresh)

View File

@ -17,8 +17,7 @@
android:id="@+id/item_icon" android:id="@+id/item_icon"
android:layout_width="@dimen/normal_icon_size" android:layout_width="@dimen/normal_icon_size"
android:layout_height="@dimen/normal_icon_size" android:layout_height="@dimen/normal_icon_size"
android:paddingBottom="@dimen/medium_margin" android:padding="@dimen/medium_margin"
android:paddingTop="@dimen/medium_margin"
android:src="@drawable/ic_folder"/> android:src="@drawable/ic_folder"/>
<TextView <TextView