diff options
Diffstat (limited to '')
| -rw-r--r-- | app/build.gradle | 1 | ||||
| -rw-r--r-- | app/src/main/java/ml/docilealligator/infinityforreddit/activities/CommentActivity.java | 20 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_comment.xml | 1 |
3 files changed, 11 insertions, 11 deletions
diff --git a/app/build.gradle b/app/build.gradle index 95131470..7d6ee1d4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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" diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CommentActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CommentActivity.java index b17ba0f4..4aac3cbe 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CommentActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CommentActivity.java @@ -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); } } diff --git a/app/src/main/res/layout/activity_comment.xml b/app/src/main/res/layout/activity_comment.xml index 4c685720..6a6ffcdc 100644 --- a/app/src/main/res/layout/activity_comment.xml +++ b/app/src/main/res/layout/activity_comment.xml @@ -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" |