From 182b0bbb8df5679eaa61ef76570773dd953be232 Mon Sep 17 00:00:00 2001
From: Ali Mehrpour <alimehrpour@gmail.com>
Date: Mon, 23 May 2016 15:41:34 -0700
Subject: [PATCH 1/4] Upgrade to Android Studio 2.1.1

---
 .idea/compiler.xml                            |  2 +-
 ..._c__2014_Volcano__All_rights_reserved_.xml |  9 -----
 .idea/gradle.xml                              |  8 +++-
 .idea/misc.xml                                |  7 +---
 MaterialDialogs/MaterialDialogs.iml           | 33 ++++++++++++---
 build.gradle                                  |  2 +-
 eSecureBox/eSecureBox-eSecureBox.iml          | 40 ++++++++++++++++---
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 8 files changed, 74 insertions(+), 31 deletions(-)
 delete mode 100644 .idea/copyright/Copyright__c__2014_Volcano__All_rights_reserved_.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 9a8b7e5..96cc43e 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
     <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="!?*.java" />
@@ -12,6 +11,7 @@
       <entry name="!?*.flex" />
       <entry name="!?*.kt" />
       <entry name="!?*.clj" />
+      <entry name="!?*.aj" />
     </wildcardResourcePatterns>
     <annotationProcessing>
       <profile default="true" name="Default" enabled="false">
diff --git a/.idea/copyright/Copyright__c__2014_Volcano__All_rights_reserved_.xml b/.idea/copyright/Copyright__c__2014_Volcano__All_rights_reserved_.xml
deleted file mode 100644
index acdcfb7..0000000
--- a/.idea/copyright/Copyright__c__2014_Volcano__All_rights_reserved_.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="CopyrightManager">
-  <copyright>
-    <option name="notice" value="Copyright (c) &amp;#36;today.year Volcano. All rights reserved." />
-    <option name="keyword" value="Copyright" />
-    <option name="allowReplaceKeyword" value="" />
-    <option name="myName" value="Copyright (c) 2014 Volcano. All rights reserved." />
-    <option name="myLocal" value="true" />
-  </copyright>
-</component>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 23f2ffb..b80f3fe 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,6 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.7" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -13,6 +12,13 @@
             <option value="$PROJECT_DIR$/eSecureBox" />
           </set>
         </option>
+        <option name="myModules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/MaterialDialogs" />
+            <option value="$PROJECT_DIR$/eSecureBox" />
+          </set>
+        </option>
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index ecfbf8f..de428ae 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
@@ -37,7 +34,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/MaterialDialogs/MaterialDialogs.iml b/MaterialDialogs/MaterialDialogs.iml
index fbedec1..7109feb 100644
--- a/MaterialDialogs/MaterialDialogs.iml
+++ b/MaterialDialogs/MaterialDialogs.iml
@@ -12,10 +12,7 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
         <afterSyncTasks>
-          <task>generateDebugAndroidTestSources</task>
           <task>generateDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -29,7 +26,7 @@
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -37,13 +34,13 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -51,6 +48,15 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -58,6 +64,15 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -65,8 +80,10 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
@@ -74,12 +91,16 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
diff --git a/build.gradle b/build.gradle
index 9405f3f..f6e9073 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:2.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/eSecureBox/eSecureBox-eSecureBox.iml b/eSecureBox/eSecureBox-eSecureBox.iml
index 9c23389..fed8c1a 100644
--- a/eSecureBox/eSecureBox-eSecureBox.iml
+++ b/eSecureBox/eSecureBox-eSecureBox.iml
@@ -12,10 +12,7 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
         <afterSyncTasks>
-          <task>generateDebugAndroidTestSources</task>
           <task>generateDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -28,7 +25,7 @@
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -37,13 +34,13 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/fabric/res/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -51,6 +48,15 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -58,6 +64,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -65,7 +72,18 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
@@ -78,13 +96,23 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.wdullaer/materialdatetimepicker/1.4.2/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/io.fabric.sdk.android/fabric/1.3.5/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c71e76..7bd349f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Mon May 23 15:30:51 PDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

From 10ff0b5a9852309c19ff721cc7bef2b9071d6ec8 Mon Sep 17 00:00:00 2001
From: Ali Mehrpour <alimehrpour@gmail.com>
Date: Mon, 23 May 2016 15:49:22 -0700
Subject: [PATCH 2/4] Handle back key press when dialog is shown

---
 .idea/misc.xml                                |  3 ++
 eSecureBox/eSecureBox-eSecureBox.iml          |  1 +
 eSecureBox/src/main/AndroidManifest.xml       |  2 +-
 .../esecurebox/activity/AbstractActivity.java | 19 +++++++++--
 .../activity/CreateAccountActivity.java       | 26 ++++++++-------
 .../activity/DisplayAccountActivity.java      |  2 +-
 .../activity/EditAccountActivity.java         | 32 ++++++++++++-------
 .../esecurebox/activity/MainActivity.java     |  2 +-
 .../esecurebox/activity/SettingsActivity.java |  2 +-
 9 files changed, 58 insertions(+), 31 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index de428ae..1a3eaff 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
diff --git a/eSecureBox/eSecureBox-eSecureBox.iml b/eSecureBox/eSecureBox-eSecureBox.iml
index fed8c1a..835d59f 100644
--- a/eSecureBox/eSecureBox-eSecureBox.iml
+++ b/eSecureBox/eSecureBox-eSecureBox.iml
@@ -83,6 +83,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
diff --git a/eSecureBox/src/main/AndroidManifest.xml b/eSecureBox/src/main/AndroidManifest.xml
index 1eaa874..eb5f23c 100644
--- a/eSecureBox/src/main/AndroidManifest.xml
+++ b/eSecureBox/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.volcano.esecurebox"
-    android:versionCode="1"
+    android:versionCode="2"
     android:versionName="1.2.0">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/eSecureBox/src/main/java/com/volcano/esecurebox/activity/AbstractActivity.java b/eSecureBox/src/main/java/com/volcano/esecurebox/activity/AbstractActivity.java
index 32e4d54..57087e7 100644
--- a/eSecureBox/src/main/java/com/volcano/esecurebox/activity/AbstractActivity.java
+++ b/eSecureBox/src/main/java/com/volcano/esecurebox/activity/AbstractActivity.java
@@ -22,9 +22,10 @@
  */
 public class AbstractActivity extends AppCompatActivity {
     protected final String TAG = LogUtils.makeLogTag(getClass().getName());
-
     protected boolean mFinishIfNotLoggedIn = true;
 
+    private Toolbar mToolbar;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -83,10 +84,21 @@ protected void setToolbarColor(int color) {
         }
     }
 
+    /**
+     * Set the activity title
+     * @param resId The resource id
+     */
     public void setTitle(int resId) {
         setTitle(getString(resId));
     }
 
+    /**
+     * @return The toolbar object
+     */
+    public Toolbar getToolbar() {
+        return mToolbar;
+    }
+
     protected void setTitle(String title) {
         final ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
@@ -94,10 +106,11 @@ protected void setTitle(String title) {
         }
     }
 
-    @SuppressWarnings("ConstantConditions")
-    protected void setActionbar(Toolbar toolbar) {
+    protected void setActionBar(Toolbar toolbar) {
+        mToolbar = toolbar;
         toolbar.setTitleTextAppearance(this, R.style.Toolbar_Title);
         setSupportActionBar(toolbar);
+        //noinspection ConstantConditions
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     }
 
diff --git a/eSecureBox/src/main/java/com/volcano/esecurebox/activity/CreateAccountActivity.java b/eSecureBox/src/main/java/com/volcano/esecurebox/activity/CreateAccountActivity.java
index 802430e..cad701d 100644
--- a/eSecureBox/src/main/java/com/volcano/esecurebox/activity/CreateAccountActivity.java
+++ b/eSecureBox/src/main/java/com/volcano/esecurebox/activity/CreateAccountActivity.java
@@ -32,7 +32,7 @@ protected void onCreate(Bundle savedInstanceState) {
         final String categoryId = intent.getStringExtra(Intents.EXTRA_CATEGORY_ID);
 
         final Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setActionbar(toolbar);
+        setActionBar(toolbar);
         setToolbarColor(categoryColor);
 
         mFragment = (CreateAccountFragment) getFragmentManager().findFragmentById(R.id.fragment_create_account);
@@ -69,17 +69,19 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     @Override
     protected boolean askToFinish() {
-        new AlertDialogWrapper.Builder(this)
-                .setMessage(R.string.alert_cancel_create_account)
-                .setNegativeButton(R.string.button_discard_uppercase, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        finish();
-                    }
-                })
-                .setPositiveButton(R.string.button_keep_editing_uppercase, null)
-                .show();
-
+        if (mFragment.allowBackPressed()) {
+            new AlertDialogWrapper.Builder(this)
+                    .setMessage(R.string.alert_cancel_create_account)
+                    .setNegativeButton(
+                    R.string.button_discard_uppercase, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            finish();
+                        }
+                    })
+                    .setPositiveButton(R.string.button_keep_editing_uppercase, null)
+                    .show();
+        }
         return false;
     }
 
