From beecf4fb74b1391a2e0f8bad151a6ea1199b8f4b Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Wed, 18 Nov 2026 11:55:56 +0100 Subject: [PATCH 1/8] style(toolbar): search bar animation Signed-off-by: alperozturk96 --- .../ui/activity/FileDisplayActivity.kt | 10 +- .../android/ui/activity/ToolbarActivity.kt | 8 +- .../animator/SearchBarSideButtonsAnimator.kt | 113 ++++++++++++++++++ .../animator/SearchBarTransition.kt | 90 ++++++++++++++ app/src/main/res/layout/toolbar_standard.xml | 1 + 5 files changed, 216 insertions(+), 6 deletions(-) create mode 100644 app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarSideButtonsAnimator.kt create mode 100644 app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarTransition.kt diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt index d5fef55779d8..407251b5a76e 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt @@ -23,8 +23,10 @@ import android.content.Intent import android.content.IntentFilter import android.content.ServiceConnection import android.content.pm.PackageManager +import android.content.res.ColorStateList import android.content.res.Configuration import android.content.res.Resources +import android.graphics.Color import android.net.Uri import android.os.Build import android.os.Bundle @@ -1203,10 +1205,8 @@ class FileDisplayActivity : searchMenuItem.isVisible = false searchText.setOnClickListener { showSearchView() - searchView?.postDelayed({ - searchView?.isIconified = false - searchView?.requestFocusFromTouch() - }, SEARCH_VIEW_FOCUS_DELAY) + searchView?.isIconified = false + searchView?.postDelayed({ searchView?.requestFocusFromTouch() }, SEARCH_VIEW_FOCUS_DELAY) } drawerMenuItemsToShowHide = listOf(searchMenuItem) @@ -1265,6 +1265,8 @@ class FileDisplayActivity : private fun setupSearchView(view: SearchView) { viewThemeUtils.androidx.themeToolbarSearchView(view) + view.findViewById(androidx.appcompat.R.id.search_plate)?.backgroundTintList = + ColorStateList.valueOf(Color.TRANSPARENT) if (searchQuery.isNotEmpty()) { view.post { restoreSearchQuery() } diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.kt index d52539f636dc..608a540b9745 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.kt @@ -35,6 +35,7 @@ import com.owncloud.android.lib.common.utils.Log_OC import com.owncloud.android.ui.activity.drawer.DrawerActivity import com.owncloud.android.ui.fragment.OCFileListFragment import com.owncloud.android.ui.fragment.SearchType +import com.owncloud.android.ui.navigation.animator.SearchBarTransition import com.owncloud.android.ui.navigation.model.ActionBarStyle import com.owncloud.android.utils.theme.ThemeUtils import com.owncloud.android.utils.theme.ViewThemeUtils @@ -69,6 +70,7 @@ abstract class ToolbarActivity : private var infoBoxMessage: TextView? = null private var actionBarStyle = ActionBarStyle.Plain + private val searchBarTransition by lazy { SearchBarTransition(toolbar, homeSearchToolbar) } private val isToolbarBound: Boolean get() = ::homeSearchToolbar.isInitialized @@ -100,6 +102,7 @@ abstract class ToolbarActivity : private fun isActionBarDisplayed(style: ActionBarStyle): Boolean { if (!isToolbarBound) return false + if (style == ActionBarStyle.Plain && searchBarTransition.isExpanded) return true val (displayed, hidden) = when (style) { ActionBarStyle.Plain -> defaultToolbar to homeSearchToolbar ActionBarStyle.Search -> homeSearchToolbar to defaultToolbar @@ -218,7 +221,7 @@ abstract class ToolbarActivity : fun showSearchView() { if (actionBarStyle != ActionBarStyle.Search) return - switchActionBar(ActionBarStyle.Plain) + searchBarTransition.expand() } fun hideSearchView(chosenFile: OCFile?) { @@ -229,7 +232,8 @@ abstract class ToolbarActivity : private fun switchActionBar(style: ActionBarStyle) { val appBar = appBar ?: return - viewThemeUtils.material.themeToolbar(toolbar) + searchBarTransition.syncWith(style) + if (!searchBarTransition.isExpanded) viewThemeUtils.material.themeToolbar(toolbar) when (style) { ActionBarStyle.Search -> { diff --git a/app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarSideButtonsAnimator.kt b/app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarSideButtonsAnimator.kt new file mode 100644 index 000000000000..e83eee45cd95 --- /dev/null +++ b/app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarSideButtonsAnimator.kt @@ -0,0 +1,113 @@ +/* + * Nextcloud - Android Client + * + * SPDX-FileCopyrightText: 2026 Alper Ozturk + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +package com.owncloud.android.ui.navigation.animator + +import android.animation.ValueAnimator +import android.view.View +import android.view.ViewGroup +import android.view.ViewGroup.MarginLayoutParams +import android.view.animation.AnimationUtils +import androidx.core.animation.doOnEnd +import androidx.core.view.isVisible +import androidx.core.view.marginEnd +import androidx.core.view.marginStart +import androidx.core.view.updateLayoutParams +import com.owncloud.android.R +import kotlin.math.roundToInt + +class SearchBarSideButtonsAnimator(homeToolbar: ViewGroup, private val durationMillis: Long) { + + private val searchCard: View = homeToolbar.findViewById(R.id.home_search_container) + private val leadingButton: View = homeToolbar.findViewById(R.id.menu_button) + private val trailingButton: View = homeToolbar.findViewById(R.id.switch_account_button) + + private val leadingWidth = leadingButton.layoutParams.width + private val leadingIdleMarginStart = leadingButton.marginStart + private val leadingIdleMarginEnd = leadingButton.marginEnd + private val trailingWidth = trailingButton.layoutParams.width + private val trailingIdleMarginEnd = trailingButton.marginEnd + private val cardIdleMarginStart = searchCard.marginStart + private val cardIdleMarginEnd = searchCard.marginEnd + private val expandedMargin = homeToolbar.resources.getDimensionPixelSize(R.dimen.standard_margin) + + private val interpolator = + AnimationUtils.loadInterpolator(homeToolbar.context, android.R.interpolator.fast_out_slow_in) + + private var animator: ValueAnimator? = null + private var progress = VISIBLE_PROGRESS + + fun hide() = animateTo(HIDDEN_PROGRESS) + + fun show() = animateTo(VISIBLE_PROGRESS) + + private fun animateTo(target: Float) { + animator?.cancel() + applyProgress(progress) + setButtonsVisible(true) + + animator = ValueAnimator.ofFloat(progress, target).apply { + duration = durationMillis + interpolator = this@SearchBarSideButtonsAnimator.interpolator + addUpdateListener { + progress = it.animatedValue as Float + applyProgress(progress) + } + doOnEnd { if (progress == HIDDEN_PROGRESS) settleHidden() } + start() + } + } + + private fun applyProgress(fraction: Float) { + val leadingCurrentWidth = lerp(leadingWidth, 0, fraction) + leadingButton.updateLayoutParams { + width = leadingCurrentWidth + marginStart = lerp(leadingIdleMarginStart, expandedMargin, fraction) + marginEnd = lerp(leadingIdleMarginEnd, 0, fraction) + } + leadingButton.scrollX = -(leadingWidth - leadingCurrentWidth) / 2 + + val trailingCurrentWidth = lerp(trailingWidth, 0, fraction) + trailingButton.updateLayoutParams { + width = trailingCurrentWidth + marginEnd = lerp(trailingIdleMarginEnd, expandedMargin, fraction) + } + trailingButton.scrollX = (trailingWidth - trailingCurrentWidth) / 2 + + searchCard.updateLayoutParams { + marginStart = cardIdleMarginStart + marginEnd = lerp(cardIdleMarginEnd, 0, fraction) + } + + val alpha = VISIBLE_ALPHA - fraction + leadingButton.alpha = alpha + trailingButton.alpha = alpha + } + + private fun settleHidden() { + applyProgress(VISIBLE_PROGRESS) + setButtonsVisible(false) + + searchCard.updateLayoutParams { + marginStart = expandedMargin + marginEnd = expandedMargin + } + } + + private fun setButtonsVisible(visible: Boolean) { + leadingButton.isVisible = visible + trailingButton.isVisible = visible + } + + private fun lerp(start: Int, end: Int, fraction: Float): Int = (start + (end - start) * fraction).roundToInt() + + private companion object { + const val VISIBLE_PROGRESS = 0f + const val HIDDEN_PROGRESS = 1f + const val VISIBLE_ALPHA = 1f + } +} diff --git a/app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarTransition.kt b/app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarTransition.kt new file mode 100644 index 000000000000..eec1cb98346a --- /dev/null +++ b/app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarTransition.kt @@ -0,0 +1,90 @@ +/* + * Nextcloud - Android Client + * + * SPDX-FileCopyrightText: 2026 Alper Ozturk + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +package com.owncloud.android.ui.navigation.animator + +import android.transition.Fade +import android.transition.TransitionManager +import android.view.View +import android.view.ViewGroup +import android.view.ViewGroup.LayoutParams.MATCH_PARENT +import android.widget.FrameLayout +import androidx.core.view.isVisible +import com.google.android.material.appbar.MaterialToolbar +import com.owncloud.android.R +import com.owncloud.android.ui.navigation.model.ActionBarStyle + +class SearchBarTransition(private val toolbar: MaterialToolbar, homeToolbar: ViewGroup) { + + private val toolbarParent = toolbar.parent as ViewGroup + private val toolbarIndex = toolbarParent.indexOfChild(toolbar) + private val toolbarLayoutParams = toolbar.layoutParams + + private val searchCard: ViewGroup = homeToolbar.findViewById(R.id.home_search_container) + private val searchCardContent: View = homeToolbar.findViewById(R.id.home_search_content) + + private val durationMillis = homeToolbar.resources.getInteger(android.R.integer.config_mediumAnimTime).toLong() + private val sideButtonsAnimator = SearchBarSideButtonsAnimator(homeToolbar, durationMillis) + private val expandFade = Fade(Fade.IN).setDuration(durationMillis) + private val collapseFade = Fade() + .setDuration(durationMillis) + .excludeTarget(toolbar, true) + .excludeChildren(toolbar, true) + + val isExpanded: Boolean + get() = toolbar.parent === searchCard + + private val isSearchViewExpanded: Boolean + get() = toolbar.findViewById(androidx.appcompat.R.id.search_edit_frame)?.isVisible == true + + fun expand() { + if (isExpanded) return + + TransitionManager.beginDelayedTransition(searchCard, expandFade) + fadeOutSearchCardContent() + toolbarParent.removeView(toolbar) + toolbar.background = null + searchCard.addView(toolbar, FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT)) + + sideButtonsAnimator.hide() + } + + fun syncWith(style: ActionBarStyle) { + when (style) { + ActionBarStyle.Search -> if (!isSearchViewExpanded) collapse() + ActionBarStyle.Plain -> collapse() + } + } + + private fun collapse() { + if (!isExpanded) return + + TransitionManager.beginDelayedTransition(searchCard, collapseFade) + searchCard.removeView(toolbar) + toolbarParent.addView(toolbar, toolbarIndex, toolbarLayoutParams) + searchCardContent.animate().cancel() + searchCardContent.alpha = OPAQUE + searchCardContent.isVisible = true + + sideButtonsAnimator.show() + } + + private fun fadeOutSearchCardContent() { + searchCardContent.animate() + .alpha(TRANSPARENT) + .setDuration(durationMillis) + .withEndAction { + searchCardContent.isVisible = false + searchCardContent.alpha = OPAQUE + } + } + + private companion object { + const val OPAQUE = 1f + const val TRANSPARENT = 0f + } +} diff --git a/app/src/main/res/layout/toolbar_standard.xml b/app/src/main/res/layout/toolbar_standard.xml index 34d6fd1468ea..79b635fe306c 100644 --- a/app/src/main/res/layout/toolbar_standard.xml +++ b/app/src/main/res/layout/toolbar_standard.xml @@ -185,6 +185,7 @@ app:strokeWidth="0dp"> From 73c01be46c502693f8dc3f4546fc889cf08f95cd Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Thu, 19 Nov 2026 08:03:58 +0100 Subject: [PATCH 2/8] remove un-necessary null checks Signed-off-by: alperozturk96 --- .../ui/activity/FileDisplayActivity.kt | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt index 407251b5a76e..1242673d382e 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt @@ -546,12 +546,7 @@ class FileDisplayActivity : return } - val currentStorageManager: FileDataStorageManager = storageManager ?: run { - Log_OC.w(TAG, "storage manager is null, cannot init file") - return - } - - val initialFile = resolveInitialFile(currentStorageManager) ?: run { + val initialFile = resolveInitialFile() ?: run { Log_OC.e(TAG, "Could not retrieve root folder – cannot continue") return } @@ -584,7 +579,7 @@ class FileDisplayActivity : checkForNewDevVersionNecessary(applicationContext) } - private fun resolveInitialFile(storageManager: FileDataStorageManager): OCFile? = + private fun resolveInitialFile(): OCFile? = file?.let { findStoredFile(it, storageManager) } ?: storageManager.getFileByPath(OCFile.ROOT_PATH) private fun findStoredFile(file: OCFile, storageManager: FileDataStorageManager): OCFile? { @@ -889,7 +884,7 @@ class FileDisplayActivity : return } - val fileStorageManager = storageManager ?: FileDataStorageManager(user, contentResolver) + val fileStorageManager = storageManager val weakContext = WeakReference(this) val task = FetchRemoteFileTask(user, fileId, fileStorageManager, lifecycleScope, capability, weakContext) task.run(showFile = { (fetchedFile, message) -> @@ -901,7 +896,7 @@ class FileDisplayActivity : private fun openFileByPath(user: User, filePath: String) { setUser(user) - val fileStorageManager = storageManager ?: FileDataStorageManager(user, contentResolver) + val fileStorageManager = storageManager lifecycleScope.launch { val client = clientRepository.getOwncloudClient() ?: run { onFileRequestError(null) @@ -1572,7 +1567,7 @@ class FileDisplayActivity : val syncFolderRemotePath = intent.getStringExtra(FileSyncAdapter.EXTRA_FOLDER_PATH) val syncResultId = intent.getStringExtra(FileSyncAdapter.EXTRA_RESULT) val syncResult = DataHolderUtil.getInstance().retrieve(syncResultId) - val isSameAccount = isCurrentAccount(accountName) && storageManager != null + val isSameAccount = isCurrentAccount(accountName) val fileList = listOfFilesFragment if (isSameAccount) { @@ -1962,7 +1957,6 @@ class FileDisplayActivity : private fun requestDownloadOfWaitingPreview() { val previousFile = waitingToPreview ?: return - if (storageManager == null) return val refreshedFile = storageManager.getFileById(previousFile.fileId) waitingToPreview = refreshedFile @@ -2177,8 +2171,8 @@ class FileDisplayActivity : connectivityService.isNetworkAndServerAvailable { isAvailable -> when { - isAvailable -> fileOperationsHelper?.removeFiles(filesToRemove, onlyLocalCopy, true) - onlyLocalCopy -> fileOperationsHelper?.removeFiles(filesToRemove, true, true) + isAvailable -> fileOperationsHelper.removeFiles(filesToRemove, onlyLocalCopy, true) + onlyLocalCopy -> fileOperationsHelper.removeFiles(filesToRemove, true, true) else -> filesToRemove.forEach { fileDataStorageManager.addRemoveFileOfflineOperation(it) } } onFilesRemoved() From cdcaa5c380d99ed2b63165e58acd47c0becd029b Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Thu, 19 Nov 2026 08:08:39 +0100 Subject: [PATCH 3/8] add comment for search_plate Signed-off-by: alperozturk96 --- .../com/owncloud/android/ui/activity/FileDisplayActivity.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt index 1242673d382e..60ee0392e010 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt @@ -1260,6 +1260,8 @@ class FileDisplayActivity : private fun setupSearchView(view: SearchView) { viewThemeUtils.androidx.themeToolbarSearchView(view) + + // when search expanded makes transparent of the background view.findViewById(androidx.appcompat.R.id.search_plate)?.backgroundTintList = ColorStateList.valueOf(Color.TRANSPARENT) From d6f357812f46701fa552648765ea997e75524b6f Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Thu, 19 Nov 2026 08:30:11 +0100 Subject: [PATCH 4/8] add comment for other clearification and remove un-necesarry code Signed-off-by: alperozturk96 --- .../java/com/owncloud/android/ui/activity/ToolbarActivity.kt | 3 +++ .../android/ui/navigation/animator/SearchBarTransition.kt | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.kt index 608a540b9745..8abc0ab2ce69 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.kt @@ -102,7 +102,10 @@ abstract class ToolbarActivity : private fun isActionBarDisplayed(style: ActionBarStyle): Boolean { if (!isToolbarBound) return false + + // needed to prevent plain toolbar returning from unified share if (style == ActionBarStyle.Plain && searchBarTransition.isExpanded) return true + val (displayed, hidden) = when (style) { ActionBarStyle.Plain -> defaultToolbar to homeSearchToolbar ActionBarStyle.Search -> homeSearchToolbar to defaultToolbar diff --git a/app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarTransition.kt b/app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarTransition.kt index eec1cb98346a..513acfb0515e 100644 --- a/app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarTransition.kt +++ b/app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarTransition.kt @@ -33,10 +33,10 @@ class SearchBarTransition(private val toolbar: MaterialToolbar, homeToolbar: Vie private val collapseFade = Fade() .setDuration(durationMillis) .excludeTarget(toolbar, true) - .excludeChildren(toolbar, true) + // if parent fully search card means it's already expanded val isExpanded: Boolean - get() = toolbar.parent === searchCard + get() = (toolbar.parent === searchCard) private val isSearchViewExpanded: Boolean get() = toolbar.findViewById(androidx.appcompat.R.id.search_edit_frame)?.isVisible == true From ef460ba5dfc1a29b9c904b9189f08a185954cc79 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Thu, 19 Nov 2026 08:42:28 +0100 Subject: [PATCH 5/8] add comment other operations Signed-off-by: alperozturk96 --- .../ui/navigation/animator/SearchBarTransition.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarTransition.kt b/app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarTransition.kt index 513acfb0515e..89b8c6d684f3 100644 --- a/app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarTransition.kt +++ b/app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarTransition.kt @@ -38,7 +38,7 @@ class SearchBarTransition(private val toolbar: MaterialToolbar, homeToolbar: Vie val isExpanded: Boolean get() = (toolbar.parent === searchCard) - private val isSearchViewExpanded: Boolean + private val isSearchOpen: Boolean get() = toolbar.findViewById(androidx.appcompat.R.id.search_edit_frame)?.isVisible == true fun expand() { @@ -46,6 +46,8 @@ class SearchBarTransition(private val toolbar: MaterialToolbar, homeToolbar: Vie TransitionManager.beginDelayedTransition(searchCard, expandFade) fadeOutSearchCardContent() + + // move the toolbar with its SearchView into the card, transparent so the card shows through toolbarParent.removeView(toolbar) toolbar.background = null searchCard.addView(toolbar, FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT)) @@ -55,7 +57,9 @@ class SearchBarTransition(private val toolbar: MaterialToolbar, homeToolbar: Vie fun syncWith(style: ActionBarStyle) { when (style) { - ActionBarStyle.Search -> if (!isSearchViewExpanded) collapse() + // search not opened thus we need to collapse to see leading and trailing icon + ActionBarStyle.Search -> if (!isSearchOpen) collapse() + ActionBarStyle.Plain -> collapse() } } @@ -64,6 +68,8 @@ class SearchBarTransition(private val toolbar: MaterialToolbar, homeToolbar: Vie if (!isExpanded) return TransitionManager.beginDelayedTransition(searchCard, collapseFade) + + // do opposite of expand searchCard.removeView(toolbar) toolbarParent.addView(toolbar, toolbarIndex, toolbarLayoutParams) searchCardContent.animate().cancel() From 576c02dd7f145bc833beb207426499d816e38d23 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Thu, 19 Nov 2026 09:05:05 +0100 Subject: [PATCH 6/8] add comment other operations Signed-off-by: alperozturk96 --- .../animator/SearchBarSideButtonsAnimator.kt | 61 ++++++++++++------- 1 file changed, 40 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarSideButtonsAnimator.kt b/app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarSideButtonsAnimator.kt index e83eee45cd95..6ee772b9b270 100644 --- a/app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarSideButtonsAnimator.kt +++ b/app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarSideButtonsAnimator.kt @@ -39,48 +39,64 @@ class SearchBarSideButtonsAnimator(homeToolbar: ViewGroup, private val durationM AnimationUtils.loadInterpolator(homeToolbar.context, android.R.interpolator.fast_out_slow_in) private var animator: ValueAnimator? = null - private var progress = VISIBLE_PROGRESS - - fun hide() = animateTo(HIDDEN_PROGRESS) - - fun show() = animateTo(VISIBLE_PROGRESS) + private var hiddenFraction = SHOWN + + fun hide() = animateTo(HIDDEN) + + fun show() = animateTo(SHOWN) + + // Animates hiddenFraction from its current value to target over durationMillis. + // SHOWN (0f) = idle home bar, HIDDEN (1f) = hamburger and avatar completely gone (search open). + // Example for hide(), avatar width 48 -> 0 (real timings follow the fast_out_slow_in easing): + // + // | time | hiddenFraction | avatar width | avatar alpha | + // |--------|----------------|--------------|--------------| + // | 0 ms | 0.0 (0%) | 48 | 1.0 | + // | 100 ms | 0.25 (25%) | 36 | 0.75 | + // | 200 ms | 0.5 (50%) | 24 | 0.5 | + // | 300 ms | 0.75 (75%) | 12 | 0.25 | + // | 400 ms | 1.0 (100%) | 0 | 0.0 | + // + // show() runs the same table backwards (1f -> 0f), so everything returns to its idle size. private fun animateTo(target: Float) { animator?.cancel() - applyProgress(progress) + applyHiddenFraction(hiddenFraction) setButtonsVisible(true) - animator = ValueAnimator.ofFloat(progress, target).apply { + animator = ValueAnimator.ofFloat(hiddenFraction, target).apply { duration = durationMillis interpolator = this@SearchBarSideButtonsAnimator.interpolator addUpdateListener { - progress = it.animatedValue as Float - applyProgress(progress) + + // Called on every screen frame so that we can apply transition for each frame + hiddenFraction = it.animatedValue as Float + applyHiddenFraction(hiddenFraction) } - doOnEnd { if (progress == HIDDEN_PROGRESS) settleHidden() } + doOnEnd { if (hiddenFraction == HIDDEN) settleHidden() } start() } } - private fun applyProgress(fraction: Float) { - val leadingCurrentWidth = lerp(leadingWidth, 0, fraction) + private fun applyHiddenFraction(fraction: Float) { + val leadingCurrentWidth = interpolate(leadingWidth, 0, fraction) leadingButton.updateLayoutParams { width = leadingCurrentWidth - marginStart = lerp(leadingIdleMarginStart, expandedMargin, fraction) - marginEnd = lerp(leadingIdleMarginEnd, 0, fraction) + marginStart = interpolate(leadingIdleMarginStart, expandedMargin, fraction) + marginEnd = interpolate(leadingIdleMarginEnd, 0, fraction) } leadingButton.scrollX = -(leadingWidth - leadingCurrentWidth) / 2 - val trailingCurrentWidth = lerp(trailingWidth, 0, fraction) + val trailingCurrentWidth = interpolate(trailingWidth, 0, fraction) trailingButton.updateLayoutParams { width = trailingCurrentWidth - marginEnd = lerp(trailingIdleMarginEnd, expandedMargin, fraction) + marginEnd = interpolate(trailingIdleMarginEnd, expandedMargin, fraction) } trailingButton.scrollX = (trailingWidth - trailingCurrentWidth) / 2 searchCard.updateLayoutParams { marginStart = cardIdleMarginStart - marginEnd = lerp(cardIdleMarginEnd, 0, fraction) + marginEnd = interpolate(cardIdleMarginEnd, 0, fraction) } val alpha = VISIBLE_ALPHA - fraction @@ -89,7 +105,7 @@ class SearchBarSideButtonsAnimator(homeToolbar: ViewGroup, private val durationM } private fun settleHidden() { - applyProgress(VISIBLE_PROGRESS) + applyHiddenFraction(SHOWN) setButtonsVisible(false) searchCard.updateLayoutParams { @@ -103,11 +119,14 @@ class SearchBarSideButtonsAnimator(homeToolbar: ViewGroup, private val durationM trailingButton.isVisible = visible } - private fun lerp(start: Int, end: Int, fraction: Float): Int = (start + (end - start) * fraction).roundToInt() + // Value partway between start and end: fraction 0f gives start, 1f gives end, 0.25f is a quarter of the way, + // e.g. interpolate(48, 0, 0.25f) = 48 + (0 - 48) * 0.25 = 36 + private fun interpolate(start: Int, end: Int, fraction: Float): Int = + (start + (end - start) * fraction).roundToInt() private companion object { - const val VISIBLE_PROGRESS = 0f - const val HIDDEN_PROGRESS = 1f + const val SHOWN = 0f + const val HIDDEN = 1f const val VISIBLE_ALPHA = 1f } } From 292296f51c09d06d82733544c9db944c4be048e7 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Thu, 19 Nov 2026 09:22:40 +0100 Subject: [PATCH 7/8] prevent flickering in recommended files Signed-off-by: alperozturk96 --- .../android/ui/adapter/filelist/OCFileListAdapter.kt | 11 ++++------- .../ui/adapter/filelist/data/OCFileListDiffer.kt | 2 +- .../adapter/filelist/header/OCFileListHeaderBinder.kt | 8 ++++++-- 3 files changed, 11 insertions(+), 10 deletions(-) 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/OCFileListAdapter.kt index 93702cac72df..6401d8943b96 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/OCFileListAdapter.kt @@ -104,7 +104,7 @@ class OCFileListAdapter( private val allFiles = mutableListOf() private val recommendedFiles = mutableListOf() - private var recommendedFilesAdapter: RecommendedFilesAdapter? = null + private val recommendedFilesAdapter = RecommendedFilesAdapter(this, recommendedFiles) private val popupDateFormat = SimpleDateFormat(DateFormatPattern.FullMonthWithYear.pattern, Locale.getDefault()) private val footerId = UUID.randomUUID().leastSignificantBits @@ -568,6 +568,7 @@ class OCFileListAdapter( fun updateRecommendedFiles(value: List) { recommendedFiles.clear() recommendedFiles.addAll(value) + recommendedFilesAdapter.notifyDataSetChanged() differ.syncHeaderState() notifyDataSetChanged() } @@ -604,11 +605,7 @@ class OCFileListAdapter( } private fun bindHeader(holder: OCFileListHeaderViewHolder) { - val visibleRecommendedFilesAdapter = if (shouldShowRecommendedFiles()) { - RecommendedFilesAdapter(this, recommendedFiles).also { recommendedFilesAdapter = it } - } else { - null - } + val visibleRecommendedFilesAdapter = recommendedFilesAdapter.takeIf { shouldShowRecommendedFiles() } headerBinder.bind(holder, currentDirectory, visibleRecommendedFilesAdapter) } @@ -658,7 +655,7 @@ class OCFileListAdapter( recommendedFiles.isNotEmpty() && currentDirectory?.isRootDirectory == true private fun visibleRecommendedFilesAdapterFor(file: OCFile): RecommendedFilesAdapter? = - recommendedFilesAdapter?.takeIf { shouldShowRecommendedFiles() && file.isRecommendedFile } + recommendedFilesAdapter.takeIf { shouldShowRecommendedFiles() && file.isRecommendedFile } private fun notifyItemChangedIfPresent(file: OCFile, payload: Any? = null) { val position = getItemPosition(file) 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/OCFileListDiffer.kt index d687123face8..34ac41d0f07d 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/OCFileListDiffer.kt @@ -119,7 +119,7 @@ class OCFileListDiffer( if (shouldShowHeader == isHeaderDisplayed) { if (shouldShowHeader) { - adapter.notifyItemChanged(0) + adapter.notifyItemChanged(0, REBIND_PAYLOAD) } return } 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/OCFileListHeaderBinder.kt index 4bc23323f3b5..6816551034eb 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/OCFileListHeaderBinder.kt @@ -86,8 +86,12 @@ internal class OCFileListHeaderBinder( } binding.recommendedFilesRecyclerView.run { - layoutManager = LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false) - adapter = recommendedFilesAdapter + if (layoutManager == null) { + layoutManager = LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false) + } + if (adapter !== recommendedFilesAdapter) { + adapter = recommendedFilesAdapter + } } } From bf64ff71d3d849025beeb588b5ce4693b6822978 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Thu, 19 Nov 2026 09:26:20 +0100 Subject: [PATCH 8/8] fix codacy Signed-off-by: alperozturk96 --- .../ui/navigation/animator/SearchBarSideButtonsAnimator.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarSideButtonsAnimator.kt b/app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarSideButtonsAnimator.kt index 6ee772b9b270..b059fda9cc9b 100644 --- a/app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarSideButtonsAnimator.kt +++ b/app/src/main/java/com/owncloud/android/ui/navigation/animator/SearchBarSideButtonsAnimator.kt @@ -68,7 +68,6 @@ class SearchBarSideButtonsAnimator(homeToolbar: ViewGroup, private val durationM duration = durationMillis interpolator = this@SearchBarSideButtonsAnimator.interpolator addUpdateListener { - // Called on every screen frame so that we can apply transition for each frame hiddenFraction = it.animatedValue as Float applyHiddenFraction(hiddenFraction)