update the item adapters primary color on resume

This commit is contained in:
tibbi 2018-05-15 10:39:42 +02:00
parent 0286b29323
commit 20359e5b48
2 changed files with 7 additions and 4 deletions

View File

@ -49,7 +49,7 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
private var currentItemsHash = fileDirItems.hashCode() private var currentItemsHash = fileDirItems.hashCode()
private val hasOTGConnected = activity.hasOTGConnected() private val hasOTGConnected = activity.hasOTGConnected()
private var textToHighlight = "" private var textToHighlight = ""
private var adjustedPrimaryColor = activity.getAdjustedPrimaryColor() var adjustedPrimaryColor = activity.getAdjustedPrimaryColor()
init { init {
setupDragListener(true) setupDragListener(true)

View File

@ -83,7 +83,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
val newTextColor = context!!.config.textColor val newTextColor = context!!.config.textColor
if (storedTextColor != newTextColor) { if (storedTextColor != newTextColor) {
storedItems = ArrayList() storedItems = ArrayList()
(items_list.adapter as? ItemsAdapter)?.apply { getRecyclerAdapter()?.apply {
updateTextColor(newTextColor) updateTextColor(newTextColor)
initDrawables() initDrawables()
} }
@ -96,6 +96,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
if (!isFirstResume) { if (!isFirstResume) {
refreshItems() refreshItems()
} }
getRecyclerAdapter()?.adjustedPrimaryColor = context!!.getAdjustedPrimaryColor()
isFirstResume = false isFirstResume = false
} }
@ -251,7 +252,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
val filtered = storedItems.filter { it.name.contains(text, true) } as ArrayList val filtered = storedItems.filter { it.name.contains(text, true) } as ArrayList
filtered.sortBy { !it.name.startsWith(text, true) } filtered.sortBy { !it.name.startsWith(text, true) }
activity?.runOnUiThread { activity?.runOnUiThread {
(items_list.adapter as? ItemsAdapter)?.updateItems(filtered, text) getRecyclerAdapter()?.updateItems(filtered, text)
} }
}.start() }.start()
} }
@ -263,7 +264,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
fun searchClosed() { fun searchClosed() {
isSearchOpen = false isSearchOpen = false
if (!skipItemUpdating) { if (!skipItemUpdating) {
(items_list.adapter as? ItemsAdapter)?.updateItems(storedItems) getRecyclerAdapter()?.updateItems(storedItems)
} }
skipItemUpdating = false skipItemUpdating = false
} }
@ -278,6 +279,8 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
} }
} }
private fun getRecyclerAdapter() = items_list.adapter as? ItemsAdapter
override fun breadcrumbClicked(id: Int) { override fun breadcrumbClicked(id: Int) {
if (id == 0) { if (id == 0) {
StoragePickerDialog(activity as SimpleActivity, currentPath) { StoragePickerDialog(activity as SimpleActivity, currentPath) {