Skip to content

Commit 1dcfb9e

Browse files
committed
updating Commons and kotlin
1 parent 417d40c commit 1dcfb9e

File tree

4 files changed

+27
-9
lines changed

4 files changed

+27
-9
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ android {
3232
}
3333

3434
dependencies {
35-
compile 'com.simplemobiletools:commons:2.21.15'
35+
compile 'com.simplemobiletools:commons:2.22.4'
3636
compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'
3737
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
3838
}
3939

4040
buildscript {
41-
ext.kotlin_version = '1.1.2-5'
41+
ext.kotlin_version = '1.1.3-2'
4242
repositories {
4343
mavenCentral()
4444
}

app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.simplemobiletools.filemanager.adapters
33
import android.content.Intent
44
import android.graphics.drawable.Drawable
55
import android.net.Uri
6+
import android.os.Build
67
import android.support.v7.view.ActionMode
78
import android.support.v7.widget.RecyclerView
89
import android.util.SparseArray
@@ -11,11 +12,17 @@ import com.bignerdranch.android.multiselector.ModalMultiSelectorCallback
1112
import com.bignerdranch.android.multiselector.MultiSelector
1213
import com.bignerdranch.android.multiselector.SwappingHolder
1314
import com.bumptech.glide.Glide
15+
import com.bumptech.glide.load.engine.DiskCacheStrategy
16+
import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
17+
import com.bumptech.glide.request.RequestOptions
1418
import com.simplemobiletools.commons.dialogs.ConfirmationDialog
1519
import com.simplemobiletools.commons.dialogs.FilePickerDialog
1620
import com.simplemobiletools.commons.dialogs.PropertiesDialog
1721
import com.simplemobiletools.commons.dialogs.RenameItemDialog
18-
import com.simplemobiletools.commons.extensions.*
22+
import com.simplemobiletools.commons.extensions.formatSize
23+
import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor
24+
import com.simplemobiletools.commons.extensions.getMimeTypeFromPath
25+
import com.simplemobiletools.commons.extensions.toast
1926
import com.simplemobiletools.commons.models.FileDirItem
2027
import com.simplemobiletools.filemanager.R
2128
import com.simplemobiletools.filemanager.activities.SimpleActivity
@@ -321,8 +328,13 @@ class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList<FileDir
321328
item_icon.setImageDrawable(folderDrawable)
322329
item_details.text = getChildrenCnt(fileDirItem)
323330
} else {
331+
val options = RequestOptions()
332+
.diskCacheStrategy(DiskCacheStrategy.RESOURCE)
333+
.error(fileDrawable)
334+
.centerCrop()
335+
324336
val path = fileDirItem.path
325-
Glide.with(activity).load(path).diskCacheStrategy(path.getCacheStrategy()).error(fileDrawable).centerCrop().crossFade().into(item_icon)
337+
Glide.with(activity).load(path).transition(DrawableTransitionOptions.withCrossFade()).apply(options).into(item_icon)
326338
item_details.text = fileDirItem.size.formatSize()
327339
}
328340

@@ -359,7 +371,9 @@ class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList<FileDir
359371
}
360372

361373
fun stopLoad() {
362-
Glide.clear(view.item_icon)
374+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && !activity.isDestroyed) {
375+
Glide.with(activity).clear(view.item_icon)
376+
}
363377
}
364378
}
365379

app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import android.net.Uri
66
import android.os.Bundle
77
import android.os.Parcelable
88
import android.support.v4.app.Fragment
9+
import android.support.v7.widget.DividerItemDecoration
910
import android.support.v7.widget.LinearLayoutManager
1011
import android.view.LayoutInflater
1112
import android.view.View
@@ -14,7 +15,6 @@ import android.webkit.MimeTypeMap
1415
import com.simplemobiletools.commons.extensions.*
1516
import com.simplemobiletools.commons.models.FileDirItem
1617
import com.simplemobiletools.commons.views.MyScalableRecyclerView
17-
import com.simplemobiletools.commons.views.RecyclerViewDivider
1818
import com.simplemobiletools.filemanager.PATH
1919
import com.simplemobiletools.filemanager.R
2020
import com.simplemobiletools.filemanager.SCROLL_STATE
@@ -93,7 +93,12 @@ class ItemsFragment : Fragment(), ItemsAdapter.ItemOperationsListener {
9393
this.adapter = ItemsAdapter(activity as SimpleActivity, mItems, this@ItemsFragment) {
9494
itemClicked(it)
9595
}
96-
addItemDecoration(RecyclerViewDivider(context))
96+
97+
DividerItemDecoration(context, DividerItemDecoration.VERTICAL).apply {
98+
setDrawable(context.resources.getDrawable(com.simplemobiletools.commons.R.drawable.divider))
99+
addItemDecoration(this)
100+
}
101+
97102
isDragSelectionEnabled = true
98103
}
99104
items_fastscroller.setViews(items_list, items_swipe_refresh)

app/src/main/res/layout/list_item.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
android:id="@+id/item_icon"
1818
android:layout_width="@dimen/normal_icon_size"
1919
android:layout_height="@dimen/normal_icon_size"
20-
android:paddingBottom="@dimen/medium_margin"
21-
android:paddingTop="@dimen/medium_margin"
20+
android:padding="@dimen/medium_margin"
2221
android:src="@drawable/ic_folder"/>
2322

2423
<TextView

0 commit comments

Comments
 (0)