aiden
/
Aegis
mirror of https://github.com/beemdevelopment/Aegis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Finish updating to API 28

Browse Source 
Also temporarily disable the preference fix library
pull/120/head
Alexander Bakker 7 years ago
parent 2152e2617f
commit 3435a4077e
5 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File

2
.idea/misc.xml
Unescape Escape View File

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

4
app/build.gradle
Unescape Escape View File

@ -6,7 +6,7 @@ android {
defaultConfig { defaultConfig {
applicationId "me.impy.aegis" applicationId "me.impy.aegis"
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 27 targetSdkVersion 28
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
} }
@ -42,7 +42,7 @@ dependencies {
implementation 'com.github.esafirm.android-image-picker:imagepicker:1.13.0' implementation 'com.github.esafirm.android-image-picker:imagepicker:1.13.0'
implementation 'com.madgag.spongycastle:core:1.58.0.0' implementation 'com.madgag.spongycastle:core:1.58.0.0'
implementation 'com.mattprecious.swirl:swirl:1.0.0' implementation 'com.mattprecious.swirl:swirl:1.0.0'
implementation 'com.takisoft.fix:preference-v7:27.1.1.1' implementation 'androidx.preference:preference:1.0.0'
implementation 'de.hdodenhof:circleimageview:2.2.0' implementation 'de.hdodenhof:circleimageview:2.2.0'
implementation 'me.dm7.barcodescanner:zxing:1.9' implementation 'me.dm7.barcodescanner:zxing:1.9'
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'

4
app/src/main/java/me/impy/aegis/ui/PreferencesFragment.java
Unescape Escape View File

@ -9,7 +9,6 @@ import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference; import androidx.preference.Preference;
import com.takisoft.fix.support.v7.preference.PreferenceFragmentCompat;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.Toast; import android.widget.Toast;
@ -23,6 +22,7 @@ import java.util.Map;
import javax.crypto.Cipher; import javax.crypto.Cipher;
import androidx.preference.PreferenceFragmentCompat;
import me.impy.aegis.AegisApplication; import me.impy.aegis.AegisApplication;
import me.impy.aegis.R; import me.impy.aegis.R;
import me.impy.aegis.crypto.MasterKey; import me.impy.aegis.crypto.MasterKey;
@ -62,7 +62,7 @@ public class PreferencesFragment extends PreferenceFragmentCompat implements Pas
private Preference _slotsPreference; private Preference _slotsPreference;
@Override @Override
public void onCreatePreferencesFix(Bundle savedInstanceState, String rootKey) { public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
addPreferencesFromResource(R.xml.preferences); addPreferencesFromResource(R.xml.preferences);
AegisApplication app = (AegisApplication) getActivity().getApplication(); AegisApplication app = (AegisApplication) getActivity().getApplication();

6
app/src/main/res/values/styles.xml
Unescape Escape View File

@ -16,7 +16,7 @@
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/> <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/> <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
<style name="AppTheme" parent="PreferenceFixTheme.Light.DarkActionBar"> <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="primaryText">@color/primary_text</item> <item name="primaryText">@color/primary_text</item>
<item name="secondaryText">@color/secondary_text</item> <item name="secondaryText">@color/secondary_text</item>
<item name="cardBackground">@color/card_background</item> <item name="cardBackground">@color/card_background</item>
@ -25,7 +25,6 @@
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
<item name="background">@color/background</item> <item name="background">@color/background</item>
<item name="preferenceCategory_marginBottom">0dp</item>
<item name="bottomSheetDialogTheme">@style/Theme.Design.Light.BottomSheetDialog</item> <item name="bottomSheetDialogTheme">@style/Theme.Design.Light.BottomSheetDialog</item>
<item name="iconColorPrimary">@color/icon_primary</item> <item name="iconColorPrimary">@color/icon_primary</item>
@ -50,7 +49,7 @@
<item name="android:windowFullscreen">true</item> <item name="android:windowFullscreen">true</item>
</style> </style>
<style name="AppTheme.Dark" parent="@style/PreferenceFixTheme"> <style name="AppTheme.Dark" parent="Theme.AppCompat">
<item name="primaryText">@color/primary_text_dark</item> <item name="primaryText">@color/primary_text_dark</item>
<item name="secondaryText">@color/secondary_text_dark</item> <item name="secondaryText">@color/secondary_text_dark</item>
<item name="cardBackground">@color/card_background_dark</item> <item name="cardBackground">@color/card_background_dark</item>
@ -59,7 +58,6 @@
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
<item name="background">@color/background_dark</item> <item name="background">@color/background_dark</item>
<item name="preferenceCategory_marginBottom">0dp</item>
<item name="bottomSheetDialogTheme">@style/Theme.Design.BottomSheetDialog</item> <item name="bottomSheetDialogTheme">@style/Theme.Design.BottomSheetDialog</item>
<item name="iconColorPrimary">@color/icon_primary_dark</item> <item name="iconColorPrimary">@color/icon_primary_dark</item>

45
app/src/main/res/xml/preferences.xml
Unescape Escape View File

@ -1,57 +1,70 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <androidx.preference.PreferenceScreen
android:title="@string/settings"> xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/settings">
<PreferenceCategory <PreferenceCategory
android:title="Appearance"> android:title="Appearance"
<android.support.v7.preference.SwitchPreferenceCompat app:iconSpaceReserved="false">
<androidx.preference.SwitchPreferenceCompat
android:defaultValue="false" android:defaultValue="false"
android:key="pref_dark_mode" android:key="pref_dark_mode"
android:title="@string/pref_dark_mode_title" android:title="@string/pref_dark_mode_title"
android:summary="@string/pref_dark_mode_summary"/> android:summary="@string/pref_dark_mode_summary"
app:iconSpaceReserved="false"/>
<android.support.v7.preference.SwitchPreferenceCompat <androidx.preference.SwitchPreferenceCompat
android:defaultValue="false" android:defaultValue="false"
android:key="pref_account_name" android:key="pref_account_name"
android:title="@string/pref_account_name_title" android:title="@string/pref_account_name_title"
android:summary="@string/pref_account_name_summary"/> android:summary="@string/pref_account_name_summary"
app:iconSpaceReserved="false"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:title="Security"> android:title="Security"
<android.support.v7.preference.SwitchPreferenceCompat app:iconSpaceReserved="false">
<androidx.preference.SwitchPreferenceCompat
android:defaultValue="true" android:defaultValue="true"
android:key="pref_secure_screen" android:key="pref_secure_screen"
android:title="@string/pref_secure_screen_title" android:title="@string/pref_secure_screen_title"
android:summary="@string/pref_secure_screen_summary"/> android:summary="@string/pref_secure_screen_summary"
app:iconSpaceReserved="false"/>
<!--<EditTextPreference <!--<EditTextPreference
android:key="pref_timeout" android:key="pref_timeout"
android:title="@string/pref_timeout_title" android:title="@string/pref_timeout_title"
android:summary="@string/pref_timeout_summary" android:summary="@string/pref_timeout_summary"
android:inputType="number" android:inputType="number"
android:defaultValue="30" android:defaultValue="30"
android:dialogTitle="Set number of seconds of inactivity before Aegis locks the database"/>--> android:dialogTitle="Set number of seconds of inactivity before Aegis locks the database"
app:iconSpaceReserved="false"/>-->
<me.impy.aegis.ui.preferences.SwitchPreference <me.impy.aegis.ui.preferences.SwitchPreference
android:key="pref_encryption" android:key="pref_encryption"
android:title="@string/pref_encryption_title" android:title="@string/pref_encryption_title"
android:summary="@string/pref_encryption_summary" android:summary="@string/pref_encryption_summary"
android:persistent="false"/> android:persistent="false"
app:iconSpaceReserved="false"/>
<Preference <Preference
android:key="pref_slots" android:key="pref_slots"
android:title="@string/pref_slots_title" android:title="@string/pref_slots_title"
android:summary="@string/pref_slots_summary"/> android:summary="@string/pref_slots_summary"
app:iconSpaceReserved="false"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:title="Tools"> android:title="Tools"
app:iconSpaceReserved="false">
<Preference <Preference
android:key="pref_import" android:key="pref_import"
android:title="@string/pref_import_title" android:title="@string/pref_import_title"
android:summary="@string/pref_import_summary"/> android:summary="@string/pref_import_summary"
app:iconSpaceReserved="false"/>
<Preference <Preference
android:key="pref_export" android:key="pref_export"
android:title="@string/pref_export_title" android:title="@string/pref_export_title"
android:summary="@string/pref_export_summary"/> android:summary="@string/pref_export_summary"
app:iconSpaceReserved="false"/>
</PreferenceCategory> </PreferenceCategory>
</androidx.preference.PreferenceScreen> </androidx.preference.PreferenceScreen>

Write Preview
Loading…
Cancel
Save