From 1d3a6f53113fe8246aa10dee2a9d9d7a155ba2eb Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Fri, 14 Aug 2020 10:11:28 +0900
Subject: [PATCH] =?UTF-8?q?=E7=B0=A1=E6=98=93=E5=85=A5=E5=8A=9B=E3=81=AE?=
 =?UTF-8?q?=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=82=A2=E3=82=A4=E3=82=B3?=
 =?UTF-8?q?=E3=83=B3=E3=82=92=E5=85=AC=E9=96=8B=E7=AF=84=E5=9B=B2=E3=81=AE?=
 =?UTF-8?q?=E5=9B=B3=E6=9F=84=E3=81=AB=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |  2 +-
 .../java/jp/juggler/subwaytooter/ActMain.kt   | 19 +++++++++++++++----
 .../subwaytooter/dialog/DlgQuickTootMenu.kt   |  2 +-
 app/src/main/res/layout/act_main.xml          | 10 ++++------
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3f62b3fa..c91ec4cc 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -44,7 +44,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt b/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt
index 09bc49cc..65f42155 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt
@@ -41,6 +41,7 @@ import jp.juggler.util.*
 import kotlinx.coroutines.delay
 import org.apache.commons.io.IOUtils
 import org.jetbrains.anko.backgroundDrawable
+import org.jetbrains.anko.imageResource
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
@@ -297,6 +298,18 @@ class ActMain : AsyncActivity()
 		).open()
 	}
 	
+	private fun showQuickTootVisibility() {
+		btnQuickTootMenu.imageResource =
+			when(val resId = Styler.getVisibilityIconId(false, quickTootVisibility)) {
+				R.drawable.ic_question -> R.drawable.ic_description
+				else -> resId
+			}
+	}
+	
+	private fun performQuickTootMenu() {
+		dlgQuickTootMenu.toggle()
+	}
+	
 	private val dlgQuickTootMenu = DlgQuickTootMenu(this, object : DlgQuickTootMenu.Callback {
 		
 		override var visibility : TootVisibility
@@ -305,6 +318,7 @@ class ActMain : AsyncActivity()
 				if(value != quickTootVisibility) {
 					quickTootVisibility = value
 					pref.edit().put(Pref.spQuickTootVisibility, value.id.toString()).apply()
+					showQuickTootVisibility()
 				}
 			}
 		
@@ -928,10 +942,6 @@ class ActMain : AsyncActivity()
 		listItemPopup = null
 	}
 	
-	private fun performQuickTootMenu() {
-		dlgQuickTootMenu.toggle()
-	}
-	
 	private fun performQuickPost(account : SavedAccount?) {
 		if(account == null) {
 			val a = if(tabletEnv != null && ! Pref.bpQuickTootOmitAccountSelection(pref)) {
@@ -1233,6 +1243,7 @@ class ActMain : AsyncActivity()
 		quickTootVisibility =
 			TootVisibility.parseSavedVisibility(Pref.spQuickTootVisibility(pref))
 				?: quickTootVisibility
+		showQuickTootVisibility()
 		
 		Column.reloadDefaultColor(this, pref)
 		
diff --git a/app/src/main/java/jp/juggler/subwaytooter/dialog/DlgQuickTootMenu.kt b/app/src/main/java/jp/juggler/subwaytooter/dialog/DlgQuickTootMenu.kt
index 6503c748..9a5e2956 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/dialog/DlgQuickTootMenu.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/dialog/DlgQuickTootMenu.kt
@@ -152,7 +152,7 @@ class DlgQuickTootMenu(
 		AlertDialog.Builder(activity)
 			.setTitle(R.string.choose_visibility)
 			.setItems(caption_list) { _, which ->
-				if(which in 0 until visibilityList.size) {
+				if(which in visibilityList.indices) {
 					callback.visibility = visibilityList[which]
 					showVisibility()
 				}
diff --git a/app/src/main/res/layout/act_main.xml b/app/src/main/res/layout/act_main.xml
index 087079b4..eb2778b6 100644
--- a/app/src/main/res/layout/act_main.xml
+++ b/app/src/main/res/layout/act_main.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<jp.juggler.subwaytooter.view.MyDrawerLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<jp.juggler.subwaytooter.view.MyDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawer_layout"
 
@@ -104,16 +103,15 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:baselineAligned="false"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
             <ImageButton
                 android:id="@+id/btnQuickTootMenu"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:contentDescription="@string/quick_toot_menu"
-                android:scaleType="fitCenter"
-                android:src="@drawable/ic_description" />
+                android:scaleType="fitCenter" />
 
             <jp.juggler.subwaytooter.view.MyEditText
                 android:id="@+id/etQuickToot"