Merge pull request #17 from AliMehrpour/cryptography

Cryptography
AliMehrpour · Mar 16, 2015 · 6afd6d4 · 6afd6d4
2 parents 799871a + c014270
commit 6afd6d4
Show file tree

Hide file tree

Showing 154 changed files with 2,172 additions and 868 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/MaterialDialogs/src/main/java/com/afollestad/materialdialogs/AlertDialogWrapper.java b/MaterialDialogs/src/main/java/com/afollestad/materialdialogs/AlertDialogWrapper.java
@@ -13,8 +13,6 @@
 import android.view.View;
 import android.widget.ListAdapter;
 
-import com.afollestad.materialdialogs.MaterialDialog;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -38,6 +36,11 @@ public Builder(@NonNull Context context) {
             builder = new MaterialDialog.Builder(context);
         }
 
+        public Builder autoDismiss(boolean dismiss) {
+            builder.autoDismiss(dismiss);
+            return this;
+        }
+
         public Builder setMessage(@StringRes int messageId) {
             builder.content(messageId);
             return this;

diff --git a/MaterialLibrary/MaterialLibrary.iml b/MaterialLibrary/MaterialLibrary.iml
diff --git a/MaterialLibrary/build.gradle b/MaterialLibrary/build.gradle
diff --git a/MaterialLibrary/proguard-rules.pro b/MaterialLibrary/proguard-rules.pro
diff --git a/MaterialLibrary/src/main/AndroidManifest.xml b/MaterialLibrary/src/main/AndroidManifest.xml
diff --git a/MaterialLibrary/src/main/res/values/strings.xml b/MaterialLibrary/src/main/res/values/strings.xml
diff --git a/eSecureBox/build.gradle b/eSecureBox/build.gradle
@@ -18,13 +18,14 @@ android {
 }
 
 dependencies {
-    compile project(':MaterialLibrary')
-    compile project(':MaterialDialogs')
+     compile project(':MaterialDialogs')
 
     compile 'com.android.support:appcompat-v7:21.0.3'
     compile 'com.android.support:recyclerview-v7:21.0.3'
 
     compile 'com.parse.bolts:bolts-android:1.1.4'
     compile fileTree(dir: 'libs', include: 'Parse-*.jar')
     compile fileTree(dir: 'libs', include: 'ParseCrashReporting-*.jar')
-}
+
+    compile "com.mixpanel.android:mixpanel-android:4.5.3"
+}
diff --git a/eSecureBox/eSecureBox.apk b/eSecureBox/eSecureBox.apk
diff --git a/eSecureBox/eSecureBox.iml b/eSecureBox/eSecureBox.iml
@@ -88,11 +88,11 @@
     <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="ParseCrashReporting-1.8.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="mixpanel-android-4.5.3" level="project" />
     <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="Parse-1.8.0" level="project" />
     <orderEntry type="library" exported="" name="bolts-android-1.1.4" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-21.0.3" level="project" />
-    <orderEntry type="module" module-name="MaterialLibrary" exported="" />
     <orderEntry type="module" module-name="MaterialDialogs" exported="" />
   </component>
 </module>