feat: resolve conflicts

Author: ohassine

app/src/main/kotlin/com/wire/android/di/accountScoped/CellsModule.kt

@@ -23,7 +23,6 @@ import com.wire.kalium.cells.CellsScope
 import com.wire.kalium.cells.domain.CellUploadManager
 import com.wire.kalium.cells.domain.usecase.AddAttachmentDraftUseCase
 import com.wire.kalium.cells.domain.usecase.CreateFolderUseCase
-import com.wire.kalium.cells.domain.usecase.publiclink.CreatePublicLinkUseCase
 import com.wire.kalium.cells.domain.usecase.DeleteCellAssetUseCase
 import com.wire.kalium.cells.domain.usecase.DownloadCellFileUseCase
 import com.wire.kalium.cells.domain.usecase.GetCellFilesUseCase

features/cells/src/main/java/com/wire/android/feature/cells/ui/AllFilesScreen.kt

@@ -38,7 +38,7 @@ fun AllFilesScreen(
     viewModel: CellViewModel = hiltViewModel(),
 ) {
 
-    val pagingListItems = viewModel.filesFlow.collectAsLazyPagingItems()
+    val pagingListItems = viewModel.nodesFlow.collectAsLazyPagingItems()
 
     LaunchedEffect(searchBarState.searchQueryTextState.text) {
         if (searchBarState.searchQueryTextState.text.isNotEmpty()) {

features/cells/src/main/java/com/wire/android/feature/cells/ui/CellFilesScreen.kt

@@ -41,7 +41,6 @@ import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.itemContentType
 import androidx.paging.compose.itemKey
 import com.wire.android.feature.cells.R
-import com.wire.android.feature.cells.ui.model.CellFileUi
 import com.wire.android.feature.cells.ui.util.PreviewMultipleThemes
 import com.wire.android.ui.common.button.WireSecondaryButton
 import com.wire.android.ui.common.colorsScheme
@@ -75,18 +74,18 @@ internal fun CellFilesScreen(
                     modifier = Modifier
                         .animateItem()
                         .background(color = colorsScheme().surface)
-                        .clickable { onItemClick(file) },
+                        .clickable { onItemClick(item) },
                     cell = item,
-                    onMenuClick = { onItemMenuClick(file) }
+                    onMenuClick = { onItemMenuClick(item) }
                 )
                 WireDivider(modifier = Modifier.fillMaxWidth())
             }
         }
 
-        when (files.loadState.append) {
+        when (cellNodes.loadState.append) {
             is LoadState.Error -> item(contentType = "error") {
                 ErrorFooter(
-                    onRetry = { files.retry() }
+                    onRetry = { cellNodes.retry() }
                 )
             }
 

features/cells/src/main/java/com/wire/android/feature/cells/ui/CellListItem.kt

@@ -122,7 +122,7 @@ internal fun CellListItem(
             }
         }
         if (cell is CellNodeUi.File) {
-            file.downloadProgress?.let {
+            cell.downloadProgress?.let {
                 WireLinearProgressIndicator(
                     modifier = Modifier
                         .fillMaxWidth()

features/cells/src/main/java/com/wire/android/feature/cells/ui/CellScreenContent.kt

@@ -59,7 +59,7 @@ import kotlinx.coroutines.flow.StateFlow
 @Composable
 internal fun CellScreenContent(
     actionsFlow: Flow<CellViewAction>,
-    pagingListItems: LazyPagingItems<CellFileUi>,
+    pagingListItems: LazyPagingItems<CellNodeUi>,
     sendIntent: (CellViewIntent) -> Unit,
     onFolderClick: (CellNodeUi.Folder) -> Unit,
     downloadFileState: StateFlow<CellNodeUi.File?>,
@@ -87,7 +87,7 @@ internal fun CellScreenContent(
         )
         else ->
             CellFilesScreen(
-                files = pagingListItems,
+                cellNodes = pagingListItems,
                 onItemClick = {
                     when (it) {
                         is CellNodeUi.File -> sendIntent(CellViewIntent.OnFileClick(it))