Skip to content

Fix search function #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
captainepoch merged 1 commit into from
Sep 28, 2025
Merged

Fix search function #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions husky/app/src/main/java/com/keylesspalace/tusky/components/search/SearchActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ class SearchActivity : BottomSheetActivity() {
super.onCreateOptionsMenu(menu)

menuInflater.inflate(R.menu.search_toolbar, menu)
val searchView = menu.findItem(R.id.action_search)
.actionView as SearchView
val searchView = menu.findItem(R.id.action_search).actionView as SearchView
setupSearchView(searchView)

searchView.setQuery(viewModel.currentQuery, false)
Expand Down
4 changes: 2 additions & 2 deletions ...y/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ import com.keylesspalace.tusky.util.hide
import com.keylesspalace.tusky.util.show
import com.keylesspalace.tusky.util.visible
import com.zhuinden.fragmentviewbindingdelegatekt.viewBinding
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koin.androidx.viewmodel.ext.android.activityViewModel

abstract class SearchFragment<T> :
Fragment(R.layout.fragment_search),
LinkListener,
SwipeRefreshLayout.OnRefreshListener {

private val binding by viewBinding(FragmentSearchBinding::bind)
protected val searchViewModel: SearchViewModel by viewModel<SearchViewModel>()
protected val searchViewModel: SearchViewModel by activityViewModel<SearchViewModel>()

private var snackbarErrorRetry: Snackbar? = null

Expand Down
1 change: 1 addition & 0 deletions ...c/main/java/com/keylesspalace/tusky/components/search/fragments/SearchHashtagsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import com.keylesspalace.tusky.entity.HashTag
import com.keylesspalace.tusky.util.NetworkState

class SearchHashtagsFragment : SearchFragment<HashTag>() {

override val networkStateRefresh: LiveData<NetworkState>
get() = searchViewModel.networkStateHashTagRefresh
override val networkState: LiveData<NetworkState>
Expand Down