diff --git a/eSecureBox/src/main/java/com/volcano/esecurebox/activity/DisplayAccountActivity.java b/eSecureBox/src/main/java/com/volcano/esecurebox/activity/DisplayAccountActivity.java
index 37921a5..4c611b4 100644
--- a/eSecureBox/src/main/java/com/volcano/esecurebox/activity/DisplayAccountActivity.java
+++ b/eSecureBox/src/main/java/com/volcano/esecurebox/activity/DisplayAccountActivity.java
@@ -27,7 +27,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_display_account);
 
-        setActionbar((Toolbar) findViewById(R.id.toolbar));
+        setActionBar((Toolbar) findViewById(R.id.toolbar));
 
         final Intent intent = getIntent();
         final String accountId = intent.getStringExtra(Intents.EXTRA_ACCOUNT_ID);
diff --git a/eSecureBox/src/main/java/com/volcano/esecurebox/activity/EditAccountActivity.java b/eSecureBox/src/main/java/com/volcano/esecurebox/activity/EditAccountActivity.java
index 7688ee2..205ab44 100644
--- a/eSecureBox/src/main/java/com/volcano/esecurebox/activity/EditAccountActivity.java
+++ b/eSecureBox/src/main/java/com/volcano/esecurebox/activity/EditAccountActivity.java
@@ -15,6 +15,7 @@
 import com.volcano.esecurebox.Intents;
 import com.volcano.esecurebox.R;
 import com.volcano.esecurebox.fragment.EditAccountFragment;
+import com.volcano.esecurebox.fragment.EditAccountFragment.OnActionsListener;
 import com.volcano.esecurebox.util.BitmapUtils;
 import com.volcano.esecurebox.util.SoftKeyboardUtils;
 import com.volcano.esecurebox.widget.RobotoTextView;
@@ -40,7 +41,7 @@ public void onClick(View v) {
             }
         });
         mFragment = (EditAccountFragment) getFragmentManager().findFragmentById(R.id.fragment_edit_account);
-        mFragment.setOnEnableActionsListener(new EditAccountFragment.OnEnableActionsListener() {
+        mFragment.setOnEnableActionsListener(new OnActionsListener() {
             @Override
             public void OnEnableActions(boolean enable) {
                 if (mSaveMenu != null) {
@@ -48,6 +49,11 @@ public void OnEnableActions(boolean enable) {
                 }
                 deleteText.setEnabled(enable);
             }
+
+            @Override
+            public void onVisibilityActions(int visibility) {
+                deleteText.setVisibility(visibility);
+            }
         });
 
         final Intent intent = getIntent();
@@ -55,7 +61,7 @@ public void OnEnableActions(boolean enable) {
         final String categoryColor = intent.getStringExtra(Intents.EXTRA_CATEGORY_COLOR);
 
         final Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setActionbar(toolbar);
+        setActionBar(toolbar);
         setToolbarColor(categoryColor);
 
         mFragment.setAccountId(accountId);
@@ -103,16 +109,18 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     @Override
     protected boolean askToFinish() {
-        new AlertDialogWrapper.Builder(this)
-                .setMessage(R.string.alert_cancel_edit_account)
-                .setNegativeButton(R.string.button_discard_uppercase, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        finish();
-                    }
-                })
-                .setPositiveButton(R.string.button_keep_editing_uppercase, null)
-                .show();
+        if (mFragment.allowBackPressed()) {
+            new AlertDialogWrapper.Builder(this)
+                    .setMessage(R.string.alert_cancel_edit_account)
+                    .setNegativeButton(R.string.button_discard_uppercase, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            finish();
+                        }
+                    })
+                    .setPositiveButton(R.string.button_keep_editing_uppercase, null)
+                    .show();
+        }
 
         return false;
     }
diff --git a/eSecureBox/src/main/java/com/volcano/esecurebox/activity/MainActivity.java b/eSecureBox/src/main/java/com/volcano/esecurebox/activity/MainActivity.java
index da7b012..4a5c5b2 100644
--- a/eSecureBox/src/main/java/com/volcano/esecurebox/activity/MainActivity.java
+++ b/eSecureBox/src/main/java/com/volcano/esecurebox/activity/MainActivity.java
@@ -52,7 +52,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
 
         final Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setActionbar(toolbar);
+        setActionBar(toolbar);
         setTitle(R.string.app_name);
         toolbar.setNavigationIcon(R.drawable.icon_drawer);
 
diff --git a/eSecureBox/src/main/java/com/volcano/esecurebox/activity/SettingsActivity.java b/eSecureBox/src/main/java/com/volcano/esecurebox/activity/SettingsActivity.java
index dd81973..eada7f9 100644
--- a/eSecureBox/src/main/java/com/volcano/esecurebox/activity/SettingsActivity.java
+++ b/eSecureBox/src/main/java/com/volcano/esecurebox/activity/SettingsActivity.java
@@ -17,7 +17,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_settings);
 
         final Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setActionbar(toolbar);
+        setActionBar(toolbar);
     }
 
 }

From cfb71ba9a6eb0aabc689750e9af7fb6c8236f9c5 Mon Sep 17 00:00:00 2001
From: Ali Mehrpour <alimehrpour@gmail.com>
Date: Mon, 23 May 2016 16:56:56 -0700
Subject: [PATCH 3/4] Develop Add More Field feature in create account and edit
 account screens

---
 .../activity/CreateAccountActivity.java       |  26 +-
 .../activity/EditAccountActivity.java         |  22 +-
 .../fragment/AddFieldDialogFragment.java      | 133 +++++++++++
 .../fragment/CreateAccountFragment.java       | 223 +++++++-----------
 .../fragment/EditAccountFragment.java         | 141 ++++-------
 .../fragment/FieldListFragment.java           |  65 +++--
 .../esecurebox/model/AccountFieldValue.java   |   3 +-
 .../volcano/esecurebox/util/CompatUtils.java  |  49 ++++
 .../esecurebox/util/SoftKeyboardUtils.java    |  16 +-
 .../main/res/drawable-v21/ripple_effect.xml   |  11 +
 .../src/main/res/drawable/ripple_effect.xml   |  10 +
 .../res/layout/fragment_create_account.xml    |   1 +
 ...list.xml => fragment_dialog_add_field.xml} |   6 +-
 .../main/res/layout/fragment_edit_account.xml |   1 +
 eSecureBox/src/main/res/values/colors.xml     |   3 +
 eSecureBox/src/main/res/values/dimens.xml     |   2 +-
 eSecureBox/src/main/res/values/styles.xml     |   2 +-
 17 files changed, 422 insertions(+), 292 deletions(-)
 create mode 100644 eSecureBox/src/main/java/com/volcano/esecurebox/fragment/AddFieldDialogFragment.java
 create mode 100644 eSecureBox/src/main/java/com/volcano/esecurebox/util/CompatUtils.java
 create mode 100644 eSecureBox/src/main/res/drawable-v21/ripple_effect.xml
 create mode 100644 eSecureBox/src/main/res/drawable/ripple_effect.xml
 rename eSecureBox/src/main/res/layout/{dialog_field_list.xml => fragment_dialog_add_field.xml} (90%)

