AndroidX版本

AndroidX版本

app/build.gradle

@@ -8,8 +8,8 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
-
     buildTypes {
         release {
             minifyEnabled false
@@ -25,12 +25,10 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation project(':policylib')
-    implementation 'com.android.support:support-v4:28.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.ext:junit:1.1.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }

policylib/src/androidTest/java/com/google/policylib/ExampleInstrumentedTest.java → app/src/androidTest/java/com/db/policylibdemo/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package com.google.policylib;
+package com.db.policylibdemo;
 
 import android.content.Context;
 
@@ -22,6 +22,6 @@ public void useAppContext() {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
-        assertEquals("com.google.policylib.test", appContext.getPackageName());
+        assertEquals("com.db.policylibdemo", appContext.getPackageName());
     }
 }

app/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <application
-        android:allowBackup="false"
+        android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"

app/src/main/java/com/db/policylibdemo/MainActivity.java

@@ -3,12 +3,13 @@
 import android.Manifest;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.db.policylib.PermissionPolicy;
 import com.db.policylib.Policy;
 

app/src/main/java/com/db/policylibdemo/MainFragment.java

@@ -3,15 +3,16 @@
 import android.Manifest;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
 import com.db.policylib.PermissionPolicy;
 import com.db.policylib.Policy;
 

app/src/main/java/com/db/policylibdemo/RuleActivity.java

@@ -5,8 +5,6 @@
 import android.net.http.SslError;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.webkit.SslErrorHandler;
 import android.webkit.WebChromeClient;
@@ -17,6 +15,9 @@
 import android.webkit.WebViewClient;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 public class RuleActivity extends AppCompatActivity {
     private Toolbar toolBar;
     private WebView webView;

app/src/main/res/layout/activity_rule.xml

@@ -6,7 +6,7 @@
     android:orientation="vertical"
     tools:context=".RuleActivity">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolBar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize" />

app/src/main/res/values/strings.xml

@@ -1,6 +1,3 @@
 <resources>
     <string name="app_name">PolicyLibDemo</string>
-
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>

policylib/src/test/java/com/google/policylib/ExampleUnitTest.java → app/src/test/java/com/db/policylibdemo/ExampleUnitTest.java

@@ -1,4 +1,4 @@
-package com.google.policylib;
+package com.db.policylibdemo;
 
 import org.junit.Test;
 

build.gradle

@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.5.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Fri Dec 06 15:43:18 CST 2019
+#Sun Dec 29 14:41:56 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

policylib/build.gradle

@@ -9,6 +9,8 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
     }
 
@@ -28,9 +30,10 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
+
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     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.ext:junit:1.1.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
 }

app/src/androidTest/java/com/google/policylibdemo/ExampleInstrumentedTest.java → policylib/src/androidTest/java/com/db/policylib/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package com.google.policylibdemo;
+package com.db.policylib;
 
 import android.content.Context;
 
@@ -22,6 +22,6 @@ public void useAppContext() {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
-        assertEquals("com.google.policylibdemo", appContext.getPackageName());
+        assertEquals("com.db.policylib.test", appContext.getPackageName());
     }
 }

policylib/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.db.policylib">
-
+    package="com.db.policylib" >
     <application>
         <activity
             android:name="pub.devrel.easypermissions.AppSettingsDialogHolderActivity"

policylib/src/main/java/com/db/policylib/Policy.java

@@ -9,11 +9,6 @@
 import android.net.Uri;
 import android.os.Build;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.method.LinkMovementMethod;
@@ -23,6 +18,12 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.db.policylib.permission.PermissionSuit;
 
 import java.util.ArrayList;

policylib/src/main/java/com/db/policylib/PolicyAdapter.java

@@ -1,13 +1,14 @@
 package com.db.policylib;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import java.util.List;
 
 public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.PolicyHolder> {

policylib/src/main/java/com/db/policylib/permission/PermissionFragment.java

@@ -5,8 +5,9 @@
 import android.app.FragmentTransaction;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 

policylib/src/main/java/com/db/policylib/permission/PermissionSuit.java

@@ -8,10 +8,11 @@
 import android.net.Uri;
 import android.os.Build;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
 import android.util.SparseArray;
 
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 

policylib/src/main/java/pub/devrel/easypermissions/AppSettingsDialog.java

@@ -7,15 +7,16 @@
 import android.content.Intent;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
-import android.support.annotation.StringRes;
-import android.support.annotation.StyleRes;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.StringRes;
+import androidx.annotation.StyleRes;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+
 import com.db.policylib.PermissionPolicy;
 import com.db.policylib.Policy;
 import com.db.policylib.R;

policylib/src/main/java/pub/devrel/easypermissions/AppSettingsDialogHolderActivity.java

@@ -8,8 +8,9 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.support.annotation.RestrictTo;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.annotation.RestrictTo;
+import androidx.appcompat.app.AppCompatActivity;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class AppSettingsDialogHolderActivity extends AppCompatActivity implements DialogInterface.OnClickListener {

policylib/src/main/java/pub/devrel/easypermissions/EasyPermissions.java

@@ -20,13 +20,14 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Size;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Size;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+
 import com.db.policylib.PermissionPolicy;
 import com.db.policylib.Policy;
 

policylib/src/main/java/pub/devrel/easypermissions/PermissionRequest.java

@@ -1,13 +1,14 @@
 package pub.devrel.easypermissions;
 
 import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
-import android.support.annotation.Size;
-import android.support.annotation.StringRes;
-import android.support.annotation.StyleRes;
-import android.support.v4.app.Fragment;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.Size;
+import androidx.annotation.StringRes;
+import androidx.annotation.StyleRes;
+import androidx.fragment.app.Fragment;
 
 import com.db.policylib.PermissionPolicy;
 import com.db.policylib.R;

policylib/src/main/java/pub/devrel/easypermissions/RationaleClickListener.java

@@ -1,7 +1,8 @@
 package pub.devrel.easypermissions;
 
 import android.app.Activity;
-import android.support.v4.app.Fragment;
+
+import androidx.fragment.app.Fragment;
 
 import java.util.Arrays;
 

policylib/src/main/java/pub/devrel/easypermissions/RationaleDialogClickListener.java

@@ -3,7 +3,8 @@
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.DialogInterface;
-import android.support.v4.app.Fragment;
+
+import androidx.fragment.app.Fragment;
 
 import java.util.Arrays;
 

policylib/src/main/java/pub/devrel/easypermissions/RationaleDialogConfig.java

@@ -3,14 +3,15 @@
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.StyleRes;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.StyleRes;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.db.policylib.PermissionPolicy;
 import com.db.policylib.Policy;
 import com.db.policylib.PolicyAdapter;

policylib/src/main/java/pub/devrel/easypermissions/RationaleDialogFragment.java

@@ -6,9 +6,10 @@
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.RestrictTo;
-import android.support.annotation.StyleRes;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.StyleRes;
 
 import com.db.policylib.PermissionPolicy;