From 7c86c75307fb3f151a6d37a1690bf9699f6892d1 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 13 Mar 2015 13:36:50 -0500 Subject: [PATCH] Move repeat control to task edit screen --- .../astrid/activity/TaskEditFragment.java | 9 +-- .../astrid/repeats/RepeatControlSet.java | 33 +------- .../todoroo/astrid/ui/DeadlineControlSet.java | 20 ++--- .../res/drawable-hdpi/ic_action_reload.png | Bin 0 -> 1256 bytes .../drawable-hdpi/ic_action_reload_white.png | Bin 0 -> 871 bytes src/main/res/drawable-hdpi/tea_icn_repeat.png | Bin 1556 -> 0 bytes .../res/drawable-hdpi/tea_icn_repeat_gray.png | Bin 1556 -> 0 bytes .../res/drawable-xhdpi/ic_action_reload.png | Bin 0 -> 1392 bytes .../drawable-xhdpi/ic_action_reload_white.png | Bin 0 -> 1019 bytes .../res/drawable-xhdpi/tea_icn_repeat.png | Bin 1784 -> 0 bytes .../drawable-xhdpi/tea_icn_repeat_gray.png | Bin 1783 -> 0 bytes .../res/drawable-xxhdpi/ic_action_reload.png | Bin 0 -> 2095 bytes .../ic_action_reload_white.png | Bin 0 -> 1582 bytes src/main/res/drawable/ic_action_reload.png | Bin 0 -> 859 bytes .../res/drawable/ic_action_reload_white.png | Bin 0 -> 599 bytes src/main/res/drawable/tea_icn_repeat.png | Bin 1283 -> 0 bytes src/main/res/drawable/tea_icn_repeat_gray.png | Bin 1284 -> 0 bytes .../res/layout/control_set_repeat_display.xml | 73 +++++++++--------- src/main/res/values/attrs.xml | 1 + src/main/res/values/keys.xml | 55 ++++++------- src/main/res/values/styles.xml | 2 + 21 files changed, 81 insertions(+), 112 deletions(-) create mode 100644 src/main/res/drawable-hdpi/ic_action_reload.png create mode 100644 src/main/res/drawable-hdpi/ic_action_reload_white.png delete mode 100644 src/main/res/drawable-hdpi/tea_icn_repeat.png delete mode 100644 src/main/res/drawable-hdpi/tea_icn_repeat_gray.png create mode 100644 src/main/res/drawable-xhdpi/ic_action_reload.png create mode 100644 src/main/res/drawable-xhdpi/ic_action_reload_white.png delete mode 100644 src/main/res/drawable-xhdpi/tea_icn_repeat.png delete mode 100644 src/main/res/drawable-xhdpi/tea_icn_repeat_gray.png create mode 100644 src/main/res/drawable-xxhdpi/ic_action_reload.png create mode 100644 src/main/res/drawable-xxhdpi/ic_action_reload_white.png create mode 100644 src/main/res/drawable/ic_action_reload.png create mode 100644 src/main/res/drawable/ic_action_reload_white.png delete mode 100644 src/main/res/drawable/tea_icn_repeat.png delete mode 100644 src/main/res/drawable/tea_icn_repeat_gray.png diff --git a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index 10343e17a..771dce085 100755 --- a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -362,6 +362,8 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { GCalControlSet gcalControl = new GCalControlSet(preferences, gcalHelper, getActivity()); + controlSetMap.put(getString(R.string.TEA_ctrl_repeat_pref), repeatControls); + // The deadline control set contains the repeat controls and the // calendar controls. // NOTE: we add the gcalControl AFTER the @@ -369,10 +371,8 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { // otherwise the correct date may not be written to the calendar event. // Order matters! DeadlineControlSet deadlineControl = new DeadlineControlSet( - preferences, getActivity(), R.layout.control_set_deadline, repeatControls, - repeatControls.getDisplayView(), gcalControl.getDisplayView()); - controlSetMap.put(getString(R.string.TEA_ctrl_when_pref), - deadlineControl); + preferences, getActivity(), R.layout.control_set_deadline, gcalControl.getDisplayView()); + controlSetMap.put(getString(R.string.TEA_ctrl_when_pref), deadlineControl); controls.add(repeatControls); repeatControls.addListener(editTitle); controls.add(deadlineControl); @@ -385,7 +385,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { importanceControl); DescriptionControlSet notesControlSet = new DescriptionControlSet(getActivity()); - EditText notesEditText = (EditText) notesControlSet.getView().findViewById(R.id.notes); controls.add(notesControlSet); controlSetMap.put(getString(R.string.TEA_ctrl_notes_pref), notesControlSet); diff --git a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java index 49856f43b..824f66ce2 100644 --- a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java +++ b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java @@ -17,7 +17,6 @@ import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.CheckBox; import android.widget.CompoundButton; -import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.Spinner; import android.widget.TextView; @@ -379,50 +378,26 @@ public class RepeatControlSet extends PopupControlSet { } } - public boolean isRecurrenceSet() { - return doRepeat; - } - - /** - * @return the recurrence display string if set, null - * if not set - */ - public String getStringForExternalDisplay() { - if (isRecurrenceSet()) { - return getRepeatString(false); - } - return null; - } - @Override protected void refreshDisplayView() { TextView repeatDisplay = (TextView) getDisplayView().findViewById(R.id.display_row_edit); - ImageView repeatImage = (ImageView) getDisplayView().findViewById(R.id.display_row_icon); if (doRepeat) { - repeatDisplay.setText(getRepeatString(true)); + repeatDisplay.setText(getRepeatString()); repeatDisplay.setTextColor(themeColor); - repeatImage.setImageResource(R.drawable.tea_icn_repeat); - } else { repeatDisplay.setTextColor(unsetColor); repeatDisplay.setText(R.string.repeat_never); - repeatImage.setImageResource(R.drawable.tea_icn_repeat_gray); } } - private String getRepeatString(boolean useAbbrev) { - int arrayResource; - if (useAbbrev) { - arrayResource = R.array.repeat_interval_short; - } else { - arrayResource = R.array.repeat_interval; - } + private String getRepeatString() { + int arrayResource = R.array.repeat_interval; String[] dates = activity.getResources().getStringArray( arrayResource); String date = String.format("%s %s", repeatValue, dates[intervalValue]); //$NON-NLS-1$ if (repeatUntilValue > 0) { - return activity.getString(R.string.repeat_detail_duedate_until, date, DateAndTimePicker.getDisplayString(activity, repeatUntilValue, useAbbrev, useAbbrev)); + return activity.getString(R.string.repeat_detail_duedate_until, date, DateAndTimePicker.getDisplayString(activity, repeatUntilValue, false, false)); } else { return activity.getString(R.string.repeat_detail_duedate, date); // Every freq int } diff --git a/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java b/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java index 5afd5144f..a09a48fce 100644 --- a/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java @@ -20,7 +20,6 @@ import android.widget.TextView; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.astrid.data.Task; -import com.todoroo.astrid.repeats.RepeatControlSet; import org.tasks.R; import org.tasks.preferences.ActivityPreferences; @@ -28,14 +27,12 @@ import org.tasks.preferences.ActivityPreferences; public class DeadlineControlSet extends PopupControlSet { private DateAndTimePicker dateAndTimePicker; - private final View[] extraViews; - private final RepeatControlSet repeatControlSet; + private final View extraView; public DeadlineControlSet(ActivityPreferences preferences, Activity activity, int displayViewLayout, - RepeatControlSet repeatControlSet, View...extraViews) { + View extraViews) { super(preferences, activity, R.layout.control_set_deadline_dialog, displayViewLayout, 0); - this.extraViews = extraViews; - this.repeatControlSet = repeatControlSet; + this.extraView = extraViews; } @Override @@ -50,13 +47,6 @@ public class DeadlineControlSet extends PopupControlSet { displayString.append(DateAndTimePicker.getDisplayString(activity, model.getDueDate(), false, false)); } - if (repeatControlSet != null) { - String repeatString = repeatControlSet.getStringForExternalDisplay(); - if (!TextUtils.isEmpty(repeatString)) { - displayString.append("\n"); //$NON-NLS-1$ - displayString.append(repeatString); - } - } TextView dateDisplay = (TextView) getDisplayView().findViewById(R.id.display_row_edit); if (TextUtils.isEmpty(displayString)) { dateDisplay.setText(R.string.TEA_deadline_hint); @@ -75,9 +65,9 @@ public class DeadlineControlSet extends PopupControlSet { protected void afterInflate() { dateAndTimePicker = (DateAndTimePicker) getView().findViewById(R.id.date_and_time); LinearLayout extras = (LinearLayout) getView().findViewById(R.id.datetime_extras); - for (View v : extraViews) { + if (extraView != null) { LayoutParams lp = new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT, 1.0f); - extras.addView(v, lp); + extras.addView(extraView, lp); } LinearLayout body = (LinearLayout) getView().findViewById(R.id.datetime_body); diff --git a/src/main/res/drawable-hdpi/ic_action_reload.png b/src/main/res/drawable-hdpi/ic_action_reload.png new file mode 100644 index 0000000000000000000000000000000000000000..e21f314c740729e28e9601dcb84f0b0621b8b4d3 GIT binary patch literal 1256 zcmVP)q0FQ)Zkyfj|v#ecy=d*@$Vf2Vdsk^)T{`B;8wO;+Pv9Tw0U7u7+C8OqQiGlI)@!oQ|JjBey z0L~Iom!@f8W&l8`R1({^iva!v;KX9Fx!Kv-otk*pb+0O=PB)U9npwz3Mn;lKsW*t| zB_ayl9Yy4!h%AW6il%Ar0@xRy%jK>_(a=x}5D{6H^}4R>uK_R`h>sJ|1ppTs$?qky zfmA9LOQ+NC6Vb>KuPY*QhlqXwu;IGymZoVv%-lyrPXRbjMDb=tdx>Nqo6RN?iNqv; zrw_e)0N}>X&Q5N1b+ueC-nMN6z^ee>jI6W{p$!m`vMlS0QtE(s5m|Lz_tVA2#bVHR zR4SD|!!TYUqDHhHNoWJMZNCHHh1#=->?oza%;j>kVd72G954)Hl8E{m&{>yI25j3t zLqr$7Wg;@Qu&{79Onke<1L0fXE$;&}-!2pip~M5g^78UM03SvX7M8%d+p?^4L^S9r zx?d`lZnQ&8BLo^yN@Z%FnOT%lpRBE|J#4S6@c0^_f2WHf&-2>+{QQq?R}}$Y1DQ+9=*i&ZPIZToqplm-Cha=Ey) zwDeoOxpuFenE7wN`W~ zYPGth>v|7>)6Dz~fb&YJ?jzzBcXxL`_Pdrjik6Q7BI+fgm-iFsk5U{Oq%|tceA989 zZ-eIiqiEK^hU>bY5z!D4y%^=zO+;8kzGLQZ!rUp+{RmZ1$^ixjY8I z0`P>0BoECj5RqK~KPaV^;_>*(%*@PY6Zru&I0l%xXc&g?Y%?)2p>J<*KTbraDwWEX zQmUBG=N~jH_%M+Tq|@n-qAXJFCh}gWlf(l}{=v}+bj)tFQBDjTHzx*;n|}ZiIe9@4e|*d7BrE|TcTu8!UnQy@+M!TemY6%z! zB$}1f@8EAkJ~aVdA&GiZAfK9m7l9-M-OIi%X=(6!mLqI`Nr$f9`lD-6D4A}Z7E#RZ1J(h7c zOS%^lBPX-}u8M#Ql2*s~*GoDnX*$GzROaL((H+^c&nBjQ22*yw0VY^F8)^ae0Y`yN zA$|{mGr$iQGHD2K#R6sqy6O|V(rL5+90P9RUa9^8hA>m-6+9nIB_mM4Y%kvy?Iz$X zaH2@6jpgT@bHFp;F=myWai?4kUjb7X@==A>T3{!z4O7$PfmsiZk?;{Pi6Q?!X)-?W x5zvnLQIQGw{vXH;vQ*4@p(dc(s0pYx{sP5!mXm#zc@qEt002ovPDHLkV1gP9at8na literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-hdpi/tea_icn_repeat.png b/src/main/res/drawable-hdpi/tea_icn_repeat.png deleted file mode 100644 index eef47c95a389279442fe7d4484e2eb0d7a02c8d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1556 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 literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xhdpi/tea_icn_repeat.png b/src/main/res/drawable-xhdpi/tea_icn_repeat.png deleted file mode 100644 index 5c5ca4bf37c6edb780b5d89a407e8155f7bd15f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1784 zcmaJ?Yfuwc6ppB6iF$8ik5csUl(j zE!2lZS{SVgk>C>1Hntp7Q>A7M)u`4IY!b<5lTj;`$DlYML!(q04tcb`fefe=9C8># z1d6nNXtc^dQHKU62875HW8|=cyvY~vF|r8-Y800OMs=)4&o*+%GkV#?-Ylk(ff)!M z!y(T)B@qPzewYpg7*voV2bmDS^rAvuAnXNu0CW%nX%L+TdQ%{f&G2S}5b*9H6V`MJ zC0ooFyt74|IOJ#?*Rp9egTX*Gcv3N46b*u5m(O0_hI3ewbSb6hiMJuXK7b7Nk# zJ|sbl(!{79i_^)8dMKUe$VBcwZpaKIykT$GsfeOTWBHgoPK|1CA)iAgZm0^Cg6+o= zAOb#*#}m*&CJTai3~xS*$7M1ZJT6R!pgA4$arqzuGnohr_Cg>CLg+kC7N19lVT2)o z5y5|4p+=8OHF9*$u8OeB6L`W1$mf2P%l6ZuQXJETU|8&22LwiAIHr%rw18hQg9-s6 zsa&NoOUwnDjhBz=RPm@npu^O_OorL2c|3rbFxLw~AOY(`kjchxg-yYKWQ95yNpT!Ml){IaeW{8)EEzTyh}#c#vb; z%jV1@-+f)xgA|3Y@w?I)Aw!B%Ja&C@ro=179nBhCk*oX6r64-yO2OpKKUNf<5sDz? z@(!`Y^X@-M0i4PoIwmHcTx)O+ZU`>ze|gQ6{P1~lsp*u-$7FN3`BB>Gh{O#qp4vG$ zI=njnc`2|$MC)Z_H`_@T=dWM&XyW11r2)JRN$p2px-%#3GeP|{{ecy18+pRLpedeZ zqmJC2U03cjab$z;YE7ph`fzFc&M($2b{inM9MD69bog-wvLm>@Zj|nm#(uRx2-+!c zd&;X!zw+E;)4Frt*dpP=mEJkckrFv0wAr?9$+SZG(e0HN98k z7g-tiqu#A~`(H~-7MiMR3j^(p%VpP-Y&V{pyvy=HBJzJ9N?H6@S>H%Q$w4K{x?oNH zs@Ai2qNHwvyB4Nj5hj+#;!fROom7N7mXFxjQLa(~f9Z9KL6(ViRp*ph#_yZ2Gtz!!IvncSCo6d- z_IJFQ$=wU}r6=98Hl3|qYaC%)j-Jep=(=a^&<50mwnkhTI-XE*Z>Zq-H;ZH%d;jy5 zJ+V!jm+d&U?%T@Xmek~~2bEajNv~O7K6ft znI2;Mn*a3Lct=uP99dv%*#dw;wf0*Q_QaQo?8)1o)$~mM9n{#B z)W<6i$ZNk$S6)w0kIK2IW@&sPHS+=WUyfLgLbv(%T o&Gb~ls;p^?W7gT$*%4DqK@vyPC$~#0J#GFM36TJPHE(a~zauiZ&Hw-a diff --git a/src/main/res/drawable-xhdpi/tea_icn_repeat_gray.png b/src/main/res/drawable-xhdpi/tea_icn_repeat_gray.png deleted file mode 100644 index 4818a95511e1ca95fc6d379d05253998c5aec76d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1783 zcmaJ?c~BEq7>`npqM}emEFD;bh#X0Fb0;+*$tDsd2q9`baY>dWVzP0wn1E14j`ULJMAYsRRaC&B6;bDM6rjQ^ zLG^~XEF4YFN>FLC(lr7tH6|LEY7>$Qj3|KsHsdmrMQ9UI-|7{TdzY9&1>Qo4bP;vH zDYYUIkYG3paOfaS19BmN%cetYP{0;M0Zb4A84!~J@@Nn!|i;m$s1|$#&7$B3uWYS0k&5~&%5F5>82^rJ?qZSQrFcSvM z1h_OJsaOUfqLQ8tgkUr)6z>(AEbkIUri@`j%nXPQGK@x7TyN19LWzEGV@R|`m1#y9 zO4Nd7;2N?XX(5ATGIt+0k{hxg-yn#h^K$>I1V_t8;u=0fFgtjgB@U~7&(A?b?-<7)Qz>_eQu zp3btu-Eh;)(%*VUx5D4`#BYDIIs8n_Vx?`3-;Be(on52vaImg@dS!B9L%{xh6-PY} ziK4@*>t2tZuIo!71kkbsq9O2(asHN$5+>8wYlfZeh+Ue2tJy*?e@cptIidEXKdz+d5n_q zm|<%>DqD~GMl5;(T#oFjsBzBfN51X2#SuOL6OWQc$>=W6(PebUB zn59RmgPi4ycKCFeqWI(e^}RCwdS`i%raN+5PjLH@`T*_zvg!$-!jY1HB02{!RU69| zNBuGH(~CFn1x~Hb%FXd>ix|FfqSh3pxB`*5j+X zycr8OLO0BTc~{#rcXa5I)^^(G1Yf+cg~n3&pWlKOLtoWi_N+?3s{yX)@&vNlb9BD{ zj}0Y%uiCYba(ZcRT7mz1_xld6HaqFsrqmF}HX3W=&Kn-JYWuqCEF&@{H#}_Q*sL+? zVSUA_p4!m)3*1f~?yYHf9OrO&9{dLY>CtmT`ZWcY_v2^o&KV9J^WMula;da-TIigG z_m&^9)UW!6bJKyI^x^e)xc7U6oz-q`0xC~6)c1(5HAV+_mTeDxlg_T(IfXj+#iWXn z2QnAu{bdX*y0V8(fBDpjHJ}6$Y>R;A0vkd?M diff --git a/src/main/res/drawable-xxhdpi/ic_action_reload.png b/src/main/res/drawable-xxhdpi/ic_action_reload.png new file mode 100644 index 0000000000000000000000000000000000000000..e2c99eefe4df3acea301e477a9998c3b46dd88bb GIT binary patch literal 2095 zcmZ`)do|FxWs4M9k|rLicVcOHur!88 zg-jwm)C>t3=APwJRI3p3&Uw%K=leb9`~9Bp<&W>>oX;oK!wsjZtg8$FfU4^;EK%l3 zn+jEs*~y$(Yng*kom@SkGKq)&!H~sDk;ieZi6LKMxN+CxE?um##m%DIS7XTD_u2@IUOAkJ=7c;lxblMxcKUO4&xvmwzan-Ah zIZ05{$CSm7>>J7g&R(?YZ02+Ni{w*qy#M!z8Kg%sYQ}8zF979OXitQ^_cSi0o?Q(v zD@7xQn56_lSqG=DxOOz|5?oRL)S^ut`@5(szWB<4sko!k!I43>KTfzM?NIWpvUt`T zlu`xWLXp>QQ?^LgBx##9S$NUOJfP)&g)J|a){ElqMaUPAul^z!wk~~5pOE-0@6>?2 z)No=L#kE&~6=0B;{|0s-U3jVLe?NWtKBj(zEsU2&Xu&&yWi|R9`USoAd}TwsEiD#9 zZs`OoI|~U|F#R?ANVhGt076p3bSoLo1lhn7CJtsy(OFr{ug)kwk9j$pVMErgP)j>F z*QN;Qmgrcb3Jst;ZcRNiPe#j$ii*x~5E?zUScFYRZ|T7NK#k-M(ar@srvGjAXi?M| z+z|y!D{zv*BMWISmgb)ql~dO)jNn(S4&6}EvID){j?9S$W#OkoGp6*63M(`A?ZLET zzda<*Q4L#*LgJ(d5>M?mae*wMRLtKy(Q1NHY%+4nSx4+c75J84Jq`Vm4r{iACqB^T z0w{H&0BM~;MLS#i0rPln8SoAi28dj+u^8!dSb!VO5BJY22(x4Q(AZL@oG8(@ks>*O z;y+@Zm(AZYy2xSX>d1qt;Xb6<|k~$0xCltBE;B?2PROixSLMSS!?^vq6%evVQ&p z%O4j|zD=q+!cGorwk?9wmGWs2}Ni@`cJi+L!unkse)l_!JtEr)Xh|X0tTu`N`yEt#C&Z zy>cT$-iIR@$!&|$(Bb8cOe;`YTG|p|&17~7k^6Hy1O2`{ln)1AZWt}XGDRh@o)D`e zD;6oi^U0|*B%&^+Q9otE*stoL((YJ?aad){fs9_AJc(5!HYGX6OHVttepp4GWEW?f?9IzUD=?rXQbcjJ`kaWpM z&~0AOh>a)RhXqW^%b*9R&>3MtRipcWjy;oO67^ChN^}JW1(TDLeo=ZRzwHTp(L@u2 z&Jo*0(1R5PsV=5jKNt=7tJj3!$98h<`axaajawG(>Sbt>)H$A$DR+K>Cr)^SoMBEo z7yJzhg~!j!raxajlyJ=FO?_3>mjRxoEK!IqE#BE!Ng=Q_Z-e2+${zUYi>-fy)gO88 zT4e1RK6uOSn7Fz28+g02wgU{J$UsM#X<|a_euB)#RbX&SX|L<7 zP)zk(a_3L_fKGo-*nq)D^6v(&NVZ0j`oXZp@xG<(%yb z{p^mf%VlMzG0UZRF6L9rDux|pBH2ok417Jm#^G>ug6!_pysmHbU+LykGQY<;9wgu! zM#HQUvvGsfzTvpafz>KlKm+IY07x}H;DkA(w zQ^Nt2uTkLvPGA336F#*gzqS+BLDv3Ny7%hN^l2ls5-K`%<}9!TrdLQua}Igo*h6gG5BzY-yE=@_M7+Cc^+42v`p7AV+dhDQfMgy^%VNAs4Ni!OiCO>wR~XSclI&{uf&;FKTl)IR&cua+9*Qp(vg`AuL{d8u0)5Z<82>iJ(_MHG0=> SEp3&NJK*Z#hOKZSCH)7BIm?3p literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxhdpi/ic_action_reload_white.png b/src/main/res/drawable-xxhdpi/ic_action_reload_white.png new file mode 100644 index 0000000000000000000000000000000000000000..d24d82b0f731d9b9c0842579495da5b7c3349718 GIT binary patch literal 1582 zcmV+}2GRM6P)H$j(gwKLfy{Aq}*J?7YEw40t%S5fh*`tAU5gFw|%Q z90|-%N>@^j2gZ^z3j7Rw1stf;#^b=M!XwQ|)de^mSPonb^Z+LUEjfNSfr#)K@CmR5 z*q`Hfr8*y=rDAWyT7V0IWl8B#>UR>@2D}Dr1V(DKSpz)i8CMvbb5$vQ&beV1o^j{g zbI!Si(`*lB{3h7nU4;m^1Xu@LRI=TJz{|iNz+D+_gGE400Tu&8$oyV)f(a075xy08 z3OFK?{mM|b0Byi};PwK2j3OD$zU1FOfs=r4U;&aTH4J46(1BziOK17JAA!wD*#`WT z(Y_rK;|gE}aPchdl}cG_z+xm9UzD@`@4z#_>%jJcwogTbSdomQ9vXTL=my>c=H_TS z0X&cF!_>;v>tPR);~z`?0t6$p0LLIxM;_2I( zz-_>bfyS{05w?Qr{Wmol0(5!mb}97V)MyAW-&2?8Jmz7I#tRu=1T=#H zZTOF>_ZR70BMb690nbD4<$5eykzg#01J1X`?JL^3h5-EveN>sC0@zoQ*#yn#6&kg3bpMAd5av-DV8~CO|q%l9GlA5SX=|y6=E5G>n)4wYdua zr&Moh8L}+s|Fi--fOAsn$C2#ldo5$eq1-{b^Fh8{Q*l061k7Y9@DAyFWMjZ-z^_^c zLq~v9E&~C_x(N9y)3-r6grf5yd<1BAK1jH$WR3$q1kU!f*^BH8)q4+7O&VnlSW7tP z&jsGb?|cW`iL&#d`WH3Jxv(rF92QuUM1W4JAj)B;)Cx@$^yE z2|X*2;saS&M>o-NyO zRo8$r*#ewL1m{Ei2eEa?6mkm%&sf&MN64c5e#v$ZCFG@~8JD5fmyOqmY&1#$WoWDh6AHE1f7EkIu9*Pn0CRo@b}Aw=wiOW>6Cg4sKx9mS$d~|;F##fD0z}3Hh>Qsk g851BfCO~BV0S{ll2}unSmH+?%07*qoM6N<$f&-hm3;+NC literal 0 HcmV?d00001 diff --git a/src/main/res/drawable/ic_action_reload.png b/src/main/res/drawable/ic_action_reload.png new file mode 100644 index 0000000000000000000000000000000000000000..319ce059355f165859437b2ad2c21ac3463c612b GIT binary patch literal 859 zcmV-h1Elj)PmAtaG{o#W+tVU2!ad0 z&}G1d8xg^ce~D|wjT;w2wtg){P%PM{O-rTKMX6X+Dt>GfX`3|fxNr)=PSUhBEqGuE z^WNp2-`saIH=!hKr)*o@|9gNi3=`W15Sd?JE6!hU;%qkCzO=N|DXEj>en~$7e5+I{ zA15XzW~$9e9{Xni>2&(InOz{c8vsb6`qTG)WHOm~0M7yRG-BQmz`(%3&T_eY+4H=f z>UBvAB)ve5E=rpU+pqF#NO;^SS^F3k#RbtX)#Y z%x)G6g?Djr>uI<+G453y1VLbC*8spd_pn$jKG;a|Mig5zlIHjrO z-AVlEW|-Ntzt6ns0IjX92UnV@R4UCi(;SFtLg!qU=Xr3>l_n=A=QnE*1VN7E9y6OR z6bdi?-d|M#-}jd#O#*l+$!*3ws^kfhz01qXvER5=ixK52(v7IMx3|O0k^o?4@8e>c zI*yacWG4Vfa*KM( zNpAq$8XFrc$L;s`_a7p8766=c#bU8o+z>#VoO5qU#+s9~FbvN~I#1G*^s}w4?S8#{ z>jIGE%xv28ynQ4;DH*$N<4{p&~4cjw%L@$vCjjpS_z zK+-gT+oPkSWdP6n`uYxgo_7Gi9+EpHeI_~A($X@wR=H~#)VzWqxDfG7 z0V_!mB!58sJFGO-1q%zYkw}P;U}s862qaC={NQ6TBiS6gJL}%A2l`;RVfWqlJ$7c_ zcebN4N{o$E{eLjf8>N9B@FqpNRHN_&FdN5p;5+aQ*aSWdh~G%{0>W<~uQs>ov z=2~gpD#DZMYL3`}`dK|nm>SB!U3EWGY(ssdUQ;`fGp^oJpR1=$8kkUbW07O^MHI{9 z_PqGm8!_-YBR*HcD-*A6;9;h~%T$qJM$wHgQGC2-t2wV}+24PxEf(Me#B4mJqLJLyC8SCxm5vpUY@-gQ-)Qx9N7( zP1q!UFXtJskw<9Lz&NlF=i7um^;Zon0n>55T*ykSVG-605nS}YIYWeNi1b>$pvb_x z67jCOsQ!%HT|-lA%)qJoOr2K8GQ2D51NBpeyKiXcwR%Bn2~-c&kDj;eELIH%ncB^0 z&_LgC)Y?jz+A$p6DrZGUOTUZ+)`0uKk9h44a1*!+OafmCJ!2i%`_oq?WuQMG-Z)YQ ldTokVG0-~x`ESD{egRy~fuw8H20Q=&002ovPDHLkV1oTr2QB~r literal 0 HcmV?d00001 diff --git a/src/main/res/drawable/tea_icn_repeat.png b/src/main/res/drawable/tea_icn_repeat.png deleted file mode 100644 index d5fa6a945abedbaf326fdb7ddcafdf705901f13a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1283 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE;=WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2v2cW|hp4h>{3jAFJg2T)jk)8oi3#0-$aN1{?c|g2d$P)DnfH z)bz|eTc!8A_bVx6rr0WloBA5~7C5J7WO`H;r3P2|g(O#HCtIc{+1n}DR9FEG$W1Lt zRH(?!$t$+1uvG$^YXxM3g!Ppaz)DK8ZIvL7itr6kaLzAERWQ{v&`mZlGgL4$(K9qL zur#sMQ7|$vG|)FR(l;>IH8ij?HMcS_RDc2{plwAdX;wilZcw{`JX@uVl9B=|ef{$C za=mh6z5JqdeM3u2OML?)eIp}XpbFjM%Dj@q3f;V7Wta&rsl~}fnFS@8`FRQ;6BCp2 zOG|8(fG&l2A-4c-Y+f-mn1BJMUy)d#Z>VPg@)As;uP=V3xw&xF#U(+h2=`(&xHzP; zAXPsowK%`DC>a=WY04n03ap%qQWHz^i$e1Ab6}wukda@KU!0L&px_*As%NO+o0y!L z2ND76@b$Iw%quQQ%u7!7bg@+enxU7OnPO$=SAPRYG7$-=xXF-Y~kW$WNGPY z>SpQcW@rf0>yn>bnwy$e0@Is<&})oSFDNnO765H_NiE7OOHFYr%Fk5*d)g`!n_CRc zT%0UTahnI#n}W?P5WOZi-J%b4j6Nu8k)j$V1WZ35COqK+Iq;;Png>kpMZko8H7UN2 zfq}8q)5S5Q;?|if_8LbLWsZORUD$pw<#2-HOr4+!0 z@z><;&I{oAr_x>Ts_`j(LkwH_^S`V6s~&y7bGM*5e{a>hmv#Hk|9w|E@BMjC6`_4T zVbk;vPyOhy-*P3V-|Wj_JPWuOEjk|Z&Yp4b?)jtauMgKVhg!~X-TzG8!bxOlhJ*a9 z3yrm}g;yOD{np@^^YHYKeKNuvNupnOY+ReT)+z2{Pj7r;UaV3}sz|cV&1EHu{F5#G zHhp{7-}69Hcf|(QUD6*K-%^^!9-%=!i` zF>4fhgtpF2j*&Nim+2n6Y5HNIsw-KGEe_9{w)pIe4J&qOD{f)&eoSMI%Y z>*9-T_a^T;HhtCf`d2c+KSKWh>S^eBtM>f<{*C)tB^YGG{kxduQx}4YB~MpBmvv4F FO#tB`(SiT~ diff --git a/src/main/res/drawable/tea_icn_repeat_gray.png b/src/main/res/drawable/tea_icn_repeat_gray.png deleted file mode 100644 index 8af89490d16d7dae9ce1b5f7db70418c243429f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1284 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE;=WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2v2cW|hp4h>{3jAFJg2T)jk)8oi3#0-$aN1{?c|g2d$P)DnfH z)bz|eTc!8A_bVx6rr0WloBA5~7C5J7WO`H;r3P2|g(O#HCtIc{+1n}DR9FEG$W1Lt zRH(?!$t$+1uvG$^YXxM3g!Ppaz)DK8ZIvL7itr6kaLzAERWQ{v&`mZlGgL4$(K9qL zur#sMQ7|$vG|)FR(l;>IH8ij?HMcS_RDc2{plwAdX;wilZcw{`JX@uVl9B=|ef{$C za=mh6z5JqdeM3u2OML?)eIp}XpbFjM%Dj@q3f;V7Wta&rsl~}fnFS@8`FRQ;6BCp2 zOG|8(fG&l2A-4c-Y+f-mn1BJMUy)d#Z>VPg@)As;uP=V3xw&xF#U(+h2=`(&xHzP; zAXPsowK%`DC>a=WY04n03ap%qQWHz^i$e1Ab6}wukda@KU!0L&px_*As%NO+o0y!L z2ND76@b$Iw%quQQ%u7!7bg@+enxU7OnPO#R;%H>y>f~l=YG7$-=xXF-Y~kW$WNGPY z>SpQcW@rf0>yn>bnwy$e0@IrU*XwM6Q!gkn8Iua(|ZvxVfRb$ z7%(s}mU+53hE&`-bH!exrBLSh$LA0EnoqVJbTW!enc(Q-##QRdcEwZEY|_D_3aPu5 znj2NTA|pzg4?ghU^dr1Qsh;h0YC-uu|JrqRAOF0|+i`Gv+~0TCZO=cS_xo?%{o}q% zgZ%7PA2?b3)Yc%uZ_&jSmT!+~NC~ubv)tR*TX|=>K41Icdgf5qhyxwZmRq>VT+KLY zaO+~b^K0Q%%S69*7`}OM`^P>p;}?h6q6)I3539BAS;!o{|InUYP8``Qj)W}pm2}`t zE1Z=0cCY-*1Kd`D>D*t;9tiKY%z455EwHO9IzjT?hbfOWEiXqTa{FW~<|^jlk@9{Z z{bSYQz{yJ`Pkr4P__$ZsV43gB^Pf_>Bb=nymHO2(hktk|TQk>qzgN~;cGJ99Gk&tg zCCMC(aAyh4vcA5 - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 7d516a072..390702e5b 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -46,6 +46,7 @@ + diff --git a/src/main/res/values/keys.xml b/src/main/res/values/keys.xml index 66533ee3f..0a453783b 100644 --- a/src/main/res/values/keys.xml +++ b/src/main/res/values/keys.xml @@ -237,35 +237,36 @@ @string/TEA_control_timer @string/TEA_control_hidden_section - - TEA_ctrl_title_pref - TEA_ctrl_when_pref - TEA_ctrl_more_pref - TEA_ctrl_importance_pref - TEA_ctrl_lists_pref - TEA_ctrl_notes_pref - TEA_ctrl_files_pref - TEA_ctrl_hide_until_pref - TEA_ctrl_hide_section_pref - TEA_ctrl_reminders_pref - TEA_ctrl_timer_pref - TEA_ctrl_share_pref + use_dark_theme use_dark_theme_widget debug_logging - - - @string/TEA_ctrl_when_pref - @string/TEA_ctrl_importance_pref - @string/TEA_ctrl_lists_pref - @string/TEA_ctrl_notes_pref - @string/TEA_ctrl_files_pref - @string/TEA_ctrl_hide_until_pref - @string/TEA_ctrl_reminders_pref - @string/TEA_ctrl_timer_pref - @string/TEA_ctrl_hide_section_pref - - - + TEA_ctrl_title_pref + TEA_ctrl_when_pref + TEA_ctrl_repeat_pref + TEA_ctrl_more_pref + TEA_ctrl_importance_pref + TEA_ctrl_lists_pref + TEA_ctrl_notes_pref + TEA_ctrl_files_pref + TEA_ctrl_hide_until_pref + TEA_ctrl_hide_section_pref + TEA_ctrl_reminders_pref + TEA_ctrl_timer_pref + TEA_ctrl_share_pref + + + @string/TEA_ctrl_when_pref + @string/TEA_ctrl_repeat_pref + @string/TEA_ctrl_importance_pref + @string/TEA_ctrl_lists_pref + @string/TEA_ctrl_notes_pref + @string/TEA_ctrl_files_pref + @string/TEA_ctrl_hide_until_pref + @string/TEA_ctrl_reminders_pref + @string/TEA_ctrl_timer_pref + @string/TEA_ctrl_hide_section_pref + + diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index cdaa6a3fc..87b06a9f9 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -65,6 +65,7 @@ @drawable/ic_action_box @drawable/ic_action_bell @drawable/ic_action_alarm + @drawable/ic_action_reload