From 6229ebf6f44a143cf8ab458529b0a41621cb5d4f Mon Sep 17 00:00:00 2001
From: Avently <7953703+avently@users.noreply.github.com>
Date: Thu, 21 Nov 2024 17:39:16 +0700
Subject: [PATCH] changes in AppBar

---
 .../simplex/common/views/helpers/AppBarTitle.kt     | 13 +++++++++----
 .../common/views/helpers/CollapsingAppBar.kt        |  1 +
 .../common/views/helpers/DefaultTopAppBar.kt        |  3 ++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/AppBarTitle.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/AppBarTitle.kt
index 441fde481f..afb557cc78 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/AppBarTitle.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/AppBarTitle.kt
@@ -24,10 +24,14 @@ fun AppBarTitle(
   bottomPadding: Dp = DEFAULT_PADDING * 1.5f + 8.dp,
   enableAlphaChanges: Boolean = true
 ) {
-  val handler = if (enableAlphaChanges) LocalAppBarHandler.current else null
-  val connection = handler?.connection
+  val handler = LocalAppBarHandler.current
+  val connection = if (enableAlphaChanges) handler?.connection else null
   LaunchedEffect(title) {
-    handler?.title?.value = title
+    if (enableAlphaChanges) {
+      handler?.title?.value = title
+    } else {
+      handler?.connection?.scrollTrackingEnabled = false
+    }
   }
   val theme = CurrentColors.collectAsState()
   val titleColor = MaterialTheme.appColors.title
@@ -60,7 +64,8 @@ fun AppBarTitle(
 }
 
 private fun bottomTitleAlpha(connection: CollapsingAppBarNestedScrollConnection?) =
-  if ((connection?.appBarOffset ?: 0f).absoluteValue < AppBarHandler.appBarMaxHeightPx / 3) 1f
+  if (connection?.scrollTrackingEnabled == false) 1f
+  else if ((connection?.appBarOffset ?: 0f).absoluteValue < AppBarHandler.appBarMaxHeightPx / 3) 1f
   else ((AppBarHandler.appBarMaxHeightPx) + (connection?.appBarOffset ?: 0f) / 1.5f).coerceAtLeast(0f) / AppBarHandler.appBarMaxHeightPx
 
 @Composable
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/CollapsingAppBar.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/CollapsingAppBar.kt
index 50942169b3..ad6611b9d9 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/CollapsingAppBar.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/CollapsingAppBar.kt
@@ -84,6 +84,7 @@ class AppBarHandler(
 }
 
 class CollapsingAppBarNestedScrollConnection(): NestedScrollConnection {
+  var scrollTrackingEnabled = true
   var appBarOffset: Float by mutableFloatStateOf(0f)
 
   override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/DefaultTopAppBar.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/DefaultTopAppBar.kt
index cf0c5f7e96..4bf20d2128 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/DefaultTopAppBar.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/DefaultTopAppBar.kt
@@ -258,7 +258,8 @@ private fun AppBarCenterAligned(
 }
 
 private fun topTitleAlpha(text: Boolean, connection: CollapsingAppBarNestedScrollConnection, alpha: Float = appPrefs.inAppBarsAlpha.get()) =
-  if (connection.appBarOffset.absoluteValue < AppBarHandler.appBarMaxHeightPx / 3) 0f
+  if (!connection.scrollTrackingEnabled) 0f
+  else if (connection.appBarOffset.absoluteValue < AppBarHandler.appBarMaxHeightPx / 3) 0f
   else ((-connection.appBarOffset * 1.5f) / (AppBarHandler.appBarMaxHeightPx)).coerceIn(0f, if (text) 1f else alpha)
 
 val AppBarHeight = 56.dp