gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update configuration

Browse Source
This commit is contained in:
Mario Danic 2020-01-03 11:15:10 +01:00
parent b9503a0869
commit a517fb75c9
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle
View File

@ -161,7 +161,7 @@ ext {
work_version = "2.3.0-alpha02" work_version = "2.3.0-alpha02"
koin_version = "2.1.0-alpha-1" koin_version = "2.1.0-alpha-1"
lifecycle_version = "2.2.0-rc01" lifecycle_version = "2.2.0-rc01"
coil_version = "0.9.0" coil_version = "0.9.1"
room_version = "2.2.3" room_version = "2.2.3"
} }
@ -299,7 +299,6 @@ dependencies {
implementation "io.coil-kt:coil:${coil_version}" implementation "io.coil-kt:coil:${coil_version}"
implementation "io.coil-kt:coil-gif:${coil_version}" implementation "io.coil-kt:coil-gif:${coil_version}"
implementation "io.coil-kt:coil-svg:${coil_version}" implementation "io.coil-kt:coil-svg:${coil_version}"
//implementation 'com.github.coil-kt:coil:9769e11f19'
implementation 'com.github.natario1:Autocomplete:v1.1.0' implementation 'com.github.natario1:Autocomplete:v1.1.0'

2
app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
View File

@ -205,7 +205,6 @@ class ConversationItem(
if (conversationDrawable != null) { if (conversationDrawable != null) {
load(conversationDrawable) load(conversationDrawable)
} else { } else {
if (model.name?.contains("marco") == false) {
load(ApiUtils.getUrlForAvatarWithName( load(ApiUtils.getUrlForAvatarWithName(
user.baseUrl, user.baseUrl,
model.name, R.dimen.avatar_size)) model.name, R.dimen.avatar_size))
@ -216,7 +215,6 @@ class ConversationItem(
} }
} }
} }
}
override fun filter(constraint: String): Boolean { override fun filter(constraint: String): Boolean {
return model.displayName != null && Pattern.compile( return model.displayName != null && Pattern.compile(

7
app/src/main/res/layout/rv_item_conversation_with_last_message.xml
View File

@ -36,10 +36,9 @@
<ImageView <ImageView
android:id="@id/dialogAvatar" android:id="@id/dialogAvatar"
android:layout_width="@dimen/small_item_height" android:layout_width="48dp"
android:layout_height="@dimen/small_item_height" android:layout_height="48dp"
android:contentDescription="@null" android:scaleType="centerCrop" />
tools:src="@drawable/ic_call_black_24dp" />
<ImageView <ImageView
android:id="@+id/passwordProtectedRoomImageView" android:id="@+id/passwordProtectedRoomImageView"

3
gradle.properties
View File

@ -29,12 +29,11 @@
# Specifies the JVM arguments used for the daemon process. # Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings. # The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=4096m org.gradle.jvmargs=-Xms1024m -Xmx8000m
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
# org.gradle.parallel=true
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.configureondemand=true org.gradle.configureondemand=true
org.gradle.caching=true org.gradle.caching=true