From 6d875fd890d6d68cdf52b0105824955c552554f2 Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Wed, 14 Dec 2022 20:39:02 -0300 Subject: [PATCH] It now properly sets a default on every change. Not the final implementation yet --- .../joinmastodon/android/fragments/ComposeFragment.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 b6e5ad690..17e2f5af4 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java @@ -667,7 +667,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr languageButton.setCompoundDrawableTintList(languageButton.getTextColors()); languageButton.setCompoundDrawablePadding(V.dp(6)); - updateLanguage(languageResolver.getDefault()); + updateLanguage(languageResolver.getDefault(accountID)); languagePopup=new PopupMenu(getActivity(), languageButton); languageButton.setOnTouchListener(languagePopup.getDragToOpenListener()); languageButton.setOnClickListener(v->languagePopup.show()); @@ -694,6 +694,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr return languageButton; } + private void setDefaultLanguage(String language) { + GlobalUserPreferences.defaultLanguages.put(accountID, language); + } + @Override public boolean onOptionsItemSelected(MenuItem item){ return true; @@ -850,6 +854,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr newRecentLanguages.remove(language); newRecentLanguages.add(0, language); recentLanguages.put(accountID, newRecentLanguages.stream().limit(4).collect(Collectors.toList())); + setDefaultLanguage(language); GlobalUserPreferences.save(); } }