diff --git a/app/build.gradle b/app/build.gradle index df9a7204..77d0ee64 100644 --- a/app/build.gradle +++ b/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" diff --git a/app/src/main/java/jp/juggler/subwaytooter/actpost/ActPostAttachment.kt b/app/src/main/java/jp/juggler/subwaytooter/actpost/ActPostAttachment.kt index df8feafc..06448b16 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/actpost/ActPostAttachment.kt +++ b/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 ) ) } diff --git a/app/src/main/java/jp/juggler/subwaytooter/appsetting/AppSettingItem.kt b/app/src/main/java/jp/juggler/subwaytooter/appsetting/AppSettingItem.kt index f7452880..40f5873b 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/appsetting/AppSettingItem.kt +++ b/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) ) } diff --git a/app/src/main/java/jp/juggler/subwaytooter/itemviewholder/ItemViewHolderPreviewCard.kt b/app/src/main/java/jp/juggler/subwaytooter/itemviewholder/ItemViewHolderPreviewCard.kt index 6305e945..403f3005 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/itemviewholder/ItemViewHolderPreviewCard.kt +++ b/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 diff --git a/app/src/main/java/jp/juggler/subwaytooter/itemviewholder/ItemViewHolderShowStatus.kt b/app/src/main/java/jp/juggler/subwaytooter/itemviewholder/ItemViewHolderShowStatus.kt index d99bfa88..383cdc6f 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/itemviewholder/ItemViewHolderShowStatus.kt +++ b/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) diff --git a/app/src/main/java/jp/juggler/subwaytooter/util/AttachmentUploader.kt b/app/src/main/java/jp/juggler/subwaytooter/util/AttachmentUploader.kt index 5e7590ae..0e1d48a3 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/util/AttachmentUploader.kt +++ b/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( diff --git a/build.gradle b/build.gradle index cb8266bc..70b37f33 100644 --- a/build.gradle +++ b/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