From b78e5aa3093f3ccffdedfe6798075cf89243d1ef Mon Sep 17 00:00:00 2001 From: Tim Su Date: Fri, 2 Jan 2009 05:38:33 +0000 Subject: [PATCH] 1.9 beta release: - added tabbed interface for editor - added ability to set fixed-time notifications - fixed some crashes --- AndroidManifest.xml | 4 +- res/drawable/ic_dialog_alert_c.png | Bin 0 -> 3724 bytes res/drawable/ic_dialog_info_c.png | Bin 0 -> 3657 bytes res/drawable/ic_dialog_time_c.png | Bin 0 -> 1924 bytes res/layout/edit_alert_item.xml | 42 ++ res/layout/task_edit.xml | 450 +++++++++-------- res/values/strings.xml | 28 +- src/com/timsu/astrid/R.java | 460 +++++++++++------- src/com/timsu/astrid/activities/TaskEdit.java | 165 ++++++- .../activities/TaskModificationActivity.java | 2 - .../TaskModificationTabbedActivity.java | 92 ++++ .../astrid/activities/TaskViewNotifier.java | 1 - .../timsu/astrid/data/AbstractController.java | 1 + src/com/timsu/astrid/data/alerts/Alert.java | 133 +++++ .../astrid/data/alerts/AlertController.java | 117 +++++ .../astrid/data/task/AbstractTaskModel.java | 74 ++- .../astrid/data/task/TaskController.java | 26 + .../astrid/data/task/TaskModelForEdit.java | 17 + .../astrid/data/task/TaskModelForNotify.java | 27 +- .../astrid/data/task/TaskModelForView.java | 4 +- .../astrid/data/task/VisibilityProperty.java | 5 - .../timsu/astrid/utilities/Notifications.java | 201 ++++---- .../timsu/astrid/widget/DateControlSet.java | 42 +- .../astrid/widget/DateWithNullControlSet.java | 70 +++ 24 files changed, 1369 insertions(+), 592 deletions(-) create mode 100644 res/drawable/ic_dialog_alert_c.png create mode 100755 res/drawable/ic_dialog_info_c.png create mode 100755 res/drawable/ic_dialog_time_c.png create mode 100644 res/layout/edit_alert_item.xml create mode 100644 src/com/timsu/astrid/activities/TaskModificationTabbedActivity.java create mode 100644 src/com/timsu/astrid/data/alerts/Alert.java create mode 100644 src/com/timsu/astrid/data/alerts/AlertController.java delete mode 100644 src/com/timsu/astrid/data/task/VisibilityProperty.java create mode 100644 src/com/timsu/astrid/widget/DateWithNullControlSet.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d1035b1b9..240647951 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="25" + android:versionName="1.9"> diff --git a/res/drawable/ic_dialog_alert_c.png b/res/drawable/ic_dialog_alert_c.png new file mode 100644 index 0000000000000000000000000000000000000000..d0c6f2f39855f54ec7b352e817484e2459b59a0b GIT binary patch literal 3724 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 brzL*__`_6W)Hd%S00000NkvXXu0mjflETis literal 0 HcmV?d00001 diff --git a/res/drawable/ic_dialog_time_c.png b/res/drawable/ic_dialog_time_c.png new file mode 100755 index 0000000000000000000000000000000000000000..20b805ad1277a706544fefc86df4eaeda0111046 GIT binary patch literal 1924 zcmV-~2YdL5P)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXAv z0y`ZtyixN200#s~L_t(o!>w0qY!ufO{^rikb7$A<_1f&p7~9|nPH{_Q8tSM&kQFLg zCyF3$6O@{wwy}h&wlq;ARaE(bDg{+a1%DcW`f!N|29s7oM6ycbrY&-cgHz+i0YBn( zu)S**zjk(ZcV>2GZhsg%yK5Vp&?|jf&Ca>scjlZq=gwiSUcHL-R!K<-LZJ`_bW#jp zAAqj|;8T$60YFCT698!d{{Yba6^TwqA`!%5v30qb2RY#P`%zh0iH|g=H3hltzVJp? zuZ+~G1`qr8*w`56=H?#G0fu2vU0sb4#@(EP{5pVoe6ckoBlSvUCjM?X90sLyg#pR` zgJoIF1b0XyjQe*f$X6ag8~|!lkgtTff?v-BcknFBt}t-rKl#02U4g84ucRIj?h!|V zN`V=D@j4&^UIwTp=~eAhkbf?F(Rh#4JzW$TjAut8Ck5lh+oetZqW1ta=94V2B0f|Z z+)e?!u3Z&uBP?0zegH_jq@4yURGOl)ce@OH)l1>C_0@d&U~2Z>o~oH)b43LFem@w$ zbTYMy_@FJ}Z!ydT)yd=A%tZTh>{L9*z+U`$CsA53$9oR{DY^Nzr-~&1m)I2%X{;`C z|H@|XGY(%KPt5~Ns>S*T^9$) zr1s`F`7{Y~v}Vi&e0tSZM`NmF?ubi$h;De)%Qi=Fu^KO~Hhx zye%25eJl_NY`6qoGHxF2i^ea{ySV&Ym79Iu!vH`8L4aFvAIb16vT;MjlwXY;qLgBS zcuppG_vr=M|DQ>3RZB1!+)yMarSPkfLpM}R<@39}(h*SlKP?fjQeRz+l4 z-pf!M*_bexv}~yDOY!=lF>ri15-0O16 zPk+PDuyL2?r++oXeQt$&lXq{rmTen1?Em`4`^_xQe%q0nbJ_-a8cd*vLiatn}D9t4vwiBXTQs^bFwAOiK%he2!<5z?QBR zfvgwnOixtZ+r@jE6;taLZGANRzSmGMeTR-|ODu}u3Oad|nrUe+P1i>qpWKx5A;OEb zgb*x;ZbdgxJV zlr%3j8OmxTW+}zk;q>6yAl@RjC;)D=X1bnSF7%5vLW&@dIqMIDFhK9nb z(FX^}hVJ$s`*c(NBS+!WP4$ZI_8-gV535GsL2GD;P)ZTM8$B}zz+yg!2~sK+2F{k3 zmw#dL^73+sg@LmsNNF~=>HzV((KE}(v1q96y))LRV*}Yp5cmFGsp^f|+FCqJItU@C zsi{G)RP{!JxcBGt{(Hfh5)HL|*@5S+5tG~?oi)8nr^Z;hCgQZSb;U0N=S-}v^N-Cb7HTEed^ zDVDM43X}84T^X}|Hy@Adx{hQr2>@`r-4Fx;y%}GD#qo#d-G#5&l=bIx#7tlyJo(lU z?fRkR7Twv|xomLWRV#f~RQ>*w#o`k|Va@WkMN{tm@b+YvZYbdp1 z3cGOO!kV7{LEPCqUQqG+77t&)T?PXD#-4b_1a7B*I|=iXium}e-`D%!U2`_<=;&CN z@Ql3ca8wB$aRm8^&BCH1JOlXdPZbLmVA4h5Ndq88syC!X-)u|WXkT|aK7aoFhI4t2 zs|#wpvQOibMvJ(V6ergLfSgGUxg1MVGTH} + + + +