- Android Studio 2020.3.1 Patch 4。

- Android Gradle plugin 7.0.4。
- kotlin 1.6.10。
- kotlinx_coroutines 1.6.0。
- androidx.emoji2 1.0.1。
- androidx.room 2.4.0。
- change reference: from R.attr.colorAccent to android.R.attr.colorAccent。
- remove unused parameter: AttachmentRequest.onUploadEnd。
- remove unused argument: fadeText in ItemViewHolder.showPreviewCard。

app/build.gradle

@@ -139,7 +139,7 @@ dependencies {
 
     implementation "androidx.appcompat:appcompat:$appcompat_version"
 
-    def emojiVersion = "1.0.0"
+    def emojiVersion = "1.0.1"
     implementation "androidx.emoji2:emoji2:$emojiVersion"
     implementation "androidx.emoji2:emoji2-bundled:$emojiVersion"
 
@@ -267,7 +267,7 @@ dependencies {
     testImplementation "androidx.arch.core:core-testing:$arch_version"
 
 
-    def roomVersion = "2.3.0"
+    def roomVersion = "2.4.0"
     implementation "androidx.room:room-runtime:$roomVersion"
     implementation "androidx.room:room-ktx:$roomVersion"
     kapt "androidx.room:room-compiler:$roomVersion"

app/src/main/java/jp/juggler/subwaytooter/actpost/ActPostAttachment.kt

@@ -90,7 +90,7 @@ fun ActPost.openAttachment() {
 fun ActPost.addAttachment(
     uri: Uri,
     mimeTypeArg: String? = null,
-    onUploadEnd: () -> Unit = {},
+//    onUploadEnd: () -> Unit = {},
 ) {
     val account = this.account
     val mimeType = attachmentUploader.getMimeType(uri, mimeTypeArg)
@@ -118,7 +118,7 @@ fun ActPost.addAttachment(
                     uri,
                     mimeType,
                     isReply = isReply,
-                    onUploadEnd = onUploadEnd
+              //      onUploadEnd = onUploadEnd
                 )
             )
         }

app/src/main/java/jp/juggler/subwaytooter/appsetting/AppSettingItem.kt

@@ -958,7 +958,7 @@ val appSettingRoot = AppSettingItem(null, SettingType.Section, R.string.app_sett
 
                     vIndicator.setBackgroundColor(
                         footerTabIndicatorColor.notZero()
-                            ?: activity.attrColor(R.attr.colorAccent)
+                            ?: activity.attrColor(android.R.attr.colorAccent)
                     )
                 }
 

app/src/main/java/jp/juggler/subwaytooter/itemviewholder/ItemViewHolderPreviewCard.kt

@@ -1,7 +1,6 @@
 package jp.juggler.subwaytooter.itemviewholder
 
 import android.view.View
-import jp.juggler.subwaytooter.ActMain
 import jp.juggler.subwaytooter.R
 import jp.juggler.subwaytooter.api.entity.TootStatus
 import jp.juggler.subwaytooter.column.ColumnType
@@ -47,7 +46,7 @@ private fun addLinkAndCaption(
     }
 }
 
-fun ItemViewHolder.showPreviewCard(status: TootStatus, fadeText: Boolean) {
+fun ItemViewHolder.showPreviewCard(status: TootStatus) {
 
     if (PrefB.bpDontShowPreviewCard(activity.pref)) return
 

app/src/main/java/jp/juggler/subwaytooter/itemviewholder/ItemViewHolderShowStatus.kt

@@ -143,7 +143,7 @@ fun ItemViewHolder.showStatus(
     val r = status.auto_cw
     tvContent.minLines = r?.originalLineCount ?: -1
 
-    showPreviewCard(status, fadeText = fadeText)
+    showPreviewCard(status)
     showSpoilerTextAndContent(status)
     showAttachments(status)
     makeReactionsView(status)

app/src/main/java/jp/juggler/subwaytooter/util/AttachmentUploader.kt

@@ -32,7 +32,7 @@ class AttachmentRequest(
     val uri: Uri,
     val mimeType: String,
     val isReply: Boolean,
-    val onUploadEnd: () -> Unit,
+    val onUploadEnd: () -> Unit ={},
 )
 
 class AttachmentUploader(

build.gradle

@@ -10,8 +10,8 @@ buildscript {
     ext.lifecycle_version = "2.4.0"
     ext.arch_version = "2.1.0"
 
-    ext.kotlin_version = '1.6.0'
-    ext.kotlinx_coroutines_version = '1.5.2'
+    ext.kotlin_version = '1.6.10'
+    ext.kotlinx_coroutines_version = '1.6.0'
 
     ext.anko_version = '0.10.8'
 
@@ -29,7 +29,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         classpath 'com.google.gms:google-services:4.3.10'
 
         //noinspection DifferentKotlinGradleVersion