Merge pull request #31 from deadman96385/master

Upgrade to AndroidX

Author: AliAsadi

build.gradle

@@ -8,9 +8,9 @@ buildscript {
     ]
 
     ext.deps = [
-            appCompat             : "com.android.support:appcompat-v7:25.0.0",
-            recyclerView          : "com.android.support:recyclerview-v7:25.0.0",
-            expandablerecyclerview: "com.github.thoughtbot.expandable-recycler-view:expandablerecyclerview:v1.3",
+            appCompat             : 'androidx.appcompat:appcompat:1.0.0',
+            recyclerView          : 'androidx.recyclerview:recyclerview:1.0.0',
+            expandablerecyclerview: 'com.github.AliAsadi.expandable-recycler-view:expandablerecyclerview:1.8',
             gson                  : "com.google.code.gson:gson:2.8.5",
             junit                 : 'androidx.test.ext:junit:1.1.1',
             mockito               : 'org.mockito:mockito-core:2.23.0',
@@ -20,10 +20,11 @@ buildscript {
     repositories {
         google()
         mavenCentral()
+        maven { url 'https://jitpack.io' }
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:7.3.1'
     }
 }
 

gradle.properties

@@ -6,6 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Aug 23 16:50:55 IDT 2019
+#Tue Jan 03 22:01:23 CST 2023
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+zipStoreBase=GRADLE_USER_HOME

power-preference/build.gradle

@@ -14,6 +14,7 @@ android {
             minifyEnabled false
         }
     }
+    namespace 'com.preference'
 
 }
 

power-preference/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-package="com.preference" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 <application>
     <provider
         android:authorities="${applicationId}.content.provider"

power-preference/src/main/java/com/preference/Preference.java

@@ -1,6 +1,6 @@
 package com.preference;
 
-import android.support.annotation.XmlRes;
+import androidx.annotation.XmlRes;
 
 import java.util.AbstractMap;
 import java.util.Map;

power-preference/src/main/java/com/preference/PreferenceCreator.java

@@ -4,9 +4,9 @@
 import android.content.SharedPreferences;
 import android.content.res.XmlResourceParser;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.XmlRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.XmlRes;
 import android.util.Log;
 
 import com.google.gson.Gson;

power-preference/src/main/java/com/preference/provider/PreferenceProvider.java

@@ -7,8 +7,8 @@
 import android.content.pm.ProviderInfo;
 import android.database.Cursor;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /**
  * Created by Ali Asadi on 20/11/2018.

power-preference/src/main/java/com/preference/ui/debug/DebugActivity.java

@@ -3,9 +3,9 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.DividerItemDecoration;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;

power-preference/src/main/java/com/preference/ui/util/DialogUtils.java

@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.EditText;