rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add dev to crypt settings and comment transition

Browse Source
This commit is contained in:
J-Jamet
2018-04-20 19:59:31 +02:00
parent 6754881847
commit 02ee58efa7
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/kunzisoft/keepass/settings/NestedSettingsFragment.java
View File

@@ -270,13 +270,7 @@ public class NestedSettingsFragment extends PreferenceFragmentCompat
}
SwitchPreference keyboardPreference = (SwitchPreference) findPreference(getString(R.string.magic_keyboard_key));
keyboardPreference.setOnPreferenceClickListener(preference -> {
FragmentManager fragmentManager = getFragmentManager();
assert fragmentManager != null;
((SwitchPreference) preference).setChecked(false);
new UnderDevelopmentFeatureDialogFragment().show(getFragmentManager(), "underDevFeatureDialog");
return false;
});
preferenceInDevelopment(keyboardPreference);
break;
@@ -323,10 +317,12 @@ public class NestedSettingsFragment extends PreferenceFragmentCompat
// Encryption Algorithm
Preference algorithmPref = findPreference(getString(R.string.encryption_algorithm_key));
algorithmPref.setSummary(db.getEncryptionAlgorithmName(getResources()));
preferenceInDevelopment(algorithmPref);
// Key derivation function
Preference kdfPref = findPreference(getString(R.string.key_derivation_function_key));
kdfPref.setSummary(db.getKeyDerivationName());
preferenceInDevelopment(kdfPref);
// Round encryption
Preference roundPref = findPreference(getString(R.string.transform_rounds_key));
@@ -400,6 +396,18 @@ public class NestedSettingsFragment extends PreferenceFragmentCompat
}
}
private void preferenceInDevelopment(Preference preferenceInDev) {
preferenceInDev.setOnPreferenceClickListener(preference -> {
FragmentManager fragmentManager = getFragmentManager();
assert fragmentManager != null;
try { // don't check if we can
((SwitchPreference) preference).setChecked(false);
} catch (Exception e) {}
new UnderDevelopmentFeatureDialogFragment().show(getFragmentManager(), "underDevFeatureDialog");
return false;
});
}
@Override
public void onStop() {
super.onStop();

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

@@ -29,8 +29,9 @@
<!-- Base application theme. -->
<!-- For setting encapsulation -->
<style name="KeepassDXStyle.Light.v21" parent="Theme.AppCompat.Light">
<!-- TODO Activate after navigation drawer
<item name="android:windowAnimationStyle">@style/KeepassDXStyle.ActivityAnimation</item>
-->
<item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item>
@@ -77,8 +78,9 @@
<item name="whiteFab">@style/KeepassDXStyle.Fab.White</item>
</style>
<style name="KeepassDXStyle.Night.v21" parent="Theme.AppCompat">
<!--
<item name="android:windowAnimationStyle">@style/KeepassDXStyle.ActivityAnimation</item>
-->
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>