@@ -5,6 +5,7 @@ import android.content.Intent
55import android.net.Uri
66import android.os.Bundle
77import android.os.Parcelable
8+ import android.support.v4.app.Fragment
89import android.support.v7.widget.LinearLayoutManager
910import android.view.LayoutInflater
1011import android.view.View
@@ -13,7 +14,6 @@ import android.webkit.MimeTypeMap
1314import com.simplemobiletools.commons.extensions.*
1415import com.simplemobiletools.commons.models.FileDirItem
1516import com.simplemobiletools.commons.views.RecyclerViewDivider
16- import com.simplemobiletools.filemanager.Config
1717import com.simplemobiletools.filemanager.PATH
1818import com.simplemobiletools.filemanager.R
1919import com.simplemobiletools.filemanager.SCROLL_STATE
@@ -26,15 +26,14 @@ import kotlinx.android.synthetic.main.items_fragment.view.*
2626import java.io.File
2727import 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 {
0 commit comments