refactor: Move CourseContainerTab

PavloNetrebchuk · PavloNetrebchuk · commit 96b7795fd69d · 2024-05-16T16:39:29.000+03:00
diff --git a/app/src/main/java/org/openedx/app/AppRouter.kt b/app/src/main/java/org/openedx/app/AppRouter.kt
@@ -9,7 +9,6 @@ import org.openedx.auth.presentation.restore.RestorePasswordFragment
 import org.openedx.auth.presentation.signin.SignInFragment
 import org.openedx.auth.presentation.signup.SignUpFragment
 import org.openedx.core.FragmentViewType
-import org.openedx.core.presentation.course.CourseContainerTab
 import org.openedx.core.presentation.course.CourseViewMode
 import org.openedx.core.presentation.global.app_upgrade.AppUpgradeRouter
 import org.openedx.core.presentation.global.app_upgrade.UpgradeRequiredFragment
@@ -160,12 +159,12 @@ class AppRouter : AuthRouter, DiscoveryRouter, DashboardRouter, CourseRouter, Di
         courseId: String,
         courseTitle: String,
         enrollmentMode: String,
-        requiredTab: CourseContainerTab,
+        openDates: Boolean,
         openBlock: String
     ) {
         replaceFragmentWithBackStack(
             fm,
-            CourseContainerFragment.newInstance(courseId, courseTitle, enrollmentMode, requiredTab, openBlock)
+            CourseContainerFragment.newInstance(courseId, courseTitle, enrollmentMode, openDates, openBlock)
         )
     }
 
diff --git a/core/src/main/java/org/openedx/core/system/notifier/CourseNotifier.kt b/core/src/main/java/org/openedx/core/system/notifier/CourseNotifier.kt
@@ -18,6 +18,7 @@ class CourseNotifier {
     suspend fun send(event: CalendarSyncEvent) = channel.emit(event)
     suspend fun send(event: CourseDatesShifted) = channel.emit(event)
     suspend fun send(event: CourseLoading) = channel.emit(event)
-    suspend fun send(event: CourseRefresh) = channel.emit(event)
     suspend fun send(event: CourseOpenBlock) = channel.emit(event)
+    suspend fun send(event: RefreshDates) = channel.emit(event)
+    suspend fun send(event: RefreshDiscussions) = channel.emit(event)
 }
diff --git a/core/src/main/java/org/openedx/core/system/notifier/CourseRefresh.kt b/core/src/main/java/org/openedx/core/system/notifier/CourseRefresh.kt
diff --git a/core/src/main/java/org/openedx/core/system/notifier/RefreshDates.kt b/core/src/main/java/org/openedx/core/system/notifier/RefreshDates.kt
@@ -0,0 +1,3 @@
+package org.openedx.core.system.notifier
+
+object RefreshDates : CourseEvent
diff --git a/core/src/main/java/org/openedx/core/system/notifier/RefreshDiscussions.kt b/core/src/main/java/org/openedx/core/system/notifier/RefreshDiscussions.kt
@@ -0,0 +1,3 @@
+package org.openedx.core.system.notifier
+
+object RefreshDiscussions : CourseEvent
diff --git a/course/src/main/java/org/openedx/course/presentation/container/CollapsingLayout.kt b/course/src/main/java/org/openedx/course/presentation/container/CollapsingLayout.kt
@@ -64,7 +64,6 @@ import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import org.openedx.core.presentation.course.CourseContainerTab
 import org.openedx.core.ui.RoundTabsBar
 import org.openedx.core.ui.displayCutoutForLandscape
 import org.openedx.core.ui.rememberWindowSize
diff --git a/course/src/main/java/org/openedx/course/presentation/container/CourseContainerFragment.kt b/course/src/main/java/org/openedx/course/presentation/container/CourseContainerFragment.kt
@@ -53,9 +53,7 @@ import kotlinx.coroutines.launch
 import org.koin.androidx.compose.koinViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
-import org.openedx.core.extension.serializable
 import org.openedx.core.extension.takeIfNotEmpty
-import org.openedx.core.presentation.course.CourseContainerTab
 import org.openedx.core.presentation.global.viewBinding
 import org.openedx.core.ui.HandleUIMessage
 import org.openedx.core.ui.OfflineModeDialog
