make fragmentView nullable

This commit is contained in:
tibbi 2017-10-22 15:07:10 +02:00
parent feea6d3590
commit 44f7543ef1

View File

@ -36,15 +36,14 @@ class ItemsFragment : Fragment(), ItemsAdapter.ItemOperationsListener {
private var mStoredTextColor = 0 private var mStoredTextColor = 0
private var mShowHidden = false private var mShowHidden = false
private var mItems = ArrayList<FileDirItem>() private var mItems = ArrayList<FileDirItem>()
private var fragmentView: View? = null
lateinit var fragmentView: View
var mPath = "" var mPath = ""
override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View { override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View {
fragmentView = inflater!!.inflate(R.layout.items_fragment, container, false)!! fragmentView = inflater!!.inflate(R.layout.items_fragment, container, false)!!
storeConfigVariables() storeConfigVariables()
return fragmentView return fragmentView!!
} }
override fun onViewCreated(view: View?, savedInstanceState: Bundle?) { override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
@ -81,7 +80,7 @@ class ItemsFragment : Fragment(), ItemsAdapter.ItemOperationsListener {
} }
fun fillItems() { fun fillItems() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && activity.isDestroyed) if (activity == null || (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && activity.isDestroyed))
return return
mPath = arguments.getString(PATH) mPath = arguments.getString(PATH)
@ -130,10 +129,10 @@ class ItemsFragment : Fragment(), ItemsAdapter.ItemOperationsListener {
} }
} }
private fun getRecyclerLayoutManager() = (fragmentView.items_list.layoutManager as LinearLayoutManager) private fun getRecyclerLayoutManager() = (fragmentView?.items_list?.layoutManager as LinearLayoutManager)
private fun setupRecyclerViewListener() { private fun setupRecyclerViewListener() {
fragmentView.items_list.listener = object : MyScalableRecyclerView.MyScalableRecyclerViewListener { fragmentView?.items_list?.listener = object : MyScalableRecyclerView.MyScalableRecyclerViewListener {
override fun zoomIn() { override fun zoomIn() {
} }