diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/AutoUploadFragment.kt b/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/AutoUploadFragment.kt index ddb0ba79d506..0ac44810a448 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/AutoUploadFragment.kt +++ b/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/AutoUploadFragment.kt @@ -50,8 +50,11 @@ import com.owncloud.android.utils.theme.ThemeUtils import com.owncloud.android.utils.theme.ViewThemeUtils import javax.inject.Inject import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +import kotlin.time.Duration.Companion.seconds class AutoUploadFragment : Fragment(), @@ -82,6 +85,9 @@ class AutoUploadFragment : private lateinit var dialogs: AutoUploadDialogs private lateinit var clickHandler: AutoUploadClickHandler + private val maxSwipeRefreshInterval = 4.seconds + private var swipeRefreshTimeoutJob: Job? = null + private val intentHandler = AutoUploadIntentHandler() private val folderPickers = AutoUploadPickers(this) { @@ -130,7 +136,7 @@ class AutoUploadFragment : setupStoragePermissionWarningBanner(activity, binding) PermissionUtil.dismissStoragePermissionDialogFragment(activity) if (PermissionUtil.checkStoragePermission(activity)) { - load(activity) + loadIfEmpty(activity) } uploadWarningCard?.bind(binding.autoUploadBatterySaverWarningCard) } @@ -206,7 +212,6 @@ class AutoUploadFragment : lifecycleScope, activity, clock, - gridWidth, clickHandler, resources.getBoolean(R.bool.syncedFolder_light), viewThemeUtils, @@ -223,6 +228,11 @@ class AutoUploadFragment : this.layoutManager = layoutManager adapter = this@AutoUploadFragment.adapter } + + binding.swipeRefreshLayout.setOnRefreshListener { + load(activity) + stopSwipeRefreshAfterTimeout() + } } private fun addMenuProvider(activity: NavigatorActivity) { @@ -258,15 +268,20 @@ class AutoUploadFragment : // region Loading private fun getItemsDisplayedPerFolder(): Int = resources.getInteger(R.integer.media_grid_width) * 2 - @SuppressLint("NotifyDataSetChanged") - private fun load(activity: NavigatorActivity) { + private fun loadIfEmpty(activity: NavigatorActivity) { if (adapter.itemCount > 0) { return } + emptyContent?.showLoadingContent() + + load(activity) + } + + @SuppressLint("NotifyDataSetChanged") + private fun load(activity: NavigatorActivity) { val perFolderMediaItemLimit = getItemsDisplayedPerFolder() val newItemAccountName = activity.account.name - emptyContent?.showLoadingContent() viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) { val currentAccountName = userAccountManager.user.accountName @@ -276,10 +291,20 @@ class AutoUploadFragment : adapter.setItems(items) emptyContent?.showList() openMediaFolderSettingsFromIntent() + binding?.swipeRefreshLayout?.isRefreshing = false } } } + private fun stopSwipeRefreshAfterTimeout() { + swipeRefreshTimeoutJob?.cancel() + swipeRefreshTimeoutJob = viewLifecycleOwner.lifecycleScope.launch { + delay(maxSwipeRefreshInterval) + + binding?.swipeRefreshLayout?.isRefreshing = false + } + } + private fun openMediaFolderSettingsFromIntent() { val section = intentHandler.findMediaFolderSection(adapter) ?: return adapter.getItem(section)?.let(clickHandler::onSyncFolderSettingsClick) diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/adapter/AutoUploadFolderAdapter.kt b/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/adapter/AutoUploadFolderAdapter.kt index 99768250b3e0..2cd675773585 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/adapter/AutoUploadFolderAdapter.kt +++ b/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/adapter/AutoUploadFolderAdapter.kt @@ -9,7 +9,9 @@ package com.owncloud.android.ui.fragment.autoUpload.adapter import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater +import android.view.View import android.view.ViewGroup +import android.widget.Space import androidx.annotation.VisibleForTesting import androidx.core.view.isVisible import androidx.lifecycle.LifecycleCoroutineScope @@ -35,7 +37,6 @@ class AutoUploadFolderAdapter( private val lifecycleScope: LifecycleCoroutineScope, private val context: Context, private val clock: Clock, - gridWidth: Int, private val clickListener: AutoUploadFolderClickListener, private val light: Boolean, private val viewThemeUtils: ViewThemeUtils, @@ -43,7 +44,6 @@ class AutoUploadFolderAdapter( private val connectivityService: ConnectivityService ) : SectionedRecyclerViewAdapter() { - private val gridTotal = gridWidth * GRID_ROWS private val mediaThumbnailGenerationJob = MediaThumbnailGenerationJob(context, viewThemeUtils) private var items: List = emptyList() @@ -131,8 +131,11 @@ class AutoUploadFolderAdapter( } override fun getFooterViewType(section: Int): Int { - val showFooter = isFooterSection(section) && hiddenFolderCount > 0 - val type = if (showFooter) AutoUploadFolderAdapterType.FOOTER else AutoUploadFolderAdapterType.EMPTY + val type = when { + isFooterSection(section) && hiddenFolderCount > 0 -> AutoUploadFolderAdapterType.FOOTER + isEmptyFolder(section) -> AutoUploadFolderAdapterType.EMPTY_FOLDER + else -> AutoUploadFolderAdapterType.EMPTY + } return type.viewType } @@ -148,8 +151,15 @@ class AutoUploadFolderAdapter( AutoUploadFolderAdapterType.FOOTER -> FooterViewHolder(SyncedFoldersFooterBinding.inflate(inflater, parent, false)) - AutoUploadFolderAdapterType.EMPTY -> - EmptyViewHolder(SyncedFoldersEmptyBinding.inflate(inflater, parent, false)) + AutoUploadFolderAdapterType.EMPTY -> EmptyViewHolder(Space(parent.context)) + + AutoUploadFolderAdapterType.EMPTY_FOLDER -> EmptyFolderViewHolder( + SyncedFoldersEmptyBinding.inflate( + inflater, + parent, + false + ) + ) } } @@ -186,6 +196,12 @@ class AutoUploadFolderAdapter( holder.binding.footerText.setOnClickListener { toggleHiddenItemsVisibility() } } + private fun isEmptyFolder(section: Int): Boolean { + val item = visibleItems.getOrNull(section) ?: return false + + return item.filePaths.isNullOrEmpty() + } + override fun onBindViewHolder( holder: SectionedViewHolder, section: Int, @@ -207,8 +223,9 @@ class AutoUploadFolderAdapter( thumbnail.tag = file.hashCode() lifecycleScope.launch { mediaThumbnailGenerationJob.load(file, thumbnail) } - val remainingFileCount = item.numberOfFiles - gridTotal - val showRemainingFileCount = remainingFileCount > 0 && position >= gridTotal - 1 + val displayedFileCount = item.filePaths?.size ?: 0 + val remainingFileCount = item.numberOfFiles - displayedFileCount + val showRemainingFileCount = remainingFileCount > 0 && position == displayedFileCount - 1 counter.text = String.format(Locale.US, "%d", remainingFileCount) counterLayout.isVisible = showRemainingFileCount thumbnailDarkener.isVisible = showRemainingFileCount @@ -218,9 +235,7 @@ class AutoUploadFolderAdapter( private class FooterViewHolder(val binding: SyncedFoldersFooterBinding) : SectionedViewHolder(binding.root) - private class EmptyViewHolder(binding: SyncedFoldersEmptyBinding) : SectionedViewHolder(binding.root) + private class EmptyViewHolder(view: View) : SectionedViewHolder(view) - companion object { - private const val GRID_ROWS = 2 - } + private class EmptyFolderViewHolder(binding: SyncedFoldersEmptyBinding) : SectionedViewHolder(binding.root) } diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/adapter/AutoUploadFolderAdapterType.kt b/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/adapter/AutoUploadFolderAdapterType.kt index c2cd9ad261b1..08c3d81c5501 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/adapter/AutoUploadFolderAdapterType.kt +++ b/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/adapter/AutoUploadFolderAdapterType.kt @@ -10,7 +10,8 @@ enum class AutoUploadFolderAdapterType { ITEM, HEADER, FOOTER, - EMPTY; + EMPTY, + EMPTY_FOLDER; val viewType: Int get() = ordinal diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/data/AutoUploadDisplayItemFactory.kt b/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/data/AutoUploadDisplayItemFactory.kt index c9a2e8be998c..4a75b215c202 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/data/AutoUploadDisplayItemFactory.kt +++ b/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/data/AutoUploadDisplayItemFactory.kt @@ -90,26 +90,33 @@ class AutoUploadDisplayItemFactory( SyncedFolder.NOT_SCANNED_YET ) - fun createAutoUploadFolder(syncedFolder: SyncedFolderParcelable): SyncedFolderDisplayItem = SyncedFolderDisplayItem( - syncedFolder.id, - syncedFolder.localPath, - syncedFolder.remotePath, - syncedFolder.isWifiOnly, - syncedFolder.isChargingOnly, - syncedFolder.isExisting, - syncedFolder.isSubfolderByDate, - syncedFolder.account, - syncedFolder.uploadAction, - syncedFolder.nameCollisionPolicy.serialize(), - syncedFolder.isEnabled, - syncedFolder.enabledTimestampMs, - File(syncedFolder.localPath).name, - syncedFolder.type, - syncedFolder.isHidden, - syncedFolder.subFolderRule, - syncedFolder.isExcludeHidden, - syncedFolder.lastScanTimestampMs - ) + fun createAutoUploadFolder(syncedFolder: SyncedFolderParcelable): SyncedFolderDisplayItem { + val localFolder = File(syncedFolder.localPath) + val files = SyncedFolderUtils.getFileList(localFolder) + + return SyncedFolderDisplayItem( + syncedFolder.id, + syncedFolder.localPath, + syncedFolder.remotePath, + syncedFolder.isWifiOnly, + syncedFolder.isChargingOnly, + syncedFolder.isExisting, + syncedFolder.isSubfolderByDate, + syncedFolder.account, + syncedFolder.uploadAction, + syncedFolder.nameCollisionPolicy.serialize(), + syncedFolder.isEnabled, + syncedFolder.enabledTimestampMs, + getDisplayFilePaths(files), + localFolder.name, + files.size.toLong(), + syncedFolder.type, + syncedFolder.isHidden, + syncedFolder.subFolderRule, + syncedFolder.isExcludeHidden, + syncedFolder.lastScanTimestampMs + ) + } fun updateAutoUploadFolderItem(item: SyncedFolderDisplayItem, syncedFolder: SyncedFolderParcelable) { item.apply { diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/handler/AutoUploadClickHandler.kt b/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/handler/AutoUploadClickHandler.kt index 3444adf92495..c1b5f7fa6ebc 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/handler/AutoUploadClickHandler.kt +++ b/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/handler/AutoUploadClickHandler.kt @@ -81,13 +81,12 @@ class AutoUploadClickHandler( } fun onSaveAutoUploadFolderPreference(syncedFolder: SyncedFolderParcelable) { - val item = if (isNewCustomFolder(syncedFolder)) { + if (isNewCustomFolder(syncedFolder)) { addFolder(syncedFolder) - } else { - updateFolder(syncedFolder) + return } - onSyncStateApplied(item) + updateFolder(syncedFolder) } fun onDeleteAutoUploadFolderPreference(syncedFolder: SyncedFolderParcelable) { @@ -113,24 +112,33 @@ class AutoUploadClickHandler( adapter.getSectionById(syncedFolder.id) } - private fun addFolder(syncedFolder: SyncedFolderParcelable): SyncedFolderDisplayItem { - val item = itemFactory.createAutoUploadFolder(syncedFolder) - persistence.saveOrUpdateAutoUploadFolder(item) - getAdapter().addItem(item) + private fun addFolder(syncedFolder: SyncedFolderParcelable) { + fragment.lifecycleScope.launch(Dispatchers.IO) { + val item = itemFactory.createAutoUploadFolder(syncedFolder) + persistence.saveOrUpdateAutoUploadFolder(item) + + withContext(Dispatchers.Main) { + getAdapter().addItem(item) - return item + onSyncStateApplied(item) + } + } } - private fun updateFolder(syncedFolder: SyncedFolderParcelable): SyncedFolderDisplayItem { + private fun updateFolder(syncedFolder: SyncedFolderParcelable) { val adapter = getAdapter() val section = findSection(adapter, syncedFolder) - val item = adapter.getItem(section) ?: return addFolder(syncedFolder) + val item = adapter.getItem(section) + if (item == null) { + addFolder(syncedFolder) + return + } itemFactory.updateAutoUploadFolderItem(item, syncedFolder) persistence.saveOrUpdateAutoUploadFolder(item) adapter.notifyItemChanged(adapter.getSectionHeaderIndex(section)) - return item + onSyncStateApplied(item) } private fun onSyncStateApplied(item: SyncedFolderDisplayItem) { diff --git a/app/src/main/res/layout/fragment_auto_upload.xml b/app/src/main/res/layout/fragment_auto_upload.xml index 379ed1a766db..604ac89a1627 100644 --- a/app/src/main/res/layout/fragment_auto_upload.xml +++ b/app/src/main/res/layout/fragment_auto_upload.xml @@ -37,17 +37,24 @@ android:layout_height="0dp" android:layout_weight="1"> - + android:layout_height="wrap_content"> + + + + + android:scaleType="centerCrop" + android:visibility="gone" + tools:visibility="visible" /> + android:orientation="horizontal" + android:visibility="gone" + tools:visibility="visible"> diff --git a/app/src/main/res/layout/synced_folders_empty.xml b/app/src/main/res/layout/synced_folders_empty.xml index 7a5c28d4cac2..1e22a65dd620 100644 --- a/app/src/main/res/layout/synced_folders_empty.xml +++ b/app/src/main/res/layout/synced_folders_empty.xml @@ -2,11 +2,16 @@ - - - + ~ SPDX-FileCopyrightText: 2026 Alper Ozturk + ~ SPDX-License-Identifier: AGPL-3.0-or-later + --> + diff --git a/app/src/main/res/layout/upload_warning_card.xml b/app/src/main/res/layout/upload_warning_card.xml index 1e37f351367b..caea1bb71745 100644 --- a/app/src/main/res/layout/upload_warning_card.xml +++ b/app/src/main/res/layout/upload_warning_card.xml @@ -58,18 +58,28 @@ tools:visibility="visible" /> - + android:layout_marginTop="12dp"> + + @@ -77,10 +87,10 @@ android:id="@+id/sync_now_button" style="@style/Widget.MaterialComponents.Button.TextButton" android:layout_width="wrap_content" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:textAllCaps="false" android:text="@string/auto_upload_sync_now_action" /> - + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3ac930b69134..17f43e228bca 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -246,6 +246,7 @@ Delete file from source folder seconds ago LIVE + Folder is empty No files here No recently modified files Files and folders you recently modified will show up here. @@ -532,6 +533,7 @@ 389 KB 5 MB 3 MB + 12 Current (2) Send button Firstname Lastname