diff --git a/eSecureBox/src/main/java/com/volcano/esecurebox/activity/CreateAccountActivity.java b/eSecureBox/src/main/java/com/volcano/esecurebox/activity/CreateAccountActivity.java
index cad701d..4384acb 100644
--- a/eSecureBox/src/main/java/com/volcano/esecurebox/activity/CreateAccountActivity.java
+++ b/eSecureBox/src/main/java/com/volcano/esecurebox/activity/CreateAccountActivity.java
@@ -69,20 +69,18 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     @Override
     protected boolean askToFinish() {
-        if (mFragment.allowBackPressed()) {
-            new AlertDialogWrapper.Builder(this)
-                    .setMessage(R.string.alert_cancel_create_account)
-                    .setNegativeButton(
-                    R.string.button_discard_uppercase, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            finish();
-                        }
-                    })
-                    .setPositiveButton(R.string.button_keep_editing_uppercase, null)
-                    .show();
-        }
+        new AlertDialogWrapper.Builder(this)
+                .setMessage(R.string.alert_cancel_create_account)
+                .setNegativeButton(
+                R.string.button_discard_uppercase, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        finish();
+                    }
+                })
+                .setPositiveButton(R.string.button_keep_editing_uppercase, null)
+                .show();
+
         return false;
     }
-
 }
diff --git a/eSecureBox/src/main/java/com/volcano/esecurebox/activity/EditAccountActivity.java b/eSecureBox/src/main/java/com/volcano/esecurebox/activity/EditAccountActivity.java
index 205ab44..82fd988 100644
--- a/eSecureBox/src/main/java/com/volcano/esecurebox/activity/EditAccountActivity.java
+++ b/eSecureBox/src/main/java/com/volcano/esecurebox/activity/EditAccountActivity.java
@@ -109,18 +109,16 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     @Override
     protected boolean askToFinish() {
-        if (mFragment.allowBackPressed()) {
-            new AlertDialogWrapper.Builder(this)
-                    .setMessage(R.string.alert_cancel_edit_account)
-                    .setNegativeButton(R.string.button_discard_uppercase, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            finish();
-                        }
-                    })
-                    .setPositiveButton(R.string.button_keep_editing_uppercase, null)
-                    .show();
-        }
+        new AlertDialogWrapper.Builder(this)
+                .setMessage(R.string.alert_cancel_edit_account)
+                .setNegativeButton(R.string.button_discard_uppercase, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        finish();
+                    }
+                })
+                .setPositiveButton(R.string.button_keep_editing_uppercase, null)
+                .show();
 
         return false;
     }
diff --git a/eSecureBox/src/main/java/com/volcano/esecurebox/fragment/AddFieldDialogFragment.java b/eSecureBox/src/main/java/com/volcano/esecurebox/fragment/AddFieldDialogFragment.java
new file mode 100644
index 0000000..0a0d2df
--- /dev/null
+++ b/eSecureBox/src/main/java/com/volcano/esecurebox/fragment/AddFieldDialogFragment.java
@@ -0,0 +1,133 @@
+package com.volcano.esecurebox.fragment;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.RelativeLayout;
+
+import com.volcano.esecurebox.R;
+import com.volcano.esecurebox.model.Field;
+import com.volcano.esecurebox.util.Utils;
+import com.volcano.esecurebox.widget.RobotoEditText;
+import com.volcano.esecurebox.widget.RobotoTextView;
+
+import java.util.List;
+
+/**
+ * Provides field list which can be selected and returned by listener
+ */
+public final class AddFieldDialogFragment extends android.app.DialogFragment {
+    private RobotoTextView mCancelButton;
+    private RobotoTextView mChooseButton;
+    private RobotoEditText mSearchEdit;
+    private FieldListFragment mFieldListFragment;
+
+    private OnFieldSelectedListener mFieldSelectedListener;
+
+    public interface OnFieldSelectedListener {
+        void onFieldSelected(List<Field> fields);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        final View view = inflater.inflate(R.layout.fragment_dialog_add_field, container, false);
+
+        mCancelButton = (RobotoTextView) view.findViewById(R.id.button_cancel);
+        mChooseButton = (RobotoTextView) view.findViewById(R.id.button_choose);
+        mSearchEdit = (RobotoEditText) view.findViewById(R.id.edit_search);
+        mFieldListFragment = (FieldListFragment) getFragmentManager().findFragmentById(R.id.fragment_field_list);
+
+        if (mFieldListFragment == null && Utils.hasJellyBeanApi()) {
+            mFieldListFragment = new FieldListFragment();
+            getFragmentManager().beginTransaction().add(R.id.layout_field_list, mFieldListFragment).commit();
+        }
+
+        return view;
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        mSearchEdit.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                mFieldListFragment.loadFields(s.toString());
+            }
+        });
+
+        mCancelButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                hideKeyboard();
+                mFieldSelectedListener.onFieldSelected(null);
+                mFieldListFragment.clearSelected();
+            }
+        });
+
+        mChooseButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                hideKeyboard();
+                mFieldSelectedListener.onFieldSelected(mFieldListFragment.getSelectedFields());
+                mFieldListFragment.clearSelected();
+            }
+        });
+
+        mSearchEdit.setText(null);
+    }
+
+    @Override
+    public Dialog onCreateDialog(final Bundle savedInstanceState) {
+        // the content
+        final RelativeLayout root = new RelativeLayout(getActivity());
+        root.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+
+        // creating the fullscreen dialog
+        final Dialog dialog = new Dialog(getActivity());
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(root);
+        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.YELLOW));
+        dialog.getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+
+        return dialog;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+
+        try {
+            getFragmentManager().beginTransaction().remove(mFieldListFragment).commit();
+        }
+        catch (Exception ignored) {
+        }
+    }
+
+    public void setOnFieldSelectedListener(OnFieldSelectedListener listener) {
+        mFieldSelectedListener = listener;
+    }
+
+    private void hideKeyboard() {
+        final InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(mSearchEdit.getWindowToken(), 0);
+    }
+}
\ No newline at end of file
diff --git a/eSecureBox/src/main/java/com/volcano/esecurebox/fragment/CreateAccountFragment.java b/eSecureBox/src/main/java/com/volcano/esecurebox/fragment/CreateAccountFragment.java
index 3a5963a..7b23382 100644
--- a/eSecureBox/src/main/java/com/volcano/esecurebox/fragment/CreateAccountFragment.java
+++ b/eSecureBox/src/main/java/com/volcano/esecurebox/fragment/CreateAccountFragment.java
@@ -2,16 +2,14 @@
 package com.volcano.esecurebox.fragment;
 
 import android.app.Activity;
-import android.app.DialogFragment;
 import android.app.FragmentManager;
+import android.app.FragmentTransaction;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.support.design.widget.CoordinatorLayout;
 import android.support.design.widget.Snackbar;
 import android.support.v4.util.Pair;
-import android.text.Editable;
 import android.text.TextUtils;
-import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -51,15 +49,15 @@
 /**
  * Create account fragment
  */
