Merge pull request #19 from OmarShoaib/master

JonatanSalas · web-flow · commit cbee32571e85 · 2023-06-06T13:16:35.000-03:00
Project updated to work on latest android versions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,12 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdk 32
     defaultConfig {
         applicationId "io.blackbox_vision.dateedittextsample"
-        minSdkVersion 14
-        targetSdkVersion 25
+        minSdkVersion 22
+        targetSdkVersion 32
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -17,18 +16,20 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    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.3.1'
-    compile 'com.android.support:design:25.3.1'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
-    compile project(':datetimepickeredittext')
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.google.android.material:material:1.7.0'
 
-    testCompile 'junit:junit:4.12'
+    implementation project(':datetimepickeredittext')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -8,7 +8,8 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="io.blackbox_vision.sample.MainActivity">
+        <activity android:name="io.blackbox_vision.sample.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/io/blackbox_vision/sample/MainActivity.java b/app/src/main/java/io/blackbox_vision/sample/MainActivity.java
@@ -1,9 +1,10 @@
 package io.blackbox_vision.sample;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.text.format.DateFormat;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import java.util.Calendar;
 
 import io.blackbox_vision.datetimepickeredittext.view.DatePickerEditText;
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -28,7 +28,7 @@
         android:layout_marginBottom="8dp"
         android:hint="@string/select_time" />
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/dateTextInputLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -39,13 +39,13 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/select_date"
-            app:dateFormat="yyyy/MM/dd"
-            app:maxDate="01/01/2050"
-            app:minDate="01/01/1981" />
+            app:dateFormat="yyyy-MM-dd"
+            app:maxDate="2050-01-01"
+            app:minDate="1981-01-01" />
 
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/timeTextInputLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -58,6 +58,6 @@
             app:is24HourView="true"
             app:timeFormat="kk:mm" />
 
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
 </LinearLayout>
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.1.2-4'
+    ext.kotlin_version = '1.7.20'
     repositories {
         jcenter()
+        google()
+        maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:7.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -16,7 +18,9 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
+        google()
+        mavenCentral()
+        maven { url "https://jitpack.io" }
     }
 }
 
diff --git a/datetimepickeredittext/build.gradle b/datetimepickeredittext/build.gradle
@@ -2,12 +2,11 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 32
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 25
+        minSdkVersion 22
+        targetSdkVersion 32
         versionCode 1
         versionName "1.0"
 
@@ -19,19 +18,23 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:design:25.3.1'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.google.android.material:material:1.7.0'
 
-    testCompile 'junit:junit:4.12'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+//    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
 repositories {
     mavenCentral()
diff --git a/datetimepickeredittext/src/androidTest/java/io/blackbox_vision/datetimepickeredittext/ExampleInstrumentedTest.java b/datetimepickeredittext/src/androidTest/java/io/blackbox_vision/datetimepickeredittext/ExampleInstrumentedTest.java
@@ -1,14 +1,15 @@
 package io.blackbox_vision.datetimepickeredittext;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import static org.junit.Assert.*;
 
+import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 /**
  * Instrumentation test, which will execute on an Android device.
  *
diff --git a/datetimepickeredittext/src/main/java/io/blackbox_vision/datetimepickeredittext/internal/fragment/DatePickerFragment.kt b/datetimepickeredittext/src/main/java/io/blackbox_vision/datetimepickeredittext/internal/fragment/DatePickerFragment.kt
@@ -3,13 +3,13 @@ package io.blackbox_vision.datetimepickeredittext.internal.fragment
 import android.app.DatePickerDialog
 import android.app.Dialog
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
 
 import java.util.Calendar
 
 import io.blackbox_vision.datetimepickeredittext.internal.utils.DateUtils
 
 import android.app.DatePickerDialog.*
+import androidx.fragment.app.DialogFragment
 
 
 class DatePickerFragment : DialogFragment() {
@@ -49,9 +49,9 @@ class DatePickerFragment : DialogFragment() {
         val datePickerDialog: DatePickerDialog
 
         if (null != themeId && themeId != 0) {
-            datePickerDialog = DatePickerDialog(activity, themeId!!, onDateSetListener, year, month, day)
+            datePickerDialog = DatePickerDialog(requireActivity(), themeId!!, onDateSetListener, year, month, day)
         } else {
-            datePickerDialog = DatePickerDialog(activity, onDateSetListener, year, month, day)
+            datePickerDialog = DatePickerDialog(requireActivity(), onDateSetListener, year, month, day)
         }
 
 //        val minDateStr = if (null != minDate) minDate else DEFAULT_MIN_DATE
@@ -95,8 +95,8 @@ class DatePickerFragment : DialogFragment() {
     }
 
     companion object {
-        private val DEFAULT_TEMPLATE = "dd/MM/yyyy"
-        private val DEFAULT_MIN_DATE = "01/01/1980"
-        private val DEFAULT_MAX_DATE = "01/01/2100"
+        private val DEFAULT_TEMPLATE = "yyyy-MM-dd"
+        private val DEFAULT_MIN_DATE = "1980-01-01"
+        private val DEFAULT_MAX_DATE = "2100-01-01"
     }
 }
diff --git a/datetimepickeredittext/src/main/java/io/blackbox_vision/datetimepickeredittext/internal/fragment/TimePickerFragment.kt b/datetimepickeredittext/src/main/java/io/blackbox_vision/datetimepickeredittext/internal/fragment/TimePickerFragment.kt
@@ -3,11 +3,11 @@ package io.blackbox_vision.datetimepickeredittext.internal.fragment
 import android.app.Dialog
 import android.app.TimePickerDialog
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
 
 import java.util.Calendar
 
 import android.app.TimePickerDialog.OnTimeSetListener
+import androidx.fragment.app.DialogFragment
 
 
 class TimePickerFragment : DialogFragment() {
diff --git a/datetimepickeredittext/src/main/java/io/blackbox_vision/datetimepickeredittext/internal/utils/DateUtils.kt b/datetimepickeredittext/src/main/java/io/blackbox_vision/datetimepickeredittext/internal/utils/DateUtils.kt
@@ -13,7 +13,7 @@ import java.util.Locale
 object DateUtils {
     private val LOG_TAG = "DateUtils"
 
-    private val DATE_TEMPLATE = "dd/MM/yyyy"
+    private val DATE_TEMPLATE = "yyyy-MM-dd"
     private val TIME_TEMPLATE = "kk:mm"
 
     private fun format(date: Date, template: String): CharSequence {
diff --git a/datetimepickeredittext/src/main/java/io/blackbox_vision/datetimepickeredittext/view/DatePickerEditText.kt b/datetimepickeredittext/src/main/java/io/blackbox_vision/datetimepickeredittext/view/DatePickerEditText.kt
@@ -1,8 +1,6 @@
 package io.blackbox_vision.datetimepickeredittext.view
 
 import android.content.Context
-import android.support.v4.app.FragmentManager
-import android.support.v7.widget.AppCompatEditText
 import android.text.InputType
 import android.util.AttributeSet
 import android.view.View
@@ -20,7 +18,9 @@ import io.blackbox_vision.datetimepickeredittext.internal.utils.DateUtils
 import android.view.View.OnFocusChangeListener
 import android.view.View.OnClickListener
 import android.app.DatePickerDialog.OnDateSetListener
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.AppCompatEditText
+import androidx.fragment.app.FragmentManager
 
 
 class DatePickerEditText : AppCompatEditText, OnFocusChangeListener, OnClickListener, OnDateSetListener {
diff --git a/datetimepickeredittext/src/main/java/io/blackbox_vision/datetimepickeredittext/view/DatePickerInputEditText.kt b/datetimepickeredittext/src/main/java/io/blackbox_vision/datetimepickeredittext/view/DatePickerInputEditText.kt
@@ -1,26 +1,24 @@
 package io.blackbox_vision.datetimepickeredittext.view
 
+import android.app.Activity
+import android.app.DatePickerDialog.OnDateSetListener
 import android.content.Context
-import android.support.design.widget.TextInputEditText
-import android.support.v4.app.FragmentManager
+import android.content.ContextWrapper
 import android.text.InputType
 import android.util.AttributeSet
 import android.view.View
+import android.view.View.OnClickListener
+import android.view.View.OnFocusChangeListener
 import android.view.inputmethod.InputMethodManager
 import android.widget.DatePicker
-
-import java.text.DateFormat
-import java.util.Calendar
-import java.util.Locale
-
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.FragmentManager
+import com.google.android.material.textfield.TextInputEditText
 import io.blackbox_vision.datetimepickeredittext.R
 import io.blackbox_vision.datetimepickeredittext.internal.fragment.DatePickerFragment
 import io.blackbox_vision.datetimepickeredittext.internal.utils.DateUtils
-
-import android.view.View.OnFocusChangeListener
-import android.view.View.OnClickListener
-import android.app.DatePickerDialog.OnDateSetListener
-import android.support.v7.app.AppCompatActivity
+import java.text.DateFormat
+import java.util.*
 
 
 class DatePickerInputEditText : TextInputEditText, OnFocusChangeListener, OnClickListener, OnDateSetListener {
@@ -60,7 +58,7 @@ class DatePickerInputEditText : TextInputEditText, OnFocusChangeListener, OnClic
         setOnClickListener(this)
 
         /*Set fragment manager*/
-        manager = (context as AppCompatActivity).supportFragmentManager
+        manager = (unwrap(context) as AppCompatActivity).supportFragmentManager
     }
 
     private fun handleAttributes(attributeSet: AttributeSet) {
@@ -193,6 +191,14 @@ class DatePickerInputEditText : TextInputEditText, OnFocusChangeListener, OnClic
         return this
     }
 
+    private fun unwrap(context: Context): Activity? {
+        var _context: Context? = context
+        while (_context !is Activity && _context is ContextWrapper) {
+            _context = _context.baseContext
+        }
+        return _context as Activity?
+    }
+
     companion object {
         private val TAG = "DatePickerInputEditText"
     }
diff --git a/datetimepickeredittext/src/main/java/io/blackbox_vision/datetimepickeredittext/view/TimePickerEditText.kt b/datetimepickeredittext/src/main/java/io/blackbox_vision/datetimepickeredittext/view/TimePickerEditText.kt
@@ -1,8 +1,6 @@
 package io.blackbox_vision.datetimepickeredittext.view
 
 import android.content.Context
-import android.support.v4.app.FragmentManager
-import android.support.v7.widget.AppCompatEditText
 import android.text.InputType
 import android.util.AttributeSet
 import android.view.View
@@ -20,7 +18,9 @@ import io.blackbox_vision.datetimepickeredittext.internal.utils.DateUtils
 import android.view.View.OnFocusChangeListener
 import android.view.View.OnClickListener
 import android.app.TimePickerDialog.OnTimeSetListener
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.AppCompatEditText
+import androidx.fragment.app.FragmentManager
 
 
 class TimePickerEditText : AppCompatEditText, OnFocusChangeListener, OnClickListener, OnTimeSetListener {
diff --git a/datetimepickeredittext/src/main/java/io/blackbox_vision/datetimepickeredittext/view/TimePickerInputEditText.kt b/datetimepickeredittext/src/main/java/io/blackbox_vision/datetimepickeredittext/view/TimePickerInputEditText.kt
diff --git a/gradle.properties b/gradle.properties
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
