From 943e9b621902378327dc6721f28beaff67121b56 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Thu, 15 Dec 2011 16:29:56 -0800 Subject: [PATCH] Themed all the task edit dialogs, including the calendar picker --- .../astrid/actfm/EditPeopleControlSet.java | 4 +- .../todoroo/astrid/tags/TagsControlSet.java | 2 +- .../color/task_edit_toggle_button_text.xml | 2 +- .../res/drawable/date_shortcut_bottom_off.xml | 3 +- .../res/drawable/date_shortcut_bottom_on.xml | 2 +- .../res/drawable/date_shortcut_middle_off.xml | 3 +- .../res/drawable/date_shortcut_middle_on.xml | 2 +- .../drawable/date_shortcut_standalone_off.xml | 3 +- .../drawable/date_shortcut_standalone_on.xml | 2 +- astrid/res/drawable/date_shortcut_top_off.xml | 3 +- astrid/res/drawable/date_shortcut_top_on.xml | 2 +- .../deadline_timepicker_button_bl_off.xml | 3 +- .../deadline_timepicker_button_bl_on.xml | 2 +- .../deadline_timepicker_button_br_off.xml | 3 +- .../deadline_timepicker_button_br_on.xml | 2 +- .../deadline_timepicker_button_tl_off.xml | 3 +- .../deadline_timepicker_button_tl_on.xml | 2 +- .../deadline_timepicker_button_tr_off.xml | 3 +- .../deadline_timepicker_button_tr_on.xml | 2 +- .../task_edit_dialog_background_white.xml | 14 ++++ astrid/res/drawable/timepicker_am_btn_off.xml | 3 +- astrid/res/drawable/timepicker_am_btn_on.xml | 2 +- astrid/res/drawable/timepicker_pm_btn_off.xml | 3 +- astrid/res/drawable/timepicker_pm_btn_on.xml | 2 +- astrid/res/layout/assigned_adapter_row.xml | 13 +++- astrid/res/layout/astrid_time_picker.xml | 4 +- astrid/res/layout/contact_adapter_row.xml | 3 +- astrid/res/layout/deadline_number_picker.xml | 6 +- ...imple_list_item_multiple_choice_themed.xml | 12 ++++ astrid/res/values/colors.xml | 1 + astrid/res/values/styles.xml | 18 +++-- .../astrid/activity/TaskEditActivity.java | 12 +--- .../todoroo/astrid/service/ThemeService.java | 11 +++ .../com/todoroo/astrid/ui/CalendarView.java | 68 +++++++++++-------- .../todoroo/astrid/ui/DateAndTimeDialog.java | 3 +- .../todoroo/astrid/ui/PopupControlSet.java | 4 +- 36 files changed, 148 insertions(+), 79 deletions(-) create mode 100644 astrid/res/drawable/task_edit_dialog_background_white.xml create mode 100644 astrid/res/layout/simple_list_item_multiple_choice_themed.xml diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java index 3e179abb6..53159a88e 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java @@ -58,6 +58,7 @@ import com.todoroo.astrid.service.StatisticsConstants; import com.todoroo.astrid.service.StatisticsService; import com.todoroo.astrid.service.TagDataService; import com.todoroo.astrid.service.TaskService; +import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.tags.TagService; import com.todoroo.astrid.ui.PeopleContainer; import com.todoroo.astrid.ui.PeopleContainer.OnAddNewPersonListener; @@ -122,7 +123,7 @@ public class EditPeopleControlSet extends PopupControlSet { sharedWithRow = LayoutInflater.from(activity).inflate(R.layout.control_set_collaborators_display, null); sharedWithView = LayoutInflater.from(activity).inflate(R.layout.control_set_collaborators, null); - sharedWithDialog = new Dialog(activity, 0); + sharedWithDialog = new Dialog(activity, ThemeService.getDialogTheme()); sharedWithDialog.setTitle(R.string.actfm_EPA_collaborators_header); View v = getSharedWithView(); DisplayMetrics metrics = new DisplayMetrics(); @@ -262,7 +263,6 @@ public class EditPeopleControlSet extends PopupControlSet { name.setText(person.optString("name")); name.setTextAppearance(activity, R.style.TextAppearance_Medium); tag.setText(activity.getString(R.string.actfm_EPA_list, person.optString("tag"))); - tag.setTextAppearance(activity, android.R.style.TextAppearance); collaborators.addView(contact); } diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java index 0cfaab55d..e577a75ee 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java @@ -64,7 +64,7 @@ public final class TagsControlSet extends PopupControlSet { selectedTags = (ListView) getView().findViewById(R.id.existingTags); selectedTags.setAdapter(new ArrayAdapter(activity, - android.R.layout.simple_list_item_multiple_choice, allTagNames)); + R.layout.simple_list_item_multiple_choice_themed, allTagNames)); selectedTags.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE); this.newTags = (LinearLayout) getView().findViewById(R.id.newTags); diff --git a/astrid/res/color/task_edit_toggle_button_text.xml b/astrid/res/color/task_edit_toggle_button_text.xml index b0b7280af..3510a4dce 100644 --- a/astrid/res/color/task_edit_toggle_button_text.xml +++ b/astrid/res/color/task_edit_toggle_button_text.xml @@ -3,5 +3,5 @@ + android:color="@color/task_edit_deadline_gray"/> \ No newline at end of file diff --git a/astrid/res/drawable/date_shortcut_bottom_off.xml b/astrid/res/drawable/date_shortcut_bottom_off.xml index bb7c79961..f5b68c836 100644 --- a/astrid/res/drawable/date_shortcut_bottom_off.xml +++ b/astrid/res/drawable/date_shortcut_bottom_off.xml @@ -3,8 +3,9 @@ android:shape="rectangle"> + android:color="@color/task_edit_deadline_gray"/> + \ No newline at end of file diff --git a/astrid/res/drawable/date_shortcut_bottom_on.xml b/astrid/res/drawable/date_shortcut_bottom_on.xml index 1c96f52de..af1a0ba50 100644 --- a/astrid/res/drawable/date_shortcut_bottom_on.xml +++ b/astrid/res/drawable/date_shortcut_bottom_on.xml @@ -3,7 +3,7 @@ android:shape="rectangle"> + android:color="@color/task_edit_deadline_gray"/> + android:color="@color/task_edit_deadline_gray"/> + \ No newline at end of file diff --git a/astrid/res/drawable/date_shortcut_middle_on.xml b/astrid/res/drawable/date_shortcut_middle_on.xml index 65556cfc9..51e164c8b 100644 --- a/astrid/res/drawable/date_shortcut_middle_on.xml +++ b/astrid/res/drawable/date_shortcut_middle_on.xml @@ -5,5 +5,5 @@ android:color="@color/task_edit_date_shortcuts_bg"/> + android:color="@color/task_edit_deadline_gray"/> \ No newline at end of file diff --git a/astrid/res/drawable/date_shortcut_standalone_off.xml b/astrid/res/drawable/date_shortcut_standalone_off.xml index 6e0794a2f..3983d6b38 100644 --- a/astrid/res/drawable/date_shortcut_standalone_off.xml +++ b/astrid/res/drawable/date_shortcut_standalone_off.xml @@ -3,10 +3,11 @@ android:shape="rectangle"> + android:color="@color/task_edit_deadline_gray"/> + \ No newline at end of file diff --git a/astrid/res/drawable/date_shortcut_standalone_on.xml b/astrid/res/drawable/date_shortcut_standalone_on.xml index 9c264a623..b0b8ada31 100644 --- a/astrid/res/drawable/date_shortcut_standalone_on.xml +++ b/astrid/res/drawable/date_shortcut_standalone_on.xml @@ -3,7 +3,7 @@ android:shape="rectangle"> + android:color="@color/task_edit_deadline_gray"/> + android:color="@color/task_edit_deadline_gray"/> + \ No newline at end of file diff --git a/astrid/res/drawable/date_shortcut_top_on.xml b/astrid/res/drawable/date_shortcut_top_on.xml index 605440c02..a6e31a8f9 100644 --- a/astrid/res/drawable/date_shortcut_top_on.xml +++ b/astrid/res/drawable/date_shortcut_top_on.xml @@ -3,7 +3,7 @@ android:shape="rectangle"> + android:color="@color/task_edit_deadline_gray"/> + android:color="@color/task_edit_deadline_gray"/> + \ No newline at end of file diff --git a/astrid/res/drawable/deadline_timepicker_button_bl_on.xml b/astrid/res/drawable/deadline_timepicker_button_bl_on.xml index 9f8a08644..29d350cc6 100644 --- a/astrid/res/drawable/deadline_timepicker_button_bl_on.xml +++ b/astrid/res/drawable/deadline_timepicker_button_bl_on.xml @@ -3,7 +3,7 @@ android:shape="rectangle"> + android:color="@color/task_edit_deadline_gray"/> + android:color="@color/task_edit_deadline_gray"/> + \ No newline at end of file diff --git a/astrid/res/drawable/deadline_timepicker_button_br_on.xml b/astrid/res/drawable/deadline_timepicker_button_br_on.xml index 81bbc26f7..61bebab0c 100644 --- a/astrid/res/drawable/deadline_timepicker_button_br_on.xml +++ b/astrid/res/drawable/deadline_timepicker_button_br_on.xml @@ -3,7 +3,7 @@ android:shape="rectangle"> + android:color="@color/task_edit_deadline_gray"/> + android:color="@color/task_edit_deadline_gray"/> + \ No newline at end of file diff --git a/astrid/res/drawable/deadline_timepicker_button_tl_on.xml b/astrid/res/drawable/deadline_timepicker_button_tl_on.xml index 264876304..03d364c76 100644 --- a/astrid/res/drawable/deadline_timepicker_button_tl_on.xml +++ b/astrid/res/drawable/deadline_timepicker_button_tl_on.xml @@ -3,7 +3,7 @@ android:shape="rectangle"> + android:color="@color/task_edit_deadline_gray"/> + android:color="@color/task_edit_deadline_gray"/> + \ No newline at end of file diff --git a/astrid/res/drawable/deadline_timepicker_button_tr_on.xml b/astrid/res/drawable/deadline_timepicker_button_tr_on.xml index 7fb8fe038..928a25382 100644 --- a/astrid/res/drawable/deadline_timepicker_button_tr_on.xml +++ b/astrid/res/drawable/deadline_timepicker_button_tr_on.xml @@ -3,7 +3,7 @@ android:shape="rectangle"> + android:color="@color/task_edit_deadline_gray"/> + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/timepicker_am_btn_off.xml b/astrid/res/drawable/timepicker_am_btn_off.xml index ec0fb1656..191e7274f 100644 --- a/astrid/res/drawable/timepicker_am_btn_off.xml +++ b/astrid/res/drawable/timepicker_am_btn_off.xml @@ -3,8 +3,9 @@ android:shape="rectangle"> + android:color="@color/task_edit_deadline_gray"/> + \ No newline at end of file diff --git a/astrid/res/drawable/timepicker_am_btn_on.xml b/astrid/res/drawable/timepicker_am_btn_on.xml index a995c53bf..4df4dc80e 100644 --- a/astrid/res/drawable/timepicker_am_btn_on.xml +++ b/astrid/res/drawable/timepicker_am_btn_on.xml @@ -3,7 +3,7 @@ android:shape="rectangle"> + android:color="@color/task_edit_deadline_gray"/> + android:color="@color/task_edit_deadline_gray"/> + \ No newline at end of file diff --git a/astrid/res/drawable/timepicker_pm_btn_on.xml b/astrid/res/drawable/timepicker_pm_btn_on.xml index 281a42b9e..f4852902c 100644 --- a/astrid/res/drawable/timepicker_pm_btn_on.xml +++ b/astrid/res/drawable/timepicker_pm_btn_on.xml @@ -3,7 +3,7 @@ android:shape="rectangle"> + android:color="@color/task_edit_deadline_gray"/> - + \ No newline at end of file diff --git a/astrid/res/layout/astrid_time_picker.xml b/astrid/res/layout/astrid_time_picker.xml index 78f605429..ef96be6e7 100644 --- a/astrid/res/layout/astrid_time_picker.xml +++ b/astrid/res/layout/astrid_time_picker.xml @@ -15,9 +15,9 @@ diff --git a/astrid/res/layout/deadline_number_picker.xml b/astrid/res/layout/deadline_number_picker.xml index 5ccaae1d4..24b3a3ed6 100644 --- a/astrid/res/layout/deadline_number_picker.xml +++ b/astrid/res/layout/deadline_number_picker.xml @@ -32,7 +32,7 @@ android:id="@+id/timepicker_left_border" android:layout_height="fill_parent" android:layout_width="2dip" - android:background="@android:color/darker_gray" + android:background="@color/task_edit_deadline_gray" android:visibility="gone" /> @@ -44,14 +44,14 @@ android:gravity="center" android:inputType="phone" android:textSize="30sp" - android:textColor="@android:color/white" + android:textColor="@color/task_edit_deadline_gray" android:background="@android:color/transparent" /> diff --git a/astrid/res/layout/simple_list_item_multiple_choice_themed.xml b/astrid/res/layout/simple_list_item_multiple_choice_themed.xml new file mode 100644 index 000000000..9968f3c1d --- /dev/null +++ b/astrid/res/layout/simple_list_item_multiple_choice_themed.xml @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/astrid/res/values/colors.xml b/astrid/res/values/colors.xml index 28c2156fd..9745d1bad 100644 --- a/astrid/res/values/colors.xml +++ b/astrid/res/values/colors.xml @@ -25,6 +25,7 @@ #438cb6 #0b78a5 + #888888 diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml index c1a28496e..71288f1a3 100644 --- a/astrid/res/values/styles.xml +++ b/astrid/res/values/styles.xml @@ -100,7 +100,7 @@ @@ -167,14 +167,20 @@ @null @android:style/Animation.Dialog stateUnspecified|adjustPan + #ffffff + + diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java index 38d6af61c..17c0733e4 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java @@ -350,7 +350,7 @@ public final class TaskEditActivity extends Activity { if (orderPreference != null) itemOrder = orderPreference.split(BeastModePreferenceActivity.BEAST_MODE_PREF_ITEM_SEPARATOR); else - itemOrder = getResources().getStringArray(R.array.TEA_control_sets); + itemOrder = getResources().getStringArray(R.array.TEA_control_sets_prefs); String moreSectionTrigger = getString(R.string.TEA_ctrl_more_pref); String whenViewDescriptor = getString(R.string.TEA_ctrl_when_pref); View whenView = findViewById(R.id.when_container); @@ -471,14 +471,8 @@ public final class TaskEditActivity extends Activity { } private void constructWhenDialog(View whenDialogView) { - int theme = ThemeService.getTheme(); - if (theme == R.style.Theme || theme == R.style.Theme_Transparent) { - whenDialog = new Dialog(this, R.style.Theme_TEA_Dialog);//R.style.Theme_WhenDialog - //whenDialogView.setBackgroundColor(getResources().getColor(android.R.color.black)); - } else { - whenDialog = new Dialog(this, R.style.Theme_TEA_Dialog); //R.style.Theme_White_WhenDialog - //whenDialogView.setBackgroundColor(getResources().getColor(android.R.color.white)); - } + int theme = ThemeService.getDialogTheme(); + whenDialog = new Dialog(this, theme); Button dismissDialogButton = (Button) whenDialogView.findViewById(R.id.when_dismiss); dismissDialogButton.setOnClickListener(new View.OnClickListener() { diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java index c4a19a25a..9078b5354 100644 --- a/astrid/src/com/todoroo/astrid/service/ThemeService.java +++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java @@ -29,4 +29,15 @@ public class ThemeService { return R.style.Theme_White; } + public static int getDialogTheme() { + int themeSetting = ThemeService.getTheme(); + int theme; + if (themeSetting == R.style.Theme || themeSetting == R.style.Theme_Transparent) { + theme = R.style.Theme_TEA_Dialog; + } else { + theme = R.style.Theme_TEA_Dialog_White; + } + return theme; + } + } diff --git a/astrid/src/com/todoroo/astrid/ui/CalendarView.java b/astrid/src/com/todoroo/astrid/ui/CalendarView.java index a13195345..58c8e25da 100644 --- a/astrid/src/com/todoroo/astrid/ui/CalendarView.java +++ b/astrid/src/com/todoroo/astrid/ui/CalendarView.java @@ -9,6 +9,7 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; +import android.graphics.Paint.Style; import android.graphics.Rect; import android.graphics.RectF; import android.graphics.drawable.BitmapDrawable; @@ -38,14 +39,14 @@ public class CalendarView extends View { private boolean ignoreNextTouch; private Paint borderPaint; - private Paint borderRightAlignPaint; - private Paint backColorPaint; - private Paint whiteCenterAlignLargePaint; + private Paint calendarNumberRightAlignPaint; + private Paint calendarSelectedNumberRightAlignPaint; + private Paint backgroundColorPaint; + private Paint monthCenterAlignLargePaint; private Paint centerAlignPaint; private Paint todayCalendarPaint; private Paint selectedCalendarPaint; private Paint dayPaint; - private Paint calendarPaint; private float density; private int leftArrowHeight; @@ -103,45 +104,48 @@ public class CalendarView extends View { borderPaint = new Paint(); borderPaint.setAntiAlias(true); - borderPaint.setColor(Color.WHITE); + borderPaint.setColor(r.getColor(R.color.task_edit_deadline_gray)); + borderPaint.setStyle(Style.STROKE); - borderRightAlignPaint = new Paint(); - borderRightAlignPaint.setAntiAlias(true); - borderRightAlignPaint.setColor(Color.WHITE); - borderRightAlignPaint.setTextSize(TEXT_SIZE * density); - borderRightAlignPaint.setTextAlign(Paint.Align.RIGHT); + calendarNumberRightAlignPaint = new Paint(); + calendarNumberRightAlignPaint.setAntiAlias(true); + calendarNumberRightAlignPaint.setColor(r.getColor(R.color.task_edit_deadline_gray)); + calendarNumberRightAlignPaint.setTextSize(TEXT_SIZE * density); + calendarNumberRightAlignPaint.setTextAlign(Paint.Align.RIGHT); + + calendarSelectedNumberRightAlignPaint = new Paint(); + calendarSelectedNumberRightAlignPaint.setAntiAlias(true); + calendarSelectedNumberRightAlignPaint.setColor(Color.WHITE); + calendarSelectedNumberRightAlignPaint.setTextSize(TEXT_SIZE * density); + calendarSelectedNumberRightAlignPaint.setTextAlign(Paint.Align.RIGHT); dayPaint = new Paint(); dayPaint.setAntiAlias(true); dayPaint.setColor(Color.rgb(137, 135, 132)); - calendarPaint = new Paint(); - calendarPaint.setAntiAlias(true); - calendarPaint.setColor(Color.BLACK); - - whiteCenterAlignLargePaint = new Paint(); - whiteCenterAlignLargePaint.setAntiAlias(true); - whiteCenterAlignLargePaint.setColor(Color.WHITE); - whiteCenterAlignLargePaint.setTextAlign(Paint.Align.CENTER); - whiteCenterAlignLargePaint.setTextSize(MONTH_TEXT_SIZE * density); + monthCenterAlignLargePaint = new Paint(); + monthCenterAlignLargePaint.setAntiAlias(true); + monthCenterAlignLargePaint.setColor(r.getColor(R.color.task_edit_deadline_gray)); + monthCenterAlignLargePaint.setTextAlign(Paint.Align.CENTER); + monthCenterAlignLargePaint.setTextSize(MONTH_TEXT_SIZE * density); centerAlignPaint = new Paint(); centerAlignPaint.setAntiAlias(true); - centerAlignPaint.setColor(Color.WHITE); + centerAlignPaint.setColor(r.getColor(R.color.task_edit_deadline_gray)); centerAlignPaint.setTextAlign(Paint.Align.CENTER); centerAlignPaint.setTextSize(TEXT_SIZE * density); todayCalendarPaint = new Paint(); todayCalendarPaint.setAntiAlias(true); - todayCalendarPaint.setColor(r.getColor(android.R.color.darker_gray)); + todayCalendarPaint.setColor(r.getColor(R.color.task_edit_deadline_gray)); selectedCalendarPaint = new Paint(); selectedCalendarPaint.setAntiAlias(true); selectedCalendarPaint.setColor(r.getColor(R.color.task_edit_date_shortcuts_bg)); - backColorPaint = new Paint(); - backColorPaint.setAntiAlias(true); - backColorPaint.setColor(Color.BLACK); + backgroundColorPaint = new Paint(); + backgroundColorPaint.setAntiAlias(true); + backgroundColorPaint.setColor(Color.TRANSPARENT); setPadding(PADDING, PADDING, PADDING, PADDING); @@ -229,7 +233,7 @@ public class CalendarView extends View { super.onDraw(canvas); // Background - canvas.drawRect(0, 0, getMeasuredWidth(), getMeasuredHeight(), backColorPaint); + canvas.drawRect(0, 0, getMeasuredWidth(), getMeasuredHeight(), backgroundColorPaint); // Outermost border -- Start // RectF outerMostBorder = new RectF(); @@ -246,7 +250,7 @@ public class CalendarView extends View { float monthTitleHeight = (MONTH_TEXT_SIZE + 10) * density; rectF.set(15, 15, getMeasuredWidth() - 15, monthTitleHeight); - canvas.drawRoundRect(rectF, CURVE_RADIUS, CURVE_RADIUS, backColorPaint); + canvas.drawRoundRect(rectF, CURVE_RADIUS, CURVE_RADIUS, backgroundColorPaint); rectF.set(16, 16, getMeasuredWidth() - 16, monthTitleHeight - 1); // canvas.drawRoundRect(rectF, CURVE_RADIUS, CURVE_RADIUS, backColorPaint); @@ -280,7 +284,7 @@ public class CalendarView extends View { int monthX = getMeasuredWidth() / 2; int monthY = (int) (monthTitleHeight / 2 + 15); String monthYear = (String) DateFormat.format("MMMM yyyy", getCoercedDate(calendar.getTime(), calendarDate)); //calendarDate.getTime() == 0 ? calendar.getTime() : calendarDate); //$NON-NLS-1$ - canvas.drawText(monthYear, monthX, monthY, whiteCenterAlignLargePaint); + canvas.drawText(monthYear, monthX, monthY, monthCenterAlignLargePaint); // Month text -- End // Day heading -- Start @@ -329,6 +333,7 @@ public class CalendarView extends View { boolean firstTime = true; int dayOfMonth = 1; Paint colorPaint; + Paint textPaint; dayLeftArr = new int[lastDateOfThisMonth]; dayTopArr = new int[lastDateOfThisMonth]; @@ -346,10 +351,13 @@ public class CalendarView extends View { if (dayOfMonth <= lastDateOfThisMonth) { if (currentHighlightDay == dayOfMonth) { colorPaint = selectedCalendarPaint; + textPaint = calendarSelectedNumberRightAlignPaint; } else if(today == dayOfMonth) { colorPaint = todayCalendarPaint; + textPaint = calendarSelectedNumberRightAlignPaint; } else { - colorPaint = calendarPaint; + colorPaint = backgroundColorPaint; + textPaint = calendarNumberRightAlignPaint; } dayLeftArr[dayOfMonth-1] = dayLeft; dayTopArr[dayOfMonth-1] = dayTop; @@ -360,8 +368,8 @@ public class CalendarView extends View { canvas.drawRoundRect(rectF, CURVE_RADIUS, CURVE_RADIUS, colorPaint); textX = dayLeft + boxWidth - TEXT_PADDING * 3; - textY = dayTop + borderRightAlignPaint.getTextSize() + TEXT_PADDING; - canvas.drawText(String.valueOf(dayOfMonth), textX, textY, borderRightAlignPaint); + textY = dayTop + calendarNumberRightAlignPaint.getTextSize() + TEXT_PADDING; + canvas.drawText(String.valueOf(dayOfMonth), textX, textY, textPaint); dayLeft += boxWidth + PADDING; diff --git a/astrid/src/com/todoroo/astrid/ui/DateAndTimeDialog.java b/astrid/src/com/todoroo/astrid/ui/DateAndTimeDialog.java index b1c609ac0..c7c10a0cb 100644 --- a/astrid/src/com/todoroo/astrid/ui/DateAndTimeDialog.java +++ b/astrid/src/com/todoroo/astrid/ui/DateAndTimeDialog.java @@ -9,6 +9,7 @@ import android.view.WindowManager.LayoutParams; import android.widget.Button; import com.timsu.astrid.R; +import com.todoroo.astrid.service.ThemeService; public class DateAndTimeDialog extends Dialog { @@ -25,7 +26,7 @@ public class DateAndTimeDialog extends Dialog { private DateAndTimeDialogListener listener; public DateAndTimeDialog(Context context, long startDate) { - super(context); + super(context, ThemeService.getDialogTheme()); /** 'Window.FEATURE_NO_TITLE' - Used to hide the title */ requestWindowFeature(Window.FEATURE_NO_TITLE); diff --git a/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java b/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java index 583ce88c0..146932084 100644 --- a/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java +++ b/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java @@ -14,6 +14,7 @@ import android.widget.Button; import com.timsu.astrid.R; import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.astrid.helper.TaskEditControlSet; +import com.todoroo.astrid.service.ThemeService; public abstract class PopupControlSet extends TaskEditControlSet { @@ -59,7 +60,8 @@ public abstract class PopupControlSet extends TaskEditControlSet { } protected Dialog buildDialog(int title, final DialogInterface.OnClickListener okListener, DialogInterface.OnCancelListener cancelListener) { - final Dialog d = new Dialog(activity, R.style.Theme_TEA_Dialog); + int theme = ThemeService.getDialogTheme(); + final Dialog d = new Dialog(activity, theme); if (title == 0) d.requestWindowFeature(Window.FEATURE_NO_TITLE); else