Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import com.github.libretube.helpers.PreferenceHelper
import com.github.libretube.ui.activities.MainActivity
import com.github.libretube.ui.adapters.SearchResultsAdapter
import com.github.libretube.ui.base.DynamicLayoutManagerFragment
import com.github.libretube.ui.extensions.setOnBackPressed
import com.github.libretube.ui.extensions.setupFragmentAnimation
import com.github.libretube.ui.models.SearchResultViewModel
import com.github.libretube.util.TextUtils.toTimeInSeconds
import kotlinx.coroutines.Dispatchers
Expand Down Expand Up @@ -105,7 +105,7 @@ class SearchResultFragment : DynamicLayoutManagerFragment(R.layout.fragment_sear
}
}

setOnBackPressed {
setupFragmentAnimation(binding.root) {
findNavController().popBackStack(R.id.searchFragment, true) ||
findNavController().popBackStack()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import com.github.libretube.helpers.PreferenceHelper
import com.github.libretube.ui.activities.MainActivity
import com.github.libretube.ui.adapters.SearchHistoryAdapter
import com.github.libretube.ui.adapters.SearchSuggestionsAdapter
import com.github.libretube.ui.extensions.setOnBackPressed
import com.github.libretube.ui.extensions.setupFragmentAnimation
import com.github.libretube.ui.models.SearchViewModel
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
Expand Down Expand Up @@ -53,7 +53,7 @@ class SearchSuggestionsFragment : Fragment(R.layout.fragment_search_suggestions)
showData(it)
}

setOnBackPressed {
setupFragmentAnimation(binding.root) {
if (mainActivity.searchView.anyChildFocused()) mainActivity.searchView.clearFocus()
else findNavController().popBackStack()
}
Expand Down
Loading