Skip to content

Commit a45645e

Browse files
committed
feat: use default Android TimePicker and DatePicker, support 24-hour time
1 parent 7f0987d commit a45645e

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ dependencies {
8989
compile 'com.android.support:support-vector-drawable:26.0.1'
9090
compile 'com.android.support:preference-v7:26.0.1'
9191
compile 'com.android.support:preference-v14:26.0.1'
92-
compile 'com.wdullaer:materialdatetimepicker:3.2.2'
9392
testCompile 'junit:junit:4.12'
9493
}
9594

app/src/main/java/tech/akpmakes/android/taskkeeper/TaskViewActivity.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package tech.akpmakes.android.taskkeeper;
22

33
import android.app.Activity;
4+
import android.app.DatePickerDialog;
5+
import android.app.TimePickerDialog;
46
import android.content.Intent;
57
import android.os.Bundle;
68
import android.os.Handler;
@@ -11,14 +13,11 @@
1113
import android.view.MenuItem;
1214
import android.view.View;
1315
import android.view.WindowManager;
14-
import android.widget.Button;
1516
import android.widget.CheckBox;
16-
import android.widget.CompoundButton;
17+
import android.widget.DatePicker;
1718
import android.widget.EditText;
1819
import android.widget.TextView;
19-
20-
import com.wdullaer.materialdatetimepicker.date.DatePickerDialog;
21-
import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
20+
import android.widget.TimePicker;
2221

2322
import java.text.DateFormat;
2423
import java.text.SimpleDateFormat;
@@ -74,28 +73,29 @@ public void run() {
7473
@Override
7574
public void onClick(View view) {
7675
Calendar now = whenTime;
77-
DatePickerDialog datePicker = DatePickerDialog.newInstance(
76+
DatePickerDialog datePicker = new DatePickerDialog(
77+
TaskViewActivity.this,
7878
TaskViewActivity.this,
7979
now.get(Calendar.YEAR),
8080
now.get(Calendar.MONTH),
81-
now.get(Calendar.DAY_OF_MONTH));
82-
datePicker.show(getFragmentManager(), "DatePickerDialog");
81+
now.get(Calendar.DAY_OF_MONTH)
82+
);
83+
datePicker.show();
8384
}
8485
});
8586

8687
taskTime.setOnClickListener(new View.OnClickListener() {
8788
@Override
8889
public void onClick(View view) {
8990
Calendar now = whenTime;
90-
TimePickerDialog timePicker = TimePickerDialog.newInstance(
91+
TimePickerDialog timePicker = new TimePickerDialog(
92+
TaskViewActivity.this,
9193
TaskViewActivity.this,
9294
now.get(Calendar.HOUR_OF_DAY),
9395
now.get(Calendar.MINUTE),
94-
now.get(Calendar.SECOND),
95-
false
96+
android.text.format.DateFormat.is24HourFormat(TaskViewActivity.this)
9697
);
97-
timePicker.enableSeconds(true);
98-
timePicker.show(getFragmentManager(), "TimePickerDialog");
98+
timePicker.show();
9999
}
100100
});
101101

@@ -146,7 +146,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
146146

147147

148148
@Override
149-
public void onDateSet(DatePickerDialog view, int year, int monthOfYear, int dayOfMonth) {
149+
public void onDateSet(DatePicker datePicker, int year, int monthOfYear, int dayOfMonth) {
150150
whenTime.set(Calendar.YEAR, year);
151151
whenTime.set(Calendar.MONTH, monthOfYear);
152152
whenTime.set(Calendar.DAY_OF_MONTH, dayOfMonth);
@@ -157,10 +157,10 @@ public void onDateSet(DatePickerDialog view, int year, int monthOfYear, int dayO
157157
}
158158

159159
@Override
160-
public void onTimeSet(TimePickerDialog view, int hourOfDay, int minute, int second) {
160+
public void onTimeSet(TimePicker timePicker, int hourOfDay, int minute) {
161161
whenTime.set(Calendar.HOUR_OF_DAY, hourOfDay);
162162
whenTime.set(Calendar.MINUTE, minute);
163-
whenTime.set(Calendar.SECOND, second);
163+
whenTime.set(Calendar.SECOND, 0);
164164

165165
useCurrentTime.setChecked(false);
166166

0 commit comments

Comments
 (0)