From 6d2181624a10e889af4637ead7100b05424add10 Mon Sep 17 00:00:00 2001 From: Daniel Tigse Date: Wed, 21 Jun 2017 17:47:25 -0500 Subject: [PATCH 1/4] support for setting current Time --- .idea/.name | 1 - .idea/compiler.xml | 2 +- .idea/gradle.xml | 8 +---- .idea/misc.xml | 18 +----------- .../com/criptext/example/MainActivity.java | 3 +- .../TimeDurationPicker.java | 29 ++++++++++++++++++- .../timedurationpicker/TimeWheel.java | 3 ++ .../config/PickerConfig.java | 3 ++ 8 files changed, 39 insertions(+), 28 deletions(-) delete mode 100644 .idea/.name diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index c0e35ee..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -TimeDurationPicker \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..9a8b7e5 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index 7e40dfc..95f0f03 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,26 +37,10 @@ - + - - - - - 1.7 - - - - - - - \ No newline at end of file diff --git a/example/src/main/java/com/criptext/example/MainActivity.java b/example/src/main/java/com/criptext/example/MainActivity.java index 0031d43..54c0f27 100644 --- a/example/src/main/java/com/criptext/example/MainActivity.java +++ b/example/src/main/java/com/criptext/example/MainActivity.java @@ -47,7 +47,7 @@ protected void onCreate(Bundle savedInstanceState) { .setCyclic(false) .setMinMillseconds(System.currentTimeMillis()) .setMaxMillseconds(System.currentTimeMillis() + tenYears) - .setCurrentMillseconds(System.currentTimeMillis()) + .setCurrentMillseconds(60000) .setThemeColor(ContextCompat.getColor(this, R.color.timepicker_dialog_bg)) .setType(Type.ALL) .setWheelItemTextNormalColor(getResources().getColor(R.color.timetimepicker_default_text_color)) @@ -92,6 +92,7 @@ protected void onCreate(Bundle savedInstanceState) { .setCallBack(this) .setMaxDay(24) .setWheelItemSelectorTextSize(16) + .setCurrentMillseconds(60000) .build(); } diff --git a/library/src/main/java/com/criptext/timedurationpicker/TimeDurationPicker.java b/library/src/main/java/com/criptext/timedurationpicker/TimeDurationPicker.java index 159cb8c..76e15d8 100644 --- a/library/src/main/java/com/criptext/timedurationpicker/TimeDurationPicker.java +++ b/library/src/main/java/com/criptext/timedurationpicker/TimeDurationPicker.java @@ -39,7 +39,12 @@ void initExpirationViews(View view) { RadioButton op2 = (RadioButton) view.findViewById(R.id.expiration_option_right); op2.setText(mPickerConfig.mExpirationOp2Label); - op1.toggle(); + if(choseRight){ + op2.toggle(); + } + else { + op1.toggle(); + } op1.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { choseRight = false; } @@ -99,6 +104,10 @@ public void setCallBack(OnDateSetListener listener) { mPickerConfig.mCallBack = listener; } + public void setExpirationOnSent() { + this.choseRight = true; + } + public static class Builder { PickerConfig mPickerConfig; @@ -178,7 +187,25 @@ public Builder setMaxMillseconds(long millseconds) { return this; } + public Builder setCurrentDay(int day) { + mPickerConfig.mCurrentDay = day; + return this; + } + + public Builder setCurrentHour(int hour) { + mPickerConfig.mCurrentHour = hour; + return this; + } + + public Builder setCurrentMinute(int minute) { + mPickerConfig.mCurrentMinute = minute; + return this; + } + public Builder setCurrentMillseconds(long millseconds) { + mPickerConfig.mCurrentDay = (int)(millseconds / TimeDuration.daysInMS); + mPickerConfig.mCurrentHour = (int)(millseconds / TimeDuration.hoursInMS); + mPickerConfig.mCurrentMinute = (int)(millseconds / TimeDuration.minutesInMS); mPickerConfig.mCurrentCalendar = new WheelCalendar(millseconds); return this; } diff --git a/library/src/main/java/com/criptext/timedurationpicker/TimeWheel.java b/library/src/main/java/com/criptext/timedurationpicker/TimeWheel.java index caaea96..9b909b4 100644 --- a/library/src/main/java/com/criptext/timedurationpicker/TimeWheel.java +++ b/library/src/main/java/com/criptext/timedurationpicker/TimeWheel.java @@ -130,16 +130,19 @@ void initMonth() { void initDay() { updateDays(); + day.setCurrentItem(mPickerConfig.mCurrentDay); day.setCyclic(mPickerConfig.cyclic); } void initHour() { updateHours(); + hour.setCurrentItem(mPickerConfig.mCurrentHour); hour.setCyclic(mPickerConfig.cyclic); } void initMinute() { updateMinutes(); + minute.setCurrentItem(mPickerConfig.mCurrentMinute); minute.setCyclic(mPickerConfig.cyclic); } diff --git a/library/src/main/java/com/criptext/timedurationpicker/config/PickerConfig.java b/library/src/main/java/com/criptext/timedurationpicker/config/PickerConfig.java index 230b4a0..bd74747 100644 --- a/library/src/main/java/com/criptext/timedurationpicker/config/PickerConfig.java +++ b/library/src/main/java/com/criptext/timedurationpicker/config/PickerConfig.java @@ -38,6 +38,9 @@ public class PickerConfig { public String mExpirationOp1Label = DefaultConfig.EXPIRATION_OPTION_1; public String mExpirationOp2Label = DefaultConfig.EXPIRATION_OPTION_2; + public int mCurrentDay = 0; + public int mCurrentHour = 0; + public int mCurrentMinute = 0; public int minDay = DefaultConfig.MIN_DAY; public int maxDay = DefaultConfig.MAX_DAY; From c5ca3918c47bda058a9f4a705129ac3dfd2302d1 Mon Sep 17 00:00:00 2001 From: Daniel Tigse Date: Thu, 22 Jun 2017 09:16:23 -0500 Subject: [PATCH 2/4] fix at setting current minutes and hours --- example/src/main/java/com/criptext/example/MainActivity.java | 3 +-- .../com/criptext/timedurationpicker/TimeDurationPicker.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/example/src/main/java/com/criptext/example/MainActivity.java b/example/src/main/java/com/criptext/example/MainActivity.java index 54c0f27..5488ba4 100644 --- a/example/src/main/java/com/criptext/example/MainActivity.java +++ b/example/src/main/java/com/criptext/example/MainActivity.java @@ -47,7 +47,6 @@ protected void onCreate(Bundle savedInstanceState) { .setCyclic(false) .setMinMillseconds(System.currentTimeMillis()) .setMaxMillseconds(System.currentTimeMillis() + tenYears) - .setCurrentMillseconds(60000) .setThemeColor(ContextCompat.getColor(this, R.color.timepicker_dialog_bg)) .setType(Type.ALL) .setWheelItemTextNormalColor(getResources().getColor(R.color.timetimepicker_default_text_color)) @@ -92,7 +91,7 @@ protected void onCreate(Bundle savedInstanceState) { .setCallBack(this) .setMaxDay(24) .setWheelItemSelectorTextSize(16) - .setCurrentMillseconds(60000) + .setCurrentMillseconds(259140000) .build(); } diff --git a/library/src/main/java/com/criptext/timedurationpicker/TimeDurationPicker.java b/library/src/main/java/com/criptext/timedurationpicker/TimeDurationPicker.java index 76e15d8..b25cec2 100644 --- a/library/src/main/java/com/criptext/timedurationpicker/TimeDurationPicker.java +++ b/library/src/main/java/com/criptext/timedurationpicker/TimeDurationPicker.java @@ -204,8 +204,8 @@ public Builder setCurrentMinute(int minute) { public Builder setCurrentMillseconds(long millseconds) { mPickerConfig.mCurrentDay = (int)(millseconds / TimeDuration.daysInMS); - mPickerConfig.mCurrentHour = (int)(millseconds / TimeDuration.hoursInMS); - mPickerConfig.mCurrentMinute = (int)(millseconds / TimeDuration.minutesInMS); + mPickerConfig.mCurrentHour = (int)(millseconds / TimeDuration.hoursInMS) % 24; + mPickerConfig.mCurrentMinute = (int)(millseconds / TimeDuration.minutesInMS) % 60; mPickerConfig.mCurrentCalendar = new WheelCalendar(millseconds); return this; } From 2cede273c263996a2b92771f8ea9e10c13048899 Mon Sep 17 00:00:00 2001 From: Daniel Tigse Date: Thu, 22 Jun 2017 09:43:13 -0500 Subject: [PATCH 3/4] save the current time at scrolling the pickers --- .idea/vcs.xml | 6 ++++++ .../java/com/criptext/timedurationpicker/TimeWheel.java | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 .idea/vcs.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/library/src/main/java/com/criptext/timedurationpicker/TimeWheel.java b/library/src/main/java/com/criptext/timedurationpicker/TimeWheel.java index 9b909b4..ec679d2 100644 --- a/library/src/main/java/com/criptext/timedurationpicker/TimeWheel.java +++ b/library/src/main/java/com/criptext/timedurationpicker/TimeWheel.java @@ -168,6 +168,8 @@ void updateDays() { PickerConstants.FORMAT, mPickerConfig.mDay); mDayAdapter.setConfig(mPickerConfig); day.setViewAdapter(mDayAdapter); + + mPickerConfig.mCurrentDay = getCurrentDay(); } void updateHours() { @@ -181,6 +183,8 @@ void updateHours() { PickerConstants.FORMAT, mPickerConfig.mHour); mHourAdapter.setConfig(mPickerConfig); hour.setViewAdapter(mHourAdapter); + + mPickerConfig.mCurrentHour= getCurrentHour(); } void updateMinutes() { @@ -194,6 +198,8 @@ void updateMinutes() { PickerConstants.FORMAT, mPickerConfig.mMinute); mMinuteAdapter.setConfig(mPickerConfig); minute.setViewAdapter(mMinuteAdapter); + + mPickerConfig.mCurrentMinute = getCurrentMinute(); } public int getCurrentYear() { From 666457c1c55203e365367b1cc9241f6f3693ea68 Mon Sep 17 00:00:00 2001 From: Daniel Tigse Date: Thu, 22 Jun 2017 10:13:11 -0500 Subject: [PATCH 4/4] removed breaking lines --- .../java/com/criptext/timedurationpicker/TimeWheel.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/library/src/main/java/com/criptext/timedurationpicker/TimeWheel.java b/library/src/main/java/com/criptext/timedurationpicker/TimeWheel.java index ec679d2..9b909b4 100644 --- a/library/src/main/java/com/criptext/timedurationpicker/TimeWheel.java +++ b/library/src/main/java/com/criptext/timedurationpicker/TimeWheel.java @@ -168,8 +168,6 @@ void updateDays() { PickerConstants.FORMAT, mPickerConfig.mDay); mDayAdapter.setConfig(mPickerConfig); day.setViewAdapter(mDayAdapter); - - mPickerConfig.mCurrentDay = getCurrentDay(); } void updateHours() { @@ -183,8 +181,6 @@ void updateHours() { PickerConstants.FORMAT, mPickerConfig.mHour); mHourAdapter.setConfig(mPickerConfig); hour.setViewAdapter(mHourAdapter); - - mPickerConfig.mCurrentHour= getCurrentHour(); } void updateMinutes() { @@ -198,8 +194,6 @@ void updateMinutes() { PickerConstants.FORMAT, mPickerConfig.mMinute); mMinuteAdapter.setConfig(mPickerConfig); minute.setViewAdapter(mMinuteAdapter); - - mPickerConfig.mCurrentMinute = getCurrentMinute(); } public int getCurrentYear() {