diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0a67a0e9..654fe2f8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -136,11 +136,7 @@ android:name=".activities.FetchRandomSubredditOrPostActivity" android:parentActivityName=".activities.MainActivity" android:theme="@style/AppTheme.NoActionBar" /> - + = 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(); diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/activities/GiveAwardActivity.java b/app/src/main/java/eu/toldi/infinityforlemmy/activities/GiveAwardActivity.java index e3076e9a..a9565461 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/activities/GiveAwardActivity.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/activities/GiveAwardActivity.java @@ -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); diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/activities/PostFilterUsageListingActivity.java b/app/src/main/java/eu/toldi/infinityforlemmy/activities/PostFilterUsageListingActivity.java index 8b30ba58..506df090 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/activities/PostFilterUsageListingActivity.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/activities/PostFilterUsageListingActivity.java @@ -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; } diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/activities/SelectUserFlairActivity.java b/app/src/main/java/eu/toldi/infinityforlemmy/activities/SelectUserFlairActivity.java index 1a1872f3..f3ae0437 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/activities/SelectUserFlairActivity.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/activities/SelectUserFlairActivity.java @@ -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(); diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/activities/SubmitCrosspostActivity.java b/app/src/main/java/eu/toldi/infinityforlemmy/activities/SubmitCrosspostActivity.java index 1adbcf04..874cf008 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/activities/SubmitCrosspostActivity.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/activities/SubmitCrosspostActivity.java @@ -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) { diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/adapters/FlairBottomSheetRecyclerViewAdapter.java b/app/src/main/java/eu/toldi/infinityforlemmy/adapters/FlairBottomSheetRecyclerViewAdapter.java index 1de2d5b5..226fb2a9 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/adapters/FlairBottomSheetRecyclerViewAdapter.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/adapters/FlairBottomSheetRecyclerViewAdapter.java @@ -52,7 +52,7 @@ public class FlairBottomSheetRecyclerViewAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/adapters/UserFlairRecyclerViewAdapter.java b/app/src/main/java/eu/toldi/infinityforlemmy/adapters/UserFlairRecyclerViewAdapter.java index 844213e5..c39c01fd 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/adapters/UserFlairRecyclerViewAdapter.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/adapters/UserFlairRecyclerViewAdapter.java @@ -47,7 +47,6 @@ public class UserFlairRecyclerViewAdapter extends RecyclerView.Adapter fetchFlairs()); } }); diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/customtheme/CustomThemeSettingsItem.java b/app/src/main/java/eu/toldi/infinityforlemmy/customtheme/CustomThemeSettingsItem.java index f97de20f..9c1afdbb 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/customtheme/CustomThemeSettingsItem.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/customtheme/CustomThemeSettingsItem.java @@ -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), diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/fragments/ThemePreviewCommentsFragment.java b/app/src/main/java/eu/toldi/infinityforlemmy/fragments/ThemePreviewCommentsFragment.java index 773416d4..6e7bf028 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/fragments/ThemePreviewCommentsFragment.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/fragments/ThemePreviewCommentsFragment.java @@ -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); diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/fragments/ThemePreviewPostsFragment.java b/app/src/main/java/eu/toldi/infinityforlemmy/fragments/ThemePreviewPostsFragment.java index 79b43a9b..147083eb 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/fragments/ThemePreviewPostsFragment.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/fragments/ThemePreviewPostsFragment.java @@ -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); diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/settings/CustomizeMainPageTabsFragment.java b/app/src/main/java/eu/toldi/infinityforlemmy/settings/CustomizeMainPageTabsFragment.java index 6e6aab6a..a8589359 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/settings/CustomizeMainPageTabsFragment.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/settings/CustomizeMainPageTabsFragment.java @@ -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); diff --git a/app/src/main/res/layout/activity_customize_post_filter.xml b/app/src/main/res/layout/activity_customize_post_filter.xml index bb461c76..9b68549e 100644 --- a/app/src/main/res/layout/activity_customize_post_filter.xml +++ b/app/src/main/res/layout/activity_customize_post_filter.xml @@ -463,48 +463,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_give_award.xml b/app/src/main/res/layout/activity_give_award.xml index a67e2927..7dc7a609 100644 --- a/app/src/main/res/layout/activity_give_award.xml +++ b/app/src/main/res/layout/activity_give_award.xml @@ -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" /> diff --git a/app/src/main/res/layout/activity_submit_crosspost.xml b/app/src/main/res/layout/activity_submit_crosspost.xml index 92f1b675..b3d38ce4 100644 --- a/app/src/main/res/layout/activity_submit_crosspost.xml +++ b/app/src/main/res/layout/activity_submit_crosspost.xml @@ -109,20 +109,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - @@ -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" /> diff --git a/app/src/main/res/layout/fragment_theme_preview_comments.xml b/app/src/main/res/layout/fragment_theme_preview_comments.xml index 76c33ecf..46b1fa2b 100644 --- a/app/src/main/res/layout/fragment_theme_preview_comments.xml +++ b/app/src/main/res/layout/fragment_theme_preview_comments.xml @@ -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" /> - - @@ -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" /> - - - - - - @string/exclude_community @string/exclude_user - @string/exclude_flair - @string/contain_flair @string/exclude_domain @string/contain_domain diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 30b41977..26ef2a70 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -33,8 +33,6 @@ Gif %1$d/%2$d Video %1$d/%2$d Crosspost - Give Award - r/all and r/popular Customize Post Filter Filtered Posts Post Filter @@ -69,7 +67,6 @@ Unmark NSFW Mark Spoiler Unmark Spoiler - Edit Flair Change Post Layout Save Edit Multicommunity @@ -82,8 +79,6 @@ Set as Wallpaper Send Private Message Block User - Select User Flair - Give Award Save to Database Read All Messages Add to Multicommunity @@ -125,8 +120,6 @@ Error loading messages.\nTap to retry. Empty NSFW - Karma: %1$,d - Karma:\n%1$,d (%2$d + %3$d) Cake day:\n%1$s Since: Profile @@ -235,10 +228,7 @@ Video is processing. Please wait. Image is processing. Please wait. Gif is processing. Please wait. - Flair Spoiler - No flair - Error loading flairs.\nTap to retry. No rules Error loading rules.\nTap to retry. Error Loading Rules @@ -323,15 +313,11 @@ Mark spoiler failed Unmark spoiler successfully Unmark spoiler failed - Update flair successfully - Update flair failed - Edit Flair Only allow less than 64 characters Click here to browse all comments Account New Message Community - Award %1$d New Messages Account Lemmy @@ -487,8 +473,7 @@ Title Type Community Name (Without @ instance tag) - Multicommunity Path (/user/yourusername/m/yourmulticommunityname) (only lowercase characters) - Username (Without u/ prefix) + Username (Without @ instance tag) There\'s no developer options here Download Location Image Download Location @@ -527,7 +512,6 @@ Comment sort type will not be saved Post Filter Hide Communities - In r/popular and r/all UFO Capturing Animation Hide Community Description Disable Image Preview in Data Saving Mode @@ -550,8 +534,6 @@ User Default Sort Time Click to Show Media in Gallery Layout Hide Post Type - Hide Post Flair - Hide the Number of Awards Hide Community and User Prefix Hide the Number of Votes Hide the Number of Comments @@ -584,7 +566,6 @@ Separate Post And Comments in Landscape Mode Video autoplay will be disabled in the post detail page Use Bottom Toolbar in Media Viewer - Hide Account Karma Secure Mode Screenshot and video recording are not allowed. No preview in recent app screen. Lock Screen Animation @@ -604,7 +585,6 @@ Custom Content Font Family Fixed Height in Card Hide Text Post Content - Hide Comment Awards Show Fewer Toolbar Options Starting From Level %1$d Show Author Avatar @@ -759,8 +739,6 @@ Applied to: Comment background Fully-Collapsed Comment Background Color Applied to: Background of fully-collapsed comments - Awarded Comment Background Color - Applied to: Background of awarded comments Received Message Background Color Applied to: Background of received private messages Sent Message Background Color @@ -817,14 +795,6 @@ Applied to: Background of the NSFW tag NSFW text color Applied to: Text color of the NSFW tag - Flair Background Color - Applied to: Background of the flair tag - Flair Text Color - Applied to: Text color of the flair tag - Awards Background Color - Applied to: Background of the awards tag - Awards Text Color - Applied to: Text color of the awards tag Archived Icon Color Applied to: Archived icon Locked Icon Color @@ -845,8 +815,6 @@ Applied to: Username Community Color Applied to: Community name - Author Flair Color - Applied to: Author flair in comments Submitter Applied to: Submitter in comments Moderator @@ -941,16 +909,11 @@ This is a post This gravity joke is getting a bit old, but I fall for it every time. POST - Flair - 4 Awards - Author Flair I got my girlfriend a “Get better soon” card.\nShe\'s not ill or anything, but she could definitely get better. Copy Multicommunity\'s Path Unable to copy multicommunity\'s path Edit Multicommunity Delete Multicommunity - %1$,d Awards - 1 Award Report Reporting Reported @@ -996,10 +959,6 @@ Block User Blocked Failed to block user - User flair selected - Select this user flair? - Clear Flair - User flair cleared Select Header Size Large Small @@ -1012,11 +971,7 @@ Refresh Change Sort Type Change Post Layout - Give Award? Anonymous - Code: %1$d/\n Message: %2$s - Award given - Failed Edited Edited on %s Warning @@ -1045,16 +1000,12 @@ Title: contains regex Exclude communities (e.g. memes,AskLemmy) Exclude users (e.g. Hostilenemy,random) - Exclude flairs (e.g. flair1,flair2) - Contain flairs (e.g. flair1,flair2) Exclude domains Contain domains Min vote (-1: no restriction) Max vote (-1: no restriction) Min comments (-1: no restriction) Max comments (-1: no restriction) - Min awards (-1: no restriction) - Max awards (-1: no restriction) Post Filter Name What is the name of this post filter? \'%1$s\' Already Exists @@ -1123,8 +1074,6 @@ Select Exclude this community Exclude this user - Exclude this flair - Contain this flair Exclude this domain Contain this domain Suggest Title @@ -1204,10 +1153,6 @@ Option 5 Option 6 Not a valid number - Post Karma: - Comment Karma: - Awarder Karma: - Awardee Karma: Handle Link Invalid link Media includes video tracks, but none are playable by this device diff --git a/app/src/main/res/xml-sw600dp/post_details_preferences.xml b/app/src/main/res/xml-sw600dp/post_details_preferences.xml index 33670156..917afff9 100644 --- a/app/src/main/res/xml-sw600dp/post_details_preferences.xml +++ b/app/src/main/res/xml-sw600dp/post_details_preferences.xml @@ -18,16 +18,6 @@ app:key="hide_post_type" app:title="@string/settings_hide_post_type" /> - - - - - \ No newline at end of file diff --git a/app/src/main/res/xml/post_details_preferences.xml b/app/src/main/res/xml/post_details_preferences.xml index 984606a6..b4d619ee 100644 --- a/app/src/main/res/xml/post_details_preferences.xml +++ b/app/src/main/res/xml/post_details_preferences.xml @@ -12,11 +12,6 @@ app:key="hide_post_type" app:title="@string/settings_hide_post_type" /> - -