diff --git a/app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.kt b/app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.kt index 8dbffad7e74c..30bf0c2aa83b 100644 --- a/app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.kt +++ b/app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.kt @@ -37,7 +37,7 @@ import com.owncloud.android.lib.resources.shares.OCShare import com.owncloud.android.lib.resources.shares.ShareType import com.owncloud.android.operations.CreateFolderOperation import com.owncloud.android.ui.activity.FileDisplayActivity -import com.owncloud.android.ui.adapter.filelist.item.OCFileListItemViewHolder +import com.owncloud.android.ui.adapter.filelist.item.FileItemViewHolder import com.owncloud.android.utils.EspressoIdlingResource import org.hamcrest.Matchers.allOf import org.junit.After @@ -196,7 +196,7 @@ class FileDisplayActivityIT : AbstractOnServerIT() { onView(withId(R.id.list_root)) .perform(closeSoftKeyboard()) .perform( - RecyclerViewActions.actionOnItemAtPosition( + RecyclerViewActions.actionOnItemAtPosition( 0, click() ) diff --git a/app/src/androidTest/java/com/owncloud/android/ui/adapter/OCFileListAdapterIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/adapter/FileListAdapterIT.kt similarity index 97% rename from app/src/androidTest/java/com/owncloud/android/ui/adapter/OCFileListAdapterIT.kt rename to app/src/androidTest/java/com/owncloud/android/ui/adapter/FileListAdapterIT.kt index dec36bbe3131..66409df67e37 100644 --- a/app/src/androidTest/java/com/owncloud/android/ui/adapter/OCFileListAdapterIT.kt +++ b/app/src/androidTest/java/com/owncloud/android/ui/adapter/FileListAdapterIT.kt @@ -13,7 +13,7 @@ import org.junit.Assert.assertEquals import org.junit.Test @Suppress("MagicNumber") -class OCFileListAdapterIT : AbstractIT() { +class FileListAdapterIT : AbstractIT() { @Test fun testParseMedia() { // empty start diff --git a/app/src/main/java/com/nextcloud/ui/component/FilenameView.kt b/app/src/main/java/com/nextcloud/ui/component/FilenameView.kt index 031b9af369a6..960fa10b7084 100644 --- a/app/src/main/java/com/nextcloud/ui/component/FilenameView.kt +++ b/app/src/main/java/com/nextcloud/ui/component/FilenameView.kt @@ -8,22 +8,26 @@ package com.nextcloud.ui.component import android.content.Context +import android.content.res.TypedArray import android.text.TextUtils import android.util.AttributeSet +import android.util.TypedValue import android.view.Gravity import android.widget.LinearLayout import android.widget.TextView +import androidx.core.content.withStyledAttributes import androidx.core.widget.TextViewCompat import com.nextcloud.utils.view.LocaleDirection +import com.owncloud.android.R import com.owncloud.android.utils.FileStorageUtils import com.google.android.material.R as MaterialR class FilenameView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : LinearLayout(context, attrs, defStyleAttr) { - private val title = createTextView(TextUtils.TruncateAt.END, TITLE_MAX_LINES) + private val title = TextView(context) - private val extension = createTextView(TextUtils.TruncateAt.START, EXTENSION_MAX_LINES) + private val extension = TextView(context) var text: CharSequence get() = title.text @@ -34,6 +38,7 @@ class FilenameView @JvmOverloads constructor(context: Context, attrs: AttributeS init { orientation = HORIZONTAL + context.withStyledAttributes(attrs, R.styleable.FilenameView, defStyleAttr) { applyStyle(this) } addView(title, LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, TITLE_WEIGHT)) } @@ -60,16 +65,65 @@ class FilenameView @JvmOverloads constructor(context: Context, attrs: AttributeS } } - private fun createTextView(truncateAt: TextUtils.TruncateAt, lines: Int): TextView = TextView(context).apply { - TextViewCompat.setTextAppearance(this, MaterialR.style.TextAppearance_Material3_HeadlineSmall) + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + if (MeasureSpec.getMode(widthMeasureSpec) != MeasureSpec.EXACTLY) { + super.onMeasure(widthMeasureSpec, heightMeasureSpec) + return + } + + val width = MeasureSpec.getSize(widthMeasureSpec) + super.onMeasure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST), heightMeasureSpec) + + setMeasuredDimension(width, measuredHeight) + } + + private fun applyStyle(typedArray: TypedArray) { + val textAppearance = typedArray.getResourceId( + R.styleable.FilenameView_android_textAppearance, + MaterialR.style.TextAppearance_Material3_HeadlineSmall + ) + val textColor = typedArray.getColorStateList(R.styleable.FilenameView_android_textColor) + val textSize = typedArray.getDimension(R.styleable.FilenameView_android_textSize, UNSET_TEXT_SIZE) + val titleMaxLines = typedArray.getInt(R.styleable.FilenameView_android_maxLines, TITLE_MAX_LINES) + val titleEllipsize = typedArray.getInt(R.styleable.FilenameView_android_ellipsize, ELLIPSIZE_END) + + listOf(title, extension).forEach { textView -> + TextViewCompat.setTextAppearance(textView, textAppearance) + textColor?.let(textView::setTextColor) + if (textSize != UNSET_TEXT_SIZE) { + textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize) + } + textView.gravity = Gravity.START + } + + title.applyLines(truncateAtOf(titleEllipsize), titleMaxLines) + extension.applyLines(TextUtils.TruncateAt.START, EXTENSION_MAX_LINES) + } + + private fun TextView.applyLines(truncateAt: TextUtils.TruncateAt, lines: Int) { ellipsize = truncateAt - maxLines = lines - gravity = Gravity.START + if (lines == SINGLE_LINE) { + isSingleLine = true + } else { + maxLines = lines + } + } + + private fun truncateAtOf(ellipsize: Int): TextUtils.TruncateAt = when (ellipsize) { + ELLIPSIZE_START -> TextUtils.TruncateAt.START + ELLIPSIZE_MIDDLE -> TextUtils.TruncateAt.MIDDLE + else -> TextUtils.TruncateAt.END } companion object { private const val TITLE_WEIGHT = 1f private const val TITLE_MAX_LINES = 3 private const val EXTENSION_MAX_LINES = 1 + private const val SINGLE_LINE = 1 + private const val UNSET_TEXT_SIZE = -1f + + private const val ELLIPSIZE_START = 1 + private const val ELLIPSIZE_MIDDLE = 2 + private const val ELLIPSIZE_END = 3 } } diff --git a/app/src/main/java/com/owncloud/android/datamodel/OCFileListAdapterDataProviderImpl.kt b/app/src/main/java/com/owncloud/android/datamodel/FileListAdapterDataProviderImpl.kt similarity index 74% rename from app/src/main/java/com/owncloud/android/datamodel/OCFileListAdapterDataProviderImpl.kt rename to app/src/main/java/com/owncloud/android/datamodel/FileListAdapterDataProviderImpl.kt index 43a1670912f6..f02fb4a8e6db 100644 --- a/app/src/main/java/com/owncloud/android/datamodel/OCFileListAdapterDataProviderImpl.kt +++ b/app/src/main/java/com/owncloud/android/datamodel/FileListAdapterDataProviderImpl.kt @@ -8,10 +8,10 @@ package com.owncloud.android.datamodel import com.nextcloud.client.database.entity.FileEntity -import com.owncloud.android.ui.adapter.filelist.data.OCFileListAdapterDataProvider +import com.owncloud.android.ui.adapter.filelist.data.FileListAdapterDataProvider -class OCFileListAdapterDataProviderImpl(private val storageManager: FileDataStorageManager) : - OCFileListAdapterDataProvider { +class FileListAdapterDataProviderImpl(private val storageManager: FileDataStorageManager) : + FileListAdapterDataProvider { override fun convertToOCFiles(id: Long): List = storageManager.offlineOperationsRepository.convertToOCFiles(id) diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/GalleryAdapter.kt b/app/src/main/java/com/owncloud/android/ui/adapter/GalleryAdapter.kt index 5da4f6539ebb..1556572c164a 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/GalleryAdapter.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/GalleryAdapter.kt @@ -37,8 +37,8 @@ import com.owncloud.android.datamodel.GalleryRowLayout import com.owncloud.android.datamodel.OCFile import com.owncloud.android.lib.common.utils.Log_OC import com.owncloud.android.ui.activity.ComponentsGetter -import com.owncloud.android.ui.adapter.filelist.CommonOCFileListAdapterInterface -import com.owncloud.android.ui.adapter.filelist.item.OCFileListDelegate +import com.owncloud.android.ui.adapter.filelist.CommonFileListAdapterInterface +import com.owncloud.android.ui.adapter.filelist.item.FileListDelegate import com.owncloud.android.ui.interfaces.OCFileListFragmentInterface import com.owncloud.android.utils.FileSortOrder import com.owncloud.android.utils.theme.ViewThemeUtils @@ -54,7 +54,7 @@ class GalleryAdapter( private val defaultThumbnailSize: Int, private val thumbnailGenerator: ThumbnailGenerator ) : SectionedRecyclerViewAdapter(), - CommonOCFileListAdapterInterface, + CommonFileListAdapterInterface, PopupTextProvider { companion object { @@ -78,18 +78,17 @@ class GalleryAdapter( invalidateCaches() } - private val ocFileListDelegate: OCFileListDelegate + private val fileListDelegate: FileListDelegate private var storageManager: FileDataStorageManager = transferServiceGetter.storageManager init { - ocFileListDelegate = OCFileListDelegate( + fileListDelegate = FileListDelegate( transferServiceGetter.fileUploaderHelper, context, ocFileListFragmentInterface, user, storageManager, false, - true, transferServiceGetter, showMetadata = false, showShareAvatar = false, @@ -164,7 +163,7 @@ class GalleryAdapter( } else { GalleryRowHolder( GalleryRowBinding.inflate(LayoutInflater.from(parent.context), parent, false), - ocFileListDelegate, + fileListDelegate, this, viewThemeUtils ) @@ -276,22 +275,22 @@ class GalleryAdapter( ?.getOrNull(0) } - override fun isMultiSelect(): Boolean = ocFileListDelegate.isMultiSelect + override fun isMultiSelect(): Boolean = fileListDelegate.isMultiSelect override fun cancelAllPendingTasks() { thumbnailGenerator.fileThumbnailGenerator.cancelPendingTasks() } override fun addCheckedFile(file: OCFile) { - ocFileListDelegate.addCheckedFile(file) + fileListDelegate.addCheckedFile(file) } - override fun isCheckedFile(file: OCFile): Boolean = ocFileListDelegate.isCheckedFile(file) + override fun isCheckedFile(file: OCFile): Boolean = fileListDelegate.isCheckedFile(file) - override fun getCheckedItems(): Set = ocFileListDelegate.checkedItems + override fun getCheckedItems(): Set = fileListDelegate.checkedItems override fun removeCheckedFile(file: OCFile) { - ocFileListDelegate.removeCheckedFile(file) + fileListDelegate.removeCheckedFile(file) } override fun notifyItemChanged(file: OCFile) { @@ -322,7 +321,7 @@ class GalleryAdapter( */ @SuppressLint("NotifyDataSetChanged") override fun setMultiSelect(isMultiSelect: Boolean) { - ocFileListDelegate.isMultiSelect = isMultiSelect + fileListDelegate.isMultiSelect = isMultiSelect notifyDataSetChanged() } @@ -332,11 +331,11 @@ class GalleryAdapter( private fun addAllFilesToCheckedFiles() { val allFiles = getAllFiles() - ocFileListDelegate.addToCheckedFiles(allFiles) + fileListDelegate.addToCheckedFiles(allFiles) } override fun clearCheckedItems() { - ocFileListDelegate.clearCheckedItems() + fileListDelegate.clearCheckedItems() } @VisibleForTesting @@ -362,7 +361,7 @@ class GalleryAdapter( } fun setCheckedItem(files: Set?) { - ocFileListDelegate.setCheckedItem(files) + fileListDelegate.setCheckedItem(files) } fun markAsFavorite(remotePath: String, favorite: Boolean) { @@ -396,6 +395,6 @@ class GalleryAdapter( override fun setSortOrder(mFile: OCFile?, sortOrder: FileSortOrder) = Unit fun cleanup() { - ocFileListDelegate.cleanup() + fileListDelegate.cleanup() } } diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/GalleryRowHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/GalleryRowHolder.kt index 0f482a3364d5..5bedf64c57a7 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/GalleryRowHolder.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/GalleryRowHolder.kt @@ -24,14 +24,14 @@ import com.owncloud.android.databinding.GalleryRowBinding import com.owncloud.android.datamodel.GalleryCellSize import com.owncloud.android.datamodel.GalleryRow import com.owncloud.android.datamodel.OCFile -import com.owncloud.android.ui.adapter.filelist.item.OCFileListDelegate +import com.owncloud.android.ui.adapter.filelist.item.FileListDelegate import com.owncloud.android.utils.theme.ViewThemeUtils private const val PLACEHOLDER_ICON_INSET_RATIO = 0.32f class GalleryRowHolder( val binding: GalleryRowBinding, - private val ocFileListDelegate: OCFileListDelegate, + private val fileListDelegate: FileListDelegate, galleryAdapter: GalleryAdapter, private val viewThemeUtils: ViewThemeUtils ) : SectionedViewHolder(binding.root) { @@ -65,7 +65,7 @@ class GalleryRowHolder( } fun recycle() { - cells.forEach { ocFileListDelegate.cancelGalleryRow(it.thumbnail) } + cells.forEach { fileListDelegate.cancelGalleryRow(it.thumbnail) } } private fun ensureCellCount(count: Int) { @@ -90,12 +90,12 @@ class GalleryRowHolder( private fun bindCell(cell: GalleryCellBinding, file: OCFile, size: GalleryCellSize) = with(cell) { root.applySize(size) - val isChecked = ocFileListDelegate.isCheckedFile(file) + val isChecked = fileListDelegate.isCheckedFile(file) val isSameFileRebound = thumbnail.tag == file.fileId applySelection(cell, isChecked, isSameFileRebound) applyCheckBox(checkbox, isChecked) - ocFileListDelegate.bindGalleryRow( + fileListDelegate.bindGalleryRow( shimmer, thumbnail, unsupported, @@ -136,7 +136,7 @@ class GalleryRowHolder( } private fun applyCheckBox(imageView: ImageView, isChecked: Boolean) { - val isMultiSelect = ocFileListDelegate.isMultiSelect + val isMultiSelect = fileListDelegate.isMultiSelect imageView.setVisibleIf(isMultiSelect) if (!isMultiSelect) { return diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/GroupFolderListAdapter.kt b/app/src/main/java/com/owncloud/android/ui/adapter/GroupFolderListAdapter.kt index cab44072a689..923a92f7e538 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/GroupFolderListAdapter.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/GroupFolderListAdapter.kt @@ -17,7 +17,7 @@ import androidx.recyclerview.widget.RecyclerView import com.nextcloud.android.lib.resources.groupfolders.Groupfolder import com.owncloud.android.R import com.owncloud.android.databinding.ListItemBinding -import com.owncloud.android.ui.adapter.filelist.item.OCFileListItemViewHolder +import com.owncloud.android.ui.adapter.filelist.item.FileItemViewHolder import com.owncloud.android.ui.interfaces.GroupfolderListInterface import com.owncloud.android.utils.MimeTypeUtil import com.owncloud.android.utils.theme.ViewThemeUtils @@ -40,27 +40,25 @@ class GroupFolderListAdapter( return MimeTypeUtil.getFolderIcon(isDarkMode, overlayDrawableId, context, viewThemeUtils) } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder = - OCFileListItemViewHolder( - ListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) - ) + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder = FileItemViewHolder( + ListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) + ) override fun getItemCount(): Int = list.size override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { val groupFolder = list[position] - val listHolder = holder as OCFileListItemViewHolder + val listHolder = holder as FileItemViewHolder val file = File("/" + groupFolder.mountPoint) listHolder.apply { - fileName.text = file.name - fileSize.text = file.parentFile?.path ?: "/" - extension.visibility = View.GONE - fileSizeSeparator.visibility = View.GONE - lastModification.visibility = View.GONE + filename.text = file.name + binding.fileSize.text = file.parentFile?.path ?: "/" + binding.fileSeparator.visibility = View.GONE + binding.lastMod.visibility = View.GONE checkbox.visibility = View.GONE - overflowMenu.visibility = View.GONE + binding.overflowMenu.visibility = View.GONE shared.visibility = View.GONE localFileIndicator.visibility = View.GONE favorite.visibility = View.GONE diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/CommonOCFileListAdapterInterface.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/CommonFileListAdapterInterface.kt similarity index 96% rename from app/src/main/java/com/owncloud/android/ui/adapter/filelist/CommonOCFileListAdapterInterface.kt rename to app/src/main/java/com/owncloud/android/ui/adapter/filelist/CommonFileListAdapterInterface.kt index 63c56b599eb5..bf750930a33f 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/CommonOCFileListAdapterInterface.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/CommonFileListAdapterInterface.kt @@ -12,7 +12,7 @@ import com.owncloud.android.datamodel.FileDataStorageManager import com.owncloud.android.datamodel.OCFile import com.owncloud.android.utils.FileSortOrder -interface CommonOCFileListAdapterInterface { +interface CommonFileListAdapterInterface { fun isMultiSelect(): Boolean fun cancelAllPendingTasks() fun getItemPosition(file: OCFile): Int diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/OCFileListAdapter.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/FileListAdapter.kt similarity index 76% rename from app/src/main/java/com/owncloud/android/ui/adapter/filelist/OCFileListAdapter.kt rename to app/src/main/java/com/owncloud/android/ui/adapter/filelist/FileListAdapter.kt index 93702cac72df..ccabbffa75ce 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/OCFileListAdapter.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/FileListAdapter.kt @@ -31,9 +31,7 @@ import com.nextcloud.utils.avatar.AvatarGenerationListener import com.nextcloud.utils.avatar.AvatarGenerator import com.nextcloud.utils.date.DateFormatPattern import com.nextcloud.utils.e2ee.E2EVersionHelper -import com.nextcloud.utils.extensions.setVisibleIf import com.nextcloud.utils.extensions.stopShimmer -import com.nextcloud.utils.mdm.MDMConfig import com.nextcloud.utils.thumbnail.ThumbnailGenerator import com.owncloud.android.MainApp import com.owncloud.android.R @@ -43,7 +41,7 @@ import com.owncloud.android.databinding.ListHeaderBinding import com.owncloud.android.databinding.ListItemBinding import com.owncloud.android.datamodel.FileDataStorageManager import com.owncloud.android.datamodel.OCFile -import com.owncloud.android.datamodel.OCFileListAdapterDataProviderImpl +import com.owncloud.android.datamodel.FileListAdapterDataProviderImpl import com.owncloud.android.datamodel.SyncedFolderProvider import com.owncloud.android.datamodel.ThumbnailsCacheManager import com.owncloud.android.datamodel.VirtualFolderType @@ -52,20 +50,19 @@ import com.owncloud.android.lib.common.utils.Log_OC import com.owncloud.android.lib.resources.status.OCCapability import com.owncloud.android.ui.activity.ComponentsGetter import com.owncloud.android.ui.activity.FileDisplayActivity -import com.owncloud.android.ui.adapter.filelist.data.OCFileListAdapterDataProvider -import com.owncloud.android.ui.adapter.filelist.data.OCFileListAdapterHelper -import com.owncloud.android.ui.adapter.filelist.data.OCFileListDiffer -import com.owncloud.android.ui.adapter.filelist.footer.OCFileListFooterBinder -import com.owncloud.android.ui.adapter.filelist.footer.OCFileListFooterViewHolder -import com.owncloud.android.ui.adapter.filelist.header.OCFileListHeaderBinder -import com.owncloud.android.ui.adapter.filelist.header.OCFileListHeaderViewHolder -import com.owncloud.android.ui.adapter.filelist.item.ListGridItemViewHolder -import com.owncloud.android.ui.adapter.filelist.item.ListItemViewHolder -import com.owncloud.android.ui.adapter.filelist.item.ListViewHolder -import com.owncloud.android.ui.adapter.filelist.item.OCFileListDelegate -import com.owncloud.android.ui.adapter.filelist.item.OCFileListGridItemViewHolder -import com.owncloud.android.ui.adapter.filelist.item.OCFileListItemBinder -import com.owncloud.android.ui.adapter.filelist.item.OCFileListItemViewHolder +import com.owncloud.android.ui.adapter.filelist.data.FileListAdapterDataProvider +import com.owncloud.android.ui.adapter.filelist.data.FileListAdapterHelper +import com.owncloud.android.ui.adapter.filelist.data.FileListDiffer +import com.owncloud.android.ui.adapter.filelist.footer.FileListFooterBinder +import com.owncloud.android.ui.adapter.filelist.footer.FileListFooterViewHolder +import com.owncloud.android.ui.adapter.filelist.header.FileListHeaderBinder +import com.owncloud.android.ui.adapter.filelist.header.FileListHeaderViewHolder +import com.owncloud.android.ui.adapter.filelist.item.FileGridItemBinder +import com.owncloud.android.ui.adapter.filelist.item.FileGridItemViewHolder +import com.owncloud.android.ui.adapter.filelist.item.FileItemBinder +import com.owncloud.android.ui.adapter.filelist.item.FileItemViewHolder +import com.owncloud.android.ui.adapter.filelist.item.FileViewHolder +import com.owncloud.android.ui.adapter.filelist.item.FileListDelegate import com.owncloud.android.ui.adapter.filelist.recommended.RecommendedFilesAdapter import com.owncloud.android.ui.adapter.filelist.recommended.RecommendedFilesViewHolder import com.owncloud.android.ui.fragment.OCFileListFragment @@ -74,7 +71,6 @@ import com.owncloud.android.ui.interfaces.OCFileListFragmentInterface import com.owncloud.android.utils.EncryptionUtils import com.owncloud.android.utils.FileSortOrder import com.owncloud.android.utils.FileSortOrder.SortType -import com.owncloud.android.utils.MimeTypeUtil import com.owncloud.android.utils.theme.CapabilityUtils import com.owncloud.android.utils.theme.ViewThemeUtils import me.zhanghai.android.fastscroll.PopupTextProvider @@ -83,7 +79,7 @@ import java.util.Date import java.util.Locale import java.util.UUID -class OCFileListAdapter( +class FileListAdapter( private val activity: Activity, private var user: User, private val preferences: AppPreferences, @@ -91,13 +87,13 @@ class OCFileListAdapter( transferServiceGetter: ComponentsGetter, ocFileListFragmentInterface: OCFileListFragmentInterface, private val hideItemOptions: Boolean, - gridView: Boolean, + private var gridView: Boolean, viewThemeUtils: ViewThemeUtils, private val thumbnailGenerator: ThumbnailGenerator, avatarGenerator: AvatarGenerator ) : RecyclerView.Adapter(), AvatarGenerationListener, - CommonOCFileListAdapterInterface, + CommonFileListAdapterInterface, PopupTextProvider { val listOfHiddenFiles = ArrayList() @@ -109,9 +105,9 @@ class OCFileListAdapter( private val popupDateFormat = SimpleDateFormat(DateFormatPattern.FullMonthWithYear.pattern, Locale.getDefault()) private val footerId = UUID.randomUUID().leastSignificantBits private val headerId = UUID.randomUUID().leastSignificantBits - private val helper = OCFileListAdapterHelper() + private val helper = FileListAdapterHelper() private val mainHandler = Handler(Looper.getMainLooper()) - private val differ = OCFileListDiffer(this, preferences, ::shouldShowHeader) + private val differ = FileListDiffer(this, preferences, ::shouldShowHeader) private var currentDirectory: OCFile? = null private var listedDirectory: OCFile? = null @@ -121,7 +117,7 @@ class OCFileListAdapter( private var storageManager: FileDataStorageManager = transferServiceGetter.storageManager ?: FileDataStorageManager(user, activity.contentResolver) - private var adapterDataProvider: OCFileListAdapterDataProvider = OCFileListAdapterDataProviderImpl(storageManager) + private var adapterDataProvider: FileListAdapterDataProvider = FileListAdapterDataProviderImpl(storageManager) private val capability: OCCapability = CapabilityUtils.getCapability(user, activity) @Suppress("DEPRECATION") @@ -129,14 +125,13 @@ class OCFileListAdapter( .get(activity) .getUserData(user.toPlatformAccount(), AccountUtils.Constants.KEY_USER_ID) - private val ocFileListDelegate = OCFileListDelegate( + private val fileListDelegate = FileListDelegate( FileUploadHelper.instance(), activity, ocFileListFragmentInterface, user, storageManager, hideItemOptions, - gridView, transferServiceGetter, showMetadata = true, showShareAvatar = true, @@ -144,7 +139,7 @@ class OCFileListAdapter( syncedFolderProvider ) - private val headerBinder = OCFileListHeaderBinder( + private val headerBinder = FileListHeaderBinder( activity, viewThemeUtils, ocFileListFragmentInterface, @@ -152,14 +147,14 @@ class OCFileListAdapter( capability ) { user } - private val footerBinder = OCFileListFooterBinder( + private val footerBinder = FileListFooterBinder( activity, viewThemeUtils, preferences, ocFileListFragmentInterface ) - private val itemBinder = OCFileListItemBinder( + private val fileItemBinder = FileItemBinder( activity, viewThemeUtils, ocFileListFragmentInterface, @@ -167,6 +162,8 @@ class OCFileListAdapter( userId ) + private val fileGridItemBinder = FileGridItemBinder(ocFileListFragmentInterface) + val isEmpty: Boolean get() = differ.latestFiles.isEmpty() @@ -203,30 +200,25 @@ class OCFileListAdapter( override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { val inflater = LayoutInflater.from(parent.context) - return when (OCFileListViewType.fromOrdinal(viewType)) { - OCFileListViewType.FOOTER -> OCFileListFooterViewHolder(ListFooterBinding.inflate(inflater, parent, false)) - - OCFileListViewType.HEADER -> OCFileListHeaderViewHolder(ListHeaderBinding.inflate(inflater, parent, false)) - - OCFileListViewType.ITEM, OCFileListViewType.IMAGE -> if (ocFileListDelegate.gridView) { - OCFileListGridItemViewHolder(GridItemBinding.inflate(inflater, parent, false)) - } else { - OCFileListItemViewHolder(ListItemBinding.inflate(inflater, parent, false)) - } + return when (FileListViewType.fromOrdinal(viewType)) { + FileListViewType.FOOTER -> FileListFooterViewHolder(ListFooterBinding.inflate(inflater, parent, false)) + FileListViewType.HEADER -> FileListHeaderViewHolder(ListHeaderBinding.inflate(inflater, parent, false)) + FileListViewType.LIST_ITEM -> FileItemViewHolder(ListItemBinding.inflate(inflater, parent, false)) + FileListViewType.GRID_ITEM -> FileGridItemViewHolder(GridItemBinding.inflate(inflater, parent, false)) } } override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { when (holder) { - is OCFileListFooterViewHolder -> footerBinder.bind(holder, files) - is OCFileListHeaderViewHolder -> bindHeader(holder) - else -> bindFileAt(holder as ListViewHolder, position) + is FileListFooterViewHolder -> footerBinder.bind(holder, files) + is FileListHeaderViewHolder -> bindHeader(holder) + is FileViewHolder -> bindFileAt(holder, position) } } override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int, payloads: MutableList) { val iconId = payloads.firstOrNull() as? Int - if (iconId != null && OCFileListDiffer.REBIND_PAYLOAD !in payloads && holder is ListViewHolder) { + if (iconId != null && FileListDiffer.REBIND_PAYLOAD !in payloads && holder is FileViewHolder) { holder.localFileIndicator.setImageResource(iconId) holder.localFileIndicator.visibility = View.VISIBLE return @@ -235,7 +227,7 @@ class OCFileListAdapter( } override fun onViewAttachedToWindow(holder: RecyclerView.ViewHolder) { - val thumbnailShimmer = (holder as? ListViewHolder)?.shimmerThumbnail ?: return + val thumbnailShimmer = (holder as? FileViewHolder)?.shimmerThumbnail ?: return if (thumbnailShimmer.isVisible) { thumbnailShimmer.setImageResource(R.drawable.background) thumbnailShimmer.resetLoader() @@ -244,7 +236,7 @@ class OCFileListAdapter( override fun onViewRecycled(holder: RecyclerView.ViewHolder) { super.onViewRecycled(holder) - if (holder is ListViewHolder) { + if (holder is FileViewHolder) { holder.thumbnail.stopShimmer(holder.shimmerThumbnail) } } @@ -259,11 +251,11 @@ class OCFileListAdapter( differ.detach() } - override fun isMultiSelect(): Boolean = ocFileListDelegate.isMultiSelect + override fun isMultiSelect(): Boolean = fileListDelegate.isMultiSelect @SuppressLint("NotifyDataSetChanged") override fun setMultiSelect(isMultiSelect: Boolean) { - ocFileListDelegate.isMultiSelect = isMultiSelect + fileListDelegate.isMultiSelect = isMultiSelect notifyDataSetChanged() } @@ -286,8 +278,8 @@ class OCFileListAdapter( if (storageManager != this.storageManager) { this.storageManager = storageManager - adapterDataProvider = OCFileListAdapterDataProviderImpl(storageManager) - ocFileListDelegate.setShowShareAvatar(true) + adapterDataProvider = FileListAdapterDataProviderImpl(storageManager) + fileListDelegate.setShowShareAvatar(true) this.user = user } @@ -305,7 +297,7 @@ class OCFileListAdapter( } } - override fun setHighlightedItem(file: OCFile) = ocFileListDelegate.setHighlightedItem(file) + override fun setHighlightedItem(file: OCFile) = fileListDelegate.setHighlightedItem(file) override fun setSortOrder(mFile: OCFile?, sortOrder: FileSortOrder) { if (searchType == SearchType.FAVORITE_SEARCH) { @@ -324,13 +316,13 @@ class OCFileListAdapter( displayedSortOrder = sortOrder } - override fun addCheckedFile(file: OCFile) = ocFileListDelegate.addCheckedFile(file) + override fun addCheckedFile(file: OCFile) = fileListDelegate.addCheckedFile(file) - override fun isCheckedFile(file: OCFile): Boolean = ocFileListDelegate.isCheckedFile(file) + override fun isCheckedFile(file: OCFile): Boolean = fileListDelegate.isCheckedFile(file) - override fun getCheckedItems(): Set = ocFileListDelegate.checkedItems + override fun getCheckedItems(): Set = fileListDelegate.checkedItems - override fun removeCheckedFile(file: OCFile) = ocFileListDelegate.removeCheckedFile(file) + override fun removeCheckedFile(file: OCFile) = fileListDelegate.removeCheckedFile(file) override fun notifyItemChanged(file: OCFile) { val recommendedAdapter = visibleRecommendedFilesAdapterFor(file) @@ -343,11 +335,11 @@ class OCFileListAdapter( override fun getFilesCount(): Int = files.size - override fun clearCheckedItems() = ocFileListDelegate.clearCheckedItems() + override fun clearCheckedItems() = fileListDelegate.clearCheckedItems() override fun selectAll(value: Boolean) { if (value) { - ocFileListDelegate.addToCheckedFiles(files) + fileListDelegate.addToCheckedFiles(files) } else { clearCheckedItems() } @@ -378,7 +370,11 @@ class OCFileListAdapter( // region Public methods fun getItem(position: Int): OCFile? = files.getOrNull(position - differ.headerOffset()) - fun bindRecommendedFilesHolder(holder: RecommendedFilesViewHolder, file: OCFile) = bindFile(holder, file) + fun bindRecommendedFilesHolder(holder: RecommendedFilesViewHolder, file: OCFile) { + bindCommon(holder, file) + + fileGridItemBinder.bind(holder, file, shouldShowMoreOptions()) + } fun shouldShowHeader(): Boolean { val directory = currentDirectory @@ -435,7 +431,7 @@ class OCFileListAdapter( displayedSortOrder = sortOrder } - fun setCheckedItem(files: Set?) = ocFileListDelegate.setCheckedItem(files) + fun setCheckedItem(files: Set?) = fileListDelegate.setCheckedItem(files) fun setFiles(files: List) = differ.submit(files.toList()) @@ -573,15 +569,15 @@ class OCFileListAdapter( } fun setGridView(bool: Boolean) { - ocFileListDelegate.gridView = bool + gridView = bool } fun setShowMetadata(bool: Boolean) { - ocFileListDelegate.isMultiSelect = bool + fileListDelegate.isMultiSelect = bool } @VisibleForTesting - fun setShowShareAvatar(bool: Boolean) = ocFileListDelegate.setShowShareAvatar(bool) + fun setShowShareAvatar(bool: Boolean) = fileListDelegate.setShowShareAvatar(bool) @VisibleForTesting fun setCurrentDirectory(folder: OCFile?) { @@ -590,20 +586,20 @@ class OCFileListAdapter( } fun cleanup() { - ocFileListDelegate.cleanup() + fileListDelegate.cleanup() helper.cleanup() } // endregion // region Private methods - private fun viewTypeAt(position: Int): OCFileListViewType = when { - isHeaderDisplayed && position == 0 -> OCFileListViewType.HEADER - position - differ.headerOffset() == files.size -> OCFileListViewType.FOOTER - getItem(position)?.let { MimeTypeUtil.isImageOrVideo(it) } == true -> OCFileListViewType.IMAGE - else -> OCFileListViewType.ITEM + private fun viewTypeAt(position: Int): FileListViewType = when { + isHeaderDisplayed && position == 0 -> FileListViewType.HEADER + position - differ.headerOffset() == files.size -> FileListViewType.FOOTER + gridView -> FileListViewType.GRID_ITEM + else -> FileListViewType.LIST_ITEM } - private fun bindHeader(holder: OCFileListHeaderViewHolder) { + private fun bindHeader(holder: FileListHeaderViewHolder) { val visibleRecommendedFilesAdapter = if (shouldShowRecommendedFiles()) { RecommendedFilesAdapter(this, recommendedFiles).also { recommendedFilesAdapter = it } } else { @@ -612,47 +608,38 @@ class OCFileListAdapter( headerBinder.bind(holder, currentDirectory, visibleRecommendedFilesAdapter) } - private fun bindFileAt(holder: ListViewHolder, position: Int) { + private fun bindFileAt(holder: FileViewHolder, position: Int) { val file = getItem(position) if (file == null) { Log_OC.e(this, "Cannot bind on view holder on a null file") return } - bindFile(holder, file) - } - private fun bindFile(holder: ListViewHolder, file: OCFile) { - ocFileListDelegate.bindViewHolder(holder, file, currentDirectory, thumbnailGenerator) + bindCommon(holder, file) + fileListDelegate.bindLongClick(holder, file) - if (holder is ListItemViewHolder) { - itemBinder.bindDetails(holder, file, user, storageManager, shouldShowItemOptions(), onlyOnDevice) - } + when (holder) { + is FileItemViewHolder -> { + fileItemBinder.bind(holder, file, user, storageManager, shouldShowItemOptions(), onlyOnDevice) + fileItemBinder.bindOverflowMenuVisibility(holder, shouldShowMoreOptions()) + } - if (holder is ListGridItemViewHolder) { - itemBinder.bindFilename(holder, file, storageManager.getFilenameConsideringOfflineOperation(file)) + is FileGridItemViewHolder -> fileGridItemBinder.bind(holder, file, shouldShowMoreOptions()) } + } - itemBinder.bindLivePhotoIndicator(holder, file) + private fun bindCommon(holder: FileViewHolder, file: OCFile) { + fileListDelegate.bindViewHolder(holder, file, currentDirectory, thumbnailGenerator, gridView) - if (!MDMConfig.sharingSupport(activity)) { - holder.shared.visibility = View.GONE - } + val filename = storageManager.getFilenameConsideringOfflineOperation(file).orEmpty() - bindMoreOptionsVisibility(holder) - holder.fileFeaturesLayout?.setVisibleIf(holder.hasVisibleFeatureIndicators) + holder.filename.setFilename(filename, file.isFolder) } - private fun shouldShowItemOptions(): Boolean = !(isMultiSelect() || ocFileListDelegate.gridView || hideItemOptions) + private fun shouldShowItemOptions(): Boolean = !(isMultiSelect() || gridView || hideItemOptions) - private fun bindMoreOptionsVisibility(holder: ListViewHolder) { - val showMoreOptions = !isMultiSelect() && !OCFileListFragment.isMultipleFileSelectedForCopyOrMove - - if (holder is ListItemViewHolder) { - holder.overflowMenu.setVisibleIf(showMoreOptions) - } else { - holder.more.setVisibleIf(showMoreOptions) - } - } + private fun shouldShowMoreOptions(): Boolean = + !isMultiSelect() && !OCFileListFragment.isMultipleFileSelectedForCopyOrMove private fun shouldShowRecommendedFiles(): Boolean = recommendedFiles.isNotEmpty() && currentDirectory?.isRootDirectory == true @@ -669,7 +656,7 @@ class OCFileListAdapter( // endregion companion object { - private val TAG = OCFileListAdapter::class.java.simpleName + private val TAG = FileListAdapter::class.java.simpleName private const val FOOTER_ITEM_COUNT = 1 } diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/OCFileListViewType.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/FileListViewType.kt similarity index 58% rename from app/src/main/java/com/owncloud/android/ui/adapter/filelist/OCFileListViewType.kt rename to app/src/main/java/com/owncloud/android/ui/adapter/filelist/FileListViewType.kt index ff68b3dcffb7..e92fe4ead0c4 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/OCFileListViewType.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/FileListViewType.kt @@ -6,13 +6,13 @@ */ package com.owncloud.android.ui.adapter.filelist -internal enum class OCFileListViewType { +internal enum class FileListViewType { FOOTER, - ITEM, - IMAGE, - HEADER; + HEADER, + LIST_ITEM, + GRID_ITEM; companion object { - fun fromOrdinal(ordinal: Int): OCFileListViewType = entries.getOrElse(ordinal) { ITEM } + fun fromOrdinal(ordinal: Int): FileListViewType = entries.getOrElse(ordinal) { LIST_ITEM } } } diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/data/OCFileListAdapterDataProvider.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/data/FileListAdapterDataProvider.kt similarity index 92% rename from app/src/main/java/com/owncloud/android/ui/adapter/filelist/data/OCFileListAdapterDataProvider.kt rename to app/src/main/java/com/owncloud/android/ui/adapter/filelist/data/FileListAdapterDataProvider.kt index 3dc0f99380db..b694ae64384e 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/data/OCFileListAdapterDataProvider.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/data/FileListAdapterDataProvider.kt @@ -10,7 +10,7 @@ package com.owncloud.android.ui.adapter.filelist.data import com.nextcloud.client.database.entity.FileEntity import com.owncloud.android.datamodel.OCFile -interface OCFileListAdapterDataProvider { +interface FileListAdapterDataProvider { fun convertToOCFiles(id: Long): List suspend fun getFolderContent(id: Long): List fun createFileInstance(entity: FileEntity): OCFile diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/data/OCFileListAdapterHelper.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/data/FileListAdapterHelper.kt similarity index 96% rename from app/src/main/java/com/owncloud/android/ui/adapter/filelist/data/OCFileListAdapterHelper.kt rename to app/src/main/java/com/owncloud/android/ui/adapter/filelist/data/FileListAdapterHelper.kt index 0aaec513129c..dea8d1d7b278 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/data/OCFileListAdapterHelper.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/data/FileListAdapterHelper.kt @@ -22,13 +22,13 @@ import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -class OCFileListAdapterHelper { +class FileListAdapterHelper { private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob()) private var job: Job? = null fun prepareFileList( directory: OCFile, - dataProvider: OCFileListAdapterDataProvider, + dataProvider: FileListAdapterDataProvider, onlyOnDevice: Boolean, limitToMimeType: String, preferences: AppPreferences, @@ -56,7 +56,7 @@ class OCFileListAdapterHelper { @Suppress("CyclomaticComplexMethod") suspend fun prepareFileList( directory: OCFile, - dataProvider: OCFileListAdapterDataProvider, + dataProvider: FileListAdapterDataProvider, onlyOnDevice: Boolean, limitToMimeType: String, preferences: AppPreferences, @@ -104,7 +104,7 @@ class OCFileListAdapterHelper { private fun addOfflineOperations( files: List, fileId: Long, - dataProvider: OCFileListAdapterDataProvider + dataProvider: FileListAdapterDataProvider ): List { val offlineOperations = dataProvider.convertToOCFiles(fileId) if (offlineOperations.isEmpty()) return files @@ -162,7 +162,7 @@ class OCFileListAdapterHelper { private suspend fun getFolderContent( ocFile: OCFile, - dataProvider: OCFileListAdapterDataProvider, + dataProvider: FileListAdapterDataProvider, onlyOnDevice: Boolean ): List = withContext(Dispatchers.IO) { if (!ocFile.isFolder || !ocFile.fileExists()) { diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/data/OCFileListDiffer.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/data/FileListDiffer.kt similarity index 99% rename from app/src/main/java/com/owncloud/android/ui/adapter/filelist/data/OCFileListDiffer.kt rename to app/src/main/java/com/owncloud/android/ui/adapter/filelist/data/FileListDiffer.kt index d687123face8..146760623e40 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/data/OCFileListDiffer.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/data/FileListDiffer.kt @@ -16,7 +16,7 @@ import com.nextcloud.client.preferences.AppPreferences import com.owncloud.android.datamodel.OCFile import com.owncloud.android.ui.fragment.SearchType -class OCFileListDiffer( +class FileListDiffer( private val adapter: RecyclerView.Adapter<*>, private val preferences: AppPreferences, private val shouldShowHeader: () -> Boolean diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/footer/OCFileListFooterBinder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/footer/FileListFooterBinder.kt similarity index 94% rename from app/src/main/java/com/owncloud/android/ui/adapter/filelist/footer/OCFileListFooterBinder.kt rename to app/src/main/java/com/owncloud/android/ui/adapter/filelist/footer/FileListFooterBinder.kt index 97ba1787e172..234eff093c2a 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/footer/OCFileListFooterBinder.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/footer/FileListFooterBinder.kt @@ -15,7 +15,7 @@ import com.owncloud.android.datamodel.OCFile import com.owncloud.android.ui.interfaces.OCFileListFragmentInterface import com.owncloud.android.utils.theme.ViewThemeUtils -internal class OCFileListFooterBinder( +internal class FileListFooterBinder( private val activity: Activity, private val viewThemeUtils: ViewThemeUtils, private val preferences: AppPreferences, @@ -23,7 +23,7 @@ internal class OCFileListFooterBinder( ) { // region Public methods - fun bind(holder: OCFileListFooterViewHolder, files: List) { + fun bind(holder: FileListFooterViewHolder, files: List) { holder.footerText.text = fileCountSummary(files) viewThemeUtils.platform.colorCircularProgressBar(holder.loadingProgressBar, ColorRole.ON_SURFACE_VARIANT) holder.loadingProgressBar.setVisibleIf(fragmentInterface.isLoading) diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/footer/OCFileListFooterViewHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/footer/FileListFooterViewHolder.kt similarity index 89% rename from app/src/main/java/com/owncloud/android/ui/adapter/filelist/footer/OCFileListFooterViewHolder.kt rename to app/src/main/java/com/owncloud/android/ui/adapter/filelist/footer/FileListFooterViewHolder.kt index b1f9bdde9c71..2e512916435a 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/footer/OCFileListFooterViewHolder.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/footer/FileListFooterViewHolder.kt @@ -11,7 +11,7 @@ package com.owncloud.android.ui.adapter.filelist.footer import androidx.recyclerview.widget.RecyclerView import com.owncloud.android.databinding.ListFooterBinding -internal class OCFileListFooterViewHolder(var binding: ListFooterBinding) : +internal class FileListFooterViewHolder(var binding: ListFooterBinding) : RecyclerView.ViewHolder( binding.root ) { diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/header/OCFileListHeaderBinder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/header/FileListHeaderBinder.kt similarity index 93% rename from app/src/main/java/com/owncloud/android/ui/adapter/filelist/header/OCFileListHeaderBinder.kt rename to app/src/main/java/com/owncloud/android/ui/adapter/filelist/header/FileListHeaderBinder.kt index 4bc23323f3b5..a047d3de5778 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/header/OCFileListHeaderBinder.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/header/FileListHeaderBinder.kt @@ -23,7 +23,7 @@ import com.owncloud.android.ui.interfaces.OCFileListFragmentInterface import com.owncloud.android.ui.preview.text.PreviewTextFragment import com.owncloud.android.utils.theme.ViewThemeUtils -internal class OCFileListHeaderBinder( +internal class FileListHeaderBinder( private val activity: Activity, private val viewThemeUtils: ViewThemeUtils, private val fragmentInterface: OCFileListFragmentInterface, @@ -33,11 +33,7 @@ internal class OCFileListHeaderBinder( ) { // region Public methods - fun bind( - holder: OCFileListHeaderViewHolder, - directory: OCFile?, - recommendedFilesAdapter: RecommendedFilesAdapter? - ) { + fun bind(holder: FileListHeaderViewHolder, directory: OCFile?, recommendedFilesAdapter: RecommendedFilesAdapter?) { holder.headerView.setOnClickListener { fragmentInterface.onHeaderClicked() } bindRichWorkspace(holder, directory) bindRecommendedFiles(holder.binding, recommendedFilesAdapter) @@ -58,7 +54,7 @@ internal class OCFileListHeaderBinder( // endregion // region Private methods - private fun bindRichWorkspace(holder: OCFileListHeaderViewHolder, directory: OCFile?) { + private fun bindRichWorkspace(holder: FileListHeaderViewHolder, directory: OCFile?) { val text = directory?.richWorkspace PreviewTextFragment.setText( holder.headerText, diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/header/OCFileListHeaderViewHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/header/FileListHeaderViewHolder.kt similarity index 89% rename from app/src/main/java/com/owncloud/android/ui/adapter/filelist/header/OCFileListHeaderViewHolder.kt rename to app/src/main/java/com/owncloud/android/ui/adapter/filelist/header/FileListHeaderViewHolder.kt index dddff5d02f37..b5b670c0e4d2 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/header/OCFileListHeaderViewHolder.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/header/FileListHeaderViewHolder.kt @@ -11,7 +11,7 @@ package com.owncloud.android.ui.adapter.filelist.header import androidx.recyclerview.widget.RecyclerView import com.owncloud.android.databinding.ListHeaderBinding -internal class OCFileListHeaderViewHolder(var binding: ListHeaderBinding) : +internal class FileListHeaderViewHolder(var binding: ListHeaderBinding) : RecyclerView.ViewHolder( binding.root ) { diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/FileGridItemBinder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/FileGridItemBinder.kt new file mode 100644 index 000000000000..7cd09e6b7e9d --- /dev/null +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/FileGridItemBinder.kt @@ -0,0 +1,53 @@ +/* + * Nextcloud - Android Client + * + * SPDX-FileCopyrightText: 2026 Alper Ozturk + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +package com.owncloud.android.ui.adapter.filelist.item + +import android.view.View +import androidx.core.view.isVisible +import com.nextcloud.utils.extensions.setVisibleIf +import com.owncloud.android.datamodel.OCFile +import com.owncloud.android.ui.adapter.filelist.recommended.RecommendedFilesViewHolder +import com.owncloud.android.ui.interfaces.OCFileListFragmentInterface + +internal class FileGridItemBinder(private val fragmentInterface: OCFileListFragmentInterface) { + + fun bind(holder: FileGridItemViewHolder, file: OCFile, showMoreOptions: Boolean) { + val binding = holder.binding + bindIndicators(holder, file, binding.gridLivePhotoIndicator, binding.fileFeaturesLayout) + bindMoreButton(binding.more, file, showMoreOptions) + + binding.playerProgressIndicator.setFile(file) + } + + fun bind(holder: RecommendedFilesViewHolder, file: OCFile, showMoreOptions: Boolean) { + val binding = holder.binding + bindIndicators(holder, file, binding.gridLivePhotoIndicator, binding.fileFeaturesLayout) + + bindMoreButton(binding.more, file, showMoreOptions) + } + + private fun bindIndicators(holder: FileViewHolder, file: OCFile, livePhotoIndicator: View, featuresLayout: View) { + if (file.unreadCommentsCount != 0) { + holder.shared.visibility = View.GONE + } + + livePhotoIndicator.setVisibleIf(file.linkedFileIdForLivePhoto != null) + + featuresLayout.setVisibleIf( + livePhotoIndicator.isVisible || + holder.localFileIndicator.isVisible || + holder.unreadComments.isVisible || + holder.shared.isVisible || + holder.favorite.isVisible + ) + } + + private fun bindMoreButton(more: View, file: OCFile, showMoreOptions: Boolean) { + more.setOnClickListener { fragmentInterface.onOverflowIconClicked(file, it) } + more.setVisibleIf(showMoreOptions) + } +} diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/FileGridItemViewHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/FileGridItemViewHolder.kt new file mode 100644 index 000000000000..eb7fc1034bda --- /dev/null +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/FileGridItemViewHolder.kt @@ -0,0 +1,35 @@ +/* + * Nextcloud - Android Client + * + * SPDX-FileCopyrightText: 2026 Alper Ozturk + * SPDX-FileCopyrightText: 2022 Tobias Kaminsky + * SPDX-FileCopyrightText: 2022 Nextcloud GmbH + * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only + */ +package com.owncloud.android.ui.adapter.filelist.item + +import android.view.View +import android.widget.ImageView +import androidx.recyclerview.widget.RecyclerView +import com.elyeproj.loaderviewlibrary.LoaderImageView +import com.nextcloud.ui.component.FilenameView +import com.owncloud.android.databinding.GridItemBinding + +class FileGridItemViewHolder(val binding: GridItemBinding) : + RecyclerView.ViewHolder(binding.root), + FileViewHolder { + + override val itemLayout: View = binding.ListItemLayout + override val thumbnail: ImageView = binding.thumbnail + override val shimmerThumbnail: LoaderImageView = binding.thumbnailShimmer + override val checkbox: ImageView = binding.customCheckbox + override val favorite: ImageView = binding.favoriteAction + override val localFileIndicator: ImageView = binding.localFileIndicator + override val shared: ImageView = binding.sharedIcon + override val unreadComments: ImageView = binding.unreadComments + override val filename: FilenameView = binding.Filename + + init { + binding.favoriteAction.drawable.mutate() + } +} diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListItemBinder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/FileItemBinder.kt similarity index 55% rename from app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListItemBinder.kt rename to app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/FileItemBinder.kt index 6aba9f710d3e..866c60d113ec 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListItemBinder.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/FileItemBinder.kt @@ -18,8 +18,8 @@ import com.nextcloud.utils.HumanReadableFormatter import com.nextcloud.utils.avatar.AvatarGenerator import com.nextcloud.utils.extensions.setVisibleIf import com.nextcloud.utils.text.DisplayTextFormatter -import com.nextcloud.utils.view.LocaleDirection import com.owncloud.android.R +import com.owncloud.android.databinding.ListItemBinding import com.owncloud.android.datamodel.FileDataStorageManager import com.owncloud.android.datamodel.OCFile import com.owncloud.android.lib.common.utils.Log_OC @@ -29,7 +29,7 @@ import com.owncloud.android.utils.FileStorageUtils import com.owncloud.android.utils.theme.ViewThemeUtils import java.io.File -internal class OCFileListItemBinder( +internal class FileItemBinder( private val activity: Activity, private val viewThemeUtils: ViewThemeUtils, private val fragmentInterface: OCFileListFragmentInterface, @@ -37,74 +37,41 @@ internal class OCFileListItemBinder( private val userId: String? ) { private val avatarShareesProvider = AvatarShareesProvider() - private val isRTL = LocaleDirection.isRtl // region Public methods - fun bindDetails( - holder: ListItemViewHolder, + fun bind( + holder: FileItemViewHolder, file: OCFile, user: User, storageManager: FileDataStorageManager, showItemOptions: Boolean, onlyOnDevice: Boolean ) { - bindSharedAvatars(holder, file, user, showItemOptions) - bindTags(holder, file.tags) - bindFileSize(holder, file, storageManager, onlyOnDevice) - bindLastModification(holder, file) - bindOverflowMenu(holder, file, showItemOptions) + val binding = holder.binding + bindSharedAvatars(binding, file, user, showItemOptions) + bindTags(binding, file.tags) + bindFileSize(binding, file, storageManager, onlyOnDevice) + bindLastModification(binding, file) + bindOverflowMenu(binding, file, showItemOptions) + bindLivePhotoIndicator(binding, file) + + binding.playerProgressIndicator.setFile(file) } - fun bindFilename(holder: ListGridItemViewHolder, file: OCFile, filename: String?) { - val hasBidiControlCharacters = FileStorageUtils.containsBidiControlCharacters(filename) - holder.fileName.setVisibleIf(!hasBidiControlCharacters) - holder.bidiFilenameContainer.setVisibleIf(hasBidiControlCharacters) - - if (hasBidiControlCharacters) { - bindBidiFilename(holder, file, filename) - } else { - bindPlainFilename(holder, filename) - } - - holder.playerProgressIndicator?.setFile(file) - } - - fun bindLivePhotoIndicator(holder: ListViewHolder, file: OCFile) { - val isLivePhoto = file.linkedFileIdForLivePhoto != null - - when (holder) { - is OCFileListItemViewHolder -> { - holder.livePhotoIndicator.setVisibleIf(isLivePhoto) - holder.livePhotoIndicatorSeparator.setVisibleIf(isLivePhoto) - } - - is OCFileListViewHolder -> holder.gridLivePhotoIndicator.setVisibleIf(isLivePhoto) - } + fun bindOverflowMenuVisibility(holder: FileItemViewHolder, showMoreOptions: Boolean) { + holder.binding.overflowMenu.setVisibleIf(showMoreOptions) } // endregion // region Private methods - private fun bindPlainFilename(holder: ListGridItemViewHolder, filename: String?) { - holder.fileName.text = filename - - if (holder is OCFileListGridItemViewHolder) { - holder.extension?.visibility = View.GONE - } - } - - private fun bindBidiFilename(holder: ListGridItemViewHolder, file: OCFile, filename: String?) { - val (name, extension) = FileStorageUtils.getFilenameAndExtension(filename, file.isFolder, isRTL) - holder.bidiFilename.text = name - holder.extension?.text = extension - - if (holder is OCFileListGridItemViewHolder) { - holder.binding.more.visibility = View.GONE - holder.binding.bidiMore.setOnClickListener { fragmentInterface.onOverflowIconClicked(file, it) } - } + private fun bindLivePhotoIndicator(binding: ListItemBinding, file: OCFile) { + val isLivePhoto = file.linkedFileIdForLivePhoto != null + binding.livePhotoIndicator.setVisibleIf(isLivePhoto) + binding.livePhotoIndicatorSeparator.setVisibleIf(isLivePhoto) } - private fun bindSharedAvatars(holder: ListItemViewHolder, file: OCFile, user: User, showItemOptions: Boolean) { - val sharedAvatars = holder.sharedAvatars + private fun bindSharedAvatars(binding: ListItemBinding, file: OCFile, user: User, showItemOptions: Boolean) { + val sharedAvatars = binding.sharedAvatars val isShared = file.isSharedWithMe || file.isSharedWithSharee if (!isShared || !showItemOptions) { @@ -121,32 +88,32 @@ internal class OCFileListItemBinder( sharedAvatars.setAvatars(user, avatarShareesProvider.get(file, userId), viewThemeUtils, avatarGenerator) } - private fun bindTags(holder: ListItemViewHolder, tags: List) { + private fun bindTags(binding: ListItemBinding, tags: List) { val hasTags = tags.isNotEmpty() - holder.tagsGroup.setVisibleIf(hasTags) - holder.fileDetailGroup.setVisibleIf(!hasTags) + binding.tagsGroup.setVisibleIf(hasTags) + binding.fileDetailGroup.setVisibleIf(!hasTags) if (!hasTags) { return } - viewThemeUtils.material.themeChipSuggestion(holder.firstTag) - holder.firstTag.visibility = View.VISIBLE - holder.secondTag.visibility = View.GONE - holder.tagMore.visibility = View.GONE + viewThemeUtils.material.themeChipSuggestion(binding.firstTag) + binding.firstTag.visibility = View.VISIBLE + binding.secondTag.visibility = View.GONE + binding.tagMore.visibility = View.GONE - applyChipVisuals(holder.firstTag, tags[0]) + applyChipVisuals(binding.firstTag, tags[0]) if (tags.size > 1) { - holder.secondTag.visibility = View.VISIBLE - applyChipVisuals(holder.secondTag, tags[1]) + binding.secondTag.visibility = View.VISIBLE + applyChipVisuals(binding.secondTag, tags[1]) } val hiddenTagCount = tags.size - MAX_VISIBLE_TAGS if (hiddenTagCount > 0) { - viewThemeUtils.material.themeChipSuggestion(holder.tagMore) - holder.tagMore.visibility = View.VISIBLE - holder.tagMore.text = activity.getString(R.string.tags_more).format(hiddenTagCount) + viewThemeUtils.material.themeChipSuggestion(binding.tagMore) + binding.tagMore.visibility = View.VISIBLE + binding.tagMore.text = activity.getString(R.string.tags_more).format(hiddenTagCount) } } @@ -169,7 +136,7 @@ internal class OCFileListItemBinder( } private fun bindFileSize( - holder: ListItemViewHolder, + binding: ListItemBinding, file: OCFile, storageManager: FileDataStorageManager, onlyOnDevice: Boolean @@ -177,13 +144,13 @@ internal class OCFileListItemBinder( val localPath = file.storagePath?.takeIf { onlyOnDevice } when { - localPath != null -> showFileSize(holder, file, localSizeOf(File(localPath)), storageManager) + localPath != null -> showFileSize(binding, file, localSizeOf(File(localPath)), storageManager) - file.fileLength >= 0 -> showFileSize(holder, file, file.fileLength, storageManager) + file.fileLength >= 0 -> showFileSize(binding, file, file.fileLength, storageManager) else -> { - holder.fileSize.visibility = View.GONE - holder.fileSizeSeparator.visibility = View.GONE + binding.fileSize.visibility = View.GONE + binding.fileSeparator.visibility = View.GONE } } } @@ -195,13 +162,13 @@ internal class OCFileListItemBinder( } private fun showFileSize( - holder: ListItemViewHolder, + binding: ListItemBinding, file: OCFile, size: Long, storageManager: FileDataStorageManager ) { - holder.fileSize.visibility = View.VISIBLE - holder.fileSize.text = fileSizeText(file, size, storageManager) + binding.fileSize.visibility = View.VISIBLE + binding.fileSize.text = fileSizeText(file, size, storageManager) } private fun fileSizeText(file: OCFile, size: Long, storageManager: FileDataStorageManager): String { @@ -218,18 +185,18 @@ internal class OCFileListItemBinder( return activity.getString(descriptionRes) } - private fun bindLastModification(holder: ListItemViewHolder, file: OCFile) { + private fun bindLastModification(binding: ListItemBinding, file: OCFile) { val timestamp = file.modificationTimestamp.takeIf { it > 0 } ?: file.firstShareTimestamp.takeIf { it > 0 } if (timestamp != null) { - holder.lastModification.text = DisplayTextFormatter.formatRelativeTimestamp(activity, timestamp) + binding.lastMod.text = DisplayTextFormatter.formatRelativeTimestamp(activity, timestamp) } - holder.lastModification.setVisibleIf(timestamp != null) + binding.lastMod.setVisibleIf(timestamp != null) } - private fun bindOverflowMenu(holder: ListItemViewHolder, file: OCFile, showItemOptions: Boolean) { - val overflowMenu = holder.overflowMenu + private fun bindOverflowMenu(binding: ListItemBinding, file: OCFile, showItemOptions: Boolean) { + val overflowMenu = binding.overflowMenu overflowMenu.setVisibleIf(showItemOptions) if (showItemOptions) { @@ -242,7 +209,7 @@ internal class OCFileListItemBinder( // endregion companion object { - private val TAG = OCFileListItemBinder::class.java.simpleName + private val TAG = FileItemBinder::class.java.simpleName private const val MAX_VISIBLE_TAGS = 2 } diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/FileItemViewHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/FileItemViewHolder.kt new file mode 100644 index 000000000000..b5b41f950094 --- /dev/null +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/FileItemViewHolder.kt @@ -0,0 +1,35 @@ +/* + * Nextcloud - Android Client + * + * SPDX-FileCopyrightText: 2026 Alper Ozturk + * SPDX-FileCopyrightText: 2022 Tobias Kaminsky + * SPDX-FileCopyrightText: 2022 Nextcloud GmbH + * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only + */ +package com.owncloud.android.ui.adapter.filelist.item + +import android.view.View +import android.widget.ImageView +import androidx.recyclerview.widget.RecyclerView +import com.elyeproj.loaderviewlibrary.LoaderImageView +import com.nextcloud.ui.component.FilenameView +import com.owncloud.android.databinding.ListItemBinding + +class FileItemViewHolder(val binding: ListItemBinding) : + RecyclerView.ViewHolder(binding.root), + FileViewHolder { + + override val itemLayout: View = binding.ListItemLayout + override val thumbnail: ImageView = binding.thumbnailLayout.thumbnail + override val shimmerThumbnail: LoaderImageView = binding.thumbnailLayout.thumbnailShimmer + override val checkbox: ImageView = binding.customCheckbox + override val favorite: ImageView = binding.favoriteAction + override val localFileIndicator: ImageView = binding.localFileIndicator + override val shared: ImageView = binding.sharedIcon + override val unreadComments: ImageView = binding.unreadComments + override val filename: FilenameView = binding.Filename + + init { + binding.favoriteAction.drawable.mutate() + } +} diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListDelegate.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/FileListDelegate.kt similarity index 89% rename from app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListDelegate.kt rename to app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/FileListDelegate.kt index 45a54fab832c..a5deb5ead26c 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListDelegate.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/FileListDelegate.kt @@ -40,7 +40,6 @@ import com.owncloud.android.ui.activity.AlbumsPickerActivity import com.owncloud.android.ui.activity.ComponentsGetter import com.owncloud.android.ui.activity.FolderPickerActivity import com.owncloud.android.ui.adapter.GalleryRowHolder -import com.owncloud.android.ui.adapter.filelist.recommended.RecommendedFilesViewHolder import com.owncloud.android.ui.fragment.albums.AlbumItemsFragment import com.owncloud.android.ui.interfaces.OCFileListFragmentInterface import com.owncloud.android.ui.navigation.animator.NavigationAnimator @@ -55,14 +54,13 @@ import kotlinx.coroutines.cancelChildren import kotlinx.coroutines.job import kotlinx.coroutines.launch -class OCFileListDelegate( +class FileListDelegate( private val fileUploadHelper: FileUploadHelper, private val context: Context, private val ocFileListFragmentInterface: OCFileListFragmentInterface, private val user: User, private val storageManager: FileDataStorageManager, private val hideItemOptions: Boolean, - var gridView: Boolean, private val transferServiceGetter: ComponentsGetter, private val showMetadata: Boolean, private var showShareAvatar: Boolean, @@ -204,15 +202,15 @@ class OCFileListDelegate( @Suppress("MagicNumber", "CyclomaticComplexMethod") fun bindViewHolder( - viewHolder: ListViewHolder, + viewHolder: FileViewHolder, file: OCFile, currentDirectory: OCFile?, - thumbnailGenerator: ThumbnailGenerator + thumbnailGenerator: ThumbnailGenerator, + isGrid: Boolean ) { // thumbnail - viewHolder.imageFileName?.text = file.fileName viewHolder.thumbnail.tag = file.fileId - if (gridView) { + if (isGrid) { if (MimeTypeUtil.isImageOrVideo(file)) { viewHolder.thumbnail.scaleType = ImageView.ScaleType.CENTER_CROP viewHolder.thumbnail.setPadding(0, 0, 0, 0) @@ -226,7 +224,7 @@ class OCFileListDelegate( thumbnailGenerator.setThumbnail( file, viewHolder.thumbnail, - ThumbnailArguments(isGrid = gridView, hideVideoOverlay = false, viewHolder.shimmerThumbnail) + ThumbnailArguments(isGrid = isGrid, hideVideoOverlay = false, viewHolder.shimmerThumbnail) ) // item layout + click listeners @@ -274,7 +272,7 @@ class OCFileListDelegate( } } - private fun bindUnreadComments(file: OCFile, gridViewHolder: ListViewHolder) { + private fun bindUnreadComments(file: OCFile, gridViewHolder: FileViewHolder) { if (file.unreadCommentsCount > 0) { gridViewHolder.unreadComments.visibility = View.VISIBLE gridViewHolder.unreadComments.setOnClickListener { @@ -286,32 +284,25 @@ class OCFileListDelegate( } } - private fun bindGridItemLayout(file: OCFile, gridViewHolder: ListViewHolder) { + private fun bindGridItemLayout(file: OCFile, gridViewHolder: FileViewHolder) { setItemLayoutBackgroundColor(file, gridViewHolder) setCheckBoxImage(file, gridViewHolder) - setItemLayoutOnClickListeners(file, gridViewHolder) - gridViewHolder.more?.setOnClickListener { - ocFileListFragmentInterface.onOverflowIconClicked(file, it) - } + gridViewHolder.itemLayout.setOnClickListener { ocFileListFragmentInterface.onItemClicked(file) } } - private fun setItemLayoutOnClickListeners(file: OCFile, gridViewHolder: ListViewHolder) { - gridViewHolder.itemLayout.setOnClickListener { ocFileListFragmentInterface.onItemClicked(file) } + fun bindLongClick(holder: FileViewHolder, file: OCFile) { + if (hideItemOptions) { + return + } - if (!hideItemOptions && gridViewHolder !is RecommendedFilesViewHolder) { - gridViewHolder.itemLayout.apply { - isLongClickable = true - setOnLongClickListener { - ocFileListFragmentInterface.onLongItemClicked( - file - ) - } - } + holder.itemLayout.apply { + isLongClickable = true + setOnLongClickListener { ocFileListFragmentInterface.onLongItemClicked(file) } } } - private fun setItemLayoutBackgroundColor(file: OCFile, gridViewHolder: ListViewHolder) { + private fun setItemLayoutBackgroundColor(file: OCFile, gridViewHolder: FileViewHolder) { val cornerRadius = context.resources.getDimension(R.dimen.selected_grid_container_radius) val isDarkModeActive = (syncFolderProvider?.preferences?.isDarkModeEnabled == true) @@ -333,7 +324,7 @@ class OCFileListDelegate( } } - private fun setCheckBoxImage(file: OCFile, gridViewHolder: ListViewHolder) { + private fun setCheckBoxImage(file: OCFile, gridViewHolder: FileViewHolder) { if (isCheckedFile(file)) { gridViewHolder.checkbox.setImageDrawable( viewThemeUtils.platform.tintDrawable(context, R.drawable.ic_checkbox_marked, ColorRole.PRIMARY) @@ -343,7 +334,7 @@ class OCFileListDelegate( } } - private fun bindGridMetadataViews(file: OCFile, gridViewHolder: ListViewHolder) { + private fun bindGridMetadataViews(file: OCFile, gridViewHolder: FileViewHolder) { if (showMetadata) { showLocalFileIndicator(file, gridViewHolder) gridViewHolder.favorite.visibility = if (file.isFavorite) View.VISIBLE else View.GONE @@ -369,7 +360,7 @@ class OCFileListDelegate( !etag.isNullOrBlank() @Suppress("ComplexCondition") - private fun showLocalFileIndicator(file: OCFile, holder: ListViewHolder) { + private fun showLocalFileIndicator(file: OCFile, holder: FileViewHolder) { var isFolderDown = false if (file.canCheckFolderDown()) { isFolderDown = storageManager.fileDao.areAllFilesHaveMediaPath(file.fileId, user.accountName) @@ -396,8 +387,8 @@ class OCFileListDelegate( } } - private fun configureSharedIconView(gridViewHolder: ListViewHolder, file: OCFile) { - val result = getShareIconIdAndContentDescriptionId(gridViewHolder, file) + private fun configureSharedIconView(gridViewHolder: FileViewHolder, file: OCFile) { + val result = getShareIconIdAndContentDescriptionId(file) gridViewHolder.shared.run { if (result == null) { @@ -412,15 +403,13 @@ class OCFileListDelegate( } } - private fun getShareIconIdAndContentDescriptionId(holder: ListViewHolder, file: OCFile): Pair? { + private fun getShareIconIdAndContentDescriptionId(file: OCFile): Pair? { if (!MDMConfig.sharingSupport(context)) { return null } if (file.isOfflineOperation) return null - if (holder !is OCFileListItemViewHolder && file.unreadCommentsCount != 0) return null - return when { file.isSharedWithSharee || file.isSharedWithMe -> { if (showShareAvatar) null else R.drawable.shared_via_users to R.string.shared_icon_shared @@ -449,6 +438,6 @@ class OCFileListDelegate( } companion object { - private val TAG = OCFileListDelegate::class.java.simpleName + private val TAG = FileListDelegate::class.java.simpleName } } diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/FileViewHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/FileViewHolder.kt new file mode 100644 index 000000000000..0a4ea0bc8bdb --- /dev/null +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/FileViewHolder.kt @@ -0,0 +1,24 @@ +/* + * Nextcloud - Android Client + * + * SPDX-FileCopyrightText: 2026 Alper Ozturk + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +package com.owncloud.android.ui.adapter.filelist.item + +import android.view.View +import android.widget.ImageView +import com.elyeproj.loaderviewlibrary.LoaderImageView +import com.nextcloud.ui.component.FilenameView + +interface FileViewHolder { + val itemLayout: View + val thumbnail: ImageView + val shimmerThumbnail: LoaderImageView + val checkbox: ImageView + val favorite: ImageView + val localFileIndicator: ImageView + val shared: ImageView + val unreadComments: ImageView + val filename: FilenameView +} diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/ListGridItemViewHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/ListGridItemViewHolder.kt deleted file mode 100644 index 60ca41a5ff88..000000000000 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/ListGridItemViewHolder.kt +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Nextcloud - Android Client - * - * SPDX-FileCopyrightText: 2026 Alper Ozturk - * SPDX-FileCopyrightText: 2022 Tobias Kaminsky - * SPDX-FileCopyrightText: 2022 Nextcloud GmbH - * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only - */ -package com.owncloud.android.ui.adapter.filelist.item - -import android.view.View -import android.widget.TextView -import com.nextcloud.client.player.ui.PlayerProgressIndicator - -internal interface ListGridItemViewHolder : ListViewHolder { - val fileName: TextView - val extension: TextView? - val playerProgressIndicator: PlayerProgressIndicator? get() = null - val bidiFilename: TextView - val bidiFilenameContainer: View -} diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/ListItemViewHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/ListItemViewHolder.kt deleted file mode 100644 index fbc855eed777..000000000000 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/ListItemViewHolder.kt +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Nextcloud - Android Client - * - * SPDX-FileCopyrightText: 2026 Alper Ozturk - * SPDX-FileCopyrightText: 2022 Tobias Kaminsky - * SPDX-FileCopyrightText: 2022 Nextcloud GmbH - * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only - */ -package com.owncloud.android.ui.adapter.filelist.item - -import android.view.View -import android.widget.ImageView -import android.widget.LinearLayout -import android.widget.TextView -import com.google.android.material.chip.Chip -import com.google.android.material.chip.ChipGroup -import com.owncloud.android.ui.AvatarGroupLayout - -internal interface ListItemViewHolder : ListGridItemViewHolder { - val fileSize: TextView - val fileSizeSeparator: View - val lastModification: TextView - val overflowMenu: ImageView - val sharedAvatars: AvatarGroupLayout - val tagsGroup: ChipGroup - val firstTag: Chip - val secondTag: Chip - val tagMore: Chip - val fileDetailGroup: LinearLayout -} diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/ListViewHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/ListViewHolder.kt deleted file mode 100644 index 7de0f03bbab2..000000000000 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/ListViewHolder.kt +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Nextcloud - Android Client - * - * SPDX-FileCopyrightText: 2026 Alper Ozturk - * SPDX-FileCopyrightText: 2022 Tobias Kaminsky - * SPDX-FileCopyrightText: 2022 Nextcloud GmbH - * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only - */ -package com.owncloud.android.ui.adapter.filelist.item - -import android.view.View -import android.widget.ImageButton -import android.widget.ImageView -import android.widget.LinearLayout -import android.widget.TextView -import com.elyeproj.loaderviewlibrary.LoaderImageView - -interface ListViewHolder { - val thumbnail: ImageView - fun showVideoOverlay() - val shimmerThumbnail: LoaderImageView - val favorite: ImageView - val localFileIndicator: ImageView - val imageFileName: TextView? - val shared: ImageView - val checkbox: ImageView - val itemLayout: View - val unreadComments: ImageView - val more: ImageButton? - val fileFeaturesLayout: LinearLayout? - val gridLivePhotoIndicator: ImageView? - val livePhotoIndicator: TextView? - val livePhotoIndicatorSeparator: TextView? - val hasVisibleFeatureIndicators: Boolean -} diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListGridItemViewHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListGridItemViewHolder.kt deleted file mode 100644 index 0dfbd55f9651..000000000000 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListGridItemViewHolder.kt +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Nextcloud - Android Client - * - * SPDX-FileCopyrightText: 2026 Alper Ozturk - * SPDX-FileCopyrightText: 2022 Tobias Kaminsky - * SPDX-FileCopyrightText: 2022 Nextcloud GmbH - * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only - */ -package com.owncloud.android.ui.adapter.filelist.item - -import android.view.View -import android.widget.ImageButton -import android.widget.ImageView -import android.widget.LinearLayout -import android.widget.TextView -import androidx.core.view.isVisible -import androidx.recyclerview.widget.RecyclerView -import com.elyeproj.loaderviewlibrary.LoaderImageView -import com.nextcloud.client.player.ui.PlayerProgressIndicator -import com.owncloud.android.databinding.GridItemBinding - -class OCFileListGridItemViewHolder(var binding: GridItemBinding) : - RecyclerView.ViewHolder( - binding.root - ), - ListGridItemViewHolder { - override val bidiFilename: TextView - get() = binding.bidiFilename - override val bidiFilenameContainer: View - get() = binding.bidiFilenameContainer - override val fileName: TextView - get() = binding.Filename - override val extension: TextView? - get() = if (binding.bidiFilenameContainer.isVisible) { - binding.bidiExtension - } else { - null - } - override val playerProgressIndicator: PlayerProgressIndicator - get() = binding.playerProgressIndicator - override val thumbnail: ImageView - get() = binding.thumbnail - - override fun showVideoOverlay() { - binding.videoOverlay.visibility = View.VISIBLE - } - - override val shimmerThumbnail: LoaderImageView - get() = binding.thumbnailShimmer - override val favorite: ImageView - get() = binding.favoriteAction - override val localFileIndicator: ImageView - get() = binding.localFileIndicator - override val imageFileName: TextView? - get() = null - override val shared: ImageView - get() = binding.sharedIcon - override val checkbox: ImageView - get() = binding.customCheckbox - override val itemLayout: View - get() = binding.ListItemLayout - override val unreadComments: ImageView - get() = binding.unreadComments - - override val gridLivePhotoIndicator: ImageView? - get() = null - override val livePhotoIndicator: TextView? - get() = null - override val livePhotoIndicatorSeparator: TextView? - get() = null - override val hasVisibleFeatureIndicators: Boolean - get() = localFileIndicator.isVisible || gridLivePhotoIndicator?.isVisible == true || unreadComments.isVisible || - shared.isVisible || binding.videoOverlay.isVisible || favorite.isVisible - override val fileFeaturesLayout: LinearLayout - get() = binding.fileFeaturesLayout - override val more: ImageButton - get() = if (binding.bidiFilenameContainer.isVisible) { - binding.bidiMore - } else { - binding.more - } - init { - binding.favoriteAction.drawable.mutate() - } -} diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListItemViewHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListItemViewHolder.kt deleted file mode 100644 index 0bbd6804e9dd..000000000000 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListItemViewHolder.kt +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Nextcloud - Android Client - * - * SPDX-FileCopyrightText: 2026 Alper Ozturk - * SPDX-FileCopyrightText: 2022 Tobias Kaminsky - * SPDX-FileCopyrightText: 2022 Nextcloud GmbH - * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only - */ -package com.owncloud.android.ui.adapter.filelist.item - -import android.view.View -import android.widget.ImageButton -import android.widget.ImageView -import android.widget.LinearLayout -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.elyeproj.loaderviewlibrary.LoaderImageView -import com.google.android.material.chip.Chip -import com.google.android.material.chip.ChipGroup -import com.nextcloud.client.player.ui.PlayerProgressIndicator -import com.owncloud.android.databinding.ListItemBinding -import com.owncloud.android.ui.AvatarGroupLayout - -class OCFileListItemViewHolder(private var binding: ListItemBinding) : - RecyclerView.ViewHolder( - binding.root - ), - ListItemViewHolder { - override val gridLivePhotoIndicator: ImageView? - get() = null - override val livePhotoIndicator: TextView - get() = binding.livePhotoIndicator - override val livePhotoIndicatorSeparator: TextView - get() = binding.livePhotoIndicatorSeparator - override val hasVisibleFeatureIndicators: Boolean - get() = false - override val playerProgressIndicator: PlayerProgressIndicator - get() = binding.playerProgressIndicator - override val fileSize: TextView - get() = binding.fileSize - override val fileSizeSeparator: View - get() = binding.fileSeparator - override val lastModification: TextView - get() = binding.lastMod - override val overflowMenu: ImageView - get() = binding.overflowMenu - override val sharedAvatars: AvatarGroupLayout - get() = binding.sharedAvatars - override val fileName: TextView - get() = binding.Filename - override val extension: TextView - get() = binding.extension - override val bidiFilename: TextView - get() = binding.bidiFilename - override val bidiFilenameContainer: View - get() = binding.bidiFilenameContainer - override val thumbnail: ImageView - get() = binding.thumbnailLayout.thumbnail - override val tagsGroup: ChipGroup - get() = binding.tagsGroup - override val firstTag: Chip - get() = binding.firstTag - override val secondTag: Chip - get() = binding.secondTag - override val tagMore: Chip - get() = binding.tagMore - override val fileDetailGroup: LinearLayout - get() = binding.fileDetailGroup - - override fun showVideoOverlay() { - binding.thumbnailLayout.videoOverlay.visibility = View.VISIBLE - } - - override val more: ImageButton? - get() = null - override val fileFeaturesLayout: LinearLayout? - get() = null - override val shimmerThumbnail: LoaderImageView - get() = binding.thumbnailLayout.thumbnailShimmer - override val favorite: ImageView - get() = binding.favoriteAction - override val localFileIndicator: ImageView - get() = binding.localFileIndicator - override val imageFileName: TextView? - get() = null - override val shared: ImageView - get() = binding.sharedIcon - override val checkbox: ImageView - get() = binding.customCheckbox - override val itemLayout: View - get() = binding.ListItemLayout - override val unreadComments: ImageView - get() = binding.unreadComments - - init { - binding.favoriteAction.drawable.mutate() - } -} diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListViewHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListViewHolder.kt deleted file mode 100644 index d96845cfd6c8..000000000000 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/item/OCFileListViewHolder.kt +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Nextcloud - Android Client - * - * SPDX-FileCopyrightText: 2026 Alper Ozturk - * SPDX-FileCopyrightText: 2022 Tobias Kaminsky - * SPDX-FileCopyrightText: 2022 Nextcloud GmbH - * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only - */ -package com.owncloud.android.ui.adapter.filelist.item - -import android.view.View -import android.widget.ImageButton -import android.widget.ImageView -import android.widget.LinearLayout -import android.widget.TextView -import androidx.core.view.isVisible -import androidx.recyclerview.widget.RecyclerView -import com.elyeproj.loaderviewlibrary.LoaderImageView -import com.owncloud.android.databinding.GridItemBinding - -internal class OCFileListViewHolder(var binding: GridItemBinding) : - RecyclerView.ViewHolder( - binding.root - ), - ListViewHolder { - - override val thumbnail: ImageView - get() = binding.thumbnail - - override val imageFileName: TextView - get() = if (binding.bidiFilenameContainer.isVisible) { - binding.bidiFilename - } else { - binding.Filename - } - - override fun showVideoOverlay() { - // noop - } - - override val shimmerThumbnail: LoaderImageView - get() = binding.thumbnailShimmer - override val favorite: ImageView - get() = binding.favoriteAction - override val localFileIndicator: ImageView - get() = binding.localFileIndicator - override val shared: ImageView - get() = binding.sharedIcon - override val checkbox: ImageView - get() = binding.customCheckbox - override val itemLayout: View - get() = binding.ListItemLayout - override val unreadComments: ImageView - get() = binding.unreadComments - override val more: ImageButton - get() = if (binding.bidiFilenameContainer.isVisible) { - binding.bidiMore - } else { - binding.more - } - override val fileFeaturesLayout: LinearLayout - get() = binding.fileFeaturesLayout - override val gridLivePhotoIndicator: ImageView - get() = binding.gridLivePhotoIndicator - override val livePhotoIndicator: TextView? - get() = null - override val livePhotoIndicatorSeparator: TextView? - get() = null - override val hasVisibleFeatureIndicators: Boolean - get() = localFileIndicator.isVisible || gridLivePhotoIndicator.isVisible || unreadComments.isVisible || - shared.isVisible || binding.videoOverlay.isVisible || favorite.isVisible - - init { - binding.favoriteAction.drawable.mutate() - } -} diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/recommended/RecommendedFilesAdapter.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/recommended/RecommendedFilesAdapter.kt index fbd8fdadf37c..eaa10cf43cc0 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/recommended/RecommendedFilesAdapter.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/recommended/RecommendedFilesAdapter.kt @@ -12,12 +12,10 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.owncloud.android.databinding.RecommendedFileItemBinding import com.owncloud.android.datamodel.OCFile -import com.owncloud.android.ui.adapter.filelist.OCFileListAdapter +import com.owncloud.android.ui.adapter.filelist.FileListAdapter -class RecommendedFilesAdapter( - private val fileListAdapter: OCFileListAdapter, - private val recommendations: List -) : RecyclerView.Adapter() { +class RecommendedFilesAdapter(private val fileListAdapter: FileListAdapter, private val recommendations: List) : + RecyclerView.Adapter() { fun getItemPosition(file: OCFile): Int = recommendations.indexOf(file) @@ -32,6 +30,6 @@ class RecommendedFilesAdapter( override fun onBindViewHolder(holder: RecommendedFilesViewHolder, position: Int) { val item = recommendations[position] fileListAdapter.bindRecommendedFilesHolder(holder, item) - holder.reason.text = item.reason + holder.binding.reason.text = item.reason } } diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/recommended/RecommendedFilesViewHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/recommended/RecommendedFilesViewHolder.kt index 920a714d3de8..f49922856be5 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/filelist/recommended/RecommendedFilesViewHolder.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/filelist/recommended/RecommendedFilesViewHolder.kt @@ -8,47 +8,26 @@ package com.owncloud.android.ui.adapter.filelist.recommended import android.view.View -import android.widget.ImageButton import android.widget.ImageView -import android.widget.LinearLayout -import android.widget.TextView -import androidx.core.view.isVisible import androidx.recyclerview.widget.RecyclerView import com.elyeproj.loaderviewlibrary.LoaderImageView +import com.nextcloud.ui.component.FilenameView import com.owncloud.android.databinding.RecommendedFileItemBinding -import com.owncloud.android.ui.adapter.filelist.item.ListGridItemViewHolder +import com.owncloud.android.ui.adapter.filelist.item.FileViewHolder -class RecommendedFilesViewHolder(private val binding: RecommendedFileItemBinding) : +class RecommendedFilesViewHolder(val binding: RecommendedFileItemBinding) : RecyclerView.ViewHolder(binding.root), - ListGridItemViewHolder { + FileViewHolder { - val reason: TextView get() = binding.reason - override val fileName: TextView get() = binding.filename - override val extension: TextView? get() = binding.extension - override val bidiFilename: TextView get() = binding.bidiFilename - override val bidiFilenameContainer: View get() = binding.bidiFilenameContainer - override val thumbnail: ImageView get() = binding.thumbnail - override val shimmerThumbnail: LoaderImageView get() = binding.thumbnailShimmer - override val favorite: ImageView get() = binding.favoriteAction - override val localFileIndicator: ImageView get() = binding.localFileIndicator - override val shared: ImageView get() = binding.sharedIcon - override val checkbox: ImageView get() = binding.customCheckbox - override val itemLayout: View get() = binding.recommendedFileItemLayout - override val unreadComments: ImageView get() = binding.unreadComments - override val fileFeaturesLayout: LinearLayout get() = binding.fileFeaturesLayout - override val more: ImageButton get() = binding.more - - override val imageFileName: TextView? get() = null - override val gridLivePhotoIndicator: ImageView? get() = null - override val livePhotoIndicator: TextView? get() = null - override val livePhotoIndicatorSeparator: TextView? get() = null - override val hasVisibleFeatureIndicators: Boolean - get() = localFileIndicator.isVisible || gridLivePhotoIndicator?.isVisible == true || unreadComments.isVisible || - shared.isVisible || binding.videoOverlay.isVisible || favorite.isVisible - - override fun showVideoOverlay() { - binding.videoOverlay.visibility = View.VISIBLE - } + override val itemLayout: View = binding.recommendedFileItemLayout + override val thumbnail: ImageView = binding.thumbnail + override val shimmerThumbnail: LoaderImageView = binding.thumbnailShimmer + override val checkbox: ImageView = binding.customCheckbox + override val favorite: ImageView = binding.favoriteAction + override val localFileIndicator: ImageView = binding.localFileIndicator + override val shared: ImageView = binding.sharedIcon + override val unreadComments: ImageView = binding.unreadComments + override val filename: FilenameView = binding.filename init { binding.favoriteAction.drawable.mutate() diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/localFileList/LocalFileListGridItemViewHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/localFileList/LocalFileListGridItemViewHolder.kt index 4ce3430aff75..83a3a1315196 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/localFileList/LocalFileListGridItemViewHolder.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/localFileList/LocalFileListGridItemViewHolder.kt @@ -9,12 +9,12 @@ package com.owncloud.android.ui.adapter.localFileList import android.view.View import android.widget.ImageView import android.widget.LinearLayout -import android.widget.TextView import androidx.recyclerview.widget.RecyclerView +import com.nextcloud.ui.component.FilenameView import com.owncloud.android.R internal open class LocalFileListGridItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - val fileName: TextView = itemView.findViewById(R.id.Filename) + val fileName: FilenameView = itemView.findViewById(R.id.Filename) val thumbnail: ImageView = itemView.findViewById(R.id.thumbnail) val checkbox: ImageView = itemView.findViewById(R.id.custom_checkbox) val itemLayout: LinearLayout = itemView.findViewById(R.id.ListItemLayout) diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.kt b/app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.kt index d4c3270b2986..9c99cdb86768 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.kt +++ b/app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.kt @@ -68,7 +68,7 @@ import com.owncloud.android.ui.activity.FolderPickerActivity import com.owncloud.android.ui.activity.OnEnforceableRefreshListener import com.owncloud.android.ui.activity.UploadFilesActivity import com.owncloud.android.ui.adapter.localFileList.LocalFileListAdapter -import com.owncloud.android.ui.adapter.filelist.OCFileListAdapter +import com.owncloud.android.ui.adapter.filelist.FileListAdapter import com.owncloud.android.utils.theme.ViewThemeUtils import javax.inject.Inject import kotlin.math.max @@ -232,7 +232,7 @@ open class ExtendedListFragment : override fun onQueryTextSubmit(query: String): Boolean { val adapter = recyclerView?.adapter - if (adapter is OCFileListAdapter) { + if (adapter is FileListAdapter) { val listOfHiddenFiles = adapter.listOfHiddenFiles performSearch(query, listOfHiddenFiles, false) return true @@ -255,7 +255,7 @@ open class ExtendedListFragment : activity.updateListOfFilesFragment() } else { Handler(Looper.getMainLooper()).post { - if (adapter is OCFileListAdapter) { + if (adapter is FileListAdapter) { activity.performUnifiedSearch(query, listOfHiddenFiles) } else if (adapter is LocalFileListAdapter) { adapter.filter(query) @@ -280,7 +280,7 @@ open class ExtendedListFragment : override fun onClose(): Boolean { val adapter = recyclerView?.adapter - if (adapter is OCFileListAdapter) { + if (adapter is FileListAdapter) { val listOfHiddenFiles = adapter.listOfHiddenFiles performSearch("", listOfHiddenFiles, true) return false diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FileListLayoutManager.kt b/app/src/main/java/com/owncloud/android/ui/fragment/FileListLayoutManager.kt index 8b8808c39ebf..70d8a73fc48a 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/FileListLayoutManager.kt +++ b/app/src/main/java/com/owncloud/android/ui/fragment/FileListLayoutManager.kt @@ -16,7 +16,7 @@ import androidx.recyclerview.widget.RecyclerView import com.nextcloud.client.preferences.AppPreferences import com.nextcloud.ui.sort.SortOrderUi import com.owncloud.android.lib.common.utils.Log_OC -import com.owncloud.android.ui.adapter.filelist.OCFileListAdapter +import com.owncloud.android.ui.adapter.filelist.FileListAdapter import com.owncloud.android.utils.FileSortOrder class FileListLayoutManager(private val fragment: OCFileListFragment, private val preferences: AppPreferences) { @@ -71,7 +71,7 @@ class FileListLayoutManager(private val fragment: OCFileListFragment, private va @SuppressLint("NotifyDataSetChanged") fun switchLayoutManager(grid: Boolean) { val recyclerView: RecyclerView? = fragment.recyclerView - val adapter: OCFileListAdapter? = fragment.adapter + val adapter: FileListAdapter? = fragment.adapter val context: Context? = fragment.context if (context == null || adapter == null || recyclerView == null) { diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.kt b/app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.kt index 9ba68ef3380b..ec03f9e4539e 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.kt +++ b/app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.kt @@ -51,7 +51,7 @@ import com.owncloud.android.ui.activity.AlbumsPickerActivity import com.owncloud.android.ui.activity.FileDisplayActivity import com.owncloud.android.ui.activity.FolderPickerActivity import com.owncloud.android.ui.activity.ToolbarActivity -import com.owncloud.android.ui.adapter.filelist.CommonOCFileListAdapterInterface +import com.owncloud.android.ui.adapter.filelist.CommonFileListAdapterInterface import com.owncloud.android.ui.adapter.GalleryAdapter import com.owncloud.android.ui.asynctasks.GallerySearchTask import com.owncloud.android.ui.fragment.GalleryFragmentBottomSheetDialog.MediaState @@ -254,7 +254,7 @@ class GalleryFragment : handleSearchEvent() } - override val commonAdapter: CommonOCFileListAdapterInterface? + override val commonAdapter: CommonFileListAdapterInterface? get() = galleryAdapter val currentMediaState: MediaState? diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.kt b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.kt index eba77739a03c..d9e2a0ed2315 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.kt +++ b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.kt @@ -92,8 +92,8 @@ import com.owncloud.android.ui.activity.FolderPickerActivity import com.owncloud.android.ui.activity.OnEnforceableRefreshListener import com.owncloud.android.ui.activity.TextEditorWebView import com.owncloud.android.ui.activity.UploadFilesActivity -import com.owncloud.android.ui.adapter.filelist.CommonOCFileListAdapterInterface -import com.owncloud.android.ui.adapter.filelist.OCFileListAdapter +import com.owncloud.android.ui.adapter.filelist.CommonFileListAdapterInterface +import com.owncloud.android.ui.adapter.filelist.FileListAdapter import com.owncloud.android.ui.dialog.ChooseRichDocumentsTemplateDialogFragment import com.owncloud.android.ui.dialog.ChooseTemplateDialogFragment import com.owncloud.android.ui.dialog.ConfirmationDialogFragment @@ -187,10 +187,10 @@ open class OCFileListFragment : var fileDepth: OCFileDepth? = OCFileDepth.Root private set - var adapter: OCFileListAdapter? = null + var adapter: FileListAdapter? = null protected set - open val commonAdapter: CommonOCFileListAdapterInterface? + open val commonAdapter: CommonFileListAdapterInterface? get() = adapter var currentSearchType: SearchType = SearchType.NO_SEARCH @@ -415,7 +415,7 @@ open class OCFileListFragment : val hideItemOptions = args?.getBoolean(ARG_HIDE_ITEM_OPTIONS, false) == true val isGridViewPreferred = fileListLayoutManager?.isGridViewPreferred() == true - adapter = OCFileListAdapter( + adapter = FileListAdapter( requireActivity(), accountManager.user, preferences, @@ -859,7 +859,7 @@ open class OCFileListFragment : @SuppressLint("NotifyDataSetChanged") fun selectAllFiles(select: Boolean) { val adapter = recyclerView?.adapter - if (adapter !is CommonOCFileListAdapterInterface) return + if (adapter !is CommonFileListAdapterInterface) return adapter.selectAll(select) adapter.notifyDataSetChanged() @@ -1144,7 +1144,7 @@ open class OCFileListFragment : } private fun scrollToHighlightedFileOrTop( - adapter: OCFileListAdapter, + adapter: FileListAdapter, highlightedFile: OCFile?, previousDirectory: OCFile?, listedDirectory: OCFile diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListMultiChoiceModeListener.kt b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListMultiChoiceModeListener.kt index fb8947c2d9f2..ad0afcdc6dcf 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListMultiChoiceModeListener.kt +++ b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListMultiChoiceModeListener.kt @@ -20,7 +20,7 @@ import com.owncloud.android.R import com.owncloud.android.datamodel.OCFile import com.owncloud.android.lib.common.utils.Log_OC import com.owncloud.android.ui.activity.AlbumsPickerActivity -import com.owncloud.android.ui.adapter.filelist.OCFileListAdapter +import com.owncloud.android.ui.adapter.filelist.FileListAdapter import edu.umd.cs.findbugs.annotations.SuppressFBWarnings internal class OCFileListMultiChoiceModeListener(private val fragment: OCFileListFragment) : @@ -68,7 +68,7 @@ internal class OCFileListMultiChoiceModeListener(private val fragment: OCFileLis val actionMode = activeActionMode if (newState != DrawerLayout.STATE_DRAGGING || actionMode == null) return - (fragment.recyclerView?.adapter as? OCFileListAdapter)?.let { + (fragment.recyclerView?.adapter as? FileListAdapter)?.let { selectionClosedByDrawer.addAll(it.getCheckedItems()) } diff --git a/app/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java b/app/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java index f9264f74fc47..1427b1f10eff 100644 --- a/app/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java +++ b/app/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java @@ -10,11 +10,11 @@ import android.view.View; import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.ui.adapter.filelist.OCFileListAdapter; +import com.owncloud.android.ui.adapter.filelist.FileListAdapter; /** * Interface for communication between {@link com.owncloud.android.ui.fragment.OCFileListFragment} - * and {@link OCFileListAdapter} + * and {@link FileListAdapter} */ public interface OCFileListFragmentInterface { diff --git a/app/src/main/res/layout/grid_item.xml b/app/src/main/res/layout/grid_item.xml index fe05edce1f7e..23f81c0a1a6c 100644 --- a/app/src/main/res/layout/grid_item.xml +++ b/app/src/main/res/layout/grid_item.xml @@ -142,64 +142,7 @@ app:layout_constraintTop_toTopOf="parent" tools:visibility="visible" /> - - - - - - - - - - - - - - - - - - - - - - - + android:textSize="@dimen/two_line_primary_text_size" /> - - - - - - - - - + android:textSize="@dimen/grid_item_text_size" /> + + + + + + + + diff --git a/app/src/main/res/values/dims.xml b/app/src/main/res/values/dims.xml index ac2ed15dcfef..7a35a06f93a9 100644 --- a/app/src/main/res/values/dims.xml +++ b/app/src/main/res/values/dims.xml @@ -62,7 +62,6 @@ 6dp 160dp 28dp - 80dp 300dp diff --git a/app/src/test/java/com/owncloud/android/ui/adapter/filelist/data/OCFileListAdapterHelperTest.kt b/app/src/test/java/com/owncloud/android/ui/adapter/filelist/data/FileListAdapterHelperTest.kt similarity index 98% rename from app/src/test/java/com/owncloud/android/ui/adapter/filelist/data/OCFileListAdapterHelperTest.kt rename to app/src/test/java/com/owncloud/android/ui/adapter/filelist/data/FileListAdapterHelperTest.kt index f16a3307e8e8..ab4d1871a4d3 100644 --- a/app/src/test/java/com/owncloud/android/ui/adapter/filelist/data/OCFileListAdapterHelperTest.kt +++ b/app/src/test/java/com/owncloud/android/ui/adapter/filelist/data/FileListAdapterHelperTest.kt @@ -23,13 +23,13 @@ import org.junit.Before import org.junit.Test @Suppress("LongMethod") -class OCFileListAdapterHelperTest { +class FileListAdapterHelperTest { private val context = mockk(relaxed = true) - private val helper = OCFileListAdapterHelper() + private val helper = FileListAdapterHelper() private val preferences = mockk(relaxed = true) - private val dataProvider = MockOCFileListAdapterDataProvider() + private val dataProvider = MockFileListAdapterDataProvider() private val userId = "user123" diff --git a/app/src/test/java/com/owncloud/android/ui/adapter/filelist/data/MockOCFileListAdapterDataProvider.kt b/app/src/test/java/com/owncloud/android/ui/adapter/filelist/data/MockFileListAdapterDataProvider.kt similarity index 97% rename from app/src/test/java/com/owncloud/android/ui/adapter/filelist/data/MockOCFileListAdapterDataProvider.kt rename to app/src/test/java/com/owncloud/android/ui/adapter/filelist/data/MockFileListAdapterDataProvider.kt index 5b3e47b5bce6..0189b4591154 100644 --- a/app/src/test/java/com/owncloud/android/ui/adapter/filelist/data/MockOCFileListAdapterDataProvider.kt +++ b/app/src/test/java/com/owncloud/android/ui/adapter/filelist/data/MockFileListAdapterDataProvider.kt @@ -12,7 +12,7 @@ import com.owncloud.android.datamodel.OCFile import com.owncloud.android.utils.MimeType @Suppress("MagicNumber") -class MockOCFileListAdapterDataProvider : OCFileListAdapterDataProvider { +class MockFileListAdapterDataProvider : FileListAdapterDataProvider { private var offlineOCFile: OCFile? = null private var files = listOf()