luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-05-16 15:02:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make preferences look decent (material) on KitKat

Browse source 
I have no idea what I'm doing
This commit is contained in:
Alexander Bakker 2018-05-14 18:45:15 +02:00
parent f8891c0225
commit 972a1670eb
6 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@ public class PreferencesActivity extends AegisActivity implements PasswordDialog
_fragment = new PreferencesFragment();
_fragment.setArguments(getIntent().getExtras());
getFragmentManager().beginTransaction().replace(android.R.id.content, _fragment).commit();
getSupportFragmentManager().beginTransaction().replace(android.R.id.content, _fragment).commit();
}
@Override

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

@ -7,11 +7,11 @@ import android.content.Intent;
import android.media.MediaScannerConnection;
import android.net.Uri;
import android.os.Bundle;
import android.preference.EditTextPreference;
import android.preference.Preference;
import android.preference.PreferenceFragment;
import android.support.v7.preference.EditTextPreference;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.preference.Preference;
import com.takisoft.fix.support.v7.preference.PreferenceFragmentCompat;
import android.view.Window;
import android.view.WindowManager;
import android.widget.Toast;
@ -42,7 +42,7 @@ import me.impy.aegis.ui.dialogs.PasswordDialogFragment;
import me.impy.aegis.ui.preferences.SwitchPreference;
import me.impy.aegis.util.ByteInputStream;
public class PreferencesFragment extends PreferenceFragment implements PasswordDialogFragment.Listener {
public class PreferencesFragment extends PreferenceFragmentCompat implements PasswordDialogFragment.Listener {
// activity request codes
private static final int CODE_IMPORT = 0;
private static final int CODE_IMPORT_DECRYPT = 1;
@ -64,8 +64,7 @@ public class PreferencesFragment extends PreferenceFragment implements PasswordD
private Preference _slotsPreference;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
public void onCreatePreferencesFix(Bundle savedInstanceState, String rootKey) {
addPreferencesFromResource(R.xml.preferences);
AegisApplication app = (AegisApplication) getActivity().getApplication();

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

@ -3,10 +3,12 @@ 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 android.util.AttributeSet;
public class SwitchPreference extends android.preference.SwitchPreference {
private OnPreferenceChangeListener _listener;
public class SwitchPreference extends SwitchPreferenceCompat {
private Preference.OnPreferenceChangeListener _listener;
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
public SwitchPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {