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

Change preferences as compat

Browse Source
This commit is contained in:
J-Jamet
2017-12-09 00:48:34 +01:00
parent b45a8b5c94
commit 37279af514
5 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/keepassdroid/settings/RoundsPreference.java
View File

@@ -36,6 +36,7 @@ import com.keepassdroid.database.PwDatabase;
import com.keepassdroid.database.edit.OnFinish; import com.keepassdroid.database.edit.OnFinish;
import com.keepassdroid.database.edit.SaveDB; import com.keepassdroid.database.edit.SaveDB;
// TODO Change to Compat
public class RoundsPreference extends DialogPreference { public class RoundsPreference extends DialogPreference {
private PwDatabase mPM; private PwDatabase mPM;

4
app/src/main/res/values-v14/styles.xml
View File

@@ -2,9 +2,9 @@
<resources> <resources>
<!-- For setting encapsulation --> <!-- For setting encapsulation -->
<style name="KeepassDXStyle.Light" parent="KeepassDXStyle.Light.v21" > <style name="KeepassDXStyle.Light" parent="KeepassDXStyle.Light.v21" >
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item> <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14</item>
</style> </style>
<style name="KeepassDXStyle.Night" parent="KeepassDXStyle.Night.v21" > <style name="KeepassDXStyle.Night" parent="KeepassDXStyle.Night.v21" >
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item> <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14</item>
</style> </style>
</resources> </resources>

56
app/src/main/res/xml/app_preferences.xml
View File

@@ -17,33 +17,33 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with KeePass DX. If not, see <http://www.gnu.org/licenses/>. along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
--> -->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<PreferenceCategory <android.support.v7.preference.PreferenceCategory
android:title="@string/general"> android:title="@string/general">
<SwitchPreference <android.support.v14.preference.SwitchPreference
android:summary="@string/omitbackup_summary" android:summary="@string/omitbackup_summary"
android:defaultValue="@bool/omitbackup_default" android:defaultValue="@bool/omitbackup_default"
android:title="@string/omitbackup_title" android:title="@string/omitbackup_title"
android:key="@string/omitbackup_key"/> android:key="@string/omitbackup_key"/>
<SwitchPreference <android.support.v14.preference.SwitchPreference
android:summary="@string/use_saf_summary" android:summary="@string/use_saf_summary"
android:defaultValue="@bool/saf_default" android:defaultValue="@bool/saf_default"
android:title="@string/use_saf_title" android:title="@string/use_saf_title"
android:key="@string/saf_key"/> android:key="@string/saf_key"/>
<SwitchPreference <android.support.v14.preference.SwitchPreference
android:key="@string/clipboard_notifications_key" android:key="@string/clipboard_notifications_key"
android:title="@string/clipboard_notifications_title" android:title="@string/clipboard_notifications_title"
android:defaultValue="@bool/clipboard_notifications_default" android:defaultValue="@bool/clipboard_notifications_default"
android:summary="@string/clipboard_notifications_summary" /> android:summary="@string/clipboard_notifications_summary" />
</PreferenceCategory> </android.support.v7.preference.PreferenceCategory>
<PreferenceCategory <android.support.v7.preference.PreferenceCategory
android:title="@string/lock"> android:title="@string/lock">
<ListPreference <android.support.v7.preference.ListPreference
android:key="@string/clipboard_timeout_key" android:key="@string/clipboard_timeout_key"
android:title="@string/clipboard_timeout" android:title="@string/clipboard_timeout"
android:summary="@string/clipboard_timeout_summary" android:summary="@string/clipboard_timeout_summary"
@@ -51,7 +51,7 @@
android:entryValues="@array/clipboard_timeout_values" android:entryValues="@array/clipboard_timeout_values"
android:dialogTitle="@string/clipboard_timeout" android:dialogTitle="@string/clipboard_timeout"
android:defaultValue="@string/clipboard_timeout_default"/> android:defaultValue="@string/clipboard_timeout_default"/>
<ListPreference <android.support.v7.preference.ListPreference
android:key="@string/app_timeout_key" android:key="@string/app_timeout_key"
android:title="@string/app_timeout" android:title="@string/app_timeout"
android:summary="@string/app_timeout_summary" android:summary="@string/app_timeout_summary"
@@ -59,17 +59,17 @@
android:entryValues="@array/clipboard_timeout_values" android:entryValues="@array/clipboard_timeout_values"
android:dialogTitle="@string/app_timeout" android:dialogTitle="@string/app_timeout"
android:defaultValue="@string/clipboard_timeout_default"/> android:defaultValue="@string/clipboard_timeout_default"/>
<SwitchPreference <android.support.v14.preference.SwitchPreference
android:key="@string/lock_database_screen_off_key" android:key="@string/lock_database_screen_off_key"
android:title="@string/lock_database_screen_off_title" android:title="@string/lock_database_screen_off_title"
android:summary="@string/lock_database_screen_off_summary" android:summary="@string/lock_database_screen_off_summary"
android:defaultValue="@bool/lock_database_screen_off_default"/> android:defaultValue="@bool/lock_database_screen_off_default"/>
</PreferenceCategory> </android.support.v7.preference.PreferenceCategory>
<PreferenceCategory <android.support.v7.preference.PreferenceCategory
android:title="@string/password"> android:title="@string/password">
<SeekBarPreference <android.support.v7.preference.SeekBarPreference
android:key="@string/password_length_key" android:key="@string/password_length_key"
android:title="@string/password_size_title" android:title="@string/password_size_title"
android:summary="@string/password_size_summary" android:summary="@string/password_size_summary"
@@ -77,7 +77,7 @@
app:min="@string/min_password_length" app:min="@string/min_password_length"
android:max="@string/max_password_length" /> android:max="@string/max_password_length" />
<MultiSelectListPreference <android.support.v14.preference.MultiSelectListPreference
android:key="@string/list_password_generator_options_key" android:key="@string/list_password_generator_options_key"
android:title="@string/list_password_generator_options_title" android:title="@string/list_password_generator_options_title"
android:summary="@string/list_password_generator_options_summary" android:summary="@string/list_password_generator_options_summary"
@@ -85,53 +85,53 @@
android:entryValues="@array/list_password_generator_options_values" android:entryValues="@array/list_password_generator_options_values"
android:defaultValue="@array/list_password_generator_options_default_values"/> android:defaultValue="@array/list_password_generator_options_default_values"/>
<SwitchPreference <android.support.v14.preference.SwitchPreference
android:key="@string/maskpass_key" android:key="@string/maskpass_key"
android:title="@string/maskpass_title" android:title="@string/maskpass_title"
android:summary="@string/maskpass_summary" android:summary="@string/maskpass_summary"
android:defaultValue="@bool/maskpass_default"/> android:defaultValue="@bool/maskpass_default"/>
</PreferenceCategory> </android.support.v7.preference.PreferenceCategory>
<PreferenceCategory <android.support.v7.preference.PreferenceCategory
android:title="@string/history"> android:title="@string/history">
<SwitchPreference <android.support.v14.preference.SwitchPreference
android:summary="@string/recentfile_summary" android:summary="@string/recentfile_summary"
android:defaultValue="@bool/recentfile_default" android:defaultValue="@bool/recentfile_default"
android:title="@string/recentfile_title" android:title="@string/recentfile_title"
android:key="@string/recentfile_key"/> android:key="@string/recentfile_key"/>
<SwitchPreference <android.support.v14.preference.SwitchPreference
android:key="@string/keyfile_key" android:key="@string/keyfile_key"
android:title="@string/remember_keyfile_title" android:title="@string/remember_keyfile_title"
android:summary="@string/remember_keyfile_summary" android:summary="@string/remember_keyfile_summary"
android:dependency="@string/recentfile_key" android:dependency="@string/recentfile_key"
android:defaultValue="@bool/keyfile_default"/> android:defaultValue="@bool/keyfile_default"/>
</PreferenceCategory> </android.support.v7.preference.PreferenceCategory>
<PreferenceCategory <android.support.v7.preference.PreferenceCategory
android:title="@string/fingerprint"> android:title="@string/fingerprint">
<SwitchPreference <android.support.v14.preference.SwitchPreference
android:key="@string/fingerprint_enable_key" android:key="@string/fingerprint_enable_key"
android:title="@string/fingerprint_enable_title" android:title="@string/fingerprint_enable_title"
android:summary="@string/fingerprint_enable_summary" android:summary="@string/fingerprint_enable_summary"
android:defaultValue="@bool/fingerprint_enable_default"/> android:defaultValue="@bool/fingerprint_enable_default"/>
</PreferenceCategory> </android.support.v7.preference.PreferenceCategory>
<PreferenceCategory <android.support.v7.preference.PreferenceCategory
android:title="@string/appearance"> android:title="@string/appearance">
<ListPreference <android.support.v7.preference.ListPreference
android:title="@string/style_choose_title" android:title="@string/style_choose_title"
android:summary="@string/style_choose_summary" android:summary="@string/style_choose_summary"
android:key="@string/setting_style_key" android:key="@string/setting_style_key"
android:defaultValue="@string/list_style_name_light" android:defaultValue="@string/list_style_name_light"
android:entries="@array/list_style_names" android:entries="@array/list_style_names"
android:entryValues="@array/list_style_values" /> android:entryValues="@array/list_style_values" />
<ListPreference <android.support.v7.preference.ListPreference
android:key="@string/list_size_key" android:key="@string/list_size_key"
android:title="@string/list_size_title" android:title="@string/list_size_title"
android:summary="@string/list_size_summary" android:summary="@string/list_size_summary"
@@ -140,5 +140,5 @@
android:dialogTitle="@string/list_size_summary" android:dialogTitle="@string/list_size_summary"
android:defaultValue="@string/list_size_default"/> android:defaultValue="@string/list_size_default"/>
</PreferenceCategory> </android.support.v7.preference.PreferenceCategory>
</PreferenceScreen> </android.support.v7.preference.PreferenceScreen>

10
app/src/main/res/xml/db_preferences.xml
View File

@@ -17,13 +17,13 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with KeePass DX. If not, see <http://www.gnu.org/licenses/>. along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
--> -->
<PreferenceScreen <android.support.v7.preference.PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"> xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory <android.support.v7.preference.PreferenceCategory
android:title="@string/general"> android:title="@string/general">
<Preference <android.support.v7.preference.Preference
android:key="@string/algorithm_key" android:key="@string/algorithm_key"
android:title="@string/algorithm" android:title="@string/algorithm"
android:enabled="false"/> android:enabled="false"/>
@@ -35,5 +35,5 @@
android:positiveButtonText="@string/entry_save" android:positiveButtonText="@string/entry_save"
android:negativeButtonText="@string/entry_cancel"/> android:negativeButtonText="@string/entry_cancel"/>
</PreferenceCategory> </android.support.v7.preference.PreferenceCategory>
</PreferenceScreen> </android.support.v7.preference.PreferenceScreen>

18
app/src/main/res/xml/preferences.xml
View File

@@ -17,27 +17,27 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with KeePass DX. If not, see <http://www.gnu.org/licenses/>. along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
--> -->
<PreferenceScreen <android.support.v7.preference.PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"> xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory <android.support.v7.preference.PreferenceCategory
android:title="@string/application"> android:title="@string/application">
<Preference <android.support.v7.preference.Preference
android:key="@string/app_key" android:key="@string/app_key"
android:title="@string/menu_app_settings" android:title="@string/menu_app_settings"
android:icon="@drawable/ic_phone_android_white_24dp" android:icon="@drawable/ic_phone_android_white_24dp"
android:persistent="false" /> android:persistent="false" />
</PreferenceCategory> </android.support.v7.preference.PreferenceCategory>
<PreferenceCategory <android.support.v7.preference.PreferenceCategory
android:title="@string/database"> android:title="@string/database">
<Preference <android.support.v7.preference.Preference
android:key="@string/db_key" android:key="@string/db_key"
android:title="@string/menu_db_settings" android:title="@string/menu_db_settings"
android:icon="@drawable/ic_data_usage_white_24dp" android:icon="@drawable/ic_data_usage_white_24dp"
android:persistent="false" /> android:persistent="false" />
<!-- TODO change dialog android:summary="@string/rounds_fix" --> <!-- TODO change dialog android:summary="@string/rounds_fix" -->
<EditTextPreference <android.support.v7.preference.EditTextPreference
android:key="@string/roundsFix_key" android:key="@string/roundsFix_key"
android:title="@string/rounds_fix" android:title="@string/rounds_fix"
android:summary="@string/rounds_fix_explanation" android:summary="@string/rounds_fix_explanation"
@@ -46,6 +46,6 @@
android:numeric="integer" android:numeric="integer"
android:inputType="numberDecimal" android:inputType="numberDecimal"
android:digits="0123456789"/> android:digits="0123456789"/>
</PreferenceCategory> </android.support.v7.preference.PreferenceCategory>
</PreferenceScreen> </android.support.v7.preference.PreferenceScreen>