「アプリ設定/投稿/絵文字を選択したら絵文字ピッカーを閉じる」を追加。
This commit is contained in:
parent
1d3a6f5311
commit
be2aeca698
|
@ -1243,7 +1243,7 @@ class ActMain : AsyncActivity()
|
||||||
quickTootVisibility =
|
quickTootVisibility =
|
||||||
TootVisibility.parseSavedVisibility(Pref.spQuickTootVisibility(pref))
|
TootVisibility.parseSavedVisibility(Pref.spQuickTootVisibility(pref))
|
||||||
?: quickTootVisibility
|
?: quickTootVisibility
|
||||||
showQuickTootVisibility()
|
|
||||||
|
|
||||||
Column.reloadDefaultColor(this, pref)
|
Column.reloadDefaultColor(this, pref)
|
||||||
|
|
||||||
|
@ -1555,6 +1555,8 @@ class ActMain : AsyncActivity()
|
||||||
return ! drawer.isDrawerOpen(GravityCompat.START)
|
return ! drawer.isDrawerOpen(GravityCompat.START)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
showQuickTootVisibility()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun isVisibleColumn(idx : Int) = phoneTab(
|
private fun isVisibleColumn(idx : Int) = phoneTab(
|
||||||
|
|
|
@ -393,6 +393,11 @@ val appSettingRoot = AppSettingItem(null, SettingType.Section, R.string.app_sett
|
||||||
Pref.bpWarnHashtagAsciiAndNonAscii,
|
Pref.bpWarnHashtagAsciiAndNonAscii,
|
||||||
R.string.warn_hashtag_ascii_and_non_ascii
|
R.string.warn_hashtag_ascii_and_non_ascii
|
||||||
)
|
)
|
||||||
|
|
||||||
|
sw(
|
||||||
|
Pref.bpEmojiPickerCloseOnSelected,
|
||||||
|
R.string.close_emoji_picker_when_selected
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
section(R.string.tablet_mode) {
|
section(R.string.tablet_mode) {
|
||||||
|
|
|
@ -427,6 +427,10 @@ object Pref {
|
||||||
true
|
true
|
||||||
)
|
)
|
||||||
|
|
||||||
|
val bpEmojiPickerCloseOnSelected = BooleanPref(
|
||||||
|
"EmojiPickerCloseOnSelected",
|
||||||
|
true
|
||||||
|
)
|
||||||
// int
|
// int
|
||||||
|
|
||||||
val ipBackButtonAction = IntPref("back_button_action", 0)
|
val ipBackButtonAction = IntPref("back_button_action", 0)
|
||||||
|
|
|
@ -535,15 +535,16 @@ class EmojiPicker(
|
||||||
customEmoji : CustomEmoji? = null
|
customEmoji : CustomEmoji? = null
|
||||||
) {
|
) {
|
||||||
|
|
||||||
dialog.dismissSafe()
|
|
||||||
|
|
||||||
val pref = App1.pref
|
val pref = App1.pref
|
||||||
|
|
||||||
|
if( Pref.bpEmojiPickerCloseOnSelected(pref))
|
||||||
|
dialog.dismissSafe()
|
||||||
|
|
||||||
// Recentをロード(他インスタンスの絵文字を含む)
|
// Recentをロード(他インスタンスの絵文字を含む)
|
||||||
val list : MutableList<JsonObject> = try {
|
val list : MutableList<JsonObject> = try {
|
||||||
Pref.spEmojiPickerRecent(pref).decodeJsonArray().objectList()
|
Pref.spEmojiPickerRecent(pref).decodeJsonArray().objectList()
|
||||||
} catch(_ : Throwable) {
|
} catch(_ : Throwable) {
|
||||||
emptyList<JsonObject>()
|
emptyList()
|
||||||
}.toMutableList()
|
}.toMutableList()
|
||||||
|
|
||||||
// 選択された絵文字と同じ項目を除去
|
// 選択された絵文字と同じ項目を除去
|
||||||
|
|
|
@ -1031,4 +1031,5 @@
|
||||||
<string name="personal_notes">覚え書き</string>
|
<string name="personal_notes">覚え書き</string>
|
||||||
<string name="personal_notes_of">%1$sに関する覚え書き</string>
|
<string name="personal_notes_of">%1$sに関する覚え書き</string>
|
||||||
<string name="custom_thumbnail">カスタムサムネイル</string>
|
<string name="custom_thumbnail">カスタムサムネイル</string>
|
||||||
|
<string name="close_emoji_picker_when_selected">絵文字を選択したら絵文字ピッカーを閉じる</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -1038,4 +1038,5 @@
|
||||||
<string name="personal_notes">Personal notes</string>
|
<string name="personal_notes">Personal notes</string>
|
||||||
<string name="personal_notes_of">Personal notes of %1$s</string>
|
<string name="personal_notes_of">Personal notes of %1$s</string>
|
||||||
<string name="custom_thumbnail">Custom thumbnail</string>
|
<string name="custom_thumbnail">Custom thumbnail</string>
|
||||||
|
<string name="close_emoji_picker_when_selected">Close emoji picker after selecting emoji</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
Loading…
Reference in New Issue