Merge remote-tracking branch 'origin/develop' into feature/video_quality

openedx · Nov 3, 2023 · 36b8a7b · 36b8a7b
2 parents 90169af + 3170de0
commit 36b8a7b
Show file tree

Hide file tree

Showing 46 changed files with 1,201 additions and 51 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -84,6 +84,7 @@ dependencies {
     implementation project(path: ':discovery')
     implementation project(path: ':profile')
     implementation project(path: ':discussion')
+    implementation project(path: ':whatsnew')
 
     kapt "androidx.room:room-compiler:$room_version"
 

diff --git a/app/src/main/java/org/openedx/app/AppActivity.kt b/app/src/main/java/org/openedx/app/AppActivity.kt
@@ -24,6 +24,9 @@ import org.openedx.core.presentation.global.WindowSizeHolder
 import org.openedx.core.ui.WindowSize
 import org.openedx.core.ui.WindowType
 import org.openedx.profile.presentation.ProfileRouter
+import org.openedx.whatsnew.WhatsNewFileManager
+import org.openedx.whatsnew.data.storage.WhatsNewPreferences
+import org.openedx.whatsnew.presentation.whatsnew.WhatsNewFragment
 
 class AppActivity : AppCompatActivity(), InsetHolder, WindowSizeHolder, AppDataHolder {
 
@@ -41,8 +44,10 @@ class AppActivity : AppCompatActivity(), InsetHolder, WindowSizeHolder, AppDataH
         get() = AppData(BuildConfig.VERSION_NAME)
 
     private lateinit var binding: ActivityAppBinding
-    private val preferencesManager by inject<CorePreferences>()
     private val viewModel by viewModel<AppViewModel>()
+    private val whatsNewFileManager by inject<WhatsNewFileManager>()
+    private val whatsNewPreferencesManager by inject<WhatsNewPreferences>()
+    private val corePreferencesManager by inject<CorePreferences>()
     private val profileRouter by inject<ProfileRouter>()
 
     private var _insetTop = 0
@@ -110,14 +115,22 @@ class AppActivity : AppCompatActivity(), InsetHolder, WindowSizeHolder, AppDataH
         binding.root.requestApplyInsetsWhenAttached()
 
         if (savedInstanceState == null) {
-            if (preferencesManager.user != null) {
-                supportFragmentManager.beginTransaction()
-                    .add(R.id.container, MainFragment())
-                    .commit()
-            } else {
-                supportFragmentManager.beginTransaction()
-                    .add(R.id.container, SignInFragment())
-                    .commit()
+            when {
+                corePreferencesManager.user == null -> {
+                    supportFragmentManager.beginTransaction()
+                        .add(R.id.container, SignInFragment())
+                        .commit()
+                }
+                shouldShowWhatsNew() -> {
+                    supportFragmentManager.beginTransaction()
+                        .add(R.id.container, WhatsNewFragment())
+                        .commit()
+                }
+                corePreferencesManager.user != null -> {
+                    supportFragmentManager.beginTransaction()
+                        .add(R.id.container, MainFragment())
+                        .commit()
+                }
             }
         }
 
@@ -130,16 +143,14 @@ class AppActivity : AppCompatActivity(), InsetHolder, WindowSizeHolder, AppDataH
         val metrics = WindowMetricsCalculator.getOrCreate()
             .computeCurrentWindowMetrics(this)
 
-        val widthDp = metrics.bounds.width() /
-                resources.displayMetrics.density
+        val widthDp = metrics.bounds.width() / resources.displayMetrics.density
         val widthWindowSize = when {
             widthDp < 600f -> WindowType.Compact
             widthDp < 840f -> WindowType.Medium
             else -> WindowType.Expanded
         }
 
-        val heightDp = metrics.bounds.height() /
-                resources.displayMetrics.density
+        val heightDp = metrics.bounds.height() / resources.displayMetrics.density
         val heightWindowSize = when {
             heightDp < 480f -> WindowType.Compact
             heightDp < 900f -> WindowType.Medium
@@ -149,15 +160,21 @@ class AppActivity : AppCompatActivity(), InsetHolder, WindowSizeHolder, AppDataH
     }
 
     private fun isUsingNightModeResources(): Boolean {
-        return when (resources.configuration.uiMode and
-                Configuration.UI_MODE_NIGHT_MASK) {
+        return when (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) {
             Configuration.UI_MODE_NIGHT_YES -> true
             Configuration.UI_MODE_NIGHT_NO -> false
             Configuration.UI_MODE_NIGHT_UNDEFINED -> false
             else -> false
         }
     }
 
+    override fun shouldShowWhatsNew(): Boolean {
+        val dataVersion = whatsNewFileManager.getNewestData().version
+        return BuildConfig.VERSION_NAME == dataVersion
+                && whatsNewPreferencesManager.lastWhatsNewVersion != dataVersion
+                && org.openedx.core.BuildConfig.SHOW_WHATS_NEW
+    }
+
     companion object {
         const val TOP_INSET = "topInset"
         const val BOTTOM_INSET = "bottomInset"

diff --git a/app/src/main/java/org/openedx/app/AppRouter.kt b/app/src/main/java/org/openedx/app/AppRouter.kt
@@ -8,7 +8,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.profile.domain.model.Account
 import org.openedx.core.domain.model.CoursewareAccess
 import org.openedx.core.presentation.course.CourseViewMode
 import org.openedx.course.presentation.CourseRouter
@@ -17,13 +16,13 @@ import org.openedx.course.presentation.container.NoAccessCourseContainerFragment
 import org.openedx.course.presentation.detail.CourseDetailsFragment
 import org.openedx.course.presentation.handouts.HandoutsType
 import org.openedx.course.presentation.handouts.WebViewFragment
-import org.openedx.discovery.presentation.search.CourseSearchFragment
 import org.openedx.course.presentation.section.CourseSectionFragment
 import org.openedx.course.presentation.unit.container.CourseUnitContainerFragment
 import org.openedx.course.presentation.unit.video.VideoFullScreenFragment
 import org.openedx.course.presentation.unit.video.YoutubeVideoFullScreenFragment
 import org.openedx.dashboard.presentation.DashboardRouter
 import org.openedx.discovery.presentation.DiscoveryRouter
+import org.openedx.discovery.presentation.search.CourseSearchFragment
 import org.openedx.discussion.domain.model.DiscussionComment
 import org.openedx.discussion.domain.model.Thread
 import org.openedx.discussion.presentation.DiscussionRouter
@@ -32,16 +31,19 @@ import org.openedx.discussion.presentation.responses.DiscussionResponsesFragment
 import org.openedx.discussion.presentation.search.DiscussionSearchThreadFragment
 import org.openedx.discussion.presentation.threads.DiscussionAddThreadFragment
 import org.openedx.discussion.presentation.threads.DiscussionThreadsFragment
+import org.openedx.profile.domain.model.Account
 import org.openedx.profile.presentation.ProfileRouter
 import org.openedx.profile.presentation.anothers_account.AnothersProfileFragment
 import org.openedx.profile.presentation.delete.DeleteProfileFragment
 import org.openedx.profile.presentation.edit.EditProfileFragment
 import org.openedx.profile.presentation.settings.video.VideoQualityFragment
 import org.openedx.profile.presentation.settings.video.VideoSettingsFragment
-import java.util.*
+import org.openedx.whatsnew.WhatsNewRouter
+import org.openedx.whatsnew.presentation.whatsnew.WhatsNewFragment
+import java.util.Date
 
 class AppRouter : AuthRouter, DiscoveryRouter, DashboardRouter, CourseRouter, DiscussionRouter,
-    ProfileRouter {
+    ProfileRouter, WhatsNewRouter {
 
     //region AuthRouter
     override fun navigateToMain(fm: FragmentManager) {
@@ -58,6 +60,13 @@ class AppRouter : AuthRouter, DiscoveryRouter, DashboardRouter, CourseRouter, Di
     override fun navigateToRestorePassword(fm: FragmentManager) {
         replaceFragmentWithBackStack(fm, RestorePasswordFragment())
     }
+
+    override fun navigateToWhatsNew(fm: FragmentManager) {
+        fm.popBackStack()
+        fm.beginTransaction()
+            .replace(R.id.container, WhatsNewFragment())
+            .commit()
+    }
     //endregion
 
     //region DiscoveryRouter

diff --git a/app/src/main/java/org/openedx/app/AppViewModel.kt b/app/src/main/java/org/openedx/app/AppViewModel.kt
@@ -4,13 +4,13 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.viewModelScope
 import androidx.room.RoomDatabase
-import org.openedx.core.BaseViewModel
-import org.openedx.core.SingleEventLiveData
-import org.openedx.app.system.notifier.AppNotifier
-import org.openedx.app.system.notifier.LogoutEvent
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.openedx.app.system.notifier.AppNotifier
+import org.openedx.app.system.notifier.LogoutEvent
+import org.openedx.core.BaseViewModel
+import org.openedx.core.SingleEventLiveData
 import org.openedx.core.data.storage.CorePreferences
 
 class AppViewModel(

diff --git a/app/src/main/java/org/openedx/app/data/storage/PreferencesManager.kt b/app/src/main/java/org/openedx/app/data/storage/PreferencesManager.kt
@@ -8,8 +8,9 @@ import org.openedx.profile.data.model.Account
 import org.openedx.core.data.model.User
 import org.openedx.core.domain.model.VideoSettings
 import org.openedx.profile.data.storage.ProfilePreferences
+import org.openedx.whatsnew.data.storage.WhatsNewPreferences
 
-class PreferencesManager(context: Context) : CorePreferences, ProfilePreferences {
+class PreferencesManager(context: Context) : CorePreferences, ProfilePreferences, WhatsNewPreferences {
 
     private val sharedPreferences = context.getSharedPreferences(BuildConfig.APPLICATION_ID, Context.MODE_PRIVATE)
 
@@ -72,11 +73,18 @@ class PreferencesManager(context: Context) : CorePreferences, ProfilePreferences
                 ?: VideoSettings.default
         }
 
+    override var lastWhatsNewVersion: String
+        set(value) {
+            saveString(LAST_WHATS_NEW_VERSION, value)
+        }
+        get() = getString(LAST_WHATS_NEW_VERSION)
+
     companion object {
         private const val ACCESS_TOKEN = "access_token"
         private const val REFRESH_TOKEN = "refresh_token"
         private const val USER = "user"
         private const val ACCOUNT = "account"
         private const val VIDEO_SETTINGS = "video_settings"
+        private const val LAST_WHATS_NEW_VERSION = "last_whats_new_version"
     }
 }
diff --git a/app/src/main/java/org/openedx/app/di/AppModule.kt b/app/src/main/java/org/openedx/app/di/AppModule.kt
@@ -38,12 +38,16 @@ import org.koin.core.qualifier.named
 import org.koin.dsl.module
 import org.openedx.core.data.storage.CorePreferences
 import org.openedx.profile.data.storage.ProfilePreferences
+import org.openedx.whatsnew.WhatsNewFileManager
+import org.openedx.whatsnew.WhatsNewRouter
+import org.openedx.whatsnew.data.storage.WhatsNewPreferences
 
 val appModule = module {
 
     single { PreferencesManager(get()) }
     single<CorePreferences> { get<PreferencesManager>() }
     single<ProfilePreferences> { get<PreferencesManager>() }
+    single<WhatsNewPreferences> { get<PreferencesManager>() }
 
     single { ResourceManager(get()) }
 
@@ -63,6 +67,7 @@ val appModule = module {
     single<CourseRouter> { get<AppRouter>() }
     single<DiscussionRouter> { get<AppRouter>() }
     single<ProfileRouter> { get<AppRouter>() }
+    single<WhatsNewRouter> { get<AppRouter>() }
 
 
     single { NetworkConnection(get()) }
@@ -114,6 +119,7 @@ val appModule = module {
     }
 
     single { TranscriptManager(get()) }
+    single { WhatsNewFileManager(get()) }
 
     single { AnalyticsManager(get()) }
     single<DashboardAnalytics> { get<AnalyticsManager>() }

diff --git a/app/src/main/java/org/openedx/app/di/ScreenModule.kt b/app/src/main/java/org/openedx/app/di/ScreenModule.kt
@@ -48,6 +48,7 @@ import org.koin.dsl.module
 import org.openedx.course.presentation.unit.video.EncodedVideoUnitViewModel
 import org.openedx.course.presentation.unit.video.VideoUnitViewModel
 import org.openedx.profile.presentation.anothers_account.AnothersProfileViewModel
+import org.openedx.whatsnew.presentation.whatsnew.WhatsNewViewModel
 
 val screenModule = module {
 
@@ -100,4 +101,6 @@ val screenModule = module {
     viewModel { (comment: DiscussionComment) -> DiscussionResponsesViewModel(get(), get(), get(), comment) }
     viewModel { (courseId: String) -> DiscussionAddThreadViewModel(get(), get(), get(), courseId) }
     viewModel { (courseId: String) -> DiscussionSearchThreadViewModel(get(), get(), get(), courseId) }
+
+    viewModel { WhatsNewViewModel(get()) }
 }
diff --git a/auth/src/main/java/org/openedx/auth/presentation/AuthRouter.kt b/auth/src/main/java/org/openedx/auth/presentation/AuthRouter.kt
@@ -9,4 +9,6 @@ interface AuthRouter {
     fun navigateToSignUp(fm: FragmentManager)
 
     fun navigateToRestorePassword(fm: FragmentManager)
+
+    fun navigateToWhatsNew(fm : FragmentManager)
 }
diff --git a/auth/src/main/java/org/openedx/auth/presentation/signin/SignInFragment.kt b/auth/src/main/java/org/openedx/auth/presentation/signin/SignInFragment.kt
@@ -44,6 +44,7 @@ import org.openedx.core.ui.theme.appShapes
 import org.openedx.core.ui.theme.appTypography
 import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.openedx.core.presentation.global.AppDataHolder
 
 class SignInFragment : Fragment() {
 
@@ -82,8 +83,13 @@ class SignInFragment : Fragment() {
                 )
 
                 LaunchedEffect(loginSuccess) {
+                    val isNeedToShowWhatsNew = (requireActivity() as AppDataHolder).shouldShowWhatsNew()
                     if (loginSuccess) {
-                        router.navigateToMain(parentFragmentManager)
+                        if (isNeedToShowWhatsNew) {
+                            router.navigateToWhatsNew(parentFragmentManager)
+                        } else {
+                            router.navigateToMain(parentFragmentManager)
+                        }
                     }
                 }
             }

diff --git a/config.yaml b/config.yaml
@@ -44,3 +44,5 @@ platformName: "OpenEdX"
 platformFullName: "OpenEdX"
 #tokenType enum accepts JWT and BEARER only
 tokenType: "JWT"
+#feature flag for activating What’s New feature
+showWhatsNew: false
diff --git a/core/build.gradle b/core/build.gradle
@@ -31,6 +31,7 @@ android {
         consumerProguardFiles "consumer-rules.pro"
 
         buildConfigField "String", "ACCESS_TOKEN_TYPE", "\"${config.tokenType}\""
+        buildConfigField "Boolean", "SHOW_WHATS_NEW", "${config.showWhatsNew}"
     }
 
     namespace 'org.openedx.core'

diff --git a/core/src/main/java/org/openedx/core/module/DownloadWorker.kt b/core/src/main/java/org/openedx/core/module/DownloadWorker.kt
@@ -63,7 +63,7 @@ class DownloadWorker(
         return ForegroundInfo(
             NOTIFICATION_ID,
             notificationBuilder
-                .setSmallIcon(R.drawable.core_ic_check)
+                .setSmallIcon(R.drawable.core_ic_check_in_box)
                 .setProgress(100, 0, false)
                 .setPriority(NotificationManager.IMPORTANCE_LOW)
                 .setContentText(context.getString(R.string.core_downloading_in_progress))
@@ -80,7 +80,7 @@ class DownloadWorker(
                         notificationManager.notify(
                             NOTIFICATION_ID,
                             notificationBuilder
-                                .setSmallIcon(R.drawable.core_ic_check)
+                                .setSmallIcon(R.drawable.core_ic_check_in_box)
                                 .setProgress(100, value.toInt(), false)
                                 .setPriority(NotificationManager.IMPORTANCE_LOW)
                                 .setContentText(context.getString(R.string.core_downloading_in_progress))

diff --git a/core/src/main/java/org/openedx/core/presentation/global/AppDataHolder.kt b/core/src/main/java/org/openedx/core/presentation/global/AppDataHolder.kt
@@ -2,6 +2,7 @@ package org.openedx.core.presentation.global
 
 interface AppDataHolder {
     val appData: AppData
+    fun shouldShowWhatsNew(): Boolean
 }
 
 data class AppData(

diff --git a/core/src/main/java/org/openedx/core/ui/ComposeExtensions.kt b/core/src/main/java/org/openedx/core/ui/ComposeExtensions.kt
@@ -3,11 +3,13 @@ package org.openedx.core.ui
 import android.content.res.Configuration
 import android.graphics.Rect
 import android.view.ViewTreeObserver
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.MutatePriority
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.pager.PagerState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.MutableState
@@ -173,3 +175,7 @@ fun LazyListState.reEnableScrolling(scope: CoroutineScope) {
     }
 }
 
+@OptIn(ExperimentalFoundationApi::class)
+fun PagerState.calculateCurrentOffsetForPage(page: Int): Float {
+    return (currentPage - page) + currentPageOffsetFraction
+}
diff --git a/core/src/main/res/drawable/core_ic_back.xml b/core/src/main/res/drawable/core_ic_back.xml
@@ -11,21 +11,21 @@
         android:strokeLineJoin="round"
         android:strokeWidth="1.75"
         android:fillColor="#00000000"
-        android:strokeColor="#19212F"
+        android:strokeColor="#ffffff"
         android:strokeLineCap="round"/>
     <path
         android:pathData="M11,18L5,12"
         android:strokeLineJoin="round"
         android:strokeWidth="1.75"
         android:fillColor="#00000000"
-        android:strokeColor="#19212F"
+        android:strokeColor="#ffffff"
         android:strokeLineCap="round"/>
     <path
         android:pathData="M11,6L5,12"
         android:strokeLineJoin="round"
         android:strokeWidth="1.75"
         android:fillColor="#00000000"
-        android:strokeColor="#19212F"
+        android:strokeColor="#ffffff"
         android:strokeLineCap="round"/>
   </group>
 </vector>