Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Ammar Githam 2021-06-07 06:54:36 +09:00
commit 4381d49aa9
2 changed files with 5 additions and 1 deletions

View File

@ -373,7 +373,10 @@ class MainActivity : BaseLanguageActivity(), FragmentManager.OnBackStackChangedL
.collect(Collectors.toList())
showBottomViewDestinations = currentTabs.asSequence().map {
it.startDestinationFragmentId
}.toMutableList().apply { add(R.id.postViewFragment) }
}.toMutableList().apply {
add(R.id.postViewFragment)
add(R.id.favoritesFragment)
}
if (setDefaultTabFromSettings) {
setSelectedTab(currentTabs)
} else {

View File

@ -4,4 +4,5 @@
android:id="@+id/favorite_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="?attr/actionBarSize"
tools:listitem="@layout/item_search_result" />