luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-04-21 22:39:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Migrated project to AndroidX

Browse source
This commit is contained in:
Michael Schättgen 2018-09-25 16:26:57 +02:00
parent 66fe809538
commit 2152e2617f
40 changed files with 78 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.idea/misc.xml generated
View file

@ -24,7 +24,7 @@
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

12
app/build.gradle
View file

@ -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'

2
app/src/main/java/me/impy/aegis/AegisApplication.java
View file

@ -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;

2
app/src/main/java/me/impy/aegis/db/DatabaseEntryList.java
View file

@ -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;

2
app/src/main/java/me/impy/aegis/helpers/FingerprintUiHelper.java
View file

@ -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;

2
app/src/main/java/me/impy/aegis/helpers/ItemTouchHelperAdapter.java
View file

@ -1,6 +1,6 @@
package me.impy.aegis.helpers;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView;
public interface ItemTouchHelperAdapter {

4
app/src/main/java/me/impy/aegis/helpers/PermissionHelper.java
View file

@ -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;

4
app/src/main/java/me/impy/aegis/helpers/SimpleItemTouchHelperCallback.java
View file

@ -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 {

2
app/src/main/java/me/impy/aegis/helpers/SpinnerHelper.java
View file

@ -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;

2
app/src/main/java/me/impy/aegis/ui/AegisActivity.java
View file

@ -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;

2
app/src/main/java/me/impy/aegis/ui/AuthActivity.java
View file

@ -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;

6
app/src/main/java/me/impy/aegis/ui/EditEntryActivity.java
View file

@ -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;

2
app/src/main/java/me/impy/aegis/ui/IntroActivity.java
View file

@ -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;

2
app/src/main/java/me/impy/aegis/ui/MainActivity.java
View file

@ -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;

4
app/src/main/java/me/impy/aegis/ui/PreferencesFragment.java
View file

@ -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;

8
app/src/main/java/me/impy/aegis/ui/SlotManagerActivity.java
View file

@ -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;

2
app/src/main/java/me/impy/aegis/ui/dialogs/Dialogs.java
View file

@ -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;

4
app/src/main/java/me/impy/aegis/ui/dialogs/FingerprintDialogFragment.java
View file

@ -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;

4
app/src/main/java/me/impy/aegis/ui/dialogs/PasswordDialogFragment.java
View file

@ -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;

2
app/src/main/java/me/impy/aegis/ui/dialogs/SlotDialogFragment.java
View file

@ -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;

6
app/src/main/java/me/impy/aegis/ui/preferences/SwitchPreference.java
View file

@ -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 {

4
app/src/main/java/me/impy/aegis/ui/slides/CustomAuthenticatedSlide.java
View file

@ -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;

4
app/src/main/java/me/impy/aegis/ui/slides/CustomAuthenticationSlide.java
View file

@ -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;

2
app/src/main/java/me/impy/aegis/ui/tasks/ProgressDialogTask.java
View file

@ -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<Params, Result> extends AsyncTask<Params, Void, Result> {
private ProgressDialog _dialog;

2
app/src/main/java/me/impy/aegis/ui/views/EntryAdapter.java
View file

@ -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;

6
app/src/main/java/me/impy/aegis/ui/views/EntryHolder.java
View file

@ -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 {

8
app/src/main/java/me/impy/aegis/ui/views/EntryListView.java
View file

@ -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;

2
app/src/main/java/me/impy/aegis/ui/views/PeriodProgressBar.java
View file

@ -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;

2
app/src/main/java/me/impy/aegis/ui/views/SlotAdapter.java
View file

@ -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;

2
app/src/main/java/me/impy/aegis/ui/views/SlotHolder.java
View file

@ -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;

4
app/src/main/res/layout/activity_auth.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@ -85,4 +85,4 @@
android:text="A fingerprint slot was found, but it appears to have been invalidated by the Android keystore. Go to &quot;Settings -> Key slots&quot; to readd your fingerprint."/>
</LinearLayout>
</LinearLayout>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

12
app/src/main/res/layout/activity_edit_entry.xml
View file

@ -154,7 +154,7 @@
android:orientation="horizontal"
android:gravity="center_vertical">
<android.support.v7.widget.AppCompatSpinner
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/spinner_type"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -165,7 +165,7 @@
android:layout_gravity="left"
android:backgroundTint="#949494"
style="@style/Base.Widget.AppCompat.Spinner.Underlined"/>
<android.support.v7.widget.AppCompatSpinner
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/spinner_algo"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -175,7 +175,7 @@
android:textAlignment="center"
android:backgroundTint="#949494"
style="@style/Base.Widget.AppCompat.Spinner.Underlined"/>
<android.support.v7.widget.AppCompatSpinner
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/spinner_digits"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -287,7 +287,7 @@
android:layout_marginStart="15dp"
android:layout_marginEnd="20dp"/>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@ -296,7 +296,7 @@
app:hintEnabled="false"
app:passwordToggleEnabled="true">
<android.support.design.widget.TextInputEditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/text_secret"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -304,7 +304,7 @@
android:backgroundTint="#949494"
android:hint="Secret (base32)"
android:inputType="textPassword"/>
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</TableRow>
</TableLayout>
</RelativeLayout>

4
app/src/main/res/layout/activity_intro.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@ -7,4 +7,4 @@
android:fitsSystemWindows="true"
tools:context="me.impy.aegis.ui.IntroActivity">
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

4
app/src/main/res/layout/activity_main.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -50,4 +50,4 @@
</com.getbase.floatingactionbutton.FloatingActionsMenu>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

10
app/src/main/res/layout/activity_slots.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@ -9,7 +9,7 @@
<android.support.v4.widget.NestedScrollView
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list_slots"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -82,6 +82,6 @@
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

2
app/src/main/res/layout/fragment_entry_list_view.xml
View file

@ -14,7 +14,7 @@
android:visibility="gone"
android:max="1000"/>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="0dp"
android:scrollbars="vertical"

4
app/src/main/res/xml/preferences.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/settings">
<PreferenceCategory
@ -54,4 +54,4 @@
android:summary="@string/pref_export_summary"/>
</PreferenceCategory>
</android.support.v7.preference.PreferenceScreen>
</androidx.preference.PreferenceScreen>

2
build.gradle
View file

@ -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

2
gradle.properties
View file

@ -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

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -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