Calculate insertion index

Author: rostikjoystick

app/src/main/java/org/stepic/droid/ui/fragments/HomeFragment.kt

@@ -186,7 +186,7 @@ class HomeFragment : FragmentBase(), HomeStreakView, FastContinueNewHomeFragment
 
             binding.bind(banner, bannerResourcesMapper)
 
-            val insertionIndex = min(banner.position + offset, homeMainContainer.childCount - 1)
+            val insertionIndex = min(banner.position + offset, homeMainContainer.childCount)
             val previousFragment = homeMainContainer.getChildAt(insertionIndex - 1).findFragment<Fragment>()
 
             homeMainContainer.addView(binding.root, insertionIndex)

app/src/main/java/org/stepik/android/view/catalog/ui/fragment/CatalogFragment.kt

@@ -83,6 +83,7 @@ import ru.nobird.android.view.base.ui.extension.showIfNotExists
 import ru.nobird.android.view.redux.ui.extension.reduxViewModel
 import ru.nobird.app.core.model.mutate
 import javax.inject.Inject
+import kotlin.math.min
 
 class CatalogFragment :
     Fragment(R.layout.fragment_catalog),
@@ -388,7 +389,10 @@ class CatalogFragment :
 
     private fun resolveCatalogItems(banners: List<Banner>, collectionCatalogItems: List<CatalogItem>): List<CatalogItem> =
         collectionCatalogItems.mutate {
-            banners.forEach { banner -> add(banner.position, CatalogItem.BannerBlock(banner)) }
+            banners.forEach { banner ->
+                val insertionIndex = min(banner.position, collectionCatalogItems.size)
+                add(insertionIndex, CatalogItem.BannerBlock(banner))
+            }
         }
 
     private fun showStories(position: Int) {