Merge branch '7927-search_scroll_fix' into 'main' (77b52a1c) · Commits · e / os / App Lounge

app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt

+6 −7

Original line number	Diff line number	Diff line
		@@ -132,7 +132,6 @@ class SearchFragment :
		authObjects.observe(viewLifecycleOwner) {
		val currentQuery = searchView?.query?.toString() ?: ""
		if (it == null \|\| shouldIgnore(it, currentQuery)) {
		showData()
		return@observe
		}

		@@ -176,6 +175,8 @@ class SearchFragment :
		searchViewModel.searchResult.observe(viewLifecycleOwner) {
		if (it.data?.first.isNullOrEmpty() && it.data?.second == false) {
		noAppsFoundLayout?.visibility = View.VISIBLE
		} else if (searchViewModel.shouldIgnoreResults()) {
		return@observe
		} else {
		listAdapter?.let { adapter ->
		observeDownloadList(adapter)
		@@ -367,13 +368,13 @@ class SearchFragment :
		}

		override fun showLoadingUI() {
		binding.shimmerLayout.startShimmer()
		binding.shimmerLayout.visibility = View.VISIBLE
		shimmerLayout?.visibility = View.VISIBLE
		shimmerLayout?.startShimmer()
		}

		override fun stopLoadingUI() {
		binding.shimmerLayout.stopShimmer()
		binding.shimmerLayout.visibility = View.GONE
		shimmerLayout?.stopShimmer()
		shimmerLayout?.visibility = View.GONE
		}

		private fun updateProgressOfInstallingApps(downloadProgress: DownloadProgress) {
		@@ -440,8 +441,6 @@ class SearchFragment :

		view?.requestFocus()
		searchHintLayout?.visibility = View.GONE
		shimmerLayout?.visibility = View.VISIBLE
		noAppsFoundLayout?.visibility = View.GONE
		/*
		* Set the search text and call for network result.
		*/

+9 −0

Original line number	Diff line number	Diff line
		@@ -319,4 +319,13 @@ class SearchViewModel @Inject constructor(
		loadMore(searchText, autoTriggered = true)
		}
		}

		fun shouldIgnoreResults(): Boolean {
		val appsList = _searchResult.value?.data?.first

		if (appsList.isNullOrEmpty()) return true

		val appPackageNames = appsList.map { it.package_name }
		return appPackageNames.all { it.isBlank() }
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -95,7 +95,7 @@

		<include
		android:id="@+id/noAppsFoundLayout"
		android:visibility="invisible"
		android:visibility="gone"
		tools:visibility="gone"
		layout="@layout/layout_no_apps_found" />