Mastodon/SubwayTooter-Android-App
1
0
Fork 0
mirror of https://github.com/tateisu/SubwayTooter synced 2025-02-01 11:26:48 +01:00
Code Issues Releases Wiki Activity

kotlinx-coroutines-play-services をnoFcmから除去

Browse Source
This commit is contained in:
tateisu 2023-02-10 13:57:07 +09:00
parent b2bee4b940
commit 4798d22858
3 changed files with 1 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/build.gradle
View File

@ -168,6 +168,7 @@ dependencies {
implementation fileTree(include: ["*.aar"], dir: "src/main/libs")
fcmImplementation "com.google.firebase:firebase-messaging:23.1.1"
fcmImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$kotlinxCoroutinesVersion"
// implementation "org.conscrypt:conscrypt-android:$conscryptVersion"
api "org.conscrypt:conscrypt-android:$conscryptVersion"
@ -175,11 +176,7 @@ dependencies {
implementation "jp.wasabeef:glide-transformations:4.3.0"
def apng4AndroidVersion = "2.24.0"
implementation "com.github.penfeizhou.android.animation:awebp:$apng4AndroidVersion"
implementation "com.github.penfeizhou.android.animation:apng:$apng4AndroidVersion"
implementation "com.github.penfeizhou.android.animation:gif:$apng4AndroidVersion"
implementation "com.github.penfeizhou.android.animation:glide-plugin:$apng4AndroidVersion"
kapt "androidx.annotation:annotation:$androidxAnnotationVersion"

59
app/src/main/java/jp/juggler/subwaytooter/MyAppGlideModule.kt
View File

@ -144,65 +144,6 @@ class MyAppGlideModule : AppGlideModule() {
.register(APNGDecoder::class.java, APNGDrawable::class.java, ApngTranscoder())
.register(SVG::class.java, PictureDrawable::class.java, SvgDrawableTranscoder())
.append(InputStream::class.java, SVG::class.java, SvgDecoder())
///////
// Animated WebP
// // We should put our decoder before the build-in decoders,
// // because the Downsampler will consume arbitrary data and make the inputstream corrupt
// // on some devices
// val resources: Resources = context.resources
// val bitmapPool: BitmapPool = glide.bitmapPool
// val arrayPool: ArrayPool = glide.arrayPool
// /* static webp decoders */
// val webpDownsampler = WebpDownsampler(
// registry.imageHeaderParsers,
// resources.getDisplayMetrics(), bitmapPool, arrayPool
// )
// val bitmapDecoder = AnimatedWebpBitmapDecoder(arrayPool, bitmapPool)
// val byteBufferBitmapDecoder = ByteBufferBitmapWebpDecoder(webpDownsampler)
// val streamBitmapDecoder = StreamBitmapWebpDecoder(webpDownsampler, arrayPool)
// /* animate webp decoders */
// val byteBufferWebpDecoder = ByteBufferWebpDecoder(context, arrayPool, bitmapPool)
// registry /* Bitmaps for static webp images */
// .prepend(
// Registry.BUCKET_BITMAP,
// ByteBuffer::class.java,
// Bitmap::class.java, byteBufferBitmapDecoder
// )
// .prepend(
// Registry.BUCKET_BITMAP,
// InputStream::class.java,
// Bitmap::class.java, streamBitmapDecoder
// ) /* BitmapDrawables for static webp images */
// .prepend(
// Registry.BUCKET_BITMAP_DRAWABLE,
// ByteBuffer::class.java,
// BitmapDrawable::class.java,
// BitmapDrawableDecoder(resources, byteBufferBitmapDecoder)
// )
// .prepend(
// Registry.BUCKET_BITMAP_DRAWABLE,
// InputStream::class.java,
// BitmapDrawable::class.java,
// BitmapDrawableDecoder(resources, streamBitmapDecoder)
// ) /* Bitmaps for animated webp images*/
// .prepend(
// Registry.BUCKET_BITMAP,
// ByteBuffer::class.java,
// Bitmap::class.java, ByteBufferAnimatedBitmapDecoder(bitmapDecoder)
// )
// .prepend(
// Registry.BUCKET_BITMAP,
// InputStream::class.java,
// Bitmap::class.java, StreamAnimatedBitmapDecoder(bitmapDecoder)
// ) /* Animated webp images */
// .prepend(ByteBuffer::class.java, WebpDrawable::class.java, byteBufferWebpDecoder)
// .prepend(
// InputStream::class.java,
// WebpDrawable::class.java, StreamWebpDecoder(byteBufferWebpDecoder, arrayPool)
// )
// .prepend(WebpDrawable::class.java, WebpDrawableEncoder())
}
override fun applyOptions(context: Context, builder: GlideBuilder) {

1
base/build.gradle
View File

@ -88,7 +88,6 @@ dependencies {
api "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinxCoroutinesVersion"
api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion"
api "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$kotlinxCoroutinesVersion"
api "org.jetbrains.kotlinx:kotlinx-datetime:0.4.0"
api "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
api "ru.gildor.coroutines:kotlin-coroutines-okhttp:1.0"