-public class CreateAccountFragment extends AbstractFragment {
+public final class CreateAccountFragment extends AbstractFragment {
 
-    private final ArrayList<SubCategoryField> mFields = new ArrayList<>();
     private SubCategory mSelectedSubCategory;
+    private final ArrayList<SubCategoryField> mFields = new ArrayList<>();
     private Pair<Object, FieldCell> mLastRemovedFieldCell;
-    private String mSelectedSubCategoryId;
+
     private int mSavedFieldCount = 0;
+    private String mSelectedSubCategoryId;
 
-    private FragmentManager mFragmentManager;
     private RobotoEditText mAccountTitle;
     private RelativeLayout mSubCategoryLayout;
     private TextView mSubCategoryText;
@@ -132,11 +130,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         mSubCategoryImage = (ImageView) view.findViewById(R.id.image_sub_category);
         mSubCategoryListLayout = (FrameLayout) view.findViewById(R.id.layout_sub_category_list);
         mProgressLayout = (FrameLayout) view.findViewById(R.id.layout_progress);
-        mFragmentManager = getFragmentManager();
-        mSubCategoryListFragment = (SubCategoryListFragment) mFragmentManager.findFragmentById(R.id.fragment_sub_category_list);
+        final FragmentManager fragmentManager = getFragmentManager();
+        mSubCategoryListFragment = (SubCategoryListFragment) fragmentManager.findFragmentById(R.id.fragment_sub_category_list);
         if (mSubCategoryListFragment == null && Utils.hasJellyBeanApi()) {
             mSubCategoryListFragment = new SubCategoryListFragment();
-            mFragmentManager.beginTransaction().add(R.id.layout_sub_category_list, mSubCategoryListFragment).commit();
+            fragmentManager.beginTransaction().add(R.id.layout_sub_category_list, mSubCategoryListFragment).commit();
         }
         mAddFieldButton = (RobotoTextView) view.findViewById(R.id.button_add_field);
         mFieldsScrollView = (ScrollView) view.findViewById(R.id.scroll_view_fields);
@@ -150,29 +148,30 @@ public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
         mSubCategoryListFragment.setDefaultColorStyle(CircleDrawable.FILL);
-        mSubCategoryListFragment.setSubCategoryListener(new SubCategoryListFragment.OnSubCategoryListener() {
-            @Override
-            public void onSubCategoriesLoadFailed() {
-                setErrorState();
-            }
+        mSubCategoryListFragment.setSubCategoryListener(
+                new SubCategoryListFragment.OnSubCategoryListener() {
+                    @Override
+                    public void onSubCategoriesLoadFailed() {
+                        setErrorState();
+                    }
 
-            @Override
-            public void onSubCategoriesEmpty() {
-                setErrorState();
-            }
+                    @Override
+                    public void onSubCategoriesEmpty() {
+                        setErrorState();
+                    }
 
-            @Override
-            public void onSubCategorySelected(SubCategory subCategory) {
-                mSubCategoryListLayout.setVisibility(View.GONE);
-                mFieldsLayout.setVisibility(View.VISIBLE);
-                if (mSelectedSubCategory == null || mSelectedSubCategory != subCategory) {
-                    removeFields();
-                    setSubCategory(subCategory);
-                    mAccountTitle.requestFocus();
-                    loadFieldsBySubCategory();
-                }
-            }
-        });
+                    @Override
+                    public void onSubCategorySelected(SubCategory subCategory) {
+                        mSubCategoryListLayout.setVisibility(View.GONE);
+                        mFieldsLayout.setVisibility(View.VISIBLE);
+                        if (mSelectedSubCategory == null || mSelectedSubCategory != subCategory) {
+                            removeFields();
+                            setSubCategory(subCategory);
+                            mAccountTitle.requestFocus();
+                            loadFieldsBySubCategory();
+                        }
+                    }
+                });
 
         if (savedInstanceState != null) {
             mSelectedSubCategoryId = savedInstanceState.getString(Intents.KEY_SUB_CATEGORY_ID);
@@ -198,8 +197,7 @@ public void done(SubCategory subCategory, ParseException e) {
         mAddFieldButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                final AddFieldDialog addFieldDialog = new AddFieldDialog();
-                addFieldDialog.show(mFragmentManager, "fragment_add_field");
+                showAddMoreFieldDialog();
             }
         });
     }
@@ -276,7 +274,8 @@ public void done(ParseException e) {
                                             @Override
                                             public void done(ParseException e) {
                                                 if (e == null) {
-                                                    Utils.showToast(R.string.toast_account_delete_successful);
+                                                    Utils.showToast(
+                                                            R.string.toast_account_delete_successful);
                                                     mProgressLayout.setVisibility(View.GONE);
                                                     if (getActivity() != null) {
                                                         getActivity().finish();
@@ -285,7 +284,8 @@ public void done(ParseException e) {
                                                 }
                                                 else {
                                                     LogUtils.LogE(TAG, "Delete account failed");
-                                                    Utils.showToast(R.string.toast_account_delete_failed);
+                                                    Utils.showToast(
+                                                            R.string.toast_account_delete_failed);
                                                     mProgressLayout.setVisibility(View.GONE);
                                                     mListener.OnEnableActions(true);
                                                 }
@@ -332,7 +332,8 @@ private void setSubCategory(SubCategory subCategory) {
             }
         }
         if (!hasIcon) {
-            mSubCategoryImage.setImageDrawable(new CircleDrawable(subCategory.getCategory().getColor(), CircleDrawable.FILL));
+            mSubCategoryImage.setImageDrawable(
+                    new CircleDrawable(subCategory.getCategory().getColor(), CircleDrawable.FILL));
         }
     }
 
@@ -354,30 +355,43 @@ else if (mFields.size() == 0) {
     private void loadFieldsBySubCategory() {
         mProgressLayout.setVisibility(View.VISIBLE);
         mListener.OnEnableActions(false);
-        SubCategoryField.getFieldBySubCategory(this, mSelectedSubCategory, new FindCallback<SubCategoryField>() {
-            @Override
-            public void done(List<SubCategoryField> subCategoryFields, ParseException e) {
-                if (e == null) {
-                    // PopulateFields
-                    mFieldsLayout.setVisibility(View.INVISIBLE);
-                    mFields.clear();
-                    mFields.addAll(subCategoryFields);
-                    final int size = mFields.size();
-                    for (int i = 0; i < size; i++) {
-                        addToFieldsLayout(mFields.get(i), i);
+        SubCategoryField.getFieldBySubCategory(this, mSelectedSubCategory,
+                new FindCallback<SubCategoryField>() {
+                    @Override
+                    public void done(List<SubCategoryField> subCategoryFields, ParseException e) {
+                        if (e == null) {
+                            // PopulateFields
+                            mFieldsLayout.setVisibility(View.INVISIBLE);
+                            mFields.clear();
+                            mFields.addAll(subCategoryFields);
+                            final int size = mFields.size();
+                            for (int i = 0; i < size; i++) {
+                                addToFieldsLayout(mFields.get(i), i);
+                            }
+
+                            mProgressLayout.setVisibility(View.GONE);
+                            mAccountTitle.setVisibility(View.VISIBLE);
+                            mFieldsLayout.setVisibility(View.VISIBLE);
+                            mAddFieldButton.setVisibility(View.VISIBLE);
+                            mListener.OnEnableActions(true);
+                        }
+                        else {
+                            setErrorState();
+                        }
                     }
+                });
+    }
 
-                    mProgressLayout.setVisibility(View.GONE);
-                    mAccountTitle.setVisibility(View.VISIBLE);
-                    mFieldsLayout.setVisibility(View.VISIBLE);
-                    mAddFieldButton.setVisibility(View.VISIBLE);
-                    mListener.OnEnableActions(true);
-                }
-                else {
-                    setErrorState();
-                }
-            }
-        });
+    private void setErrorState() {
+        LogUtils.LogE(TAG, "Load account/fields failed");
+        mProgressLayout.setVisibility(View.GONE);
+        mFieldsLayout.setVisibility(View.GONE);
+        Utils.showToast(R.string.toast_account_create_failed);
+
+        final Activity activity = getActivity();
+        if (activity != null) {
+            getActivity().finish();
+        }
     }
 
     private void addToFieldsLayout(SubCategoryField field, int index) {
@@ -392,18 +406,6 @@ private void removeFields() {
         mFieldsLayout.removeAllViews();
     }
 
-    private void setErrorState() {
-        LogUtils.LogE(TAG, "Load account/fields failed");
-        mProgressLayout.setVisibility(View.GONE);
-        mFieldsLayout.setVisibility(View.GONE);
-        Utils.showToast(R.string.toast_account_create_failed);
-
-        final Activity activity = getActivity();
-        if (activity != null) {
-            getActivity().finish();
-        }
-    }
-
     private void addMoreField(List<Field> fields) {
         for(final Field field : fields) {
             final SubCategoryField subCategoryField = new SubCategoryField(mSelectedSubCategory, field);
@@ -420,73 +422,24 @@ private void scrollToDown() {
             public void run() {
                 mFieldsScrollView.fullScroll(ScrollView.FOCUS_DOWN);
             }
-        });    }
-
-    public class AddFieldDialog extends DialogFragment {
-
-        private RobotoTextView mCancelButton;
-        private RobotoTextView mChooseButton;
-        private RobotoEditText mSearchEdit;
-        private FieldListFragment mFragment;
-
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            setStyle(DialogFragment.STYLE_NO_TITLE, R.style.Theme_Assistant);
-        }
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-            final View view = inflater.inflate(R.layout.dialog_field_list, container);
-
-            mCancelButton = (RobotoTextView) view.findViewById(R.id.button_cancel);
-            mChooseButton = (RobotoTextView) view.findViewById(R.id.button_choose);
-            mSearchEdit = (RobotoEditText) view.findViewById(R.id.edit_search);
-            mFragment = (FieldListFragment) getFragmentManager().findFragmentById(R.id.fragment_field_list);
-
-            return view;
-        }
-
-        @Override
-        public void onActivityCreated(Bundle savedInstanceState) {
-            super.onActivityCreated(savedInstanceState);
-
-            mSearchEdit.addTextChangedListener(new TextWatcher() {
-                @Override
-                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                }
-
-                @Override
-                public void onTextChanged(CharSequence s, int start, int before, int count) {
-                }
-
-                @Override
-                public void afterTextChanged(Editable s) {
-                    mFragment.loadFields(s.toString());
-                }
-            });
-
-            mCancelButton.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    dismiss();
-                }
-            });
+        });
+    }
 
