DyncEric · DyncKathline · Jan 8, 2016 · Jan 8, 2016 · Jan 8, 2016 · Jan 8, 2016
diff --git a/.gitignore b/.gitignore
@@ -1,32 +1,37 @@
-# Built application files
+# built application files
 *.apk
 *.ap_
 
-# Files for the Dalvik VM
+# files for the dex VM
 *.dex
 
 # Java class files
 *.class
 
-# Generated files
+# generated files
 bin/
 gen/
 
-# Gradle files
-.gradle/
-build/
-
 # Local configuration file (sdk path, etc)
 local.properties
 
+# Eclipse project files
+.classpath
+.project
+
 # Proguard folder generated by Eclipse
 proguard/
 
-# Log Files
-*.log
-
-# Android Studio Navigation editor temp files
-.navigation/
-
-# Android Studio captures folder
-captures/
+# Intellij project files
+*.iml
+*.ipr
+*.iws
+.idea/
+
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/libraries/EventBus2_4.xml b/.idea/libraries/EventBus2_4.xml
diff --git a/.idea/libraries/android_async_http_1_4_7.xml b/.idea/libraries/android_async_http_1_4_7.xml
diff --git a/.idea/libraries/anyrtc_1_0_0.xml b/.idea/libraries/anyrtc_1_0_0.xml
diff --git a/.idea/libraries/gson_2_5.xml b/.idea/libraries/gson_2_5.xml
diff --git a/.idea/libraries/jpush_android_2_0_5.xml b/.idea/libraries/jpush_android_2_0_5.xml
diff --git a/.idea/libraries/logger_1_3.xml b/.idea/libraries/logger_1_3.xml
diff --git a/.idea/libraries/nineoldandroids_2_4_0.xml b/.idea/libraries/nineoldandroids_2_4_0.xml
diff --git a/.idea/libraries/support_v4_19_1_0.xml b/.idea/libraries/support_v4_19_1_0.xml
diff --git a/.idea/libraries/sweetAlertDialogLibrary_unspecified.xml b/.idea/libraries/sweetAlertDialogLibrary_unspecified.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml