From 126b344434ea9ddf2f0d91c5ee39a67bbc25ba57 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 19 Jul 2020 15:10:58 +0200
Subject: [PATCH] SchildiChat notification icon

---
 graphics/icon_gen.sh                             |   3 +++
 graphics/materialdesignicons/README.md           |   8 ++++++++
 .../materialdesignicons/ic_status_bar_sc.svg     |   5 +++++
 .../features/notifications/NotificationUtils.kt  |   8 ++++----
 .../main/res/drawable-hdpi/ic_status_bar_sc.png  | Bin 0 -> 662 bytes
 .../main/res/drawable-mdpi/ic_status_bar_sc.png  | Bin 0 -> 433 bytes
 .../main/res/drawable-xhdpi/ic_status_bar_sc.png | Bin 0 -> 784 bytes
 .../res/drawable-xxhdpi/ic_status_bar_sc.png     | Bin 0 -> 1224 bytes
 .../res/drawable-xxxhdpi/ic_status_bar_sc.png    | Bin 0 -> 1686 bytes
 9 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 graphics/materialdesignicons/README.md
 create mode 100644 graphics/materialdesignicons/ic_status_bar_sc.svg
 create mode 100644 vector/src/main/res/drawable-hdpi/ic_status_bar_sc.png
 create mode 100644 vector/src/main/res/drawable-mdpi/ic_status_bar_sc.png
 create mode 100644 vector/src/main/res/drawable-xhdpi/ic_status_bar_sc.png
 create mode 100644 vector/src/main/res/drawable-xxhdpi/ic_status_bar_sc.png
 create mode 100644 vector/src/main/res/drawable-xxxhdpi/ic_status_bar_sc.png

diff --git a/graphics/icon_gen.sh b/graphics/icon_gen.sh
index 071158dc1a..571ead4e55 100755
--- a/graphics/icon_gen.sh
+++ b/graphics/icon_gen.sh
@@ -28,6 +28,9 @@ file="$mydir/riot_splash_sc.svg"
 export_files
 rm "$mydir/riot_splash_sc.svg"
 
+file="$mydir/materialdesignicons/ic_status_bar_sc.svg"
+export_files
+
 dpi=48
 cp "$mydir/ic_launcher_sc.svg" "$mydir/element_logo_sc.svg"
 file="$mydir/element_logo_sc.svg"
diff --git a/graphics/materialdesignicons/README.md b/graphics/materialdesignicons/README.md
new file mode 100644
index 0000000000..1e772a6c69
--- /dev/null
+++ b/graphics/materialdesignicons/README.md
@@ -0,0 +1,8 @@
+Icons in this directory have been taken from [materialdesignicons.com](https://materialdesignicons.com/),
+released under the [SIL Open Font License 1.1](https://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web).
+
+Listed below are the original icon names and authors:
+
+- ic\_status\_bar\_sc.svg
+    - Original name: tortoise
+    - Author: Nick
diff --git a/graphics/materialdesignicons/ic_status_bar_sc.svg b/graphics/materialdesignicons/ic_status_bar_sc.svg
new file mode 100644
index 0000000000..1d4c8a5bdd
--- /dev/null
+++ b/graphics/materialdesignicons/ic_status_bar_sc.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1"  width="24" height="24" viewBox="0 0 24 24">
+   <path fill="#ffffff" d="M19.31,5.6C18.09,5.56 16.88,6.5 16.5,8C16,10 16,10 15,11C13,13 10,14 4,15C3,15.16 2.5,15.5 2,16C4,16 6,16 4.5,17.5L3,19H6L8,17C10,18 11.33,18 13.33,17L14,19H17L16,16C16,16 17,12 18,11C19,10 19,11 20,11C21,11 22,10 22,8.5C22,8 22,7 20.5,6C20.15,5.76 19.74,5.62 19.31,5.6M9,6A6,6 0 0,0 3,12C3,12.6 3.13,13.08 3.23,13.6C9.15,12.62 12.29,11.59 13.93,9.94L14.43,9.44C13.44,7.34 11.32,6 9,6Z" />
+</svg>
diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationUtils.kt
index 36874d5782..9bcbd87875 100755
--- a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationUtils.kt
+++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationUtils.kt
@@ -512,7 +512,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
         val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color)
         // Build the pending intent for when the notification is clicked
         val openRoomIntent = buildOpenRoomIntent(roomInfo.roomId)
-        val smallIcon = R.drawable.ic_status_bar
+        val smallIcon = R.drawable.ic_status_bar_sc
 
         val channelID = if (roomInfo.shouldBing) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID
         return NotificationCompat.Builder(context, channelID)
@@ -613,7 +613,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
                                         matrixId: String): Notification {
         val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color)
         // Build the pending intent for when the notification is clicked
