Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12316d9b authored Jan 25, 2019 by Nihar Thakkar

Fix "load more" bug

parent f4f8f38f

app/src/main/java/io/eelo/appinstaller/categories/category/CategoryActivity.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -108,6 +108,7 @@ class CategoryActivity : AppCompatActivity(), ApplicationManagerServiceConnectio
		progressBar.visibility = View.GONE
		loadMoreContainer.visibility = View.GONE
		} else {
		loadMoreContainer.visibility = View.GONE
		isLoadingMoreApplications = false
		}
		} else {

app/src/main/java/io/eelo/appinstaller/search/SearchFragment.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -140,6 +140,7 @@ class SearchFragment : Fragment(), SearchView.OnQueryTextListener, SearchView.On
		progressBar.visibility = View.GONE
		loadMoreContainer.visibility = View.GONE
		} else {
		loadMoreContainer.visibility = View.GONE
		isLoadingMoreApplications = false
		}
		} else {

app/src/main/java/io/eelo/appinstaller/search/model/SearchModel.kt

+9 −7

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ class SearchModel : SearchModelInterface {

		override fun onSearchComplete(error: Error?, applicationList: ArrayList<Application>) {
		if (error == null) {
		if (applicationList.isNotEmpty()) {
		if (pageNumber > 1 && this.applicationList.value != null) {
		val combinedAppList = this.applicationList.value!!
		combinedAppList.addAll(applicationList)
		@@ -60,7 +61,8 @@ class SearchModel : SearchModelInterface {
		} else {
		this.applicationList.value = applicationList
		}
		if (applicationList.isEmpty()) {
		}
		else {
		screenError.value = Error.NO_RESULTS
		}
		} else {