Feature/new navigation pager (#23)

* New navigation

---------

Co-authored-by: Volodymyr Chekyrta <[email protected]>

Author: hryh27

app/build.gradle

@@ -76,7 +76,7 @@ dependencies {
 
     kapt "androidx.room:room-compiler:$room_version"
 
-    implementation 'androidx.core:core-splashscreen:1.0.0'
+    implementation 'androidx.core:core-splashscreen:1.0.1'
     testImplementation 'junit:junit:4.13.2'
 
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'

app/src/main/java/com/raccoongang/newedx/AppRouter.kt

@@ -2,6 +2,7 @@ package com.raccoongang.newedx
 
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentTransaction
 import com.raccoongang.auth.presentation.AuthRouter
 import com.raccoongang.auth.presentation.restore.RestorePasswordFragment
 import com.raccoongang.auth.presentation.signin.SignInFragment
@@ -21,7 +22,6 @@ import com.raccoongang.course.presentation.section.CourseSectionFragment
 import com.raccoongang.course.presentation.unit.container.CourseUnitContainerFragment
 import com.raccoongang.course.presentation.unit.video.VideoFullScreenFragment
 import com.raccoongang.course.presentation.unit.video.YoutubeVideoFullScreenFragment
-import com.raccoongang.course.presentation.units.CourseUnitsFragment
 import com.raccoongang.dashboard.presentation.DashboardRouter
 import com.raccoongang.discovery.presentation.DiscoveryRouter
 import com.raccoongang.discussion.domain.model.DiscussionComment
@@ -93,42 +93,44 @@ class AppRouter : AuthRouter, DiscoveryRouter, DashboardRouter, CourseRouter, Di
     //endregion
 
     //region CourseRouter
-    override fun navigateToCourseUnits(
+
+    override fun navigateToCourseSubsections(
         fm: FragmentManager,
         courseId: String,
         blockId: String,
-        courseName: String,
+        title: String,
         mode: CourseViewMode,
     ) {
         replaceFragmentWithBackStack(
             fm,
-            CourseUnitsFragment.newInstance(courseId, blockId, courseName, mode)
+            CourseSectionFragment.newInstance(courseId, blockId, title, mode)
         )
     }
 
-    override fun navigateToCourseSubsections(
+    override fun navigateToCourseContainer(
         fm: FragmentManager,
-        courseId: String,
         blockId: String,
-        title: String,
-        mode: CourseViewMode,
+        courseId: String,
+        courseName: String,
+        mode: CourseViewMode
     ) {
         replaceFragmentWithBackStack(
             fm,
-            CourseSectionFragment.newInstance(courseId, blockId, title, mode)
+            CourseUnitContainerFragment.newInstance(blockId, courseId, courseName, mode)
         )
     }
 
-    override fun navigateToCourseContainer(
+    override fun replaceCourseContainer(
         fm: FragmentManager,
         blockId: String,
         courseId: String,
         courseName: String,
         mode: CourseViewMode
     ) {
-        replaceFragmentWithBackStack(
+        replaceFragment(
             fm,
-            CourseUnitContainerFragment.newInstance(blockId, courseId, courseName, mode)
+            CourseUnitContainerFragment.newInstance(blockId, courseId, courseName, mode),
+            FragmentTransaction.TRANSIT_FRAGMENT_FADE
         )
     }
 
@@ -259,8 +261,9 @@ class AppRouter : AuthRouter, DiscoveryRouter, DashboardRouter, CourseRouter, Di
             .commit()
     }
 
-    private fun replaceFragment(fm: FragmentManager, fragment: Fragment) {
+    private fun replaceFragment(fm: FragmentManager, fragment: Fragment, transaction: Int = FragmentTransaction.TRANSIT_NONE) {
         fm.beginTransaction()
+            .setTransition(transaction)
             .replace(R.id.container, fragment, fragment.javaClass.simpleName)
             .commit()
     }

app/src/main/java/com/raccoongang/newedx/di/ScreenModule.kt

@@ -19,7 +19,6 @@ import com.raccoongang.course.presentation.section.CourseSectionViewModel
 import com.raccoongang.course.presentation.unit.container.CourseUnitContainerViewModel
 import com.raccoongang.course.presentation.unit.video.VideoUnitViewModel
 import com.raccoongang.course.presentation.unit.video.VideoViewModel
-import com.raccoongang.course.presentation.units.CourseUnitsViewModel
 import com.raccoongang.course.presentation.videos.CourseVideoViewModel
 import com.raccoongang.dashboard.data.repository.DashboardRepository
 import com.raccoongang.dashboard.domain.interactor.DashboardInteractor
@@ -80,20 +79,19 @@ val screenModule = module {
     viewModel { (courseId: String) -> CourseDetailsViewModel(courseId, get(), get(), get(), get()) }
     viewModel { (courseId: String) -> CourseContainerViewModel(courseId, get(), get(), get(), get()) }
     viewModel { (courseId: String) -> CourseOutlineViewModel(courseId, get(), get(), get(), get(), get(), get(), get()) }
-    viewModel { CourseUnitsViewModel(get(), get(),get(), get(), get()) }
-    viewModel { (courseId: String) -> CourseSectionViewModel(get(), get(), get(), get(), get(), get(), courseId) }
+    viewModel { (courseId: String) -> CourseSectionViewModel(get(), get(), get(), get(), get(), get(), get(), courseId) }
     viewModel { (courseId: String) -> CourseUnitContainerViewModel(get(), get(), courseId) }
     viewModel { (courseId: String) -> CourseVideoViewModel(courseId, get(), get(), get(), get(), get(), get(), get()) }
     viewModel { (courseId: String) -> VideoViewModel(courseId, get(), get(), get()) }
-    viewModel { (courseId: String) -> VideoUnitViewModel(courseId, get(), get(), get(), get(), get()) }
+    viewModel { (courseId: String) -> VideoUnitViewModel(courseId, get(), get(), get(), get()) }
     viewModel { (courseId:String, handoutsType: String) -> HandoutsViewModel(courseId, handoutsType, get()) }
     viewModel { CourseSearchViewModel(get(), get()) }
     viewModel { SelectDialogViewModel(get()) }
 
-    single { DiscussionRepository(get()) }
+    single { DiscussionRepository(get(), get()) }
     factory { DiscussionInteractor(get()) }
     viewModel { (courseId: String) -> DiscussionTopicsViewModel(get(), get(), courseId) }
-    viewModel { (courseId: String, threadType: String) ->  DiscussionThreadsViewModel(get(), get(), get(), courseId, threadType) }
+    viewModel { (courseId: String, topicId: String, threadType: String) ->  DiscussionThreadsViewModel(get(), get(), get(), courseId, topicId, threadType) }
     viewModel { (thread: com.raccoongang.discussion.domain.model.Thread) -> DiscussionCommentsViewModel(get(), get(), get(), get(), thread) }
     viewModel { (comment: DiscussionComment) -> DiscussionResponsesViewModel(get(), get(), get(), get(), comment) }
     viewModel { (courseId: String) -> DiscussionAddThreadViewModel(get(), get(), get(), courseId) }

build.gradle

@@ -1,9 +1,9 @@
 buildscript {
     ext {
         kotlin_version = '1.8.10'
-        coroutines_version = '1.6.4'
-        compose_version = '1.3.1'
-        compose_compiler_version = '1.4.2'
+        coroutines_version = '1.7.1'
+        compose_version = '1.4.3'
+        compose_compiler_version = '1.4.4'
     }
 }
 
@@ -18,30 +18,30 @@ task clean(type: Delete) {
 }
 
 ext {
-    core_version = "1.9.0"
-    appcompat_version = "1.5.1"
-    material_version = "1.7.0"
-    lifecycle_version = "2.5.1"
-    fragment_version = "1.5.5"
+    core_version = "1.10.1"
+    appcompat_version = "1.6.1"
+    material_version = "1.9.0"
+    lifecycle_version = "2.6.1"
+    fragment_version = "1.6.0"
     constraintlayout_version = "2.1.4"
     viewpager2_version = "1.0.0"
-    exoplayer_version = "2.18.2"
+    exoplayer_version = "2.18.7"
     youtubeplayer_version = "11.1.0"
 
     retrofit_version = '2.9.0'
     logginginterceptor_version = '4.9.1'
 
     koin_version = '3.2.0'
 
-    coil_version = '2.1.0'
+    coil_version = '2.3.0'
 
-    jsoup_version = '1.11.2'
+    jsoup_version = '1.13.1'
 
-    room_version = '2.5.0'
+    room_version = '2.5.1'
 
-    work_version = '2.8.0'
+    work_version = '2.8.1'
 
-    window_version = '1.0.0'
+    window_version = '1.1.0'
 
     //testing
     mockk_version = '1.13.3'

config.yaml

@@ -24,4 +24,4 @@ environments:
       FEEDBACK_EMAIL_ADDRESS: "[email protected]"
     OAUTH_CLIENT_ID: "PROD_OAUTH_CLIENT_ID"
 platformName: "New Open edX"
-platformFullName: "New Open edX"
+platformFullName: "New Open edX"

core/build.gradle

@@ -129,10 +129,11 @@ dependencies {
     api "androidx.compose.runtime:runtime-livedata:$compose_version"
     api "androidx.compose.ui:ui:$compose_version"
     api "androidx.compose.material:material:$compose_version"
+    api "androidx.compose.foundation:foundation:$compose_version"
     debugApi "androidx.compose.ui:ui-tooling:$compose_version"
     api "androidx.compose.ui:ui-tooling-preview:$compose_version"
     api "androidx.compose.material:material-icons-extended:$compose_version"
-    debugApi "androidx.customview:customview:1.2.0-alpha01"
+    debugApi "androidx.customview:customview:1.2.0-alpha02"
     debugApi "androidx.customview:customview-poolingcontainer:1.0.0"
 
     //Networking

core/src/main/java/com/raccoongang/core/extension/ListExt.kt

@@ -0,0 +1,25 @@
+package com.raccoongang.core.extension
+
+inline fun <T> List<T>.indexOfFirstFromIndex(startIndex: Int, predicate: (T) -> Boolean): Int {
+    var index = 0
+    for ((i, item) in this.withIndex()) {
+        if (i > startIndex) {
+            if (predicate(item))
+                return index
+        }
+        index++
+    }
+    return -1
+}
+
+fun <T> ArrayList<T>.clearAndAddAll(collection: Collection<T>): ArrayList<T> {
+    this.clear()
+    this.addAll(collection)
+    return this
+}
+
+fun <T> MutableList<T>.clearAndAddAll(collection: Collection<T>): MutableList<T> {
+    this.clear()
+    this.addAll(collection)
+    return this
+}

core/src/main/java/com/raccoongang/core/module/download/AbstractDownloader.kt

@@ -25,6 +25,7 @@ abstract class AbstractDownloader {
     var isCanceled = false
 
     private var input: InputStream? = null
+    private var fos: FileOutputStream? = null
 
     open suspend fun download(
         url: String,
@@ -41,14 +42,14 @@ abstract class AbstractDownloader {
                 file.createNewFile()
                 input = response.byteStream()
                 currentDownloadingFilePath = path
-                val fos = FileOutputStream(file)
+                fos = FileOutputStream(file)
                 fos.use { output ->
                     val buffer = ByteArray(4 * 1024)
                     var read: Int
                     while (input!!.read(buffer).also { read = it } != -1) {
-                        output.write(buffer, 0, read)
+                        output?.write(buffer, 0, read)
                     }
-                    output.flush()
+                    output?.flush()
                 }
                 true
             } else {
@@ -58,6 +59,7 @@ abstract class AbstractDownloader {
             e.printStackTrace()
             false
         } finally {
+            fos?.close()
             input?.close()
         }
     }
@@ -66,7 +68,12 @@ abstract class AbstractDownloader {
     suspend fun cancelDownloading() {
         isCanceled = true
         withContext(Dispatchers.IO) {
-            input?.close()
+            try {
+                fos?.close()
+                input?.close()
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
         }
         currentDownloadingFilePath?.let {
             val file = File(it)

core/src/main/java/com/raccoongang/core/system/notifier/CourseNotifier.kt

@@ -13,7 +13,7 @@ class CourseNotifier {
     suspend fun send(event: CourseVideoPositionChanged) = channel.emit(event)
     suspend fun send(event: CourseStructureUpdated) = channel.emit(event)
     suspend fun send(event: CourseDashboardUpdate) = channel.emit(event)
-    suspend fun send(event: CoursePauseVideo) = channel.emit(event)
     suspend fun send(event: CourseSubtitleLanguageChanged) = channel.emit(event)
+    suspend fun send(event: CourseSectionChanged) = channel.emit(event)
 
 }