owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Superduper buggy. But the preferences side is done, so make sure to merge this commit as well @sk22

Browse Source
This commit is contained in:
LucasGGamerM
2022-12-14 19:59:53 -03:00
parent a2022b25e5
commit 4cbb59850b
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
View File

@@ -29,7 +29,9 @@ public class GlobalUserPreferences{
public static ColorPreference color; public static ColorPreference color;
private final static Type recentLanguagesType = new TypeToken<Map<String, List<String>>>() {}.getType(); private final static Type recentLanguagesType = new TypeToken<Map<String, List<String>>>() {}.getType();
private final static Type defaultLanguagesType = new TypeToken<Map<String, String>>() {}.getType();
public static Map<String, List<String>> recentLanguages; public static Map<String, List<String>> recentLanguages;
public static Map<String, String> defaultLanguages;
private static SharedPreferences getPrefs(){ private static SharedPreferences getPrefs(){
return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE); return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
@@ -55,6 +57,7 @@ public class GlobalUserPreferences{
voteButtonForSingleChoice=prefs.getBoolean("voteButtonForSingleChoice", true); voteButtonForSingleChoice=prefs.getBoolean("voteButtonForSingleChoice", true);
theme=ThemePreference.values()[prefs.getInt("theme", 0)]; theme=ThemePreference.values()[prefs.getInt("theme", 0)];
recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>()); recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>());
defaultLanguages=fromJson(prefs.getString("defaultLanguages", "{}"), defaultLanguagesType, new HashMap<>());
color=ColorPreference.values()[prefs.getInt("color", 1)]; color=ColorPreference.values()[prefs.getInt("color", 1)];
} }
@@ -72,6 +75,7 @@ public class GlobalUserPreferences{
.putBoolean("disableMarquee", disableMarquee) .putBoolean("disableMarquee", disableMarquee)
.putInt("theme", theme.ordinal()) .putInt("theme", theme.ordinal())
.putString("recentLanguages", gson.toJson(recentLanguages)) .putString("recentLanguages", gson.toJson(recentLanguages))
.putString("defaultLanguages", gson.toJson(defaultLanguages))
.putInt("color", color.ordinal()) .putInt("color", color.ordinal())
.apply(); .apply();
} }

5
mastodon/src/main/java/org/joinmastodon/android/utils/MastodonLanguage.java
View File

@@ -93,8 +93,9 @@ public class MastodonLanguage {
.orElse(fallbackLanguage); .orElse(fallbackLanguage);
} }
public MastodonLanguage getDefault() { public MastodonLanguage getDefault(String accountID) {
return from(Locale.getDefault().getLanguage());
return from(Locale.getDefault().getLanguage());
} }
} }
} }