chore: apply 4.0.0-beta29 source code

AmityCo · Jan 31, 2025 · 3efb6d9 · 3efb6d9
1 parent aefd375
commit 3efb6d9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 32 deletions.
diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle
@@ -12,8 +12,8 @@ buildscript {
         amityMockkVersion = "1.10.0"
         amitySDKJitpackDependency = 'com.github.AmityCo.Amity-Social-Cloud-SDK-Android'
         amitySDKMavenDependency = 'co.amity.android'
-        amityMessagingSdkVersion = '6.47.0'
-        amitySDKDependency = amitySDKMavenDependency
+        amityMessagingSdkVersion = '6.50.0'
+        amitySDKDependency = amitySDKJitpackDependency
         amityRxLifeCycleVersion = '1.1.2-beta01'
         amityJacocoVersion = '0.8.5'
         amityExoplayerVersion = '2.18.5'

diff --git a/...amity/socialcloud/uikit/community/compose/post/composer/poll/AmityPollPostComposerPage.kt b/...amity/socialcloud/uikit/community/compose/post/composer/poll/AmityPollPostComposerPage.kt
@@ -695,8 +695,7 @@ fun AmityPollPostComposerPage(
                         )
                         Icon(
                             Icons.Filled.KeyboardArrowDown,
-                            //painter = painterResource(R.drawable.),
-                            contentDescription = "Select category",
+                            contentDescription = "Select duration",
                             tint = AmityTheme.colors.baseShade2,
                             modifier = modifier
                                 .size(24.dp)
@@ -988,33 +987,6 @@ fun AmityPollDurationOptionContainer(
 
             Spacer(modifier = Modifier.height(40.dp))
 
-//            Row(
-//                verticalAlignment = Alignment.CenterVertically,
-//                modifier = Modifier
-//                    .height(56.dp)
-//                    .fillMaxWidth()
-//                    .clickableWithoutRipple {
-//                        onSelected(-1)
-//                    }
-//                    .padding(start = 16.dp, end = 18.dp),
-//
-//            ) {
-//                Text(
-//                    text = "Custom end date",
-//                    style = AmityTheme.typography.body.copy(
-//                        fontWeight = FontWeight.SemiBold,
-//                    ),
-//                    modifier = modifier
-//                        .weight(1f)
-//                        .testTag("custom_poll_duration")
-//                )
-//                Icon(
-//                    modifier = Modifier.size(18.dp),
-//                    painter = painterResource(R.drawable.amity_ic_chevron_right),
-//                    contentDescription = "pick date time",
-//                    tint = AmityTheme.colors.baseShade1
-//                )
-//            }
 
         }
     }

diff --git a/...om/amity/socialcloud/uikit/community/compose/post/detail/elements/AmityPostPollElement.kt b/...om/amity/socialcloud/uikit/community/compose/post/detail/elements/AmityPostPollElement.kt
@@ -398,7 +398,8 @@ fun AmityPostPollElement(
                             "Voted by 1 participant"
                         }else {
                             val plusSign = if(voteCount > 1000) "+" else ""
-                            "Voted by ${voteCount.readableNumber()}${plusSign} participants".apply {
+                            val displayVoteCount = if(answer.isVotedByUser) (voteCount - 1).readableNumber() else voteCount.readableNumber()
+                            "Voted by ${displayVoteCount}${plusSign} participants".apply {
                                 if (answer.isVotedByUser) {
                                     this.plus(" and you")
                                 }

diff --git a/...com/amity/socialcloud/uikit/community/compose/search/global/AmityGlobalSearchViewModel.kt b/...com/amity/socialcloud/uikit/community/compose/search/global/AmityGlobalSearchViewModel.kt
@@ -5,6 +5,7 @@ import androidx.paging.LoadState
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
 import com.amity.socialcloud.sdk.api.core.AmityCoreClient
+import com.amity.socialcloud.sdk.api.core.user.search.AmityUserSearchMatchType
 import com.amity.socialcloud.sdk.api.core.user.search.AmityUserSortOption
 import com.amity.socialcloud.sdk.api.social.AmitySocialClient
 import com.amity.socialcloud.sdk.helper.core.coroutines.asFlow
@@ -83,6 +84,7 @@ class AmityGlobalSearchViewModel : AmityBaseViewModel() {
         return AmityCoreClient.newUserRepository()
             .searchUsers(_keyword.value)
             .sortBy(AmityUserSortOption.DISPLAYNAME)
+            .matchType(AmityUserSearchMatchType.PARTIAL)
             .build()
             .query()
             .subscribeOn(Schedulers.io())