Minor bugs fixed.

This commit is contained in:
Docile-Alligator 2022-09-21 15:54:58 +10:00
parent 3e66a4fda7
commit 1108d41eed
3 changed files with 11 additions and 11 deletions

View File

@ -110,6 +110,7 @@ dependencies {
def butterknifeVersion = "10.2.3"
implementation "com.jakewharton:butterknife:$butterknifeVersion"
annotationProcessor "com.jakewharton:butterknife-compiler:$butterknifeVersion"
compileOnly 'com.android.databinding:viewbinding:7.3.0'
// Events
def eventbusVersion = "3.3.1"

View File

@ -187,8 +187,8 @@ public class CommentActivity extends BaseActivity implements UploadImageEnabledA
String parentBodyMarkdown = intent.getStringExtra(EXTRA_COMMENT_PARENT_BODY_MARKDOWN_KEY);
String parentBody = intent.getStringExtra(EXTRA_COMMENT_PARENT_BODY_KEY);
if (parentBodyMarkdown != null && !parentBodyMarkdown.equals("")) {
binding.contentMarkdownRecyclerView.setVisibility(View.VISIBLE);
binding.contentMarkdownRecyclerView.setNestedScrollingEnabled(false);
binding.commentContentMarkdownView.setVisibility(View.VISIBLE);
binding.commentContentMarkdownView.setNestedScrollingEnabled(false);
int linkColor = mCustomThemeWrapper.getLinkColor();
Markwon postBodyMarkwon = Markwon.builder(this)
.usePlugin(MarkwonInlineParserPlugin.create(plugin -> {
@ -356,26 +356,26 @@ public class CommentActivity extends BaseActivity implements UploadImageEnabledA
@Override
protected void applyCustomTheme() {
binding.coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(binding.appBarLayout, null, toolbar);
binding.commentCoordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(binding.commentAppbarLayout, null, binding.commentToolbar);
binding.commentParentTitleTextView.setTextColor(customThemeWrapper.getPostTitleColor());
binding.divider.setBackgroundColor(mCustomThemeWrapper.getDividerColor());
binding.commentEditText.setTextColor(mCustomThemeWrapper.getCommentColor());
binding.commentDivider.setBackgroundColor(mCustomThemeWrapper.getDividerColor());
binding.commentCommentEditText.setTextColor(mCustomThemeWrapper.getCommentColor());
int secondaryTextColor = mCustomThemeWrapper.getSecondaryTextColor();
binding.commentEditText.setHintTextColor(secondaryTextColor);
binding.commentCommentEditText.setHintTextColor(secondaryTextColor);
if (isReplying) {
parentTextColor = mCustomThemeWrapper.getCommentColor();
} else {
parentTextColor = mCustomThemeWrapper.getPostContentColor();
}
parentSpoilerBackgroundColor = parentTextColor | 0xFF000000;
binding.accountNameTextView.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
binding.commentAccountNameTextView.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
if (typeface != null) {
commentEditText.setTypeface(typeface);
binding.commentCommentEditText.setTypeface(typeface);
}
if (titleTypeface != null) {
commentParentTitleTextView.setTypeface(titleTypeface);
binding.commentParentTitleTextView.setTypeface(titleTypeface);
}
}

View File

@ -42,7 +42,6 @@
<TextView
android:id="@+id/comment_parent_title_text_view"
android:id="@+id/comment_comment_parent_markwon_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"