feat: cache-first logic

Author: PavloNetrebchuk

app/src/main/java/org/openedx/app/MainFragment.kt

@@ -17,13 +17,15 @@ import org.openedx.app.deeplink.HomeTab
 import org.openedx.core.adapter.NavigationFragmentAdapter
 import org.openedx.core.presentation.global.appupgrade.UpgradeRequiredFragment
 import org.openedx.core.presentation.global.viewBinding
+import org.openedx.dates.presentation.dates.DatesFragment
 import org.openedx.discovery.presentation.DiscoveryRouter
 import org.openedx.downloads.presentation.download.DownloadsFragment
 import org.openedx.learn.presentation.LearnFragment
 import org.openedx.learn.presentation.LearnTab
 import org.openedx.profile.presentation.profile.ProfileFragment
 
-class MainFragment : Fragment(R.layout.fragment_main) {
+class
+MainFragment : Fragment(R.layout.fragment_main) {
 
     private val binding by viewBinding(FragmentMainBinding::bind)
     private val viewModel by viewModel<MainViewModel>()
@@ -93,6 +95,9 @@ class MainFragment : Fragment(R.layout.fragment_main) {
             if (viewModel.isDownloadsFragmentEnabled) {
                 add(R.id.fragmentDownloads to DownloadsFragment())
             }
+            if (viewModel.isDatesFragmentEnabled) {
+                add(R.id.fragmentDates to DatesFragment())
+            }
             add(R.id.fragmentProfile to ProfileFragment())
         }
     }
@@ -102,12 +107,14 @@ class MainFragment : Fragment(R.layout.fragment_main) {
             R.id.fragmentLearn to resources.getString(R.string.app_navigation_learn),
             R.id.fragmentDiscover to resources.getString(R.string.app_navigation_discovery),
             R.id.fragmentDownloads to resources.getString(R.string.app_navigation_downloads),
+            R.id.fragmentDates to resources.getString(R.string.app_navigation_dates),
             R.id.fragmentProfile to resources.getString(R.string.app_navigation_profile),
         )
         val tabIconSelectors = mapOf(
             R.id.fragmentLearn to R.drawable.app_ic_learn_selector,
             R.id.fragmentDiscover to R.drawable.app_ic_discover_selector,
             R.id.fragmentDownloads to R.drawable.app_ic_downloads_selector,
+            R.id.fragmentDates to R.drawable.app_ic_dates_selector,
             R.id.fragmentProfile to R.drawable.app_ic_profile_selector
         )
 
@@ -125,6 +132,7 @@ class MainFragment : Fragment(R.layout.fragment_main) {
                 R.id.fragmentLearn -> viewModel.logLearnTabClickedEvent()
                 R.id.fragmentDiscover -> viewModel.logDiscoveryTabClickedEvent()
                 R.id.fragmentDownloads -> viewModel.logDownloadsTabClickedEvent()
+                R.id.fragmentDates -> viewModel.logDatesTabClickedEvent()
                 R.id.fragmentProfile -> viewModel.logProfileTabClickedEvent()
             }
             menuIdToIndex[menuItem.itemId]?.let { index ->
@@ -162,6 +170,7 @@ class MainFragment : Fragment(R.layout.fragment_main) {
             } else {
                 R.id.fragmentLearn
             }
+            HomeTab.DATES.name -> R.id.fragmentDates
             HomeTab.PROFILE.name -> R.id.fragmentProfile
             else -> R.id.fragmentLearn
         }

app/src/main/java/org/openedx/app/di/ScreenModule.kt

@@ -235,6 +235,7 @@ val screenModule = module {
 
     single { CourseRepository(get(), get(), get(), get(), get()) }
     factory { CourseInteractor(get()) }
+    single<org.openedx.core.domain.interactor.CourseInteractor> { get<CourseInteractor>() }
 
     viewModel { (pathId: String, infoType: String) ->
         CourseInfoViewModel(
@@ -551,7 +552,8 @@ val screenModule = module {
             resourceManager = get(),
             datesInteractor = get(),
             corePreferences = get(),
-            analytics = get()
+            analytics = get(),
+            calendarSyncScheduler = get()
         )
     }
 }

app/src/main/java/org/openedx/app/room/AppDatabase.kt

@@ -6,6 +6,7 @@ import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 import org.openedx.core.data.model.room.CourseCalendarEventEntity
 import org.openedx.core.data.model.room.CourseCalendarStateEntity
+import org.openedx.core.data.model.room.CourseDatesResponseEntity
 import org.openedx.core.data.model.room.CourseEnrollmentDetailsEntity
 import org.openedx.core.data.model.room.CourseStructureEntity
 import org.openedx.core.data.model.room.DownloadCoursePreview
@@ -17,7 +18,6 @@ import org.openedx.core.module.db.DownloadDao
 import org.openedx.core.module.db.DownloadModelEntity
 import org.openedx.course.data.storage.CourseConverter
 import org.openedx.dashboard.data.DashboardDao
-import org.openedx.dates.data.storage.CourseDateEntity
 import org.openedx.dates.data.storage.DatesDao
 import org.openedx.discovery.data.converter.DiscoveryConverter
 import org.openedx.discovery.data.model.room.CourseEntity
@@ -37,7 +37,7 @@ const val DATABASE_NAME = "OpenEdX_db"
         CourseCalendarStateEntity::class,
         DownloadCoursePreview::class,
         CourseEnrollmentDetailsEntity::class,
-        CourseDateEntity::class,
+        CourseDatesResponseEntity::class,
     ],
     autoMigrations = [
         AutoMigration(1, DATABASE_VERSION)

app/src/main/res/drawable/app_ic_dates_cloud_fill.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="20dp"
+    android:viewportWidth="18"
+    android:viewportHeight="20">
+    <path
+        android:pathData="M16,2H15V0H13V2H5V0H3V2H2C0.89,2 0.01,2.9 0.01,4L0,18C0,19.1 0.89,20 2,20H16C17.1,20 18,19.1 18,18V4C18,2.9 17.1,2 16,2ZM16,18H2V8H16V18ZM6,12H4V10H6V12ZM10,12H8V10H10V12ZM14,12H12V10H14V12ZM6,16H4V14H6V16ZM10,16H8V14H10V16ZM14,16H12V14H14V16Z"
+        android:fillColor="#3C68FF" />
+</vector>

app/src/main/res/drawable/app_ic_dates_cloud_outline.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="20dp"
+    android:viewportWidth="18"
+    android:viewportHeight="20">
+    <path
+        android:pathData="M16,2H15V0H13V2H5V0H3V2H2C0.89,2 0.01,2.9 0.01,4L0,18C0,19.1 0.89,20 2,20H16C17.1,20 18,19.1 18,18V4C18,2.9 17.1,2 16,2ZM16,18H2V8H16V18ZM16,6H2V4H16V6ZM6,12H4V10H6V12ZM10,12H8V10H10V12ZM14,12H12V10H14V12ZM6,16H4V14H6V16ZM10,16H8V14H10V16ZM14,16H12V14H14V16Z"
+        android:fillColor="#97A5BB" />
+</vector>

app/src/main/res/drawable/app_ic_dates_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/app_ic_dates_cloud_fill" android:state_checked="true" />
+    <item android:drawable="@drawable/app_ic_dates_cloud_outline" />
+</selector>

app/src/main/res/menu/bottom_view_menu.xml

@@ -3,5 +3,6 @@
     <item type="id" name="fragmentLearn" />
     <item type="id" name="fragmentDiscover" />
     <item type="id" name="fragmentDownloads" />
+    <item type="id" name="fragmentDates" />
     <item type="id" name="fragmentProfile" />
 </resources>

app/src/main/res/values/main_manu_tab_ids.xml

@@ -2,7 +2,7 @@ package org.openedx.core.config
 
 import com.google.gson.annotations.SerializedName
 
-data class DatesConfig(
+data class AppLevelDatesConfig(
     @SerializedName("ENABLED")
     val isEnabled: Boolean = true,
 )

…a/org/openedx/core/config/DatesConfig.kt …enedx/core/config/AppLevelDatesConfig.ktcore/src/main/java/org/openedx/core/config/DatesConfig.kt renamed to core/src/main/java/org/openedx/core/config/AppLevelDatesConfig.kt core/src/main/java/org/openedx/core/config/DatesConfig.kt renamed to core/src/main/java/org/openedx/core/config/AppLevelDatesConfig.kt

@@ -5,4 +5,6 @@ import com.google.gson.annotations.SerializedName
 data class ExperimentalFeaturesConfig(
     @SerializedName("APP_LEVEL_DOWNLOADS")
     val appLevelDownloadsConfig: AppLevelDownloadsConfig,
+    @SerializedName("APP_LEVEL_DATES")
+    val appLevelDatesConfig: AppLevelDatesConfig,
 )