From a8258b381ae9aab74211b7f69dc3bc295a6a78a5 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Wed, 1 Feb 2017 02:19:25 +0100 Subject: [PATCH 1/6] Update gradle and applicationId --- sample/build.gradle | 4 ++-- sample/src/main/AndroidManifest.xml | 5 +++-- sample/src/main/res/values/styles.xml | 4 ++++ switchdatetime/build.gradle | 5 ++--- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/sample/build.gradle b/sample/build.gradle index 120eab9..d6f8949 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -4,7 +4,7 @@ android { compileSdkVersion 25 buildToolsVersion "25.0.2" defaultConfig { - applicationId "com.satanasoft.switchdatetimepicker" + applicationId "com.kunzisoft.switchdatetimepicker.sample" minSdkVersion 15 targetSdkVersion 25 versionCode 1 @@ -24,7 +24,7 @@ dependencies { androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:25.1.0' + compile 'com.android.support:appcompat-v7:25.1.1' testCompile 'junit:junit:4.12' compile project(path: ':switchdatetime') } diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index 8efba52..5e697ce 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -7,10 +7,11 @@ android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:theme="@style/MyAppCustomTheme" + android:theme="@style/AppTheme.NoActionbar" android:supportsRtl="true"> + android:name="com.kunzisoft.switchdatetimesample.Sample" + android:theme="@style/Theme.AppCompat"> diff --git a/sample/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml index 4430086..e182557 100644 --- a/sample/src/main/res/values/styles.xml +++ b/sample/src/main/res/values/styles.xml @@ -1,4 +1,8 @@ + + + @@ -38,7 +38,7 @@ @@ -50,7 +50,7 @@ @@ -62,7 +62,7 @@ diff --git a/switchdatetime/src/main/res/values-xhdpi/dimens.xml b/switchdatetime/src/main/res/values-xhdpi/dimens.xml index 92ff557..500467e 100644 --- a/switchdatetime/src/main/res/values-xhdpi/dimens.xml +++ b/switchdatetime/src/main/res/values-xhdpi/dimens.xml @@ -2,15 +2,12 @@ 300dp + + 264dp + 302dp + + 192dp + 220dp - 38dp - 16dp - 16dp - 32dp - 32dp - 22dp - 22dp - 24dp - - 28dp + 28dp \ No newline at end of file diff --git a/switchdatetime/src/main/res/values/dimens.xml b/switchdatetime/src/main/res/values/dimens.xml index 0089996..3138efb 100644 --- a/switchdatetime/src/main/res/values/dimens.xml +++ b/switchdatetime/src/main/res/values/dimens.xml @@ -3,7 +3,10 @@ 200dp + 18sp + 24sp + 12sp 32dip 128dip 170dp @@ -12,21 +15,23 @@ -30dp 4dip + 16sp + 26sp + 64dip 320dp - 54dp - 18dp - 18dp - 54dp - 62dp - 0dp - 0dp - 62dp + + + 340dp + 390dp + + 190dp + 220dp - 24dp + 24dp 270dip diff --git a/switchdatetime/src/main/res/values/styles.xml b/switchdatetime/src/main/res/values/styles.xml index 18941fc..0483596 100644 --- a/switchdatetime/src/main/res/values/styles.xml +++ b/switchdatetime/src/main/res/values/styles.xml @@ -15,7 +15,7 @@ @@ -44,7 +44,7 @@ @@ -56,7 +56,7 @@ @@ -68,7 +68,7 @@ From ec1c6e5526006e4e8a0a04ba74487ececf45e5de Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Mon, 27 Mar 2017 23:08:09 +0200 Subject: [PATCH 5/6] Change name for issue #16 --- sample/src/main/AndroidManifest.xml | 2 +- sample/src/main/res/values/strings.xml | 2 +- switchdatetime/src/main/AndroidManifest.xml | 1 - switchdatetime/src/main/res/values/strings.xml | 3 --- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index af2ede6..6242e00 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -6,7 +6,7 @@ - Switch DateTime Picker + Switch DateTime Picker Open DateTime Dialog diff --git a/switchdatetime/src/main/AndroidManifest.xml b/switchdatetime/src/main/AndroidManifest.xml index 40503df..aaaa886 100644 --- a/switchdatetime/src/main/AndroidManifest.xml +++ b/switchdatetime/src/main/AndroidManifest.xml @@ -3,7 +3,6 @@ diff --git a/switchdatetime/src/main/res/values/strings.xml b/switchdatetime/src/main/res/values/strings.xml index 8b6032e..99965a0 100644 --- a/switchdatetime/src/main/res/values/strings.xml +++ b/switchdatetime/src/main/res/values/strings.xml @@ -1,6 +1,4 @@ - Switch DateTime Picker - yyyy-MM-dd \'at\' HH:mm @@ -13,7 +11,6 @@ Image datetime - Hours circular slider Select hours Minutes circular slider From e68ed98f650dac7c321221ddcb336ed9e62e3777 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Tue, 28 Mar 2017 00:00:09 +0200 Subject: [PATCH 6/6] Add RTL format --- .../dialog_switch_datetime_picker.xml | 146 ++++++++++++++++++ .../dialog_switch_datetime_picker.xml | 140 +++++++++++++++++ .../layout-ldrtl-v17/time_header_label.xml | 117 ++++++++++++++ 3 files changed, 403 insertions(+) create mode 100644 switchdatetime/src/main/res/layout-ldrtl-land-v17/dialog_switch_datetime_picker.xml create mode 100644 switchdatetime/src/main/res/layout-ldrtl-v17/dialog_switch_datetime_picker.xml create mode 100644 switchdatetime/src/main/res/layout-ldrtl-v17/time_header_label.xml diff --git a/switchdatetime/src/main/res/layout-ldrtl-land-v17/dialog_switch_datetime_picker.xml b/switchdatetime/src/main/res/layout-ldrtl-land-v17/dialog_switch_datetime_picker.xml new file mode 100644 index 0000000..90e9e92 --- /dev/null +++ b/switchdatetime/src/main/res/layout-ldrtl-land-v17/dialog_switch_datetime_picker.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/switchdatetime/src/main/res/layout-ldrtl-v17/dialog_switch_datetime_picker.xml b/switchdatetime/src/main/res/layout-ldrtl-v17/dialog_switch_datetime_picker.xml new file mode 100644 index 0000000..c276bc8 --- /dev/null +++ b/switchdatetime/src/main/res/layout-ldrtl-v17/dialog_switch_datetime_picker.xml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/switchdatetime/src/main/res/layout-ldrtl-v17/time_header_label.xml b/switchdatetime/src/main/res/layout-ldrtl-v17/time_header_label.xml new file mode 100644 index 0000000..d9b44a7 --- /dev/null +++ b/switchdatetime/src/main/res/layout-ldrtl-v17/time_header_label.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file