diff --git a/.gitignore b/.gitignore
index d8aa69f01..18ceea34f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,94 @@
-.project
+# Built application files
+*.apk
+*.ap_
 
-.gradle
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
 local.properties
 
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
+*.iml
 .idea/workspace.xml
 .idea/tasks.xml
 .idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
 .idea/libraries
-*.iml
-import-summary.txt
+.idea/caches
 
-build/
-*.apk
+
+# IntelliJ IDEA
+*.iml
+*.iws
+/out/
+
+# User-specific configurations
+.idea/.name
+.idea/assetWizardSettings.xml
+.idea/caches/
+.idea/compiler.xml
+.idea/copyright/profiles_settings.xml
+.idea/dataSources.ids
+.idea/datasources.xml
+.idea/dictionaries
+.idea/dynamic.xml
+.idea/encodings.xml
+.idea/jsLibraryMappings.xml
+.idea/libraries/
+.idea/misc.xml
+.idea/modules.xml
+.idea/scopes/scope_settings.xml
+.idea/shelf/
+.idea/sqlDataSources.xml
+.idea/tasks.xml
+.idea/vcs.xml
+.idea/uiDesigner.xml
+.idea/workspace.xml
+
+# Keystore files
+# Uncomment the following line if you do not want to check your keystore files in.
+#*.jks
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md