From 0e6bac33a7e8e9a86cc777f09eccf0126becd931 Mon Sep 17 00:00:00 2001 From: "cwz.scardigno@gmail.com" Date: Wed, 3 Dec 2014 16:25:15 +0100 Subject: [PATCH 1/3] Add compatibility to Android 2.1 --- build.gradle | 2 +- datetimepicker-library/build.gradle | 2 +- .../drawable/list_item_background_pressed.xml | 10 ++++++++++ .../drawable/list_item_background_standard.xml | 9 +++++++++ .../list_selector_background_disabled.xml | 10 ++++++++++ .../list_selector_background_focused.xml | 9 +++++++++ .../list_selector_background_transition.xml | 5 +++++ .../res/drawable/selected_item_background.xml | 14 ++++++++++++++ datetimepicker-library/res/values-v9/styles.xml | 14 ++++++++++++++ datetimepicker-library/res/values/colors.xml | 16 ++++++++++++++++ gradle/wrapper/gradle-wrapper.properties | 4 ++-- 11 files changed, 91 insertions(+), 4 deletions(-) create mode 100644 datetimepicker-library/res/drawable/list_item_background_pressed.xml create mode 100644 datetimepicker-library/res/drawable/list_item_background_standard.xml create mode 100644 datetimepicker-library/res/drawable/list_selector_background_disabled.xml create mode 100644 datetimepicker-library/res/drawable/list_selector_background_focused.xml create mode 100644 datetimepicker-library/res/drawable/list_selector_background_transition.xml create mode 100644 datetimepicker-library/res/drawable/selected_item_background.xml create mode 100644 datetimepicker-library/res/values-v9/styles.xml diff --git a/build.gradle b/build.gradle index 1a9a22e..51f58c5 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.12.2' + classpath 'com.android.tools.build:gradle:1.0.0-rc1' } } diff --git a/datetimepicker-library/build.gradle b/datetimepicker-library/build.gradle index 09c02e0..cf02542 100644 --- a/datetimepicker-library/build.gradle +++ b/datetimepicker-library/build.gradle @@ -6,7 +6,7 @@ repositories { dependencies { compile 'com.nineoldandroids:library:2.4.0' - compile 'com.android.support:support-v4:20.0.0' + compile 'com.android.support:support-v4:21.0.2' } android { diff --git a/datetimepicker-library/res/drawable/list_item_background_pressed.xml b/datetimepicker-library/res/drawable/list_item_background_pressed.xml new file mode 100644 index 0000000..99d3813 --- /dev/null +++ b/datetimepicker-library/res/drawable/list_item_background_pressed.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/datetimepicker-library/res/drawable/list_item_background_standard.xml b/datetimepicker-library/res/drawable/list_item_background_standard.xml new file mode 100644 index 0000000..a72d1f3 --- /dev/null +++ b/datetimepicker-library/res/drawable/list_item_background_standard.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/datetimepicker-library/res/drawable/list_selector_background_disabled.xml b/datetimepicker-library/res/drawable/list_selector_background_disabled.xml new file mode 100644 index 0000000..a2285bc --- /dev/null +++ b/datetimepicker-library/res/drawable/list_selector_background_disabled.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/datetimepicker-library/res/drawable/list_selector_background_focused.xml b/datetimepicker-library/res/drawable/list_selector_background_focused.xml new file mode 100644 index 0000000..2c15736 --- /dev/null +++ b/datetimepicker-library/res/drawable/list_selector_background_focused.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/datetimepicker-library/res/drawable/list_selector_background_transition.xml b/datetimepicker-library/res/drawable/list_selector_background_transition.xml new file mode 100644 index 0000000..acad8f9 --- /dev/null +++ b/datetimepicker-library/res/drawable/list_selector_background_transition.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/datetimepicker-library/res/drawable/selected_item_background.xml b/datetimepicker-library/res/drawable/selected_item_background.xml new file mode 100644 index 0000000..2e6d629 --- /dev/null +++ b/datetimepicker-library/res/drawable/selected_item_background.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/datetimepicker-library/res/values-v9/styles.xml b/datetimepicker-library/res/values-v9/styles.xml new file mode 100644 index 0000000..cc5806a --- /dev/null +++ b/datetimepicker-library/res/values-v9/styles.xml @@ -0,0 +1,14 @@ + + + + \ No newline at end of file diff --git a/datetimepicker-library/res/values/colors.xml b/datetimepicker-library/res/values/colors.xml index 8728710..aeff98b 100644 --- a/datetimepicker-library/res/values/colors.xml +++ b/datetimepicker-library/res/values/colors.xml @@ -17,4 +17,20 @@ #aaffffff #7F000000 + + #FFFFF8EB + #FFFFF8EB + #FF444444 + + #FFFFA500 + #FFCD8500 + #FF282828 + + #FFEEEEEE + #FFBBBBBB + #FFFFFFFF + #FFFFF3DF + #FFFFFFFF + #FFDDDDDD + #FFCCCCCC diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f7a012..382da59 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Sep 02 21:48:24 CEST 2014 +#Wed Dec 03 16:20:59 CET 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip From 232c0d2a3fa8ef05ed21b0da62935163871a7f98 Mon Sep 17 00:00:00 2001 From: croccio Date: Wed, 3 Dec 2014 16:38:59 +0100 Subject: [PATCH 2/3] Updated README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fa6933d..1e1f1f2 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +FORK COMPATIBLE FROM ANDROID 2.3 WITH MATERIAL DESIGN (maybe 2.1, i can't try it on 2.1 device) + Official source: https://android.googlesource.com/platform/frameworks/opt/datetimepicker/ @@ -7,8 +9,6 @@ https://android.googlesource.com/platform/frameworks/opt/datetimepicker/ DateTimePicker is a library which contains the beautiful DatePicker and TimePicker that can be seen in the new Google Agenda app. -**This picker is available for 2.1+** - You have a recurrence picker in the same style [here](https://github.com/Shusshu/Android-RecurrencePicker). ## WARNING From 5b650902306cd6b4e9450ffb1df6bb675ecdc84a Mon Sep 17 00:00:00 2001 From: "cwz.scardigno@gmail.com" Date: Wed, 3 Dec 2014 17:06:30 +0100 Subject: [PATCH 3/3] Adjust timePickerView. It cut half buttons at the end --- datetimepicker-library/res/drawable/material_button.xml | 7 +++++++ datetimepicker-library/res/layout/date_picker_dialog.xml | 2 +- datetimepicker-library/res/layout/picker_done_button.xml | 5 +++-- datetimepicker-library/res/layout/time_picker_dialog.xml | 4 +--- datetimepicker-library/res/values/colors.xml | 1 + 5 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 datetimepicker-library/res/drawable/material_button.xml diff --git a/datetimepicker-library/res/drawable/material_button.xml b/datetimepicker-library/res/drawable/material_button.xml new file mode 100644 index 0000000..07fe41b --- /dev/null +++ b/datetimepicker-library/res/drawable/material_button.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/datetimepicker-library/res/layout/date_picker_dialog.xml b/datetimepicker-library/res/layout/date_picker_dialog.xml index a593630..05bc7f8 100644 --- a/datetimepicker-library/res/layout/date_picker_dialog.xml +++ b/datetimepicker-library/res/layout/date_picker_dialog.xml @@ -1,6 +1,6 @@ + xmlns:android="http://schemas.android.com/apk/res/android" > diff --git a/datetimepicker-library/res/layout/picker_done_button.xml b/datetimepicker-library/res/layout/picker_done_button.xml index f43b1b2..7f1dbfc 100644 --- a/datetimepicker-library/res/layout/picker_done_button.xml +++ b/datetimepicker-library/res/layout/picker_done_button.xml @@ -1,6 +1,5 @@ - @@ -28,6 +28,7 @@ android:layout_alignParentRight="true" android:layout_margin="@dimen/view_margin_medium" android:layout_width="wrap_content" + android:background="@drawable/material_button" android:layout_height="wrap_content" android:text="@string/done_label" style="@style/button_bar_button" /> diff --git a/datetimepicker-library/res/layout/time_picker_dialog.xml b/datetimepicker-library/res/layout/time_picker_dialog.xml index 10c91cd..b139714 100644 --- a/datetimepicker-library/res/layout/time_picker_dialog.xml +++ b/datetimepicker-library/res/layout/time_picker_dialog.xml @@ -39,7 +39,5 @@ android:layout_gravity="center" android:focusable="true" android:focusableInTouchMode="true" /> - + diff --git a/datetimepicker-library/res/values/colors.xml b/datetimepicker-library/res/values/colors.xml index aeff98b..27a8bd8 100644 --- a/datetimepicker-library/res/values/colors.xml +++ b/datetimepicker-library/res/values/colors.xml @@ -26,6 +26,7 @@ #FFCD8500 #FF282828 + #E0E0E0 #FFEEEEEE #FFBBBBBB #FFFFFFFF