From ff038ebd168231354cc96f57a9b18cc08f34bc98 Mon Sep 17 00:00:00 2001 From: Brandon McAnsh Date: Wed, 7 Aug 2024 11:32:51 -0400 Subject: [PATCH 1/2] build: prep next development cycle Signed-off-by: Brandon McAnsh --- buildSrc/src/main/java/Dependencies.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index d11149e3..65c1b8d7 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -13,10 +13,10 @@ object Packaging { private const val majorVersion = 2 private const val minorVersion = 1 private const val patchVersion = 7 - const val buildNumber = 411 + private const val buildNumber = 412 - val versionCode = buildNumber - val versionName = "$majorVersion.$minorVersion.$patchVersion" + const val versionCode = buildNumber + const val versionName = "$majorVersion.$minorVersion.$patchVersion" } object Versions { From ee811e2b57519bb7bd75b62d21572da181068eee Mon Sep 17 00:00:00 2001 From: Brandon McAnsh Date: Wed, 7 Aug 2024 11:38:21 -0400 Subject: [PATCH 2/2] chore: put chat chat node avatars behind tip chat beta flag Signed-off-by: Brandon McAnsh --- .../java/com/getcode/ui/components/chat/ChatNode.kt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/getcode/ui/components/chat/ChatNode.kt b/app/src/main/java/com/getcode/ui/components/chat/ChatNode.kt index 278764f1..ee9f79a6 100644 --- a/app/src/main/java/com/getcode/ui/components/chat/ChatNode.kt +++ b/app/src/main/java/com/getcode/ui/components/chat/ChatNode.kt @@ -26,6 +26,7 @@ import coil3.compose.AsyncImage import coil3.compose.LocalPlatformContext import coil3.request.ImageRequest import coil3.request.error +import com.getcode.LocalBetaFlags import com.getcode.R import com.getcode.model.chat.Chat import com.getcode.model.chat.MessageContent @@ -49,6 +50,8 @@ fun ChatNode( chat: Chat, onClick: () -> Unit, ) { + val betaFlags = LocalBetaFlags.current + Row( modifier = modifier .rememberedClickable { onClick() } @@ -59,11 +62,13 @@ fun ChatNode( horizontalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x3), verticalAlignment = Alignment.CenterVertically ) { - val imageModifier = Modifier - .size(CodeTheme.dimens.staticGrid.x10) - .clip(CircleShape) + if (betaFlags.tipsChatEnabled) { + val imageModifier = Modifier + .size(CodeTheme.dimens.staticGrid.x10) + .clip(CircleShape) - UserAvatar(modifier = imageModifier, data = chat.imageData) + UserAvatar(modifier = imageModifier, data = chat.imageData) + } Column( modifier = Modifier.weight(1f),