From 3ddf8d33f0758a5f925e588f97b765b37a0c4638 Mon Sep 17 00:00:00 2001 From: kosyak Date: Sun, 17 Dec 2023 22:16:12 +0100 Subject: [PATCH] fix compilation --- .../java/eu/siacs/conversations/ui/ConversationFragment.java | 2 +- .../siacs/conversations/ui/ConversationsOverviewFragment.java | 2 +- .../java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 121395d0a..187735ae6 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -4234,7 +4234,7 @@ public class ConversationFragment extends XmppFragment if (primaryColor != -1) return primaryColor; TypedValue typedValue = new TypedValue(); - getContext().getTheme().resolveAttribute(R.attr.colorPrimary, typedValue, true); + getContext().getTheme().resolveAttribute(androidx.appcompat.R.attr.colorPrimary, typedValue, true); primaryColor = typedValue.data; return primaryColor; diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java index 9d22348d5..48b9709f8 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java @@ -114,7 +114,7 @@ public class ConversationsOverviewFragment extends XmppFragment { super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive); if(actionState != ItemTouchHelper.ACTION_STATE_IDLE){ Paint paint = new Paint(); - paint.setColor(StyledAttributes.getColor(activity,R.attr.colorPrimaryDark)); + paint.setColor(StyledAttributes.getColor(activity, androidx.appcompat.R.attr.colorPrimaryDark)); paint.setStyle(Paint.Style.FILL); c.drawRect(viewHolder.itemView.getLeft(),viewHolder.itemView.getTop() ,viewHolder.itemView.getRight(),viewHolder.itemView.getBottom(), paint); diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index c557223a2..9f11258e3 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -1149,7 +1149,7 @@ public class MessageAdapter extends ArrayAdapter { if (primaryColor != -1) return primaryColor; TypedValue typedValue = new TypedValue(); - getContext().getTheme().resolveAttribute(R.attr.colorPrimary, typedValue, true); + getContext().getTheme().resolveAttribute(androidx.appcompat.R.attr.colorPrimary, typedValue, true); primaryColor = typedValue.data; return primaryColor;