ProfessionalUwU/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2024-09-20 04:32:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed many unused strings

Browse Source 
Closes #263
This commit is contained in:
Bazsalanszky 2024-07-19 09:40:20 +02:00
parent 1395eee2df
commit 2a2e7c0e87
25 changed files with 32 additions and 410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/AndroidManifest.xml
View File

@ -136,11 +136,7 @@
android:name=".activities.FetchRandomSubredditOrPostActivity"
android:parentActivityName=".activities.MainActivity"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".activities.GiveAwardActivity"
android:label="@string/give_award_activity_label"
android:parentActivityName=".activities.MainActivity"
android:theme="@style/AppTheme.Slidable" />
<activity
android:name=".activities.SelectUserFlairActivity"
android:parentActivityName=".activities.MainActivity"

59
app/src/main/java/eu/toldi/infinityforlemmy/activities/CustomizePostFilterActivity.java
View File

@ -157,14 +157,7 @@ public class CustomizePostFilterActivity extends BaseActivity {
TextInputEditText excludesUsersTextInputEditText;
@BindView(R.id.add_users_image_view_customize_post_filter_activity)
ImageView addUsersImageView;
@BindView(R.id.excludes_flairs_text_input_layout_customize_post_filter_activity)
TextInputLayout excludesFlairsTextInputLayout;
@BindView(R.id.excludes_flairs_text_input_edit_text_customize_post_filter_activity)
TextInputEditText excludesFlairsTextInputEditText;
@BindView(R.id.contains_flairs_text_input_layout_customize_post_filter_activity)
TextInputLayout containsFlairsTextInputLayout;
@BindView(R.id.contains_flairs_text_input_edit_text_customize_post_filter_activity)
TextInputEditText containsFlairsTextInputEditText;
@BindView(R.id.exclude_domains_text_input_layout_customize_post_filter_activity)
TextInputLayout excludeDomainsTextInputLayout;
@BindView(R.id.exclude_domains_text_input_edit_text_customize_post_filter_activity)
@ -189,14 +182,7 @@ public class CustomizePostFilterActivity extends BaseActivity {
TextInputLayout maxCommentsTextInputLayout;
@BindView(R.id.max_comments_text_input_edit_text_customize_post_filter_activity)
TextInputEditText maxCommentsTextInputEditText;
@BindView(R.id.min_awards_text_input_layout_customize_post_filter_activity)
TextInputLayout minAwardsTextInputLayout;
@BindView(R.id.min_awards_text_input_edit_text_customize_post_filter_activity)
TextInputEditText minAwardsTextInputEditText;
@BindView(R.id.max_awards_text_input_layout_customize_post_filter_activity)
TextInputLayout maxAwardsTextInputLayout;
@BindView(R.id.max_awards_text_input_edit_text_customize_post_filter_activity)
TextInputEditText maxAwardsTextInputEditText;
@Inject
RedditDataRoomDatabase mRedditDataRoomDatabase;
@Inject
@ -323,16 +309,12 @@ public class CustomizePostFilterActivity extends BaseActivity {
titleContainsRegexTextInputEditText.setText(postFilter.postTitleContainsRegex);
excludesSubredditsTextInputEditText.setText(postFilter.excludeSubreddits);
excludesUsersTextInputEditText.setText(postFilter.excludeUsers);
excludesFlairsTextInputEditText.setText(postFilter.excludeFlairs);
containsFlairsTextInputEditText.setText(postFilter.containFlairs);
excludeDomainsTextInputEditText.setText(postFilter.excludeDomains);
containDomainsTextInputEditText.setText(postFilter.containDomains);
minVoteTextInputEditText.setText(Integer.toString(postFilter.minVote));
maxVoteTextInputEditText.setText(Integer.toString(postFilter.maxVote));
minCommentsTextInputEditText.setText(Integer.toString(postFilter.minComments));
maxCommentsTextInputEditText.setText(Integer.toString(postFilter.maxComments));
minAwardsTextInputEditText.setText(Integer.toString(postFilter.minAwards));
maxAwardsTextInputEditText.setText(Integer.toString(postFilter.maxAwards));
Intent intent = getIntent();
String excludeSubreddit = intent.getStringExtra(EXTRA_EXCLUDE_SUBREDDIT);
@ -354,18 +336,6 @@ public class CustomizePostFilterActivity extends BaseActivity {
}
excludesUsersTextInputEditText.append(excludeUser);
}
if (excludeFlair != null && !excludeFlair.equals("")) {
if (!excludesFlairsTextInputEditText.getText().toString().equals("")) {
excludesFlairsTextInputEditText.append(",");
}
excludesFlairsTextInputEditText.append(excludeFlair);
}
if (containFlair != null && !containFlair.equals("")) {
if (!containsFlairsTextInputEditText.getText().toString().equals("")) {
containsFlairsTextInputEditText.append(",");
}
containsFlairsTextInputEditText.append(containFlair);
}
if (excludeDomain != null && !excludeDomain.equals("")) {
if (!excludeDomainsTextInputEditText.getText().toString().equals("")) {
excludeDomainsTextInputEditText.append(",");
@ -428,12 +398,6 @@ public class CustomizePostFilterActivity extends BaseActivity {
excludesUsersTextInputLayout.setDefaultHintTextColor(ColorStateList.valueOf(primaryTextColor));
excludesUsersTextInputEditText.setTextColor(primaryTextColor);
addUsersImageView.setImageDrawable(Utils.getTintedDrawable(this, R.drawable.ic_add_24dp, primaryIconColor));
excludesFlairsTextInputLayout.setBoxStrokeColor(primaryTextColor);
excludesFlairsTextInputLayout.setDefaultHintTextColor(ColorStateList.valueOf(primaryTextColor));
excludesFlairsTextInputEditText.setTextColor(primaryTextColor);
containsFlairsTextInputLayout.setBoxStrokeColor(primaryTextColor);
containsFlairsTextInputLayout.setDefaultHintTextColor(ColorStateList.valueOf(primaryTextColor));
containsFlairsTextInputEditText.setTextColor(primaryTextColor);
excludeDomainsTextInputLayout.setBoxStrokeColor(primaryTextColor);
excludeDomainsTextInputLayout.setDefaultHintTextColor(ColorStateList.valueOf(primaryTextColor));
excludeDomainsTextInputEditText.setTextColor(primaryTextColor);
@ -452,13 +416,6 @@ public class CustomizePostFilterActivity extends BaseActivity {
maxCommentsTextInputLayout.setBoxStrokeColor(primaryTextColor);
maxCommentsTextInputLayout.setDefaultHintTextColor(ColorStateList.valueOf(primaryTextColor));
maxCommentsTextInputEditText.setTextColor(primaryTextColor);
minAwardsTextInputLayout.setBoxStrokeColor(primaryTextColor);
minAwardsTextInputLayout.setDefaultHintTextColor(ColorStateList.valueOf(primaryTextColor));
minAwardsTextInputEditText.setTextColor(primaryTextColor);
maxAwardsTextInputLayout.setBoxStrokeColor(primaryTextColor);
maxAwardsTextInputLayout.setDefaultHintTextColor(ColorStateList.valueOf(primaryTextColor));
maxAwardsTextInputEditText.setTextColor(primaryTextColor);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
nameTextInputEditText.setTextCursorDrawable(cursorDrawable);
titleExcludesStringsTextInputEditText.setTextCursorDrawable(cursorDrawable);
@ -467,16 +424,12 @@ public class CustomizePostFilterActivity extends BaseActivity {
titleContainsRegexTextInputEditText.setTextCursorDrawable(cursorDrawable);
excludesSubredditsTextInputEditText.setTextCursorDrawable(cursorDrawable);
excludesUsersTextInputEditText.setTextCursorDrawable(cursorDrawable);
excludesFlairsTextInputEditText.setTextCursorDrawable(cursorDrawable);
containsFlairsTextInputEditText.setTextCursorDrawable(cursorDrawable);
excludeDomainsTextInputEditText.setTextCursorDrawable(cursorDrawable);
containDomainsTextInputEditText.setTextCursorDrawable(cursorDrawable);
minVoteTextInputEditText.setTextCursorDrawable(cursorDrawable);
maxVoteTextInputEditText.setTextCursorDrawable(cursorDrawable);
minCommentsTextInputEditText.setTextCursorDrawable(cursorDrawable);
maxCommentsTextInputEditText.setTextCursorDrawable(cursorDrawable);
minAwardsTextInputEditText.setTextCursorDrawable(cursorDrawable);
maxAwardsTextInputEditText.setTextCursorDrawable(cursorDrawable);
} else {
setCursorDrawableColor(nameTextInputEditText, primaryTextColor);
setCursorDrawableColor(titleExcludesStringsTextInputEditText, primaryTextColor);
@ -485,16 +438,12 @@ public class CustomizePostFilterActivity extends BaseActivity {
setCursorDrawableColor(titleContainsRegexTextInputEditText, primaryTextColor);
setCursorDrawableColor(excludesSubredditsTextInputEditText, primaryTextColor);
setCursorDrawableColor(excludesUsersTextInputEditText, primaryTextColor);
setCursorDrawableColor(excludesFlairsTextInputEditText, primaryTextColor);
setCursorDrawableColor(containsFlairsTextInputEditText, primaryTextColor);
setCursorDrawableColor(excludeDomainsTextInputEditText, primaryTextColor);
setCursorDrawableColor(containDomainsTextInputEditText, primaryTextColor);
setCursorDrawableColor(minVoteTextInputEditText, primaryTextColor);
setCursorDrawableColor(maxVoteTextInputEditText, primaryTextColor);
setCursorDrawableColor(minCommentsTextInputEditText, primaryTextColor);
setCursorDrawableColor(maxCommentsTextInputEditText, primaryTextColor);
setCursorDrawableColor(minAwardsTextInputEditText, primaryTextColor);
setCursorDrawableColor(maxAwardsTextInputEditText, primaryTextColor);
}
if (typeface != null) {
@ -639,8 +588,6 @@ public class CustomizePostFilterActivity extends BaseActivity {
postFilter.minVote = minVoteTextInputEditText.getText() == null || minVoteTextInputEditText.getText().toString().equals("") ? -1 : Integer.parseInt(minVoteTextInputEditText.getText().toString());
postFilter.maxComments = maxCommentsTextInputEditText.getText() == null || maxCommentsTextInputEditText.getText().toString().equals("") ? -1 : Integer.parseInt(maxCommentsTextInputEditText.getText().toString());
postFilter.minComments = minCommentsTextInputEditText.getText() == null || minCommentsTextInputEditText.getText().toString().equals("") ? -1 : Integer.parseInt(minCommentsTextInputEditText.getText().toString());
postFilter.maxAwards = maxAwardsTextInputEditText.getText() == null || maxAwardsTextInputEditText.getText().toString().equals("") ? -1 : Integer.parseInt(maxAwardsTextInputEditText.getText().toString());
postFilter.minAwards = minAwardsTextInputEditText.getText() == null || minAwardsTextInputEditText.getText().toString().equals("") ? -1 : Integer.parseInt(minAwardsTextInputEditText.getText().toString());
postFilter.postTitleExcludesRegex = titleExcludesRegexTextInputEditText.getText().toString();
Pattern.compile(postFilter.postTitleExcludesRegex);
postFilter.postTitleContainsRegex = titleContainsRegexTextInputEditText.getText().toString();
@ -649,8 +596,6 @@ public class CustomizePostFilterActivity extends BaseActivity {
postFilter.postTitleContainsStrings = titleContainsStringsTextInputEditText.getText().toString();
postFilter.excludeSubreddits = excludesSubredditsTextInputEditText.getText().toString();
postFilter.excludeUsers = excludesUsersTextInputEditText.getText().toString();
postFilter.excludeFlairs = excludesFlairsTextInputEditText.getText().toString();
postFilter.containFlairs = containsFlairsTextInputEditText.getText().toString();
postFilter.excludeDomains = excludeDomainsTextInputEditText.getText().toString();
postFilter.containDomains = containDomainsTextInputEditText.getText().toString();
postFilter.containTextType = postTypeTextCheckBox.isChecked();

6
app/src/main/java/eu/toldi/infinityforlemmy/activities/GiveAwardActivity.java
View File

@ -117,7 +117,7 @@ public class GiveAwardActivity extends BaseActivity {
View layout = inflater.inflate(R.layout.dialog_give_award, null);
MaterialSwitch materialSwitch = layout.findViewById(R.id.switch_material_give_award_dialog);
new MaterialAlertDialogBuilder(this)
.setTitle(R.string.give_award_dialog_title)
.setTitle("")
.setView(layout)
.setPositiveButton(R.string.yes, (dialogInterface, i) -> {
boolean isAnonymous = materialSwitch.isChecked();
@ -138,10 +138,10 @@ public class GiveAwardActivity extends BaseActivity {
public void failed(int code, String message) {
View layout = inflater.inflate(R.layout.copy_text_material_dialog, null);
TextView textView = layout.findViewById(R.id.text_view_copy_text_material_dialog);
String text = getString(R.string.give_award_error_message, code, message == null ? "" : message);
String text = "";
textView.setText(text);
new MaterialAlertDialogBuilder(GiveAwardActivity.this, R.style.CopyTextMaterialAlertDialogTheme)
.setTitle(R.string.give_award_failed)
.setTitle("")
.setView(layout)
.setPositiveButton(R.string.copy_all, (dialogInterface, i) -> {
ClipboardManager clipboard = (ClipboardManager) GiveAwardActivity.this.getSystemService(Context.CLIPBOARD_SERVICE);

1
app/src/main/java/eu/toldi/infinityforlemmy/activities/PostFilterUsageListingActivity.java
View File

@ -147,7 +147,6 @@ public class PostFilterUsageListingActivity extends BaseActivity {
titleStringId = R.string.user;
break;
case PostFilterUsage.MULTIREDDIT_TYPE:
textInputEditText.setHint(R.string.settings_tab_multi_reddit_name);
titleStringId = R.string.multi_reddit;
break;
}

14
app/src/main/java/eu/toldi/infinityforlemmy/activities/SelectUserFlairActivity.java
View File

@ -138,7 +138,7 @@ public class SelectUserFlairActivity extends BaseActivity implements ActivityToo
flairEditText.requestFocus();
Utils.showKeyboard(this, new Handler(), flairEditText);
new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme)
.setTitle(R.string.edit_flair)
.setTitle("")
.setView(dialogView)
.setPositiveButton(R.string.ok, (dialogInterface, i)
-> {
@ -156,13 +156,13 @@ public class SelectUserFlairActivity extends BaseActivity implements ActivityToo
} else {
if (userFlair == null) {
new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme)
.setTitle(R.string.clear_user_flair)
.setTitle("")
.setPositiveButton(R.string.yes, (dialogInterface, i) -> selectUserFlair(userFlair))
.setNegativeButton(R.string.no, null)
.show();
} else {
new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme)
.setTitle(R.string.select_this_user_flair)
.setTitle("")
.setMessage(userFlair.getText())
.setPositiveButton(R.string.yes, (dialogInterface, i) -> selectUserFlair(userFlair))
.setNegativeButton(R.string.no, null)
@ -181,9 +181,9 @@ public class SelectUserFlairActivity extends BaseActivity implements ActivityToo
@Override
public void success() {
if (userFlair == null) {
Toast.makeText(SelectUserFlairActivity.this, R.string.clear_user_flair_success, Toast.LENGTH_SHORT).show();
Toast.makeText(SelectUserFlairActivity.this, "", Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(SelectUserFlairActivity.this, R.string.select_user_flair_success, Toast.LENGTH_SHORT).show();
Toast.makeText(SelectUserFlairActivity.this, "", Toast.LENGTH_SHORT).show();
}
finish();
}
@ -192,9 +192,9 @@ public class SelectUserFlairActivity extends BaseActivity implements ActivityToo
public void failed(String errorMessage) {
if (errorMessage == null || errorMessage.equals("")) {
if (userFlair == null) {
Snackbar.make(coordinatorLayout, R.string.clear_user_flair_success, Snackbar.LENGTH_SHORT).show();
Snackbar.make(coordinatorLayout, "", Snackbar.LENGTH_SHORT).show();
} else {
Snackbar.make(coordinatorLayout, R.string.select_user_flair_success, Snackbar.LENGTH_SHORT).show();
Snackbar.make(coordinatorLayout, "", Snackbar.LENGTH_SHORT).show();
}
} else {
Snackbar.make(coordinatorLayout, errorMessage, Snackbar.LENGTH_SHORT).show();

46
app/src/main/java/eu/toldi/infinityforlemmy/activities/SubmitCrosspostActivity.java
View File

@ -71,7 +71,7 @@ import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
import pl.droidsonroids.gif.GifImageView;
import retrofit2.Retrofit;
public class SubmitCrosspostActivity extends BaseActivity implements FlairBottomSheetFragment.FlairSelectionCallback,
public class SubmitCrosspostActivity extends BaseActivity implements
AccountChooserBottomSheetFragment.AccountChooserListener {
public static final String EXTRA_POST = "EP";
@ -110,8 +110,6 @@ public class SubmitCrosspostActivity extends BaseActivity implements FlairBottom
MaterialButton rulesButton;
@BindView(R.id.divider_1_submit_crosspost_activity)
View divider1;
@BindView(R.id.flair_custom_text_view_submit_crosspost_activity)
CustomTextView flairTextView;
@BindView(R.id.nsfw_custom_text_view_submit_crosspost_activity)
CustomTextView nsfwTextView;
@BindView(R.id.divider_2_submit_crosspost_activity)
@ -240,7 +238,6 @@ public class SubmitCrosspostActivity extends BaseActivity implements FlairBottom
if (subredditName != null) {
subredditNameTextView.setTextColor(primaryTextColor);
subredditNameTextView.setText(subredditName);
flairTextView.setVisibility(View.VISIBLE);
if (!loadSubredditIconSuccessful) {
loadSubredditIcon();
}
@ -251,12 +248,6 @@ public class SubmitCrosspostActivity extends BaseActivity implements FlairBottom
mPostingSnackbar.show();
}
if (flair != null) {
flairTextView.setText(flair.getText());
flairTextView.setBackgroundColor(flairBackgroundColor);
flairTextView.setBorderColor(flairBackgroundColor);
flairTextView.setTextColor(flairTextColor);
}
if (isNSFW) {
nsfwTextView.setBackgroundColor(nsfwBackgroundColor);
nsfwTextView.setBorderColor(nsfwBackgroundColor);
@ -342,27 +333,6 @@ public class SubmitCrosspostActivity extends BaseActivity implements FlairBottom
}
});
flairTextView.setOnClickListener(view -> {
if (flair == null) {
flairSelectionBottomSheetFragment = new FlairBottomSheetFragment();
Bundle bundle = new Bundle();
bundle.putString(FlairBottomSheetFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
if (subredditIsUser) {
bundle.putString(FlairBottomSheetFragment.EXTRA_SUBREDDIT_NAME, "u_" + subredditName);
} else {
bundle.putString(FlairBottomSheetFragment.EXTRA_SUBREDDIT_NAME, subredditName);
}
flairSelectionBottomSheetFragment.setArguments(bundle);
flairSelectionBottomSheetFragment.show(getSupportFragmentManager(), flairSelectionBottomSheetFragment.getTag());
} else {
flairTextView.setBackgroundColor(resources.getColor(android.R.color.transparent));
flairTextView.setTextColor(primaryTextColor);
flairTextView.setText(getString(R.string.flair));
flair = null;
}
});
nsfwTextView.setOnClickListener(view -> {
if (!isNSFW) {
nsfwTextView.setBackgroundColor(nsfwBackgroundColor);
@ -442,7 +412,6 @@ public class SubmitCrosspostActivity extends BaseActivity implements FlairBottom
spoilerTextColor = mCustomThemeWrapper.getSpoilerTextColor();
nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor();
nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor();
flairTextView.setTextColor(primaryTextColor);
nsfwTextView.setTextColor(primaryTextColor);
titleEditText.setTextColor(primaryTextColor);
titleEditText.setHintTextColor(secondaryTextColor);
@ -454,7 +423,6 @@ public class SubmitCrosspostActivity extends BaseActivity implements FlairBottom
subredditNameTextView.setTypeface(typeface);
rulesButton.setTypeface(typeface);
receivePostReplyNotificationsTextView.setTypeface(typeface);
flairTextView.setTypeface(typeface);
nsfwTextView.setTypeface(typeface);
titleEditText.setTypeface(typeface);
}
@ -612,10 +580,6 @@ public class SubmitCrosspostActivity extends BaseActivity implements FlairBottom
subredditNameTextView.setText(subredditName);
displaySubredditIcon();
flairTextView.setVisibility(View.VISIBLE);
flairTextView.setBackgroundColor(resources.getColor(android.R.color.transparent));
flairTextView.setTextColor(primaryTextColor);
flairTextView.setText(getString(R.string.flair));
flair = null;
}
}
@ -627,14 +591,6 @@ public class SubmitCrosspostActivity extends BaseActivity implements FlairBottom
super.onDestroy();
}
@Override
public void flairSelected(Flair flair) {
this.flair = flair;
flairTextView.setText(flair.getText());
flairTextView.setBackgroundColor(flairBackgroundColor);
flairTextView.setBorderColor(flairBackgroundColor);
flairTextView.setTextColor(flairTextColor);
}
@Override
public void onAccountSelected(Account account) {

2
app/src/main/java/eu/toldi/infinityforlemmy/adapters/FlairBottomSheetRecyclerViewAdapter.java
View File

@ -52,7 +52,7 @@ public class FlairBottomSheetRecyclerViewAdapter extends RecyclerView.Adapter<Fl
flairEditText.requestFocus();
Utils.showKeyboard(activity, new Handler(), flairEditText);
new MaterialAlertDialogBuilder(activity, R.style.MaterialAlertDialogTheme)
.setTitle(R.string.edit_flair)
.setTitle("")
.setView(dialogView)
.setPositiveButton(R.string.ok, (dialogInterface, i)
-> {

1
app/src/main/java/eu/toldi/infinityforlemmy/adapters/UserFlairRecyclerViewAdapter.java
View File

@ -47,7 +47,6 @@ public class UserFlairRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerV
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
if (holder instanceof UserFlairViewHolder) {
if (position == 0) {
((UserFlairViewHolder) holder).userFlairHtmlTextView.setText(R.string.clear_user_flair);
((UserFlairViewHolder) holder).editUserFlairImageView.setVisibility(View.GONE);
} else {
UserFlair userFlair = userFlairs.get(holder.getBindingAdapterPosition() - 1);

4
app/src/main/java/eu/toldi/infinityforlemmy/bottomsheetfragments/FlairBottomSheetFragment.java
View File

@ -111,7 +111,7 @@ public class FlairBottomSheetFragment extends LandscapeExpandedBottomSheetDialog
progressBar.setVisibility(View.GONE);
if (flairs == null || flairs.size() == 0) {
errorTextView.setVisibility(View.VISIBLE);
errorTextView.setText(R.string.no_flair);
errorTextView.setText("");
} else {
errorTextView.setVisibility(View.GONE);
mAdapter.changeDataset(flairs);
@ -122,7 +122,7 @@ public class FlairBottomSheetFragment extends LandscapeExpandedBottomSheetDialog
public void fetchFailed() {
progressBar.setVisibility(View.GONE);
errorTextView.setVisibility(View.VISIBLE);
errorTextView.setText(R.string.error_loading_flairs);
errorTextView.setText("");
errorTextView.setOnClickListener(view -> fetchFlairs());
}
});

26
app/src/main/java/eu/toldi/infinityforlemmy/customtheme/CustomThemeSettingsItem.java
View File

@ -160,10 +160,6 @@ public class CustomThemeSettingsItem implements Parcelable {
context.getString(R.string.theme_item_fully_collapsed_comment_background_color),
context.getString(R.string.theme_item_fully_collapsed_comment_background_color_detail),
customTheme.fullyCollapsedCommentBackgroundColor));
customThemeSettingsItems.add(new CustomThemeSettingsItem(
context.getString(R.string.theme_item_awarded_comment_background_color),
context.getString(R.string.theme_item_awarded_comment_background_color_detail),
customTheme.awardedCommentBackgroundColor));
customThemeSettingsItems.add(new CustomThemeSettingsItem(
context.getString(R.string.theme_item_received_message_background_color),
context.getString(R.string.theme_item_received_message_background_color_detail),
@ -276,24 +272,6 @@ public class CustomThemeSettingsItem implements Parcelable {
context.getString(R.string.theme_item_nsfw_text_color),
context.getString(R.string.theme_item_nsfw_text_color_detail),
customTheme.nsfwTextColor));
customThemeSettingsItems.add(new CustomThemeSettingsItem(
context.getString(R.string.theme_item_flair_background_color),
context.getString(R.string.theme_item_flair_background_color_detail),
customTheme.flairBackgroundColor));
customThemeSettingsItems.add(new CustomThemeSettingsItem(
context.getString(R.string.theme_item_flair_text_color),
context.getString(R.string.theme_item_flair_text_color_detail),
customTheme.flairTextColor));
customThemeSettingsItems.add(new CustomThemeSettingsItem(
context.getString(R.string.theme_item_awards_background_color),
context.getString(R.string.theme_item_awards_background_color_detail),
customTheme.awardsBackgroundColor
));
customThemeSettingsItems.add(new CustomThemeSettingsItem(
context.getString(R.string.theme_item_awards_text_color),
context.getString(R.string.theme_item_awards_text_color_detail),
customTheme.awardsTextColor
));
customThemeSettingsItems.add(new CustomThemeSettingsItem(
context.getString(R.string.theme_item_archived_tint),
context.getString(R.string.theme_item_archived_tint_detail),
@ -336,10 +314,6 @@ public class CustomThemeSettingsItem implements Parcelable {
context.getString(R.string.theme_item_community_color),
context.getString(R.string.theme_item_community_color_detail),
customTheme.subreddit));
customThemeSettingsItems.add(new CustomThemeSettingsItem(
context.getString(R.string.theme_item_author_flair_text_color),
context.getString(R.string.theme_item_author_flair_text_color_detail),
customTheme.authorFlairTextColor));
customThemeSettingsItems.add(new CustomThemeSettingsItem(
context.getString(R.string.theme_item_submitter_color),
context.getString(R.string.theme_item_submitter_color_detail),

4
app/src/main/java/eu/toldi/infinityforlemmy/fragments/ThemePreviewCommentsFragment.java
View File

@ -44,7 +44,6 @@ public class ThemePreviewCommentsFragment extends Fragment {
binding.authorTextViewThemePreviewCommentsFragment.setTextColor(customTheme.moderator);
binding.commentTimeTextViewThemePreviewCommentsFragment.setTextColor(customTheme.secondaryTextColor);
binding.commentMarkdownViewThemePreviewCommentsFragment.setTextColor(customTheme.commentColor);
binding.authorFlairTextViewThemePreviewCommentsFragment.setTextColor(customTheme.authorFlairTextColor);
binding.dividerThemePreviewCommentsFragment.setBackgroundColor(customTheme.dividerColor);
binding.upvoteButtonThemePreviewCommentsFragment.setIconTint(ColorStateList.valueOf(customTheme.commentIconAndInfoColor));
binding.upvoteButtonThemePreviewCommentsFragment.setTextColor(customTheme.commentIconAndInfoColor);
@ -59,7 +58,6 @@ public class ThemePreviewCommentsFragment extends Fragment {
binding.authorTextViewAwardBackgroundThemePreviewCommentsFragment.setTextColor(customTheme.moderator);
binding.commentTimeTextViewAwardBackgroundThemePreviewCommentsFragment.setTextColor(customTheme.secondaryTextColor);
binding.commentMarkdownViewAwardBackgroundThemePreviewCommentsFragment.setTextColor(customTheme.commentColor);
binding.authorFlairTextViewAwardBackgroundThemePreviewCommentsFragment.setTextColor(customTheme.authorFlairTextColor);
binding.dividerAwardBackgroundThemePreviewCommentsFragment.setBackgroundColor(customTheme.dividerColor);
binding.upvoteButtonAwardBackgroundThemePreviewCommentsFragment.setIconTint(ColorStateList.valueOf(customTheme.commentIconAndInfoColor));
binding.upvoteButtonAwardBackgroundThemePreviewCommentsFragment.setTextColor(customTheme.commentIconAndInfoColor);
@ -77,12 +75,10 @@ public class ThemePreviewCommentsFragment extends Fragment {
if (activity.typeface != null) {
binding.authorTextViewThemePreviewCommentsFragment.setTypeface(activity.typeface);
binding.commentTimeTextViewThemePreviewCommentsFragment.setTypeface(activity.typeface);
binding.authorFlairTextViewThemePreviewCommentsFragment.setTypeface(activity.typeface);
binding.upvoteButtonThemePreviewCommentsFragment.setTypeface(activity.typeface);
binding.authorTextViewAwardBackgroundThemePreviewCommentsFragment.setTypeface(activity.typeface);
binding.commentTimeTextViewAwardBackgroundThemePreviewCommentsFragment.setTypeface(activity.typeface);
binding.authorFlairTextViewAwardBackgroundThemePreviewCommentsFragment.setTypeface(activity.typeface);
binding.upvoteButtonAwardBackgroundThemePreviewCommentsFragment.setTypeface(activity.typeface);
binding.authorTextViewFullyCollapsedThemePreviewCommentsFragment.setTypeface(activity.typeface);

8
app/src/main/java/eu/toldi/infinityforlemmy/fragments/ThemePreviewPostsFragment.java
View File

@ -61,12 +61,6 @@ public class ThemePreviewPostsFragment extends Fragment {
binding.nsfwTextViewThemePreviewPostsFragment.setBackgroundColor(customTheme.nsfwBackgroundColor);
binding.nsfwTextViewThemePreviewPostsFragment.setBorderColor(customTheme.nsfwBackgroundColor);
binding.nsfwTextViewThemePreviewPostsFragment.setTextColor(customTheme.nsfwTextColor);
binding.flairCustomTextViewThemePreviewPostsFragment.setBackgroundColor(customTheme.flairBackgroundColor);
binding.flairCustomTextViewThemePreviewPostsFragment.setBorderColor(customTheme.flairBackgroundColor);
binding.flairCustomTextViewThemePreviewPostsFragment.setTextColor(customTheme.flairTextColor);
binding.awardsTextViewThemePreviewPostsFragment.setBackgroundColor(customTheme.awardsBackgroundColor);
binding.awardsTextViewThemePreviewPostsFragment.setBorderColor(customTheme.awardsBackgroundColor);
binding.awardsTextViewThemePreviewPostsFragment.setTextColor(customTheme.awardsTextColor);
binding.archivedImageViewThemePreviewPostsFragment.setColorFilter(customTheme.archivedTint, PorterDuff.Mode.SRC_IN);
binding.lockedImageViewThemePreviewPostsFragment.setColorFilter(customTheme.lockedIconTint, PorterDuff.Mode.SRC_IN);
binding.crosspostImageViewThemePreviewPostsFragment.setColorFilter(customTheme.crosspostIconTint, PorterDuff.Mode.SRC_IN);
@ -92,8 +86,6 @@ public class ThemePreviewPostsFragment extends Fragment {
binding.typeTextViewThemePreviewPostsFragment.setTypeface(activity.typeface);
binding.spoilerCustomTextViewThemePreviewPostsFragment.setTypeface(activity.typeface);
binding.nsfwTextViewThemePreviewPostsFragment.setTypeface(activity.typeface);
binding.flairCustomTextViewThemePreviewPostsFragment.setTypeface(activity.typeface);
binding.awardsTextViewThemePreviewPostsFragment.setTypeface(activity.typeface);
binding.linkTextViewThemePreviewPostsFragment.setTypeface(activity.typeface);
binding.upvoteButtonThemePreviewPostsFragment.setTypeface(activity.typeface);
binding.commentsCountButtonThemePreviewPostsFragment.setTypeface(activity.typeface);

12
app/src/main/java/eu/toldi/infinityforlemmy/settings/CustomizeMainPageTabsFragment.java
View File

@ -280,7 +280,7 @@ public class CustomizeMainPageTabsFragment extends Fragment {
titleId = R.string.settings_tab_community_name;
break;
case SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_MULTIREDDIT:
titleId = R.string.settings_tab_multi_reddit_name;
titleId = R.string.multi_reddit;
break;
case SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_USER:
titleId = R.string.settings_tab_username;
@ -366,7 +366,7 @@ public class CustomizeMainPageTabsFragment extends Fragment {
titleId = R.string.settings_tab_community_name;
break;
case SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_MULTIREDDIT:
titleId = R.string.settings_tab_multi_reddit_name;
titleId = R.string.multi_reddit;
break;
case SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_USER:
titleId = R.string.settings_tab_username;
@ -452,7 +452,7 @@ public class CustomizeMainPageTabsFragment extends Fragment {
titleId = R.string.settings_tab_community_name;
break;
case SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_MULTIREDDIT:
titleId = R.string.settings_tab_multi_reddit_name;
titleId = R.string.multi_reddit;
break;
case SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_USER:
titleId = R.string.settings_tab_username;
@ -564,7 +564,7 @@ public class CustomizeMainPageTabsFragment extends Fragment {
break;
case SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_MULTIREDDIT:
constraintLayout.setVisibility(View.VISIBLE);
titleTextView.setText(R.string.settings_tab_multi_reddit_name);
titleTextView.setText(R.string.multi_reddit);
break;
case SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_USER:
constraintLayout.setVisibility(View.VISIBLE);
@ -583,7 +583,7 @@ public class CustomizeMainPageTabsFragment extends Fragment {
break;
case SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_MULTIREDDIT:
linearLayout.setVisibility(View.VISIBLE);
titleTextView.setText(R.string.settings_tab_multi_reddit_name);
titleTextView.setText(R.string.multi_reddit);
break;
case SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_USER:
linearLayout.setVisibility(View.VISIBLE);
@ -602,7 +602,7 @@ public class CustomizeMainPageTabsFragment extends Fragment {
break;
case SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_MULTIREDDIT:
constraintLayout.setVisibility(View.VISIBLE);
titleTextView.setText(R.string.settings_tab_multi_reddit_name);
titleTextView.setText(R.string.multi_reddit);
break;
case SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_USER:
constraintLayout.setVisibility(View.VISIBLE);

86
app/src/main/res/layout/activity_customize_post_filter.xml
View File

@ -463,48 +463,6 @@
</LinearLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/excludes_flairs_text_input_layout_customize_post_filter_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/excludes_flairs_text_input_edit_text_customize_post_filter_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
android:hint="@string/exclude_flairs_hint"
android:maxLines="10" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/contains_flairs_text_input_layout_customize_post_filter_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/contains_flairs_text_input_edit_text_customize_post_filter_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
android:hint="@string/contain_flairs_hint"
android:maxLines="10" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/exclude_domains_text_input_layout_customize_post_filter_activity"
android:layout_width="match_parent"
@ -635,50 +593,6 @@
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/min_awards_text_input_layout_customize_post_filter_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/min_awards_text_input_edit_text_customize_post_filter_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="numberSigned"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
android:hint="@string/min_awards_hint"
android:maxLines="1" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/max_awards_text_input_layout_customize_post_filter_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/max_awards_text_input_edit_text_customize_post_filter_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="numberSigned"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
android:hint="@string/max_awards_hint"
android:maxLines="1" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>

2
app/src/main/res/layout/activity_give_award.xml
View File

@ -18,7 +18,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize"
app:title="@string/give_award_activity_label"
app:title=""
app:popupTheme="@style/AppTheme.PopupOverlay"
app:navigationIcon="?attr/homeAsUpIndicator" />

14
app/src/main/res/layout/activity_submit_crosspost.xml
View File

@ -109,20 +109,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.libRG.CustomTextView
android:id="@+id/flair_custom_text_view_submit_crosspost_activity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:padding="4dp"
android:text="@string/flair"
android:textColor="?attr/primaryTextColor"
android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family"
android:visibility="gone"
app:lib_setRadius="6dp"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<com.libRG.CustomTextView
android:id="@+id/nsfw_custom_text_view_submit_crosspost_activity"

2
app/src/main/res/layout/dialog_edit_flair.xml
View File

@ -12,7 +12,7 @@
android:textColor="?attr/primaryTextColor"
android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family"
android:hint="@string/flair"
android:hint=""
android:maxLength="64" />
<TextView

8
app/src/main/res/layout/fragment_karma_info_bottom_sheet.xml
View File

@ -13,7 +13,7 @@
android:paddingTop="16dp"
android:paddingStart="32dp"
android:paddingEnd="32dp"
android:text="@string/post_karma"
android:text=""
android:textColor="?attr/primaryTextColor"
android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family" />
@ -37,7 +37,7 @@
android:paddingTop="16dp"
android:paddingStart="32dp"
android:paddingEnd="32dp"
android:text="@string/comment_karma"
android:text=""
android:textColor="?attr/primaryTextColor"
android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family" />
@ -61,7 +61,7 @@
android:paddingTop="16dp"
android:paddingStart="32dp"
android:paddingEnd="32dp"
android:text="@string/awarder_karma"
android:text=""
android:textColor="?attr/primaryTextColor"
android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family" />
@ -85,7 +85,7 @@
android:paddingTop="16dp"
android:paddingStart="32dp"
android:paddingEnd="32dp"
android:text="@string/awardee_karma"
android:text=""
android:textColor="?attr/primaryTextColor"
android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family" />

38
app/src/main/res/layout/fragment_theme_preview_comments.xml
View File

@ -39,7 +39,6 @@
android:layout_height="?attr/font_default"
android:layout_marginEnd="4dp"
android:src="@drawable/ic_mic_14dp"
app:layout_constraintBottom_toTopOf="@id/author_flair_text_view_theme_preview_comments_fragment"
app:layout_constraintEnd_toStartOf="@id/author_text_view_theme_preview_comments_fragment"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -50,30 +49,14 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:fontFamily="?attr/font_family"
android:maxLines="2"
android:text="@string/username_preview"
android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family"
app:layout_constraintBottom_toTopOf="@id/author_flair_text_view_theme_preview_comments_fragment"
app:layout_constraintEnd_toStartOf="@+id/comment_time_text_view_theme_preview_comments_fragment"
app:layout_constraintStart_toEndOf="@id/author_type_image_view_theme_preview_comments_fragment"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/author_flair_text_view_theme_preview_comments_fragment"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="2"
android:text="@string/author_flair_preview"
android:textSize="?attr/font_12"
android:fontFamily="?attr/font_family"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/comment_time_text_view_theme_preview_comments_fragment"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/author_text_view_theme_preview_comments_fragment" />
<TextView
android:id="@+id/comment_time_text_view_theme_preview_comments_fragment"
android:layout_width="0dp"
@ -261,7 +244,6 @@
android:layout_height="?attr/font_default"
android:layout_marginEnd="4dp"
android:src="@drawable/ic_mic_14dp"
app:layout_constraintBottom_toTopOf="@id/author_flair_text_view_award_background_theme_preview_comments_fragment"
app:layout_constraintEnd_toStartOf="@id/author_text_view_award_background_theme_preview_comments_fragment"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -272,30 +254,14 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:fontFamily="?attr/font_family"
android:maxLines="2"
android:text="@string/username_preview"
android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family"
app:layout_constraintBottom_toTopOf="@id/author_flair_text_view_award_background_theme_preview_comments_fragment"
app:layout_constraintEnd_toStartOf="@+id/comment_time_text_view_award_background_theme_preview_comments_fragment"
app:layout_constraintStart_toEndOf="@id/author_type_image_view_award_background_theme_preview_comments_fragment"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/author_flair_text_view_award_background_theme_preview_comments_fragment"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="2"
android:text="@string/author_flair_preview"
android:textSize="?attr/font_12"
android:fontFamily="?attr/font_family"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/comment_time_text_view_award_background_theme_preview_comments_fragment"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/author_text_view_award_background_theme_preview_comments_fragment" />
<TextView
android:id="@+id/comment_time_text_view_award_background_theme_preview_comments_fragment"
android:layout_width="0dp"

25
app/src/main/res/layout/fragment_theme_preview_posts.xml
View File

@ -165,31 +165,6 @@
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<com.libRG.CustomTextView
android:id="@+id/flair_custom_text_view_theme_preview_posts_fragment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:padding="4dp"
android:text="@string/flair_preview"
android:textSize="?attr/font_12"
android:fontFamily="?attr/font_family"
app:lib_setRadius="6dp"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<com.libRG.CustomTextView
android:id="@+id/awards_text_view_theme_preview_posts_fragment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="4dp"
android:text="@string/awards_preview"
android:textSize="?attr/font_12"
android:fontFamily="?attr/font_family"
app:lib_setRadius="6dp"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<ImageView
android:id="@+id/archived_image_view_theme_preview_posts_fragment"
android:layout_width="24dp"

2
app/src/main/res/values/arrays.xml
View File

@ -581,8 +581,6 @@
<string-array name="add_to_post_filter_options">
<item>@string/exclude_community</item>
<item>@string/exclude_user</item>
<item>@string/exclude_flair</item>
<item>@string/contain_flair</item>
<item>@string/exclude_domain</item>
<item>@string/contain_domain</item>
</string-array>

57
app/src/main/res/values/strings.xml
View File

@ -33,8 +33,6 @@
<string name="view_reddit_gallery_activity_gif_label">Gif %1$d/%2$d</string>
<string name="view_reddit_gallery_activity_video_label">Video %1$d/%2$d</string>
<string name="submit_crosspost_activity_label">Crosspost</string>
<string name="give_award_activity_label">Give Award</string>
<string name="community_filter_popular_and_all_activity_label">r/all and r/popular</string>
<string name="customize_post_filter_activity_label">Customize Post Filter</string>
<string name="filtered_posts_activity_subtitle">Filtered Posts</string>
<string name="post_filter_preference_activity_label">Post Filter</string>
@ -69,7 +67,6 @@
<string name="action_unmark_nsfw">Unmark NSFW</string>
<string name="action_mark_spoiler">Mark Spoiler</string>
<string name="action_unmark_spoiler">Unmark Spoiler</string>
<string name="action_edit_flair">Edit Flair</string>
<string name="action_change_post_layout">Change Post Layout</string>
<string name="action_save">Save</string>
<string name="action_edit_multi_reddit">Edit Multicommunity</string>
@ -82,8 +79,6 @@
<string name="action_set_wallpaper">Set as Wallpaper</string>
<string name="action_send_private_message">Send Private Message</string>
<string name="action_block_user">Block User</string>
<string name="action_select_user_flair">Select User Flair</string>
<string name="action_give_award">Give Award</string>
<string name="action_save_to_database">Save to Database</string>
<string name="action_read_all_messages">Read All Messages</string>
<string name="action_add_to_multireddit">Add to Multicommunity</string>
@ -125,8 +120,6 @@
<string name="load_messages_failed">Error loading messages.\nTap to retry.</string>
<string name="no_messages">Empty</string>
<string name="nsfw">NSFW</string>
<string name="karma_info">Karma: %1$,d</string>
<string name="karma_info_user_detail">Karma:\n%1$,d (%2$d + %3$d)</string>
<string name="cakeday_info">Cake day:\n%1$s</string>
<string name="since">Since:</string>
<string name="profile">Profile</string>
@ -235,10 +228,7 @@
<string name="video_is_processing">Video is processing. Please wait.</string>
<string name="image_is_processing">Image is processing. Please wait.</string>
<string name="gif_is_processing">Gif is processing. Please wait.</string>
<string name="flair">Flair</string>
<string name="spoiler">Spoiler</string>
<string name="no_flair">No flair</string>
<string name="error_loading_flairs">Error loading flairs.\nTap to retry.</string>
<string name="no_rule">No rules</string>
<string name="error_loading_rules">Error loading rules.\nTap to retry.</string>
<string name="error_loading_rules_without_retry">Error Loading Rules</string>
@ -323,15 +313,11 @@
<string name="mark_spoiler_failed">Mark spoiler failed</string>
<string name="unmark_spoiler_success">Unmark spoiler successfully</string>
<string name="unmark_spoiler_failed">Unmark spoiler failed</string>
<string name="update_flair_success">Update flair successfully</string>
<string name="update_flair_failed">Update flair failed</string>
<string name="edit_flair">Edit Flair</string>
<string name="only_allow_64_chars">Only allow less than 64 characters</string>
<string name="view_all_comments">Click here to browse all comments</string>
<string name="notification_summary_account">Account</string>
<string name="notification_summary_message">New Message</string>
<string name="notification_summary_community">Community</string>
<string name="notification_summary_award">Award</string>
<string name="notification_new_messages">%1$d New Messages</string>
<string name="label_account">Account</string>
<string name="label_reddit">Lemmy</string>
@ -487,8 +473,7 @@
<string name="settings_tab_title">Title</string>
<string name="settings_tab_post_type">Type</string>
<string name="settings_tab_community_name">Community Name (Without @ instance tag)</string>
<string name="settings_tab_multi_reddit_name">Multicommunity Path (/user/yourusername/m/yourmulticommunityname) (only lowercase characters)</string>
<string name="settings_tab_username">Username (Without u/ prefix)</string>
<string name="settings_tab_username">Username (Without @ instance tag)</string>
<string name="no_developer_easter_egg">There\'s no developer options here</string>
<string name="settings_download_location_title">Download Location</string>
<string name="settings_image_download_location_title">Image Download Location</string>
@ -527,7 +512,6 @@
<string name="settings_respect_community_recommended_comment_sort_type_summary">Comment sort type will not be saved</string>
<string name="settings_post_filter_title">Post Filter</string>
<string name="settings_community_filter_category">Hide Communities</string>
<string name="settings_community_filter_popular_and_all">In r/popular and r/all</string>
<string name="settings_credits_ufo_capturing_animation_title">UFO Capturing Animation</string>
<string name="settings_hide_community_description_title">Hide Community Description</string>
<string name="settings_disable_image_preview_title">Disable Image Preview in Data Saving Mode</string>
@ -550,8 +534,6 @@
<string name="settings_user_default_sort_time_title">User Default Sort Time</string>
<string name="settings_click_to_show_media_in_gallery_layout">Click to Show Media in Gallery Layout</string>
<string name="settings_hide_post_type">Hide Post Type</string>
<string name="settings_hide_post_flair">Hide Post Flair</string>
<string name="settings_hide_the_number_of_awards">Hide the Number of Awards</string>
<string name="settings_hide_community_and_user_prefix">Hide Community and User Prefix</string>
<string name="settings_hide_the_number_of_votes">Hide the Number of Votes</string>
<string name="settings_hide_the_number_of_comments">Hide the Number of Comments</string>
@ -584,7 +566,6 @@
<string name="settings_separate_post_and_comments_in_landscape_mode_title">Separate Post And Comments in Landscape Mode</string>
<string name="settings_separate_post_and_comments_summary">Video autoplay will be disabled in the post detail page</string>
<string name="settings_use_bottom_toolbar_in_media_viewer_title">Use Bottom Toolbar in Media Viewer</string>
<string name="settings_navigation_drawer_enable_hide_karma_title">Hide Account Karma</string>
<string name="settings_secure_mode_title">Secure Mode</string>
<string name="settings_secure_mode_summary">Screenshot and video recording are not allowed. No preview in recent app screen.</string>
<string name="settings_credits_lock_screen_animation_title">Lock Screen Animation</string>
@ -604,7 +585,6 @@
<string name="settings_custom_content_font_family_title">Custom Content Font Family</string>
<string name="settings_fixed_height_preview_in_card_title">Fixed Height in Card</string>
<string name="settings_hide_text_post_content">Hide Text Post Content</string>
<string name="settings_hide_comment_awards_title">Hide Comment Awards</string>
<string name="settings_show_fewer_toolbar_options_threshold_title">Show Fewer Toolbar Options Starting From</string>
<string name="settings_show_fewer_toolbar_options_threshold_summary">Level %1$d</string>
<string name="settings_show_author_avatar_title">Show Author Avatar</string>
@ -759,8 +739,6 @@
<string name="theme_item_comment_background_color_detail">Applied to: Comment background</string>
<string name="theme_item_fully_collapsed_comment_background_color">Fully-Collapsed Comment Background Color</string>
<string name="theme_item_fully_collapsed_comment_background_color_detail">Applied to: Background of fully-collapsed comments</string>
<string name="theme_item_awarded_comment_background_color">Awarded Comment Background Color</string>
<string name="theme_item_awarded_comment_background_color_detail">Applied to: Background of awarded comments</string>
<string name="theme_item_received_message_background_color">Received Message Background Color</string>
<string name="theme_item_received_message_background_color_detail">Applied to: Background of received private messages</string>
<string name="theme_item_sent_message_background_color">Sent Message Background Color</string>
@ -817,14 +795,6 @@
<string name="theme_item_nsfw_background_color_detail">Applied to: Background of the NSFW tag</string>
<string name="theme_item_nsfw_text_color">NSFW text color</string>
<string name="theme_item_nsfw_text_color_detail">Applied to: Text color of the NSFW tag</string>
<string name="theme_item_flair_background_color">Flair Background Color</string>
<string name="theme_item_flair_background_color_detail">Applied to: Background of the flair tag</string>
<string name="theme_item_flair_text_color">Flair Text Color</string>
<string name="theme_item_flair_text_color_detail">Applied to: Text color of the flair tag</string>
<string name="theme_item_awards_background_color">Awards Background Color</string>
<string name="theme_item_awards_background_color_detail">Applied to: Background of the awards tag</string>
<string name="theme_item_awards_text_color">Awards Text Color</string>
<string name="theme_item_awards_text_color_detail">Applied to: Text color of the awards tag</string>
<string name="theme_item_archived_tint">Archived Icon Color</string>
<string name="theme_item_archived_tint_detail">Applied to: Archived icon</string>
<string name="theme_item_locked_icon_tint">Locked Icon Color</string>
@ -845,8 +815,6 @@
<string name="theme_item_username_color_detail">Applied to: Username</string>
<string name="theme_item_community_color">Community Color</string>
<string name="theme_item_community_color_detail">Applied to: Community name</string>
<string name="theme_item_author_flair_text_color">Author Flair Color</string>
<string name="theme_item_author_flair_text_color_detail">Applied to: Author flair in comments</string>
<string name="theme_item_submitter_color">Submitter</string>
<string name="theme_item_submitter_color_detail">Applied to: Submitter in comments</string>
<string name="theme_item_moderator_color">Moderator</string>
@ -941,16 +909,11 @@
<string name="post_title_preview">This is a post</string>
<string name="post_content_preview">This gravity joke is getting a bit old, but I fall for it every time.</string>
<string name="post_type_preview">POST</string>
<string name="flair_preview">Flair</string>
<string name="awards_preview">4 Awards</string>
<string name="author_flair_preview">Author Flair</string>
<string name="comment_content_preview">I got my girlfriend a “Get better soon” card.\nShe\'s not ill or anything, but she could definitely get better.</string>
<string name="copy_multi_reddit_path">Copy Multicommunity\'s Path</string>
<string name="copy_multi_reddit_path_failed">Unable to copy multicommunity\'s path</string>
<string name="edit_multi_reddit">Edit Multicommunity</string>
<string name="delete_multi_reddit">Delete Multicommunity</string>
<string name="n_awards">%1$,d Awards</string>
<string name="one_award">1 Award</string>
<string name="report">Report</string>
<string name="reporting">Reporting</string>
<string name="report_successful">Reported</string>
@ -996,10 +959,6 @@
<string name="block_user">Block User</string>
<string name="block_user_success">Blocked</string>
<string name="block_user_failed">Failed to block user</string>
<string name="select_user_flair_success">User flair selected</string>
<string name="select_this_user_flair">Select this user flair?</string>
<string name="clear_user_flair">Clear Flair</string>
<string name="clear_user_flair_success">User flair cleared</string>
<string name="select_header_size">Select Header Size</string>
<string name="large">Large</string>
<string name="small">Small</string>
@ -1012,11 +971,7 @@
<string name="refresh">Refresh</string>
<string name="change_sort_type">Change Sort Type</string>
<string name="change_post_layout">Change Post Layout</string>
<string name="give_award_dialog_title">Give Award?</string>
<string name="anonymous">Anonymous</string>
<string name="give_award_error_message">Code: %1$d/\n Message: %2$s</string>
<string name="give_award_success">Award given</string>
<string name="give_award_failed">Failed</string>
<string name="edited">Edited</string>
<string name="edited_time">Edited on %s</string>
<string name="warning">Warning</string>
@ -1045,16 +1000,12 @@
<string name="title_contains_regex_hint">Title: contains regex</string>
<string name="exclude_communities_hint">Exclude communities (e.g. memes,AskLemmy)</string>
<string name="exclude_users_hint">Exclude users (e.g. Hostilenemy,random)</string>
<string name="exclude_flairs_hint">Exclude flairs (e.g. flair1,flair2)</string>
<string name="contain_flairs_hint">Contain flairs (e.g. flair1,flair2)</string>
<string name="exclude_domains_hint">Exclude domains</string>
<string name="contain_domains_hint">Contain domains</string>
<string name="min_vote_hint">Min vote (-1: no restriction)</string>
<string name="max_vote_hint">Max vote (-1: no restriction)</string>
<string name="min_comments_hint">Min comments (-1: no restriction)</string>
<string name="max_comments_hint">Max comments (-1: no restriction)</string>
<string name="min_awards_hint">Min awards (-1: no restriction)</string>
<string name="max_awards_hint">Max awards (-1: no restriction)</string>
<string name="post_filter_name_hint">Post Filter Name</string>
<string name="post_filter_requires_a_name">What is the name of this post filter?</string>
<string name="duplicate_post_filter_dialog_title">\'%1$s\' Already Exists</string>
@ -1123,8 +1074,6 @@
<string name="select">Select</string>
<string name="exclude_community">Exclude this community</string>
<string name="exclude_user">Exclude this user</string>
<string name="exclude_flair">Exclude this flair</string>
<string name="contain_flair">Contain this flair</string>
<string name="exclude_domain">Exclude this domain</string>
<string name="contain_domain">Contain this domain</string>
<string name="suggest_title">Suggest Title</string>
@ -1204,10 +1153,6 @@
<string name="option_5_hint">Option 5</string>
<string name="option_6_hint">Option 6</string>
<string name="not_a_valid_number">Not a valid number</string>
<string name="post_karma">Post Karma:</string>
<string name="comment_karma">Comment Karma:</string>
<string name="awarder_karma">Awarder Karma:</string>
<string name="awardee_karma">Awardee Karma:</string>
<string name="handle_link">Handle Link</string>
<string name="invalid_link">Invalid link</string>
<string name="error_unsupported_video">Media includes video tracks, but none are playable by this device</string>

10
app/src/main/res/xml-sw600dp/post_details_preferences.xml
View File

@ -18,16 +18,6 @@
app:key="hide_post_type"
app:title="@string/settings_hide_post_type" />
<eu.toldi.infinityforlemmy.customviews.CustomFontSwitchPreference
app:defaultValue="false"
app:key="hide_post_flair"
app:title="@string/settings_hide_post_flair" />
<eu.toldi.infinityforlemmy.customviews.CustomFontSwitchPreference
app:defaultValue="false"
app:key="hide_the_number_of_awards"
app:title="@string/settings_hide_the_number_of_awards" />
<eu.toldi.infinityforlemmy.customviews.CustomFontSwitchPreference
app:defaultValue="false"
app:key="hide_subreddit_and_user_prefix"

4
app/src/main/res/xml/navigation_drawer_preferences.xml
View File

@ -51,10 +51,6 @@
app:key="hide_subscribed_subreddits_sections"
app:title="@string/settings_hide_subscribed_communities_sections_title" />
<eu.toldi.infinityforlemmy.customviews.CustomFontSwitchPreference
app:defaultValue="false"
app:key="hide_account_karma"
app:title="@string/settings_navigation_drawer_enable_hide_karma_title" />
</PreferenceScreen>

5
app/src/main/res/xml/post_details_preferences.xml
View File

@ -12,11 +12,6 @@
app:key="hide_post_type"
app:title="@string/settings_hide_post_type" />
<eu.toldi.infinityforlemmy.customviews.CustomFontSwitchPreference
app:defaultValue="false"
app:key="hide_post_flair"
app:title="@string/settings_hide_post_flair" />
<eu.toldi.infinityforlemmy.customviews.CustomFontSwitchPreference
app:defaultValue="false"
app:key="hide_upvote_ratio"