diff --git a/app/src/main/java/jp/juggler/subwaytooter/DlgContextMenu.kt b/app/src/main/java/jp/juggler/subwaytooter/DlgContextMenu.kt index 1ee43542..028083be 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/DlgContextMenu.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/DlgContextMenu.kt @@ -220,13 +220,6 @@ internal class DlgContextMenu( btnBoostedBy, btnFavouritedBy, - btnCrossAccountActionsForStatus, - btnCrossAccountActionsForAccount, - btnAroundThisToot, - btnYourToot, - btnStatusExtraAction, - btnAccountExtraAction, - viewRoot.findViewById(R.id.btnQuoteUrlStatus), viewRoot.findViewById(R.id.btnTranslate), viewRoot.findViewById(R.id.btnQuoteUrlAccount), @@ -511,6 +504,7 @@ internal class DlgContextMenu( updateGroup(btnYourToot, llYourToot) updateGroup(btnStatusExtraAction, llStatusExtraAction) updateGroup(btnAccountExtraAction, llAccountExtraAction) + } fun show() { @@ -533,12 +527,20 @@ internal class DlgContextMenu( } private fun updateGroup(btn : Button, group : View, toggle : Boolean = false) { + if(btn.visibility != View.VISIBLE) { vg(group, false) return } - if(toggle) vg(group, group.visibility != View.VISIBLE) + when { + Pref.bpAlwaysExpandContextMenuItems(activity.pref) ->{ + vg(group, true) + btn.background = null + } + toggle -> vg(group, group.visibility != View.VISIBLE) + else -> btn.setOnClickListener(this) + } val iconId = if(group.visibility == View.VISIBLE) { R.drawable.ic_arrow_drop_up diff --git a/app/src/main/java/jp/juggler/subwaytooter/Pref.kt b/app/src/main/java/jp/juggler/subwaytooter/Pref.kt index 9c65ac2e..4fe60f92 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/Pref.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/Pref.kt @@ -448,6 +448,14 @@ object Pref { R.id.swSeparateReplyNotificationGroup ) + val bpAlwaysExpandContextMenuItems = BooleanPref( + "AlwaysExpandContextMenuItems", + false, + R.id.swAlwaysExpandContextMenuItems + ) + + + // int val ipBackButtonAction = IntPref("back_button_action", 0) @@ -550,6 +558,7 @@ object Pref { val spRoundRatio = StringPref("round_ratio", "33") val spBoostAlpha = StringPref("BoostAlpha", "60") + val spPullNotificationCheckInterval = StringPref("PullNotificationCheckInterval", "15") val spUserAgent = StringPref("UserAgent", "") 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 d0d72e39..25b683f6 100644 --- a/app/src/main/res/layout/act_app_setting_behavior.xml +++ b/app/src/main/res/layout/act_app_setting_behavior.xml @@ -448,5 +448,21 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c5399b57..d180f885 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -958,5 +958,6 @@ 簡易投稿でも可能ならアカウント選択を省略する 返信の通知グループを分ける (Android 8+) タイムラインの行間 (数値は文字に対する割合を示します。空欄でデフォルト状態。アプリ再起動が必要) + コンテキストメニューの副項目を常に展開する diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c40b142b..40f7253e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -953,4 +953,5 @@ When using quick toot, omit account selection if possible Separate notification groups for reply (Android 8+) Timeline line spacing (floating number is used as line spacing multiplier. leave empty to default. app restart required) + Always expand sub-items of context menu \ No newline at end of file