Sort saved searches in UI

This commit is contained in:
NerdNumber9 2019-04-06 17:59:18 -04:00
parent 96b1340aec
commit 739fc9f95d
2 changed files with 5 additions and 5 deletions

View File

@ -143,7 +143,7 @@ open class BrowseCatalogueController(bundle: Bundle) :
drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED, Gravity.END) drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED, Gravity.END)
// EXH --> // EXH -->
navView.setSavedSearches(presenter.source.id, presenter.loadSearches()) navView.setSavedSearches(presenter.loadSearches())
navView.onSaveClicked = { navView.onSaveClicked = {
MaterialDialog.Builder(navView.context) MaterialDialog.Builder(navView.context)
.title("Save current search query?") .title("Save current search query?")
@ -157,7 +157,7 @@ open class BrowseCatalogueController(bundle: Bundle) :
presenter.sourceFilters presenter.sourceFilters
) )
presenter.saveSearches(newSearches) presenter.saveSearches(newSearches)
navView.setSavedSearches(presenter.source.id, newSearches) navView.setSavedSearches(newSearches)
} }
} }
.positiveText("Save") .positiveText("Save")
@ -218,7 +218,7 @@ open class BrowseCatalogueController(bundle: Bundle) :
index != indexToDelete index != indexToDelete
} }
presenter.saveSearches(newSearches) presenter.saveSearches(newSearches)
navView.setSavedSearches(presenter.source.id, newSearches) navView.setSavedSearches(newSearches)
} }
.cancelable(true) .cancelable(true)
.canceledOnTouchOutside(true) .canceledOnTouchOutside(true)

View File

@ -58,7 +58,7 @@ class CatalogueNavigationView @JvmOverloads constructor(context: Context, attrs:
} }
// EXH --> // EXH -->
fun setSavedSearches(id: Long, searches: List<EXHSavedSearch>) { fun setSavedSearches(searches: List<EXHSavedSearch>) {
saved_searches.removeAllViews() saved_searches.removeAllViews()
val outValue = TypedValue() val outValue = TypedValue()
@ -66,7 +66,7 @@ class CatalogueNavigationView @JvmOverloads constructor(context: Context, attrs:
save_search_btn.visibility = if(searches.size < 5) View.VISIBLE else View.GONE save_search_btn.visibility = if(searches.size < 5) View.VISIBLE else View.GONE
searches.forEachIndexed { index, search -> searches.withIndex().sortedBy { it.value.name }.forEach { (index, search) ->
val restoreBtn = TextView(context) val restoreBtn = TextView(context)
restoreBtn.text = search.name restoreBtn.text = search.name
val params = LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT) val params = LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT)