Merge pull request #1 from wdullaer/master

Merge from Origin
mohsenjahani · Jun 5, 2019 · d1e660c · d1e660c
2 parents b36aa00 + 059aae8
commit d1e660c
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ Date Picker | Time Picker
  The easiest way to add the Material DateTime Picker library to your project is by adding it as a dependency to your `build.gradle`
 ```groovy
 dependencies {
-    implementation 'com.wdullaer:materialdatetimepicker:4.2.0'
+    implementation 'com.wdullaer:materialdatetimepicker:4.2.1'
 }
 ```
 
@@ -243,7 +243,7 @@ This library depends on some androidx support libraries. Because the jvm allows
 Using the following snippet in your apps `build.gradle` file you can exclude this library's transitive appcompat library dependency from being installed.
 
 ```groovy
-implementation ('com.wdullaer:materialdatetimepicker:4.2.0') {
+implementation ('com.wdullaer:materialdatetimepicker:4.2.1') {
         exclude group: 'androidx.appcompat'
         exclude group: 'androidx.recyclerview'
 }

diff --git a/README_ES.md b/README_ES.md
@@ -42,7 +42,7 @@ Selector de fecha | Selector de tiempo
     La forma más fácil de agregar a la Biblioteca la _Material DateTime Picker_ a su proyecto es agregarla como una dependencia `build.gradle`
     ```groovy
     a sus dependencias{
-        implementation 'com.wdullaer:materialdatetimepicker:4.2.0'
+        implementation 'com.wdullaer:materialdatetimepicker:4.2.1'
 }
 ```
 
@@ -244,7 +244,7 @@ puede desactivar la carga de la biblioteca de soporte para MaterialDateTimePicke
 Usando el siguiente fragmento en el archivo `build.gradle` de su aplicación, puede excluir la posibilidad de que se instale la biblioteca de soporte transitivo de esta biblioteca.
 
 ```groovy
-implementation ('com.wdullaer:materialdatetimepicker:4.2.0') {
+implementation ('com.wdullaer:materialdatetimepicker:4.2.1') {
         exclude group: 'androidx.appcompat'
         exclude group: 'androidx.recyclerview'
 }

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:3.4.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle.properties b/gradle.properties
@@ -16,8 +16,8 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME=4.2.0
-VERSION_CODE=51
+VERSION_NAME=4.2.1
+VERSION_CODE=52
 GROUP=com.wdullaer
 
 ANDROID_BUILD_MIN_SDK_VERSION=16

diff --git a/library/build.gradle b/library/build.gradle
@@ -37,8 +37,8 @@ dependencies {
     testImplementation 'com.pholser:junit-quickcheck-core:0.7'
     testImplementation 'com.pholser:junit-quickcheck-generators:0.7'
 
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test:rules:1.1.1'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test:rules:1.2.0'
 }
 
 apply from: 'gradle-mvn-push.gradle'
diff --git a/library/src/main/java/com/wdullaer/materialdatetimepicker/date/DatePickerDialog.java b/library/src/main/java/com/wdullaer/materialdatetimepicker/date/DatePickerDialog.java
@@ -256,6 +256,7 @@ public void onCreate(Bundle savedInstanceState) {
         final Activity activity = requireActivity();
         activity.getWindow().setSoftInputMode(
                 WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+        setStyle(AppCompatDialogFragment.STYLE_NO_TITLE, 0);
         mCurrentView = UNINITIALIZED;
         if (savedInstanceState != null) {
             mCalendar.set(Calendar.YEAR, savedInstanceState.getInt(KEY_SELECTED_YEAR));

diff --git a/library/src/main/java/com/wdullaer/materialdatetimepicker/time/TimePickerDialog.java b/library/src/main/java/com/wdullaer/materialdatetimepicker/time/TimePickerDialog.java
@@ -631,6 +631,7 @@ public void setLocale(Locale locale) {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setStyle(AppCompatDialogFragment.STYLE_NO_TITLE, 0);
         if (savedInstanceState != null && savedInstanceState.containsKey(KEY_INITIAL_TIME)
                     && savedInstanceState.containsKey(KEY_IS_24_HOUR_VIEW)) {
             mInitialTime = savedInstanceState.getParcelable(KEY_INITIAL_TIME);
@@ -671,7 +672,6 @@ affect the behaviour of the picker (in the unlikely event the user reconfigures
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
-
         int viewRes = mVersion == Version.VERSION_1 ? R.layout.mdtp_time_picker_dialog : R.layout.mdtp_time_picker_dialog_v2;
         View view = inflater.inflate(viewRes, container,false);
         KeyboardListener keyboardListener = new KeyboardListener();