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

app/build.gradle

@@ -208,6 +208,7 @@ dependencies {
       'androidx.test.ext:junit:1.1.1',
       'com.github.bumptech.glide:mocks:4.11.0',
       'com.google.truth:truth:1.1.3',
+      'androidx.work:work-testing:2.4.0',
       'com.google.truth.extensions:truth-liteproto-extension:1.1.3',
       'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.2.2',
       'org.mockito:mockito-android:2.7.22',

app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentPresenter.kt

@@ -78,7 +78,7 @@ class AdministratorControlsFragmentPresenter @Inject constructor(
   private fun createRecyclerViewAdapter(isMultipane: Boolean):
     BindableAdapter<AdministratorControlsItemViewModel> {
       return BindableAdapter.MultiTypeBuilder
-        .newBuilder<AdministratorControlsItemViewModel, ViewType> { viewModel ->
+        .Factory(fragment).create<AdministratorControlsItemViewModel, ViewType> { viewModel ->
           viewModel.isMultipane.set(isMultipane)
           when (viewModel) {
             is AdministratorControlsGeneralViewModel -> {

app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentPresenter.kt

@@ -16,8 +16,10 @@ import javax.inject.Inject
 /** Presenter for arranging [ProfileAndDeviceIdFragment]'s UI. */
 class ProfileAndDeviceIdFragmentPresenter @Inject constructor(
   private val fragment: Fragment,
-  private val profileListViewModelFactory: ProfileListViewModel.Factory
+  private val profileListViewModelFactory: ProfileListViewModel.Factory,
+  private val multiTypeBuilderFactory: BindableAdapter.MultiTypeBuilder.Factory
 ) {
+
   private lateinit var binding: ProfileAndDeviceIdFragmentBinding
 
   /** Handles [ProfileAndDeviceIdFragment]'s creation flow. */
@@ -38,16 +40,15 @@ class ProfileAndDeviceIdFragmentPresenter @Inject constructor(
   }
 
   private fun createRecyclerViewAdapter(): BindableAdapter<ProfileListItemViewModel> {
-    return BindableAdapter.MultiTypeBuilder
-      .newBuilder<ProfileListItemViewModel, ProfileListItemViewType> { viewModel ->
-        when (viewModel) {
-          is DeviceIdItemViewModel -> ProfileListItemViewType.DEVICE_ID
-          is ProfileLearnerIdItemViewModel -> ProfileListItemViewType.LEARNER_ID
-          is SyncStatusItemViewModel -> ProfileListItemViewType.SYNC_STATUS
-          else -> error("Encountered unexpected view model: $viewModel")
-        }
+    return multiTypeBuilderFactory.create<ProfileListItemViewModel,
+      ProfileListItemViewType> { viewModel ->
+      when (viewModel) {
+        is DeviceIdItemViewModel -> ProfileListItemViewType.DEVICE_ID
+        is ProfileLearnerIdItemViewModel -> ProfileListItemViewType.LEARNER_ID
+        is SyncStatusItemViewModel -> ProfileListItemViewType.SYNC_STATUS
+        else -> error("Encountered unexpected view model: $viewModel")
       }
-      .setLifecycleOwner(fragment)
+    }.setLifecycleOwner(fragment)
       .registerViewDataBinder(
         viewType = ProfileListItemViewType.DEVICE_ID,
         inflateDataBinding = ProfileListDeviceIdItemBinding::inflate,

app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListFragmentPresenter.kt

@@ -17,7 +17,8 @@ import javax.inject.Inject
 class CompletedStoryListFragmentPresenter @Inject constructor(
   private val activity: AppCompatActivity,
   private val fragment: Fragment,
-  private val viewModelProvider: ViewModelProvider<CompletedStoryListViewModel>
+  private val viewModelProvider: ViewModelProvider<CompletedStoryListViewModel>,
+  private val singleTypeBuilderFactory: BindableAdapter.SingleTypeBuilder.Factory
 ) {
 
   private lateinit var binding: CompletedStoryListFragmentBinding
@@ -52,8 +53,7 @@ class CompletedStoryListFragmentPresenter @Inject constructor(
   }
 
   private fun createRecyclerViewAdapter(): BindableAdapter<CompletedStoryItemViewModel> {
-    return BindableAdapter.SingleTypeBuilder
-      .newBuilder<CompletedStoryItemViewModel>()
+    return singleTypeBuilderFactory.create<CompletedStoryItemViewModel>()
       .registerViewDataBinderWithSameModelType(
         inflateDataBinding = CompletedStoryItemBinding::inflate,
         setViewModel = CompletedStoryItemBinding::setViewModel

app/src/main/java/org/oppia/android/app/devoptions/DeveloperOptionsFragmentPresenter.kt

@@ -24,7 +24,9 @@ import javax.inject.Inject
 @FragmentScope
 class DeveloperOptionsFragmentPresenter @Inject constructor(
   private val activity: AppCompatActivity,
-  private val fragment: Fragment
+  private val fragment: Fragment,
+  private val multiTypeBuilderFactory: BindableAdapter.MultiTypeBuilder.Factory
+
 ) {
 
   private lateinit var binding: DeveloperOptionsFragmentBinding
@@ -59,28 +61,27 @@ class DeveloperOptionsFragmentPresenter @Inject constructor(
   }
 
   private fun createRecyclerViewAdapter(): BindableAdapter<DeveloperOptionsItemViewModel> {
-    return BindableAdapter.MultiTypeBuilder
-      .newBuilder<DeveloperOptionsItemViewModel, ViewType> { viewModel ->
-        when (viewModel) {
-          is DeveloperOptionsModifyLessonProgressViewModel -> {
-            viewModel.itemIndex.set(0)
-            ViewType.VIEW_TYPE_MODIFY_LESSON_PROGRESS
-          }
-          is DeveloperOptionsViewLogsViewModel -> {
-            viewModel.itemIndex.set(1)
-            ViewType.VIEW_TYPE_VIEW_LOGS
-          }
-          is DeveloperOptionsOverrideAppBehaviorsViewModel -> {
-            viewModel.itemIndex.set(2)
-            ViewType.VIEW_TYPE_OVERRIDE_APP_BEHAVIORS
-          }
-          is DeveloperOptionsTestParsersViewModel -> {
-            viewModel.itemIndex.set(3)
-            ViewType.VIEW_TYPE_TEST_PARSERS
-          }
-          else -> throw IllegalArgumentException("Encountered unexpected view model: $viewModel")
+    return multiTypeBuilderFactory.create<DeveloperOptionsItemViewModel, ViewType> { viewModel ->
+      when (viewModel) {
+        is DeveloperOptionsModifyLessonProgressViewModel -> {
+          viewModel.itemIndex.set(0)
+          ViewType.VIEW_TYPE_MODIFY_LESSON_PROGRESS
+        }
+        is DeveloperOptionsViewLogsViewModel -> {
+          viewModel.itemIndex.set(1)
+          ViewType.VIEW_TYPE_VIEW_LOGS
+        }
+        is DeveloperOptionsOverrideAppBehaviorsViewModel -> {
+          viewModel.itemIndex.set(2)
+          ViewType.VIEW_TYPE_OVERRIDE_APP_BEHAVIORS
         }
+        is DeveloperOptionsTestParsersViewModel -> {
+          viewModel.itemIndex.set(3)
+          ViewType.VIEW_TYPE_TEST_PARSERS
+        }
+        else -> throw IllegalArgumentException("Encountered unexpected view model: $viewModel")
       }
+    }
       .registerViewDataBinder(
         viewType = ViewType.VIEW_TYPE_MODIFY_LESSON_PROGRESS,
         inflateDataBinding = DeveloperOptionsModifyLessonProgressViewBinding::inflate,

app/src/main/java/org/oppia/android/app/devoptions/forcenetworktype/ForceNetworkTypeFragmentPresenter.kt

@@ -21,7 +21,8 @@ class ForceNetworkTypeFragmentPresenter @Inject constructor(
   private val activity: AppCompatActivity,
   private val fragment: Fragment,
   private val networkConnectionUtil: Optional<NetworkConnectionDebugUtil>,
-  private val viewModelProvider: ViewModelProvider<ForceNetworkTypeViewModel>
+  private val viewModelProvider: ViewModelProvider<ForceNetworkTypeViewModel>,
+  private val singleTypeBuilderFactory: BindableAdapter.SingleTypeBuilder.Factory
 ) {
 
   private lateinit var binding: ForceNetworkTypeFragmentBinding
@@ -60,8 +61,7 @@ class ForceNetworkTypeFragmentPresenter @Inject constructor(
   }
 
   private fun createRecyclerViewAdapter(): BindableAdapter<NetworkTypeItemViewModel> {
-    return BindableAdapter.SingleTypeBuilder
-      .newBuilder<NetworkTypeItemViewModel>()
+    return singleTypeBuilderFactory.create<NetworkTypeItemViewModel>()
       .registerViewDataBinderWithSameModelType(
         inflateDataBinding = ForceNetworkTypeNetworkItemViewBinding::inflate,
         setViewModel = this::bindNetworkItemView

app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragmentPresenter.kt

@@ -23,7 +23,8 @@ class MarkChaptersCompletedFragmentPresenter @Inject constructor(
   private val activity: AppCompatActivity,
   private val fragment: Fragment,
   private val viewModelProvider: ViewModelProvider<MarkChaptersCompletedViewModel>,
-  private val modifyLessonProgressController: ModifyLessonProgressController
+  private val modifyLessonProgressController: ModifyLessonProgressController,
+  private val multiTypeBuilderFactory: BindableAdapter.MultiTypeBuilder.Factory
 ) : ChapterSelector {
   private lateinit var binding: MarkChaptersCompletedFragmentBinding
   private lateinit var linearLayoutManager: LinearLayoutManager
@@ -94,14 +95,14 @@ class MarkChaptersCompletedFragmentPresenter @Inject constructor(
   }
 
   private fun createRecyclerViewAdapter(): BindableAdapter<MarkChaptersCompletedItemViewModel> {
-    return BindableAdapter.MultiTypeBuilder
-      .newBuilder<MarkChaptersCompletedItemViewModel, ViewType> { viewModel ->
-        when (viewModel) {
-          is StorySummaryViewModel -> ViewType.VIEW_TYPE_STORY
-          is ChapterSummaryViewModel -> ViewType.VIEW_TYPE_CHAPTER
-          else -> throw IllegalArgumentException("Encountered unexpected view model: $viewModel")
-        }
+    return multiTypeBuilderFactory.create<MarkChaptersCompletedItemViewModel,
+      ViewType> { viewModel ->
+      when (viewModel) {
+        is StorySummaryViewModel -> ViewType.VIEW_TYPE_STORY
+        is ChapterSummaryViewModel -> ViewType.VIEW_TYPE_CHAPTER
+        else -> throw IllegalArgumentException("Encountered unexpected view model: $viewModel")
       }
+    }
       .registerViewDataBinder(
         viewType = ViewType.VIEW_TYPE_STORY,
         inflateDataBinding = MarkChaptersCompletedStorySummaryViewBinding::inflate,

app/src/main/java/org/oppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedFragmentPresenter.kt

@@ -21,7 +21,8 @@ class MarkStoriesCompletedFragmentPresenter @Inject constructor(
   private val activity: AppCompatActivity,
   private val fragment: Fragment,
   private val viewModelProvider: ViewModelProvider<MarkStoriesCompletedViewModel>,
-  private val modifyLessonProgressController: ModifyLessonProgressController
+  private val modifyLessonProgressController: ModifyLessonProgressController,
+  private val singleTypeBuilderFactory: BindableAdapter.SingleTypeBuilder.Factory
 ) : StorySelector {
   private lateinit var binding: MarkStoriesCompletedFragmentBinding
   private lateinit var linearLayoutManager: LinearLayoutManager
@@ -91,8 +92,7 @@ class MarkStoriesCompletedFragmentPresenter @Inject constructor(
   }
 
   private fun createRecyclerViewAdapter(): BindableAdapter<StorySummaryViewModel> {
-    return BindableAdapter.SingleTypeBuilder
-      .newBuilder<StorySummaryViewModel>()
+    return singleTypeBuilderFactory.create<StorySummaryViewModel>()
       .registerViewDataBinderWithSameModelType(
         inflateDataBinding = MarkStoriesCompletedStorySummaryViewBinding::inflate,
         setViewModel = this::bindStorySummaryView

app/src/main/java/org/oppia/android/app/devoptions/marktopicscompleted/MarkTopicsCompletedFragmentPresenter.kt

@@ -21,7 +21,8 @@ class MarkTopicsCompletedFragmentPresenter @Inject constructor(
   private val activity: AppCompatActivity,
   private val fragment: Fragment,
   private val viewModelProvider: ViewModelProvider<MarkTopicsCompletedViewModel>,
-  private val modifyLessonProgressController: ModifyLessonProgressController
+  private val modifyLessonProgressController: ModifyLessonProgressController,
+  private val singleTypeAdapterFactory: BindableAdapter.SingleTypeBuilder.Factory
 ) : TopicSelector {
   private lateinit var binding: MarkTopicsCompletedFragmentBinding
   private lateinit var linearLayoutManager: LinearLayoutManager
@@ -89,8 +90,7 @@ class MarkTopicsCompletedFragmentPresenter @Inject constructor(
   }
 
   private fun createRecyclerViewAdapter(): BindableAdapter<TopicViewModel> {
-    return BindableAdapter.SingleTypeBuilder
-      .newBuilder<TopicViewModel>()
+    return singleTypeAdapterFactory.create<TopicViewModel>()
       .registerViewDataBinderWithSameModelType(
         inflateDataBinding = MarkTopicsCompletedTopicViewBinding::inflate,
         setViewModel = this::bindTopicSummaryView

app/src/main/java/org/oppia/android/app/devoptions/vieweventlogs/ViewEventLogsFragmentPresenter.kt

@@ -18,7 +18,8 @@ import javax.inject.Inject
 class ViewEventLogsFragmentPresenter @Inject constructor(
   private val activity: AppCompatActivity,
   private val fragment: Fragment,
-  private val viewModelProvider: ViewModelProvider<ViewEventLogsViewModel>
+  private val viewModelProvider: ViewModelProvider<ViewEventLogsViewModel>,
+  private val singleTypeAdapterFactory: BindableAdapter.SingleTypeBuilder.Factory
 ) {
 
   private lateinit var binding: ViewEventLogsFragmentBinding
@@ -56,8 +57,7 @@ class ViewEventLogsFragmentPresenter @Inject constructor(
   }
 
   private fun createRecyclerViewAdapter(): BindableAdapter<EventLogItemViewModel> {
-    return BindableAdapter.SingleTypeBuilder
-      .newBuilder<EventLogItemViewModel>()
+    return singleTypeAdapterFactory.create<EventLogItemViewModel>()
       .registerViewDataBinderWithSameModelType(
         inflateDataBinding = ViewEventLogsEventLogItemViewBinding::inflate,
         setViewModel = ViewEventLogsEventLogItemViewBinding::setViewModel

app/src/main/java/org/oppia/android/app/help/HelpFragmentPresenter.kt

@@ -18,7 +18,8 @@ import javax.inject.Inject
 class HelpFragmentPresenter @Inject constructor(
   private val activity: AppCompatActivity,
   private val fragment: Fragment,
-  private val viewModelProvider: ViewModelProvider<HelpListViewModel>
+  private val viewModelProvider: ViewModelProvider<HelpListViewModel>,
+  private val singleTypeBuilderFactory: BindableAdapter.SingleTypeBuilder.Factory
 ) {
   private lateinit var binding: HelpFragmentBinding
 
@@ -48,8 +49,7 @@ class HelpFragmentPresenter @Inject constructor(
   }
 
   private fun createRecyclerViewAdapter(): BindableAdapter<HelpItemViewModel> {
-    return BindableAdapter.SingleTypeBuilder
-      .newBuilder<HelpItemViewModel>()
+    return singleTypeBuilderFactory.create<HelpItemViewModel>()
       .registerViewDataBinderWithSameModelType(
         inflateDataBinding = HelpItemBinding::inflate,
         setViewModel = HelpItemBinding::setViewModel

app/src/main/java/org/oppia/android/app/help/faq/FAQListFragmentPresenter.kt

@@ -22,7 +22,8 @@ import javax.inject.Inject
 class FAQListFragmentPresenter @Inject constructor(
   private val activity: AppCompatActivity,
   private val fragment: Fragment,
-  private val viewModelProvider: ViewModelProvider<FAQListViewModel>
+  private val viewModelProvider: ViewModelProvider<FAQListViewModel>,
+  private val multiTypeBuilderFactory: BindableAdapter.MultiTypeBuilder.Factory
 ) {
   private lateinit var binding: FaqListFragmentBinding
 
@@ -48,14 +49,13 @@ class FAQListFragmentPresenter @Inject constructor(
   }
 
   private fun createRecyclerViewAdapter(): BindableAdapter<FAQItemViewModel> {
-    return BindableAdapter.MultiTypeBuilder
-      .newBuilder<FAQItemViewModel, ViewType> { viewModel ->
-        when (viewModel) {
-          is FAQHeaderViewModel -> ViewType.VIEW_TYPE_HEADER
-          is FAQContentViewModel -> ViewType.VIEW_TYPE_CONTENT
-          else -> throw IllegalArgumentException("Encountered unexpected view model: $viewModel")
-        }
+    return multiTypeBuilderFactory.create<FAQItemViewModel, ViewType> { viewModel ->
+      when (viewModel) {
+        is FAQHeaderViewModel -> ViewType.VIEW_TYPE_HEADER
+        is FAQContentViewModel -> ViewType.VIEW_TYPE_CONTENT
+        else -> throw IllegalArgumentException("Encountered unexpected view model: $viewModel")
       }
+    }
       .registerViewDataBinder(
         viewType = ViewType.VIEW_TYPE_HEADER,
         inflateDataBinding = FaqItemHeaderBinding::inflate,

app/src/main/java/org/oppia/android/app/help/thirdparty/LicenseListFragmentPresenter.kt

@@ -18,7 +18,8 @@ import javax.inject.Inject
 class LicenseListFragmentPresenter @Inject constructor(
   private val activity: AppCompatActivity,
   private val fragment: Fragment,
-  private val resourceHandler: AppLanguageResourceHandler
+  private val resourceHandler: AppLanguageResourceHandler,
+  private val singleTypeBuilderFactory: BindableAdapter.SingleTypeBuilder.Factory
 ) {
   private lateinit var binding: LicenseListFragmentBinding
 
@@ -51,8 +52,7 @@ class LicenseListFragmentPresenter @Inject constructor(
   }
 
   private fun createRecyclerViewAdapter(): BindableAdapter<LicenseItemViewModel> {
-    return BindableAdapter.SingleTypeBuilder
-      .newBuilder<LicenseItemViewModel>()
+    return singleTypeBuilderFactory.create<LicenseItemViewModel>()
       .registerViewDataBinderWithSameModelType(
         inflateDataBinding = LicenseItemBinding::inflate,
         setViewModel = LicenseItemBinding::setViewModel

app/src/main/java/org/oppia/android/app/help/thirdparty/ThirdPartyDependencyListFragmentPresenter.kt

@@ -18,7 +18,8 @@ import javax.inject.Inject
 class ThirdPartyDependencyListFragmentPresenter @Inject constructor(
   private val activity: AppCompatActivity,
   private val fragment: Fragment,
-  private val viewModelProvider: ViewModelProvider<ThirdPartyDependencyListViewModel>
+  private val viewModelProvider: ViewModelProvider<ThirdPartyDependencyListViewModel>,
+  private val singleTypeBuilderFactory: BindableAdapter.SingleTypeBuilder.Factory
 ) {
   private lateinit var binding: ThirdPartyDependencyListFragmentBinding
 
@@ -50,8 +51,7 @@ class ThirdPartyDependencyListFragmentPresenter @Inject constructor(
   }
 
   private fun createRecyclerViewAdapter(): BindableAdapter<ThirdPartyDependencyItemViewModel> {
-    return BindableAdapter.SingleTypeBuilder
-      .newBuilder<ThirdPartyDependencyItemViewModel>()
+    return singleTypeBuilderFactory.create<ThirdPartyDependencyItemViewModel>()
       .registerViewDataBinderWithSameModelType(
         inflateDataBinding = ThirdPartyDependencyItemBinding::inflate,
         setViewModel = ThirdPartyDependencyItemBinding::setViewModel

app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt

@@ -36,7 +36,8 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
   private val htmlParserFactory: HtmlParser.Factory,
   @DefaultResourceBucketName private val resourceBucketName: String,
   @ExplorationHtmlParserEntityType private val entityType: String,
-  private val resourceHandler: AppLanguageResourceHandler
+  private val resourceHandler: AppLanguageResourceHandler,
+  private val multiTypeAdapterFactory: BindableAdapter.MultiTypeBuilder.Factory
 ) {
 
   private var currentExpandedHintListIndex: Int? = null
@@ -167,15 +168,14 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
   }
 
   private fun createRecyclerViewAdapter(): BindableAdapter<HintsAndSolutionItemViewModel> {
-    return BindableAdapter.MultiTypeBuilder
-      .newBuilder<HintsAndSolutionItemViewModel, ViewType> { viewModel ->
-        when (viewModel) {
-          is HintsViewModel -> ViewType.VIEW_TYPE_HINT_ITEM
-          is SolutionViewModel -> ViewType.VIEW_TYPE_SOLUTION_ITEM
-          is HintsDividerViewModel -> ViewType.VIEW_TYPE_HINTS_DIVIDER_ITEM
-          else -> throw IllegalArgumentException("Encountered unexpected view model: $viewModel")
-        }
+    return multiTypeAdapterFactory.create<HintsAndSolutionItemViewModel, ViewType> { viewModel ->
+      when (viewModel) {
+        is HintsViewModel -> ViewType.VIEW_TYPE_HINT_ITEM
+        is SolutionViewModel -> ViewType.VIEW_TYPE_SOLUTION_ITEM
+        is HintsDividerViewModel -> ViewType.VIEW_TYPE_HINTS_DIVIDER_ITEM
+        else -> throw IllegalArgumentException("Encountered unexpected view model: $viewModel")
       }
+    }
       .registerViewDataBinder(
         viewType = ViewType.VIEW_TYPE_HINT_ITEM,
         inflateDataBinding = HintsSummaryBinding::inflate,