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 b2f66dc7..4dc54fc7 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/appsetting/AppSettingItem.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/appsetting/AppSettingItem.kt @@ -395,7 +395,10 @@ val appSettingRoot = AppSettingItem(null, SettingType.Section, R.string.app_sett ) sw(PrefB.bpEnablePixelfed, R.string.enable_connect_to_pixelfed_server) + sw(PrefB.bpShowFilteredWord, R.string.show_filtered_word) + sw(PrefB.bpShowUsernameFilteredPost,R.string.show_username_on_filtered_post) + sw(PrefB.bpEnableDomainTimeline, R.string.enable_domain_timeline) } 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 d1cb7391..39deeea1 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/itemviewholder/ItemViewHolderShowStatus.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/itemviewholder/ItemViewHolderShowStatus.kt @@ -58,18 +58,20 @@ fun ItemViewHolder.showStatus( val filteredWord = status.filteredWord if (filteredWord != null) { - PrefI.ipEventBgColorFiltered.value.notZero()?.let{ + PrefI.ipEventBgColorFiltered.value.notZero()?.let { viewRoot.backgroundColor = it } - showMessageHolder( - TootMessageHolder( - if (PrefB.bpShowFilteredWord.value) { - "${activity.getString(R.string.filtered)} / $filteredWord" - } else { - activity.getString(R.string.filtered) - } - ) - ) + val text = StringBuilder().apply { + append(activity.getString(R.string.filtered)) + if (PrefB.bpShowFilteredWord.value) { + append(" / $filteredWord") + } + if (PrefB.bpShowUsernameFilteredPost.value) { + val s = status.reblog ?: status + append(" / ${s.account.display_name} @${s.account.acct}") + } + }.toString() + showMessageHolder(TootMessageHolder(text)) return } @@ -211,8 +213,10 @@ private fun ItemViewHolder.showSpoilerTextAndContent(status: TootStatus) { // 予約投稿でも使う fun ItemViewHolder.setContentVisibility(shown: Boolean) { llContents.visibility = if (shown) View.VISIBLE else View.GONE - btnContentWarning.contentDescription = activity.getString(if (shown) R.string.hide else R.string.show) - btnContentWarning.imageResource = if (shown) R.drawable.outline_compress_24 else R.drawable.outline_expand_24 + btnContentWarning.contentDescription = + activity.getString(if (shown) R.string.hide else R.string.show) + btnContentWarning.imageResource = + if (shown) R.drawable.outline_compress_24 else R.drawable.outline_expand_24 statusShowing?.let { status -> val r = status.auto_cw diff --git a/app/src/main/java/jp/juggler/subwaytooter/pref/PrefB.kt b/app/src/main/java/jp/juggler/subwaytooter/pref/PrefB.kt index 714c8165..6f461d2b 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/pref/PrefB.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/pref/PrefB.kt @@ -355,4 +355,9 @@ object PrefB { "MisskeyNotificationCheck", false ) + + val bpShowUsernameFilteredPost = BooleanPref( + "ShowUsernameFilteredPost", + false + ) } diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 6415f6d9..8cca403c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1252,4 +1252,5 @@ 文字 \"%1$s\" は使えません 承認されました。 アカウント一覧 - \ No newline at end of file + フィルタされた投稿にユーザ名を表示する + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2ba70592..d8df8ffc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1253,4 +1253,5 @@ glide test viewing column account(phone), or ask always(tablet) Quick post account + Show username on filtered post \ No newline at end of file