Skip to content

refactor(oc-file-list-adapter): kotlin #17814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alperozturk96 merged 8 commits into from
Oct 14, 2026
Merged

refactor(oc-file-list-adapter): kotlin #17814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d6a9861
Rename .java to .kt
alperozturk96 Oct 13, 2026
476a76d
convert java to kotlin
alperozturk96 Oct 13, 2026
bba7211
extract item binder
alperozturk96 Oct 13, 2026
83636b9
simplify adapter
alperozturk96 Oct 13, 2026
ce5625c
reorganize package
alperozturk96 Oct 13, 2026
17fc711
use kt extension and simplify
alperozturk96 Oct 13, 2026
cec4525
fix spotless check
alperozturk96 Oct 13, 2026
2ffd6b8
add folder mark favorite action
alperozturk96 Oct 14, 2026
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
2 changes: 1 addition & 1 deletion app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.kt
View file
Open in desktop
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.OCFileListItemViewHolder
import com.owncloud.android.ui.adapter.filelist.item.OCFileListItemViewHolder
import com.owncloud.android.utils.EspressoIdlingResource
import org.hamcrest.Matchers.allOf
import org.junit.After
Expand Down
2 changes: 1 addition & 1 deletion app/src/androidTest/java/com/owncloud/android/ui/fragment/SharedListFragmentIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ internal class SharedListFragmentIT : AbstractIT() {
.parseAndSaveShares(listOf(), shares, storageManager, user)
}
fragment.adapter.run {
prepareForSearchData(storageManager, SearchType.SHARED_FILTER)
prepareForSearchData(SearchType.SHARED_FILTER)
updateAdapter(newList, null)
}
EspressoIdlingResource.decrement()
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/owncloud/android/datamodel/OCFileListAdapterDataProviderImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
package com.owncloud.android.datamodel

import com.nextcloud.client.database.entity.FileEntity
import com.owncloud.android.ui.adapter.filelist.OCFileListAdapterDataProvider
import com.owncloud.android.ui.adapter.filelist.data.OCFileListAdapterDataProvider

@Suppress("ReturnCount")
class OCFileListAdapterDataProviderImpl(private val storageManager: FileDataStorageManager) :
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/owncloud/android/ui/adapter/GalleryAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +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.interfaces.OCFileListFragmentInterface
import com.owncloud.android.utils.FileSortOrder
import com.owncloud.android.utils.theme.ViewThemeUtils
Expand Down Expand Up @@ -391,7 +393,7 @@ class GalleryAdapter(

override fun setHighlightedItem(file: OCFile) = Unit

override fun setSortOrder(mFile: OCFile, sortOrder: FileSortOrder) = Unit
override fun setSortOrder(mFile: OCFile?, sortOrder: FileSortOrder) = Unit

fun cleanup() {
ocFileListDelegate.cleanup()
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/owncloud/android/ui/adapter/GalleryRowHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ 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.utils.theme.ViewThemeUtils

private const val CHECKED_SCALE = 0.8f
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/owncloud/android/ui/adapter/GroupFolderListAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +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.interfaces.GroupfolderListInterface
import com.owncloud.android.utils.MimeTypeUtil
import com.owncloud.android.utils.theme.ViewThemeUtils
Expand Down
Loading
Loading