Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'org.jetbrains.kotlin.plugin.compose'
}

android {
compileSdk 34
compileSdk 35
namespace "com.example.chattutorial"

defaultConfig {
Expand Down Expand Up @@ -36,9 +37,6 @@ android {
buildFeatures {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion compose_compiler_version
}
packagingOptions {
resources {
excludes += '/META-INF/{AL2.0,LGPL2.1}'
Expand All @@ -47,11 +45,11 @@ android {
}

dependencies {
implementation "io.getstream:stream-chat-android-compose:6.4.3"
implementation "io.getstream:stream-chat-android-offline:6.4.3"
implementation "io.getstream:stream-chat-android-compose:6.12.1"
implementation "io.getstream:stream-chat-android-offline:6.12.1"

implementation(platform("androidx.compose:compose-bom:2024.06.00"))
implementation("androidx.activity:activity-compose:1.7.2")
implementation("androidx.activity:activity-compose:1.10.1")
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-tooling")
implementation("androidx.compose.runtime:runtime")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ class MessagesActivity3 : ComponentActivity() {
onDismiss = {
attachmentsPickerViewModel.changeAttachmentState(false)
attachmentsPickerViewModel.dismissAttachments()
}
},
onTabClick = { _, _ -> /* Not needed for this example */ }
)
}

Expand All @@ -143,7 +144,6 @@ class MessagesActivity3 : ComponentActivity() {
messageOptions = defaultMessageOptionsState(
selectedMessage,
user,
listViewModel.isInThread,
selectedMessageState.ownCapabilities
),
message = selectedMessage,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ class MessagesActivity4 : ComponentActivity() {
onDismiss = {
attachmentsPickerViewModel.changeAttachmentState(false)
attachmentsPickerViewModel.dismissAttachments()
}
},
onTabClick = { _, _ -> /* Not needed for this example */ }
)
}

Expand All @@ -147,7 +148,6 @@ class MessagesActivity4 : ComponentActivity() {
messageOptions = defaultMessageOptionsState(
selectedMessage,
user,
listViewModel.isInThread,
selectedMessageState.ownCapabilities
),
message = selectedMessage,
Expand Down
9 changes: 3 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
buildscript {
ext {
compose_version = '1.5.1'
compose_compiler_version = '1.5.3'
}
repositories {
google()
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.1.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
classpath "com.android.tools.build:gradle:8.8.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Sep 15 12:53:53 KST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists