Migrate to AndroidX

build.gradle

@@ -15,7 +15,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -36,12 +36,12 @@ dependencies {
     // kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    implementation 'com.android.support:appcompat-v7:27.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
-    implementation 'com.android.support:support-v4:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
     // Apache validator
     implementation 'commons-validator:commons-validator:1.6'

src/main/java/com/kdanmobile/kdanloginregisterui/BaseLoginView.kt

@@ -2,7 +2,7 @@ package com.kdanmobile.kdanloginregisterui
 
 import com.kdanmobile.kdanloginregisterui.Utils.toSpannable
 
-import android.support.constraint.ConstraintLayout
+import androidx.constraintlayout.widget.ConstraintLayout
 import android.content.Context
 import android.text.method.LinkMovementMethod
 import android.util.AttributeSet

src/main/java/com/kdanmobile/kdanloginregisterui/BaseRegisterView.kt

@@ -2,7 +2,7 @@ package com.kdanmobile.kdanloginregisterui
 
 import com.kdanmobile.kdanloginregisterui.Utils.toSpannable
 
-import android.support.constraint.ConstraintLayout
+import androidx.constraintlayout.widget.ConstraintLayout
 import android.content.Context
 import android.text.method.LinkMovementMethod
 import android.util.AttributeSet

src/main/java/com/kdanmobile/kdanloginregisterui/BindAccountView.kt

@@ -1,7 +1,7 @@
 package com.kdanmobile.kdanloginregisterui
 
 import android.content.Context
-import android.support.constraint.ConstraintLayout
+import androidx.constraintlayout.widget.ConstraintLayout
 import android.text.TextUtils
 import android.util.AttributeSet
 import android.view.View

src/main/java/com/kdanmobile/kdanloginregisterui/LoginBView.kt

@@ -1,7 +1,7 @@
 package com.kdanmobile.kdanloginregisterui
 
 import android.content.Context
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View

src/main/java/com/kdanmobile/kdanloginregisterui/RegisterBView.kt

@@ -1,7 +1,7 @@
 package com.kdanmobile.kdanloginregisterui
 
 import android.content.Context
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View

src/main/java/com/kdanmobile/kdanloginregisterui/ResetPwdDialogFragment.kt

@@ -2,8 +2,8 @@ package com.kdanmobile.kdanloginregisterui
 
 import android.content.Context
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
-import android.support.v4.app.FragmentManager
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.FragmentManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup

src/main/java/com/kdanmobile/kdanloginregisterui/widget/EmailLoginFormView.kt

@@ -3,7 +3,7 @@ package com.kdanmobile.kdanloginregisterui.widget
 import com.kdanmobile.kdanloginregisterui.Utils.toSpannable
 
 import android.content.Context
-import android.support.constraint.ConstraintLayout
+import androidx.constraintlayout.widget.ConstraintLayout
 import android.text.TextUtils
 import android.util.AttributeSet
 import android.view.View

src/main/java/com/kdanmobile/kdanloginregisterui/widget/EmailRegisterFormView.kt

@@ -1,7 +1,7 @@
 package com.kdanmobile.kdanloginregisterui.widget
 
 import android.content.Context
-import android.support.constraint.ConstraintLayout
+import androidx.constraintlayout.widget.ConstraintLayout
 import android.text.TextUtils
 import android.util.AttributeSet
 import android.widget.TextView

src/main/java/com/kdanmobile/kdanloginregisterui/widget/PwdEditText.kt

@@ -1,7 +1,7 @@
 package com.kdanmobile.kdanloginregisterui.widget
 
 import android.content.Context
-import android.support.constraint.ConstraintLayout
+import androidx.constraintlayout.widget.ConstraintLayout
 import android.text.Editable
 import android.text.TextUtils
 import android.text.TextWatcher

src/main/java/com/kdanmobile/kdanloginregisterui/widget/btn/BaseEmailBtn.kt

@@ -1,7 +1,7 @@
 package com.kdanmobile.kdanloginregisterui.widget.btn
 
 import android.content.Context
-import android.support.constraint.ConstraintLayout
+import androidx.constraintlayout.widget.ConstraintLayout
 import android.util.AttributeSet
 import com.kdanmobile.kdanloginregisterui.R
 

src/main/java/com/kdanmobile/kdanloginregisterui/widget/btn/BaseFacebookBtn.kt

@@ -1,7 +1,7 @@
 package com.kdanmobile.kdanloginregisterui.widget.btn
 
 import android.content.Context
-import android.support.constraint.ConstraintLayout
+import androidx.constraintlayout.widget.ConstraintLayout
 import android.util.AttributeSet
 import com.kdanmobile.kdanloginregisterui.R
 

src/main/java/com/kdanmobile/kdanloginregisterui/widget/btn/BaseGoogleBtn.kt

@@ -1,7 +1,7 @@
 package com.kdanmobile.kdanloginregisterui.widget.btn
 
 import android.content.Context
-import android.support.constraint.ConstraintLayout
+import androidx.constraintlayout.widget.ConstraintLayout
 import android.util.AttributeSet
 import com.kdanmobile.kdanloginregisterui.R
 

src/main/res/layout-land/activity_login_a.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -16,11 +16,11 @@
         app:layout_constraintBottom_toBottomOf="parent"
         >
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <android.support.constraint.Guideline
+            <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/guideLine_loginA_centerHorizontal"
                 android:orientation="vertical"
                 android:layout_width="0dp"
@@ -113,7 +113,7 @@
                 tools:text="Terms of service &amp; Privacy policy."
                 />
 
-            <android.support.constraint.Barrier
+            <androidx.constraintlayout.widget.Barrier
                 android:id="@+id/barrier_loginALand_bottom"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -137,7 +137,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 />
 
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout-land/activity_login_b.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -16,11 +16,11 @@
         app:layout_constraintBottom_toBottomOf="parent"
         >
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <android.support.constraint.Guideline
+            <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/guideLine_loginB_centerHorizontal"
                 android:orientation="vertical"
                 android:layout_width="0dp"
@@ -136,7 +136,7 @@
                 app:layout_constraintTop_toBottomOf="@id/view_loginB_emailLogin"
                 tools:text="Our terms of service and privacy policy."
                 />
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout-land/activity_register_a.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -16,11 +16,11 @@
         app:layout_constraintBottom_toBottomOf="parent"
         >
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <android.support.constraint.Guideline
+            <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/guideLine_registerA_centerHorizontal"
                 android:orientation="vertical"
                 android:layout_width="0dp"
@@ -129,7 +129,7 @@
                 tools:text="Terms of service &amp; Privacy policy."
                 />
 
-            <android.support.constraint.Barrier
+            <androidx.constraintlayout.widget.Barrier
                 android:id="@+id/barrier_registerALand_bottom"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -153,7 +153,7 @@
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="@id/barrier_registerALand_bottom" />
 
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout-land/activity_register_b.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -16,11 +16,11 @@
         app:layout_constraintBottom_toBottomOf="parent"
         >
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <android.support.constraint.Guideline
+            <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/guideLine_registerB_centerHorizontal"
                 android:orientation="vertical"
                 android:layout_width="0dp"
@@ -152,7 +152,7 @@
                 app:layout_constraintTop_toBottomOf="@id/view_registerB_emailRegister"
                 tools:text="By signing up, you agree to our terms of service and that you have read our privacy policy."
                 />
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/activity_bind_account.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -16,11 +16,11 @@
         app:layout_constraintBottom_toBottomOf="parent"
         >
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <android.support.constraint.Guideline
+            <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/guideLine_bindAccount_centerHorizontal"
                 android:orientation="vertical"
                 android:layout_width="0dp"
@@ -210,6 +210,6 @@
                 app:layout_constraintTop_toBottomOf="@id/btn_bindAccount_bind"
                 app:layout_constraintBottom_toBottomOf="parent"
                 />
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/activity_login_a.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -16,11 +16,11 @@
         app:layout_constraintBottom_toBottomOf="parent"
         >
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <android.support.constraint.Guideline
+            <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/guideLine_loginA_centerHorizontal"
                 android:orientation="vertical"
                 android:layout_width="0dp"
@@ -174,7 +174,7 @@
                 app:layout_constraintTop_toBottomOf="@id/tv_loginA_switchToRegister"
                 app:layout_constraintBottom_toBottomOf="parent"
                 />
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/activity_login_b.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -16,11 +16,11 @@
         app:layout_constraintBottom_toBottomOf="parent"
         >
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <android.support.constraint.Guideline
+            <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/guideLine_loginB_centerHorizontal"
                 android:orientation="vertical"
                 android:layout_width="0dp"
@@ -174,7 +174,7 @@
                 app:layout_constraintTop_toBottomOf="@id/tv_loginB_switchToRegister"
                 app:layout_constraintBottom_toBottomOf="parent"
                 />
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/activity_register_a.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -16,11 +16,11 @@
         app:layout_constraintBottom_toBottomOf="parent"
         >
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <android.support.constraint.Guideline
+            <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/guideLine_registerA_centerHorizontal"
                 android:orientation="vertical"
                 android:layout_width="0dp"
@@ -175,7 +175,7 @@
                 app:layout_constraintTop_toBottomOf="@id/tv_registerA_switchToLogin"
                 app:layout_constraintBottom_toBottomOf="parent"
                 />
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/activity_register_b.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -16,11 +16,11 @@
         app:layout_constraintBottom_toBottomOf="parent"
         >
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <android.support.constraint.Guideline
+            <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/guideLine_registerB_centerHorizontal"
                 android:orientation="vertical"
                 android:layout_width="0dp"
@@ -176,7 +176,7 @@
                 app:layout_constraintTop_toBottomOf="@id/tv_registerB_switchToLogin"
                 app:layout_constraintBottom_toBottomOf="parent"
                 />
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/btn_email_login_register.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -35,4 +35,4 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/btn_facebook_login_register.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -36,4 +36,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/btn_google_login_register.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -36,4 +36,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/dialog_email_login.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -7,7 +7,7 @@
     android:background="@color/kdanlrui_email_login_register_form_bg"
     >
 
-    <android.support.constraint.Guideline
+    <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideLine_emailLoginForm_centerVertical"
         android:orientation="vertical"
         android:layout_width="wrap_content"
@@ -45,4 +45,4 @@
         android:layout_marginBottom="54dp"
         />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/dialog_email_register.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -7,7 +7,7 @@
     android:background="@color/kdanlrui_email_login_register_form_bg"
     >
 
-    <android.support.constraint.Guideline
+    <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideLine_emailRegisterForm_centerVertical"
         android:orientation="vertical"
         android:layout_width="wrap_content"
@@ -45,4 +45,4 @@
         android:layout_marginBottom="54dp"
         />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/dialog_reset_pwd.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:theme="@style/KdanLoginRegisterTheme"
@@ -63,4 +63,4 @@
             android:layout_marginRight="8dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/edit_text_pwd.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="@dimen/kdanlrui_email_login_dialog_field_height"
     xmlns:app="http://schemas.android.com/apk/res-auto">
@@ -30,4 +30,4 @@
         app:layout_constraintTop_toTopOf="@id/et_pwdEditText_pwd"
         app:layout_constraintBottom_toBottomOf="@id/et_pwdEditText_pwd"
         />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/view_email_login_form.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -37,7 +37,7 @@
         app:layout_constraintBottom_toTopOf="@+id/btn_emailLoginForm_login"
         />
 
-    <android.support.v7.widget.AppCompatCheckBox
+    <androidx.appcompat.widget.AppCompatCheckBox
         android:id="@+id/cb_emailLogin_rememberMe"
         android:text="@string/kdanlrui_email_login_remember_me_check_box"
         android:textSize="12sp"
@@ -73,4 +73,4 @@
         app:layout_constraintTop_toBottomOf="@id/et_emailLoginForm_pwd"
         app:layout_constraintBottom_toBottomOf="parent"
         />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/view_email_register_form.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -56,4 +56,4 @@
         app:layout_constraintTop_toBottomOf="@id/et_emailRegisterForm_pwd"
         app:layout_constraintBottom_toBottomOf="parent"
         />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>