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

Merge pull request #1154 from nextcloud/coil-1.2.0

Browse Source 
Bump coil to 1.2.0
This commit is contained in:
Andy Scherzinger 2021-04-27 11:34:02 +02:00 committed by GitHub
commit 10ff33333f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -126,7 +126,7 @@ android {
} }
ext { ext {
coilKtVersion = "0.9.1" coilKtVersion = "1.2.0"
daggerVersion = "2.34.1" daggerVersion = "2.34.1"
powermockVersion = "2.0.9" powermockVersion = "2.0.9"
workVersion = "2.3.0" workVersion = "2.3.0"
@ -225,8 +225,8 @@ dependencies {
implementation 'com.github.mario.fresco:imagepipeline-okhttp3:111' implementation 'com.github.mario.fresco:imagepipeline-okhttp3:111'
implementation group: 'joda-time', name: 'joda-time', version: '2.10.3' implementation group: 'joda-time', name: 'joda-time', version: '2.10.3'
implementation "io.coil-kt:coil:${coilKtVersion}" implementation "io.coil-kt:coil:${coilKtVersion}"
implementation("io.coil-kt:coil-gif:${coilKtVersion}") implementation "io.coil-kt:coil-gif:${coilKtVersion}"
implementation("io.coil-kt:coil-svg:${coilKtVersion}") implementation "io.coil-kt:coil-svg:${coilKtVersion}"
implementation 'com.github.natario1:Autocomplete:v1.1.0' implementation 'com.github.natario1:Autocomplete:v1.1.0'
implementation 'com.github.cotechde.hwsecurity:hwsecurity-fido:2.4.5' implementation 'com.github.cotechde.hwsecurity:hwsecurity-fido:2.4.5'

2
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt
View File

@ -38,7 +38,7 @@ import androidx.emoji.widget.EmojiTextView
import autodagger.AutoInjector import autodagger.AutoInjector
import butterknife.BindView import butterknife.BindView
import butterknife.ButterKnife import butterknife.ButterKnife
import coil.api.load import coil.load
import coil.transform.CircleCropTransformation import coil.transform.CircleCropTransformation
import com.amulyakhare.textdrawable.TextDrawable import com.amulyakhare.textdrawable.TextDrawable
import com.facebook.drawee.view.SimpleDraweeView import com.facebook.drawee.view.SimpleDraweeView

2
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt
View File

@ -35,7 +35,7 @@ import androidx.emoji.widget.EmojiTextView
import autodagger.AutoInjector import autodagger.AutoInjector
import butterknife.BindView import butterknife.BindView
import butterknife.ButterKnife import butterknife.ButterKnife
import coil.api.load import coil.load
import coil.transform.CircleCropTransformation import coil.transform.CircleCropTransformation
import com.google.android.flexbox.FlexboxLayout import com.google.android.flexbox.FlexboxLayout
import com.nextcloud.talk.R import com.nextcloud.talk.R

17
app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt
View File

@ -110,7 +110,6 @@ class NextcloudTalkApplication : MultiDexApplication(), LifecycleObserver {
} catch (e: UnsatisfiedLinkError) { } catch (e: UnsatisfiedLinkError) {
Log.w(TAG, e) Log.w(TAG, e)
} }
} }
//endregion //endregion
@ -132,7 +131,7 @@ class NextcloudTalkApplication : MultiDexApplication(), LifecycleObserver {
componentApplication.inject(this) componentApplication.inject(this)
Coil.setDefaultImageLoader(::buildDefaultImageLoader) Coil.setImageLoader(buildDefaultImageLoader())
setAppTheme(appPreferences.theme) setAppTheme(appPreferences.theme)
super.onCreate() super.onCreate()
@ -196,19 +195,19 @@ class NextcloudTalkApplication : MultiDexApplication(), LifecycleObserver {
} }
private fun buildDefaultImageLoader(): ImageLoader { private fun buildDefaultImageLoader(): ImageLoader {
return ImageLoader(applicationContext) { return ImageLoader.Builder(applicationContext)
availableMemoryPercentage(0.5) // Use 50% of the application's available memory. .availableMemoryPercentage(0.5) // Use 50% of the application's available memory.
crossfade(true) // Show a short crossfade when loading images from network or disk into an ImageView. .crossfade(true) // Show a short crossfade when loading images from network or disk into an ImageView.
componentRegistry { .componentRegistry {
if (SDK_INT >= P) { if (SDK_INT >= P) {
add(ImageDecoderDecoder()) add(ImageDecoderDecoder(applicationContext))
} else { } else {
add(GifDecoder()) add(GifDecoder())
} }
add(SvgDecoder(applicationContext)) add(SvgDecoder(applicationContext))
} }
okHttpClient(okHttpClient) .okHttpClient(okHttpClient)
} .build()
} }
companion object { companion object {
private val TAG = NextcloudTalkApplication::class.java.simpleName private val TAG = NextcloudTalkApplication::class.java.simpleName

2
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View File

@ -54,7 +54,7 @@ import androidx.work.WorkManager
import autodagger.AutoInjector import autodagger.AutoInjector
import butterknife.BindView import butterknife.BindView
import butterknife.OnClick import butterknife.OnClick
import coil.api.load import coil.load
import coil.transform.CircleCropTransformation import coil.transform.CircleCropTransformation
import com.bluelinelabs.conductor.RouterTransaction import com.bluelinelabs.conductor.RouterTransaction
import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler