archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Lots more date picker polish, copy updates

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent 5d9598527c
commit ec57da2565
9 changed files with 50 additions and 32 deletions
Show Stats Download Patch File Download Diff File

31
astrid/res/layout/date_time_picker_no_shortcuts.xml
Unescape Escape View File

@ -11,22 +11,27 @@
android:layout_weight="100" android:layout_weight="100"
android:paddingLeft="10dip" android:paddingLeft="10dip"
android:paddingRight="10dip" android:paddingRight="10dip"
android:paddingTop="5dip" android:paddingTop="4dip"
android:paddingBottom="5dip"> android:paddingBottom="5dip">
<LinearLayout <LinearLayout
android:id="@+id/datetime_body" android:id="@+id/datetime_body"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent"> android:layout_height="fill_parent">
<LinearLayout <com.todoroo.astrid.ui.CalendarView
android:id="@+id/datetime_extras" android:id="@+id/calendar"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="250dip"
android:orientation="horizontal"/> android:layout_weight="1" />
<View
android:id="@+id/TEA_Separator"
android:layout_width="fill_parent"
android:layout_height="1px"
android:layout_marginBottom="1dip"
style="@style/TEA_Separator" />
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="3dip"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_weight="1"> android:layout_weight="1">
<LinearLayout <LinearLayout
@ -47,11 +52,17 @@
android:orientation="vertical"/> android:orientation="vertical"/>
</LinearLayout> </LinearLayout>
<com.todoroo.astrid.ui.CalendarView <View
android:id="@+id/calendar" android:id="@+id/TEA_Separator"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="250dip" android:layout_height="1px"
android:layout_weight="1" /> android:layout_marginTop="1dip"
style="@style/TEA_Separator" />
<LinearLayout
android:id="@+id/datetime_extras"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"/>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</merge> </merge>

2
astrid/res/layout/deadline_number_picker.xml
Unescape Escape View File

@ -37,7 +37,7 @@
android:gravity="center" android:gravity="center"
android:inputType="phone" android:inputType="phone"
android:textSize="30sp" android:textSize="30sp"
android:textColor="@color/task_edit_deadline_gray" android:textColor="?attr/asThemeTextColor"
android:background="@android:color/transparent" android:background="@android:color/transparent"
/> />
</LinearLayout> </LinearLayout>

14
astrid/res/values/strings-core.xml
Unescape Escape View File

@ -385,7 +385,7 @@
<string-array name="TEA_urgency"> <string-array name="TEA_urgency">
<!-- slide 19: urgency: labels for edit page. item #4 -> auto filled --> <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
<item>No deadline</item> <item>No date</item>
<item>Specific day</item> <item>Specific day</item>
<item>Today</item> <item>Today</item>
<item>Tomorrow</item> <item>Tomorrow</item>
@ -824,13 +824,13 @@
<!-- slide 36b --> <!-- slide 36b -->
<item>Day - Red</item> <item>Day - Red</item>
<!-- slide 36b --> <!-- slide 36b -->
<item>Baby Blue</item> <item>Sky blue</item>
<!-- slide 36c --> <!-- slide 36c -->
<item>Night</item> <item>Night</item>
<!-- slide 36d --> <!-- slide 36d -->
<item>Transparent (White Text)</item> <item>Transparent (white text)</item>
<!-- slide 36e --> <!-- slide 36e -->
<item>Transparent (Black Text)</item> <item>Transparent (black text)</item>
</string-array> </string-array>
<string-array name="EPr_themes_widget"> <string-array name="EPr_themes_widget">
@ -838,10 +838,10 @@
<item>Same as app</item> <item>Same as app</item>
<item>Day - Blue</item> <item>Day - Blue</item>
<item>Day - Red</item> <item>Day - Red</item>
<item>Baby Blue</item> <item>Sky blue</item>
<item>Night</item> <item>Night</item>
<item>Transparent (White Text)</item> <item>Transparent (white text)</item>
<item>Transparent (Black Text)</item> <item>Transparent (black text)</item>
<item>Old Style</item> <item>Old Style</item>
</string-array> </string-array>

2
astrid/res/values/strings-gcal.xml
Unescape Escape View File

@ -29,7 +29,7 @@
<!-- No calendar label (don't add option) --> <!-- No calendar label (don't add option) -->
<string name="gcal_TEA_nocal">Don\'t add</string> <string name="gcal_TEA_nocal">Don\'t add</string>
<string name="gcal_TEA_none_selected">Add to cal...</string> <string name="gcal_TEA_none_selected">To calendar?</string>
<string name="gcal_TEA_has_event">Cal event</string> <string name="gcal_TEA_has_event">Cal event</string>

