From 5e3ee18059c0b8195eef69bd7e985928dee47641 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Tue, 3 Dec 2019 23:55:30 +0900
Subject: [PATCH] =?UTF-8?q?tootsearch=E3=81=AE=E6=8A=95=E7=A5=A8=E7=B5=90?=
 =?UTF-8?q?=E6=9E=9C=E3=81=AE=E7=A5=A8=E6=95=B0=E8=A1=A8=E8=A8=98=E3=82=92?=
 =?UTF-8?q?=20=3F=20=E3=81=AB=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jp/juggler/subwaytooter/ItemViewHolder.kt | 58 ++++++++++---------
 app/src/main/res/values-ja/strings.xml        |  5 +-
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt b/app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt
index 3e46259c..3d077d49 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt
@@ -267,28 +267,27 @@ internal class ItemViewHolder(
 		}
 		
 		val spacing = activity.timeline_spacing
-		if( spacing != null){
-			tvFollowerName.setLineSpacing(0f,spacing)
-			tvName.setLineSpacing(0f,spacing)
-			tvMentions.setLineSpacing(0f,spacing)
-			tvContentWarning.setLineSpacing(0f,spacing)
-			tvContent.setLineSpacing(0f,spacing)
-			btnShowMedia.setLineSpacing(0f,spacing)
-			tvApplication.setLineSpacing(0f,spacing)
-			tvMessageHolder.setLineSpacing(0f,spacing)
-			btnListTL.setLineSpacing(0f,spacing)
-			tvTrendTagName.setLineSpacing(0f,spacing)
-			tvTrendTagCount.setLineSpacing(0f,spacing)
-			tvFilterPhrase.setLineSpacing(0f,spacing)
-			tvMediaDescription.setLineSpacing(0f,spacing)
-			tvCardText.setLineSpacing(0f,spacing)
-			tvConversationIconsMore.setLineSpacing(0f,spacing)
-			tvConversationParticipants.setLineSpacing(0f,spacing)
-			tvBoosted.setLineSpacing(0f,spacing)
-			tvReply.setLineSpacing(0f,spacing)
+		if(spacing != null) {
+			tvFollowerName.setLineSpacing(0f, spacing)
+			tvName.setLineSpacing(0f, spacing)
+			tvMentions.setLineSpacing(0f, spacing)
+			tvContentWarning.setLineSpacing(0f, spacing)
+			tvContent.setLineSpacing(0f, spacing)
+			btnShowMedia.setLineSpacing(0f, spacing)
+			tvApplication.setLineSpacing(0f, spacing)
+			tvMessageHolder.setLineSpacing(0f, spacing)
+			btnListTL.setLineSpacing(0f, spacing)
+			tvTrendTagName.setLineSpacing(0f, spacing)
+			tvTrendTagCount.setLineSpacing(0f, spacing)
+			tvFilterPhrase.setLineSpacing(0f, spacing)
+			tvMediaDescription.setLineSpacing(0f, spacing)
+			tvCardText.setLineSpacing(0f, spacing)
+			tvConversationIconsMore.setLineSpacing(0f, spacing)
+			tvConversationParticipants.setLineSpacing(0f, spacing)
+			tvBoosted.setLineSpacing(0f, spacing)
+			tvReply.setLineSpacing(0f, spacing)
 		}
 		
-		
 		var s = activity.avatarIconSize
 		ivThumbnail.layoutParams.height = s
 		ivThumbnail.layoutParams.width = s
@@ -1830,14 +1829,14 @@ internal class ItemViewHolder(
 			
 			llReply -> {
 				val s = status_reply
-
+				
 				when {
 					s != null -> Action_Toot.conversation(activity, pos, access_info, s)
 					
 					// tootsearchは返信元のIDを取得するのにひと手間必要
 					column.type == ColumnType.SEARCH_TS ->
 						Action_Toot.showReplyTootsearch(activity, pos, status_showing)
-
+					
 					else -> {
 						val id = status_showing?.in_reply_to_id
 						if(id != null) {
@@ -2026,7 +2025,7 @@ internal class ItemViewHolder(
 			llReply -> {
 				val s = status_reply
 				when {
-
+					
 					// 返信元のstatusがあるならコンテキストメニュー
 					s != null -> DlgContextMenu(
 						activity,
@@ -2038,7 +2037,7 @@ internal class ItemViewHolder(
 					).show()
 					
 					// それ以外はコンテキストメニューではなく会話を開く
-
+					
 					// tootsearchは返信元のIDを取得するのにひと手間必要
 					column.type == ColumnType.SEARCH_TS ->
 						Action_Toot.showReplyTootsearch(
@@ -2641,11 +2640,16 @@ internal class ItemViewHolder(
 				val sb = SpannableStringBuilder()
 					.append(item.decoded_text)
 				if(! canVote) {
+					val v = item.votes
+					
 					sb.append(" / ")
 					sb.append(
-						when(val v = item.votes) {
-							null -> activity.getString(R.string.vote_count_unavailable)
-							else -> activity.getString(R.string.vote_count_text, v)
+						when {
+							v == null ||
+								(column.isSearchColumn && column.access_info.isNA) ->
+								activity.getString(R.string.vote_count_unavailable)
+							else ->
+								activity.getString(R.string.vote_count_text, v)
 						}
 					)
 					if(item.isVoted) sb.append(' ').append(0x2713.toChar())
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 0c896c1f..5aa0686a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -773,6 +773,7 @@
 
     <string name="vote_polls">投票やその結果</string>
     <string name="vote_count_text">%1$d票</string>
+
     <string name="wait_previous_operation">直前の操作が完了するまでお待ちください</string>
     <string name="with_attachment">添付データあり</string>
     <string name="with_highlight">強調表示あり</string>
@@ -902,8 +903,8 @@
     <string name="poll_expire_days">日</string>
     <string name="poll_expire_hours">時間</string>
     <string name="poll_expire_minutes">分</string>
-    <string name="vote_1">1 vote</string>
-    <string name="vote_2">%1$d 人。</string>
+    <string name="vote_1">1 票</string>
+    <string name="vote_2">%1$d 票</string>
     <string name="vote_expire_at">投票期限 %1$s</string>
     <string name="vote_count_unavailable">\?\?\?票</string>
     <string name="vote_button">投票</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2cea8bfc..428b0854 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -749,6 +749,7 @@
     <string name="visibility_home">Home</string>
     <string name="visibility_followers">Followers</string>
     <string name="vote_count_text">%1$d votes</string>
+
     <string name="reaction_add">Add reaction</string>
     <string name="reaction_remove">Remove reaction</string>
     <string name="unknown_notification_from">unknown notification from %1$s</string>