From ff8b3f8837aca5ed2708df2daf5cab836b0ddb40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Sun, 1 Aug 2021 13:19:46 +0200 Subject: [PATCH] Send mutltiple notifications instead of summary notification (#1365) --- .../debug/res/drawable-hdpi/ic_stat_grade.png | Bin 478 -> 0 bytes .../res/drawable-hdpi/ic_stat_luckynumber.png | Bin 652 -> 0 bytes .../res/drawable-hdpi/ic_stat_message.png | Bin 384 -> 0 bytes .../debug/res/drawable-hdpi/ic_stat_note.png | Bin 460 -> 0 bytes .../res/drawable-hdpi/ic_stat_timetable.png | Bin 426 -> 0 bytes .../debug/res/drawable-mdpi/ic_stat_grade.png | Bin 355 -> 0 bytes .../res/drawable-mdpi/ic_stat_luckynumber.png | Bin 451 -> 0 bytes .../res/drawable-mdpi/ic_stat_message.png | Bin 297 -> 0 bytes .../debug/res/drawable-mdpi/ic_stat_note.png | Bin 339 -> 0 bytes .../res/drawable-mdpi/ic_stat_timetable.png | Bin 335 -> 0 bytes .../res/drawable-xhdpi/ic_stat_grade.png | Bin 588 -> 0 bytes .../drawable-xhdpi/ic_stat_luckynumber.png | Bin 897 -> 0 bytes .../res/drawable-xhdpi/ic_stat_message.png | Bin 508 -> 0 bytes .../debug/res/drawable-xhdpi/ic_stat_note.png | Bin 586 -> 0 bytes .../res/drawable-xhdpi/ic_stat_timetable.png | Bin 519 -> 0 bytes .../res/drawable-xxhdpi/ic_stat_grade.png | Bin 781 -> 0 bytes .../drawable-xxhdpi/ic_stat_luckynumber.png | Bin 1329 -> 0 bytes .../res/drawable-xxhdpi/ic_stat_message.png | Bin 692 -> 0 bytes .../res/drawable-xxhdpi/ic_stat_note.png | Bin 805 -> 0 bytes .../res/drawable-xxhdpi/ic_stat_timetable.png | Bin 700 -> 0 bytes .../ic_stat_grade.xml | 0 .../ic_stat_luckynumber.xml | 0 .../ic_stat_message.xml | 0 .../ic_stat_note.xml | 0 .../ic_stat_timetable.xml | 0 .../wulkanowy/data/pojos/Notification.kt | 3 + .../sync/channels/LuckyNumberChannel.kt | 1 + .../sync/channels/NewConferencesChannel.kt | 1 + .../services/sync/channels/NewExamChannel.kt | 1 + .../sync/channels/NewGradesChannel.kt | 3 + .../sync/channels/NewHomeworkChannel.kt | 1 + .../sync/channels/NewMessagesChannel.kt | 1 + .../services/sync/channels/NewNotesChannel.kt | 1 + .../channels/NewSchoolAnnouncementsChannel.kt | 3 +- .../sync/notifications/BaseNotification.kt | 95 +++++++++++------- .../NewConferenceNotification.kt | 1 + .../sync/notifications/NewExamNotification.kt | 3 +- .../notifications/NewGradeNotification.kt | 9 +- .../notifications/NewHomeworkNotification.kt | 1 + .../NewLuckyNumberNotification.kt | 1 + .../notifications/NewMessageNotification.kt | 1 + .../sync/notifications/NewNoteNotification.kt | 5 +- .../NewSchoolAnnouncementNotification.kt | 1 + .../main/res/drawable-hdpi/ic_stat_grade.png | Bin 364 -> 0 bytes .../res/drawable-hdpi/ic_stat_luckynumber.png | Bin 473 -> 0 bytes .../res/drawable-hdpi/ic_stat_message.png | Bin 252 -> 0 bytes .../main/res/drawable-hdpi/ic_stat_note.png | Bin 347 -> 0 bytes .../res/drawable-hdpi/ic_stat_timetable.png | Bin 386 -> 0 bytes .../main/res/drawable-mdpi/ic_stat_grade.png | Bin 301 -> 0 bytes .../res/drawable-mdpi/ic_stat_luckynumber.png | Bin 343 -> 0 bytes .../res/drawable-mdpi/ic_stat_message.png | Bin 220 -> 0 bytes .../main/res/drawable-mdpi/ic_stat_note.png | Bin 280 -> 0 bytes .../res/drawable-mdpi/ic_stat_timetable.png | Bin 315 -> 0 bytes .../main/res/drawable-xhdpi/ic_stat_grade.png | Bin 427 -> 0 bytes .../drawable-xhdpi/ic_stat_luckynumber.png | Bin 713 -> 0 bytes .../res/drawable-xhdpi/ic_stat_message.png | Bin 289 -> 0 bytes .../main/res/drawable-xhdpi/ic_stat_note.png | Bin 449 -> 0 bytes .../res/drawable-xhdpi/ic_stat_timetable.png | Bin 499 -> 0 bytes .../res/drawable-xxhdpi/ic_stat_grade.png | Bin 602 -> 0 bytes .../drawable-xxhdpi/ic_stat_luckynumber.png | Bin 1088 -> 0 bytes .../res/drawable-xxhdpi/ic_stat_message.png | Bin 361 -> 0 bytes .../main/res/drawable-xxhdpi/ic_stat_note.png | Bin 590 -> 0 bytes .../res/drawable-xxhdpi/ic_stat_timetable.png | Bin 671 -> 0 bytes .../drawable-xxxhdpi/ic_stat_timetable.png | Bin 659 -> 0 bytes .../ic_stat_grade.xml | 0 .../ic_stat_luckynumber.xml | 0 .../ic_stat_message.xml | 0 .../ic_stat_note.xml | 0 .../ic_stat_timetable.xml | 0 69 files changed, 86 insertions(+), 46 deletions(-) delete mode 100644 app/src/debug/res/drawable-hdpi/ic_stat_grade.png delete mode 100644 app/src/debug/res/drawable-hdpi/ic_stat_luckynumber.png delete mode 100644 app/src/debug/res/drawable-hdpi/ic_stat_message.png delete mode 100644 app/src/debug/res/drawable-hdpi/ic_stat_note.png delete mode 100644 app/src/debug/res/drawable-hdpi/ic_stat_timetable.png delete mode 100644 app/src/debug/res/drawable-mdpi/ic_stat_grade.png delete mode 100644 app/src/debug/res/drawable-mdpi/ic_stat_luckynumber.png delete mode 100644 app/src/debug/res/drawable-mdpi/ic_stat_message.png delete mode 100644 app/src/debug/res/drawable-mdpi/ic_stat_note.png delete mode 100644 app/src/debug/res/drawable-mdpi/ic_stat_timetable.png delete mode 100644 app/src/debug/res/drawable-xhdpi/ic_stat_grade.png delete mode 100644 app/src/debug/res/drawable-xhdpi/ic_stat_luckynumber.png delete mode 100644 app/src/debug/res/drawable-xhdpi/ic_stat_message.png delete mode 100644 app/src/debug/res/drawable-xhdpi/ic_stat_note.png delete mode 100644 app/src/debug/res/drawable-xhdpi/ic_stat_timetable.png delete mode 100644 app/src/debug/res/drawable-xxhdpi/ic_stat_grade.png delete mode 100644 app/src/debug/res/drawable-xxhdpi/ic_stat_luckynumber.png delete mode 100644 app/src/debug/res/drawable-xxhdpi/ic_stat_message.png delete mode 100644 app/src/debug/res/drawable-xxhdpi/ic_stat_note.png delete mode 100644 app/src/debug/res/drawable-xxhdpi/ic_stat_timetable.png rename app/src/debug/res/{drawable-anydpi-v24 => drawable}/ic_stat_grade.xml (100%) rename app/src/debug/res/{drawable-anydpi-v24 => drawable}/ic_stat_luckynumber.xml (100%) rename app/src/debug/res/{drawable-anydpi-v24 => drawable}/ic_stat_message.xml (100%) rename app/src/debug/res/{drawable-anydpi-v24 => drawable}/ic_stat_note.xml (100%) rename app/src/debug/res/{drawable-anydpi-v24 => drawable}/ic_stat_timetable.xml (100%) delete mode 100644 app/src/main/res/drawable-hdpi/ic_stat_grade.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_stat_luckynumber.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_stat_message.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_stat_note.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_stat_timetable.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_stat_grade.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_stat_luckynumber.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_stat_message.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_stat_note.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_stat_timetable.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_stat_grade.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_stat_luckynumber.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_stat_message.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_stat_note.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_stat_timetable.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_stat_grade.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_stat_luckynumber.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_stat_message.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_stat_note.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_stat_timetable.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_stat_timetable.png rename app/src/main/res/{drawable-anydpi-v24 => drawable}/ic_stat_grade.xml (100%) rename app/src/main/res/{drawable-anydpi-v24 => drawable}/ic_stat_luckynumber.xml (100%) rename app/src/main/res/{drawable-anydpi-v24 => drawable}/ic_stat_message.xml (100%) rename app/src/main/res/{drawable-anydpi-v24 => drawable}/ic_stat_note.xml (100%) rename app/src/main/res/{drawable-anydpi-v24 => drawable}/ic_stat_timetable.xml (100%) diff --git a/app/src/debug/res/drawable-hdpi/ic_stat_grade.png b/app/src/debug/res/drawable-hdpi/ic_stat_grade.png deleted file mode 100644 index 013b7ac4988d5b4215636dbf10fd4f9666f2c4c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 478 zcmV<40U`d0P)ABwK|pa$Bz-V!K@A6SAz2wM0%G66;2?BRFwhP<3B>z>_#TvhX;7pgAYC=6a@jyTNEu1) z2@u~0;&)K~g@JGoBM|Svk*L!Ks_I|`;shYBhvHfww!>k*ArPkkaU9JYMC+CzAqVLK zu>!G}Ru0l7vsKuKWNtpR6o=t{APxs&Hj*6#6`w?+V{U@d7LxvrIMjg(Q5}*U1eH_4 z(g?$a718v<9JCcG9|*)Jkcta_k{v{0Qh+&V4w4uT5I@CL@4*zYBQ?0DklB#;BE~^b z@o7-;-S~WSj>0a^9ugb`t7dNCbC5Qu-vq>e$aK(25*$==@LL6HmUsqg#3q)T8DbT5w|*3?*1=8uTnpO m>i_t2LhCFmxBN-u&iDp>Vewr3fQGvO0000sqlSZOk<1H)Mi(*;24Ze{Ip_!wGZN8ycnica z^l*?Bj=J$VG<4d5_$re6NOBx>4v6;?fmh(EtS=ymv4C2QQ1RD5%teZWW+6ub8EF#3 zK~QlsBs)Uz8L*C8jv?S6P$>O{$~6+>Ac`G>&p}YRuduq3kb|h=7!pFL8J_`u)N%{~ z2bmxxjc|JQg0bZ?W+2`K6@L%JyaVANSUJ=L#HW!$Czamg1h`7-&p@0x5Ca$3>M~GE eKxoj9x&Q#yJOxR-8A`1H0000Y diff --git a/app/src/debug/res/drawable-hdpi/ic_stat_note.png b/app/src/debug/res/drawable-hdpi/ic_stat_note.png deleted file mode 100644 index 1992edf256bdb7f24a1a1404c4a0adf20d4ed656..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 460 zcmV;-0W2k`*$2^u=)IuJ{eT1&G)YwCC?Zlu5g(~-<^1!4|r zG)X`Xd_{(1wgIs)t=dU-Bskj`0&xsAL(BxNh?oMzW##shCTt}01_O;g479Uq{K1dK>P%%lAG20000*LPuX&fL}AsmJ=t`4ADNg%wfmk4an zn23@}d+Zs-1)3S(NM~7U6=Fa~^nE7{)D{3K$k2x6BSzZe>}m*~)Dp+nq^Ti=Q!Av< zsk4S>ZE%#Ge7Kha(zu=^#@S3FY;YrsBs1+FnKj6d*};|?bYM#t$zV3I+XHSHBQ;Aj zW)p0!FOO!d_-P{IQMga|yw_Jsm zJ{PDXx9m+Y13&3OnlSaq?rFlX9_S3-I-oQ5kbU2mto}g^zIc8b$bf;d>gpHb1x7t0 UUF%U7EdT%j07*qoM6N<$f`#0?BLDyZ diff --git a/app/src/debug/res/drawable-mdpi/ic_stat_grade.png b/app/src/debug/res/drawable-mdpi/ic_stat_grade.png deleted file mode 100644 index a5df2a3596a75db0f9dc48ae542282f887c088bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 355 zcmV-p0i6DcP)m;Btr#|Lk+dSW&x0`2gIMzg2a)U7L-E83XmdJf|?doK*gkR z=%<U#r?9}s9D zXaNa6hgpyT<>y2B=I9E8p%Pn=A`%yF!(#y#G=(*xTL22neMFY~*YQ}u2r9OLcmlN& z2f797P<|e@E$9PcS7-_YMYtHXEkG^=4d~W*004qZ%P)}C`MCf9002ovPDHLkV1g!h Bi8BBI diff --git a/app/src/debug/res/drawable-mdpi/ic_stat_luckynumber.png b/app/src/debug/res/drawable-mdpi/ic_stat_luckynumber.png deleted file mode 100644 index 278ed2c6673286284086e1dd77d9b5fecb12a84d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 451 zcmV;!0X+VRP) zxt>$!=Ja;&eJ}5ul~cdwojZ4)=bm%VeQzT1A5lXol>&oc64ZlQFb+mRRU8Hz>N}pn zllXp23y30~Q{mAU#h?y+h8X02BisS9{Ji22-{v_PkoVotEg`VXWx6qlKawa|5?LOC zw98<~Aao77!JQbRjV^){!~7YS!IY&Gx1a#dKv_JSV$NmIz^!PCbI=T0z`kY9D`;~W zWCMLJqs-z>;MDN@8)ubq8I&yIWZDG|Sfs#)6nmf_Bz?MQ%+f7IE|JWp2h9Go|Eu}< z>)7E|G~a_Cch|5_Mm6BWU~nPkXoGoi zSgEX6J_dQqrmxxzcx;^)mI^bd07rp7e*v2z25W3k>61koOw$Pk?Vyn^8%K#~40hGU*JW{dp??4X002ovPDHLkV1mn1%ZUI0 diff --git a/app/src/debug/res/drawable-mdpi/ic_stat_message.png b/app/src/debug/res/drawable-mdpi/ic_stat_message.png deleted file mode 100644 index 7327a02f32c857a246a430d5dccf26d8d27b8552..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 297 zcmV+^0oMMBP)}Y02cHFn|0xHp_$(-*f(32FTJV8{c)LrE z1z&+Uo=E(P91Fgakb>R~${_j+#P^BBzlpV=m;xVsgIZQbtOZ|y*ntSl55z`5%tVY! zib+iK)ufg~q*yQ?sz(+{3{=dV1>#UjEdWKT6q*Iwp?P8>lpjpUf=NKEfCEb->490$ z4dpXKBmF!+3nq~etSA;h#a06GACP6}ic3f_9FGMnpcb&8D^@0>fCLq28#Fwd6 v1Hvo-x!M;RJRlH7Z3|%F1`x;6t&Rr(lkMR%11L)H00000NkvXXu0mjf$q93V diff --git a/app/src/debug/res/drawable-mdpi/ic_stat_note.png b/app/src/debug/res/drawable-mdpi/ic_stat_note.png deleted file mode 100644 index 2fb0209825a5ba1b4016d0b288471114db74e2e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 339 zcmV-Z0j&OsP)_U7NumbU1AifX9zlkvX zFOvG@K+H`_&R$D|1*<73I*ft%2Oh&4fS8fe^2q^+Z(uQeB~)G(NeonMoCV@gax4O+ zlG{N15{T81#9=A zMk+jJ=(XUhg*jHasSuN*7W$fvl@7&r?+tJkg9ivI=x;0Yi;kF)r;{JgqG=j}3#o(N z_%XwZT}mY5j%I4M2%wWsK|YYsGNK;oiz5i^424d&WOVZs75q}9u2#j0e8u|gX;U7t h!+C>tyLa>v@&an^DdqdT(X{{o002ovPDHLkV1jaYl6C+9 diff --git a/app/src/debug/res/drawable-xhdpi/ic_stat_grade.png b/app/src/debug/res/drawable-xhdpi/ic_stat_grade.png deleted file mode 100644 index c63f810fb059d540b0d582b4ea9751038ae9a6e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 588 zcmV-S0<-;zP)(j~utNzmm`~qS}YCGQSKYhV*YI`6B$?$7H z98UvWjbz6cYI`69$?&~2N}{?*cKjTf9sp`|L5fmMay$T(X9Z$6JW0inmLAxSWJn&V z9stUT1MztR8MJvYdtf0ECCs4qz+)tJXK++jNrTw~pODm<4n!s%^#GDOKOk0sVxghv z0d#N$h^>dR2SDIG5K9ha4}d`WkjunC_Tr&Z4~%+Xpgr&qM@{?!NxXP4dtf$!4EzUI zpLei$KnRGB;pyuZ4C;CSs+Jj){?YmX!9XlSKp!^{I{>i;5L*tI2L^iVXV`im2}%4O z5Z6hAcqY^{q~dxk<{^9F9g^BJXdanN6%WuL$s&8;BAT2B5Pw6Gw;xg-fXde+$!{da zz->qx8j!k#lwvV5J)njp4~h+DLLQh(qtWKoWO@KJC-E0ajXWU_=!4oJH1NPOay$T4 z^94zb7BR`l5i~vz#NVmtfn5}M;1`k_<-u0-6G}odXmtX|Q1d`0lKip3*!IF#4=AGb zNklC;T5m+Ax$NWQkqH_wU9BT5-nkAArT8qg%FDp5gU(%u&EXC zSO^jlLCm5HA*~9Lc%?K9QFHxI^4;X*r1#EwjeE&_$uDj0dED=R=DXkd&b^UH!3tKe zf)y-ia~x+hI07DmUT^~>K$O}W!BuK|3_3x1Se%~;UO7YCb#T_B?K7wg+W9EB>*yO3 zUKXT)xsJKTgA|akAmC7t0ybI@us28nMGWBVoYbw^xZGxR7h_`M~ZR&g(=<{*n zJy=P7TR~RR`4o*=2zq?_eFf7^1awF^!&ZI^^>3FDag6$|AO~|cZGSg+7C1a-d21t*~&N5*m^KPA=XOQ zs_B}F^_ctuNsaW#R=%FbSAr(`f3{}2Jz$#uuW8(rt#YNXSM+Jj^9+nMO{HfvZp^}F zEjPyk(62GiO;BXw{2Gm$X1SQ3>h8AqyG%0kWN2@=Lo}EO=+Y42W}7+S4dwb6U0dg| zV-HeI6$c}1)<7>6o$sJ=OTZ_g?uk=d3#DAwZh?9ED&n3hIM45}10JjF?$~W4B9+%_ z6qBEpbp9~)U!5b)nbU35ch=u1qbum`fnUzw$*p`wa>tGd_o?;CW@-ARCh3Z(^Qagf zxw)RwpMeo}C{`Bm_+4+Q!qHKG*vB6QPX*k4j~E(PJJ@0o;AwS*eeNiJKJniS0T9sLu(m zJ#9)zVPHqqiiF6%e5cI;_AsAI}J00000NkvXXu0mjfNfe;G diff --git a/app/src/debug/res/drawable-xhdpi/ic_stat_message.png b/app/src/debug/res/drawable-xhdpi/ic_stat_message.png deleted file mode 100644 index c4140be897ce9df34883a5c387eb7ececa6f83cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 508 zcmV5TUPu{WiTHwNNg{|6R?QR0CO{|6r2q{IXF27w3u z0Wl}J9(eM9Z~*>M51@hHG$?hx(ZT~yaTxfJ2F3O6Q4fqH4}1sW{Zz*9=;?tWQwojd zfr0kGv*GH2FF-t>%J?ZgJuqZ4F)j~)LQ8?l`0#Ma1HYhcqXW?T;R+D*4h0Vs0dWWr zb5YY!TpsuU#Pw9dHni-}Kc`{F{0qd@K+H5$Jy1Z8Ar)GAU^1FLR(Lv27lF71h$RM# z2Oa`350M@~2A_a9dN6n(9*aHb9#{dy3!rtwH?$Fo$bt00J8VNFSUez(BqsvIJJ3o% zF-kqK7>FInzBK^+2Nu$*(jn3VUTA6rN%6o!TGp6EdcYG+jS#UOpsC|Y@IW+@{2w4@CC1=xT05Qu z5A-0(Uma|-K!l1>ZnQ3E=aBILv<_H@B=;4FWe2+lRzN%YD}ne8nq0`o~j%SYY_W%9i`yLl0000TN>V~8Hg-y6VMDR9lOiQ`B~sW>mz_r`JCEd*l@tp*?-GUR z7LmvCpBnWwx%VD-<~Zlx=BwZ4esgEO-+j!SnTd$dp+kob9ae>582jMd2iu@t!5F1r z#m_j5q+mP0H3CPwMDaD?-NYElRtmg;#31`WGt7k&fep~d84(7UB000Tg+69UZqW*X z9`bs&p+2ff{|#C|3upl?parym76=D{Q_{%+@NgC^5LhMsZ;{v8(`sC>0@H^5u_LqD zaDfXOi+=)zvOA_!FbLMcCgD+Gp|3*Uj4}3KvvRvRp-^DWj{S0lqT<)zzo>s$2LFl1sebBr{y67?*(Wp3S^L6I-jZN;^qn& z0iI6+HzeO5QUbgUJxn{Ys%Z9@-OHaWy~3jcJK4*Z5NH-=r)bs1w}Q6-GfA<8K%LMg zRb}xd;KRgJSScY;E3`>dDKKPm0c(*EXd-#`Va2EvST-pzDIqXS^2biQ2?{igCV*>_ zcZZAsUjvp%?ipk`U0{x{BlF;1)s@zN3i#S~b~yDm)Sm#mr5p!&PQK2K13AAC8TNPC Y-`g6$N>;02v?yBm(#ZOM!`5yZ1(jTt+j%RRLP?N0^v>iESa^cX9l0KD-LO445UE z(dP5P`HHB9ZV!OP!9KUBk!^BIk5oqitcK(ZV!MR_VoeSJt2bS>rYUk^&i^shnC8qH4xg4i|vog$k@Ql#w8K1OQI1UJj4GN1bb6`v44uqQF8l z%IXOli>F7v0cZ#Ss8~ulR%S-ev;&}IsRf1LCkBA-PLDokYhX%R`U{y{n2QB%LT~SCcG*UMSt^zP#^0UbT{Q;!e2T9p$Of&!h002ov JPDHLkV1hGH(31cF diff --git a/app/src/debug/res/drawable-xxhdpi/ic_stat_grade.png b/app/src/debug/res/drawable-xxhdpi/ic_stat_grade.png deleted file mode 100644 index 13c26b77245c16c5038f0e6c66b47cea61e3b7e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 781 zcmV+o1M>WdP)yiQB*AaAgx+>LN4hdh!G?z zHZe*N!BpZOph850;0KDI(e)i1xV_=My`9O;&g{`i`qnVEfOwp4;32!bF8 zO0Ou2+Q{oXaF=gj`pL88zmY$BO+H2La1G}m`A_7p?vmSG!C6cG7WuCsSAd42d}z)U zpbFEOo8)oFey8;5vnxPV22igDlg6ylr|$p+Kme24z419-d0HXX>^7)j5?`dBE ztz`c2iBvLc6r~yC#1V9!5 z9bnqMAkQdPYeqAn0NP|Y%~wJJw2b^r6OK4JvL&RN^ak>K4M1mudDMut@0JU~mkD5= zk_R;Ve_vknksQmO=MqqE1wa4 zfKGY<=(r_7A6qd{cSQeRMsul=i~voW4uI`)4{MJ6#Q~tIg)yj&*-pAs%N_H{r`Rl?1qR;m**;_>~4>tuQCz~VWA53j%V~Bw6#ZIYBChXu2 zhp@q5S}?m<3PA>d=5@ESLjd$a*3Ji$s*^GqLMI*%JwAeLuDJ{myD7Mq$sIGTf}U|4{cCXUn+}s zBFi94q@slgD%vniv{G;9(0MT2=3Vc*cV>L|c@O+~Po0@N_xJ9bIm_trxaOK`uDRx# zYp%KGnrjX)P1AaU5TC|UIo#vp~=wZ{GaFbYQ6cEdTgJ9nHm^g+C z`Jhg^K1T$?DaH?o8M_rhsqoSMD`>6Cz|%}@^#in&=@$XIDge$aP#0$0v7mP*`xeNC zGlHUSe+-?)aO&R%^w0*JPi*W3?^7+zXT3~7MHX-DvUeST*LD^meFP1rF+xDQEzac| zZ=DnYrwgdg#;5-P;m}x7^s`y}02)MnLj|}F^JM^o2;PZkfTFAyy@ID=MO6LTo2)-uzOrf#>4YuHS zSY8jXyyHj0->fZ_?JOo!^+BYi`&jd;1z#smMW``K!o*KHuf+ze?w_9PEC{@KGb=9u~fLW*^c063qRs2siLY!iL1GpUlcOcns2xQu{F+QUSK z3V<_&SyvAG(f1z0VIbj?loW`G`j-~rVE($l&3sO=@`cv|pd}V=tOOLpe68%{bME`9 zP?$`|{3Os=?HDc#QobKIlWU`%+#@{&84aX9%0ThDers*Q zsWb9|Z6x%nWTjwZL0iZ_DWmi$o*SI%^sAY@W!bgy7629M zD#4hpNh4p3w?6f03_u$Nz$rCx9Ya8zQzwr&?JuZ?6G3HP=~W1S08#s1+W&_tFu)zE z5>SGm@FZR|AnJ2~(`ScDKwAXBsn<-L&aen*3NHnt5>UPXK;LcD?HU3U?PJ>yRRu^y zE$f9WK-7=tezaEwXqf;&C6WR0Hj!9Wfbb+og-t-OB?J1x>DN=`I+SJ;P=#bbyb4XU zYJbS=p@TfCr0R=>F_ISPC{CXmeW;`gQi?&z=slYN)BgSQ-F@coiIM>E4rDxO%zRQy z&@AoWflExcZlXzs`Di}?v{Ey1+}9$Y98RBXPcWK=P@}7l4J59~147Rnbc@sewkKH4 z3?Kr71k~SW^R3Nkz)HK5{^;t?>l2*~lo?>dynXfS4^ET?$WAFh2mj2A#lM nm8U5gEx^4SP>9Dh*Ob~{Mo&7jsAX{m00000NkvXXu0mjfA-!)C diff --git a/app/src/debug/res/drawable-xxhdpi/ic_stat_message.png b/app/src/debug/res/drawable-xxhdpi/ic_stat_message.png deleted file mode 100644 index 9d0fa781cb8e525fb85479e0d4e43d34cf8d62f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 692 zcmV;l0!#ggP)t2U33WY+UP$(1%g%V>p z=S^r2I%q-L(5G?1w4l4(z8s_3sBxOn3vPFYq6FIJ_U8{;83j%wcPGP90ChP8G!+F< z)*+xd0wN#+au(-p|7G5i_wD4=@}x88h+3P>A{0#Ju!%~ljZT5%MBQh9Fs#bE+z#|a7~ z)?G^0JqruS2pmPAUy^mzK{ha8Dvl!1sbpP^Dv(h)ia>uQ>ryH}#^ERo>2k@Me}P`z z3LqnK6oAr_H9J8!P;V-Z0?@Q%%@lJn0UkA~&@;)J*2Dwh`(@}i$@Lq|)%XDtFj;Ya zz?&uUs?Le|&9Q9xNoO9iy0Af^dCh*;YZ7X*!DJENRs;7g2}oD%d6 zEMcgp1YX3f$tgi5#~JF`m!O{11ib|}ee@C6JqN90%njl`Pl$SkYzn$YT(?l$OD9oJ zmk1I;B1i;@AQ2>jM34v)K_W;5i69Xqf<%xA5~UG7K85@7u3nUlWDee){e{ENlDIi(3r*ZM5~y^{4oQ;tRK3%$Ry_{ z*r>7|J$yvvF@vD3DlfqgQx68lP|m@C`*eh8`w83yhrlA2Buxd!z^{aI9)gJp1o?B- zsSe(I{r7tFp{V(x|8r6;rl64#_Bz*o?WTY>Z~$D;^ieu9GQI-3K|83a@|hh8p3L81 zt;_w?ZldTj5kG?x)ceo(CwWh>8Rb_3`lq>t6-2yU?-AEu5<#QaHxPZH8GJU0pwTvm z!ww^gDrh;;rq88U{$6l8VEyP7I1hF*3MvJ>_Q%^4(-Lu}Kfoo(Yey|1*V>X(_6B@W za-Uhy8=~E88*-XsF8B{J3wlkotG6NOY|K&a2WCNEiFPF$g5D*V3e+)m(lY{x({0#1G0R(VYr zL7tfPdiW3Ts0F#^q6spy^&yW+l^4M_mFFZ_Q8er1yHws2Q&7L=_$LDy7c>Y?ft9LA j@jBo+RT!rvl2r2-e}J_`_YP))*r03>Z$LH(8^8t>-znD~7aM=bs!jCX>1VKb zkY(9&ih{*ru~;k?i?yn0ns&1tX1gSA=h;eXILFzBDKCAik4gn6S9KKAYMAm?&C&B; zQKaZ^0MNvM7*KwIWT5qw&m{-+ZqH>v42S_SAO^&M7!U*EN}2&NAO^&M@&Hr^nj~hl z%VwEZEg8#m?)z-js}>HNm8;|6X139$!;u9b%O-$|F5&ph+5%La1EAZ=OPm6py|*xBKy8+Q z0(@`M5Vb z&&Ki`yiNg76Eli5ehN*|IHFb6hS0q@+SL$69TlKItKw3v@4yvNTjojy$Pm$cpMgul z-j(;CPdoq#wCdcj8;+sQCm(nK+My+Dc-Wn|6MA#0eq8}+R@N3H5mJL1Ai+PAz1lXM zmoJY5NEWFGqB3Oa)|&=|PyxROpck7^5|rJx`3<*bMohB1f$0000 sendOneNotification(notification) + is MultipleNotifications -> sendMultipleNotifications(notification) + } + + private fun sendOneNotification(notification: OneNotification) { notificationManager.notify( Random.nextInt(Int.MAX_VALUE), - NotificationCompat.Builder(context, notification.channelId) - .setLargeIcon(context.getCompatBitmap(notification.icon, R.color.colorPrimary)) - .setSmallIcon(R.drawable.ic_stat_all) - .setAutoCancel(true) - .setDefaults(NotificationCompat.DEFAULT_ALL) - .setPriority(NotificationCompat.PRIORITY_HIGH) - .setColor(context.getCompatColor(R.color.colorPrimary)) - .setContentIntent( - PendingIntent.getActivity( - context, notification.startMenu.id, - MainActivity.getStartIntent(context, notification.startMenu, true), - PendingIntent.FLAG_UPDATE_CURRENT - ) + getNotificationBuilder(notification).apply { + val content = context.getString( + notification.contentStringRes, + *notification.contentValues.toTypedArray() ) - .apply { - when (notification) { - is OneNotification -> buildForOneNotification(notification) - is MultipleNotifications -> buildForMultipleNotification(notification) - } - } - .build() + setContentTitle(context.getString(notification.titleStringRes)) + setContentText(content) + setStyle(NotificationCompat.BigTextStyle().bigText(content)) + }.build() ) } - private fun NotificationCompat.Builder.buildForOneNotification(n: OneNotification) { - val content = context.getString(n.contentStringRes, *n.contentValues.toTypedArray()) - setContentTitle(context.getString(n.titleStringRes)) - setContentText(content) - setStyle(NotificationCompat.BigTextStyle().run { - bigText(content) - this - }) + private fun sendMultipleNotifications(notification: MultipleNotifications) { + notification.lines.forEach { item -> + notificationManager.notify( + Random.nextInt(Int.MAX_VALUE), + getNotificationBuilder(notification).apply { + setContentTitle(getQuantityString(notification.titleStringRes, 1)) + setContentText(item) + setStyle(NotificationCompat.BigTextStyle().bigText(item)) + setGroup(notification.group) + }.build() + ) + } + + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) return + + notificationManager.notify( + notification.group.hashCode(), + getNotificationBuilder(notification).apply { + setSmallIcon(notification.icon) + setGroup(notification.group) + setGroupSummary(true) + }.build() + ) } - private fun NotificationCompat.Builder.buildForMultipleNotification(n: MultipleNotifications) { - val lines = n.lines.size - setContentTitle(context.resources.getQuantityString(n.titleStringRes, lines, lines)) - setContentText(context.resources.getQuantityString(n.contentStringRes, lines, lines)) - setStyle(NotificationCompat.InboxStyle().run { - setSummaryText( - context.resources.getQuantityString(n.summaryStringRes, n.lines.size, n.lines.size) + private fun getNotificationBuilder(notification: Notification) = NotificationCompat + .Builder(context, notification.channelId) + .setLargeIcon(context.getCompatBitmap(notification.icon, R.color.colorPrimary)) + .setSmallIcon(R.drawable.ic_stat_all) + .setAutoCancel(true) + .setDefaults(NotificationCompat.DEFAULT_ALL) + .setPriority(NotificationCompat.PRIORITY_HIGH) + .setColor(context.getCompatColor(R.color.colorPrimary)) + .setContentIntent( + PendingIntent.getActivity( + context, notification.startMenu.id, + MainActivity.getStartIntent(context, notification.startMenu, true), + PendingIntent.FLAG_UPDATE_CURRENT ) - n.lines.forEach(::addLine) - this - }) + ) + + private fun getQuantityString(@PluralsRes id: Int, value: Int): String { + return context.resources.getQuantityString(id, value, value) } } diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewConferenceNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewConferenceNotification.kt index 8e8431f7..a96de1be 100644 --- a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewConferenceNotification.kt +++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewConferenceNotification.kt @@ -18,6 +18,7 @@ class NewConferenceNotification @Inject constructor( fun notify(items: List) { val notification = MultipleNotifications( channelId = NewConferencesChannel.CHANNEL_ID, + group = NewConferencesChannel.GROUP_ID, icon = R.drawable.ic_more_conferences, titleStringRes = R.plurals.conference_notify_new_item_title, contentStringRes = R.plurals.conference_notify_new_items, diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewExamNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewExamNotification.kt index a2d9da56..6a60de93 100644 --- a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewExamNotification.kt +++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewExamNotification.kt @@ -18,9 +18,10 @@ class NewExamNotification @Inject constructor( fun notify(items: List) { val notification = MultipleNotifications( channelId = NewExamChannel.CHANNEL_ID, + group = NewExamChannel.GROUP_ID, icon = R.drawable.ic_main_exam, titleStringRes = R.plurals.exam_notify_new_item_title, - contentStringRes = R.plurals.grade_notify_new_items, // TODO add missing string + contentStringRes = R.plurals.exam_notify_new_item_title, // TODO add missing string summaryStringRes = R.plurals.exam_number_item, startMenu = MainView.Section.EXAM, lines = items.map { diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewGradeNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewGradeNotification.kt index 4a2eacad..5ef4f6c3 100644 --- a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewGradeNotification.kt +++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewGradeNotification.kt @@ -16,9 +16,10 @@ class NewGradeNotification @Inject constructor( notificationManager: NotificationManagerCompat, ) : BaseNotification(context, notificationManager) { - fun notifyDetails(items: List) { + fun notifyDetails(items: List) { val notification = MultipleNotifications( channelId = NewGradesChannel.CHANNEL_ID, + group = NewGradesChannel.GROUP_DETAILS_ID, icon = R.drawable.ic_stat_grade, titleStringRes = R.plurals.grade_new_items, contentStringRes = R.plurals.grade_notify_new_items, @@ -32,9 +33,10 @@ class NewGradeNotification @Inject constructor( sendNotification(notification) } - fun notifyPredicted(items: List) { + fun notifyPredicted(items: List) { val notification = MultipleNotifications( channelId = NewGradesChannel.CHANNEL_ID, + group = NewGradesChannel.GROUP_PREDICTED_ID, icon = R.drawable.ic_stat_grade, titleStringRes = R.plurals.grade_new_items_predicted, contentStringRes = R.plurals.grade_notify_new_items_predicted, @@ -48,9 +50,10 @@ class NewGradeNotification @Inject constructor( sendNotification(notification) } - fun notifyFinal(items: List) { + fun notifyFinal(items: List) { val notification = MultipleNotifications( channelId = NewGradesChannel.CHANNEL_ID, + group = NewGradesChannel.GROUP_FINAL_ID, icon = R.drawable.ic_stat_grade, titleStringRes = R.plurals.grade_new_items_final, contentStringRes = R.plurals.grade_notify_new_items_final, diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewHomeworkNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewHomeworkNotification.kt index 228ca668..1249b495 100644 --- a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewHomeworkNotification.kt +++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewHomeworkNotification.kt @@ -18,6 +18,7 @@ class NewHomeworkNotification @Inject constructor( fun notify(items: List) { val notification = MultipleNotifications( channelId = NewHomeworkChannel.CHANNEL_ID, + group = NewHomeworkChannel.GROUP_ID, icon = R.drawable.ic_more_homework, titleStringRes = R.plurals.homework_notify_new_item_title, contentStringRes = R.plurals.homework_notify_new_item_title, // todo: you received %d new homework diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewLuckyNumberNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewLuckyNumberNotification.kt index 4bbffa9d..68e01414 100644 --- a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewLuckyNumberNotification.kt +++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewLuckyNumberNotification.kt @@ -18,6 +18,7 @@ class NewLuckyNumberNotification @Inject constructor( fun notify(item: LuckyNumber) { val notification = OneNotification( channelId = LuckyNumberChannel.CHANNEL_ID, + group = LuckyNumberChannel.GROUP_ID, icon = R.drawable.ic_stat_luckynumber, titleStringRes = R.string.lucky_number_notify_new_item_title, contentStringRes = R.string.lucky_number_notify_new_item, diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewMessageNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewMessageNotification.kt index f52fe857..4e7940d9 100644 --- a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewMessageNotification.kt +++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewMessageNotification.kt @@ -18,6 +18,7 @@ class NewMessageNotification @Inject constructor( fun notify(items: List) { val notification = MultipleNotifications( channelId = NewMessagesChannel.CHANNEL_ID, + group = NewMessagesChannel.GROUP_ID, icon = R.drawable.ic_stat_message, titleStringRes = R.plurals.message_new_items, contentStringRes = R.plurals.message_notify_new_items, diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewNoteNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewNoteNotification.kt index e6e22a44..fb4cf918 100644 --- a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewNoteNotification.kt +++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewNoteNotification.kt @@ -7,7 +7,7 @@ import io.github.wulkanowy.R import io.github.wulkanowy.data.db.entities.Note import io.github.wulkanowy.data.pojos.MultipleNotifications import io.github.wulkanowy.sdk.scrapper.notes.NoteCategory -import io.github.wulkanowy.services.sync.channels.NewMessagesChannel +import io.github.wulkanowy.services.sync.channels.NewNotesChannel import io.github.wulkanowy.ui.modules.main.MainView import javax.inject.Inject @@ -18,7 +18,8 @@ class NewNoteNotification @Inject constructor( fun notify(items: List) { val notification = MultipleNotifications( - channelId = NewMessagesChannel.CHANNEL_ID, + channelId = NewNotesChannel.CHANNEL_ID, + group = NewNotesChannel.GROUP_ID, icon = R.drawable.ic_stat_note, titleStringRes = when (NoteCategory.getByValue(items.first().categoryType)) { NoteCategory.POSITIVE -> R.plurals.praise_new_items diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewSchoolAnnouncementNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewSchoolAnnouncementNotification.kt index e4928927..524c188c 100644 --- a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewSchoolAnnouncementNotification.kt +++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewSchoolAnnouncementNotification.kt @@ -18,6 +18,7 @@ class NewSchoolAnnouncementNotification @Inject constructor( fun notify(items: List) { val notification = MultipleNotifications( channelId = NewSchoolAnnouncementsChannel.CHANNEL_ID, + group = NewSchoolAnnouncementsChannel.GROUP_ID, icon = R.drawable.ic_all_about, titleStringRes = R.plurals.school_announcement_notify_new_item_title, contentStringRes = R.plurals.school_announcement_notify_new_items, diff --git a/app/src/main/res/drawable-hdpi/ic_stat_grade.png b/app/src/main/res/drawable-hdpi/ic_stat_grade.png deleted file mode 100644 index d97efb5d404e74e92748f8ccca5b89643e14edb6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 364 zcmV-y0h9iTP)X`Jb-^_tmLSJ5JV5;8KW)H7avY?OWI!{OqU;vb zyj|ot$PmdvQB+Eg=b+~8A*4_U$rl2oI0z^wiX$}GC~=SnlI2dsI0z`l1jGyQq!S5x zJ1Cq$!lk=|I*{b!v0zSmJE$8bNsB~Hk%NFh0gA;3i-V8>sH`y_Ob!Bpn*;5jdMMtB zBqluIi5kc(9>{Dz=p0mtCk=sG39R&X5U37&hQmP}bWhYsjw(b-)FA9TAmtFPn;%2M zK{7~UuYmYI74T1}dCN(55LA2%4cgOxk?kPWL2N)=0L1gDgeL*9H8F9E)j-wN?L#=^}s=eb9kk#?k4Qb6iL_oS5cLJCQ)G)#~5k^i)J=({Q3z9i5x zH@B4}(9r_uBnfn|06I$oMHWCCNg$t;8Nevt+d3xh<7=Eq7qv>#0BsWkppmwaNBr_P z(n3Wn7sf3K?M#~>VZf~6J0^XWqy&!x6jn_{>X4rQ@Y%v=T`|^-1GHzXUcuayOcTgGfO8;Z{tQo6M zwEdNp938Gnsk*>Hc)-EvqitlcX(#A2zyW|k1|%Oc%$NbB4tu&dhE&{2PLN<-+`#tW|NsAu z4tqE|zF+2OKEtPS&9LtOOLnHt!V7LzRvFxed{&O`>~ke2@mY1cK91H>d9wXV$%Qhl zCwJZ+zU8>RamPHTn%T4Xez6_-u6g9X+hu{ZG9_Hy$Gjb6{1x}P__Fh69IVLFaJjjl zSU_W;bwGzd-)j?-1$aPfANV&0WHNmA_>E zn=cCrd1f`U-7^dTy1=Bbv2?LJyRh5A05*oD|1uVMzIMr(n4BD3;mK%j+5`e64?$Qv}NkuaV+N%+7Wfx@d&xVS%D0_hRgd= zG=T+kiz$`F#jCekw6-bRC#4cX=@^Y$06cog&^5tW-Q=c+&}Pi`b_T40hC`&mxib}g zw-2m<6Hqb|C63W^{!~8&2_uwz!(Ynx2!Viw`{WgRY)v6D2adq4Wi#LK++3B64O}^% tGCIdrAruR|gJM;iIOAmcr%vbZ@&spdrKq!cZ@~Zn002ovPDHLkV1ky)kByHfT4f8`KTz2yUPo)D3h4-GD-JCWP=fDb%FlPcA0b!pCtB zD2lAC1mc`G!iEI)5>|%5q||T}XiN;m{|bnDYzp}{80f5TGtf6N^zhgm@@-E0v(mm6 zwrX>2@c$MnzI-kQCK5fU#m}8KNpI^@;ynY{T{F6;VSvCxsu*HiqCvGWfz)m7EwCeE zA!V$zS7WBc0vX0RMR z$C`NFT?+~UB5FNxj8j2vlA0{_tB#fS3pP_=i-=({xQeaCknQ%Mwu}`sFl^;)t6xW2 z0!9*wdaCr>Rlj^I3GMjOdskr>up8XPbkS57N@D5eHf_mZG>^6jnEvpsH3Are7#zVG gI5&|ZE9*!402pVqU-#CzkpKVy07*qoM6N<$f`S{JoWvkC zg<4RHO;QDj_XBYvE(?HsNg!ScRR_a9#9Ckom2AXg!Az){`$#yFnigyVDIhn9h_(O- z;-OfbRu;g(4VGI(iD`tWeHjU72^P61ro3vzVI`ETCkABN(P46 z2t^PN5Wo3PK9C?L6{rJo1&Ngm4D&FI0&)QW|Bm&F`HtNc00000NkvXXu0mjf<|J`U diff --git a/app/src/main/res/drawable-mdpi/ic_stat_luckynumber.png b/app/src/main/res/drawable-mdpi/ic_stat_luckynumber.png deleted file mode 100644 index bfced4eb088c8e2818255e0c50634dd72673fee9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 343 zcmV-d0jU0oP)+Gf&#&C9HJsZC$(Vc7I_? zsSx0j@evSwgLn_PsF&4%hKxHMV(K!UzrAaBV+ zDom*(33N*WzzHy|kdOFpxqx0OMa2-sfSLFv^o`7%XidNeJeUa+F5nKh;rGPEY7URv zMI+>U02~m55LZiQPzw|9MBpmKH5|Doq-e&p+)yYK@~=7kHGxRTf4s=~ym81Ow~M!u z!%`d>;S-iJwQj4?GHjX@eXWr19%B-mlZ%bEB6v2qDpH%fs4x&HZ3J=yfz0;7q4!g> p=#`7rgF}P@{Y;Xv%a-EL*%KaD{LXL3W}pB7002ovPDHLkV1i1ll4bw^ diff --git a/app/src/main/res/drawable-mdpi/ic_stat_message.png b/app/src/main/res/drawable-mdpi/ic_stat_message.png deleted file mode 100644 index b357b32105376c5820a91c084b15572943fdeaa9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gji#=T&Ln>}1CrE@n`2YWZkHZ@7 zBYY`I6XM)z+VcPUTi#$h;&VeM;J3f+g2uB<&RS6kK0U0}jXUOf?3pgZy~@KwCiF=} zfmp|L;m-4uk`LwxO?sY_q+_tCRA6EB2fmK?!kzbdz2r-nH!@A!F}1CrFq*`2YXEjl-LU z7T(4g6FF*o0=Ay0s@$My@~@w>jM-3I?r`M7tP72XcHHk6KGrDg<9NEAsnCY+4p(Tg z;Hu|*hGIHxpQ8T>^G7YH66=pLIHWs)<&nL^AIXmQ%pa?TbSn6-ewNH?Q(4zDnd^x8 z!mjv92?xDb$W6ExlGM#7Dx?#jxV@}NpwkFJkYBQp00i_>zopr09K}Iu>b%7 diff --git a/app/src/main/res/drawable-mdpi/ic_stat_timetable.png b/app/src/main/res/drawable-mdpi/ic_stat_timetable.png deleted file mode 100644 index 9147c409006bd9a9975b2e249a1eee49c7500ca1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 315 zcmV-B0mS}^P)rx0hMgMc6=$gMGm{+s{X4Ff%F@@mr zA`keR!!Rccro_vtptbFx8n7<$&s@-(-LKFHn0z7UOa?-s+oLsT1X~DvIIYvdNIQlF zTjt7A9 z8AOy=rv{}5fO676{GEu>Wzc#c6wQqNIPmnr>VZ^b1L&QJM?Em?Jb;$&_X2Sb5Q`2a z4`2gN@p)n>cmM=?hl&S~Yu}ql;s=LZCI)h64uy(r)B^+U0dFER@y5aG0RbR>MT7?u z2Xk}UnSdvz05RjB^#D{o9}xSZjrT+WvBscoN(^+Da#(v{3X=FOAaaC=OkvSO7 zd(GV9rq~ZY5^nc)=iA5Z%w8_%;NakZ@H}q`cnquqCql}nfCp4(p_dFV18=;)XaL8F z&5-gIuw>i#BJkOZ#se`5`0lJt0T*6&T-q|eAJ{b@;1f7#LqN$hhms8eqXq>G+ge6< z28?gp+{EVw1f2edp+o5IfFptD1>kK4p7eIt+_hyiD97bbm5A9%!gpAXktCw2^zF}n z!UDh3Naod^lx;RNUT7jAmXE`uZ#cCznW3$FOo}uD#_46-0v^Q6hdOQa&=P8DmQSy3 z;wg!Mn$nH#q;R8~N;kSM5pX1Iyvq)D=zv^hbM+$kT~4kaH2X26SL zQ@*kR$WxNkX60X$OwE|c%mygU8w)(or(9}rvsehUIYNC6{YS2RY9OgUw|OhkHXz{6 zmhr;|FSbVA)uKYcAYII61$wxCTg&LufPf2|n|Rj12aaOSCTK5&-61vEC#FWkT~9gJ vE5Ia%KHwdM#qN}2)Tz#r`z-3<;P8tdgLcdbpG+}F00000NkvXXu0mjf!w^TD diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_message.png b/app/src/main/res/drawable-xhdpi/ic_stat_message.png deleted file mode 100644 index 0e67ade37c96d5005b3bb5dab7164092772d0ef0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmV++0p9+JP)GLfXst`>T3SV_xpw*M@C)fh$In%|bRB*oJ?nI05K|YxN~f2N3!q96pj-gE1OYVx zxd2*^@12%_aiM+AfX?HmLl*)7v59SfUfOtS&pkjuA^>GsXpr7KbqE1~cnYbUZy^F= z10X&n;5YGs00Q2!MF-500VmhzaVmhj^k|Mc{|RUij@4_};Vl4+;lBWIhW`M-8vX@< nH~bR-bNCT3<1bEzVS?lV4_~TY^3y5_00000NkvXXu0mjf*wS(* diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_note.png b/app/src/main/res/drawable-xhdpi/ic_stat_note.png deleted file mode 100644 index ea674a793e0537bc04137d833abd3a504ca62171..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 449 zcmV;y0Y3hTP)kFye$-1EY{zX5TXGdQ@8~shy6;jW?IjNNx_lG)*7@O zm~YEkSsJ+xK>7ex3-eW3Lxc)I8e0Sy8}zXXFabA`L|fZ|mz?ahT8YwU;xa&@td)g7 zm6bjT2jBo4fCF#<4!{98K%f8vZSx*%BwLRGwo0G9wl**cPywGJ9+8)d>AU(6{6t`$ zJPh+5IJ)3j9{Dy3M-N7iT938t-Su(kpLz%|J?GS-Xa$ufn zG(!!*df?l_Jnij;p5k@DYYy|YrxVL4vIy?M6F8)pKFE9M-eSzN)f#wLjMMMhr45Kz zN`TcRPPjQh2-AHq18?A@1USiSwAPQ&IK6%^4gNxx#;?bo1I%+g2j;PuzqWW1U&RpM r!6Lw23<2sHALr7j^Cwjn>!0fv9|XsrB9~cA00000NkvXXu0mjf+JeIi diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_timetable.png b/app/src/main/res/drawable-xhdpi/ic_stat_timetable.png deleted file mode 100644 index 96942b5a3ddf02c66f67b17bc0283c871aa9234f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 499 zcmVaw7 zoz4g4dy6XQd;8-i}Sh`hZdFT#Qh5}?Q0f2-W-|HPzql|kdA%HX@D+-G_8Yp&eX9CMYPDRm! zKLq-v_!XBEmwO$oQ%30V0liW=3# zbqKDygAE7vEBXbmq%vRKldX-09r*@_ABHRZ?#O?3Ziij1M%p%&VhB1A02!cG&g7aL!|#=^!2Py{P4 zg?1{Ug%{957|)UgLpZz1Zj#x#{6Bo%*`3YDW@mP0Cl*5x1VPM?5Tc7%CU%KKg(whf zL^4V_OT?#8J3mA&3ORE^uViG(X(OIB6ZAzSWC@xSdS+IZpn0b8J7P;AE}3i0$`Z85 zG=8F3?|Q&o;|2sl5Co|!h)yt0ER-?YNI`U5KQY6!>qR0;LHo=}cN!sx>br^K5MA|% z@q(zflei5zma#%mp@zYp*@CF9iFkn^?=})1Km4ppQl<;);q2(r%|j3bL6Dh(+&QLl zQqJTY1o`KK$P;l0^3O#ONj3^{l7}GwyjS~7GEvY2!!J`eh;IJB_Q}R~F$jVn2!fy} z1;uMzJ~n$k$UXi#q?}ix*#&YKTP|0z<9xJ0!Gf?lYF_a){0znW2 zL5&u)#|XL-YHhXTNXrtms_6)MT9%-sDDLruARkFN2&yb8BZ_-GA;?FP^TD^X3ujZP owbha%g)SCB5ClOG1VL2DAG(}hLxvp3x&QzG07*qoM6N<$f^JCuSO5S3 diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_luckynumber.png b/app/src/main/res/drawable-xxhdpi/ic_stat_luckynumber.png deleted file mode 100644 index 9bab1373178182d45ec40c6ad1e84181190e5611..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1088 zcmV-G1i$-o(2zr8-2<&fk(iz;1qZq+!jVSG4MC`xOTzKuH&1*`##5i1$T!9P7?gU z{;g~93+@|<ItyaL&Lr zrFhZ_@CJXBAAy&_FTFYo-*tiS6~MU#cX+f{&+mV$;Lp5|t9;^Gr5a8g{KKcySKzlI zC?2Mu)~Lr1_YVBar_4F74^_b#EpX_!3+0yy;VgQLQrSy6M;--$3VS3&7UIf0>8c|N z-X?&P!Qh)PI`0as1J5N!1*Z)BCBO-N$e$4Wtpx7{s4I(gxPX5QP!|U9q7;ByiGKC` zi9O*F#6q=$WnG{%1pVry05nE)-^jX75Fu?9PXg?tQZ&pG34}LkhLLnU}T1$ze*#Ctgy|JlcB-{;jCJUKMMx-Xf;-r3mPr91zcyhwTz;p#-!S!khE~ z6`V#zzvBOX%;V^7q5w1$;)&ug1)!M_FE!>U0Hp{!v`es9%@FoyfdbG3)y$PB+)=@! z0u&mf0Mtp)k!>Mhwi9slVI7|c`qfGSD9Zfz7s^~BQCB1|8*mg>x-QZ80qVjqav9a5 zK2~JV{*7>x%@B>osE}>BEn+3#qay7i8}`5yOqasP^s-QQJ9AP^vQo48lR29*&wU!k zq#Y*j>H_4{WHm0dQNx_1<&{qvOnR!_2?7mNF(-|S>D&|Mq<8T%rhDr>j_)Yq5|CYV zc6qdipfC-NiOM71N1Q(;SgCFHU6C>QzfL1gDS~C&Qp+-Q*CIULu2Gtg_&CcCuy&l57TzfYw$CUk(s-p7O26US?Ok-qL zm2!C9(CEj&$Rgk{t-dqe@;T4uuAWEba*>^G(0qdBzClu39YW@Gniuq1~bI zQ~bL!#;W_yW|w}wkdwL)YIeoub`A3svj;04M*r(??ECg`z0L)tO%a|7vn^B`-#ij= za4)E1W;)Ky(#Osr!!KYVr%+(y@SviBO+!FXQ1Iq!&PTHzJ4tk>qymGG!PC{xWt~$( F699nziH86H diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_note.png b/app/src/main/res/drawable-xxhdpi/ic_stat_note.png deleted file mode 100644 index 174e1509b5b80104dd224958f8f5b9f8cd73a6b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 590 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2U=sCoaSW-r^>(&>Hj|-5yK={B zkyj7G3QG$Mz6h6WVl`Z>yp-{;O%<1F8(~A{~%|2lis54OTJgW@Ggm7 z_v3ky;m7X>@^{VHQ)zLoyR(N8Xg&jj>YUF;Piv3w36#^E&h~20f;&NR-&SmwIdVXD zpS|}f=Z>O0jnB-l-pmmC;%>@fc~$w9v0jGr$;>H}CnrZ}dtA7zv7$UB_ZG`q&HG(C zqPfebX#39mW%EB|>)OL2Cf_q}KYEt=^NLx!0!I^WWTd}h?TZT6k0LYYG%V=!&((Il zT_(_^bthKKk)um~M|S0_4$Gs>x9YXzb~=`4b?g*rzPCg>uuf)z^0RE+E?>8Ajcw+y9cL~qSg?@yd8ZT`t7(qF6hjS-EulT9FZroOK+MTJSRHqkAq^y0R|RF0T#yz zfrgoA9M!Yvt0O?-lG)r_V2m5mUaF=5O~qc=x7BwJtFtS9l6mUM%tT zi#zOO`hL=ab!?8Y(^<}%aLn4drR#o{z?Rad+ZRaO|C@j7w_4lv9B{nZ{$V;j#r5N= Rn_;^^d{0+Dmvv4FO#nA11j+ya diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_timetable.png b/app/src/main/res/drawable-xxhdpi/ic_stat_timetable.png deleted file mode 100644 index 510da8d5257b165a84300089e9b4b3050bee4a95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 671 zcmV;Q0$}}#P)=iI|=^->CFewL}@;C8mVO@<>1K$b}W>0O0mos9*kCI&zk!%I{<;SYxT%U}V? zm)CUs?&39uc3Mq4w~ztdG#xL9``!8QQg46^-cvdDq2D>&Ze*((A)xEpguI~-y=9w) z_qj+D2OS*jxMyf>1*FQZ#anF*k@T>!4=#Y#yl9F6Q0*I#D!&#V<)H)0nEY4nmnv`nW^OYXG}mVNs$Bm^E=6Tf%J z)P&6qYEl#YW3vByq3_~QPnpCd_2oH+?mapV2bi|aSW-r^>(hUcZ{Qi+w=|= z7SBXMj%-2QOYT7$9hoAEQ5^61H}VT zo}B)Hmu2E!mn((o=Nd0_-YY-<^xc_V-)Eg>1X=_FN7{??mbJ}g>|4J1n&DB21!AoX z$AedtIDciNZg~@Q zH#zs6D74h=7Swg_HoLsz?2lV%c_&~IeuclDVSCvhefvfa4NwB`boFyt=akR{00hbj ALI3~& diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_grade.xml b/app/src/main/res/drawable/ic_stat_grade.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v24/ic_stat_grade.xml rename to app/src/main/res/drawable/ic_stat_grade.xml diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_luckynumber.xml b/app/src/main/res/drawable/ic_stat_luckynumber.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v24/ic_stat_luckynumber.xml rename to app/src/main/res/drawable/ic_stat_luckynumber.xml diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_message.xml b/app/src/main/res/drawable/ic_stat_message.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v24/ic_stat_message.xml rename to app/src/main/res/drawable/ic_stat_message.xml diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_note.xml b/app/src/main/res/drawable/ic_stat_note.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v24/ic_stat_note.xml rename to app/src/main/res/drawable/ic_stat_note.xml diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_timetable.xml b/app/src/main/res/drawable/ic_stat_timetable.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v24/ic_stat_timetable.xml rename to app/src/main/res/drawable/ic_stat_timetable.xml