Merge pull request #3 from BenHenning/update-pr-4383

Update PR oppia#4383 with various fixes
KevinGitonga · Sep 29, 2022 · 60b6e25 · 60b6e25
2 parents 342bacc + 1630af9
commit 60b6e25
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...ia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragmentPresenter.kt b/...ia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragmentPresenter.kt
@@ -79,7 +79,7 @@ class MarkChaptersCompletedFragmentPresenter @Inject constructor(
         }
       } else if (binding.isAllChecked == true) {
         binding.isAllChecked = false
-        getMarkChaptersCompletedViewModel().getItemList().forEach { viewModel ->
+        viewModel.getItemList().forEach { viewModel ->
           if (viewModel is ChapterSummaryViewModel) {
             if (!viewModel.checkIfChapterIsCompleted()) {
               chapterUnselected(viewModel.chapterIndex, viewModel.nextStoryIndex)

diff --git a/...ppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedFragmentPresenter.kt b/...ppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedFragmentPresenter.kt
@@ -77,7 +77,7 @@ class MarkStoriesCompletedFragmentPresenter @Inject constructor(
             storySelected(viewModel.storySummary.storyId)
         }
       } else {
-        getMarkStoriesCompletedViewModel().getStorySummaryMap().values.forEach { viewModel ->
+        viewModel.getStorySummaryMap().values.forEach { viewModel ->
           if (!viewModel.isCompleted) storyUnselected(viewModel.storySummary.storyId)
         }
       }

diff --git a/.../oppia/android/app/devoptions/marktopicscompleted/MarkTopicsCompletedFragmentPresenter.kt b/.../oppia/android/app/devoptions/marktopicscompleted/MarkTopicsCompletedFragmentPresenter.kt
@@ -72,7 +72,7 @@ class MarkTopicsCompletedFragmentPresenter @Inject constructor(
           if (!viewModel.isCompleted) topicSelected(viewModel.topic.topicId)
         }
       } else {
-        getMarkTopicsCompletedViewModel().getTopicList().forEach { viewModel ->
+        viewModel.getTopicList().forEach { viewModel ->
           if (!viewModel.isCompleted) topicUnselected(viewModel.topic.topicId)
         }
       }