From a765bd125ed96d2afe62d3b5db33ab2d18e8f462 Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Sun, 2 Feb 2014 07:03:40 +0100 Subject: [PATCH] fixed a few theme issues implemented selection in preferences and recreation of activities --- .gitignore | 17 + .../KeePassLib2Android.csproj | 2 +- .../Kp2aBusinessLogic.csproj | 10 +- .../database/KdbDatabaseLoader.cs | 11 +- src/keepass2android/CreateDatabaseActivity.cs | 14 + src/keepass2android/EntryActivity.cs | 1 + src/keepass2android/EntryEditActivity.cs | 2 +- src/keepass2android/ExportDatabaseActivity.cs | 2 +- .../FileStorageSelectionActivity.cs | 15 +- src/keepass2android/GroupActivity.cs | 1 + src/keepass2android/GroupBaseActivity.cs | 2 +- src/keepass2android/GroupEditActivity.cs | 14 + src/keepass2android/IconPickerActivity.cs | 1 + src/keepass2android/KeePass.cs | 9 + src/keepass2android/LockCloseActivity.cs | 9 + src/keepass2android/LockCloseListActivity.cs | 9 +- src/keepass2android/NfcOtpActivity.cs | 182 +- src/keepass2android/PasswordActivity.cs | 9 +- src/keepass2android/QuickUnlock.cs | 10 + .../Resources/Resource.designer.cs | 7555 ++++------------- .../ic_menu_remove_field_holo_light.png | Bin 1157 -> 1358 bytes .../Resources/layout-v14/SaveButton.xml | 2 +- .../Resources/layout-v14/entry_edit.xml | 2 +- .../layout-v14/generate_password.xml | 4 +- .../Resources/layout-v14/group_add_entry.xml | 6 +- .../layout/file_selection_buttons.xml | 6 +- .../layout/file_selection_filename.xml | 2 +- .../Resources/layout/search.xml | 2 +- .../Resources/menu-v11/password.xml | 2 +- .../Resources/values-v14/styles.xml | 6 +- .../Resources/values-v14/styles_dark.xml | 16 +- .../Resources/values-v14/styles_light.xml | 21 +- .../Resources/values/config.xml | 9 +- .../Resources/values/strings.xml | 10 +- .../Resources/values/styles.xml | 7 +- .../Resources/xml/preferences.xml | 8 + src/keepass2android/Utils/Util.cs | 2 + .../fileselect/FileSelectActivity.cs | 9 +- .../fileselect/FileStorageSetupActivity.cs | 9 + src/keepass2android/keepass2android.csproj | 76 +- src/keepass2android/search/SearchActivity.cs | 2 +- src/keepass2android/search/SearchResults.cs | 2 +- .../settings/AppSettingsActivity.cs | 32 + .../settings/DatabaseSettingsActivity.cs | 27 + 44 files changed, 2136 insertions(+), 6001 deletions(-) diff --git a/.gitignore b/.gitignore index cbba5ea8..6af2ddc5 100644 --- a/.gitignore +++ b/.gitignore @@ -180,3 +180,20 @@ Thumbs.db /src/AppCompatV7Binding/bin/ReleaseNoNet /src/java/KP2ASoftKeyboard2/java/projectzip + +/src/JavaFileStorageBindings/bin/ReleaseNoNet + +/src/KP2AKdbLibraryBinding/bin/Debug + +/src/KP2AKdbLibraryBinding/bin/Release +/src/KP2AKdbLibraryBinding/obj/Debug + +/src/KP2AKdbLibraryBinding/obj/Release + +/src/java/.metadata + +/src/java/JavaFileStorage/.google_apis/drive-v2/drive + +/src/java/JavaFileStorage/.google_apis/drive-v2r102lv1.16.0-rc/drive + +/src/java/JavaFileStorage/libs diff --git a/src/KeePassLib2Android/KeePassLib2Android.csproj b/src/KeePassLib2Android/KeePassLib2Android.csproj index f0c6a69b..275418c0 100644 --- a/src/KeePassLib2Android/KeePassLib2Android.csproj +++ b/src/KeePassLib2Android/KeePassLib2Android.csproj @@ -20,7 +20,7 @@ full False bin\Debug - DEBUG;EXCLUDE_TWOFISH;INCLUDE_KEYBOARD;INCLUDE_FILECHOOSER;EXCLUDE_JAVAFILESTORAGE + DEBUG;EXCLUDE_TWOFISH;EXCLUDE_KEYBOARD;EXCLUDE_FILECHOOSER;EXCLUDE_JAVAFILESTORAGE;EXCLUDE_KEYTRANSFORM prompt 4 False diff --git a/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj b/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj index 21336fde..5ef6e781 100644 --- a/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj +++ b/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj @@ -20,7 +20,7 @@ full false bin\Debug\ - TRACE;DEBUG;EXCLUDE_TWOFISH;INCLUDE_KEYBOARD;INCLUDE_FILECHOOSER;EXCLUDE_JAVAFILESTORAGE + TRACE;DEBUG;EXCLUDE_TWOFISH;EXCLUDE_KEYBOARD;EXCLUDE_FILECHOOSER;EXCLUDE_JAVAFILESTORAGE;EXCLUDE_KEYTRANSFORM prompt 4 @@ -112,18 +112,10 @@ - - {48574278-4779-4b3a-a9e4-9cf1bc285d0b} - JavaFileStorageBindings - {545b4a6b-8bba-4fbe-92fc-4ac060122a54} KeePassLib2Android - - {70d3844a-d9fa-4a64-b205-a84c6a822196} - KP2AKdbLibraryBinding - @@ -41,7 +41,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:paddingRight="20dp" - android:drawableLeft="@drawable/navigation_cancel" + android:drawableLeft="?attr/CancelDrawable" android:drawablePadding="8dp" android:gravity="center_vertical" android:text="@android:string/cancel" /> diff --git a/src/keepass2android/Resources/layout-v14/group_add_entry.xml b/src/keepass2android/Resources/layout-v14/group_add_entry.xml index 7a2076af..fcce2fa0 100644 --- a/src/keepass2android/Resources/layout-v14/group_add_entry.xml +++ b/src/keepass2android/Resources/layout-v14/group_add_entry.xml @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:paddingRight="20dp" - android:drawableLeft="@drawable/btn_new_group" + android:drawableLeft="?attr/NewGroupDrawable" android:drawablePadding="8dp" android:gravity="center_vertical" android:text="@string/add_group" /> @@ -48,7 +48,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:paddingRight="20dp" - android:drawableLeft="@drawable/device_access_new_account" + android:drawableLeft="?attr/NewEntryDrawable" android:drawablePadding="8dp" android:gravity="center_vertical" android:text="@string/add_entry" /> @@ -65,7 +65,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:paddingRight="20dp" - android:drawableLeft="@drawable/btn_new_group" + android:drawableLeft="?attr/NewGroupDrawable" android:drawablePadding="8dp" android:gravity="center_vertical" android:text="@string/insert_element_here" /> diff --git a/src/keepass2android/Resources/layout/file_selection_buttons.xml b/src/keepass2android/Resources/layout/file_selection_buttons.xml index 57664f8f..98d58201 100644 --- a/src/keepass2android/Resources/layout/file_selection_buttons.xml +++ b/src/keepass2android/Resources/layout/file_selection_buttons.xml @@ -16,19 +16,19 @@ android:layout_height="wrap_content" android:id="@+id/start_open_file" android:minHeight="45dp" - android:drawableTop="@drawable/collections_collection" /> + android:drawableTop="?attr/OpenFileDrawable" />