-            mChooseButton.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    dismiss();
-                    addMoreField(mFragment.getSelectedFields());
+    private void showAddMoreFieldDialog() {
+        final FragmentTransaction transaction = getFragmentManager().beginTransaction();
+        final AddFieldDialogFragment fragment = new AddFieldDialogFragment();
+        fragment.setOnFieldSelectedListener(new AddFieldDialogFragment.OnFieldSelectedListener() {
+            @Override
+            public void onFieldSelected(List<Field> fields) {
+                if (fields != null) {
+                    addMoreField(fields);
                 }
-            });
-        }
 
-        @Override
-        public void onDestroyView() {
-            super.onDestroyView();
-            if (mFragment != null)
-                getFragmentManager().beginTransaction().remove(mFragment).commit();
-        }
+                fragment.dismiss();
+                final FragmentTransaction transaction = getFragmentManager().beginTransaction();
+                transaction.remove(fragment).commit();
+            }
+        });
+        fragment.show(transaction, fragment.getClass().getSimpleName());
     }
 }
\ No newline at end of file
diff --git a/eSecureBox/src/main/java/com/volcano/esecurebox/fragment/EditAccountFragment.java b/eSecureBox/src/main/java/com/volcano/esecurebox/fragment/EditAccountFragment.java
index c0c96b3..7c0b20d 100644
--- a/eSecureBox/src/main/java/com/volcano/esecurebox/fragment/EditAccountFragment.java
+++ b/eSecureBox/src/main/java/com/volcano/esecurebox/fragment/EditAccountFragment.java
@@ -2,17 +2,14 @@
 package com.volcano.esecurebox.fragment;
 
 import android.app.Activity;
-import android.app.DialogFragment;
+import android.app.FragmentTransaction;
 import android.content.DialogInterface;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.support.design.widget.CoordinatorLayout;
 import android.support.design.widget.Snackbar;
 import android.support.v4.util.Pair;
-import android.text.Editable;
 import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -77,11 +74,12 @@ public void onSwiped(final FieldCell fieldCell) {
             final AccountFieldValue fieldValue = mAccountFieldValues.get(index);
 
             if (fieldValue.getStatus() == Status.EXIST) {
-                fieldValue.setStatus(Status.REMOVED);
-                mAccountFieldValues.get(index).setStatus(Status.REMOVED);
+                fieldValue.setStatus(Status.EXIST_REMOVED);
+                mAccountFieldValues.get(index).setStatus(Status.EXIST_REMOVED);
             }
             else {
-                mAccountFieldValues.remove(index);
+                fieldValue.setStatus(Status.ADDED_REMOVED);
+                mAccountFieldValues.get(index).setStatus(Status.ADDED_REMOVED);
             }
 
             mLastRemovedFieldCell = new Pair<>(fieldValue, fieldCell);
@@ -99,13 +97,14 @@ public void onClick(View v) {
 
                             int adjustedIndex = index;
                             for (int i = 0; i < index; i++) {
-                                if (mAccountFieldValues.get(i).getStatus() == Status.REMOVED) {
+                                final Status status = mAccountFieldValues.get(i).getStatus();
+                                if (status == Status.EXIST_REMOVED || status == Status.ADDED_REMOVED) {
                                     adjustedIndex--;
                                 }
                             }
                             mFieldsLayout.addView(removedCell, adjustedIndex);
 
-                            if (removedAccountFieldValue.getStatus() == Status.REMOVED) {
+                            if (removedAccountFieldValue.getStatus() == Status.EXIST_REMOVED) {
                                 removedAccountFieldValue.setStatus(Status.EXIST);
                                 mAccountFieldValues.set(index, removedAccountFieldValue);
                             }
@@ -135,13 +134,14 @@ public void onSwipeCanceled() {
         }
     };
 
-    private OnEnableActionsListener mListener;
+    private OnActionsListener mListener;
 
     /**
      * Interface to containing activities have to implement to be notified of actions on account
      */
-    public interface OnEnableActionsListener {
+    public interface OnActionsListener {
         void OnEnableActions(boolean enable);
+        void onVisibilityActions(int visibility);
     }
 
     @Override
@@ -168,17 +168,16 @@ public void onActivityCreated(Bundle savedInstanceState) {
         mAddFieldButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                final AddFieldDialog addFieldDialog = new AddFieldDialog();
-                addFieldDialog.show(getFragmentManager(), "fragment_add_field");
+                showAddMoreFieldDialog();
             }
         });
     }
 
     /**
-     * Set {@link OnEnableActionsListener}
+     * Set {@link OnActionsListener}
      * @param listener The listener
      */
-    public void setOnEnableActionsListener(OnEnableActionsListener listener) {
+    public void setOnEnableActionsListener(OnActionsListener listener) {
         mListener = listener;
     }
 
@@ -240,7 +239,7 @@ public void done(ParseException e) {
                                     checkDone();
                                 }
                             }
-                            else {
+                            else if (fieldValueStatus == Status.EXIST_REMOVED) {
                                 fieldValue.remove(new DeleteCallback() {
                                     @Override
                                     public void done(ParseException e) {
@@ -257,6 +256,10 @@ public void done(ParseException e) {
                                     }
                                 });
                             }
+                            else {
+                                mProcessedFieldCount++;
+                                checkDone();
+                            }
                         }
                     }
                     else {
@@ -346,7 +349,8 @@ private void setSubCategory(SubCategory subCategory) {
             }
         }
         if (!hasIcon) {
-            mSubCategoryImage.setImageDrawable(new CircleDrawable(subCategory.getCategory().getColor(), CircleDrawable.FILL));
+            mSubCategoryImage.setImageDrawable(
+                    new CircleDrawable(subCategory.getCategory().getColor(), CircleDrawable.FILL));
         }
     }
 
@@ -398,6 +402,18 @@ public void done(List<AccountFieldValue> accountFieldValues, ParseException e) {
         });
     }
 
+    private void setErrorState() {
+        LogUtils.LogE(TAG, "Load account/fields failed");
+        mProgressLayout.setVisibility(View.GONE);
+        mFieldsLayout.setVisibility(View.GONE);
+        Utils.showToast(R.string.toast_account_load_failed);
+
+        final Activity activity = getActivity();
+        if (activity != null) {
+            getActivity().finish();
+        }
+    }
+
     private void addToFieldsLayout(AccountFieldValue fieldValue, int index) {
         final FieldCell fieldCell = new FieldCell(getActivity());
         fieldCell.setField(fieldValue.getField(), fieldValue.getValue(), index);
@@ -413,6 +429,7 @@ private void addMoreField(List<Field> fields) {
             addToFieldsLayout(accountFieldValue, index);
             mAccountFieldValues.add(accountFieldValue);
         }
+
         scrollToDown();
     }
 
@@ -425,83 +442,21 @@ public void run() {
         });
     }
 
