From be2aeca698e736df9d992bb3896ead83a78a5984 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Fri, 14 Aug 2020 10:28:59 +0900
Subject: [PATCH] =?UTF-8?q?=E3=80=8C=E3=82=A2=E3=83=97=E3=83=AA=E8=A8=AD?=
 =?UTF-8?q?=E5=AE=9A/=E6=8A=95=E7=A8=BF/=E7=B5=B5=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E3=82=92=E9=81=B8=E6=8A=9E=E3=81=97=E3=81=9F=E3=82=89=E7=B5=B5?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E3=83=94=E3=83=83=E3=82=AB=E3=83=BC=E3=82=92?=
 =?UTF-8?q?=E9=96=89=E3=81=98=E3=82=8B=E3=80=8D=E3=82=92=E8=BF=BD=E5=8A=A0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/jp/juggler/subwaytooter/ActMain.kt       | 4 +++-
 .../main/java/jp/juggler/subwaytooter/AppSettingItem.kt    | 5 +++++
 app/src/main/java/jp/juggler/subwaytooter/Pref.kt          | 4 ++++
 .../java/jp/juggler/subwaytooter/dialog/EmojiPicker.kt     | 7 ++++---
 app/src/main/res/values-ja/strings.xml                     | 1 +
 app/src/main/res/values/strings.xml                        | 1 +
 6 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt b/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt
index 65f42155..097fbfff 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt
@@ -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(
diff --git a/app/src/main/java/jp/juggler/subwaytooter/AppSettingItem.kt b/app/src/main/java/jp/juggler/subwaytooter/AppSettingItem.kt
index 0096b0a8..1364d84f 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/AppSettingItem.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/AppSettingItem.kt
@@ -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) {
diff --git a/app/src/main/java/jp/juggler/subwaytooter/Pref.kt b/app/src/main/java/jp/juggler/subwaytooter/Pref.kt
index ed454428..30fb0c93 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/Pref.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/Pref.kt
@@ -427,6 +427,10 @@ object Pref {
 		true
 	)
 	
+	val bpEmojiPickerCloseOnSelected = BooleanPref(
+		"EmojiPickerCloseOnSelected",
+		true
+	)
 	// int
 	
 	val ipBackButtonAction = IntPref("back_button_action", 0)
diff --git a/app/src/main/java/jp/juggler/subwaytooter/dialog/EmojiPicker.kt b/app/src/main/java/jp/juggler/subwaytooter/dialog/EmojiPicker.kt
index 537ac1d0..fc3c6bf7 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/dialog/EmojiPicker.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/dialog/EmojiPicker.kt
@@ -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()
 		
 		// 選択された絵文字と同じ項目を除去
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index e5c66c52..13ac2517 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -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>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bec3ad20..1e3d2cd7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -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>