diff --git a/app/build.gradle b/app/build.gradle index 02f55a7..63a48cc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,8 +31,8 @@ dependencies { implementation 'commons-codec:commons-codec:1.12' // beware: a version included in Android is used instead implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' - implementation 'com.android.support:design:28.0.0' - implementation 'android.arch.work:work-runtime:1.0.1' + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.work:work-runtime:2.2.0' } diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/CallReceiver.java b/app/src/main/java/dummydomain/yetanothercallblocker/CallReceiver.java index 02fbc54..badafd1 100644 --- a/app/src/main/java/dummydomain/yetanothercallblocker/CallReceiver.java +++ b/app/src/main/java/dummydomain/yetanothercallblocker/CallReceiver.java @@ -5,7 +5,7 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.telephony.TelephonyManager; import com.android.internal.telephony.ITelephony; diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/CustomListViewAdapter.java b/app/src/main/java/dummydomain/yetanothercallblocker/CustomListViewAdapter.java index c6e41f1..78de76f 100644 --- a/app/src/main/java/dummydomain/yetanothercallblocker/CustomListViewAdapter.java +++ b/app/src/main/java/dummydomain/yetanothercallblocker/CustomListViewAdapter.java @@ -1,10 +1,10 @@ package dummydomain.yetanothercallblocker; import android.content.res.ColorStateList; -import android.support.annotation.NonNull; -import android.support.v4.widget.ImageViewCompat; -import android.support.v7.widget.AppCompatImageView; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.core.widget.ImageViewCompat; +import androidx.appcompat.widget.AppCompatImageView; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/DebugActivity.java b/app/src/main/java/dummydomain/yetanothercallblocker/DebugActivity.java index 4388ff1..bb49328 100644 --- a/app/src/main/java/dummydomain/yetanothercallblocker/DebugActivity.java +++ b/app/src/main/java/dummydomain/yetanothercallblocker/DebugActivity.java @@ -2,7 +2,7 @@ package dummydomain.yetanothercallblocker; import android.os.AsyncTask; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.EditText; import android.widget.TextView; diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/MainActivity.java b/app/src/main/java/dummydomain/yetanothercallblocker/MainActivity.java index c7b494a..d5edbb4 100644 --- a/app/src/main/java/dummydomain/yetanothercallblocker/MainActivity.java +++ b/app/src/main/java/dummydomain/yetanothercallblocker/MainActivity.java @@ -1,9 +1,9 @@ package dummydomain.yetanothercallblocker; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.SwitchCompat; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.SwitchCompat; import android.os.Bundle; import android.view.Menu; import android.view.MenuItem; diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/NotificationHelper.java b/app/src/main/java/dummydomain/yetanothercallblocker/NotificationHelper.java index 21e807a..1803dc2 100644 --- a/app/src/main/java/dummydomain/yetanothercallblocker/NotificationHelper.java +++ b/app/src/main/java/dummydomain/yetanothercallblocker/NotificationHelper.java @@ -8,10 +8,10 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.os.Build; -import android.support.annotation.ColorInt; -import android.support.annotation.DrawableRes; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationManagerCompat; +import androidx.annotation.ColorInt; +import androidx.annotation.DrawableRes; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationManagerCompat; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/PermissionHelper.java b/app/src/main/java/dummydomain/yetanothercallblocker/PermissionHelper.java index ef495e1..585ac8b 100644 --- a/app/src/main/java/dummydomain/yetanothercallblocker/PermissionHelper.java +++ b/app/src/main/java/dummydomain/yetanothercallblocker/PermissionHelper.java @@ -3,9 +3,9 @@ package dummydomain.yetanothercallblocker; import android.Manifest; import android.content.pm.PackageManager; import android.os.Build; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AppCompatActivity; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/ReviewsActivity.java b/app/src/main/java/dummydomain/yetanothercallblocker/ReviewsActivity.java index fa14331..94f32fc 100644 --- a/app/src/main/java/dummydomain/yetanothercallblocker/ReviewsActivity.java +++ b/app/src/main/java/dummydomain/yetanothercallblocker/ReviewsActivity.java @@ -4,10 +4,10 @@ import android.content.Context; import android.content.Intent; import android.os.AsyncTask; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.DividerItemDecoration; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/UpdateWorker.java b/app/src/main/java/dummydomain/yetanothercallblocker/UpdateWorker.java index 95b37f8..9705d9f 100644 --- a/app/src/main/java/dummydomain/yetanothercallblocker/UpdateWorker.java +++ b/app/src/main/java/dummydomain/yetanothercallblocker/UpdateWorker.java @@ -1,7 +1,7 @@ package dummydomain.yetanothercallblocker; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/sia/model/NumberCategory.java b/app/src/main/java/dummydomain/yetanothercallblocker/sia/model/NumberCategory.java index b6301cf..ffbb1a6 100644 --- a/app/src/main/java/dummydomain/yetanothercallblocker/sia/model/NumberCategory.java +++ b/app/src/main/java/dummydomain/yetanothercallblocker/sia/model/NumberCategory.java @@ -1,7 +1,7 @@ package dummydomain.yetanothercallblocker.sia.model; import android.content.Context; -import android.support.annotation.StringRes; +import androidx.annotation.StringRes; import dummydomain.yetanothercallblocker.R; diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/sia/model/database/CommunityDatabase.java b/app/src/main/java/dummydomain/yetanothercallblocker/sia/model/database/CommunityDatabase.java index c92bec5..97867b5 100644 --- a/app/src/main/java/dummydomain/yetanothercallblocker/sia/model/database/CommunityDatabase.java +++ b/app/src/main/java/dummydomain/yetanothercallblocker/sia/model/database/CommunityDatabase.java @@ -1,7 +1,7 @@ package dummydomain.yetanothercallblocker.sia.model.database; import android.annotation.SuppressLint; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.SparseArray; import org.slf4j.Logger; diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2e510a3..ce6ff85 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -25,7 +25,7 @@ android:paddingRight="@dimen/item_padding" android:showDividers="middle"> - - - - - - - - - + + - + diff --git a/app/src/main/res/layout/content_reviews.xml b/app/src/main/res/layout/content_reviews.xml index f8cabe9..ffaedbe 100644 --- a/app/src/main/res/layout/content_reviews.xml +++ b/app/src/main/res/layout/content_reviews.xml @@ -1,5 +1,5 @@ - - - + diff --git a/app/src/main/res/layout/review_item.xml b/app/src/main/res/layout/review_item.xml index 242c960..dbba892 100644 --- a/app/src/main/res/layout/review_item.xml +++ b/app/src/main/res/layout/review_item.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> - - - -