-    private void setErrorState() {
-        LogUtils.LogE(TAG, "Load account/fields failed");
-        mProgressLayout.setVisibility(View.GONE);
-        mFieldsLayout.setVisibility(View.GONE);
-        Utils.showToast(R.string.toast_account_load_failed);
-
-        final Activity activity = getActivity();
-        if (activity != null) {
-            getActivity().finish();
-        }
-    }
-
-    public class AddFieldDialog extends DialogFragment {
-
-        private RobotoTextView mCancelButton;
-        private RobotoTextView mChooseButton;
-        private RobotoEditText mSearchEdit;
-        private FieldListFragment mFragment;
-
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            setStyle(DialogFragment.STYLE_NO_TITLE, R.style.Theme_Assistant);
-        }
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-            final View view = inflater.inflate(R.layout.dialog_field_list, container);
-
-            mCancelButton = (RobotoTextView) view.findViewById(R.id.button_cancel);
-            mChooseButton = (RobotoTextView) view.findViewById(R.id.button_choose);
-            mSearchEdit = (RobotoEditText) view.findViewById(R.id.edit_search);
-            mFragment = (FieldListFragment) getFragmentManager().findFragmentById(R.id.fragment_field_list);
-
-            return view;
-        }
-
-        @Override
-        public void onActivityCreated(Bundle savedInstanceState) {
-            super.onActivityCreated(savedInstanceState);
-
-            mSearchEdit.addTextChangedListener(new TextWatcher() {
-                @Override
-                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                }
-
-                @Override
-                public void onTextChanged(CharSequence s, int start, int before, int count) {
-                }
-
-                @Override
-                public void afterTextChanged(Editable s) {
-                    mFragment.loadFields(s.toString());
-                }
-            });
-
-            mCancelButton.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    dismiss();
-                }
-            });
-
-            mChooseButton.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    dismiss();
-                    addMoreField(mFragment.getSelectedFields());
+    private void showAddMoreFieldDialog() {
+        final FragmentTransaction transaction = getFragmentManager().beginTransaction();
+        final AddFieldDialogFragment fragment = new AddFieldDialogFragment();
+        fragment.setOnFieldSelectedListener(new AddFieldDialogFragment.OnFieldSelectedListener() {
+            @Override
+            public void onFieldSelected(List<Field> fields) {
+                if (fields != null) {
+                    addMoreField(fields);
                 }
-            });
-        }
 
-        @Override
-        public void onDestroyView() {
-            super.onDestroyView();
-            if (mFragment != null)
-                getFragmentManager().beginTransaction().remove(mFragment).commit();
-        }
+                fragment.dismiss();
+                final FragmentTransaction transaction = getFragmentManager().beginTransaction();
+                transaction.remove(fragment).commit();
+            }
+        });
+        fragment.show(transaction, fragment.getClass().getSimpleName());
     }
 }
diff --git a/eSecureBox/src/main/java/com/volcano/esecurebox/fragment/FieldListFragment.java b/eSecureBox/src/main/java/com/volcano/esecurebox/fragment/FieldListFragment.java
index f5f7a81..ed15f1f 100644
--- a/eSecureBox/src/main/java/com/volcano/esecurebox/fragment/FieldListFragment.java
+++ b/eSecureBox/src/main/java/com/volcano/esecurebox/fragment/FieldListFragment.java
@@ -18,6 +18,7 @@
 import com.volcano.esecurebox.R;
 import com.volcano.esecurebox.model.Field;
 import com.volcano.esecurebox.util.BitmapUtils;
+import com.volcano.esecurebox.util.CompatUtils;
 import com.volcano.esecurebox.widget.RobotoTextView;
 
 import java.util.ArrayList;
@@ -30,17 +31,15 @@ public final class FieldListFragment extends AbstractFragment {
 
     private ListView mListView;
 
-    private final ArrayList<Field> mOriginalFields = new ArrayList<>();
+    private final static ArrayList<Field> mOriginalFields = new ArrayList<>();
     private final ArrayList<Field> mFields = new ArrayList<>();
     private final FieldListAdapter mAdapter = new FieldListAdapter();
     private final ArrayList<Field> mSelectedFields = new ArrayList<>();
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        final View view = inflater.inflate(R.layout.fragment_field_list, container);
-
+        final View view = inflater.inflate(R.layout.fragment_field_list, container, false);
         mListView = (ListView) view.findViewById(R.id.list_field);
-
         return view;
     }
 
@@ -67,8 +66,6 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
                 ((FieldListItem) view).setField(field, selected);
             }
         });
