From 81516734f58c13260396337c66caabb437f1783f Mon Sep 17 00:00:00 2001 From: Carl Vuorinen Date: Sun, 14 Apr 2019 21:16:14 +0300 Subject: [PATCH] Add support for mystery items notifications --- .../drawable-hdpi/notification_mystery_item.webp | Bin 0 -> 956 bytes .../drawable-mdpi/notification_mystery_item.webp | Bin 0 -> 174 bytes .../notification_mystery_item.webp | Bin 0 -> 1166 bytes .../notification_mystery_item.webp | Bin 0 -> 1274 bytes Habitica/res/values/strings.xml | 1 + .../models/notifications/GlobalNotification.kt | 1 + .../ui/activities/NotificationsActivity.kt | 9 +++++++++ .../ui/viewmodels/NotificationsViewModel.kt | 2 +- 8 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 Habitica/res/drawable-hdpi/notification_mystery_item.webp create mode 100644 Habitica/res/drawable-mdpi/notification_mystery_item.webp create mode 100644 Habitica/res/drawable-xhdpi/notification_mystery_item.webp create mode 100644 Habitica/res/drawable-xxhdpi/notification_mystery_item.webp diff --git a/Habitica/res/drawable-hdpi/notification_mystery_item.webp b/Habitica/res/drawable-hdpi/notification_mystery_item.webp new file mode 100644 index 0000000000000000000000000000000000000000..a8fa79ab1c97165dde1f4c3da454912e6a5ab6ff GIT binary patch literal 956 zcmV;t14H~$Nk&Gr0{{S5MM6+kP&iDd0{{RoFTe{BHw7z_ZP!Y#ysygwhl9@J)%V;+Z6f`AbX2!vQj{bjYv@34G!OXDO) znbs)=7MVcBl#GBjG7xAZ(?$i5rB!gT$_PRPncvTV>Cg8|@A`i4=j3x-cXC*@i%!t) zX}J8N1S&QV#SqaOHPD9gk7|b-k+H60pSK&0hx5T|o!EA&Tdfl-Ay%zq?5M%cM@uZN z>{^)?{sp2e5FMMe^&}nZ*h_oXzqmLB#I|!o4R$r0h>0DSqGK0f6&?Fu9xq4JDF345 z|6!27ZQJoSwr$O|?KV#4t+wLX_G;VyKl8os`{XHqexHc`J8;`JlBAiv<}$EOAK`Ij znV*$?twnFLIh=z~7;-vnCOr{pdNJf=s&q!P-5qwbQKyLHdS`2!#XLGND17LpzEQKK zt@UZMN{yp(b!)BNcz4wKte@MvHDsjrwXM~v%-i`WDmM4GTA_oz8g`%7t^Li4oGc8v zS=B3>s~xJQq2ZCbd?G4PtB9y$b#tXUD;I$z%B!g;&&Z@3H|b6mGn1K7UQv^mkJ+VU z2XP{fdI=_`Bq5cFVlo~-(IB)yFdm;XRKzzr4p0UJ1^Ne5C{ZwlM1gsHA)z)hrFV$MaC0 z*(iwcuipVb7v;!Ic}r^~oqYHO%JVfGj|!38R3jrIH1T~g|a6R!OQhtn$;f<^(l7s8yx`uKT^J(rSP#EeY>{&~cD^71#7WGu!7 z`vfvRB?vGv1vri%etnO3cS_*Z_8#DRJc5mV-aUYweZY+?o-;pXZ<^icOqrS-L;mkb zSQD_ln%={}j?yHKvB@bU$|pR#s2=W~28rzXq^FIel>qB{_+8k8f-Y eU_=^Q2ht;;#Gpe> z01%7<-aT(k^pB!|qPA_Ia_G1JV-TkCXEka50|34A{!lE5_Eyb%lyLw<+Ey*4kiu2C z3Mr&;6;jCi&F8Kefr$Q3KztFbqe$DbBFKd+a2uX{X_=V;i!(Ex?rwnW?)IDjkf$S3 cl30?I;n`iWc6Wa#mu}>f#FBg`kmonv0$fZ`(*OVf literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xhdpi/notification_mystery_item.webp b/Habitica/res/drawable-xhdpi/notification_mystery_item.webp new file mode 100644 index 0000000000000000000000000000000000000000..9319695e411f8ab369397437cef7c87cec7b7a7b GIT binary patch literal 1166 zcmV;91abRPNk&G71ONb6MM6+kP&iC_1ONapKfn(VX9hWvBt=q0^}y~ilLn{1B&WcM z059(8v|B0QMw0DXncXWs-=e+;Hh~c;`Dm>03W58!FoUeP1E z(m^9hs#VE88D!&=e3U^4DkiA|0A7pB#}zA+|ckAX-V)Oe#uk{B3JOA+4!{@~!v$W@NcnPS^OiDPq$Cy`X6*4MIpIQ$Q&IXariy z3aACHQ+5OjTNT*+{CBh{IB3pxh8sgFbF4>abr+isHA&AR__+P>`uC#$E}!qeQistYb@+a>{=3|s zUy02#8RT!h+%4ChyICe0Py5|c3b7MsW4(}UcdT`_HD73YlQQBGY5Cd=Ejnhxz1 z;K6=g>8sncY$Ay=;s+H8Ss5~2T&9I^AF{g^i8uYk88y6p7{eEqY0*@MWF`0_M&hJt zW_VTy``! z3A7nGL++(@-#k!s7v%$%G&T`6AlBE_P#rd4Z3&dCs2igA^+&*$=Bjkb(u%A@uTm&l zQP?Xe*Xv@4{EuG&e;7#a=@7OrV!lJUKIR`Z@;-b6{G~6#*N1GQ;*eY%F#0Ey>q8zy z>CkV$0Ub${Qjo{9_O9sU=zuo{pMF7Qc}`akEpoXsRra)EODAV<^da`PwPNMOE{A{LzQGs4Y=7T<{s!Ov<;pZs*@|tw zT)o9S(cX%MyPpByMX>*y`|qJVyM?XT&OCF_DEK$c;nWu{9(J51~p-( zsxmt%AU2YuNUEyA-Mza<|DAdpnE98w8**ezj+FnaYPDViuz?#M;Uo5N)EZh;eTTGd z3(+=s3>iFwQi!B67=;ir7=|I}8KlrPr~?2l?u${&AW9i&;|-n2kqB5rXdt4OLcvJhBtZLYK7 z<`f*1Mi9x#00M}}3J!umo1c|BDgp=a`h%)5^X~PW_whPEGc(wp;2<&p z-JvS4O=OS0KP`af+jpM7`HAa0@6+vdd@)`pS}0I9)pc75nN>n0nsvip;sVOIU8tGG_?>~xoZXvM060_eVvJ} zo?b+sW?Gw-xdqX~4XS+Gp)kZqm8hb|4yWD;VrQEH(cLAG801ZBvotd$n&?ASTPGCu zoDwH0DX=5z$ue=G1A7?@Q`%?IF#&~7qM%kzbTx>Gyc{vQ{|T`#9KMYjhUbXJ>Y@}C zl~pN*_d#KQG}OwAus~Q0%9~=Mh)xplZQQwg4{_I4If`3$h*Oksg2I?4s1+0Dq%)Co z8D`S2vudN7-$q#(#>zG#(&<$2TUJ`a*wQjYI-RON(p4Ds8DEg5G{85fxTug=ke^4) zFMx*JRBUHPJ(l$M-ALcW!8iZ-;e$kJI|rhjG&DrMz;?b*$MU875z;#+;g?IDGz4ae z*8AAb?k}q~z79P`dh-OZZ6B+s+J@%0(n9wGD%1$s has new posts]]> %1$s, has new posts]]> %1$s unallocated Stat Points]]> + Mystery Items]]> Create Only leader can create Challenges Create Party diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/GlobalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/GlobalNotification.kt index bcf009ff0..912fd867b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/GlobalNotification.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/GlobalNotification.kt @@ -7,6 +7,7 @@ import java.lang.reflect.Type enum class NotificationType(val type: String) { NEW_STUFF("NEW_STUFF"), NEW_CHAT_MESSAGE("NEW_CHAT_MESSAGE"), + NEW_MYSTERY_ITEMS("NEW_MYSTERY_ITEMS"), UNALLOCATED_STATS_POINTS("UNALLOCATED_STATS_POINTS"); companion object { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt index 7b8591dd1..02616d93b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt @@ -92,6 +92,7 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget NotificationType.NEW_CHAT_MESSAGE.type -> createNewChatMessageNotification(it) NotificationType.NEW_STUFF.type -> createNewStuffNotification(it) NotificationType.UNALLOCATED_STATS_POINTS.type -> createUnallocatedStatsNotification(it) + NotificationType.NEW_MYSTERY_ITEMS.type -> createMysteryItemsNotification(it) //TODO rest of the notification types else -> null } @@ -143,6 +144,14 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget ) } + private fun createMysteryItemsNotification(notification: GlobalNotification): View? { + return createNotificationItem( + notification, + fromHtml(getString(R.string.new_subscriber_item)), + R.drawable.notification_mystery_item + ) + } + private fun createNotificationItem(notification: GlobalNotification, messageText: CharSequence, imageResourceId: Int? = null): View? { val item = inflater.inflate(R.layout.notification_item, notification_items, false) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt index 3c4d2efdc..1f94e10a0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt @@ -61,4 +61,4 @@ open class NotificationsViewModel : BaseViewModel() { //TODO("not implemented") } -} \ No newline at end of file +}