mirror of
https://github.com/KokaKiwi/BarInsta
synced 2024-11-26 00:27:30 +00:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
4381d49aa9
@ -373,7 +373,10 @@ class MainActivity : BaseLanguageActivity(), FragmentManager.OnBackStackChangedL
|
|||||||
.collect(Collectors.toList())
|
.collect(Collectors.toList())
|
||||||
showBottomViewDestinations = currentTabs.asSequence().map {
|
showBottomViewDestinations = currentTabs.asSequence().map {
|
||||||
it.startDestinationFragmentId
|
it.startDestinationFragmentId
|
||||||
}.toMutableList().apply { add(R.id.postViewFragment) }
|
}.toMutableList().apply {
|
||||||
|
add(R.id.postViewFragment)
|
||||||
|
add(R.id.favoritesFragment)
|
||||||
|
}
|
||||||
if (setDefaultTabFromSettings) {
|
if (setDefaultTabFromSettings) {
|
||||||
setSelectedTab(currentTabs)
|
setSelectedTab(currentTabs)
|
||||||
} else {
|
} else {
|
||||||
|
@ -4,4 +4,5 @@
|
|||||||
android:id="@+id/favorite_list"
|
android:id="@+id/favorite_list"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
|
android:paddingBottom="?attr/actionBarSize"
|
||||||
tools:listitem="@layout/item_search_result" />
|
tools:listitem="@layout/item_search_result" />
|
Loading…
Reference in New Issue
Block a user