Skip to content

Commit 5ec5c3e

Browse files
committed
pull request #32 Merge branch 'nitin3210-master' into develop
2 parents 87a4bdd + 12fb087 commit 5ec5c3e

File tree

4 files changed

+22
-6
lines changed

4 files changed

+22
-6
lines changed

ReadMe.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111

1212
Donations will be used to create free and open source applications.
1313

14-
[![Donation Paypal](https://4.bp.blogspot.com/-ncaIbUGaHOk/WfhaThYUPGI/AAAAAAAAAVQ/_HidNgdB1q4DaC24ujaKNzH64KUUJiQewCLcBGAs/s1600/pay-with-paypal.png "")](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KM6QMDAXZM3UU "Kunzisoft Paypal Donation")
14+
[![Donation Paypal](https://4.bp.blogspot.com/-ncaIbUGaHOk/WfhaThYUPGI/AAAAAAAAAVQ/_HidNgdB1q4DaC24ujaKNzH64KUUJiQewCLcBGAs/s1600/pay-with-paypal.png)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KM6QMDAXZM3UU "Kunzisoft Paypal Donation")
1515

16-
[![Donation Streamlabs](https://lh3.googleusercontent.com/d1aTMwN6NMJmcMdsz24h_J4JmH5aZ9lhbJdZWQ3VFne3VZxiUVPrYZ41qm1Zig2ha4lU4Wg_BSAE_w=w1920-h1200-no "")](https://youtube.streamlabs.com/UC_U4icXPFfgKo4IDSTSzBEQ "Kunzisoft Streamlabs Donation")
16+
<a href="bitcoin:1DSwXCk7Sob24sNsofywNoRQw2f5Qj5t2F"><img src="https://2.bp.blogspot.com/-K7-LKnSZd7c/WkvIKpLdmKI/AAAAAAAAAVs/-5LTimDq5IURMHwMmEP5VPTT53b2EUsswCLcBGAs/s1600/donate-with-bitcoin.png" alt="Kunzisoft Bitcoin" />Bitcoin wallet address : 1DSwXCk7Sob24sNsofywNoRQw2f5Qj5t2F</a>
1717

18-
[![Donation Liberapay](https://liberapay.com/assets/widgets/donate.svg "")](https://liberapay.com/Kunzisoft/donate "Kunzisoft Liberapay Donation")
18+
[![Donation Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/Kunzisoft/donate "Kunzisoft Liberapay Donation")
1919

2020
## Installation
2121
Add the JitPack repository in your build.gradle at the end of repositories:

switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ public void onDateSelected(@NonNull MaterialCalendarView widget, @NonNull Calend
273273
listPickerYearView.assignCurrentYear(calendarDay.getYear());
274274
yearHeaderValues.setText(yearSimpleDate.format(dateTimeCalendar.getTime()));
275275
monthAndDayHeaderValues.setText(dayAndMonthSimpleDate.format(currentDate));
276+
timePicker.clickHour();
276277
}
277278
});
278279
materialCalendarView.invalidate();

switchdatetime/src/main/java/com/kunzisoft/switchdatetime/time/SwitchTimePicker.java

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@ public class SwitchTimePicker implements RadialPickerLayout.OnValueSelectedListe
108108
// Enable/Disable Vibrations
109109
private boolean mVibrate = true;
110110

111+
private boolean isSelected = false;
112+
113+
111114
public SwitchTimePicker(Context context, OnTimeSelectedListener callback) {
112115
mContext = context;
113116
onTimeSelectedListener = callback;
@@ -236,7 +239,11 @@ public void onClick(View v) {
236239
mMinuteView.setOnClickListener(new OnClickListener() {
237240
@Override
238241
public void onClick(View v) {
239-
// TODO bug
242+
//if user click minute first then we ask user to select the Hours first.
243+
if(!isSelected){
244+
clickHour();
245+
return;
246+
}
240247
setCurrentItemShowing(MINUTE_INDEX, true, false, true);
241248
mTimePicker.tryVibrate();
242249
if(onClickTimeListener != null)
@@ -910,6 +917,14 @@ public void setFirstViewShow(int viewIndex) {
910917
mCurrentViewShow = viewIndex;
911918
}
912919

920+
public void clickHour() {
921+
isSelected = true;
922+
setCurrentItemShowing(HOUR_INDEX, true, false, true);
923+
mTimePicker.tryVibrate();
924+
if(onClickTimeListener != null)
925+
onClickTimeListener.onClick(mHourView);
926+
}
927+
913928
/**
914929
* Simple node class to be used for traversal to check for legal times.
915930
* mLegalKeys represents the keys that can be typed to get to the node.

switchdatetime/src/main/res/values/dimens.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<dimen name="time_label_text">24sp</dimen>
99
<dimen name="time_label_AmPm">12sp</dimen>
1010
<dimen name="time_label_height">32dip</dimen>
11-
<dimen name="time_label_width">128dip</dimen>
12-
<dimen name="time_label_min_width">170dp</dimen>
11+
<dimen name="time_label_width">150dip</dimen>
12+
<dimen name="time_label_min_width">180dp</dimen>
1313
<dimen name="ampm_label_size">16sp</dimen>
1414
<dimen name="ampm_left_padding">6dip</dimen>
1515
<dimen name="extra_time_label_margin">-30dp</dimen>

0 commit comments

Comments
 (0)