Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -196,7 +196,7 @@ class FileDisplayActivityIT : AbstractOnServerIT() {
onView(withId(R.id.list_root))
.perform(closeSoftKeyboard())
.perform(
RecyclerViewActions.actionOnItemAtPosition<OCFileListItemViewHolder>(
RecyclerViewActions.actionOnItemAtPosition<FileItemViewHolder>(
0,
click()
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
66 changes: 60 additions & 6 deletions app/src/main/java/com/nextcloud/ui/component/FilenameView.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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))
}

Expand All @@ -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
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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<OCFile> =
storageManager.offlineOperationsRepository.convertToOCFiles(id)

Expand Down
33 changes: 16 additions & 17 deletions app/src/main/java/com/owncloud/android/ui/adapter/GalleryAdapter.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -54,7 +54,7 @@ class GalleryAdapter(
private val defaultThumbnailSize: Int,
private val thumbnailGenerator: ThumbnailGenerator
) : SectionedRecyclerViewAdapter<SectionedViewHolder>(),
CommonOCFileListAdapterInterface,
CommonFileListAdapterInterface,
PopupTextProvider {

companion object {
Expand All @@ -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,
Expand Down Expand Up @@ -164,7 +163,7 @@ class GalleryAdapter(
} else {
GalleryRowHolder(
GalleryRowBinding.inflate(LayoutInflater.from(parent.context), parent, false),
ocFileListDelegate,
fileListDelegate,
this,
viewThemeUtils
)
Expand Down Expand Up @@ -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<OCFile> = ocFileListDelegate.checkedItems
override fun getCheckedItems(): Set<OCFile> = fileListDelegate.checkedItems

override fun removeCheckedFile(file: OCFile) {
ocFileListDelegate.removeCheckedFile(file)
fileListDelegate.removeCheckedFile(file)
}

override fun notifyItemChanged(file: OCFile) {
Expand Down Expand Up @@ -322,7 +321,7 @@ class GalleryAdapter(
*/
@SuppressLint("NotifyDataSetChanged")
override fun setMultiSelect(isMultiSelect: Boolean) {
ocFileListDelegate.isMultiSelect = isMultiSelect
fileListDelegate.isMultiSelect = isMultiSelect
notifyDataSetChanged()
}

Expand All @@ -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
Expand All @@ -362,7 +361,7 @@ class GalleryAdapter(
}

fun setCheckedItem(files: Set<OCFile>?) {
ocFileListDelegate.setCheckedItem(files)
fileListDelegate.setCheckedItem(files)
}

fun markAsFavorite(remotePath: String, favorite: Boolean) {
Expand Down Expand Up @@ -396,6 +395,6 @@ class GalleryAdapter(
override fun setSortOrder(mFile: OCFile?, sortOrder: FileSortOrder) = Unit

fun cleanup() {
ocFileListDelegate.cleanup()
fileListDelegate.cleanup()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand All @@ -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,
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading