From 7ceff3eaa4dc7467122fbddbe2c5802945ab30b6 Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Thu, 5 Jan 2023 13:24:09 -0300 Subject: [PATCH] Fixing #28 --- .../android/fragments/SettingsFragment.java | 16 +++++++++++----- mastodon/src/main/res/values/strings_sk.xml | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java index d64d291f5..b50936034 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java @@ -131,10 +131,15 @@ public class SettingsFragment extends MastodonToolbarFragment{ case NORD -> R.string.sk_color_palette_nord; }); })); - items.add(new ButtonItem(R.string.sk_settings_publish_button_text, R.drawable.ic_fluent_send_24_regular, b->{ + items.add(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) { + b.setOnClickListener(l -> { + Toast.makeText(getActivity(), R.string.sk_disable_relocate_publish_button_to_enable_customization, + Toast.LENGTH_LONG).show(); + }); + } else { + b.setOnClickListener(l -> { FrameLayout inputWrap = new FrameLayout(getContext()); EditText input = new EditText(getContext()); input.setHint(R.string.publish); @@ -154,9 +159,10 @@ public class SettingsFragment extends MastodonToolbarFragment{ GlobalUserPreferences.save(); updatePublishText(b); }) - .setNegativeButton(R.string.cancel, (d, which) -> {}) + .setNegativeButton(R.string.cancel, (d, which) -> { + }) .show(); - }); + });} })); items.add(new SwitchItem(R.string.sk_settings_uniform_icon_for_notifications, R.drawable.ic_ntf_logo, GlobalUserPreferences.uniformNotificationIcon, i->{ GlobalUserPreferences.uniformNotificationIcon=i.checked; diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml index 0c0d43198..f83d6610d 100644 --- a/mastodon/src/main/res/values/strings_sk.xml +++ b/mastodon/src/main/res/values/strings_sk.xml @@ -135,4 +135,5 @@ The included images have no description. Please consider adding one, to allow visually impaired people to participate. Recently used Clear recently used emoji + Disable "Relocate publish button" to allow customization \ No newline at end of file