From 17a8969d80c0753ac47821e286606594e1e6454f Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Thu, 23 Dec 2021 15:26:14 +0100
Subject: [PATCH] [merge] Fix some poll colors + some more previously missed

Change-Id: I346fab778b9c6c07bcf5fd1f3c753ccfe717aeea
---
 .../timeline/edithistory/ViewEditHistoryEpoxyController.kt | 2 +-
 .../app/features/poll/create/CreatePollController.kt       | 2 +-
 vector/src/main/res/drawable/ic_list_item_bullet.xml       | 7 ++++---
 vector/src/main/res/drawable/ic_poll_winner.xml            | 5 +++--
 .../src/main/res/drawable/ic_shield_trusted_no_border.xml  | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt
index ed9f831018..45658f9449 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt
@@ -119,7 +119,7 @@ class ViewEditHistoryEpoxyController @Inject constructor(
                                 diff_match_patch.Operation.INSERT -> {
                                     span {
                                         text = it.text
-                                        textColor = colorProvider.getColor(R.color.palette_element_green)
+                                        textColor = colorProvider.getColorFromAttribute(R.attr.vctr_encrypting_message_text_color)
                                     }
                                 }
                                 else                              -> {
diff --git a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt
index 94a3d0c7d3..18fc251be9 100644
--- a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt
+++ b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt
@@ -94,7 +94,7 @@ class CreatePollController @Inject constructor(
             genericButtonItem {
                 id("add_option")
                 text(host.stringProvider.getString(R.string.create_poll_add_option))
-                textColor(host.colorProvider.getColor(R.color.palette_element_green))
+                textColor(host.colorProvider.getColorFromAttribute(R.attr.colorAccent))
                 gravity(Gravity.START)
                 bold(true)
                 buttonClickAction {
diff --git a/vector/src/main/res/drawable/ic_list_item_bullet.xml b/vector/src/main/res/drawable/ic_list_item_bullet.xml
index b4f13479f7..6513f6d250 100644
--- a/vector/src/main/res/drawable/ic_list_item_bullet.xml
+++ b/vector/src/main/res/drawable/ic_list_item_bullet.xml
@@ -2,19 +2,20 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?colorAccent">
   <path
       android:pathData="M12,2C6.5,2 2,6.5 2,12C2,17.5 6.5,22 12,22C17.5,22 22,17.5 22,12C22,6.5 17.5,2 12,2V2Z"
       android:strokeWidth="2"
       android:fillColor="#00000000"
       android:fillType="evenOdd"
-      android:strokeColor="#0DBD8B"
+      android:strokeColor="#8bc34a"
       android:strokeLineCap="square"/>
   <path
       android:pathData="M6.5454,12.8885L9.803,16.2428L17.4545,8.364"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#0DBD8B"
+      android:strokeColor="#8bc34a"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_poll_winner.xml b/vector/src/main/res/drawable/ic_poll_winner.xml
index 71bc7ee5b6..c6b80f32d4 100644
--- a/vector/src/main/res/drawable/ic_poll_winner.xml
+++ b/vector/src/main/res/drawable/ic_poll_winner.xml
@@ -2,8 +2,9 @@
     android:width="16dp"
     android:height="16dp"
     android:viewportWidth="16"
-    android:viewportHeight="16">
+    android:viewportHeight="16"
+    android:tint="?colorAccent">
   <path
       android:pathData="M12.6667,3.3333H11.3333V2.6667C11.3333,2.3 11.0333,2 10.6667,2H5.3333C4.9667,2 4.6667,2.3 4.6667,2.6667V3.3333H3.3333C2.6,3.3333 2,3.9333 2,4.6667V5.3333C2,7.0333 3.28,8.42 4.9267,8.6267C5.3467,9.6267 6.2467,10.38 7.3333,10.6V12.6667H5.3333C4.9667,12.6667 4.6667,12.9667 4.6667,13.3333C4.6667,13.7 4.9667,14 5.3333,14H10.6667C11.0333,14 11.3333,13.7 11.3333,13.3333C11.3333,12.9667 11.0333,12.6667 10.6667,12.6667H8.6667V10.6C9.7533,10.38 10.6533,9.6267 11.0733,8.6267C12.72,8.42 14,7.0333 14,5.3333V4.6667C14,3.9333 13.4,3.3333 12.6667,3.3333ZM3.3333,5.3333V4.6667H4.6667V7.2133C3.8933,6.9333 3.3333,6.2 3.3333,5.3333ZM12.6667,5.3333C12.6667,6.2 12.1067,6.9333 11.3333,7.2133V4.6667H12.6667V5.3333Z"
-      android:fillColor="#0DBD8B"/>
+      android:fillColor="#8bc34a"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_shield_trusted_no_border.xml b/vector/src/main/res/drawable/ic_shield_trusted_no_border.xml
index 2266c23548..78e06fa511 100644
--- a/vector/src/main/res/drawable/ic_shield_trusted_no_border.xml
+++ b/vector/src/main/res/drawable/ic_shield_trusted_no_border.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="24">
   <path
       android:pathData="M1.5,12.405V3.075L12,0L22.5,3.075V12.405C22.5,21.945 12,24 12,24C12,24 1.5,21.945 1.5,12.405Z"
-      android:fillColor="#0DBD8B"/>
+      android:fillColor="#8bc34a"/>
   <path
       android:pathData="M17.4157,6.8094C17.1457,6.5244 16.6957,6.5094 16.4107,6.7794L10.0057,12.7794L7.6507,11.1294C7.3357,10.9194 6.9007,10.9194 6.6007,11.1894C6.2407,11.4894 6.2107,12.0294 6.5107,12.3894L9.2257,15.5094C9.2707,15.5544 9.3157,15.6144 9.3757,15.6444C9.8857,16.0644 10.6507,15.9894 11.0707,15.4794L11.1157,15.4194L17.4457,7.7544C17.6557,7.4844 17.6557,7.0794 17.4157,6.8094Z"
       android:fillColor="#ffffff"/>