diff --git a/datetimepicker-library/res/color/date_picker_selector.xml b/datetimepicker-library/res/color/date_picker_selector.xml
index c0527c3..78f80f1 100644
--- a/datetimepicker-library/res/color/date_picker_selector.xml
+++ b/datetimepicker-library/res/color/date_picker_selector.xml
@@ -1,7 +1,7 @@
- - 0.82
- 0.85
- 0.16
diff --git a/datetimepicker-library/res/values/ids.xml b/datetimepicker-library/res/values/ids.xml
index 1f9fc29..b9274a7 100644
--- a/datetimepicker-library/res/values/ids.xml
+++ b/datetimepicker-library/res/values/ids.xml
@@ -1,6 +1,7 @@
- - false
+ - false
+ - false
- false
- false
- false
diff --git a/datetimepicker-library/res/values/strings.xml b/datetimepicker-library/res/values/strings.xml
index e442e83..70aeedc 100644
--- a/datetimepicker-library/res/values/strings.xml
+++ b/datetimepicker-library/res/values/strings.xml
@@ -1,6 +1,7 @@
- Done
+ OK
+ Cancel
Month grid of days
Year list
Select month and day
diff --git a/datetimepicker-library/res/values/styles.xml b/datetimepicker-library/res/values/styles.xml
index d6f6fb9..3994bf1 100644
--- a/datetimepicker-library/res/values/styles.xml
+++ b/datetimepicker-library/res/values/styles.xml
@@ -17,14 +17,26 @@
+
+
\ No newline at end of file
diff --git a/datetimepicker-library/src/com/fourmob/datetimepicker/date/DatePickerDialog.java b/datetimepicker-library/src/com/fourmob/datetimepicker/date/DatePickerDialog.java
index 1698147..e31eb76 100644
--- a/datetimepicker-library/src/com/fourmob/datetimepicker/date/DatePickerDialog.java
+++ b/datetimepicker-library/src/com/fourmob/datetimepicker/date/DatePickerDialog.java
@@ -1,6 +1,7 @@
package com.fourmob.datetimepicker.date;
import android.app.Activity;
+import android.content.Context;
import android.content.res.Resources;
import android.os.Bundle;
import android.os.SystemClock;
@@ -75,7 +76,6 @@ public class DatePickerDialog extends DialogFragment implements View.OnClickList
private TextView mDayOfWeekView;
private DayPickerView mDayPickerView;
- private Button mDoneButton;
private LinearLayout mMonthAndDayView;
private TextView mSelectedDayTextView;
private TextView mSelectedMonthTextView;
@@ -173,7 +173,7 @@ private void updateDisplay(boolean announce) {
this.mDayOfWeekView.setText(mDateFormatSymbols.getWeekdays()[this.mCalendar.get(Calendar.DAY_OF_WEEK)].toUpperCase(Locale.getDefault()));
}
- this.mSelectedMonthTextView.setText(mDateFormatSymbols.getMonths()[this.mCalendar.get(Calendar.MONTH)].toUpperCase(Locale.getDefault()));
+ this.mSelectedMonthTextView.setText(mDateFormatSymbols.getShortMonths()[this.mCalendar.get(Calendar.MONTH)].toUpperCase(Locale.getDefault()));
mSelectedDayTextView.setText(DAY_FORMAT.format(mCalendar.getTime()));
mYearView.setText(YEAR_FORMAT.format(mCalendar.getTime()));
@@ -239,7 +239,7 @@ public void onCreate(Bundle bundle) {
super.onCreate(bundle);
Activity activity = getActivity();
activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
- mVibrator = ((Vibrator) activity.getSystemService("vibrator"));
+ mVibrator = ((Vibrator) activity.getSystemService(Context.VIBRATOR_SERVICE));
if (bundle != null) {
mCalendar.set(Calendar.YEAR, bundle.getInt(KEY_SELECTED_YEAR));
mCalendar.set(Calendar.MONTH, bundle.getInt(KEY_SELECTED_MONTH));
@@ -296,12 +296,19 @@ public View onCreateView(LayoutInflater layoutInflater, ViewGroup parent, Bundle
outAlphaAnimation.setDuration(300L);
mAnimator.setOutAnimation(outAlphaAnimation);
- mDoneButton = ((Button) view.findViewById(R.id.done));
- mDoneButton.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
+ Button doneButton = ((Button) view.findViewById(R.id.done_button));
+ Button cancelButton = ((Button) view.findViewById(R.id.cancel_button));
+ doneButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
onDoneButtonClick();
- }
- });
+ }
+ });
+ cancelButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ dismiss();
+ }
+ });
updateDisplay(false);
setCurrentView(currentView, true);
@@ -321,7 +328,7 @@ private void onDoneButtonClick() {
tryVibrate();
if (mCallBack != null) {
mCallBack.onDateSet(this, mCalendar.get(Calendar.YEAR), mCalendar.get(Calendar.MONTH), mCalendar.get(Calendar.DAY_OF_MONTH));
-}
+ }
dismiss();
}
diff --git a/datetimepicker-library/src/com/fourmob/datetimepicker/date/SimpleMonthView.java b/datetimepicker-library/src/com/fourmob/datetimepicker/date/SimpleMonthView.java
index 9d7dbd9..e387167 100644
--- a/datetimepicker-library/src/com/fourmob/datetimepicker/date/SimpleMonthView.java
+++ b/datetimepicker-library/src/com/fourmob/datetimepicker/date/SimpleMonthView.java
@@ -130,7 +130,8 @@ private void drawMonthDayLabels(Canvas canvas) {
int calendarDay = (i + mWeekStart) % mNumDays;
int x = (2 * i + 1) * dayWidthHalf + mPadding;
mDayLabelCalendar.set(Calendar.DAY_OF_WEEK, calendarDay);
- canvas.drawText(mDateFormatSymbols.getShortWeekdays()[mDayLabelCalendar.get(Calendar.DAY_OF_WEEK)].toUpperCase(Locale.getDefault()), x, y, mMonthDayLabelPaint);
+ canvas.drawText(mDateFormatSymbols.getShortWeekdays()[mDayLabelCalendar
+ .get(Calendar.DAY_OF_WEEK)].toUpperCase(Locale.getDefault()).substring(0, 1), x, y, mMonthDayLabelPaint);
}
}
diff --git a/datetimepicker-library/src/com/sleepbot/datetimepicker/time/TimePickerDialog.java b/datetimepicker-library/src/com/sleepbot/datetimepicker/time/TimePickerDialog.java
index a186bf2..eb15bcf 100644
--- a/datetimepicker-library/src/com/sleepbot/datetimepicker/time/TimePickerDialog.java
+++ b/datetimepicker-library/src/com/sleepbot/datetimepicker/time/TimePickerDialog.java
@@ -78,8 +78,8 @@ public class TimePickerDialog extends DialogFragment implements RadialPickerLayo
private View mAmPmHitspace;
private RadialPickerLayout mTimePicker;
- private int mBlue;
- private int mBlack;
+ private int mWhite;
+ private int mUnfocusedWhite;
private String mAmText;
private String mPmText;
@@ -197,8 +197,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
mSelectHours = res.getString(R.string.select_hours);
mMinutePickerDescription = res.getString(R.string.minute_picker_description);
mSelectMinutes = res.getString(R.string.select_minutes);
- mBlue = res.getColor(R.color.blue);
- mBlack = res.getColor(R.color.numbers_text_color);
+ mWhite = res.getColor(R.color.white);
+ mUnfocusedWhite = res.getColor(R.color.transparent_white);
mHourView = (TextView) view.findViewById(R.id.hours);
mHourView.setOnKeyListener(keyboardListener);
@@ -264,6 +264,13 @@ public void onClick(View v) {
}
});
mDoneButton.setOnKeyListener(keyboardListener);
+
+ view.findViewById(R.id.cancel_button).setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ dismiss();
+ }
+ });
// Enable or disable the AM/PM view.
mAmPmHitspace = view.findViewById(R.id.ampm_hitspace);
@@ -440,8 +447,8 @@ private void setCurrentItemShowing(int index, boolean animateCircle, boolean del
labelToAnimate = mMinuteView;
}
- int hourColor = (index == HOUR_INDEX) ? mBlue : mBlack;
- int minuteColor = (index == MINUTE_INDEX) ? mBlue : mBlack;
+ int hourColor = (index == HOUR_INDEX) ? mWhite : mUnfocusedWhite;
+ int minuteColor = (index == MINUTE_INDEX) ? mWhite : mUnfocusedWhite;
mHourView.setTextColor(hourColor);
mMinuteView.setTextColor(minuteColor);
@@ -661,10 +668,10 @@ private void updateDisplay(boolean allowEmptyDisplay) {
String.format(minuteFormat, values[1]).replace(' ', mPlaceholderText);
mHourView.setText(hourStr);
mHourSpaceView.setText(hourStr);
- mHourView.setTextColor(mBlack);
+ mHourView.setTextColor(mUnfocusedWhite);
mMinuteView.setText(minuteStr);
mMinuteSpaceView.setText(minuteStr);
- mMinuteView.setTextColor(mBlack);
+ mMinuteView.setTextColor(mUnfocusedWhite);
if (!mIs24HourMode) {
updateAmPmDisplay(values[2]);
}