From 2cf0de3ac03b084679c1192ef5bb4b1a872477c7 Mon Sep 17 00:00:00 2001 From: Tim Su Date: Thu, 14 Jul 2011 15:53:52 -0700 Subject: [PATCH] New notification icons for c2dm and default astrid --- .../com/timsu/astrid/C2DMReceiver.java | 25 +++++++++++++++++- astrid/res/drawable/notif_astrid.png | Bin 1377 -> 1118 bytes astrid/res/drawable/notif_c2dm_assign.png | Bin 0 -> 780 bytes astrid/res/drawable/notif_c2dm_done.png | Bin 0 -> 770 bytes astrid/res/drawable/notif_c2dm_msg.png | Bin 0 -> 382 bytes 5 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 astrid/res/drawable/notif_c2dm_assign.png create mode 100644 astrid/res/drawable/notif_c2dm_done.png create mode 100644 astrid/res/drawable/notif_c2dm_msg.png diff --git a/astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java b/astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java index 468adb462..91632ddba 100644 --- a/astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java +++ b/astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java @@ -166,9 +166,11 @@ public class C2DMReceiver extends BroadcastReceiver { PendingIntent pendingIntent = PendingIntent.getActivity(context, notifId, notifyIntent, 0); + int icon = calculateIcon(intent); + // create notification NotificationManager nm = new AndroidNotificationManager(ContextManager.getContext()); - Notification notification = new Notification(R.drawable.notif_pink_alarm, + Notification notification = new Notification(icon, message, System.currentTimeMillis()); String title; if(intent.hasExtra("title")) @@ -194,6 +196,27 @@ public class C2DMReceiver extends BroadcastReceiver { } } + private int calculateIcon(Intent intent) { + if(intent.hasExtra("type")) { + String type = intent.getStringExtra("type"); + if("f".equals(type)) + return R.drawable.notif_c2dm_done; + if("s".equals(type)) + return R.drawable.notif_c2dm_assign; + if("l".equals(type)) + return R.drawable.notif_c2dm_assign; + } else { + String message = intent.getStringExtra("alert"); + if(message.contains(" finished ")) + return R.drawable.notif_c2dm_done; + if(message.contains(" invited you to ")) + return R.drawable.notif_c2dm_assign; + if(message.contains(" sent you ")) + return R.drawable.notif_c2dm_assign; + } + return R.drawable.notif_c2dm_msg; + } + private Intent createTaskIntent(Intent intent) { TodorooCursor cursor = taskService.query( Query.select(Task.PROPERTIES).where(Task.REMOTE_ID.eq( diff --git a/astrid/res/drawable/notif_astrid.png b/astrid/res/drawable/notif_astrid.png index d46377a344a8062d0154557c00eff2444effae2a..bd8495ee71ee6a762790c36909df610793548777 100644 GIT binary patch delta 1074 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 t;+uM4T}H(002ovPDHLkV1j=an}h%W diff --git a/astrid/res/drawable/notif_c2dm_assign.png b/astrid/res/drawable/notif_c2dm_assign.png new file mode 100644 index 0000000000000000000000000000000000000000..2c37d7cbae8385fa1bb29d82fcd61171196dad87 GIT binary patch literal 780 zcmV+n1M~ceP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipe@ z7AiL>uUm=$00N9jL_t(Y$L*F&Yg17ag}-ysmkqwEskEV0u_HwV2Z9t-{0&m)3I&Vc zALu~*0irk%XF71uIu#rg!6%|1l~zO)L=;<%DYRBoZ*tCA4iZ}%bCX*i9l7Abh09rM z?|s)kd&7UM5>mf=@c5a1X6J!TX7YaS??of2Mbarrwv1R;Pm&B#OW z5ClFl0ED1QU`qkk<2F?S`dQ2v!~6UzZals~2qLJ2Q4=p`?(lm4IZZUPxAQQWbRWim z^ATG%ZfD@&@Z$NZYMHoh+0{MI% z=N#U9T3cHgeR!UmFV4|o*K+dEW%h3E$2kW;dwV;XOomh{Rm+&Mr7i-?`mL?4jh>#K zvVjx`!LwogMxt+En=M^ko%Hth{$j=&_)@Q(p44ieA7mi}B;j4aI|y#c%^?Ir2yu=E zn5-u}Qn!C?nb7-yi(sJ;5qw$9T8p)|-ftbLXRb@YiMZR#U@?eY*?x}f7^GuehR(Iy zl6Yyd!rgF4Ow=0^-g|lP7vB@y)7h1b#nYA1R#Q9y?o~Ki{&YsyLP65ef4ZvF5S@{< z|DW$jRidvX^{vWs_LJx%Ngb=U6;?#AOIow4>!_rQl2ZJ~Z{j;5&dG09d3H7c0000< KMNUMnLSTZ++GK_R literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/notif_c2dm_done.png b/astrid/res/drawable/notif_c2dm_done.png new file mode 100644 index 0000000000000000000000000000000000000000..46db45db9e0a7ab6851465e96ae3cf0070c8df94 GIT binary patch literal 770 zcmV+d1O5DoP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipe@ z7AZ8Fi&^sk00M$ZL_t(Y$L*HSOH@%5$G`W!al*gDF<_K=K*g*K9$+5n6qLMt{nJVmlGjML;s zpjIqJge2)(KlnKrbgl#JO8{D`-5M(v6k_4aJ1l*jfukLWNZ~Inx!7eLC#rSoTSH?E zKYV<{i-Wt^eRnsL^W*tdC{Uu3<5-2HN;vi5=m_3_nneGTb}XCk_?G^R=hKf$g@{!G zmpp+&DS8${XO~`K;8_P!<|neQMQc+hu5>&E04S)kv2}=34h03zbMtWD8aO(FnZ*g* z8f{0)TSmt9aj+?l-ZLX0xi(L!vT-YdMJ$w3m|jfa^1TB{&W}SYjfhi+nZ*h8jkY7@ zuORFCXl;t)X4e?B*6TvoR-@P*i<~Nj*@f4*@%Sh*@URVA(0}$Nw03ZP=or%C!5ANH z&2ij5HwL8@KtSu#epEp=L9ko67b1eyY#Mi-cH_m|2%>ckb~yD=N@Lkyg)u%3HOJ9^ zetjr_6{S=|xut#^$PnANHlX+P5DxD>3D>ho`7Tl>3)l0}wkI?c0H!PL@o*3o0N?URDv6j}_FwjIUM)YrMbSbTpJoT@egP?wpjMbtmDbyUv z{k3X`eruBC&RX_iBsoH|zSa%kAW3Jl72c?R0h`l#9PLH53jhEB07*qoM6N<$g3QQS A%m4rY literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/notif_c2dm_msg.png b/astrid/res/drawable/notif_c2dm_msg.png new file mode 100644 index 0000000000000000000000000000000000000000..996abc25d73686a39d0885f29e60ac848cd8dd88 GIT binary patch literal 382 zcmeAS@N?(olHy`uVBq!ia0vp^azHG@!3HGDe(| zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sfZFW8}Etyu~MW=v5|2$nBLp+YZ zowkwdkbyv(zL*xDo?q*_b?bg9HRV4D`H)z{^^q|~RGnS$)eGYtodMI&t2*^A%eu|t zXs^+tz1M#F?k|2%&iga9I56on_MAWYWjm+9K5Z#x>sQI_N8Y>43bJ1*S$X(^T(`%0 z$8S})wue?c*--MXM*Hy!V?jDs@QA)1U8<3WTmtoHc*UL(&>(IL7wk$DG3q&m2yFXRu&p`WZY) Z+blxp%C6fR`GFz9;OXk;vd$@?2>?NynUVki literal 0 HcmV?d00001