mirror of
https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git
synced 2025-01-28 18:44:44 +01:00
Fix some themeing issues. Minor bugs fixed.
This commit is contained in:
parent
86171535a6
commit
20e785e2eb
@ -237,7 +237,9 @@ public class CommentActivity extends BaseActivity {
|
|||||||
commentParentMarkwonView.setTextColor(mCustomThemeWrapper.getCommentColor());
|
commentParentMarkwonView.setTextColor(mCustomThemeWrapper.getCommentColor());
|
||||||
divider.setBackgroundColor(mCustomThemeWrapper.getDividerColor());
|
divider.setBackgroundColor(mCustomThemeWrapper.getDividerColor());
|
||||||
commentEditText.setTextColor(mCustomThemeWrapper.getCommentColor());
|
commentEditText.setTextColor(mCustomThemeWrapper.getCommentColor());
|
||||||
markdownColor = mCustomThemeWrapper.getSecondaryTextColor();
|
int secondaryTextColor = mCustomThemeWrapper.getSecondaryTextColor();
|
||||||
|
commentEditText.setHintTextColor(secondaryTextColor);
|
||||||
|
markdownColor = secondaryTextColor;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void getCurrentAccount() {
|
private void getCurrentAccount() {
|
||||||
|
@ -215,13 +215,17 @@ public class CreateMultiRedditActivity extends BaseActivity {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void applyCustomTheme() {
|
protected void applyCustomTheme() {
|
||||||
|
coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
|
||||||
applyAppBarLayoutAndToolbarTheme(appBarLayout, toolbar);
|
applyAppBarLayoutAndToolbarTheme(appBarLayout, toolbar);
|
||||||
int primaryTextColor = mCustomThemeWrapper.getPrimaryTextColor();
|
int primaryTextColor = mCustomThemeWrapper.getPrimaryTextColor();
|
||||||
|
int secondaryTextColor = mCustomThemeWrapper.getSecondaryTextColor();
|
||||||
nameEditText.setTextColor(primaryTextColor);
|
nameEditText.setTextColor(primaryTextColor);
|
||||||
|
nameEditText.setHintTextColor(secondaryTextColor);
|
||||||
int dividerColor = mCustomThemeWrapper.getDividerColor();
|
int dividerColor = mCustomThemeWrapper.getDividerColor();
|
||||||
divider1.setBackgroundColor(dividerColor);
|
divider1.setBackgroundColor(dividerColor);
|
||||||
divider2.setBackgroundColor(dividerColor);
|
divider2.setBackgroundColor(dividerColor);
|
||||||
descriptionEditText.setTextColor(primaryTextColor);
|
descriptionEditText.setTextColor(primaryTextColor);
|
||||||
|
descriptionEditText.setHintTextColor(secondaryTextColor);
|
||||||
visibilityTextView.setTextColor(primaryTextColor);
|
visibilityTextView.setTextColor(primaryTextColor);
|
||||||
selectSubredditTextView.setTextColor(primaryTextColor);
|
selectSubredditTextView.setTextColor(primaryTextColor);
|
||||||
}
|
}
|
||||||
|
@ -249,14 +249,18 @@ public class EditMultiRedditActivity extends BaseActivity {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void applyCustomTheme() {
|
protected void applyCustomTheme() {
|
||||||
|
coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
|
||||||
applyAppBarLayoutAndToolbarTheme(appBarLayout, toolbar);
|
applyAppBarLayoutAndToolbarTheme(appBarLayout, toolbar);
|
||||||
progressBar.setIndeterminateTintList(ColorStateList.valueOf(mCustomThemeWrapper.getColorAccent()));
|
progressBar.setIndeterminateTintList(ColorStateList.valueOf(mCustomThemeWrapper.getColorAccent()));
|
||||||
int primaryTextColor = mCustomThemeWrapper.getPrimaryTextColor();
|
int primaryTextColor = mCustomThemeWrapper.getPrimaryTextColor();
|
||||||
|
int secondaryTextColor = mCustomThemeWrapper.getSecondaryTextColor();
|
||||||
nameEditText.setTextColor(primaryTextColor);
|
nameEditText.setTextColor(primaryTextColor);
|
||||||
|
nameEditText.setHintTextColor(secondaryTextColor);
|
||||||
int dividerColor = mCustomThemeWrapper.getDividerColor();
|
int dividerColor = mCustomThemeWrapper.getDividerColor();
|
||||||
divider1.setBackgroundColor(dividerColor);
|
divider1.setBackgroundColor(dividerColor);
|
||||||
divider2.setBackgroundColor(dividerColor);
|
divider2.setBackgroundColor(dividerColor);
|
||||||
descriptionEditText.setTextColor(primaryTextColor);
|
descriptionEditText.setTextColor(primaryTextColor);
|
||||||
|
descriptionEditText.setHintTextColor(secondaryTextColor);
|
||||||
visibilityTextView.setTextColor(primaryTextColor);
|
visibilityTextView.setTextColor(primaryTextColor);
|
||||||
selectSubredditTextView.setTextColor(primaryTextColor);
|
selectSubredditTextView.setTextColor(primaryTextColor);
|
||||||
}
|
}
|
||||||
|
@ -378,6 +378,8 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF
|
|||||||
protected void applyCustomTheme() {
|
protected void applyCustomTheme() {
|
||||||
coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
|
coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
|
||||||
applyAppBarLayoutAndToolbarTheme(appBarLayout, toolbar);
|
applyAppBarLayoutAndToolbarTheme(appBarLayout, toolbar);
|
||||||
|
int secondaryTextColor = mCustomThemeWrapper.getSecondaryTextColor();
|
||||||
|
subredditNameTextView.setTextColor(secondaryTextColor);
|
||||||
rulesButton.setTextColor(mCustomThemeWrapper.getButtonTextColor());
|
rulesButton.setTextColor(mCustomThemeWrapper.getButtonTextColor());
|
||||||
rulesButton.setBackgroundTintList(ColorStateList.valueOf(mCustomThemeWrapper.getColorPrimaryLightTheme()));
|
rulesButton.setBackgroundTintList(ColorStateList.valueOf(mCustomThemeWrapper.getColorPrimaryLightTheme()));
|
||||||
int dividerColor = mCustomThemeWrapper.getDividerColor();
|
int dividerColor = mCustomThemeWrapper.getDividerColor();
|
||||||
@ -391,7 +393,11 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF
|
|||||||
spoilerTextColor = mCustomThemeWrapper.getSpoilerTextColor();
|
spoilerTextColor = mCustomThemeWrapper.getSpoilerTextColor();
|
||||||
nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor();
|
nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor();
|
||||||
nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor();
|
nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor();
|
||||||
|
flairTextView.setTextColor(flairTextColor);
|
||||||
|
spoilerTextView.setTextColor(spoilerTextColor);
|
||||||
|
nsfwTextView.setTextColor(nsfwTextColor);
|
||||||
titleEditText.setTextColor(primaryTextColor);
|
titleEditText.setTextColor(primaryTextColor);
|
||||||
|
titleEditText.setHintTextColor(secondaryTextColor);
|
||||||
applyFABTheme(captureFab);
|
applyFABTheme(captureFab);
|
||||||
applyFABTheme(selectFromLibraryFab);
|
applyFABTheme(selectFromLibraryFab);
|
||||||
selectAgainTextView.setTextColor(mCustomThemeWrapper.getColorAccent());
|
selectAgainTextView.setTextColor(mCustomThemeWrapper.getColorAccent());
|
||||||
|
@ -317,6 +317,8 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr
|
|||||||
protected void applyCustomTheme() {
|
protected void applyCustomTheme() {
|
||||||
coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
|
coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
|
||||||
applyAppBarLayoutAndToolbarTheme(appBarLayout, toolbar);
|
applyAppBarLayoutAndToolbarTheme(appBarLayout, toolbar);
|
||||||
|
int secondaryTextColor = mCustomThemeWrapper.getSecondaryTextColor();
|
||||||
|
subredditNameTextView.setTextColor(secondaryTextColor);
|
||||||
rulesButton.setTextColor(mCustomThemeWrapper.getButtonTextColor());
|
rulesButton.setTextColor(mCustomThemeWrapper.getButtonTextColor());
|
||||||
rulesButton.setBackgroundTintList(ColorStateList.valueOf(mCustomThemeWrapper.getColorPrimaryLightTheme()));
|
rulesButton.setBackgroundTintList(ColorStateList.valueOf(mCustomThemeWrapper.getColorPrimaryLightTheme()));
|
||||||
int dividerColor = mCustomThemeWrapper.getDividerColor();
|
int dividerColor = mCustomThemeWrapper.getDividerColor();
|
||||||
@ -330,8 +332,13 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr
|
|||||||
spoilerTextColor = mCustomThemeWrapper.getSpoilerTextColor();
|
spoilerTextColor = mCustomThemeWrapper.getSpoilerTextColor();
|
||||||
nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor();
|
nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor();
|
||||||
nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor();
|
nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor();
|
||||||
|
flairTextView.setTextColor(flairTextColor);
|
||||||
|
spoilerTextView.setTextColor(spoilerTextColor);
|
||||||
|
nsfwTextView.setTextColor(nsfwTextColor);
|
||||||
titleEditText.setTextColor(primaryTextColor);
|
titleEditText.setTextColor(primaryTextColor);
|
||||||
|
titleEditText.setHintTextColor(secondaryTextColor);
|
||||||
linkEditText.setTextColor(primaryTextColor);
|
linkEditText.setTextColor(primaryTextColor);
|
||||||
|
linkEditText.setHintTextColor(secondaryTextColor);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void getCurrentAccount() {
|
private void getCurrentAccount() {
|
||||||
|
@ -321,6 +321,8 @@ public class PostTextActivity extends BaseActivity implements FlairBottomSheetFr
|
|||||||
protected void applyCustomTheme() {
|
protected void applyCustomTheme() {
|
||||||
coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
|
coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
|
||||||
applyAppBarLayoutAndToolbarTheme(appBarLayout, toolbar);
|
applyAppBarLayoutAndToolbarTheme(appBarLayout, toolbar);
|
||||||
|
int secondaryTextColor = mCustomThemeWrapper.getSecondaryTextColor();
|
||||||
|
subredditNameTextView.setTextColor(secondaryTextColor);
|
||||||
rulesButton.setTextColor(mCustomThemeWrapper.getButtonTextColor());
|
rulesButton.setTextColor(mCustomThemeWrapper.getButtonTextColor());
|
||||||
rulesButton.setBackgroundTintList(ColorStateList.valueOf(mCustomThemeWrapper.getColorPrimaryLightTheme()));
|
rulesButton.setBackgroundTintList(ColorStateList.valueOf(mCustomThemeWrapper.getColorPrimaryLightTheme()));
|
||||||
int dividerColor = mCustomThemeWrapper.getDividerColor();
|
int dividerColor = mCustomThemeWrapper.getDividerColor();
|
||||||
@ -334,8 +336,13 @@ public class PostTextActivity extends BaseActivity implements FlairBottomSheetFr
|
|||||||
spoilerTextColor = mCustomThemeWrapper.getSpoilerTextColor();
|
spoilerTextColor = mCustomThemeWrapper.getSpoilerTextColor();
|
||||||
nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor();
|
nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor();
|
||||||
nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor();
|
nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor();
|
||||||
|
flairTextView.setTextColor(flairTextColor);
|
||||||
|
spoilerTextView.setTextColor(spoilerTextColor);
|
||||||
|
nsfwTextView.setTextColor(nsfwTextColor);
|
||||||
titleEditText.setTextColor(primaryTextColor);
|
titleEditText.setTextColor(primaryTextColor);
|
||||||
|
titleEditText.setHintTextColor(secondaryTextColor);
|
||||||
contentEditText.setTextColor(primaryTextColor);
|
contentEditText.setTextColor(primaryTextColor);
|
||||||
|
contentEditText.setHintTextColor(secondaryTextColor);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void getCurrentAccount() {
|
private void getCurrentAccount() {
|
||||||
|
@ -383,6 +383,8 @@ public class PostVideoActivity extends BaseActivity implements FlairBottomSheetF
|
|||||||
protected void applyCustomTheme() {
|
protected void applyCustomTheme() {
|
||||||
coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
|
coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
|
||||||
applyAppBarLayoutAndToolbarTheme(appBarLayout, toolbar);
|
applyAppBarLayoutAndToolbarTheme(appBarLayout, toolbar);
|
||||||
|
int secondaryTextColor = mCustomThemeWrapper.getSecondaryTextColor();
|
||||||
|
subredditNameTextView.setTextColor(secondaryTextColor);
|
||||||
rulesButton.setTextColor(mCustomThemeWrapper.getButtonTextColor());
|
rulesButton.setTextColor(mCustomThemeWrapper.getButtonTextColor());
|
||||||
rulesButton.setBackgroundTintList(ColorStateList.valueOf(mCustomThemeWrapper.getColorPrimaryLightTheme()));
|
rulesButton.setBackgroundTintList(ColorStateList.valueOf(mCustomThemeWrapper.getColorPrimaryLightTheme()));
|
||||||
int dividerColor = mCustomThemeWrapper.getDividerColor();
|
int dividerColor = mCustomThemeWrapper.getDividerColor();
|
||||||
@ -396,7 +398,11 @@ public class PostVideoActivity extends BaseActivity implements FlairBottomSheetF
|
|||||||
spoilerTextColor = mCustomThemeWrapper.getSpoilerTextColor();
|
spoilerTextColor = mCustomThemeWrapper.getSpoilerTextColor();
|
||||||
nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor();
|
nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor();
|
||||||
nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor();
|
nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor();
|
||||||
|
flairTextView.setTextColor(flairTextColor);
|
||||||
|
spoilerTextView.setTextColor(spoilerTextColor);
|
||||||
|
nsfwTextView.setTextColor(nsfwTextColor);
|
||||||
titleEditText.setTextColor(primaryTextColor);
|
titleEditText.setTextColor(primaryTextColor);
|
||||||
|
titleEditText.setHintTextColor(secondaryTextColor);
|
||||||
applyFABTheme(captureFab);
|
applyFABTheme(captureFab);
|
||||||
applyFABTheme(selectFromLibraryFab);
|
applyFABTheme(selectFromLibraryFab);
|
||||||
selectAgainTextView.setTextColor(mCustomThemeWrapper.getColorAccent());
|
selectAgainTextView.setTextColor(mCustomThemeWrapper.getColorAccent());
|
||||||
|
@ -154,6 +154,7 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
|
|||||||
((SubredditViewHolder) viewHolder).favoriteImageView.setVisibility(View.GONE);
|
((SubredditViewHolder) viewHolder).favoriteImageView.setVisibility(View.GONE);
|
||||||
name = username;
|
name = username;
|
||||||
iconUrl = userIconUrl;
|
iconUrl = userIconUrl;
|
||||||
|
viewHolder.itemView.setOnClickListener(view -> itemClickListener.onClick(name, iconUrl, true));
|
||||||
} else if (hasClearSelectionRow && viewHolder.getAdapterPosition() == 1) {
|
} else if (hasClearSelectionRow && viewHolder.getAdapterPosition() == 1) {
|
||||||
((SubredditViewHolder) viewHolder).favoriteImageView.setVisibility(View.GONE);
|
((SubredditViewHolder) viewHolder).favoriteImageView.setVisibility(View.GONE);
|
||||||
name = username;
|
name = username;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user