Merge branch 'develop' into YahiaAngelo-master

Kunzisoft · Sep 7, 2021 · cfe6b0c · cfe6b0c
2 parents d9ddf1e + 60263ff
commit cfe6b0c
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 23 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0-alpha09'
+        classpath 'com.android.tools.build:gradle:4.1.3'
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sat May 16 08:54:51 EET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-rc-2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.kunzisoft.switchdatetimepicker.sample"
-        minSdkVersion 16
-        targetSdkVersion 29
+        minSdkVersion 14
+        targetSdkVersion 30
         versionCode 20
         versionName "2.0"
     }
@@ -20,9 +20,7 @@ android {
     }
 }
 
-def supportVersion = "27.1.1"
-
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation project(path: ":switchdatetime")
 }
diff --git a/switchdatetime/build.gradle b/switchdatetime/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: "com.android.library"
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 29
+        minSdkVersion 14
+        targetSdkVersion 30
         versionCode 20
         versionName "2.0"
     }
@@ -19,11 +19,9 @@ android {
     }
 }
 
-def supportVersion = "27.0.2"
-
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'com.github.prolificinteractive:material-calendarview:1.6.1'
-    implementation 'com.google.android.material:material:1.2.0-alpha06'
+    implementation 'com.google.android.material:material:1.4.0'
 }
diff --git a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java
@@ -542,7 +542,7 @@ public SimpleDateFormat getSimpleDateMonthAndDayFormat() {
      * @param simpleDateFormat Format to show month and day
      */
     public void setSimpleDateMonthAndDayFormat(SimpleDateFormat simpleDateFormat) throws SimpleDateMonthAndDayFormatException{
-        Pattern patternMonthAndDay = Pattern.compile("(M|w|W|D|d|F|E|u|\\s)*");
+        Pattern patternMonthAndDay = Pattern.compile("(M|w|W|D|d|F|E|u|\\.|\\s)*");
         Matcher matcherMonthAndDay = patternMonthAndDay.matcher(simpleDateFormat.toPattern());
         if(!matcherMonthAndDay.matches()) {
             throw new SimpleDateMonthAndDayFormatException(simpleDateFormat.toPattern() + "isn't allowed for " + patternMonthAndDay.pattern());

diff --git a/switchdatetime/src/main/res/layout/time_header_label.xml b/switchdatetime/src/main/res/layout/time_header_label.xml
@@ -35,8 +35,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/time_placeholder"
-        android:layout_toLeftOf="@id/minutes"
-        android:layout_toStartOf="@id/minutes"
+        android:layout_toLeftOf="@+id/minutes"
+        android:layout_toStartOf="@+id/minutes"
         android:layout_marginRight="@dimen/separator_total_vertical_padding_approximation"
         android:layout_marginEnd="@dimen/separator_total_vertical_padding_approximation"
         android:layout_centerVertical="true"

diff --git a/switchdatetime/src/main/res/values/strings.xml b/switchdatetime/src/main/res/values/strings.xml
@@ -21,5 +21,5 @@
 
     <string name="sans_serif" translatable="false">sans-serif</string>
     <string name="radial_numbers_typeface" translatable="false">sans-serif</string>
-    <string name="deleted_key"><xliff:g id="key" example="4">%1$s</xliff:g> deleted</string>
+    <string name="deleted_key">%1$s deleted</string>
 </resources>