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

Merge branch 'feature/filter-home-timeline' into fork

Browse Source
This commit is contained in:
sk
2022-11-08 00:27:31 +01:00
parent 6b226cdcad 4615612a65
commit 18df7c32a4
3 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
View File

@@ -105,7 +105,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
GlobalUserPreferences.save(); GlobalUserPreferences.save();
})); }));
items.add(new HeaderItem(R.string.settings_timeline)); items.add(new HeaderItem(R.string.home_timeline));
items.add(new SwitchItem(R.string.settings_show_replies, R.drawable.ic_fluent_chat_multiple_24_regular, GlobalUserPreferences.showReplies, i->{ items.add(new SwitchItem(R.string.settings_show_replies, R.drawable.ic_fluent_chat_multiple_24_regular, GlobalUserPreferences.showReplies, i->{
GlobalUserPreferences.showReplies=i.checked; GlobalUserPreferences.showReplies=i.checked;
GlobalUserPreferences.save(); GlobalUserPreferences.save();

1
mastodon/src/main/res/values-de-rDE/strings.xml
View File

@@ -252,7 +252,6 @@
<string name="theme_dark">Dunkel</string> <string name="theme_dark">Dunkel</string>
<string name="theme_true_black">AMOLED-Modus</string> <string name="theme_true_black">AMOLED-Modus</string>
<string name="settings_behavior">App-Verhalten</string> <string name="settings_behavior">App-Verhalten</string>
<string name="settings_timeline">Timeline</string>
<string name="settings_show_replies">Antworten anzeigen</string> <string name="settings_show_replies">Antworten anzeigen</string>
<string name="settings_show_boosts">Geteilte Beiträge anzeigen</string> <string name="settings_show_boosts">Geteilte Beiträge anzeigen</string>
<string name="settings_gif">Spiele animierte GIFs, Avatare und Emojis ab</string> <string name="settings_gif">Spiele animierte GIFs, Avatare und Emojis ab</string>

1
mastodon/src/main/res/values/strings.xml
View File

@@ -256,7 +256,6 @@
<string name="theme_dark">Dark</string> <string name="theme_dark">Dark</string>
<string name="theme_true_black">True black mode</string> <string name="theme_true_black">True black mode</string>
<string name="settings_behavior">Behavior</string> <string name="settings_behavior">Behavior</string>
<string name="settings_timeline">Timeline</string>
<string name="settings_show_replies">Show replies</string> <string name="settings_show_replies">Show replies</string>
<string name="settings_show_boosts">Show boosts</string> <string name="settings_show_boosts">Show boosts</string>
<string name="settings_gif">Play animated avatars and emoji</string> <string name="settings_gif">Play animated avatars and emoji</string>