-        val smallIcon = R.drawable.ic_status_bar
+        val smallIcon = R.drawable.ic_status_bar_sc
 
         val channelID = if (inviteNotifiableEvent.noisy) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID
 
@@ -676,7 +676,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
                                      matrixId: String): Notification {
         val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color)
         // Build the pending intent for when the notification is clicked
-        val smallIcon = R.drawable.ic_status_bar
+        val smallIcon = R.drawable.ic_status_bar_sc
 
         val channelID = if (simpleNotifiableEvent.noisy) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID
 
@@ -774,7 +774,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
                                      noisy: Boolean,
                                      lastMessageTimestamp: Long): Notification {
         val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color)
-        val smallIcon = R.drawable.ic_status_bar
+        val smallIcon = R.drawable.ic_status_bar_sc
 
         return NotificationCompat.Builder(context, if (noisy) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID)
                 // used in compat < N, after summary is built based on child notifications
diff --git a/vector/src/main/res/drawable-hdpi/ic_status_bar_sc.png b/vector/src/main/res/drawable-hdpi/ic_status_bar_sc.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9871806e5b8be6658fcc47943c1213eb694f631
GIT binary patch
literal 662
zcmV;H0%`q;P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00009a7bBm000&x
z000&x0ZCFM@Bjb+8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10wYO8
zK~z|U?Ug@h6hRcmzbEIRTw!6tS*VBvK_!J27NRM{YoZn@QV4>IMLHWJw*J9F5Cjp?
z!a@lsq!US_g<=|;Scr`ZNk9|{Dk6kL6Mq&vC+lQyXLb!*xIY-~nD@T-zMb92NEH<o
z75^6do6UfJNqZ&DOByk=H)RWT1H-^$;2p34%m7b-Ge9$-uLJk_ojKr0Q6uJzd?BB&
zz-eGbhdNg~=zahPW6jindjTUpqd?uOvlf`m(M-e|x>nFko10#p<AMBdF=qCaG}ES)
zsx=bGolN)6eCLwRM;&7}-zBYfW*U+X1@a%}MuGJtA6pqd0{c_7u6yx0k^yM*3Ro91
zbhw0(1>g>D{7I(sqL=d?=mi?UF}KzP&l@;Zz{m`61?WlX8^G<1+<{>84u*yUC-Drp
z0Q3PXJ#9bmIz#sYh`JSO8GF;I|8FHdcWXk@Q#1SInW#$|kaSYg?hbu!nHe#LmH>1C
zEubqWrwJSd?vi}SdCUXdvHgR`2-GBPm9)dHKKC1YF+Vc1RyZwT$txq7lmn7>N!lr?
zSJJB3f*FjJRstu;zjw;8<qsa_m$4?W2N+)lL)(k=&b&Iz?1Pz&OZx1ErX)R(w3s1V
zbg@})f3S$5jsWMpC!GW~x!6Wv2)OLl5U|0;Mm^oj<uG&BD>@Bqj?@ljytZwzy|bpQ
wN6A!ON^RdTv#H3MW1d!$!gp3hMaBQhPwzyCDxBwNVE_OC07*qoM6N<$f|6AlaR2}S

literal 0
HcmV?d00001

diff --git a/vector/src/main/res/drawable-mdpi/ic_status_bar_sc.png b/vector/src/main/res/drawable-mdpi/ic_status_bar_sc.png
new file mode 100644
index 0000000000000000000000000000000000000000..232c3cea2c0041767eba47764a25787052298cb9
GIT binary patch
literal 433
zcmV;i0Z#sjP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000id
z000id0mpBsWB>pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10X|7Y
zK~zYI?a{wWmQfhS@%#7#b8|~^mzQ!82^w^A30hnn#3^WghiJ(L>n~_(Y;kB8#M!|>
zbJ0PR1SfF_Y^kV4J`FzN;pKUbk88XaoZ;N}b-veq&WY%&ueQP*mNC}GJc2HE@e7yu
zf|nTS@g}Uh)j6h1@JSqK)*i+)|MMEperfU&{6=3fRGs-;)BoEP&}{*SD?G(8e$@1L
zn*#P)z%Q^+`9Eg$Equc%W}5<j7QknCjWImHr>wWp_^CYsm)W7;*v2ZJV4zxyIP3}U
zv<>KD1&=UT)e>g$7AG|~+bJ<qO~^z<%w%gWA|4hPuTn}M+D!if$Av#=($t;sEMye(
z_Y8PkVh-h-l+qtO%S!JfVlyIEB4R2czDLAXTtD5L%Ci&^M{RHLE}Lwv;Ok_*<5uv#
b{$KqAeJ+FFZnZ+i00000NkvXXu0mjf9nHJX

literal 0
HcmV?d00001

diff --git a/vector/src/main/res/drawable-xhdpi/ic_status_bar_sc.png b/vector/src/main/res/drawable-xhdpi/ic_status_bar_sc.png
new file mode 100644
index 0000000000000000000000000000000000000000..377bebadb851d15f5a058046f3503bfbfcc22645
GIT binary patch
literal 784
zcmV+r1MmEaP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm0013_
z0013_0gvVJWdHyG8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10-Z@j
zK~!jg?UzkRRY4er-?6j;BSi};Q`(du1(AyiqD5r22#gl}>>_d}noupff>1km1&S2p
zx*+Ih6GT5yw1^1HqD^4bA_Pq=q}$Wt+{NK|&$%;mkG7cyW^>Q?z2EztJ2PiS3Iqay
zKp+tC#{6#saex()PDwg0X|trylE#cNPx3C*3iJYxfJtBum<OhS`@kij#Zj{vcusk4
z0;}^d-U5sPe^Ls?DFU~FRtw!);AI89dw~Cp0lI;o7RHmz04FPG_gZS5^)=sDdZWJl
z1^P4eCoFYd`<U;p(tMmn{{*nrA^*3l`4;@9O&YT#)&y|QA%8CEv8F-~gOci<y3S^;
zq@l!bM;-Dfts{xHN}Jurg?ZpmtVR>?%OQWjr2*TW!Itm9o<xmthx}K-DwhTx=4k#7
zuqmNGloER#=m4$(KY(fA2C&ZBe5t_49E?8$x)QoIz;H_ZEhm!|8kqGoJp+sad&_7x
z0e4gKrh$e$8*te^zXBt`F<?y@Ed!hYzGY|(=4QTB^ixWqBGCbE95@eb&(JWyVWI_?
zMG<K8@wqbN**i&Xk|rd*iH*0$m_;9ygz=4%&PeK!w9UfDV`I!0E626~8-O~?SOe??
zE&?xbKYE<@_33pyC0cB|N@Jg-1Cp9OJuFCCZ;YAsNzR%=k|dx}Qir77vC*!|#}Hed
z`kI$g8US`k>XXzZX^XG8B@c2{11<myj&rygY!-Pci>84wX4n{0C#g}<#d^P_(Q1lR
zpmqthBY*~?Th&rfsK%S^LcFT-J61tbr=$@{Y2St^MfZw>DbF+S%T)suY~CDD4;%sd
zfy+P-&<WJUV&11{bu72}D>>^Ga<-no`I2UPispwry$1q;Kp+rUF8%@0MwKlL!!b|*
O0000<MNUMnLSTa4epkf+

literal 0
HcmV?d00001

diff --git a/vector/src/main/res/drawable-xxhdpi/ic_status_bar_sc.png b/vector/src/main/res/drawable-xxhdpi/ic_status_bar_sc.png
new file mode 100644
index 0000000000000000000000000000000000000000..70736b374944352195206d7b3da2a0b1d61f5734
GIT binary patch
literal 1224
zcmV;(1ULJMP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm001mX
z001mX0e5<IO#lD@8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11XW2y
zK~#90?V4Mtl|>kapHVAQtc=t`BP&bU+l`$gilUR2SQ!z8K}g_DU=cykmAf#63Z%RW
zx(EU<B5yR3%Ip9MW?>>?N)cTInRXCMDi2Q=vx?nr9p*o|gyw+-i+|00-}}FOGynWE
z3o@BZCX>lzGMP*!lgVT<|0hDf1vHI11(*ix4<YR9x1N&%b-cP<-RZyiPF<m%l^Uy&
z3Q}hQ3xMl^Ilu+LB;Y9U6YvAD9oP!I6GHg5#@us&H-Moo&Atbggb+TcD{oKKaq2_r
z7K?FA-K;*Sj;W|&P~Df9_o%wGrrYl+><)ErL1WtSg?f8Q4HMPf1@j$K@2=aAk)kH3
zuhwA9NRF#()bRziJX12?kLuY?m@`%Vye3oHu}wWEQOiX2V1-;ycZywV%&Sv@kAW-7
z^iSj}U~?;1FBSr4RLFH_rymL%q)q@f0<$X!N@WPxpq|#F-J*(lF6;C|nF@NDW-Dhj
z*8r<~w7I2Xj?*jlj~Jg;{o=L`nl7y&cE=TVas{d5h}F|CUR1}nxjw&!*n2wtP-KWb
z09;aCOKD~R=eD`Nq=wk<R*qot6>^>ISLe0SG+<meRpGE{Ps*<5%&K~a71(2Zw;Qc#
ztolg}@gJ*XPD{+AH3%ugMmwx>)zu08zfs>ezIU}_Rb_KpV%FAkzsVd>AMT=OWkQUX
z)KgmRhtzfI&#li!J3JN38nnG3BSv#beZjcN)lSD4(<<k++HOA4paV_1V%(xwX_t2|
z<0jaf39-IbC!R=uQ2%Jalq2eTb+N6X&?Wz%=`Y3|hh}3KOTP{d8Rvqfb{IyZ@{U!X
zQh!g3|E290lg*-jRnm|n>Q?o6b%DKKI{(fWjFmNdPq`P%oA#oU;13f89yD&Bu2L7O
zlM3b;qb^cEEoh9!>O8aVdmoqBZU=DFsB6CfJBgd`+knr2y&;6-MMbFR0gnL7h#UN6
zSQkP#Sh8<NQVrTfJX_j9G-YSilL&Pha1U@Va4XPtqE29K#r|zMVF!oC$@5C!X5cR1
zI!f+nwqYMIJ%n(qrg;C5T0w;|PRR3s8;GXdNVRRzZft169H_}4<6hBh;OY^ddBCZ4
z#7|&-Q-KQ)F?BL9NE|K$t?!ou6Y7<g%wb?k2;p!O!FyIvt2!0~_Yseh&u>CV1vWKh
z4)iccoe#VM%xp?P4ZPiC@QzOr^>O0y&deqS)WCa92Jbls8UHF0h!gG<;6mb)X&ErN
zNpXqH4I%96w}}6s&M>}f^_$@)@3YE6?azw+>*D?<gO@#<55Ss){=>vG_Sb<T3%TRK
zTg0KfyGPprb)Z1(=24$3TKdKz`K0=h`dgd!zZ!Q9o=~Tc==W^Dhgl)i;i`g-|3<r5
zy|(qa$hh8W*LH3~zLR5;PBdpl19^8P<n8Y;>z6qNat}9=yH0_PnA6HXCn0~Y$vl(E
mWHOmdCX>lzGMP*!1AhTH)li;1jG!_A0000<MNUMnLSTY-f<E;C

literal 0
HcmV?d00001

diff --git a/vector/src/main/res/drawable-xxxhdpi/ic_status_bar_sc.png b/vector/src/main/res/drawable-xxxhdpi/ic_status_bar_sc.png
new file mode 100644
index 0000000000000000000000000000000000000000..474b97f6f5b877a20b93b105977d0c46ff1ef95b
GIT binary patch
literal 1686
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

literal 0
HcmV?d00001