From 5ecbc29fecf101d5dc1de879fb378bec1f6d12db Mon Sep 17 00:00:00 2001
From: Jonas Kalderstam <jonas@kalderstam.se>
Date: Tue, 17 Nov 2015 18:37:47 +0100
Subject: [PATCH] Fix icons for notification items

---
 .../drawable/ic_alarm_24dp_black_active.xml   | 26 +++++++++++++++++++
 ...active.xml => ic_alarm_add_24dp_white.xml} |  2 +-
 ...ite_active.xml => ic_clear_24dp_white.xml} |  2 +-
 app/src/main/res/layout/notification_view.xml |  4 +--
 app/src/main/res/values/attr.xml              |  1 +
 app/src/main/res/values/themes.xml            |  6 +++--
 6 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_alarm_24dp_black_active.xml
 rename app/src/main/res/drawable/{ic_alarm_add_24dp_white_active.xml => ic_alarm_add_24dp_white.xml} (96%)
 rename app/src/main/res/drawable/{ic_clear_24dp_white_active.xml => ic_clear_24dp_white.xml} (96%)

diff --git a/app/src/main/res/drawable/ic_alarm_24dp_black_active.xml b/app/src/main/res/drawable/ic_alarm_24dp_black_active.xml
new file mode 100644
index 000000000..18709ae0b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_alarm_24dp_black_active.xml
@@ -0,0 +1,26 @@
+<!--
+  Copyright (c) 2015 Jonas Kalderstam.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#8a000000"
+        android:pathData="M22,5.72l-4.6,-3.86 -1.29,1.53 4.6,3.86L22,5.72zM7.88,3.39L6.6,1.86 2,5.71l1.29,1.53 4.59,-3.85zM12.5,8H11v6l4.75,2.85 0.75,-1.23 -4,-2.37V8zM12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zm0,16c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_alarm_add_24dp_white_active.xml b/app/src/main/res/drawable/ic_alarm_add_24dp_white.xml
similarity index 96%
rename from app/src/main/res/drawable/ic_alarm_add_24dp_white_active.xml
rename to app/src/main/res/drawable/ic_alarm_add_24dp_white.xml
index 00af2ad38..131747280 100644
--- a/app/src/main/res/drawable/ic_alarm_add_24dp_white_active.xml
+++ b/app/src/main/res/drawable/ic_alarm_add_24dp_white.xml
@@ -21,6 +21,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#8affffff"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M7.88,3.39L6.6,1.86 2,5.71l1.29,1.53 4.59,-3.85zM22,5.72l-4.6,-3.86 -1.29,1.53 4.6,3.86L22,5.72zM12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zm0,16c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7zm1,-11h-2v3H8v2h3v3h2v-3h3v-2h-3V9z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_clear_24dp_white_active.xml b/app/src/main/res/drawable/ic_clear_24dp_white.xml
similarity index 96%
rename from app/src/main/res/drawable/ic_clear_24dp_white_active.xml
rename to app/src/main/res/drawable/ic_clear_24dp_white.xml
index 0705c3bb0..54ebd8637 100644
--- a/app/src/main/res/drawable/ic_clear_24dp_white_active.xml
+++ b/app/src/main/res/drawable/ic_clear_24dp_white.xml
@@ -21,6 +21,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#8affffff"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
 </vector>
diff --git a/app/src/main/res/layout/notification_view.xml b/app/src/main/res/layout/notification_view.xml
index 3ed06ab9e..ec4406e7b 100644
--- a/app/src/main/res/layout/notification_view.xml
+++ b/app/src/main/res/layout/notification_view.xml
@@ -35,7 +35,7 @@
         android:layout_marginLeft="4dp"
         android:contentDescription="Remove reminder"
         android:scaleType="center"
-        android:src="@drawable/ic_clear_24dp_black_active"
+        android:src="?ic_clear_24dp_active"
         tools:ignore="HardcodedText" />
 
     <ImageView
@@ -48,7 +48,7 @@
         android:minWidth="8dp"
         android:padding="0dp"
         android:scaleType="center"
-        android:src="@drawable/ic_alarm_24dp_white"
+        android:src="?ic_alarm_24dp_active"
         tools:ignore="HardcodedText" />
 
     <TextView
diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
index 166940332..0a1378bda 100644
--- a/app/src/main/res/values/attr.xml
+++ b/app/src/main/res/values/attr.xml
@@ -24,6 +24,7 @@
 
     <attr name="ic_clear_24dp_active" format="reference"/>
     <attr name="ic_alarm_add_24dp_active" format="reference"/>
+    <attr name="ic_alarm_24dp_active" format="reference"/>
 
     <!-- Unknown -->
     <attr name="my_list_selector" format="reference" />
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 1fe716504..2d585eba3 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -31,6 +31,7 @@
         <item name="iconTint">@color/icon_tint_light</item>
         <item name="ic_clear_24dp_active">@drawable/ic_clear_24dp_black_active</item>
         <item name="ic_alarm_add_24dp_active">@drawable/ic_alarm_add_24dp_black_active</item>
+        <item name="ic_alarm_24dp_active">@drawable/ic_alarm_24dp_black_active</item>
 
         <item name="NavDrawerStyle">@style/LightNavbarTheme</item>
         <item name="alertDialogTheme">@style/LightDialogStyle</item>
@@ -54,8 +55,9 @@
         <item name="separatorColor">@color/dark_separator_color</item>
         <item name="selectedItemColor">@color/dark_selected_item_color</item>
         <item name="iconTint">@color/icon_tint_dark</item>
-        <item name="ic_clear_24dp_active">@drawable/ic_clear_24dp_white_active</item>
-        <item name="ic_alarm_add_24dp_active">@drawable/ic_alarm_add_24dp_white_active</item>
+        <item name="ic_clear_24dp_active">@drawable/ic_clear_24dp_white</item>
+        <item name="ic_alarm_add_24dp_active">@drawable/ic_alarm_add_24dp_white</item>
+        <item name="ic_alarm_24dp_active">@drawable/ic_alarm_24dp_white</item>
 
         <item name="windowActionModeOverlay">true</item>
         <item name="actionModeBackground">@color/primary_dark</item>