From e1f5c9cb634cc310357b2fd196cd865fe24fca19 Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Mon, 12 Jun 2023 19:09:13 -0300 Subject: [PATCH] feat: lower publish button text setting opacity when relocatePublishButton is enabled --- .../android/fragments/settings/BehaviourFragment.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/BehaviourFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/BehaviourFragment.java index 34df3ddfc..aa5b21c31 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/BehaviourFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/BehaviourFragment.java @@ -22,6 +22,8 @@ public class BehaviourFragment extends SettingsBaseFragment{ SwitchItem alwaysRevealSpoilersItem; ButtonItem autoRevealSpoilersItem; + ButtonItem publishButtonTextSetting; + SwitchItem relocatePublishButtonSetting; @Override public void addItems(ArrayList items) { items.add(new HeaderItem(R.string.settings_behavior)); @@ -67,7 +69,7 @@ public class BehaviourFragment extends SettingsBaseFragment{ })); items.add(new HeaderItem(R.string.mo_composer_behavior)); - items.add(new ButtonItem(R.string.sk_settings_publish_button_text, R.drawable.ic_fluent_send_24_regular, b-> { + items.add(publishButtonTextSetting = new ButtonItem(R.string.sk_settings_publish_button_text, R.drawable.ic_fluent_send_24_regular, b-> { updatePublishText(b); b.setOnClickListener(l -> { if(!GlobalUserPreferences.relocatePublishButton) { @@ -99,8 +101,11 @@ public class BehaviourFragment extends SettingsBaseFragment{ Toast.LENGTH_LONG).show(); } }); + + b.setAlpha(relocatePublishButtonSetting.checked ? 0.7f : 1f); })); - items.add(new SwitchItem(R.string.mo_relocate_publish_button, R.string.mo_setting_relocate_publish_summary, R.drawable.ic_fluent_arrow_autofit_down_24_regular, GlobalUserPreferences.relocatePublishButton, i->{ + items.add(relocatePublishButtonSetting = new SwitchItem(R.string.mo_relocate_publish_button, R.string.mo_setting_relocate_publish_summary, R.drawable.ic_fluent_arrow_autofit_down_24_regular, GlobalUserPreferences.relocatePublishButton, i->{ + if (list.findViewHolderForAdapterPosition(items.indexOf(publishButtonTextSetting)) instanceof SettingsBaseFragment.ButtonViewHolder bvh) bvh.rebind(); GlobalUserPreferences.relocatePublishButton=i.checked; GlobalUserPreferences.save(); }));