Skip to content

Commit 8854df8

Browse files
committed
Bump and migrate to 4.28.2
1 parent d8b0a18 commit 8854df8

File tree

5 files changed

+17
-16
lines changed

5 files changed

+17
-16
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ android {
4747
}
4848

4949
dependencies {
50-
def stream_version = "4.25.0"
50+
def stream_version = "4.28.2"
5151
implementation "io.getstream:stream-chat-android-compose:$stream_version-beta"
5252

5353
implementation "androidx.compose.material:material-icons-extended:$compose_version"

app/src/main/java/com/example/chattutorial/MessagesActivity3.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,9 @@ class MessagesActivity3 : AppCompatActivity() {
150150
composerViewModel.performMessageAction(action)
151151
listViewModel.performMessageAction(action)
152152
},
153+
onShowMoreReactionsSelected = {
154+
listViewModel.selectExtendedReactions(selectedMessage)
155+
},
153156
onDismiss = { listViewModel.removeOverlay() },
154157
)
155158
} else if (selectedMessageState is SelectedMessageReactionsState) {
@@ -165,6 +168,9 @@ class MessagesActivity3 : AppCompatActivity() {
165168
composerViewModel.performMessageAction(action)
166169
listViewModel.performMessageAction(action)
167170
},
171+
onShowMoreReactionsSelected = {
172+
listViewModel.selectExtendedReactions(selectedMessage)
173+
},
168174
onDismiss = { listViewModel.removeOverlay() }
169175
)
170176
}

app/src/main/java/com/example/chattutorial/MessagesActivity4.kt

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import androidx.compose.ui.unit.dp
3232
import io.getstream.chat.android.common.state.MessageMode.MessageThread
3333
import io.getstream.chat.android.compose.state.messages.SelectedMessageOptionsState
3434
import io.getstream.chat.android.compose.state.messages.SelectedMessageReactionsState
35-
import io.getstream.chat.android.compose.state.messages.composer.MessageComposerState
3635
import io.getstream.chat.android.compose.ui.components.composer.MessageInput
3736
import io.getstream.chat.android.compose.ui.components.messageoptions.defaultMessageOptionsState
3837
import io.getstream.chat.android.compose.ui.components.selectedmessage.SelectedMessageMenu
@@ -155,6 +154,9 @@ class MessagesActivity4 : AppCompatActivity() {
155154
composerViewModel.performMessageAction(action)
156155
listViewModel.performMessageAction(action)
157156
},
157+
onShowMoreReactionsSelected = {
158+
listViewModel.selectExtendedReactions(selectedMessage)
159+
},
158160
onDismiss = { listViewModel.removeOverlay() },
159161
)
160162
} else if (selectedMessageState is SelectedMessageReactionsState) {
@@ -170,6 +172,9 @@ class MessagesActivity4 : AppCompatActivity() {
170172
composerViewModel.performMessageAction(action)
171173
listViewModel.performMessageAction(action)
172174
},
175+
onShowMoreReactionsSelected = {
176+
listViewModel.selectExtendedReactions(selectedMessage)
177+
},
173178
onDismiss = { listViewModel.removeOverlay() }
174179
)
175180
}
@@ -185,23 +190,13 @@ class MessagesActivity4 : AppCompatActivity() {
185190
.wrapContentHeight(),
186191
viewModel = composerViewModel,
187192
integrations = {}, // 2 - Remove integrations from the composer
188-
input = { // 3 - Add a custom message input
189-
val value by composerViewModel.input.collectAsState()
190-
val selectedAttachments by composerViewModel.selectedAttachments.collectAsState()
191-
val activeAction by composerViewModel.lastActiveAction.collectAsState(null)
192-
val validationErrors by composerViewModel.validationErrors.collectAsState()
193-
193+
input = { inputState ->// 3 - Add a custom message input
194194
MessageInput(
195195
modifier = Modifier
196196
.fillMaxWidth()
197197
.weight(7f)
198198
.padding(start = 8.dp),
199-
messageComposerState = MessageComposerState(
200-
inputValue = value,
201-
attachments = selectedAttachments,
202-
action = activeAction,
203-
validationErrors = validationErrors,
204-
),
199+
messageComposerState = inputState,
205200
onValueChange = { composerViewModel.setMessageInput(it) },
206201
onAttachmentRemoved = { composerViewModel.removeSelectedAttachment(it) },
207202
label = { // 4 - Override the label to show a custom icon and a text

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
mavenCentral()
88
}
99
dependencies {
10-
classpath "com.android.tools.build:gradle:7.0.3"
10+
classpath "com.android.tools.build:gradle:7.1.0"
1111
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31'
1212
}
1313
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Thu Jul 29 12:32:20 CEST 2021
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)