Update to androidx

julian-klode · Sep 7, 2019 · e987283 · e987283
1 parent 92a3625
commit e987283
Show file tree

Hide file tree

Showing 28 changed files with 86 additions and 86 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ android {
         targetSdkVersion 28
         versionCode 21
         versionName "0.6.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -24,13 +24,13 @@ 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.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
 
     // Proxy stuff
     implementation 'org.pcap4j:pcap4j-core:1.8.2'

diff --git a/app/src/androidTest/java/org/jak_linux/dns66/ExampleInstrumentedTest.java b/app/src/androidTest/java/org/jak_linux/dns66/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package org.jak_linux.dns66;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/app/src/main/java/org/jak_linux/dns66/InfoActivity.java b/app/src/main/java/org/jak_linux/dns66/InfoActivity.java
@@ -8,7 +8,7 @@
 package org.jak_linux.dns66;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.TextView;
 
 public class InfoActivity extends AppCompatActivity {

diff --git a/app/src/main/java/org/jak_linux/dns66/ItemActivity.java b/app/src/main/java/org/jak_linux/dns66/ItemActivity.java
@@ -13,9 +13,9 @@
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.design.widget.TextInputEditText;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import com.google.android.material.textfield.TextInputEditText;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.Menu;

diff --git a/app/src/main/java/org/jak_linux/dns66/MainActivity.java b/app/src/main/java/org/jak_linux/dns66/MainActivity.java
@@ -15,16 +15,16 @@
 import android.content.IntentFilter;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.app.AppCompatDelegate;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.Fragment;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.Toolbar;
 import android.text.Html;
 import android.util.Log;
 import android.view.Menu;
@@ -43,7 +43,6 @@
 import org.jak_linux.dns66.vpn.AdVpnService;
 
 import java.io.BufferedReader;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;

diff --git a/app/src/main/java/org/jak_linux/dns66/SquareImageView.java b/app/src/main/java/org/jak_linux/dns66/SquareImageView.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 
 /**
@@ -14,7 +14,7 @@
  * <p>
  * To use this view, you have to make sure it is centered horizontally in its layout.
  */
-public class SquareImageView extends android.support.v7.widget.AppCompatImageView {
+public class SquareImageView extends androidx.appcompat.widget.AppCompatImageView {
     public SquareImageView(Context context) {
         super(context);
         if (Build.VERSION.SDK_INT < 23)

diff --git a/app/src/main/java/org/jak_linux/dns66/db/RuleDatabase.java b/app/src/main/java/org/jak_linux/dns66/db/RuleDatabase.java
@@ -8,7 +8,7 @@
 package org.jak_linux.dns66.db;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import org.jak_linux.dns66.Configuration;

diff --git a/app/src/main/java/org/jak_linux/dns66/db/RuleDatabaseItemUpdateRunnable.java b/app/src/main/java/org/jak_linux/dns66/db/RuleDatabaseItemUpdateRunnable.java
@@ -10,7 +10,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import org.jak_linux.dns66.Configuration;

diff --git a/app/src/main/java/org/jak_linux/dns66/db/RuleDatabaseUpdateTask.java b/app/src/main/java/org/jak_linux/dns66/db/RuleDatabaseUpdateTask.java
@@ -15,8 +15,8 @@
 import android.content.UriPermission;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.NonNull;
+import androidx.core.app.NotificationCompat;
 import android.util.Log;
 
 import org.jak_linux.dns66.Configuration;

diff --git a/app/src/main/java/org/jak_linux/dns66/main/DNSFragment.java b/app/src/main/java/org/jak_linux/dns66/main/DNSFragment.java
@@ -8,11 +8,11 @@
 package org.jak_linux.dns66.main;
 
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/org/jak_linux/dns66/main/FloatingActionButtonFragment.java b/app/src/main/java/org/jak_linux/dns66/main/FloatingActionButtonFragment.java
@@ -1,6 +1,6 @@
 package org.jak_linux.dns66.main;
 
-import android.support.design.widget.FloatingActionButton;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 /**
  * Created by jak on 14/04/17.

diff --git a/app/src/main/java/org/jak_linux/dns66/main/HostsFragment.java b/app/src/main/java/org/jak_linux/dns66/main/HostsFragment.java
@@ -8,11 +8,11 @@
 package org.jak_linux.dns66.main;
 
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/org/jak_linux/dns66/main/ItemRecyclerViewAdapter.java b/app/src/main/java/org/jak_linux/dns66/main/ItemRecyclerViewAdapter.java
@@ -8,7 +8,7 @@
 package org.jak_linux.dns66.main;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/org/jak_linux/dns66/main/ItemTouchHelperCallback.java b/app/src/main/java/org/jak_linux/dns66/main/ItemTouchHelperCallback.java
@@ -7,8 +7,8 @@
  */
 package org.jak_linux.dns66.main;
 
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import android.util.Log;
 
 import org.jak_linux.dns66.FileHelper;

diff --git a/app/src/main/java/org/jak_linux/dns66/main/MainFragmentPagerAdapter.java b/app/src/main/java/org/jak_linux/dns66/main/MainFragmentPagerAdapter.java
@@ -8,14 +8,12 @@
 package org.jak_linux.dns66.main;
 
 import android.content.Context;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
 
 import org.jak_linux.dns66.R;
 
-import java.util.ArrayList;
-
 /**
  * Adapter for the pager that holds the fragments of the main activity.
  */

diff --git a/app/src/main/java/org/jak_linux/dns66/main/StartFragment.java b/app/src/main/java/org/jak_linux/dns66/main/StartFragment.java
@@ -15,8 +15,8 @@
 import android.net.VpnService;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/app/src/main/java/org/jak_linux/dns66/main/WhitelistFragment.java b/app/src/main/java/org/jak_linux/dns66/main/WhitelistFragment.java
@@ -13,11 +13,11 @@
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.DividerItemDecoration;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.fragment.app.Fragment;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;

diff --git a/app/src/main/java/org/jak_linux/dns66/vpn/AdVpnService.java b/app/src/main/java/org/jak_linux/dns66/vpn/AdVpnService.java
@@ -25,10 +25,10 @@
 import android.os.Build;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.Log;
 
 import org.jak_linux.dns66.Configuration;

diff --git a/app/src/main/java/org/jak_linux/dns66/vpn/VpnWatchdog.java b/app/src/main/java/org/jak_linux/dns66/vpn/VpnWatchdog.java
@@ -12,7 +12,7 @@
  */
 package org.jak_linux.dns66.vpn;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import java.io.IOException;

diff --git a/app/src/main/res/layout/activity_item.xml b/app/src/main/res/layout/activity_item.xml
@@ -10,35 +10,35 @@
                 android:paddingTop="@dimen/activity_vertical_margin"
                 tools:context="org.jak_linux.dns66.ItemActivity">
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/title_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true">
 
-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:inputType="text"
             android:maxLines="1"
             android:hint="@string/title" />
-    </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/location_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/title_layout">
 
-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/location"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/location"
             android:drawableEnd="@drawable/ic_attach_file_black_24dp"
             android:inputType="textUri"/>
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
 
     <TextView

diff --git a/app/src/main/res/layout/activity_item_dns.xml b/app/src/main/res/layout/activity_item_dns.xml
@@ -10,34 +10,34 @@
                 android:paddingTop="@dimen/activity_vertical_margin"
                 tools:context="org.jak_linux.dns66.ItemActivity">
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/title_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true">
 
-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/title"
             android:inputType="text"
             android:maxLines="1"/>
-    </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/location_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/title_layout">
 
-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/location"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/location_dns"
             android:inputType="textUri"/>
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
     <Switch
         android:id="@+id/state_switch"