feat: added height limit and scroll to download dialog

PavloNetrebchuk · PavloNetrebchuk · commit d0288bd050fe · 2025-03-18T17:44:30.000+02:00
diff --git a/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadConfirmDialogFragment.kt b/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadConfirmDialogFragment.kt
@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -62,8 +63,10 @@ class DownloadConfirmDialogFragment : DialogFragment(), DownloadDialog {
         setContent {
             OpenEdXTheme {
                 val dialogType =
-                    requireArguments().parcelable<DownloadConfirmDialogType>(ARG_DIALOG_TYPE) ?: return@OpenEdXTheme
-                val uiState = requireArguments().parcelable<DownloadDialogUIState>(ARG_UI_STATE) ?: return@OpenEdXTheme
+                    requireArguments().parcelable<DownloadConfirmDialogType>(ARG_DIALOG_TYPE)
+                        ?: return@OpenEdXTheme
+                val uiState = requireArguments().parcelable<DownloadDialogUIState>(ARG_UI_STATE)
+                    ?: return@OpenEdXTheme
                 val sizeSumString = uiState.sizeSum.toFileSize(1, false)
                 val dialogData = when (dialogType) {
                     DownloadConfirmDialogType.CONFIRM -> DownloadDialogResource(
@@ -150,7 +153,6 @@ private fun DownloadConfirmDialogView(
         Column(
             modifier = Modifier
                 .fillMaxWidth()
-                .verticalScroll(scrollState)
                 .padding(20.dp),
             verticalArrangement = Arrangement.spacedBy(12.dp)
         ) {
@@ -173,7 +175,11 @@ private fun DownloadConfirmDialogView(
                     minSize = MaterialTheme.appTypography.titleLarge.fontSize.value - 1
                 )
             }
-            Column {
+            Column(
+                modifier = Modifier
+                    .heightIn(max = DownloadDialogManager.listMaxSize)
+                    .verticalScroll(scrollState)
+            ) {
                 uiState.downloadDialogItems.forEach {
                     DownloadDialogItem(downloadDialogItem = it)
                 }
diff --git a/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadDialogManager.kt b/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadDialogManager.kt
@@ -1,5 +1,10 @@
 package org.openedx.core.presentation.dialog.downloaddialog
 
+import android.content.res.Configuration
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
 import androidx.fragment.app.FragmentManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -14,6 +19,7 @@ import org.openedx.core.module.DownloadWorkerController
 import org.openedx.core.module.db.DownloadModel
 import org.openedx.core.system.StorageManager
 import org.openedx.core.system.connection.NetworkConnection
+import org.openedx.foundation.presentation.rememberWindowSize
 
 interface DownloadDialogListener {
     fun onCancelClick()
@@ -34,6 +40,22 @@ class DownloadDialogManager(
     companion object {
         const val MAX_CELLULAR_SIZE = 104857600 // 100MB
         const val DOWNLOAD_SIZE_FACTOR = 2 // Multiplier to match required disk size
+
+        val listMaxSize: Dp
+            @Composable
+            get() {
+                val configuration = LocalConfiguration.current
+                val windowSize = rememberWindowSize()
+                return when {
+                    configuration.orientation == Configuration.ORIENTATION_PORTRAIT || windowSize.isTablet -> {
+                        200.dp
+                    }
+
+                    else -> {
+                        88.dp
+                    }
+                }
+            }
     }
 
     private val uiState = MutableSharedFlow<DownloadDialogUIState>()
diff --git a/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadErrorDialogFragment.kt b/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadErrorDialogFragment.kt
@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -133,7 +134,6 @@ private fun DownloadErrorDialogView(
         Column(
             modifier = Modifier
                 .fillMaxWidth()
-                .verticalScroll(scrollState)
                 .padding(20.dp),
             verticalArrangement = Arrangement.spacedBy(12.dp)
         ) {
@@ -156,7 +156,11 @@ private fun DownloadErrorDialogView(
                     minSize = MaterialTheme.appTypography.titleLarge.fontSize.value - 1
                 )
             }
-            Column {
+            Column(
+                modifier = Modifier
+                    .heightIn(max = DownloadDialogManager.listMaxSize)
+                    .verticalScroll(scrollState)
+            ) {
                 uiState.downloadDialogItems.forEach {
                     DownloadDialogItem(downloadDialogItem = it)
                 }
diff --git a/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadStorageErrorDialogFragment.kt b/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadStorageErrorDialogFragment.kt
@@ -18,6 +18,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -69,7 +70,8 @@ class DownloadStorageErrorDialogFragment : DialogFragment(), DownloadDialog {
         setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
         setContent {
             OpenEdXTheme {
-                val uiState = requireArguments().parcelable<DownloadDialogUIState>(ARG_UI_STATE) ?: return@OpenEdXTheme
+                val uiState = requireArguments().parcelable<DownloadDialogUIState>(ARG_UI_STATE)
+                    ?: return@OpenEdXTheme
                 val downloadDialogResource = DownloadDialogResource(
                     title = stringResource(id = R.string.core_device_storage_full),
                     description = stringResource(id = R.string.core_download_device_storage_full_dialog_description),
@@ -119,7 +121,6 @@ private fun DownloadStorageErrorDialogView(
         Column(
             modifier = Modifier
                 .fillMaxWidth()
-                .verticalScroll(scrollState)
                 .padding(20.dp),
             verticalArrangement = Arrangement.spacedBy(12.dp)
         ) {
@@ -142,7 +143,11 @@ private fun DownloadStorageErrorDialogView(
                     minSize = MaterialTheme.appTypography.titleLarge.fontSize.value - 1
                 )
             }
-            Column {
+            Column(
+                modifier = Modifier
+                    .heightIn(max = DownloadDialogManager.listMaxSize)
+                    .verticalScroll(scrollState)
+            ) {
                 uiState.downloadDialogItems.forEach {
                     DownloadDialogItem(downloadDialogItem = it.copy(size = it.size * DOWNLOAD_SIZE_FACTOR))
                 }
diff --git a/course/src/main/java/org/openedx/course/presentation/offline/CourseOfflineViewModel.kt b/course/src/main/java/org/openedx/course/presentation/offline/CourseOfflineViewModel.kt
@@ -131,7 +131,6 @@ class CourseOfflineViewModel(
             val downloadDialogItem = DownloadDialogItem(
                 title = courseTitle,
                 size = totalSize,
-                icon = Icons.AutoMirrored.Outlined.InsertDriveFile
             )
             downloadDialogManager.showRemoveDownloadModelPopup(
                 downloadDialogItem = downloadDialogItem,
diff --git a/downloads/src/main/java/org/openedx/downloads/presentation/download/DownloadsScreen.kt b/downloads/src/main/java/org/openedx/downloads/presentation/download/DownloadsScreen.kt
@@ -173,7 +173,7 @@ fun DownloadsScreen(
                                 columns = GridCells.Fixed(2),
                                 verticalArrangement = Arrangement.spacedBy(20.dp),
                                 horizontalArrangement = Arrangement.spacedBy(20.dp),
-                                contentPadding = PaddingValues(bottom = 20.dp, top = 12.dp),
+                                contentPadding = PaddingValues(bottom = 46.dp, top = 12.dp),
                                 content = {
                                     items(uiState.downloadCoursePreviews) { item ->
                                         val downloadModels =
@@ -205,7 +205,7 @@ fun DownloadsScreen(
                         } else {
                             LazyColumn(
                                 modifier = contentWidth,
-                                contentPadding = PaddingValues(bottom = 20.dp, top = 12.dp),
+                                contentPadding = PaddingValues(bottom = 46.dp, top = 12.dp),
                                 verticalArrangement = Arrangement.spacedBy(20.dp)
                             ) {
                                 items(uiState.downloadCoursePreviews) { item ->
diff --git a/downloads/src/main/java/org/openedx/downloads/presentation/download/DownloadsViewModel.kt b/downloads/src/main/java/org/openedx/downloads/presentation/download/DownloadsViewModel.kt
@@ -141,7 +141,8 @@ class DownloadsViewModel(
                             .sumOf { it.size }
                         val courseSize = _uiState.value.downloadCoursePreviews
                             .find { it.id == courseId }?.totalSize ?: 0
-                        val isSizeMatch: Boolean = downloadedSize.toDouble() / courseSize >= 0.95
+                        val isSizeMatch: Boolean =
+                            downloadedSize.toDouble() / courseSize >= SIZE_MATCH_THRESHOLD
                         determineCourseState(blockStates, isSizeMatch)
                     }
                     if (currentCourseState == DownloadedState.LOADING_COURSE_STRUCTURE &&
@@ -367,6 +368,10 @@ class DownloadsViewModel(
     private fun getCoursePreview(courseId: String): DownloadCoursePreview? {
         return _uiState.value.downloadCoursePreviews.find { it.id == courseId }
     }
+
+    companion object {
+        const val SIZE_MATCH_THRESHOLD = 0.95
+    }
 }
 
 interface DownloadsViewActions {

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,6 @@ class CourseOfflineViewModel(`
`131`	`131`	`val downloadDialogItem = DownloadDialogItem(`
`132`	`132`	`title = courseTitle,`
`133`	`133`	`size = totalSize,`
`134`		`- icon = Icons.AutoMirrored.Outlined.InsertDriveFile`
`135`	`134`	`)`
`136`	`135`	`downloadDialogManager.showRemoveDownloadModelPopup(`
`137`	`136`	`downloadDialogItem = downloadDialogItem,`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,8 @@ class DownloadsViewModel(`
`141`	`141`	`.sumOf { it.size }`
`142`	`142`	`val courseSize = _uiState.value.downloadCoursePreviews`
`143`	`143`	`.find { it.id == courseId }?.totalSize ?: 0`
`144`		`- val isSizeMatch: Boolean = downloadedSize.toDouble() / courseSize >= 0.95`
	`144`	`+ val isSizeMatch: Boolean =`
	`145`	`+ downloadedSize.toDouble() / courseSize >= SIZE_MATCH_THRESHOLD`
`145`	`146`	`determineCourseState(blockStates, isSizeMatch)`
`146`	`147`	`}`
`147`	`148`	`if (currentCourseState == DownloadedState.LOADING_COURSE_STRUCTURE &&`
`@@ -367,6 +368,10 @@ class DownloadsViewModel(`
`367`	`368`	`private fun getCoursePreview(courseId: String): DownloadCoursePreview? {`
`368`	`369`	`return _uiState.value.downloadCoursePreviews.find { it.id == courseId }`
`369`	`370`	`}`
	`371`	`+`
	`372`	`+ companion object {`
	`373`	`+ const val SIZE_MATCH_THRESHOLD = 0.95`
	`374`	`+ }`
`370`	`375`	`}`
`371`	`376`
`372`	`377`	`interface DownloadsViewActions {`