@@ -258,21 +256,21 @@ class CourseContainerFragment : Fragment(R.layout.fragment_course_container) {
         const val ARG_COURSE_ID = "courseId"
         const val ARG_TITLE = "title"
         const val ARG_ENROLLMENT_MODE = "enrollmentMode"
-        const val ARG_REQUIRED_TAB = "requiredTab"
+        const val ARG_OPEN_DATES = "open_dates"
         const val ARG_OPEN_BLOCK = "resume_block"
         fun newInstance(
             courseId: String,
             courseTitle: String,
             enrollmentMode: String,
-            requiredTab: CourseContainerTab = CourseContainerTab.HOME,
+            openDates: Boolean = false,
             openBlock: String = ""
         ): CourseContainerFragment {
             val fragment = CourseContainerFragment()
             fragment.arguments = bundleOf(
                 ARG_COURSE_ID to courseId,
                 ARG_TITLE to courseTitle,
                 ARG_ENROLLMENT_MODE to enrollmentMode,
-                ARG_REQUIRED_TAB to requiredTab,
+                ARG_OPEN_DATES to openDates,
                 ARG_OPEN_BLOCK to openBlock
             )
             return fragment
@@ -304,7 +302,11 @@ fun CourseDashboard(
             val refreshing by viewModel.refreshing.collectAsState(true)
             val courseImage by viewModel.courseImage.collectAsState()
             val uiMessage by viewModel.uiMessage.collectAsState(null)
-            val requiredTab = bundle.serializable<CourseContainerTab>(CourseContainerFragment.ARG_REQUIRED_TAB)
+            val requiredTab = if (bundle.getBoolean(CourseContainerFragment.ARG_OPEN_DATES)) {
+                CourseContainerTab.DATES
+            } else {
+                CourseContainerTab.HOME
+            }
             val pagerState = rememberPagerState(
                 initialPage = CourseContainerTab.entries.indexOf(requiredTab),
                 pageCount = { CourseContainerTab.entries.size }
diff --git a/course/src/main/java/org/openedx/course/presentation/container/CourseContainerTab.kt b/course/src/main/java/org/openedx/course/presentation/container/CourseContainerTab.kt
@@ -1,4 +1,4 @@
-package org.openedx.core.presentation.course
+package org.openedx.course.presentation.container
 
 import androidx.annotation.StringRes
 import androidx.compose.material.icons.Icons
diff --git a/course/src/main/java/org/openedx/course/presentation/container/CourseContainerViewModel.kt b/course/src/main/java/org/openedx/course/presentation/container/CourseContainerViewModel.kt
@@ -25,7 +25,6 @@ import org.openedx.core.config.Config
 import org.openedx.core.data.storage.CorePreferences
 import org.openedx.core.exception.NoCachedDataException
 import org.openedx.core.extension.isInternetError
-import org.openedx.core.presentation.course.CourseContainerTab
 import org.openedx.core.system.ResourceManager
 import org.openedx.core.system.connection.NetworkConnection
 import org.openedx.core.system.notifier.CalendarSyncEvent.CheckCalendarSyncEvent
@@ -35,8 +34,9 @@ import org.openedx.core.system.notifier.CourseDatesShifted
 import org.openedx.core.system.notifier.CourseLoading
 import org.openedx.core.system.notifier.CourseNotifier
 import org.openedx.core.system.notifier.CourseOpenBlock
-import org.openedx.core.system.notifier.CourseRefresh
 import org.openedx.core.system.notifier.CourseStructureUpdated
+import org.openedx.core.system.notifier.RefreshDates
+import org.openedx.core.system.notifier.RefreshDiscussions
 import org.openedx.core.utils.TimeUtils
 import org.openedx.course.DatesShiftedSnackBar
 import org.openedx.course.R
@@ -228,13 +228,13 @@ class CourseContainerViewModel(
 
             CourseContainerTab.DATES -> {
                 viewModelScope.launch {
-                    courseNotifier.send(CourseRefresh(courseContainerTab))
+                    courseNotifier.send(RefreshDates)
                 }
             }
 
             CourseContainerTab.DISCUSSIONS -> {
                 viewModelScope.launch {
-                    courseNotifier.send(CourseRefresh(courseContainerTab))
+                    courseNotifier.send(RefreshDiscussions)
                 }
             }
 
diff --git a/course/src/main/java/org/openedx/course/presentation/dates/CourseDatesViewModel.kt b/course/src/main/java/org/openedx/course/presentation/dates/CourseDatesViewModel.kt
@@ -23,14 +23,13 @@ import org.openedx.core.domain.model.CourseStructure
 import org.openedx.core.extension.getSequentialBlocks
 import org.openedx.core.extension.getVerticalBlocks
 import org.openedx.core.extension.isInternetError
-import org.openedx.core.presentation.course.CourseContainerTab
 import org.openedx.core.system.ResourceManager
 import org.openedx.core.system.notifier.CalendarSyncEvent.CheckCalendarSyncEvent
 import org.openedx.core.system.notifier.CalendarSyncEvent.CreateCalendarSyncEvent
 import org.openedx.core.system.notifier.CourseDatesShifted
 import org.openedx.core.system.notifier.CourseLoading
 import org.openedx.core.system.notifier.CourseNotifier
-import org.openedx.core.system.notifier.CourseRefresh
+import org.openedx.core.system.notifier.RefreshDates
 import org.openedx.course.domain.interactor.CourseInteractor
 import org.openedx.course.presentation.CourseAnalytics
 import org.openedx.course.presentation.CourseAnalyticsEvent
@@ -88,11 +87,7 @@ class CourseDatesViewModel(
                         _calendarSyncUIState.update { it.copy(isSynced = event.isSynced) }
                     }
 
-                    is CourseRefresh -> {
-                        if (event.courseContainerTab == CourseContainerTab.DATES) {
-                            loadingCourseDatesInternal()
-                        }
-                    }
+                    is RefreshDates -> loadingCourseDatesInternal()
                 }
             }
         }
diff --git a/dashboard/src/main/java/org/openedx/courses/presentation/PrimaryCourseScreen.kt b/dashboard/src/main/java/org/openedx/courses/presentation/PrimaryCourseScreen.kt
@@ -78,7 +78,6 @@ import org.openedx.core.domain.model.EnrolledCourse
 import org.openedx.core.domain.model.EnrolledCourseData
 import org.openedx.core.domain.model.Pagination
 import org.openedx.core.domain.model.Progress
-import org.openedx.core.presentation.course.CourseContainerTab
 import org.openedx.core.ui.HandleUIMessage
 import org.openedx.core.ui.OfflineModeDialog
 import org.openedx.core.ui.OpenEdXButton
@@ -142,7 +141,7 @@ fun PrimaryCourseScreen(
                         courseId = action.enrolledCourse.course.id,
                         courseTitle = action.enrolledCourse.course.name,
                         enrollmentMode = action.enrolledCourse.mode,
-                        requiredTab = CourseContainerTab.DATES
+                        openDates = true
                     )
                 }
 
diff --git a/dashboard/src/main/java/org/openedx/dashboard/presentation/DashboardRouter.kt b/dashboard/src/main/java/org/openedx/dashboard/presentation/DashboardRouter.kt
@@ -2,7 +2,6 @@ package org.openedx.dashboard.presentation
 
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
-import org.openedx.core.presentation.course.CourseContainerTab
 
 interface DashboardRouter {
 
@@ -11,7 +10,7 @@ interface DashboardRouter {
         courseId: String,
         courseTitle: String,
         enrollmentMode: String,
-        requiredTab: CourseContainerTab = CourseContainerTab.HOME,
+        openDates: Boolean = false,
         openBlock: String = ""
     )
 
diff --git a/discovery/src/main/java/org/openedx/discovery/presentation/DiscoveryRouter.kt b/discovery/src/main/java/org/openedx/discovery/presentation/DiscoveryRouter.kt
@@ -1,7 +1,6 @@
 package org.openedx.discovery.presentation
 
 import androidx.fragment.app.FragmentManager
-import org.openedx.core.presentation.course.CourseContainerTab
 
 interface DiscoveryRouter {
 
diff --git a/discussion/src/main/java/org/openedx/discussion/presentation/topics/DiscussionTopicsViewModel.kt b/discussion/src/main/java/org/openedx/discussion/presentation/topics/DiscussionTopicsViewModel.kt
@@ -11,11 +11,10 @@ import org.openedx.core.BaseViewModel
 import org.openedx.core.R
 import org.openedx.core.UIMessage
 import org.openedx.core.extension.isInternetError
-import org.openedx.core.presentation.course.CourseContainerTab
 import org.openedx.core.system.ResourceManager
 import org.openedx.core.system.notifier.CourseLoading
 import org.openedx.core.system.notifier.CourseNotifier
-import org.openedx.core.system.notifier.CourseRefresh
+import org.openedx.core.system.notifier.RefreshDiscussions
 import org.openedx.discussion.domain.interactor.DiscussionInteractor
 import org.openedx.discussion.presentation.DiscussionAnalytics
 import org.openedx.discussion.presentation.DiscussionRouter
@@ -81,11 +80,7 @@ class DiscussionTopicsViewModel(
         viewModelScope.launch {
             courseNotifier.notifier.collect { event ->
                 when (event) {
-                    is CourseRefresh -> {
-                        if (event.courseContainerTab == CourseContainerTab.DISCUSSIONS) {
-                            getCourseTopic()
-                        }
-                    }
+                    is RefreshDiscussions -> getCourseTopic()
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ class CourseNotifier {`
`18`	`18`	`suspend fun send(event: CalendarSyncEvent) = channel.emit(event)`
`19`	`19`	`suspend fun send(event: CourseDatesShifted) = channel.emit(event)`
`20`	`20`	`suspend fun send(event: CourseLoading) = channel.emit(event)`
`21`		`- suspend fun send(event: CourseRefresh) = channel.emit(event)`
`22`	`21`	`suspend fun send(event: CourseOpenBlock) = channel.emit(event)`
	`22`	`+ suspend fun send(event: RefreshDates) = channel.emit(event)`
	`23`	`+ suspend fun send(event: RefreshDiscussions) = channel.emit(event)`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package org.openedx.core.system.notifier`
	`2`	`+`
	`3`	`+object RefreshDates : CourseEvent`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package org.openedx.core.system.notifier`
	`2`	`+`
	`3`	`+object RefreshDiscussions : CourseEvent`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.openedx.core.presentation.course`
	`1`	`+package org.openedx.course.presentation.container`
`2`	`2`
`3`	`3`	`import androidx.annotation.StringRes`
`4`	`4`	`import androidx.compose.material.icons.Icons`