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" />
+ android:drawableTop="?attr/OpenUrlDrawable" />
+ android:drawableTop="?attr/CreateDbDrawable" />
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout/file_selection_filename.xml b/src/keepass2android/Resources/layout/file_selection_filename.xml
index dc156a0f..3f7729a3 100644
--- a/src/keepass2android/Resources/layout/file_selection_filename.xml
+++ b/src/keepass2android/Resources/layout/file_selection_filename.xml
@@ -17,7 +17,7 @@
android:id="@+id/browse_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_launcher_folder_small"
+ android:src="?attr/ic_launcher_folder_small"
android:layout_alignParentRight="true"
android:layout_below="@id/label_open_by_filename" />
diff --git a/src/keepass2android/Resources/values-v14/styles.xml b/src/keepass2android/Resources/values-v14/styles.xml
index 0c3af43d..8cb3f66c 100644
--- a/src/keepass2android/Resources/values-v14/styles.xml
+++ b/src/keepass2android/Resources/values-v14/styles.xml
@@ -17,15 +17,15 @@
-->
-
-
-
diff --git a/src/keepass2android/Resources/values-v14/styles_dark.xml b/src/keepass2android/Resources/values-v14/styles_dark.xml
index 8dc74cc4..09b506dc 100644
--- a/src/keepass2android/Resources/values-v14/styles_dark.xml
+++ b/src/keepass2android/Resources/values-v14/styles_dark.xml
@@ -17,8 +17,6 @@
-->
-
-
+
+
+
diff --git a/src/keepass2android/Resources/values-v14/styles_light.xml b/src/keepass2android/Resources/values-v14/styles_light.xml
index 311056e4..a7b420a1 100644
--- a/src/keepass2android/Resources/values-v14/styles_light.xml
+++ b/src/keepass2android/Resources/values-v14/styles_light.xml
@@ -17,10 +17,7 @@
-->
-
-
-
+
+
+
+
diff --git a/src/keepass2android/Resources/values/config.xml b/src/keepass2android/Resources/values/config.xml
index fe68bbfb..e5af89f2 100644
--- a/src/keepass2android/Resources/values/config.xml
+++ b/src/keepass2android/Resources/values/config.xml
@@ -54,7 +54,8 @@
maskpass
omitbackup
list_size
- sort_key
+ design_key
+ sort_key
TanExpiresOnUse_key
ShowUsernameInList_key
RememberRecentFiles_key
@@ -124,6 +125,12 @@
- 28
+ Light
+
+ - Light
+ - Dark
+
+
WARN
- IGNORE
diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml
index bdcc2f3d..0e454151 100644
--- a/src/keepass2android/Resources/values/strings.xml
+++ b/src/keepass2android/Resources/values/strings.xml
@@ -537,7 +537,15 @@ Initial public release
- Medium
- Large
-
+
+
+ - Holo Light
+ - Holo Dark
+
+
+ Design
+
+
- Do not remember username and password
- Remember username only
- Remember username and password
diff --git a/src/keepass2android/Resources/values/styles.xml b/src/keepass2android/Resources/values/styles.xml
index 1492a654..1e0e51d0 100644
--- a/src/keepass2android/Resources/values/styles.xml
+++ b/src/keepass2android/Resources/values/styles.xml
@@ -18,7 +18,12 @@
along with Keepass2Android. If not, see .
-->
-
+