2
astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java
Unescape Escape View File

@ -158,6 +158,6 @@ public class ABTests {
private void initialize() { private void initialize() {
addTest(AB_USE_DATE_SHORTCUTS, new int[] { 1, 1 }, addTest(AB_USE_DATE_SHORTCUTS, new int[] { 1, 1 },
new int[] { 1, 1 }, new String[] { "date-shortcuts-off", "date-shortcuts-on" }, true); //$NON-NLS-1$ //$NON-NLS-2$ new int[] { 1, 9 }, new String[] { "date-shortcuts-off", "date-shortcuts-on" }, true); //$NON-NLS-1$ //$NON-NLS-2$
} }
} }

2
astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java
Unescape Escape View File

@ -72,7 +72,7 @@ public class AstridTimePicker extends LinearLayout {
int onColorValue = r.getColor(onColor.data); int onColorValue = r.getColor(onColor.data);
int offColorValue = r.getColor(android.R.color.transparent); int offColorValue = r.getColor(android.R.color.transparent);
int borderColorValue = r.getColor(R.color.task_edit_deadline_gray); int borderColorValue = r.getColor(android.R.color.transparent);
int cornerRadius = (int) (5 * r.getDisplayMetrics().density); int cornerRadius = (int) (5 * r.getDisplayMetrics().density);
int strokeWidth = (int) (1 * r.getDisplayMetrics().density); int strokeWidth = (int) (1 * r.getDisplayMetrics().density);

15
astrid/src/com/todoroo/astrid/ui/CalendarView.java
Unescape Escape View File

@ -49,6 +49,7 @@ public class CalendarView extends View {
private Paint backgroundColorPaint; private Paint backgroundColorPaint;
private Paint monthCenterAlignLargePaint; private Paint monthCenterAlignLargePaint;
private Paint centerAlignPaint; private Paint centerAlignPaint;
private Paint rightAlignPaint;
private Paint todayCalendarPaint; private Paint todayCalendarPaint;
private Paint selectedCalendarPaint; private Paint selectedCalendarPaint;
private Paint dayPaint; private Paint dayPaint;
@ -140,6 +141,12 @@ public class CalendarView extends View {
centerAlignPaint.setTextAlign(Paint.Align.CENTER); centerAlignPaint.setTextAlign(Paint.Align.CENTER);
centerAlignPaint.setTextSize(TEXT_SIZE * density); centerAlignPaint.setTextSize(TEXT_SIZE * density);
rightAlignPaint = new Paint();
rightAlignPaint.setAntiAlias(true);
rightAlignPaint.setColor(r.getColor(R.color.task_edit_deadline_gray));
rightAlignPaint.setTextAlign(Paint.Align.RIGHT);
rightAlignPaint.setTextSize(TEXT_SIZE * density);
todayCalendarPaint = new Paint(); todayCalendarPaint = new Paint();
todayCalendarPaint.setAntiAlias(true); todayCalendarPaint.setAntiAlias(true);
todayCalendarPaint.setColor(r.getColor(R.color.task_edit_deadline_gray)); todayCalendarPaint.setColor(r.getColor(R.color.task_edit_deadline_gray));
@ -311,9 +318,9 @@ public class CalendarView extends View {
String day = DateUtils.getDayOfWeekString(dayOfWeek, DateUtils.LENGTH_SHORT); String day = DateUtils.getDayOfWeekString(dayOfWeek, DateUtils.LENGTH_SHORT);
calendar.add(Calendar.DATE, 1); calendar.add(Calendar.DATE, 1);
textX = dayLeft + boxWidth / 2; textX = dayLeft + boxWidth - TEXT_PADDING * 3;
textY = dayTop + (boxHeight - boxHeight/8) - TEXT_PADDING * 2; textY = dayTop + (boxHeight - boxHeight/8) - TEXT_PADDING * 2;
canvas.drawText(day, textX, textY, centerAlignPaint); canvas.drawText(day, textX, textY, rightAlignPaint);
dayLeft += boxWidth; dayLeft += boxWidth;
} }
@ -369,8 +376,8 @@ public class CalendarView extends View {
dayLeftArr[dayOfMonth-1] = dayLeft; dayLeftArr[dayOfMonth-1] = dayLeft;
dayTopArr[dayOfMonth-1] = dayTop; dayTopArr[dayOfMonth-1] = dayTop;
rectF.set(dayLeft, dayTop, dayLeft + boxWidth, dayTop + boxHeight); rectF.set(dayLeft, dayTop, dayLeft + boxWidth, dayTop + boxHeight);
if (j != 1) // if (j != 1)
canvas.drawLine(rectF.left, rectF.top, rectF.left, rectF.bottom, borderPaint); // canvas.drawLine(rectF.left, rectF.top, rectF.left, rectF.bottom, borderPaint);
rectF.set(dayLeft+1, dayTop, dayLeft + boxWidth - 1, dayTop + boxHeight); rectF.set(dayLeft+1, dayTop, dayLeft + boxWidth - 1, dayTop + boxHeight);
canvas.drawRoundRect(rectF, CURVE_RADIUS, CURVE_RADIUS, colorPaint); canvas.drawRoundRect(rectF, CURVE_RADIUS, CURVE_RADIUS, colorPaint);

8
astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java
Unescape Escape View File

@ -178,7 +178,7 @@ public class DateAndTimePicker extends LinearLayout {
int onColorValue = r.getColor(onColor.data); int onColorValue = r.getColor(onColor.data);
int offColorValue = r.getColor(android.R.color.transparent); int offColorValue = r.getColor(android.R.color.transparent);
int borderColorValue = r.getColor(R.color.task_edit_deadline_gray); int borderColorValue = r.getColor(android.R.color.transparent);
int cornerRadius = (int) (5 * r.getDisplayMetrics().density); int cornerRadius = (int) (5 * r.getDisplayMetrics().density);
int strokeWidth = (int) (1 * r.getDisplayMetrics().density); int strokeWidth = (int) (1 * r.getDisplayMetrics().density);
@ -193,18 +193,18 @@ public class DateAndTimePicker extends LinearLayout {
tb.setTag(uv); tb.setTag(uv);
if (i == 0) { if (i == 0) {
if (useShortcuts) if (useShortcuts)
tb.setBackgroundDrawable(CustomBorderDrawable.customButton(cornerRadius, cornerRadius, 0, 0, onColorValue, offColorValue, borderColorValue, strokeWidth)); tb.setBackgroundDrawable(CustomBorderDrawable.customButton(cornerRadius, cornerRadius, cornerRadius, cornerRadius, onColorValue, offColorValue, borderColorValue, strokeWidth));
else else
tb.setBackgroundDrawable(CustomBorderDrawable.customButton(cornerRadius, cornerRadius, cornerRadius, cornerRadius, onColorValue, offColorValue, borderColorValue, strokeWidth)); tb.setBackgroundDrawable(CustomBorderDrawable.customButton(cornerRadius, cornerRadius, cornerRadius, cornerRadius, onColorValue, offColorValue, borderColorValue, strokeWidth));
} else if (i == urgencyValues.size() - 2) { } else if (i == urgencyValues.size() - 2) {
lp.topMargin = (int) (-1 * metrics.density); lp.topMargin = (int) (-1 * metrics.density);
tb.setBackgroundDrawable(CustomBorderDrawable.customButton(0, 0, cornerRadius, cornerRadius, onColorValue, offColorValue, borderColorValue, strokeWidth)); tb.setBackgroundDrawable(CustomBorderDrawable.customButton(cornerRadius, cornerRadius, cornerRadius, cornerRadius, onColorValue, offColorValue, borderColorValue, strokeWidth));
} else if (i == urgencyValues.size() - 1) { } else if (i == urgencyValues.size() - 1) {
lp.topMargin = (int) (5 * metrics.density); lp.topMargin = (int) (5 * metrics.density);
tb.setBackgroundDrawable(CustomBorderDrawable.customButton(cornerRadius, cornerRadius, cornerRadius, cornerRadius, onColorValue, offColorValue, borderColorValue, strokeWidth)); tb.setBackgroundDrawable(CustomBorderDrawable.customButton(cornerRadius, cornerRadius, cornerRadius, cornerRadius, onColorValue, offColorValue, borderColorValue, strokeWidth));
} else { } else {
lp.topMargin = (int) (-1 * metrics.density); lp.topMargin = (int) (-1 * metrics.density);
tb.setBackgroundDrawable(CustomBorderDrawable.customButton(0, 0, 0, 0, onColorValue, offColorValue, borderColorValue, strokeWidth)); tb.setBackgroundDrawable(CustomBorderDrawable.customButton(cornerRadius, cornerRadius, cornerRadius, cornerRadius, onColorValue, offColorValue, borderColorValue, strokeWidth));
} }
int verticalPadding = (int) (SHORTCUT_PADDING * metrics.density); int verticalPadding = (int) (SHORTCUT_PADDING * metrics.density);
tb.setPadding(0, verticalPadding, 0, verticalPadding); tb.setPadding(0, verticalPadding, 0, verticalPadding);

Write Preview
Loading…
Cancel
Save