Browse Source

Merge remote-tracking branch 'upstream/master'

renovate/org.robolectric-robolectric-4.x
Ammar Githam 4 years ago
parent
commit
4381d49aa9
  1. 5
      app/src/main/java/awais/instagrabber/activities/MainActivity.kt
  2. 1
      app/src/main/res/layout/fragment_favorites.xml

5
app/src/main/java/awais/instagrabber/activities/MainActivity.kt

@ -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 {

1
app/src/main/res/layout/fragment_favorites.xml

@ -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" />
Loading…
Cancel
Save