-
-        loadFields(null);
     }
 
     /**
@@ -77,28 +74,37 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
      */
     public void loadFields(String query) {
         if (TextUtils.isEmpty(query)) {
-            Field.findInBackground(this, new FindCallback<Field>() {
-                @Override
-                public void done(List<Field> fields, ParseException e) {
-                    if (e == null) {
-                        if (fields.size() > 0) {
-                            mFields.clear();
-                            mFields.addAll(fields);
-                            mAdapter.notifyDataSetChanged();
-
-                            // Used for search
-                            mOriginalFields.clear();
-                            mOriginalFields.addAll(fields);
+            clearSelected();
+
+            if (mOriginalFields.isEmpty()) {
+                Field.findInBackground(this, new FindCallback<Field>() {
+                    @Override
+                    public void done(List<Field> fields, ParseException e) {
+                        if (e == null) {
+                            if (fields.size() > 0) {
+                                mFields.clear();
+                                mFields.addAll(fields);
+                                mAdapter.notifyDataSetChanged();
+
+                                // Used for search
+                                mOriginalFields.clear();
+                                mOriginalFields.addAll(fields);
+                            }
+                            else {
+                                setErrorState();
+                            }
                         }
                         else {
                             setErrorState();
                         }
                     }
-                    else {
-                        setErrorState();
-                    }
-                }
-            });
+                });
+            }
+            else {
+                mFields.clear();
+                mFields.addAll(mOriginalFields);
+                mAdapter.notifyDataSetChanged();
+            }
         }
         else {
             mFields.clear();
@@ -114,13 +120,20 @@ public void done(List<Field> fields, ParseException e) {
     }
 
     /**
-     * Return selected fields
-     * @return
+     * @return selected fields
      */
     public ArrayList<Field> getSelectedFields() {
         return mSelectedFields;
     }
 
+    /**
+     * Clear selected list
+     */
+    public void clearSelected() {
+        mSelectedFields.clear();
+        mAdapter.notifyDataSetChanged();
+    }
+
     private void setErrorState() {
         // TODO: handle error state
     }
@@ -176,7 +189,7 @@ public FieldListItem(Context context) {
         }
 
         private void setField(Field field, boolean selected) {
-            mIcon.setImageDrawable(BitmapUtils.getFieldDrawable(getContext(), field.getIconName(), field.getName().charAt(0), getResources().getColor(R.color.grey_1)));
+            mIcon.setImageDrawable(BitmapUtils.getFieldDrawable(getContext(), field.getIconName(), field.getName().charAt(0), CompatUtils.getColor(R.color.grey_1)));
             mNameText.setText(field.getName());
             mCheckMarkImage.setVisibility(selected ? VISIBLE : INVISIBLE);
         }
diff --git a/eSecureBox/src/main/java/com/volcano/esecurebox/model/AccountFieldValue.java b/eSecureBox/src/main/java/com/volcano/esecurebox/model/AccountFieldValue.java
index 2e17120..cf43778 100644
--- a/eSecureBox/src/main/java/com/volcano/esecurebox/model/AccountFieldValue.java
+++ b/eSecureBox/src/main/java/com/volcano/esecurebox/model/AccountFieldValue.java
@@ -29,7 +29,8 @@ public class AccountFieldValue extends ParseObject {
     public enum Status {
         EXIST,
         ADDED,
-        REMOVED,
+        EXIST_REMOVED, // An existed object is removed
+        ADDED_REMOVED // An new added object is removed
     }
 
     public static ParseQuery findInBackground(Object tag, Account account, final FindCallback<AccountFieldValue> callback) {
diff --git a/eSecureBox/src/main/java/com/volcano/esecurebox/util/CompatUtils.java b/eSecureBox/src/main/java/com/volcano/esecurebox/util/CompatUtils.java
new file mode 100644
index 0000000..a72481d
--- /dev/null
+++ b/eSecureBox/src/main/java/com/volcano/esecurebox/util/CompatUtils.java
@@ -0,0 +1,49 @@
+package com.volcano.esecurebox.util;
+
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.widget.TextView;
+
+import com.volcano.esecurebox.VlApplication;
+
+/**
+ * Contains functions that call the appropriate SDK level function.
+ */
+public final class CompatUtils {
+    /**
+     * @see Resources#getColor(int)
+     */
+    public static int getColor(int id) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            return VlApplication.getInstance().getResources().getColor(id, null);
+        }
+        else {
+            //noinspection deprecation
+            return VlApplication.getInstance().getResources().getColor(id);
+        }
+    }
+
+    /**
+     * @see Resources#getDrawable(int)
+     */
+    public static Drawable getDrawable(int id) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            return VlApplication.getInstance().getResources().getDrawable(id, null);
+        }
+        else {
+            //noinspection deprecation
+            return VlApplication.getInstance().getResources().getDrawable(id);
+        }
+    }
+
+    public static void setTextAppearance(TextView textview, int resId) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            textview.setTextAppearance(resId);
+        }
+        else {
+            //noinspection deprecation
+            textview.setTextAppearance(textview.getContext(), resId);
+        }
+    }
+}
diff --git a/eSecureBox/src/main/java/com/volcano/esecurebox/util/SoftKeyboardUtils.java b/eSecureBox/src/main/java/com/volcano/esecurebox/util/SoftKeyboardUtils.java
index 93e3c1b..ddaace7 100644
--- a/eSecureBox/src/main/java/com/volcano/esecurebox/util/SoftKeyboardUtils.java
+++ b/eSecureBox/src/main/java/com/volcano/esecurebox/util/SoftKeyboardUtils.java
@@ -20,7 +20,7 @@
 @SuppressWarnings("UnusedDeclaration")
 public class SoftKeyboardUtils implements ViewTreeObserver.OnGlobalLayoutListener {
 
-    private float mMaxHeigthDiff;
+    private float mMaxHeightDiff;
     private final List<OnSoftKeyboardStateListener> listeners = new LinkedList<>();
     private final View mActivityRootView;
     private int mLastSoftKeyboardHeight;
@@ -35,12 +35,12 @@ public interface OnSoftKeyboardStateListener {
          * Called when soft keyboard has opened
          * @param keyboardHeight The soft keyboard height
          */
-        public void onSoftKeyboardOpened(int keyboardHeight);
+        void onSoftKeyboardOpened(int keyboardHeight);
 
         /**
          * Called when soft keyboard has closed
          */
-        public void onSoftKeyboardClosed();
+        void onSoftKeyboardClosed();
     }
 
     public SoftKeyboardUtils(View activityRootView) {
@@ -54,10 +54,10 @@ public SoftKeyboardUtils(View activityRootView, boolean isSoftKeyboardOpened) {
 
         final Resources res = VlApplication.getInstance().getResources();
         // For confidence use 150% of status bar
-        mMaxHeigthDiff = 1.5f * res.getDimensionPixelSize(R.dimen.status_bar_height);
+        mMaxHeightDiff = 1.5f * res.getDimensionPixelSize(R.dimen.status_bar_height);
         if (Utils.hasLollipopApi()) {
             final float buttonBarHeight = res.getDimensionPixelSize(R.dimen.button_bar_height_lollipop);
-            mMaxHeigthDiff += buttonBarHeight;
+            mMaxHeightDiff += buttonBarHeight;
         }
     }
 
@@ -79,7 +79,7 @@ public boolean ismIsSoftKeyboardOpened() {
      * Default value is zero (0)
      * @return last saved keyboard height in px
      */
-    public int getmLastSoftKeyboardHeight() {
+    public int getLastSoftKeyboardHeight() {
         return mLastSoftKeyboardHeight;
     }
 
@@ -106,11 +106,11 @@ public void onGlobalLayout() {
         mActivityRootView.getWindowVisibleDisplayFrame(r);
 
         final int heightDiff = mActivityRootView.getRootView().getHeight() - (r.bottom - r.top);
-        if (!mIsSoftKeyboardOpened && heightDiff > mMaxHeigthDiff) {
+        if (!mIsSoftKeyboardOpened && heightDiff > mMaxHeightDiff) {
             mIsSoftKeyboardOpened = true;
             notifyOnSoftKeyboardOpened(heightDiff);
         }
-        else if (mIsSoftKeyboardOpened && heightDiff < mMaxHeigthDiff) {
+        else if (mIsSoftKeyboardOpened && heightDiff < mMaxHeightDiff) {
             mIsSoftKeyboardOpened = false;
             notifyOnSoftKeyboardClosed();
         }
diff --git a/eSecureBox/src/main/res/drawable-v21/ripple_effect.xml b/eSecureBox/src/main/res/drawable-v21/ripple_effect.xml
new file mode 100644
index 0000000..0a65121
--- /dev/null
+++ b/eSecureBox/src/main/res/drawable-v21/ripple_effect.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2016 Didja, Inc. All rights reserved. -->
+
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/button_normal_ripple">
+
+    <item android:id="@android:id/mask"
+        android:drawable="@android:color/white" />
+
+</ripple>
\ No newline at end of file
diff --git a/eSecureBox/src/main/res/drawable/ripple_effect.xml b/eSecureBox/src/main/res/drawable/ripple_effect.xml
new file mode 100644
index 0000000..7b276ed
--- /dev/null
+++ b/eSecureBox/src/main/res/drawable/ripple_effect.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2016 Didja, Inc. All rights reserved. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@color/button_normal_ripple" android:state_pressed="true"/>
+
+    <item android:drawable="@color/button_normal_background" />
+
+</selector>
\ No newline at end of file
diff --git a/eSecureBox/src/main/res/layout/fragment_create_account.xml b/eSecureBox/src/main/res/layout/fragment_create_account.xml
index 585e9c2..f83d0da 100644
--- a/eSecureBox/src/main/res/layout/fragment_create_account.xml
+++ b/eSecureBox/src/main/res/layout/fragment_create_account.xml
@@ -114,6 +114,7 @@
                 android:text="@string/button_add_field"
                 android:textColor="@color/grey_2"
                 style="@style/Text.RegularGrey16"
+                android:background="@drawable/ripple_effect"
                 android:visibility="gone"/>
 
         </LinearLayout>
diff --git a/eSecureBox/src/main/res/layout/dialog_field_list.xml b/eSecureBox/src/main/res/layout/fragment_dialog_add_field.xml
similarity index 90%
rename from eSecureBox/src/main/res/layout/dialog_field_list.xml
rename to eSecureBox/src/main/res/layout/fragment_dialog_add_field.xml
index 5fe4072..7bd407d 100644
--- a/eSecureBox/src/main/res/layout/dialog_field_list.xml
+++ b/eSecureBox/src/main/res/layout/fragment_dialog_add_field.xml
@@ -6,7 +6,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusable="true"
-    android:focusableInTouchMode="true">
+    android:focusableInTouchMode="true"
+    android:background="@android:color/white">
 
     <com.volcano.esecurebox.widget.RobotoEditText
         android:id="@+id/edit_search"
@@ -30,6 +31,7 @@
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
             android:text="@string/button_choose_uppercase"
+            android:background="@drawable/ripple_effect"
             style="@style/ButtonDialog" />
 
         <com.volcano.esecurebox.widget.RobotoTextView
@@ -40,12 +42,14 @@
             android:layout_marginEnd="@dimen/margin_12"
             android:layout_toLeftOf="@id/button_choose"
             android:layout_toStartOf="@id/button_choose"
+            android:background="@drawable/ripple_effect"
             android:text="@string/button_cancel_uppercase"
             style="@style/ButtonDialog" />
 
     </RelativeLayout>
 
     <FrameLayout
+        android:id="@+id/layout_field_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/edit_search"
diff --git a/eSecureBox/src/main/res/layout/fragment_edit_account.xml b/eSecureBox/src/main/res/layout/fragment_edit_account.xml
index b97914f..24200d8 100644
--- a/eSecureBox/src/main/res/layout/fragment_edit_account.xml
+++ b/eSecureBox/src/main/res/layout/fragment_edit_account.xml
@@ -99,6 +99,7 @@
                 android:text="@string/button_add_field"
                 android:textColor="@color/grey_2"
                 style="@style/Text.RegularGrey16"
+                android:background="@drawable/ripple_effect"
                 android:visibility="gone"/>
 
         </LinearLayout>
diff --git a/eSecureBox/src/main/res/values/colors.xml b/eSecureBox/src/main/res/values/colors.xml
index fe33a81..643c236 100644
--- a/eSecureBox/src/main/res/values/colors.xml
+++ b/eSecureBox/src/main/res/values/colors.xml
@@ -7,6 +7,9 @@
     <color name="blue_1">#596699</color>
     <color name="blue_2">#41C2FA</color>
 
+    <color name="button_normal_ripple">#79999999</color>
+    <color name="button_normal_background">#FFFFFF</color>
+
     <color name="divider">#CECECE</color>
 
     <color name="fab_disable">#AAAAAA</color>
diff --git a/eSecureBox/src/main/res/values/dimens.xml b/eSecureBox/src/main/res/values/dimens.xml
index fa082b3..e3265f5 100644
--- a/eSecureBox/src/main/res/values/dimens.xml
+++ b/eSecureBox/src/main/res/values/dimens.xml
@@ -10,7 +10,7 @@
 
     <dimen name="button_dialog_height">48dp</dimen>
     <dimen name="button_dialog_min_width">42dp</dimen>
-    <dimen name="button_dialog_textsize">14sp</dimen>
+    <dimen name="button_dialog_text_size">14sp</dimen>
     <dimen name="button_dialog_inset_vertical">6dp</dimen>
     <dimen name="button_dialog_inset_horizontal">4dp</dimen>
 
diff --git a/eSecureBox/src/main/res/values/styles.xml b/eSecureBox/src/main/res/values/styles.xml
index 66d05fb..ccf7062 100644
--- a/eSecureBox/src/main/res/values/styles.xml
+++ b/eSecureBox/src/main/res/values/styles.xml
@@ -52,7 +52,7 @@
 
     <style name="ButtonDialog" parent="@android:style/TextAppearance.Holo">
         <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">@dimen/button_dialog_textsize</item>
+        <item name="android:textSize">@dimen/button_dialog_text_size</item>
         <item name="android:textColor">@color/theme_primary</item>
         <item name="android:singleLine">true</item>
         <item name="android:layout_gravity">center_vertical</item>

From bc25f8e65cbcd7bb13112b3eaec32ed18cccef5c Mon Sep 17 00:00:00 2001
From: Ali Mehrpour <alimehrpour@gmail.com>
Date: Mon, 23 May 2016 17:58:12 -0700
Subject: [PATCH 4/4] Fix collapsing toolbar issue

---
 .../esecurebox/activity/DisplayAccountActivity.java       | 3 ++-
 .../esecurebox/fragment/AddFieldDialogFragment.java       | 2 +-
 .../widget/FloatingActionButtonAppbarBehavior.java        | 8 ++++++--
 .../src/main/res/layout/activity_display_account.xml      | 2 +-
 eSecureBox/src/main/res/values/dimens.xml                 | 7 ++++---
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/eSecureBox/src/main/java/com/volcano/esecurebox/activity/DisplayAccountActivity.java b/eSecureBox/src/main/java/com/volcano/esecurebox/activity/DisplayAccountActivity.java
index 4c611b4..d89ada8 100644
--- a/eSecureBox/src/main/java/com/volcano/esecurebox/activity/DisplayAccountActivity.java
+++ b/eSecureBox/src/main/java/com/volcano/esecurebox/activity/DisplayAccountActivity.java
@@ -15,6 +15,7 @@
 import com.volcano.esecurebox.R;
 import com.volcano.esecurebox.analytics.MixpanelManager;
 import com.volcano.esecurebox.fragment.DisplayAccountFragment;
+import com.volcano.esecurebox.util.CompatUtils;
 import com.volcano.esecurebox.widget.FloatingActionButton;
 
 /**
@@ -39,7 +40,7 @@ protected void onCreate(Bundle savedInstanceState) {
         collapsingToolbar.setTitle(intent.getStringExtra(Intents.EXTRA_ACCOUNT_TITLE));
         collapsingToolbar.setContentScrimColor(colorId);
         collapsingToolbar.setStatusBarScrimColor(colorId);
-        collapsingToolbar.setExpandedTitleColor(getResources().getColor(android.R.color.transparent));
+        collapsingToolbar.setExpandedTitleColor(CompatUtils.getColor(android.R.color.transparent));
         collapsingToolbar.setExpandedTitleTextAppearance(R.style.Text_RegularWhite30);
 
         final AppBarLayout appBarLayout = (AppBarLayout) findViewById(R.id.appbar);
diff --git a/eSecureBox/src/main/java/com/volcano/esecurebox/fragment/AddFieldDialogFragment.java b/eSecureBox/src/main/java/com/volcano/esecurebox/fragment/AddFieldDialogFragment.java
index 0a0d2df..2937303 100644
--- a/eSecureBox/src/main/java/com/volcano/esecurebox/fragment/AddFieldDialogFragment.java
+++ b/eSecureBox/src/main/java/com/volcano/esecurebox/fragment/AddFieldDialogFragment.java
@@ -105,7 +105,7 @@ public Dialog onCreateDialog(final Bundle savedInstanceState) {
         final Dialog dialog = new Dialog(getActivity());
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         dialog.setContentView(root);
-        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.YELLOW));
+        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.WHITE));
         dialog.getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
 
         return dialog;
diff --git a/eSecureBox/src/main/java/com/volcano/esecurebox/widget/FloatingActionButtonAppbarBehavior.java b/eSecureBox/src/main/java/com/volcano/esecurebox/widget/FloatingActionButtonAppbarBehavior.java
index 413c786..d31bd86 100644
--- a/eSecureBox/src/main/java/com/volcano/esecurebox/widget/FloatingActionButtonAppbarBehavior.java
+++ b/eSecureBox/src/main/java/com/volcano/esecurebox/widget/FloatingActionButtonAppbarBehavior.java
@@ -8,11 +8,15 @@
 import android.util.AttributeSet;
 import android.view.View;
 
+import com.volcano.esecurebox.R;
+import com.volcano.esecurebox.VlApplication;
+
 /**
  * Defines fab behavior when user scroll the list and coordinator layout has been changed
  */
 @SuppressWarnings("unused")
 public final class FloatingActionButtonAppBarBehavior extends Behavior<FloatingActionButton> {
+    final int sCollapsedToolbarHeight = VlApplication.getInstance().getResources().getDimensionPixelSize(R.dimen.toolbar_collapse_height);
 
     public FloatingActionButtonAppBarBehavior(Context context, AttributeSet attrs) {
     }
@@ -23,13 +27,13 @@ public boolean layoutDependsOn(CoordinatorLayout parent, FloatingActionButton ch
     }
 
     @Override
-    public boolean onDependentViewChanged(CoordinatorLayout parent, FloatingActionButton child, View dependency) {
+    public boolean onDependentViewChanged(CoordinatorLayout parent, final FloatingActionButton child, View dependency) {
         final Rect rect = new Rect();
         dependency.getGlobalVisibleRect(rect);
 
         child.setTranslationY(dependency.getTop());
 
-        if (child.getHeight() + 50 > rect.height()) {
+        if (rect.height() < sCollapsedToolbarHeight * 2) {
             child.setTranslationX(-500); // Just goes out of screen
         }
         else {
diff --git a/eSecureBox/src/main/res/layout/activity_display_account.xml b/eSecureBox/src/main/res/layout/activity_display_account.xml
index eea7163..1923ef6 100644
--- a/eSecureBox/src/main/res/layout/activity_display_account.xml
+++ b/eSecureBox/src/main/res/layout/activity_display_account.xml
@@ -19,7 +19,7 @@
         <android.support.design.widget.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
-            android:layout_height="192dp"
+            android:layout_height="@dimen/toolbar_extended_height"
             app:layout_scrollFlags="scroll|exitUntilCollapsed"
             app:expandedTitleMarginStart="48dp"
             app:expandedTitleMarginEnd="48dp"
diff --git a/eSecureBox/src/main/res/values/dimens.xml b/eSecureBox/src/main/res/values/dimens.xml
index e3265f5..865724e 100644
--- a/eSecureBox/src/main/res/values/dimens.xml
+++ b/eSecureBox/src/main/res/values/dimens.xml
@@ -77,8 +77,9 @@
     <dimen name="text_size_36">36sp</dimen>
 
     <dimen name="text_view_height">64dp</dimen>
-    
-    <dimen name="toolbar_extended_height">192dp</dimen>
-    <dimen name="toolbar_extended_button_margin_top">164dp</dimen>
+
+    <dimen name="toolbar_collapse_height">56dp</dimen>
+    <dimen name="toolbar_extended_height">208dp</dimen>
+    <dimen name="toolbar_extended_button_margin_top">156dp</dimen>
 
 </resources>