From 7dca01c7a9a468a84426eed49c3db638e1f72c09 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Mon, 2 Dec 2019 10:57:17 +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/=E8=A6=8B=E3=81=9F=E7=9B=AE/=E3=83=96=E3=83=83?=
 =?UTF-8?q?=E3=82=AF=E3=83=9E=E3=83=BC=E3=82=AF=E3=83=9C=E3=82=BF=E3=83=B3?=
 =?UTF-8?q?=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E3=80=8D=E3=82=92?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E3=80=82=E3=81=AA=E3=81=8A=E3=82=AA=E3=83=95?=
 =?UTF-8?q?=E3=81=AB=E3=81=97=E3=81=A6=E3=82=82=E3=82=B3=E3=83=B3=E3=83=86?=
 =?UTF-8?q?=E3=82=AD=E3=82=B9=E3=83=88=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC?=
 =?UTF-8?q?=E3=81=AE=E5=88=A5=E3=82=A2=E3=82=AB=E6=93=8D=E4=BD=9C=E3=81=AB?=
 =?UTF-8?q?=E3=81=AF=E6=AE=8B=E3=81=A3=E3=81=A6=E3=81=BE=E3=81=99=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/jp/juggler/subwaytooter/Pref.kt |  8 +++--
 .../jp/juggler/subwaytooter/StatusButtons.kt  |  2 ++
 .../res/layout/act_app_setting_appearance.xml | 33 +++++++++++++++++++
 .../res/layout/act_app_setting_behavior.xml   | 15 ---------
 app/src/main/res/values-ja/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 6 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/Pref.kt b/app/src/main/java/jp/juggler/subwaytooter/Pref.kt
index 5dce5720..1b97a71f 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/Pref.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/Pref.kt
@@ -454,8 +454,12 @@ object Pref {
 		R.id.swAlwaysExpandContextMenuItems
 	)
 	
-	
-	
+	val bpShowBookmarkButton = BooleanPref(
+		"ShowBookmarkButton",
+		false,
+		R.id.swShowBookmarkButton
+	)
+
 	// int
 	
 	val ipBackButtonAction = IntPref("back_button_action", 0)
diff --git a/app/src/main/java/jp/juggler/subwaytooter/StatusButtons.kt b/app/src/main/java/jp/juggler/subwaytooter/StatusButtons.kt
index 01bd44a1..a982c24a 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/StatusButtons.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/StatusButtons.kt
@@ -200,6 +200,8 @@ internal class StatusButtons(
 		
 		// ブックマークボタン
 		when {
+			!Pref.bpShowBookmarkButton(activity.pref) -> vg(btnBookmark,false)
+
 			activity.app_state.isBusyBookmark(access_info, status) -> setButton(
 				btnBookmark,
 				false,
diff --git a/app/src/main/res/layout/act_app_setting_appearance.xml b/app/src/main/res/layout/act_app_setting_appearance.xml
index d261c97e..3ab004a5 100644
--- a/app/src/main/res/layout/act_app_setting_appearance.xml
+++ b/app/src/main/res/layout/act_app_setting_appearance.xml
@@ -700,5 +700,38 @@
         <View style="@style/setting_divider"/>
 
 
+        <TextView
+            style="@style/setting_row_label"
+            android:text="@string/always_expand_context_menu_sub_items"
+            />
+
+        <LinearLayout style="@style/setting_row_form">
+
+            <Switch
+                android:id="@+id/swAlwaysExpandContextMenuItems"
+                style="@style/setting_horizontal_stretch"
+                />
+
+        </LinearLayout>
+
+        <View style="@style/setting_divider"/>
+
+        <TextView
+            style="@style/setting_row_label"
+            android:text="@string/show_bookmark_button"
+            />
+
+        <LinearLayout style="@style/setting_row_form">
+
+            <Switch
+                android:id="@+id/swShowBookmarkButton"
+                style="@style/setting_horizontal_stretch"
+                />
+
+        </LinearLayout>
+
+        <View style="@style/setting_divider"/>
+
+
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/act_app_setting_behavior.xml b/app/src/main/res/layout/act_app_setting_behavior.xml
index 25b683f6..74b13478 100644
--- a/app/src/main/res/layout/act_app_setting_behavior.xml
+++ b/app/src/main/res/layout/act_app_setting_behavior.xml
@@ -446,21 +446,6 @@
 
         </LinearLayout>
 
-        <View style="@style/setting_divider"/>
-
-        <TextView
-            style="@style/setting_row_label"
-            android:text="@string/always_expand_context_menu_sub_items"
-            />
-
-        <LinearLayout style="@style/setting_row_form">
-
-            <Switch
-                android:id="@+id/swAlwaysExpandContextMenuItems"
-                style="@style/setting_horizontal_stretch"
-                />
-
-        </LinearLayout>
 
         <View style="@style/setting_divider"/>
 
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 97fd68a8..0c896c1f 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -973,5 +973,6 @@
     <string name="release_notes_updated">更新履歴 (v%1$s→v%2$s)</string>
     <string name="test">Test</string>
     <string name="please_help_translation">Please help translation!</string>
+    <string name="show_bookmark_button">ブックマークボタンを表示する (アプリ再起動が必要)</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8d04e5c3..2cea8bfc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -967,4 +967,5 @@
     <string name="release_notes_updated">Release notes (v%1$s→v%2$s)</string>
     <string name="test">Test</string>
     <string name="please_help_translation">Please help translation!</string>
+    <string name="show_bookmark_button">Show bookmark button (app restart required)</string>
 </resources>
\ No newline at end of file