「アプリ設定/投稿/絵文字を選択したら絵文字ピッカーを閉じる」を追加。

This commit is contained in:
tateisu 2020-08-14 10:28:59 +09:00
parent 1d3a6f5311
commit be2aeca698
6 changed files with 18 additions and 4 deletions

View File

@ -1243,7 +1243,7 @@ class ActMain : AsyncActivity()
quickTootVisibility =
TootVisibility.parseSavedVisibility(Pref.spQuickTootVisibility(pref))
?: quickTootVisibility
showQuickTootVisibility()
Column.reloadDefaultColor(this, pref)
@ -1555,6 +1555,8 @@ class ActMain : AsyncActivity()
return ! drawer.isDrawerOpen(GravityCompat.START)
}
})
showQuickTootVisibility()
}
private fun isVisibleColumn(idx : Int) = phoneTab(

View File

@ -393,6 +393,11 @@ val appSettingRoot = AppSettingItem(null, SettingType.Section, R.string.app_sett
Pref.bpWarnHashtagAsciiAndNonAscii,
R.string.warn_hashtag_ascii_and_non_ascii
)
sw(
Pref.bpEmojiPickerCloseOnSelected,
R.string.close_emoji_picker_when_selected
)
}
section(R.string.tablet_mode) {

View File

@ -427,6 +427,10 @@ object Pref {
true
)
val bpEmojiPickerCloseOnSelected = BooleanPref(
"EmojiPickerCloseOnSelected",
true
)
// int
val ipBackButtonAction = IntPref("back_button_action", 0)

View File

@ -535,15 +535,16 @@ class EmojiPicker(
customEmoji : CustomEmoji? = null
) {
dialog.dismissSafe()
val pref = App1.pref
if( Pref.bpEmojiPickerCloseOnSelected(pref))
dialog.dismissSafe()
// Recentをロード(他インスタンスの絵文字を含む)
val list : MutableList<JsonObject> = try {
Pref.spEmojiPickerRecent(pref).decodeJsonArray().objectList()
} catch(_ : Throwable) {
emptyList<JsonObject>()
emptyList()
}.toMutableList()
// 選択された絵文字と同じ項目を除去

View File

@ -1031,4 +1031,5 @@
<string name="personal_notes">覚え書き</string>
<string name="personal_notes_of">%1$sに関する覚え書き</string>
<string name="custom_thumbnail">カスタムサムネイル</string>
<string name="close_emoji_picker_when_selected">絵文字を選択したら絵文字ピッカーを閉じる</string>
</resources>

View File

@ -1038,4 +1038,5 @@
<string name="personal_notes">Personal notes</string>
<string name="personal_notes_of">Personal notes of %1$s</string>
<string name="custom_thumbnail">Custom thumbnail</string>
<string name="close_emoji_picker_when_selected">Close emoji picker after selecting emoji</string>
</resources>