From 29cc73e84e8a0fc3b626e700ce487af5ca4bb72d Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Fri, 27 Jan 2023 16:01:17 -0300 Subject: [PATCH] Fixing npe in compose fragment, and also rearranging settings items --- .../android/fragments/ComposeFragment.java | 2 +- .../android/fragments/SettingsFragment.java | 22 ++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java index ac780d661..40649c9b1 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java @@ -972,7 +972,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr nonDoneAttachmentCount++; } publishButton.setEnabled((trimmedCharCount>0 || !attachments.isEmpty()) && charCount<=charLimit && nonDoneAttachmentCount==0 && (pollOptions.isEmpty() || nonEmptyPollOptionsCount>1)); - sendError.setVisibility(View.GONE); +// sendError.setVisibility(View.GONE); } private void onCustomEmojiClick(Emoji emoji){ 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 d78158139..0f622a38f 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java @@ -127,13 +127,6 @@ public class SettingsFragment extends MastodonToolbarFragment{ needAppRestart=true; })); - items.add(new SwitchItem(R.string.sk_settings_show_alt_indicator, R.drawable.ic_fluent_scan_text_24_regular, GlobalUserPreferences.showAltIndicator, i->{ - GlobalUserPreferences.showAltIndicator=i.checked; - })); - items.add(new SwitchItem(R.string.sk_settings_show_no_alt_indicator, R.drawable.ic_fluent_important_24_regular, GlobalUserPreferences.showNoAltIndicator, i->{ - GlobalUserPreferences.showNoAltIndicator=i.checked; - })); - items.add(new ButtonItem(R.string.sk_settings_color_palette, R.drawable.ic_fluent_color_24_regular, b->{ PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL); @@ -239,7 +232,7 @@ public class SettingsFragment extends MastodonToolbarFragment{ // needAppRestart=true; // })); - items.add(new HeaderItem(R.string.home_timeline)); + items.add(new HeaderItem(R.string.sk_timelines)); items.add(new SwitchItem(R.string.sk_settings_show_replies, R.drawable.ic_fluent_chat_multiple_24_regular, GlobalUserPreferences.showReplies, i->{ GlobalUserPreferences.showReplies=i.checked; GlobalUserPreferences.save(); @@ -263,6 +256,14 @@ public class SettingsFragment extends MastodonToolbarFragment{ GlobalUserPreferences.save(); })); + items.add(new SwitchItem(R.string.sk_settings_show_alt_indicator, R.drawable.ic_fluent_scan_text_24_regular, GlobalUserPreferences.showAltIndicator, i->{ + GlobalUserPreferences.showAltIndicator=i.checked; + })); + items.add(new SwitchItem(R.string.sk_settings_show_no_alt_indicator, R.drawable.ic_fluent_important_24_regular, GlobalUserPreferences.showNoAltIndicator, i->{ + GlobalUserPreferences.showNoAltIndicator=i.checked; + })); + + items.add(new HeaderItem(R.string.settings_notifications)); items.add(notificationPolicyItem=new NotificationPolicyItem()); PushSubscription pushSubscription=getPushSubscription(); @@ -338,8 +339,9 @@ public class SettingsFragment extends MastodonToolbarFragment{ })); } - items.add(new TextItem(R.string.sk_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sk22/megalodon"), R.drawable.ic_fluent_open_24_regular)); - items.add(new TextItem(R.string.sk_settings_donate, ()->UiUtils.launchWebBrowser(getActivity(), "https://ko-fi.com/xsk22"), R.drawable.ic_fluent_heart_24_regular)); + items.add(new TextItem(R.string.mo_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/LucasGGamerM/moshidon"), R.drawable.ic_fluent_open_24_regular)); + items.add(new TextItem(R.string.sk_settings_donate, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sponsors/LucasGGamerM"), R.drawable.ic_fluent_heart_24_regular)); + LruCache cache = imageCache == null ? null : imageCache.getLruCache(); clearImageCacheItem = new TextItem(R.string.settings_clear_cache, UiUtils.formatFileSize(getContext(), cache != null ? cache.size() : 0, true), this::clearImageCache, 0); items.add(clearImageCacheItem);