From 7a21f26007137e3a3766001ce435170da9aa311e Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Sun, 13 Sep 2015 12:33:24 +0200 Subject: [PATCH] new icons, folder icons are used changed resource ids to not be equal to layout ids (hint from stackoverflow) --- src/KeePass.sln | 511 ++++++++--------- src/Kp2aBusinessLogic/IDrawableFactory.cs | 4 +- src/Kp2aUnitTests/TestDrawableFactory.cs | 4 +- src/MaterialTest2/MaterialTest2.csproj | 6 +- src/MaterialTest2/Resources/values/styles.xml | 2 +- src/keepass2android/EntryEditActivity.cs | 4 +- .../FileStorageSelectionActivity.cs | 9 +- .../GeneratePasswordActivity.cs | 6 +- src/keepass2android/GroupBaseActivity.cs | 2 +- src/keepass2android/GroupEditActivity.cs | 6 +- src/keepass2android/IconPickerActivity.cs | 2 +- src/keepass2android/KeePass.cs | 2 +- src/keepass2android/PasswordActivity.cs | 14 +- .../Properties/AndroidManifest_debug.xml | 2 +- .../drawable-mdpi/ic_action_search.png | Bin 1429 -> 0 bytes .../ic_launcher_folder_small.png | Bin 1522 -> 0 bytes .../drawable-mdpi/ic_menu_copy_holo_light.png | Bin 199 -> 0 bytes .../Resources/drawable-mdpi/ic_menu_view.png | Bin 1508 -> 0 bytes .../drawable-mdpi/ic_notify_loaded.png | Bin 3651 -> 0 bytes .../drawable-mdpi/ic_notify_locked.png | Bin 3637 -> 0 bytes .../drawable-mdpi/ic_notify_offline.png | Bin 8984 -> 0 bytes .../drawable-mdpi/ic_storage_androidget.png | Bin 1185 -> 0 bytes .../drawable-mdpi/ic_storage_androidsend.png | Bin 1185 -> 0 bytes .../drawable-mdpi/ic_storage_content.png | Bin 1185 -> 0 bytes .../drawable-mdpi/ic_storage_dropbox.png | Bin 4711 -> 0 bytes .../drawable-mdpi/ic_storage_dropboxKP2A.png | Bin 4711 -> 0 bytes .../drawable-mdpi/ic_storage_file.png | Bin 1273 -> 0 bytes .../drawable-mdpi/ic_storage_ftp.png | Bin 3141 -> 0 bytes .../drawable-mdpi/ic_storage_gdrive.png | Bin 2254 -> 0 bytes .../drawable-mdpi/ic_storage_http.png | Bin 3141 -> 0 bytes .../drawable-mdpi/ic_storage_https.png | Bin 3141 -> 0 bytes .../drawable-mdpi/ic_storage_sftp.png | Bin 837 -> 0 bytes .../drawable-mdpi/ic_storage_skydrive.png | Bin 1211 -> 0 bytes .../Resources/drawable-mdpi/navheader_bg.png | Bin 4661 -> 0 bytes .../Resources/drawable-mdpi/oktoberfest.png | Bin 156176 -> 0 bytes .../Resources/drawable-mdpi/splashlogo.png | Bin 7049 -> 0 bytes .../Resources/drawable-mdpi/toolbar_bg.png | Bin 13894 -> 0 bytes .../drawable-mdpi/toolbar_bg_quickunlock.png | Bin 14265 -> 0 bytes .../Resources/drawable-mdpi/vdots.png | Bin 319 -> 0 bytes .../Resources/drawable-xhdpi/checkmark.png | Bin 1193 -> 15325 bytes .../Resources/drawable-xhdpi/createnewdb.png | Bin 2256 -> 15529 bytes .../Resources/drawable-xhdpi/ic00.png | Bin 6123 -> 21834 bytes .../Resources/drawable-xhdpi/ic01.png | Bin 8923 -> 25707 bytes .../Resources/drawable-xhdpi/ic02.png | Bin 5501 -> 20428 bytes .../Resources/drawable-xhdpi/ic03.png | Bin 3586 -> 18397 bytes .../Resources/drawable-xhdpi/ic04.png | Bin 4400 -> 19694 bytes .../Resources/drawable-xhdpi/ic05.png | Bin 7916 -> 24110 bytes .../Resources/drawable-xhdpi/ic06.png | Bin 5960 -> 21308 bytes .../Resources/drawable-xhdpi/ic07.png | Bin 3344 -> 18145 bytes .../Resources/drawable-xhdpi/ic08.png | Bin 6842 -> 22411 bytes .../Resources/drawable-xhdpi/ic09.png | Bin 5068 -> 20129 bytes .../Resources/drawable-xhdpi/ic10.png | Bin 6539 -> 24071 bytes .../Resources/drawable-xhdpi/ic11.png | Bin 6971 -> 21804 bytes .../Resources/drawable-xhdpi/ic12.png | Bin 6872 -> 23263 bytes .../Resources/drawable-xhdpi/ic13.png | Bin 8003 -> 23898 bytes .../Resources/drawable-xhdpi/ic14.png | Bin 3454 -> 18494 bytes .../Resources/drawable-xhdpi/ic15.png | Bin 4698 -> 19901 bytes .../Resources/drawable-xhdpi/ic16.png | Bin 7917 -> 23237 bytes .../Resources/drawable-xhdpi/ic17.png | Bin 11501 -> 27850 bytes .../Resources/drawable-xhdpi/ic18.png | Bin 2858 -> 17748 bytes .../Resources/drawable-xhdpi/ic19.png | Bin 4493 -> 19676 bytes .../Resources/drawable-xhdpi/ic20.png | Bin 7533 -> 23103 bytes .../Resources/drawable-xhdpi/ic21.png | Bin 5377 -> 20415 bytes .../Resources/drawable-xhdpi/ic22.png | Bin 3680 -> 18605 bytes .../Resources/drawable-xhdpi/ic23.png | Bin 6284 -> 21682 bytes .../Resources/drawable-xhdpi/ic24.png | Bin 3646 -> 18602 bytes .../Resources/drawable-xhdpi/ic25.png | Bin 3935 -> 19013 bytes .../Resources/drawable-xhdpi/ic26.png | Bin 4288 -> 19131 bytes .../Resources/drawable-xhdpi/ic27.png | Bin 5204 -> 21074 bytes .../Resources/drawable-xhdpi/ic28.png | Bin 6833 -> 21742 bytes .../Resources/drawable-xhdpi/ic29.png | Bin 6277 -> 21648 bytes .../Resources/drawable-xhdpi/ic30.png | Bin 4759 -> 20150 bytes .../Resources/drawable-xhdpi/ic31.png | Bin 3006 -> 18029 bytes .../Resources/drawable-xhdpi/ic32.png | Bin 2851 -> 17787 bytes .../Resources/drawable-xhdpi/ic33.png | Bin 10095 -> 25849 bytes .../Resources/drawable-xhdpi/ic34.png | Bin 7471 -> 22766 bytes .../Resources/drawable-xhdpi/ic35.png | Bin 6427 -> 21412 bytes .../Resources/drawable-xhdpi/ic36.png | Bin 2926 -> 17960 bytes .../Resources/drawable-xhdpi/ic37.png | Bin 6934 -> 23134 bytes .../Resources/drawable-xhdpi/ic38.png | Bin 5788 -> 21213 bytes .../Resources/drawable-xhdpi/ic39.png | Bin 9696 -> 23747 bytes .../Resources/drawable-xhdpi/ic40.png | Bin 6726 -> 22779 bytes .../Resources/drawable-xhdpi/ic41.png | Bin 5101 -> 20011 bytes .../Resources/drawable-xhdpi/ic42.png | Bin 2102 -> 17364 bytes .../Resources/drawable-xhdpi/ic43.png | Bin 8057 -> 23806 bytes .../Resources/drawable-xhdpi/ic44.png | Bin 4586 -> 20511 bytes .../Resources/drawable-xhdpi/ic45.png | Bin 7259 -> 22195 bytes .../Resources/drawable-xhdpi/ic46.png | Bin 7423 -> 23374 bytes .../Resources/drawable-xhdpi/ic47.png | Bin 3681 -> 18760 bytes .../Resources/drawable-xhdpi/ic48.png | Bin 3535 -> 18575 bytes .../Resources/drawable-xhdpi/ic49.png | Bin 2861 -> 17849 bytes .../Resources/drawable-xhdpi/ic50.png | Bin 4115 -> 19127 bytes .../Resources/drawable-xhdpi/ic51.png | Bin 4783 -> 20008 bytes .../Resources/drawable-xhdpi/ic52.png | Bin 4829 -> 19965 bytes .../Resources/drawable-xhdpi/ic53.png | Bin 2624 -> 18296 bytes .../Resources/drawable-xhdpi/ic54.png | Bin 3280 -> 18519 bytes .../Resources/drawable-xhdpi/ic55.png | Bin 4181 -> 19277 bytes .../Resources/drawable-xhdpi/ic56.png | Bin 4550 -> 19943 bytes .../Resources/drawable-xhdpi/ic57.png | Bin 2769 -> 17802 bytes .../Resources/drawable-xhdpi/ic58.png | Bin 6172 -> 21221 bytes .../Resources/drawable-xhdpi/ic59.png | Bin 4448 -> 20718 bytes .../Resources/drawable-xhdpi/ic60.png | Bin 3391 -> 18532 bytes .../Resources/drawable-xhdpi/ic61.png | Bin 5861 -> 21427 bytes .../Resources/drawable-xhdpi/ic62.png | Bin 4472 -> 19710 bytes .../Resources/drawable-xhdpi/ic63.png | Bin 6947 -> 23463 bytes .../Resources/drawable-xhdpi/ic64.png | Bin 196 -> 15033 bytes .../Resources/drawable-xhdpi/ic65.png | Bin 6850 -> 22596 bytes .../Resources/drawable-xhdpi/ic66.png | Bin 5217 -> 20747 bytes .../Resources/drawable-xhdpi/ic67.png | Bin 3763 -> 18875 bytes .../Resources/drawable-xhdpi/ic68.png | Bin 2930 -> 17802 bytes .../drawable-xhdpi/ic_action_search.png | Bin 0 -> 16368 bytes .../drawable-xhdpi/ic_entry_attachments.png | Bin 2176 -> 16505 bytes .../drawable-xhdpi/ic_entry_comments.png | Bin 1357 -> 16419 bytes .../drawable-xhdpi/ic_entry_created.png | Bin 905 -> 17247 bytes .../drawable-xhdpi/ic_entry_expires.png | Bin 905 -> 17041 bytes .../drawable-xhdpi/ic_entry_extras.png | Bin 1649 -> 16802 bytes .../drawable-xhdpi/ic_entry_group.png | Bin 905 -> 16400 bytes .../drawable-xhdpi/ic_entry_modified.png | Bin 905 -> 17168 bytes .../drawable-xhdpi/ic_entry_password.png | Bin 1678 -> 16487 bytes .../drawable-xhdpi/ic_entry_tags.png | Bin 2783 -> 16789 bytes .../Resources/drawable-xhdpi/ic_entry_url.png | Bin 3926 -> 17231 bytes .../drawable-xhdpi/ic_entry_username.png | Bin 1657 -> 15636 bytes .../Resources/drawable-xhdpi/ic_fab_edit.png | Bin 960 -> 15203 bytes .../Resources/drawable-xhdpi/ic_fab_entry.png | Bin 960 -> 15431 bytes .../drawable-xhdpi/ic_fab_folder.png | Bin 520 -> 15170 bytes .../ic_launcher_folder_small.png | Bin 0 -> 15321 bytes .../ic_menu_copy_holo_light.png | Bin 0 -> 15927 bytes .../Resources/drawable-xhdpi/ic_menu_cut.png | Bin 1998 -> 16651 bytes .../drawable-xhdpi/ic_menu_delete.png | Bin 1320 -> 16196 bytes .../Resources/drawable-xhdpi/ic_menu_edit.png | Bin 942 -> 15998 bytes .../Resources/drawable-xhdpi/ic_menu_lock.png | Bin 709 -> 16468 bytes .../drawable-xhdpi/ic_menu_navigate.png | Bin 969 -> 16235 bytes .../Resources/drawable-xhdpi/ic_menu_view.png | Bin 0 -> 16314 bytes .../Resources/drawable-xhdpi/ic_nav_about.png | Bin 463 -> 15952 bytes .../drawable-xhdpi/ic_nav_changedb.png | Bin 1933 -> 15172 bytes .../drawable-xhdpi/ic_nav_donate.png | Bin 2872 -> 15393 bytes .../drawable-xhdpi/ic_nav_search.png | Bin 1895 -> 15509 bytes .../drawable-xhdpi/ic_nav_settings.png | Bin 3826 -> 15532 bytes .../Resources/drawable-xhdpi/ic_nav_sort.png | Bin 778 -> 15184 bytes .../Resources/drawable-xhdpi/ic_notify.png | Bin 1569 -> 16627 bytes .../drawable-xhdpi/ic_notify_keyboard.png | Bin 1849 -> 15815 bytes .../drawable-xhdpi/ic_notify_loaded.png | Bin 0 -> 16491 bytes .../drawable-xhdpi/ic_notify_locked.png | Bin 0 -> 16503 bytes .../drawable-xhdpi/ic_notify_offline.png | Bin 0 -> 17003 bytes .../drawable-xhdpi/ic_plus_button.png | Bin 1949 -> 15881 bytes .../drawable-xhdpi/ic_storage_androidget.png | Bin 0 -> 15869 bytes .../drawable-xhdpi/ic_storage_androidsend.png | Bin 0 -> 15869 bytes .../drawable-xhdpi/ic_storage_content.png | Bin 0 -> 15869 bytes .../drawable-xhdpi/ic_storage_dropbox.png | Bin 0 -> 19658 bytes .../drawable-xhdpi/ic_storage_dropboxKP2A.png | Bin 0 -> 19873 bytes .../drawable-xhdpi/ic_storage_file.png | Bin 0 -> 15411 bytes .../drawable-xhdpi/ic_storage_ftp.png | Bin 0 -> 15334 bytes .../drawable-xhdpi/ic_storage_ftps.png | Bin 0 -> 16012 bytes .../drawable-xhdpi/ic_storage_gdrive.png | Bin 0 -> 16595 bytes .../drawable-xhdpi/ic_storage_http.png | Bin 0 -> 16875 bytes .../drawable-xhdpi/ic_storage_https.png | Bin 0 -> 16861 bytes .../drawable-xhdpi/ic_storage_owncloud.png | Bin 0 -> 17605 bytes .../drawable-xhdpi/ic_storage_sftp.png | Bin 0 -> 15647 bytes .../drawable-xhdpi/ic_storage_skydrive.png | Bin 0 -> 16603 bytes .../Resources/drawable-xhdpi/icf00.png | Bin 0 -> 5951 bytes .../Resources/drawable-xhdpi/icf01.png | Bin 0 -> 8001 bytes .../Resources/drawable-xhdpi/icf02.png | Bin 0 -> 4738 bytes .../Resources/drawable-xhdpi/icf03.png | Bin 0 -> 3925 bytes .../Resources/drawable-xhdpi/icf04.png | Bin 0 -> 4477 bytes .../Resources/drawable-xhdpi/icf05.png | Bin 0 -> 4353 bytes .../Resources/drawable-xhdpi/icf06.png | Bin 0 -> 4360 bytes .../Resources/drawable-xhdpi/icf07.png | Bin 0 -> 3605 bytes .../Resources/drawable-xhdpi/icf08.png | Bin 0 -> 6269 bytes .../Resources/drawable-xhdpi/icf09.png | Bin 0 -> 4849 bytes .../Resources/drawable-xhdpi/icf10.png | Bin 0 -> 6214 bytes .../Resources/drawable-xhdpi/icf11.png | Bin 0 -> 5644 bytes .../Resources/drawable-xhdpi/icf12.png | Bin 0 -> 7106 bytes .../Resources/drawable-xhdpi/icf13.png | Bin 0 -> 6443 bytes .../Resources/drawable-xhdpi/icf14.png | Bin 0 -> 3979 bytes .../Resources/drawable-xhdpi/icf15.png | Bin 0 -> 4557 bytes .../Resources/drawable-xhdpi/icf16.png | Bin 0 -> 6758 bytes .../Resources/drawable-xhdpi/icf17.png | Bin 0 -> 9334 bytes .../Resources/drawable-xhdpi/icf18.png | Bin 0 -> 3384 bytes .../Resources/drawable-xhdpi/icf19.png | Bin 0 -> 4795 bytes .../Resources/drawable-xhdpi/icf20.png | Bin 0 -> 6840 bytes .../Resources/drawable-xhdpi/icf21.png | Bin 0 -> 4994 bytes .../Resources/drawable-xhdpi/icf22.png | Bin 0 -> 3784 bytes .../Resources/drawable-xhdpi/icf23.png | Bin 0 -> 5413 bytes .../Resources/drawable-xhdpi/icf24.png | Bin 0 -> 3841 bytes .../Resources/drawable-xhdpi/icf25.png | Bin 0 -> 4130 bytes .../Resources/drawable-xhdpi/icf26.png | Bin 0 -> 4260 bytes .../Resources/drawable-xhdpi/icf27.png | Bin 0 -> 4263 bytes .../Resources/drawable-xhdpi/icf28.png | Bin 0 -> 5921 bytes .../Resources/drawable-xhdpi/icf29.png | Bin 0 -> 5648 bytes .../Resources/drawable-xhdpi/icf30.png | Bin 0 -> 4809 bytes .../Resources/drawable-xhdpi/icf31.png | Bin 0 -> 3532 bytes .../Resources/drawable-xhdpi/icf32.png | Bin 0 -> 3454 bytes .../Resources/drawable-xhdpi/icf33.png | Bin 0 -> 6099 bytes .../Resources/drawable-xhdpi/icf34.png | Bin 0 -> 6467 bytes .../Resources/drawable-xhdpi/icf35.png | Bin 0 -> 5521 bytes .../Resources/drawable-xhdpi/icf36.png | Bin 0 -> 4100 bytes .../Resources/drawable-xhdpi/icf37.png | Bin 0 -> 6485 bytes .../Resources/drawable-xhdpi/icf38.png | Bin 0 -> 4421 bytes .../Resources/drawable-xhdpi/icf39.png | Bin 0 -> 7458 bytes .../Resources/drawable-xhdpi/icf40.png | Bin 0 -> 6552 bytes .../Resources/drawable-xhdpi/icf41.png | Bin 0 -> 4819 bytes .../Resources/drawable-xhdpi/icf42.png | Bin 0 -> 3260 bytes .../Resources/drawable-xhdpi/icf43.png | Bin 0 -> 5651 bytes .../Resources/drawable-xhdpi/icf44.png | Bin 0 -> 4968 bytes .../Resources/drawable-xhdpi/icf45.png | Bin 0 -> 5898 bytes .../Resources/drawable-xhdpi/icf46.png | Bin 0 -> 6957 bytes .../Resources/drawable-xhdpi/icf47.png | Bin 0 -> 3970 bytes .../Resources/drawable-xhdpi/icf49.png | Bin 0 -> 3443 bytes .../Resources/drawable-xhdpi/icf50.png | Bin 0 -> 4260 bytes .../Resources/drawable-xhdpi/icf51.png | Bin 0 -> 4883 bytes .../Resources/drawable-xhdpi/icf52.png | Bin 0 -> 5097 bytes .../Resources/drawable-xhdpi/icf53.png | Bin 0 -> 3537 bytes .../Resources/drawable-xhdpi/icf54.png | Bin 0 -> 3700 bytes .../Resources/drawable-xhdpi/icf55.png | Bin 0 -> 4273 bytes .../Resources/drawable-xhdpi/icf56.png | Bin 0 -> 4919 bytes .../Resources/drawable-xhdpi/icf57.png | Bin 0 -> 3390 bytes .../Resources/drawable-xhdpi/icf58.png | Bin 0 -> 5623 bytes .../Resources/drawable-xhdpi/icf59.png | Bin 0 -> 5065 bytes .../Resources/drawable-xhdpi/icf60.png | Bin 0 -> 3751 bytes .../Resources/drawable-xhdpi/icf61.png | Bin 0 -> 5219 bytes .../Resources/drawable-xhdpi/icf62.png | Bin 0 -> 7327 bytes .../Resources/drawable-xhdpi/icf63.png | Bin 0 -> 6245 bytes .../Resources/drawable-xhdpi/icf64.png | Bin 0 -> 5186 bytes .../Resources/drawable-xhdpi/icf65.png | Bin 0 -> 5766 bytes .../Resources/drawable-xhdpi/icf66.png | Bin 0 -> 5348 bytes .../Resources/drawable-xhdpi/icf67.png | Bin 0 -> 4044 bytes .../Resources/drawable-xhdpi/icf68.png | Bin 0 -> 3484 bytes .../Resources/drawable-xhdpi/navheader_bg.png | Bin 0 -> 26965 bytes .../Resources/drawable-xhdpi/oktoberfest.png | Bin 0 -> 85194 bytes .../Resources/drawable-xhdpi/opendb.png | Bin 1215 -> 15302 bytes .../Resources/drawable-xhdpi/rightarrow.png | Bin 696 -> 15281 bytes .../Resources/drawable-xhdpi/splashlogo.png | Bin 0 -> 28801 bytes .../Resources/drawable-xhdpi/toolbar_bg.png | Bin 0 -> 46709 bytes .../drawable-xhdpi/toolbar_bg_quickunlock.png | Bin 0 -> 48387 bytes .../Resources/drawable-xhdpi/vdots.png | Bin 0 -> 15967 bytes .../drawable-xxxhdpi/ic_launcher.png | Bin 0 -> 4802 bytes .../drawable-xxxhdpi/ic_launcher_offline.png | Bin 0 -> 21436 bytes .../drawable/grouplistitem_selector.xml | 2 +- .../Resources/layout/QuickUnlock.xml | 2 +- .../Resources/layout/file_selection.xml | 3 +- .../layout/filestorage_selection.xml | 4 +- .../layout/filestorage_selection_listitem.xml | 47 -- .../filestorage_selection_listitem_kp2a.xml | 83 --- .../Resources/layout/generate_password.xml | 4 +- .../Resources/layout/group.xml | 3 +- .../Resources/layout/password.xml | 61 +- .../Resources/layout/preference.axml | 4 +- .../Resources/layout/toolbar.axml | 4 +- .../Resources/values/styles_material.xml | 2 +- src/keepass2android/icons/DrawableFactory.cs | 12 +- src/keepass2android/icons/Icons.cs | 29 +- src/keepass2android/keepass2android.csproj | 535 +++++++++++++----- src/keepass2android/packages.config | 6 +- src/keepass2android/search/SearchProvider.cs | 2 +- .../settings/AppSettingsActivity.cs | 4 +- .../settings/DatabaseSettingsActivity.cs | 2 +- src/keepass2android/views/FileStorageView.cs | 83 --- .../views/FileStorageViewKp2a.cs | 40 -- src/keepass2android/views/PwEntryView.cs | 4 +- src/keepass2android/views/PwGroupView.cs | 2 +- 260 files changed, 723 insertions(+), 789 deletions(-) delete mode 100644 src/keepass2android/Resources/drawable-mdpi/ic_action_search.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/ic_launcher_folder_small.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/ic_menu_copy_holo_light.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/ic_menu_view.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/ic_notify_loaded.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/ic_notify_locked.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/ic_notify_offline.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/ic_storage_androidget.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/ic_storage_androidsend.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/ic_storage_content.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/ic_storage_dropbox.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/ic_storage_dropboxKP2A.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/ic_storage_file.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/ic_storage_ftp.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/ic_storage_gdrive.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/ic_storage_http.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/ic_storage_https.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/ic_storage_sftp.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/ic_storage_skydrive.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/navheader_bg.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/oktoberfest.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/splashlogo.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/toolbar_bg.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/toolbar_bg_quickunlock.png delete mode 100644 src/keepass2android/Resources/drawable-mdpi/vdots.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_action_search.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_launcher_folder_small.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_menu_copy_holo_light.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_menu_view.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_notify_loaded.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_notify_locked.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_notify_offline.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_storage_androidget.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_storage_androidsend.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_storage_content.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_storage_dropbox.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_storage_dropboxKP2A.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_storage_file.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_storage_ftp.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_storage_ftps.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_storage_gdrive.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_storage_http.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_storage_https.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_storage_owncloud.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_storage_sftp.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_storage_skydrive.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf00.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf01.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf02.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf03.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf04.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf05.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf06.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf07.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf08.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf09.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf10.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf11.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf12.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf13.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf14.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf15.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf16.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf17.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf18.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf19.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf20.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf21.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf22.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf23.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf24.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf25.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf26.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf27.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf28.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf29.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf30.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf31.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf32.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf33.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf34.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf35.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf36.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf37.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf38.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf39.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf40.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf41.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf42.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf43.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf44.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf45.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf46.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf47.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf49.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf50.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf51.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf52.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf53.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf54.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf55.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf56.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf57.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf58.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf59.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf60.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf61.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf62.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf63.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf64.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf65.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf66.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf67.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/icf68.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/navheader_bg.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/oktoberfest.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/splashlogo.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/toolbar_bg.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/toolbar_bg_quickunlock.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/vdots.png create mode 100644 src/keepass2android/Resources/drawable-xxxhdpi/ic_launcher.png create mode 100644 src/keepass2android/Resources/drawable-xxxhdpi/ic_launcher_offline.png delete mode 100644 src/keepass2android/Resources/layout/filestorage_selection_listitem.xml delete mode 100644 src/keepass2android/Resources/layout/filestorage_selection_listitem_kp2a.xml delete mode 100644 src/keepass2android/views/FileStorageView.cs delete mode 100644 src/keepass2android/views/FileStorageViewKp2a.cs diff --git a/src/KeePass.sln b/src/KeePass.sln index f472a639..7510e05e 100644 --- a/src/KeePass.sln +++ b/src/KeePass.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio 2012 +VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLib2Android", "KeePassLib2Android\KeePassLib2Android.csproj", "{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}" EndProject @@ -55,209 +55,6 @@ Global ReleaseNoNet|x64 = ReleaseNoNet|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Debug|Win32.ActiveCfg = Debug|Any CPU - {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Debug|Win32.Build.0 = Debug|Any CPU - {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Debug|x64.ActiveCfg = Debug|Any CPU - {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Debug|x64.Build.0 = Debug|Any CPU - {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Release|Any CPU.Build.0 = Release|Any CPU - {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Release|Win32.ActiveCfg = Release|Any CPU - {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Release|Win32.Build.0 = Release|Any CPU - {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Release|x64.ActiveCfg = Release|Any CPU - {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Release|x64.Build.0 = Release|Any CPU - {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU - {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU - {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU - {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU - {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.ReleaseNoNet|Win32.ActiveCfg = ReleaseNoNet|Any CPU - {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.ReleaseNoNet|x64.ActiveCfg = ReleaseNoNet|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Win32.ActiveCfg = Debug|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Win32.Build.0 = Debug|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|x64.ActiveCfg = Debug|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|x64.Build.0 = Debug|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Any CPU.Build.0 = Release|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Win32.ActiveCfg = Release|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Win32.Build.0 = Release|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|x64.ActiveCfg = Release|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|x64.Build.0 = Release|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Any CPU.Deploy.0 = ReleaseNoNet|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Mixed Platforms.Deploy.0 = ReleaseNoNet|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Win32.ActiveCfg = ReleaseNoNet|Any CPU - {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|x64.ActiveCfg = ReleaseNoNet|Any CPU - {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Debug|Win32.ActiveCfg = Debug|Any CPU - {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Debug|Win32.Build.0 = Debug|Any CPU - {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Debug|x64.ActiveCfg = Debug|Any CPU - {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Debug|x64.Build.0 = Debug|Any CPU - {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Release|Any CPU.Build.0 = Release|Any CPU - {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Release|Win32.ActiveCfg = Release|Any CPU - {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Release|Win32.Build.0 = Release|Any CPU - {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Release|x64.ActiveCfg = Release|Any CPU - {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Release|x64.Build.0 = Release|Any CPU - {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Any CPU.ActiveCfg = Debug|Any CPU - {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Any CPU.Build.0 = Debug|Any CPU - {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU - {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU - {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU - {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU - {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|Win32.ActiveCfg = Debug|Any CPU - {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|x64.ActiveCfg = Debug|Any CPU - {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Any CPU.Build.0 = Release|Any CPU - {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Win32.ActiveCfg = Release|Any CPU - {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|x64.ActiveCfg = Release|Any CPU - {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU - {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU - {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU - {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU - {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU - {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU - {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|Win32.ActiveCfg = Debug|Any CPU - {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|x64.ActiveCfg = Debug|Any CPU - {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|Any CPU.Build.0 = Release|Any CPU - {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|Win32.ActiveCfg = Release|Any CPU - {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|x64.ActiveCfg = Release|Any CPU - {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU - {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU - {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU - {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU - {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Win32.ActiveCfg = ReleaseNoNet|Any CPU - {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|x64.ActiveCfg = ReleaseNoNet|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Win32.ActiveCfg = Debug|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|x64.ActiveCfg = Debug|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Any CPU.Build.0 = Release|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Any CPU.Deploy.0 = Release|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Win32.ActiveCfg = Release|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|x64.ActiveCfg = Release|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Any CPU.Deploy.0 = Release|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Mixed Platforms.Deploy.0 = ReleaseNoNet|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU - {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU - {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|Win32.ActiveCfg = Debug|Any CPU - {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|x64.ActiveCfg = Debug|Any CPU - {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|Any CPU.Build.0 = Release|Any CPU - {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|Win32.ActiveCfg = Release|Any CPU - {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|x64.ActiveCfg = Release|Any CPU - {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU - {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU - {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU - {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU - {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU - {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU - {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Win32.ActiveCfg = Debug|Any CPU - {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|x64.ActiveCfg = Debug|Any CPU - {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Any CPU.Build.0 = Release|Any CPU - {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Win32.ActiveCfg = Release|Any CPU - {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|x64.ActiveCfg = Release|Any CPU - {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU - {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU - {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU - {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU - {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU - {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU - {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Win32.ActiveCfg = Debug|Any CPU - {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|x64.ActiveCfg = Debug|Any CPU - {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|Any CPU.Build.0 = Release|Any CPU - {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|Win32.ActiveCfg = Release|Any CPU - {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|x64.ActiveCfg = Release|Any CPU - {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU - {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU - {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU - {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU - {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU - {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU - {70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|Any CPU.Build.0 = Debug|Any CPU - {70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|Win32.ActiveCfg = Debug|Any CPU - {70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|x64.ActiveCfg = Debug|Any CPU - {70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|Any CPU.ActiveCfg = Release|Any CPU - {70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|Any CPU.Build.0 = Release|Any CPU - {70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|Win32.ActiveCfg = Release|Any CPU - {70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|x64.ActiveCfg = Release|Any CPU - {70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU - {70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU - {70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU - {70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU - {70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU - {70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU {1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Any CPU.Build.0 = Debug|Any CPU {1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.Debug|Any CPU.Deploy.0 = Debug|Any CPU @@ -282,24 +79,6 @@ Global {1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Mixed Platforms.Deploy.0 = Release|Any CPU {1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU {1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU - {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Win32.ActiveCfg = Debug|Any CPU - {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|x64.ActiveCfg = Debug|Any CPU - {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Any CPU.Build.0 = Release|Any CPU - {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Win32.ActiveCfg = Release|Any CPU - {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|x64.ActiveCfg = Release|Any CPU - {3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU - {3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU - {3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU - {3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU - {3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU - {3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU {2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Debug|Any CPU.Build.0 = Debug|Any CPU {2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -318,6 +97,184 @@ Global {2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU {2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU {2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU + {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Win32.ActiveCfg = Debug|Any CPU + {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|x64.ActiveCfg = Debug|Any CPU + {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|Any CPU.Build.0 = Release|Any CPU + {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|Win32.ActiveCfg = Release|Any CPU + {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Release|x64.ActiveCfg = Release|Any CPU + {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU + {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU + {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU + {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU + {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU + {3C0F7FE5-639F-4422-A087-8B26CF862D1B}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU + {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Win32.ActiveCfg = Debug|Any CPU + {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|x64.ActiveCfg = Debug|Any CPU + {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Any CPU.Build.0 = Release|Any CPU + {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Win32.ActiveCfg = Release|Any CPU + {3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|x64.ActiveCfg = Release|Any CPU + {3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU + {3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU + {3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU + {3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU + {3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU + {3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Win32.ActiveCfg = Debug|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|x64.ActiveCfg = Debug|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Any CPU.Build.0 = Release|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Any CPU.Deploy.0 = Release|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|Win32.ActiveCfg = Release|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Release|x64.ActiveCfg = Release|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Any CPU.Deploy.0 = Release|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Mixed Platforms.Deploy.0 = ReleaseNoNet|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU + {46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU + {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|Win32.ActiveCfg = Debug|Any CPU + {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Debug|x64.ActiveCfg = Debug|Any CPU + {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Any CPU.Build.0 = Release|Any CPU + {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|Win32.ActiveCfg = Release|Any CPU + {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.Release|x64.ActiveCfg = Release|Any CPU + {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU + {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU + {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU + {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU + {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU + {48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU + {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|Win32.ActiveCfg = Debug|Any CPU + {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|x64.ActiveCfg = Debug|Any CPU + {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Any CPU.Build.0 = Release|Any CPU + {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Win32.ActiveCfg = Release|Any CPU + {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|x64.ActiveCfg = Release|Any CPU + {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU + {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU + {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU + {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU + {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU + {53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU + {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Debug|Any CPU.Build.0 = Debug|Any CPU + {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Debug|Win32.ActiveCfg = Debug|Any CPU + {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Debug|Win32.Build.0 = Debug|Any CPU + {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Debug|x64.ActiveCfg = Debug|Any CPU + {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Debug|x64.Build.0 = Debug|Any CPU + {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Release|Any CPU.ActiveCfg = Release|Any CPU + {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Release|Any CPU.Build.0 = Release|Any CPU + {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Release|Win32.ActiveCfg = Release|Any CPU + {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Release|Win32.Build.0 = Release|Any CPU + {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Release|x64.ActiveCfg = Release|Any CPU + {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Release|x64.Build.0 = Release|Any CPU + {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU + {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU + {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU + {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU + {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.ReleaseNoNet|Win32.ActiveCfg = ReleaseNoNet|Any CPU + {545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.ReleaseNoNet|x64.ActiveCfg = ReleaseNoNet|Any CPU + {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|Win32.ActiveCfg = Debug|Any CPU + {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Debug|x64.ActiveCfg = Debug|Any CPU + {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|Any CPU.Build.0 = Release|Any CPU + {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|Win32.ActiveCfg = Release|Any CPU + {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|x64.ActiveCfg = Release|Any CPU + {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU + {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU + {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU + {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU + {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU + {5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Win32.ActiveCfg = Debug|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Win32.Build.0 = Debug|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|x64.ActiveCfg = Debug|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|x64.Build.0 = Debug|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Any CPU.Build.0 = Release|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Win32.ActiveCfg = Release|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Win32.Build.0 = Release|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|x64.ActiveCfg = Release|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|x64.Build.0 = Release|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU + {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|x64.Build.0 = Release|Any CPU + {70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|Any CPU.Build.0 = Debug|Any CPU + {70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|Win32.ActiveCfg = Debug|Any CPU + {70D3844A-D9FA-4A64-B205-A84C6A822196}.Debug|x64.ActiveCfg = Debug|Any CPU + {70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|Any CPU.ActiveCfg = Release|Any CPU + {70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|Any CPU.Build.0 = Release|Any CPU + {70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|Win32.ActiveCfg = Release|Any CPU + {70D3844A-D9FA-4A64-B205-A84C6A822196}.Release|x64.ActiveCfg = Release|Any CPU + {70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU + {70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU + {70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU + {70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU + {70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU + {70D3844A-D9FA-4A64-B205-A84C6A822196}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU {96A3EA5A-7024-479F-A5B1-06654D0867A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {96A3EA5A-7024-479F-A5B1-06654D0867A3}.Debug|Any CPU.Build.0 = Debug|Any CPU {96A3EA5A-7024-479F-A5B1-06654D0867A3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -360,30 +317,72 @@ Global {9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.ReleaseNoNet|Mixed Platforms.Deploy.0 = Release|Any CPU {9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU {9A4C5BAA-1A8A-49B4-BBC3-60D4871FB36C}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Win32.ActiveCfg = Debug|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|Win32.Build.0 = Debug|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|x64.ActiveCfg = Debug|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Debug|x64.Build.0 = Debug|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Any CPU.Build.0 = Release|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Win32.ActiveCfg = Release|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Win32.Build.0 = Release|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|x64.ActiveCfg = Release|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|x64.Build.0 = Release|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|x64.Build.0 = Release|Any CPU + {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|Win32.ActiveCfg = Debug|Any CPU + {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|x64.ActiveCfg = Debug|Any CPU + {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|Any CPU.Build.0 = Release|Any CPU + {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|Win32.ActiveCfg = Release|Any CPU + {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|x64.ActiveCfg = Release|Any CPU + {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU + {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU + {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU + {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU + {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Win32.ActiveCfg = ReleaseNoNet|Any CPU + {A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|x64.ActiveCfg = ReleaseNoNet|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Win32.ActiveCfg = Debug|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Win32.Build.0 = Debug|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|x64.ActiveCfg = Debug|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|x64.Build.0 = Debug|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Any CPU.Build.0 = Release|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Win32.ActiveCfg = Release|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Win32.Build.0 = Release|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|x64.ActiveCfg = Release|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|x64.Build.0 = Release|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Mixed Platforms.Deploy.0 = ReleaseNoNet|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Win32.ActiveCfg = ReleaseNoNet|Any CPU + {A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|x64.ActiveCfg = ReleaseNoNet|Any CPU + {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Debug|Win32.ActiveCfg = Debug|Any CPU + {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Debug|Win32.Build.0 = Debug|Any CPU + {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Debug|x64.ActiveCfg = Debug|Any CPU + {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Debug|x64.Build.0 = Debug|Any CPU + {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Release|Any CPU.Build.0 = Release|Any CPU + {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Release|Win32.ActiveCfg = Release|Any CPU + {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Release|Win32.Build.0 = Release|Any CPU + {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Release|x64.ActiveCfg = Release|Any CPU + {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Release|x64.Build.0 = Release|Any CPU + {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Any CPU.ActiveCfg = Debug|Any CPU + {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Any CPU.Build.0 = Debug|Any CPU + {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU + {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU + {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU + {A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Debug|Any CPU.Build.0 = Debug|Any CPU {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Debug|Any CPU.Deploy.0 = Debug|Any CPU @@ -391,11 +390,7 @@ Global {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Debug|Win32.ActiveCfg = Debug|Any CPU - {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Debug|Win32.Build.0 = Debug|Any CPU - {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Debug|Win32.Deploy.0 = Debug|Any CPU {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Debug|x64.ActiveCfg = Debug|Any CPU - {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Debug|x64.Build.0 = Debug|Any CPU - {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Debug|x64.Deploy.0 = Debug|Any CPU {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Release|Any CPU.ActiveCfg = Release|Any CPU {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Release|Any CPU.Build.0 = Release|Any CPU {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Release|Any CPU.Deploy.0 = Release|Any CPU @@ -403,11 +398,7 @@ Global {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Release|Mixed Platforms.Build.0 = Release|Any CPU {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Release|Win32.ActiveCfg = Release|Any CPU - {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Release|Win32.Build.0 = Release|Any CPU - {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Release|Win32.Deploy.0 = Release|Any CPU {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Release|x64.ActiveCfg = Release|Any CPU - {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Release|x64.Build.0 = Release|Any CPU - {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Release|x64.Deploy.0 = Release|Any CPU {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.ReleaseNoNet|Any CPU.Deploy.0 = Release|Any CPU @@ -415,14 +406,7 @@ Global {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.ReleaseNoNet|Mixed Platforms.Deploy.0 = Release|Any CPU {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU - {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU - {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.ReleaseNoNet|Win32.Deploy.0 = Release|Any CPU {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU - {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.ReleaseNoNet|x64.Build.0 = Release|Any CPU - {B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.ReleaseNoNet|x64.Deploy.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {2F7CB5B4-AC2A-4790-B0F3-42E6C9A060D5} = {CAC7DBC4-E21F-41E1-B33A-E3A04585F6A3} @@ -440,4 +424,7 @@ Global $2.inheritsSet = VisualStudio $2.inheritsScope = text/plain EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection EndGlobal diff --git a/src/Kp2aBusinessLogic/IDrawableFactory.cs b/src/Kp2aBusinessLogic/IDrawableFactory.cs index fdf5733f..23f50031 100644 --- a/src/Kp2aBusinessLogic/IDrawableFactory.cs +++ b/src/Kp2aBusinessLogic/IDrawableFactory.cs @@ -7,9 +7,9 @@ namespace keepass2android { public interface IDrawableFactory { - void AssignDrawableTo (ImageView iv, Resources res, PwDatabase db, PwIcon icon, PwUuid customIconId); + void AssignDrawableTo (ImageView iv, Resources res, PwDatabase db, PwIcon icon, PwUuid customIconId, bool forGroup); - Drawable GetIconDrawable(Resources res, PwDatabase db, PwIcon icon, PwUuid customIconId); + Drawable GetIconDrawable(Resources res, PwDatabase db, PwIcon icon, PwUuid customIconId, bool forGroup); void Clear(); diff --git a/src/Kp2aUnitTests/TestDrawableFactory.cs b/src/Kp2aUnitTests/TestDrawableFactory.cs index c2c02c9e..57d20a7c 100644 --- a/src/Kp2aUnitTests/TestDrawableFactory.cs +++ b/src/Kp2aUnitTests/TestDrawableFactory.cs @@ -9,12 +9,12 @@ namespace Kp2aUnitTests { internal class TestDrawableFactory : IDrawableFactory { - public void AssignDrawableTo(ImageView iv, Resources res, PwDatabase db, PwIcon icon, PwUuid customIconId) + public void AssignDrawableTo(ImageView iv, Resources res, PwDatabase db, PwIcon icon, PwUuid customIconId, bool forGroup) { } - public Drawable GetIconDrawable(Resources res, PwDatabase db, PwIcon icon, PwUuid customIconId) + public Drawable GetIconDrawable(Resources res, PwDatabase db, PwIcon icon, PwUuid customIconId, bool forGroup) { return res.GetDrawable(Resource.Drawable.Icon); } diff --git a/src/MaterialTest2/MaterialTest2.csproj b/src/MaterialTest2/MaterialTest2.csproj index 41433b5c..2f1ff5bd 100644 --- a/src/MaterialTest2/MaterialTest2.csproj +++ b/src/MaterialTest2/MaterialTest2.csproj @@ -9,7 +9,7 @@ MaterialTest2 Resources Assets - True + False True Resources\Resource.designer.cs Resource @@ -27,7 +27,7 @@ 4 None false - True + False full @@ -54,7 +54,6 @@ - @@ -66,6 +65,7 @@ + diff --git a/src/MaterialTest2/Resources/values/styles.xml b/src/MaterialTest2/Resources/values/styles.xml index 8d5f7161..0cc45f01 100644 --- a/src/MaterialTest2/Resources/values/styles.xml +++ b/src/MaterialTest2/Resources/values/styles.xml @@ -117,7 +117,7 @@ - diff --git a/src/keepass2android/icons/DrawableFactory.cs b/src/keepass2android/icons/DrawableFactory.cs index df2ea920..dc223f5d 100644 --- a/src/keepass2android/icons/DrawableFactory.cs +++ b/src/keepass2android/icons/DrawableFactory.cs @@ -45,18 +45,18 @@ namespace keepass2android */ private readonly Dictionary _standardIconMap = new Dictionary(); - public void AssignDrawableTo (ImageView iv, Resources res, PwDatabase db, PwIcon icon, PwUuid customIconId) + public void AssignDrawableTo (ImageView iv, Resources res, PwDatabase db, PwIcon icon, PwUuid customIconId, bool forGroup) { - Drawable draw = GetIconDrawable (res, db, icon, customIconId); + Drawable draw = GetIconDrawable (res, db, icon, customIconId, forGroup); iv.SetImageDrawable (draw); } - public Drawable GetIconDrawable (Resources res, PwDatabase db, PwIcon icon, PwUuid customIconId) + public Drawable GetIconDrawable (Resources res, PwDatabase db, PwIcon icon, PwUuid customIconId, bool forGroup) { if (!customIconId.Equals(PwUuid.Zero)) { return GetIconDrawable (res, db, customIconId); } - return GetIconDrawable (res, icon); + return GetIconDrawable (res, icon, forGroup); } private static void InitBlank (Resources res) @@ -68,9 +68,9 @@ namespace keepass2android } } - public Drawable GetIconDrawable (Resources res, PwIcon icon) + public Drawable GetIconDrawable (Resources res, PwIcon icon, bool forGroup) { - int resId = Icons.IconToResId (icon); + int resId = Icons.IconToResId (icon, forGroup); Drawable draw; if (!_standardIconMap.TryGetValue(resId, out draw)) diff --git a/src/keepass2android/icons/Icons.cs b/src/keepass2android/icons/Icons.cs index aa7e0bf8..8a746e87 100644 --- a/src/keepass2android/icons/Icons.cs +++ b/src/keepass2android/icons/Icons.cs @@ -28,12 +28,14 @@ namespace keepass2android public class Icons { private static Dictionary _icons; + private static Dictionary _folderIcons; private static void BuildList() { if (_icons != null) return; _icons = new Dictionary(); + _folderIcons = new Dictionary(); FieldInfo[] fields = typeof(Resource.Drawable).GetFields(BindingFlags.Static | BindingFlags.Public); foreach (FieldInfo fieldInfo in fields) @@ -61,14 +63,37 @@ namespace keepass2android _icons[(PwIcon)num] = resId; } } + if (fieldName.StartsWith("icf") && (fieldName.Length >= 5)) + { + + String sNum = fieldName.Substring(3, 2); + int num; + if (int.TryParse(sNum, out num) && (num < (int)PwIcon.Count)) + { + + int resId; + try + { + resId = (int)fieldInfo.GetValue(null); + } + catch (Exception) + { + continue; + } + + _folderIcons[(PwIcon)num] = resId; + } + } } } - public static int IconToResId(PwIcon iconId) + public static int IconToResId(PwIcon iconId, bool forGroup) { BuildList(); int resId; - if (_icons.TryGetValue(iconId, out resId)) + if (forGroup && _folderIcons.TryGetValue(iconId, out resId)) + return resId; + if (!forGroup && _icons.TryGetValue(iconId, out resId)) return resId; return Resource.Drawable.ic99_blank; } diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android.csproj index a4960ff4..35c6a407 100644 --- a/src/keepass2android/keepass2android.csproj +++ b/src/keepass2android/keepass2android.csproj @@ -19,7 +19,6 @@ 1G armeabi,armeabi-v7a,x86 - True @@ -36,10 +35,9 @@ False - - Xamarin True + armeabi;armeabi-v7a;x86 full @@ -61,6 +59,8 @@ True + + none @@ -78,6 +78,8 @@ True + + @@ -91,13 +93,13 @@ ..\packages\Xamarin.Android.Support.v7.MediaRouter.21.0.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll - ..\packages\Xamarin.Android.Support.v4.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - ..\packages\Xamarin.Android.Support.Design.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.Design.dll + ..\packages\Xamarin.Android.Support.Design.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.Design.dll @@ -169,11 +171,9 @@ - - @@ -211,6 +211,7 @@ + @@ -308,7 +309,6 @@ - Designer @@ -385,14 +385,10 @@ Designer - Designer - - - Designer @@ -439,7 +435,9 @@ - + + Designer + @@ -460,7 +458,6 @@ - @@ -506,9 +503,6 @@ - - - Designer @@ -531,9 +525,6 @@ - - - @@ -542,33 +533,6 @@ Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer @@ -577,20 +541,6 @@ - - - - - - - - - Designer - - - - - Designer @@ -608,7 +558,9 @@ - + + Designer + @@ -618,32 +570,11 @@ Designer - - - - - - Designer - - - - - - - - - - - - - - - 22.0.0.0 @@ -654,18 +585,6 @@ False - - - - - - - - - - - - @@ -698,22 +617,14 @@ - + + Designer + - - - - - - - - - - - - - + + Designer + @@ -725,37 +636,46 @@ Designer - - - - - - - - - Designer - + + Designer + - + + Designer + - + + Designer + - + - + - + + + + + + + + + + + + + @@ -766,29 +686,131 @@ - - - - - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -998,58 +1020,261 @@ - + - + - + - + - + - + - + - + - + - + - + - - Designer - + - - Designer - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/keepass2android/packages.config b/src/keepass2android/packages.config index a9790340..d1e4cc0a 100644 --- a/src/keepass2android/packages.config +++ b/src/keepass2android/packages.config @@ -1,8 +1,8 @@  - - - + + + \ No newline at end of file diff --git a/src/keepass2android/search/SearchProvider.cs b/src/keepass2android/search/SearchProvider.cs index a70deeee..11c2c950 100644 --- a/src/keepass2android/search/SearchProvider.cs +++ b/src/keepass2android/search/SearchProvider.cs @@ -111,7 +111,7 @@ namespace keepass2android.search var iconId = (PwIcon)Enum.Parse(typeof(PwIcon), uri.GetQueryParameter(IconIdParameter)); var customIconUuid = new PwUuid(MemUtil.HexStringToByteArray(uri.GetQueryParameter(CustomIconUuidParameter))); - var iconDrawable = _db.DrawableFactory.GetIconDrawable(App.Context.Resources, _db.KpDatabase, iconId, customIconUuid) as BitmapDrawable; + var iconDrawable = _db.DrawableFactory.GetIconDrawable(App.Context.Resources, _db.KpDatabase, iconId, customIconUuid, false) as BitmapDrawable; if (iconDrawable != null) { var pipe = ParcelFileDescriptor.CreatePipe(); diff --git a/src/keepass2android/settings/AppSettingsActivity.cs b/src/keepass2android/settings/AppSettingsActivity.cs index 1c976537..9f109c48 100644 --- a/src/keepass2android/settings/AppSettingsActivity.cs +++ b/src/keepass2android/settings/AppSettingsActivity.cs @@ -61,7 +61,7 @@ namespace keepass2android LayoutInflater inflater = (LayoutInflater) Context.GetSystemService(Context.LayoutInflaterService); View layout = inflater.Inflate(Resource.Layout.toolbar, parent, false); - Toolbar toolbar = (Toolbar) layout.FindViewById(Resource.Id.toolbar); + Toolbar toolbar = (Toolbar) layout.FindViewById(Resource.Id.mytoolbar); toolbar.SetNavigationIcon(Resource.Drawable.ic_arrow_back_white_24dp); toolbar.Title = Title; toolbar.NavigationClick += (sender, args) => @@ -101,7 +101,7 @@ namespace keepass2android SetContentView(Resource.Layout.preference); - SetSupportActionBar(FindViewById(Resource.Id.toolbar)); + SetSupportActionBar(FindViewById(Resource.Id.mytoolbar)); FragmentManager.FindFragmentById(Resource.Id.settings_fragment).FindPreference(GetString(Resource.String.db_key)).Enabled = false; diff --git a/src/keepass2android/settings/DatabaseSettingsActivity.cs b/src/keepass2android/settings/DatabaseSettingsActivity.cs index c8f7003b..49c91a93 100644 --- a/src/keepass2android/settings/DatabaseSettingsActivity.cs +++ b/src/keepass2android/settings/DatabaseSettingsActivity.cs @@ -609,7 +609,7 @@ namespace keepass2android base.OnCreate(savedInstanceState); SetContentView(Resource.Layout.preference); - SetSupportActionBar(FindViewById(Resource.Id.toolbar)); + SetSupportActionBar(FindViewById(Resource.Id.mytoolbar)); } diff --git a/src/keepass2android/views/FileStorageView.cs b/src/keepass2android/views/FileStorageView.cs deleted file mode 100644 index 69d1e95c..00000000 --- a/src/keepass2android/views/FileStorageView.cs +++ /dev/null @@ -1,83 +0,0 @@ -/* -This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin. - - Keepass2Android is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Keepass2Android is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Keepass2Android. If not, see . - */ -using System; -using Android.App; -using Android.Graphics.Drawables; -using Android.Runtime; -using Android.Views; -using Android.Widget; -using Android.Text; - -namespace keepass2android.view -{/* - public sealed class FileStorageView : ClickView - { - private readonly TextView _textView; - - public FileStorageView(IntPtr javaReference, JniHandleOwnership transfer) - : base(javaReference, transfer) - { - - } - - public FileStorageView(Activity activity, string protocolId, int pos) - : base(activity) - { - View ev = Inflate(activity, Resource.Layout.filestorage_selection_listitem, null); - _textView = (TextView)ev.FindViewById(Resource.Id.filestorage_label); - _textView.TextSize = PrefsUtil.GetListTextSize(activity); - - PopulateView(ev, protocolId, pos); - - LayoutParams lp = new LayoutParams(ViewGroup.LayoutParams.FillParent, ViewGroup.LayoutParams.WrapContent); - - AddView(ev, lp); - - } - - private void PopulateView(View ev, string protocolId, int pos) - { - ImageView iv = (ImageView)ev.FindViewById(Resource.Id.filestorage_logo); - - Drawable drawable = App.Kp2a.GetResourceDrawable("ic_storage_" + protocolId); - iv.SetImageDrawable(drawable); - - String title = App.Kp2a.GetResourceString("filestoragename_" + protocolId); - var str = new SpannableString(title); - _textView.TextFormatted = str; - - - } - - - public override void OnClick() - { - - } - - - public override void OnCreateMenu(IContextMenu menu, IContextMenuContextMenuInfo menuInfo) - { - } - - public override bool OnContextItemSelected(IMenuItem item) - { - return false; - } - } -} - diff --git a/src/keepass2android/views/FileStorageViewKp2a.cs b/src/keepass2android/views/FileStorageViewKp2a.cs deleted file mode 100644 index ad770fe9..00000000 --- a/src/keepass2android/views/FileStorageViewKp2a.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using Android.App; -using Android.Runtime; -using Android.Views; - -namespace keepass2android.view -{ - public sealed class FileStorageViewKp2a: ClickView - { - public FileStorageViewKp2a(IntPtr javaReference, JniHandleOwnership transfer) : base(javaReference, transfer) - { - } - - public FileStorageViewKp2a(Activity activity) - : base(activity) - { - View ev = Inflate(activity, Resource.Layout.filestorage_selection_listitem_kp2a, null); - LayoutParams lp = new LayoutParams(ViewGroup.LayoutParams.FillParent, ViewGroup.LayoutParams.WrapContent); - - AddView(ev, lp); - - } - - - public override void OnClick() - { - - } - - - public override void OnCreateMenu(IContextMenu menu, IContextMenuContextMenuInfo menuInfo) - { - } - - public override bool OnContextItemSelected(IMenuItem item) - { - return false; - } - } -} \ No newline at end of file diff --git a/src/keepass2android/views/PwEntryView.cs b/src/keepass2android/views/PwEntryView.cs index 48e613ac..552c7538 100644 --- a/src/keepass2android/views/PwEntryView.cs +++ b/src/keepass2android/views/PwEntryView.cs @@ -104,10 +104,10 @@ namespace keepass2android.view bool isExpired = pw.Expires && pw.ExpiryTime < DateTime.Now; if (isExpired) { - App.Kp2a.GetDb().DrawableFactory.AssignDrawableTo(iv, Resources, App.Kp2a.GetDb().KpDatabase, PwIcon.Expired, PwUuid.Zero); + App.Kp2a.GetDb().DrawableFactory.AssignDrawableTo(iv, Resources, App.Kp2a.GetDb().KpDatabase, PwIcon.Expired, PwUuid.Zero, false); } else { - App.Kp2a.GetDb().DrawableFactory.AssignDrawableTo(iv, Resources, App.Kp2a.GetDb().KpDatabase, pw.IconId, pw.CustomIconUuid); + App.Kp2a.GetDb().DrawableFactory.AssignDrawableTo(iv, Resources, App.Kp2a.GetDb().KpDatabase, pw.IconId, pw.CustomIconUuid, false); } String title = pw.Strings.ReadSafe(PwDefs.TitleField); diff --git a/src/keepass2android/views/PwGroupView.cs b/src/keepass2android/views/PwGroupView.cs index e5b515d6..ab71a99e 100644 --- a/src/keepass2android/views/PwGroupView.cs +++ b/src/keepass2android/views/PwGroupView.cs @@ -73,7 +73,7 @@ namespace keepass2android.view _pwGroup = pw; ImageView iv = (ImageView) gv.FindViewById(Resource.Id.icon); - App.Kp2a.GetDb().DrawableFactory.AssignDrawableTo(iv, Resources, App.Kp2a.GetDb().KpDatabase, pw.IconId, pw.CustomIconUuid); + App.Kp2a.GetDb().DrawableFactory.AssignDrawableTo(iv, Resources, App.Kp2a.GetDb().KpDatabase, pw.IconId, pw.CustomIconUuid, true); _textview.Text = pw.Name;