Merge branch 'migrate-to-androidx'

build.gradle

@@ -28,7 +28,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -41,11 +41,11 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'com.android.support:appcompat-v7:27.0.2'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
     testImplementation 'junit:junit:4.12'
 

src/androidTest/java/com/kdanmobile/kdan_others_library_for_android/ExampleInstrumentedTest.java

@@ -1,8 +1,8 @@
 package com.kdanmobile.kdan_others_library_for_android;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

src/androidTest/java/com/kdanmobile/kdan_others_library_for_android/dash2fullscreen/Dash2FullScreenAdControllerTest.java

@@ -2,8 +2,8 @@ package com.kdanmobile.kdan_others_library_for_android.dash2fullscreen;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Before;

src/main/java/com/kdanmobile/kdan_others_library_for_android/card/AccountInfoCard.java

@@ -1,8 +1,8 @@
 package com.kdanmobile.kdan_others_library_for_android.card;
 
 import android.content.Context;
-import android.graphics.Color;
-import android.support.v4.content.ContextCompat;
+
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.Button;

src/main/java/com/kdanmobile/kdan_others_library_for_android/card/BaseCard.java

@@ -2,11 +2,11 @@ package com.kdanmobile.kdan_others_library_for_android.card;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.AttrRes;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.AttrRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;

src/main/java/com/kdanmobile/kdan_others_library_for_android/card/QubiiXCreativeStoreCard.java

@@ -2,9 +2,9 @@ package com.kdanmobile.kdan_others_library_for_android.card;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 
 import com.kdanmobile.kdan_others_library_for_android.R;

src/main/java/com/kdanmobile/kdan_others_library_for_android/dash2fullscreen/BaseDash2FullScreenAdActivity.java

@@ -3,7 +3,7 @@ package com.kdanmobile.kdan_others_library_for_android.dash2fullscreen;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.Html;
 import android.view.View;
 import android.view.WindowManager;

src/main/java/com/kdanmobile/kdan_others_library_for_android/dialog/MozbiiConnectDialog.java

@@ -2,7 +2,7 @@ package com.kdanmobile.kdan_others_library_for_android.dialog;
 
 import android.content.Context;
 import android.graphics.drawable.AnimationDrawable;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

src/main/java/com/kdanmobile/kdan_others_library_for_android/dialog/UpdateLatestAppDialog.java

@@ -1,8 +1,8 @@
 package com.kdanmobile.kdan_others_library_for_android.dialog;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;

src/main/java/com/kdanmobile/kdan_others_library_for_android/dialog/ZendeskLoginNotifyDialog.java

@@ -2,8 +2,8 @@ package com.kdanmobile.kdan_others_library_for_android.dialog;
 
 import android.content.Context;
 import android.graphics.Color;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.kdanmobile.kdan_others_library_for_android.R;

src/main/java/com/kdanmobile/kdan_others_library_for_android/view/SimpleWebViewActivity.java

@@ -7,9 +7,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.Window;
 import android.webkit.DownloadListener;

src/main/res/layout-land/dailog_dash2_full_screen_ad.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"
     xmlns:tools="http://schemas.android.com/tools"
@@ -7,14 +7,14 @@
     android:layout_height="match_parent"
     android:background="#FFFFFF">
 
-    <android.support.constraint.Guideline
+    <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline_dash2_full_screen_image_left"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         app:layout_constraintGuide_percent="0.5" />
 
-    <android.support.constraint.Guideline
+    <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline_dash2_full_screen_image_right"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -95,4 +95,4 @@
         android:text="@string/dash2_full_screen_ad_supporting_text"/>
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/dailog_dash2_full_screen_ad.xml

@@ -1,25 +1,25 @@
 <?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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#FFFFFF">
 
-    <android.support.constraint.Guideline
+    <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline_dash2_full_screen_image_top"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         app:layout_constraintGuide_percent="0.3"/>
 
-    <android.support.constraint.Guideline
+    <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline_dash2_full_screen_image_left"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         app:layout_constraintGuide_percent="0.12"/>
 
-    <android.support.constraint.Guideline
+    <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline_dash2_full_screen_image_right"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -89,4 +89,4 @@
         android:textColor="#000000"
         android:text="@string/dash2_full_screen_ad_cta" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/simplewebview_layout.xml

@@ -5,7 +5,7 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar_simple_web_view"
         android:background="#5f5f5f"
         android:layout_width="match_parent"
@@ -60,7 +60,7 @@
             </LinearLayout>
 
         </RelativeLayout>
-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
     <ProgressBar android:id="@+id/webview_progressbar"
         style="?android:attr/progressBarStyleHorizontal"

src/main/res/layout/widget_account_info_card.xml

@@ -1,4 +1,4 @@
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -229,4 +229,4 @@
             </LinearLayout>
         </RelativeLayout>
     </FrameLayout>
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>

src/main/res/layout/widget_ad_promote_card.xml

@@ -1,4 +1,4 @@
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -52,4 +52,4 @@
             android:text="@string/home_promote_card_tyr_now_btn_text"
             android:textColor="?attr/colorAccent" />
     </LinearLayout>
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>

src/main/res/layout/widget_adonit_creative_store_promote_card.xml

@@ -1,4 +1,4 @@
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/view3"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -37,4 +37,4 @@
             android:text="@string/creative_store_card_view"
             android:textColor="?attr/colorAccent" />
     </LinearLayout>
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>

src/main/res/layout/widget_base_card.xml

@@ -1,11 +1,11 @@
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="#ffffff">
@@ -97,5 +97,5 @@
             android:textColor="?attr/colorAccent"
             tools:text="action3"
             tools:visibility="visible"/>
-    </android.support.constraint.ConstraintLayout>
-</android.support.v7.widget.CardView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.cardview.widget.CardView>

src/main/res/layout/widget_creative_store_promote_card.xml

@@ -1,4 +1,4 @@
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/view3"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -70,4 +70,4 @@
         </RelativeLayout>
 
     </LinearLayout>
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>

src/main/res/layout/widget_noteledge_promote_card.xml

@@ -1,4 +1,4 @@
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -57,4 +57,4 @@
             android:text="@string/home_promote_card_tyr_now_btn_text"
             android:textColor="?attr/colorAccent" />
     </LinearLayout>
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>

src/main/res/layout/widget_pdfreader_promote_card.xml

@@ -1,4 +1,4 @@
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -51,4 +51,4 @@
             android:text="@string/home_promote_card_tyr_now_btn_text"
             android:textColor="?attr/colorAccent" />
     </LinearLayout>
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>