Skip to content

Commit c079bbb

Browse files
committed
use MyScalableRecyclerView from Commons
1 parent 9d17c5a commit c079bbb

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android {
3232
}
3333

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

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

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import android.content.Intent
55
import android.net.Uri
66
import android.os.Bundle
77
import android.os.Parcelable
8+
import android.support.v4.app.Fragment
89
import android.support.v7.widget.LinearLayoutManager
910
import android.view.LayoutInflater
1011
import android.view.View
@@ -13,7 +14,6 @@ import android.webkit.MimeTypeMap
1314
import com.simplemobiletools.commons.extensions.*
1415
import com.simplemobiletools.commons.models.FileDirItem
1516
import com.simplemobiletools.commons.views.RecyclerViewDivider
16-
import com.simplemobiletools.filemanager.Config
1717
import com.simplemobiletools.filemanager.PATH
1818
import com.simplemobiletools.filemanager.R
1919
import com.simplemobiletools.filemanager.SCROLL_STATE
@@ -26,15 +26,14 @@ import kotlinx.android.synthetic.main.items_fragment.view.*
2626
import java.io.File
2727
import java.util.*
2828

29-
class ItemsFragment : android.support.v4.app.Fragment(), ItemsAdapter.ItemOperationsListener {
29+
class ItemsFragment : Fragment(), ItemsAdapter.ItemOperationsListener {
3030
private var mListener: ItemInteractionListener? = null
3131
private var mStoredTextColor = 0
32+
private var mShowHidden = false
33+
private var mItems = ArrayList<FileDirItem>()
3234

33-
lateinit var mItems: ArrayList<FileDirItem>
34-
lateinit var mConfig: Config
3535
lateinit var fragmentView: View
3636

37-
private var mShowHidden = false
3837
var mPath = ""
3938

4039
override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View {
@@ -44,9 +43,7 @@ class ItemsFragment : android.support.v4.app.Fragment(), ItemsAdapter.ItemOperat
4443

4544
override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
4645
super.onViewCreated(view, savedInstanceState)
47-
mConfig = context.config
48-
mShowHidden = mConfig.showHidden
49-
mItems = ArrayList<FileDirItem>()
46+
mShowHidden = context.config.showHidden
5047
fillItems()
5148

5249
items_swipe_refresh.setOnRefreshListener({ fillItems() })
@@ -55,15 +52,16 @@ class ItemsFragment : android.support.v4.app.Fragment(), ItemsAdapter.ItemOperat
5552

5653
override fun onResume() {
5754
super.onResume()
58-
if (mShowHidden != mConfig.showHidden) {
55+
val config = context.config
56+
if (mShowHidden != config.showHidden) {
5957
mShowHidden = !mShowHidden
6058
fillItems()
6159
}
6260
context.updateTextColors(items_holder)
63-
if (mStoredTextColor != context.config.textColor) {
61+
if (mStoredTextColor != config.textColor) {
6462
mItems = ArrayList<FileDirItem>()
6563
fillItems()
66-
mStoredTextColor = context.config.textColor
64+
mStoredTextColor = config.textColor
6765
}
6866
}
6967

@@ -76,7 +74,7 @@ class ItemsFragment : android.support.v4.app.Fragment(), ItemsAdapter.ItemOperat
7674
mPath = arguments.getString(PATH)
7775
getItems(mPath) {
7876
val newItems = it
79-
FileDirItem.sorting = mConfig.getFolderSorting(mPath)
77+
FileDirItem.sorting = context.config.getFolderSorting(mPath)
8078
newItems.sort()
8179

8280
fragmentView.apply {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
android:layout_width="match_parent"
1717
android:layout_height="wrap_content">
1818

19-
<android.support.v7.widget.RecyclerView
19+
<com.simplemobiletools.commons.views.MyScalableRecyclerView
2020
android:id="@+id/items_list"
2121
android:layout_width="match_parent"
2222
android:layout_height="wrap_content"

0 commit comments

Comments
 (0)