From 2152e2617f54d6df23817fe0f61c86fc890f9ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Sch=C3=A4ttgen?= Date: Tue, 25 Sep 2018 16:26:57 +0200 Subject: [PATCH] Migrated project to AndroidX --- .idea/misc.xml | 2 +- app/build.gradle | 12 ++++++------ .../main/java/me/impy/aegis/AegisApplication.java | 2 +- .../java/me/impy/aegis/db/DatabaseEntryList.java | 2 +- .../me/impy/aegis/helpers/FingerprintUiHelper.java | 2 +- .../impy/aegis/helpers/ItemTouchHelperAdapter.java | 2 +- .../java/me/impy/aegis/helpers/PermissionHelper.java | 4 ++-- .../aegis/helpers/SimpleItemTouchHelperCallback.java | 4 ++-- .../java/me/impy/aegis/helpers/SpinnerHelper.java | 2 +- .../main/java/me/impy/aegis/ui/AegisActivity.java | 2 +- app/src/main/java/me/impy/aegis/ui/AuthActivity.java | 2 +- .../java/me/impy/aegis/ui/EditEntryActivity.java | 6 +++--- .../main/java/me/impy/aegis/ui/IntroActivity.java | 2 +- app/src/main/java/me/impy/aegis/ui/MainActivity.java | 2 +- .../java/me/impy/aegis/ui/PreferencesFragment.java | 4 ++-- .../java/me/impy/aegis/ui/SlotManagerActivity.java | 8 ++++---- .../main/java/me/impy/aegis/ui/dialogs/Dialogs.java | 2 +- .../aegis/ui/dialogs/FingerprintDialogFragment.java | 4 ++-- .../aegis/ui/dialogs/PasswordDialogFragment.java | 4 ++-- .../me/impy/aegis/ui/dialogs/SlotDialogFragment.java | 2 +- .../impy/aegis/ui/preferences/SwitchPreference.java | 6 +++--- .../aegis/ui/slides/CustomAuthenticatedSlide.java | 4 ++-- .../aegis/ui/slides/CustomAuthenticationSlide.java | 4 ++-- .../me/impy/aegis/ui/tasks/ProgressDialogTask.java | 2 +- .../java/me/impy/aegis/ui/views/EntryAdapter.java | 2 +- .../java/me/impy/aegis/ui/views/EntryHolder.java | 6 ++---- .../java/me/impy/aegis/ui/views/EntryListView.java | 8 ++++---- .../me/impy/aegis/ui/views/PeriodProgressBar.java | 2 +- .../java/me/impy/aegis/ui/views/SlotAdapter.java | 2 +- .../main/java/me/impy/aegis/ui/views/SlotHolder.java | 2 +- app/src/main/res/layout/activity_auth.xml | 4 ++-- app/src/main/res/layout/activity_edit_entry.xml | 12 ++++++------ app/src/main/res/layout/activity_intro.xml | 4 ++-- app/src/main/res/layout/activity_main.xml | 4 ++-- app/src/main/res/layout/activity_slots.xml | 10 +++++----- app/src/main/res/layout/fragment_entry_list_view.xml | 2 +- app/src/main/res/xml/preferences.xml | 4 ++-- build.gradle | 2 +- gradle.properties | 2 ++ gradle/wrapper/gradle-wrapper.properties | 4 ++-- 40 files changed, 78 insertions(+), 78 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 53a3fb16..635999df 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,7 +24,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 3014094c..693c6299 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { applicationId "me.impy.aegis" @@ -31,11 +31,11 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:cardview-v7:27.1.1' - implementation 'com.android.support:design:27.1.1' - implementation 'com.android.support:recyclerview-v7:27.1.1' - implementation 'com.android.support:support-v4:27.1.1' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'com.getbase:floatingactionbutton:1.10.1' implementation 'com.github.apl-devs:appintro:v4.2.2' implementation 'com.github.avito-tech:krop:3e65e12' diff --git a/app/src/main/java/me/impy/aegis/AegisApplication.java b/app/src/main/java/me/impy/aegis/AegisApplication.java index 7176717f..83fcde5d 100644 --- a/app/src/main/java/me/impy/aegis/AegisApplication.java +++ b/app/src/main/java/me/impy/aegis/AegisApplication.java @@ -6,7 +6,7 @@ import android.content.pm.ShortcutInfo; import android.content.pm.ShortcutManager; import android.graphics.drawable.Icon; import android.os.Build; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import java.util.Collections; diff --git a/app/src/main/java/me/impy/aegis/db/DatabaseEntryList.java b/app/src/main/java/me/impy/aegis/db/DatabaseEntryList.java index 14f2992e..222bbd7c 100644 --- a/app/src/main/java/me/impy/aegis/db/DatabaseEntryList.java +++ b/app/src/main/java/me/impy/aegis/db/DatabaseEntryList.java @@ -1,6 +1,6 @@ package me.impy.aegis.db; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.io.Serializable; import java.util.ArrayList; diff --git a/app/src/main/java/me/impy/aegis/helpers/FingerprintUiHelper.java b/app/src/main/java/me/impy/aegis/helpers/FingerprintUiHelper.java index 38ded55a..bc1c5814 100644 --- a/app/src/main/java/me/impy/aegis/helpers/FingerprintUiHelper.java +++ b/app/src/main/java/me/impy/aegis/helpers/FingerprintUiHelper.java @@ -22,7 +22,7 @@ package me.impy.aegis.helpers; import android.hardware.fingerprint.FingerprintManager; import android.os.Build; import android.os.CancellationSignal; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import android.widget.TextView; import com.mattprecious.swirl.SwirlView; diff --git a/app/src/main/java/me/impy/aegis/helpers/ItemTouchHelperAdapter.java b/app/src/main/java/me/impy/aegis/helpers/ItemTouchHelperAdapter.java index 962c951b..4b4b5dd9 100644 --- a/app/src/main/java/me/impy/aegis/helpers/ItemTouchHelperAdapter.java +++ b/app/src/main/java/me/impy/aegis/helpers/ItemTouchHelperAdapter.java @@ -1,6 +1,6 @@ package me.impy.aegis.helpers; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; public interface ItemTouchHelperAdapter { diff --git a/app/src/main/java/me/impy/aegis/helpers/PermissionHelper.java b/app/src/main/java/me/impy/aegis/helpers/PermissionHelper.java index adbde17a..801226e7 100644 --- a/app/src/main/java/me/impy/aegis/helpers/PermissionHelper.java +++ b/app/src/main/java/me/impy/aegis/helpers/PermissionHelper.java @@ -3,8 +3,8 @@ package me.impy.aegis.helpers; import android.app.Activity; import android.content.Context; import android.content.pm.PackageManager; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/me/impy/aegis/helpers/SimpleItemTouchHelperCallback.java b/app/src/main/java/me/impy/aegis/helpers/SimpleItemTouchHelperCallback.java index ebc30db9..dddd1937 100644 --- a/app/src/main/java/me/impy/aegis/helpers/SimpleItemTouchHelperCallback.java +++ b/app/src/main/java/me/impy/aegis/helpers/SimpleItemTouchHelperCallback.java @@ -1,7 +1,7 @@ package me.impy.aegis.helpers; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; public class SimpleItemTouchHelperCallback extends ItemTouchHelper.Callback { diff --git a/app/src/main/java/me/impy/aegis/helpers/SpinnerHelper.java b/app/src/main/java/me/impy/aegis/helpers/SpinnerHelper.java index 479fe241..ac6b9df3 100644 --- a/app/src/main/java/me/impy/aegis/helpers/SpinnerHelper.java +++ b/app/src/main/java/me/impy/aegis/helpers/SpinnerHelper.java @@ -1,7 +1,7 @@ package me.impy.aegis.helpers; import android.content.Context; -import android.support.annotation.ArrayRes; +import androidx.annotation.ArrayRes; import android.widget.ArrayAdapter; import android.widget.Spinner; diff --git a/app/src/main/java/me/impy/aegis/ui/AegisActivity.java b/app/src/main/java/me/impy/aegis/ui/AegisActivity.java index 595d384a..df4a4465 100644 --- a/app/src/main/java/me/impy/aegis/ui/AegisActivity.java +++ b/app/src/main/java/me/impy/aegis/ui/AegisActivity.java @@ -1,7 +1,7 @@ package me.impy.aegis.ui; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.WindowManager; import me.impy.aegis.AegisApplication; diff --git a/app/src/main/java/me/impy/aegis/ui/AuthActivity.java b/app/src/main/java/me/impy/aegis/ui/AuthActivity.java index 3bb7083d..2e38d6fd 100644 --- a/app/src/main/java/me/impy/aegis/ui/AuthActivity.java +++ b/app/src/main/java/me/impy/aegis/ui/AuthActivity.java @@ -3,7 +3,7 @@ package me.impy.aegis.ui; import android.content.Intent; import android.hardware.fingerprint.FingerprintManager; import android.os.Build; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.os.Bundle; import android.view.KeyEvent; import android.view.View; diff --git a/app/src/main/java/me/impy/aegis/ui/EditEntryActivity.java b/app/src/main/java/me/impy/aegis/ui/EditEntryActivity.java index e0bb13d8..f708e79b 100644 --- a/app/src/main/java/me/impy/aegis/ui/EditEntryActivity.java +++ b/app/src/main/java/me/impy/aegis/ui/EditEntryActivity.java @@ -8,9 +8,9 @@ import android.graphics.Color; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.annotation.ArrayRes; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AlertDialog; +import androidx.annotation.ArrayRes; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; import android.text.Editable; import android.text.TextWatcher; import android.view.Menu; diff --git a/app/src/main/java/me/impy/aegis/ui/IntroActivity.java b/app/src/main/java/me/impy/aegis/ui/IntroActivity.java index 254210b5..1ba39290 100644 --- a/app/src/main/java/me/impy/aegis/ui/IntroActivity.java +++ b/app/src/main/java/me/impy/aegis/ui/IntroActivity.java @@ -2,7 +2,7 @@ package me.impy.aegis.ui; import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.WindowManager; import com.github.paolorotolo.appintro.AppIntro2; diff --git a/app/src/main/java/me/impy/aegis/ui/MainActivity.java b/app/src/main/java/me/impy/aegis/ui/MainActivity.java index e57eb267..a148d80e 100644 --- a/app/src/main/java/me/impy/aegis/ui/MainActivity.java +++ b/app/src/main/java/me/impy/aegis/ui/MainActivity.java @@ -6,7 +6,7 @@ import android.content.ClipboardManager; import android.content.Context; import android.content.Intent; import android.graphics.Rect; -import android.support.design.widget.BottomSheetDialog; +import com.google.android.material.bottomsheet.BottomSheetDialog; import android.os.Bundle; import android.view.Menu; import android.view.MenuItem; diff --git a/app/src/main/java/me/impy/aegis/ui/PreferencesFragment.java b/app/src/main/java/me/impy/aegis/ui/PreferencesFragment.java index e2f82e40..87e5a966 100644 --- a/app/src/main/java/me/impy/aegis/ui/PreferencesFragment.java +++ b/app/src/main/java/me/impy/aegis/ui/PreferencesFragment.java @@ -7,8 +7,8 @@ import android.content.Intent; import android.media.MediaScannerConnection; import android.net.Uri; import android.os.Bundle; -import android.support.v7.app.AlertDialog; -import android.support.v7.preference.Preference; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.Preference; import com.takisoft.fix.support.v7.preference.PreferenceFragmentCompat; import android.view.Window; import android.view.WindowManager; diff --git a/app/src/main/java/me/impy/aegis/ui/SlotManagerActivity.java b/app/src/main/java/me/impy/aegis/ui/SlotManagerActivity.java index 5a40dc46..05359d6c 100644 --- a/app/src/main/java/me/impy/aegis/ui/SlotManagerActivity.java +++ b/app/src/main/java/me/impy/aegis/ui/SlotManagerActivity.java @@ -2,10 +2,10 @@ package me.impy.aegis.ui; import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.Menu; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/me/impy/aegis/ui/dialogs/Dialogs.java b/app/src/main/java/me/impy/aegis/ui/dialogs/Dialogs.java index 0044c3f9..411a5087 100644 --- a/app/src/main/java/me/impy/aegis/ui/dialogs/Dialogs.java +++ b/app/src/main/java/me/impy/aegis/ui/dialogs/Dialogs.java @@ -2,7 +2,7 @@ package me.impy.aegis.ui.dialogs; import android.app.Activity; import android.content.DialogInterface; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import me.impy.aegis.R; diff --git a/app/src/main/java/me/impy/aegis/ui/dialogs/FingerprintDialogFragment.java b/app/src/main/java/me/impy/aegis/ui/dialogs/FingerprintDialogFragment.java index 225b0a14..e79b71c5 100644 --- a/app/src/main/java/me/impy/aegis/ui/dialogs/FingerprintDialogFragment.java +++ b/app/src/main/java/me/impy/aegis/ui/dialogs/FingerprintDialogFragment.java @@ -3,8 +3,8 @@ package me.impy.aegis.ui.dialogs; import android.app.Dialog; import android.hardware.fingerprint.FingerprintManager; import android.os.Bundle; -import android.support.v7.app.AlertDialog; -import android.support.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.annotation.NonNull; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/me/impy/aegis/ui/dialogs/PasswordDialogFragment.java b/app/src/main/java/me/impy/aegis/ui/dialogs/PasswordDialogFragment.java index f0c5aa65..584b909c 100644 --- a/app/src/main/java/me/impy/aegis/ui/dialogs/PasswordDialogFragment.java +++ b/app/src/main/java/me/impy/aegis/ui/dialogs/PasswordDialogFragment.java @@ -2,8 +2,8 @@ package me.impy.aegis.ui.dialogs; import android.app.Dialog; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import android.text.Editable; import android.text.TextWatcher; import android.view.View; diff --git a/app/src/main/java/me/impy/aegis/ui/dialogs/SlotDialogFragment.java b/app/src/main/java/me/impy/aegis/ui/dialogs/SlotDialogFragment.java index cc5972ac..f7b41251 100644 --- a/app/src/main/java/me/impy/aegis/ui/dialogs/SlotDialogFragment.java +++ b/app/src/main/java/me/impy/aegis/ui/dialogs/SlotDialogFragment.java @@ -1,7 +1,7 @@ package me.impy.aegis.ui.dialogs; import android.content.Context; -import android.support.v4.app.DialogFragment; +import androidx.fragment.app.DialogFragment; import javax.crypto.Cipher; diff --git a/app/src/main/java/me/impy/aegis/ui/preferences/SwitchPreference.java b/app/src/main/java/me/impy/aegis/ui/preferences/SwitchPreference.java index 047a2275..dc75f92b 100644 --- a/app/src/main/java/me/impy/aegis/ui/preferences/SwitchPreference.java +++ b/app/src/main/java/me/impy/aegis/ui/preferences/SwitchPreference.java @@ -2,9 +2,9 @@ package me.impy.aegis.ui.preferences; import android.content.Context; import android.os.Build; -import android.support.annotation.RequiresApi; -import android.support.v7.preference.Preference; -import android.support.v7.preference.SwitchPreferenceCompat; +import androidx.annotation.RequiresApi; +import androidx.preference.Preference; +import androidx.preference.SwitchPreferenceCompat; import android.util.AttributeSet; public class SwitchPreference extends SwitchPreferenceCompat { diff --git a/app/src/main/java/me/impy/aegis/ui/slides/CustomAuthenticatedSlide.java b/app/src/main/java/me/impy/aegis/ui/slides/CustomAuthenticatedSlide.java index b0f6fe8f..5fd63b5f 100644 --- a/app/src/main/java/me/impy/aegis/ui/slides/CustomAuthenticatedSlide.java +++ b/app/src/main/java/me/impy/aegis/ui/slides/CustomAuthenticatedSlide.java @@ -5,8 +5,8 @@ import android.content.Intent; import android.hardware.fingerprint.FingerprintManager; import android.os.Build; import android.os.Bundle; -import android.support.design.widget.Snackbar; -import android.support.v4.app.Fragment; +import com.google.android.material.snackbar.Snackbar; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/impy/aegis/ui/slides/CustomAuthenticationSlide.java b/app/src/main/java/me/impy/aegis/ui/slides/CustomAuthenticationSlide.java index ef5ea468..bab1b86a 100644 --- a/app/src/main/java/me/impy/aegis/ui/slides/CustomAuthenticationSlide.java +++ b/app/src/main/java/me/impy/aegis/ui/slides/CustomAuthenticationSlide.java @@ -3,8 +3,8 @@ package me.impy.aegis.ui.slides; import android.content.Intent; import android.hardware.fingerprint.FingerprintManager; import android.os.Bundle; -import android.support.design.widget.Snackbar; -import android.support.v4.app.Fragment; +import com.google.android.material.snackbar.Snackbar; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/impy/aegis/ui/tasks/ProgressDialogTask.java b/app/src/main/java/me/impy/aegis/ui/tasks/ProgressDialogTask.java index 7603a01b..b9d8f771 100644 --- a/app/src/main/java/me/impy/aegis/ui/tasks/ProgressDialogTask.java +++ b/app/src/main/java/me/impy/aegis/ui/tasks/ProgressDialogTask.java @@ -4,7 +4,7 @@ import android.app.ProgressDialog; import android.content.Context; import android.os.AsyncTask; import android.os.Process; -import android.support.annotation.CallSuper; +import androidx.annotation.CallSuper; public abstract class ProgressDialogTask extends AsyncTask { private ProgressDialog _dialog; diff --git a/app/src/main/java/me/impy/aegis/ui/views/EntryAdapter.java b/app/src/main/java/me/impy/aegis/ui/views/EntryAdapter.java index 8549b49c..73ca1568 100644 --- a/app/src/main/java/me/impy/aegis/ui/views/EntryAdapter.java +++ b/app/src/main/java/me/impy/aegis/ui/views/EntryAdapter.java @@ -1,6 +1,6 @@ package me.impy.aegis.ui.views; -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/me/impy/aegis/ui/views/EntryHolder.java b/app/src/main/java/me/impy/aegis/ui/views/EntryHolder.java index 1e586524..9fbe9a97 100644 --- a/app/src/main/java/me/impy/aegis/ui/views/EntryHolder.java +++ b/app/src/main/java/me/impy/aegis/ui/views/EntryHolder.java @@ -3,9 +3,8 @@ package me.impy.aegis.ui.views; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.PorterDuff; -import android.graphics.drawable.BitmapDrawable; -import android.graphics.drawable.Drawable; -import android.support.v7.widget.RecyclerView; + +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.TextView; @@ -17,7 +16,6 @@ import me.impy.aegis.db.DatabaseEntry; import me.impy.aegis.helpers.TextDrawableHelper; import me.impy.aegis.helpers.UiRefresher; import me.impy.aegis.otp.HotpInfo; -import me.impy.aegis.otp.OtpInfoException; import me.impy.aegis.otp.TotpInfo; public class EntryHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/me/impy/aegis/ui/views/EntryListView.java b/app/src/main/java/me/impy/aegis/ui/views/EntryListView.java index 1d305949..508078c2 100644 --- a/app/src/main/java/me/impy/aegis/ui/views/EntryListView.java +++ b/app/src/main/java/me/impy/aegis/ui/views/EntryListView.java @@ -2,10 +2,10 @@ package me.impy.aegis.ui.views; import android.graphics.PorterDuff; import android.os.Bundle; -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 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/me/impy/aegis/ui/views/PeriodProgressBar.java b/app/src/main/java/me/impy/aegis/ui/views/PeriodProgressBar.java index 3552ba66..23b4f9e7 100644 --- a/app/src/main/java/me/impy/aegis/ui/views/PeriodProgressBar.java +++ b/app/src/main/java/me/impy/aegis/ui/views/PeriodProgressBar.java @@ -3,7 +3,7 @@ package me.impy.aegis.ui.views; import android.animation.ObjectAnimator; import android.content.Context; import android.os.Build; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import android.util.AttributeSet; import android.view.animation.LinearInterpolator; import android.widget.ProgressBar; diff --git a/app/src/main/java/me/impy/aegis/ui/views/SlotAdapter.java b/app/src/main/java/me/impy/aegis/ui/views/SlotAdapter.java index 6a0c084b..bfceef48 100644 --- a/app/src/main/java/me/impy/aegis/ui/views/SlotAdapter.java +++ b/app/src/main/java/me/impy/aegis/ui/views/SlotAdapter.java @@ -1,6 +1,6 @@ package me.impy.aegis.ui.views; -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/me/impy/aegis/ui/views/SlotHolder.java b/app/src/main/java/me/impy/aegis/ui/views/SlotHolder.java index dd661231..be0efc24 100644 --- a/app/src/main/java/me/impy/aegis/ui/views/SlotHolder.java +++ b/app/src/main/java/me/impy/aegis/ui/views/SlotHolder.java @@ -1,6 +1,6 @@ package me.impy.aegis.ui.views; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; diff --git a/app/src/main/res/layout/activity_auth.xml b/app/src/main/res/layout/activity_auth.xml index 23fc8329..be1e052f 100644 --- a/app/src/main/res/layout/activity_auth.xml +++ b/app/src/main/res/layout/activity_auth.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/activity_edit_entry.xml b/app/src/main/res/layout/activity_edit_entry.xml index 12d2ff89..7935fa6c 100644 --- a/app/src/main/res/layout/activity_edit_entry.xml +++ b/app/src/main/res/layout/activity_edit_entry.xml @@ -154,7 +154,7 @@ android:orientation="horizontal" android:gravity="center_vertical"> - - - - - - + diff --git a/app/src/main/res/layout/activity_intro.xml b/app/src/main/res/layout/activity_intro.xml index ebf7abe0..141ee724 100644 --- a/app/src/main/res/layout/activity_intro.xml +++ b/app/src/main/res/layout/activity_intro.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e3e901c8..3302f7e8 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/activity_slots.xml b/app/src/main/res/layout/activity_slots.xml index ac742715..f82b8f9b 100644 --- a/app/src/main/res/layout/activity_slots.xml +++ b/app/src/main/res/layout/activity_slots.xml @@ -1,5 +1,5 @@ - @@ -19,7 +19,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - + - + diff --git a/app/src/main/res/layout/fragment_entry_list_view.xml b/app/src/main/res/layout/fragment_entry_list_view.xml index 6809001a..003a0e3e 100644 --- a/app/src/main/res/layout/fragment_entry_list_view.xml +++ b/app/src/main/res/layout/fragment_entry_list_view.xml @@ -14,7 +14,7 @@ android:visibility="gone" android:max="1000"/> - - - + diff --git a/build.gradle b/build.gradle index 65ebae31..c3ac8137 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle.properties b/gradle.properties index 5f8975db..9d7aa3a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,6 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=512m diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e0557639..4222aaa7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue May 08 19:45:12 CEST 2018 +#Tue Sep 25 14:16:38 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip