Fix #2658, #299: Replace builder() with Factory in SingleTypeBuilder and MultiTypeBuilder

app/src/main/java/org/oppia/android/app/player/state/DragDropSortInteractionView.kt

@@ -53,7 +53,6 @@ class DragDropSortInteractionView @JvmOverloads constructor(
   @Inject
   lateinit var viewBindingShim: ViewBindingShim
 
-  @Inject
   lateinit var singleTypeBuilderFactory: BindableAdapter.SingleTypeBuilder.Factory
 
   private lateinit var entityId: String
@@ -76,6 +75,7 @@ class DragDropSortInteractionView @JvmOverloads constructor(
     //  this more efficiently and cleanly than always relying on notifying of potential changes in the adapter when the
     //  type is set (plus the type ought to be permanent).
     this.isMultipleItemsInSamePositionAllowed = isAllowed
+    singleTypeBuilderFactory = BindableAdapter.SingleTypeBuilder.Factory(Fragment())
     adapter = createAdapter()
   }
 

app/src/main/java/org/oppia/android/app/player/state/SelectionInteractionView.kt

@@ -45,15 +45,13 @@ class SelectionInteractionView @JvmOverloads constructor(
   @Inject
   lateinit var bindingInterface: ViewBindingShim
 
-  @Inject
   lateinit var singleTypeBuilderFactory: BindableAdapter.SingleTypeBuilder.Factory
 
   private lateinit var entityId: String
   private lateinit var writtenTranslationContext: WrittenTranslationContext
 
   override fun onAttachedToWindow() {
     super.onAttachedToWindow()
-
     val viewComponentFactory = FragmentManager.findFragment<Fragment>(this) as ViewComponentFactory
     val viewComponent = viewComponentFactory.createViewComponent(this) as ViewComponentImpl
     viewComponent.inject(this)
@@ -65,6 +63,7 @@ class SelectionInteractionView @JvmOverloads constructor(
     //  this more efficiently and cleanly than always relying on notifying of potential changes in the adapter when the
     //  type is set (plus the type ought to be permanent).
     this.selectionItemInputType = selectionItemInputType
+    singleTypeBuilderFactory = BindableAdapter.SingleTypeBuilder.Factory(Fragment())
     adapter = createAdapter()
   }
 

app/src/main/java/org/oppia/android/app/recyclerview/BindableAdapter.kt

@@ -336,11 +336,7 @@ class BindableAdapter<T : Any> internal constructor(
             setViewModel(binding, transformViewModel(data))
             // Attaching lifecycleOwner before view model initialization can sometimes cause a
             // NullPointerException because data might not be attached to the views yet.
-            // Skip attaching Lifecycle when StateFragment is created as this is causing NPE, yet to find fix.
-            val currentFragment = getLifecycleOwner()?.javaClass?.simpleName.toString()
-            if (currentFragment != "QuestionPlayerFragment" && currentFragment != "StateFragment") {
-              binding.lifecycleOwner = getLifecycleOwner()
-            }
+            binding.lifecycleOwner = getLifecycleOwner()
           }
         }
       }