Minor improvements to browse source
This commit is contained in:
parent
7920eeb278
commit
f28342601b
2 changed files with 2 additions and 3 deletions
|
|
@ -110,7 +110,7 @@ fun BrowseSourceScreen(
|
||||||
},
|
},
|
||||||
floatingActionButton = {
|
floatingActionButton = {
|
||||||
BrowseSourceFloatingActionButton(
|
BrowseSourceFloatingActionButton(
|
||||||
isVisible = presenter.filters.isNotEmpty() && presenter.currentFilter is BrowseSourcePresenter.Filter.UserInput,
|
isVisible = presenter.filters.isNotEmpty()/* SY --> && presenter.currentFilter is BrowseSourcePresenter.Filter.UserInput <-- SY */,
|
||||||
onFabClick = onFabClick,
|
onFabClick = onFabClick,
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
|
|
@ -200,7 +200,7 @@ fun BrowseSourceScreen(
|
||||||
text = if (presenter.filters.isNotEmpty()) {
|
text = if (presenter.filters.isNotEmpty()) {
|
||||||
stringResource(id = R.string.action_filter)
|
stringResource(id = R.string.action_filter)
|
||||||
} else {
|
} else {
|
||||||
stringResource(id = R.string.saved_searches)
|
stringResource(id = R.string.action_search)
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
// SY <--
|
// SY <--
|
||||||
|
|
|
||||||
|
|
@ -254,7 +254,6 @@ open class BrowseSourceController(bundle: Bundle) :
|
||||||
val allDefault = search.filterList != null && presenter.filters == presenter.source!!.getFilterList()
|
val allDefault = search.filterList != null && presenter.filters == presenter.source!!.getFilterList()
|
||||||
filterSheet?.dismiss()
|
filterSheet?.dismiss()
|
||||||
|
|
||||||
filterSheet?.dismiss()
|
|
||||||
presenter.searchQuery = search.query.nullIfBlank()
|
presenter.searchQuery = search.query.nullIfBlank()
|
||||||
presenter.setSourceFilter(if (allDefault) FilterList() else presenter.filters)
|
presenter.setSourceFilter(if (allDefault) FilterList() else presenter.filters)
|
||||||
presenter.search()
|
presenter.search()
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue