diff --git a/.DS_Store b/.DS_Store
index 325f626..c3d1760 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/.gitignore b/.gitignore
index 35bfdb6..f54e63f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,71 @@
-# Created by https://www.toptal.com/developers/gitignore/api/androidstudio,xcode
-# Edit at https://www.toptal.com/developers/gitignore?templates=androidstudio,xcode
+# Created by https://www.toptal.com/developers/gitignore/api/gradle,java,android,androidstudio,xcode,xcodeinjection
+# Edit at https://www.toptal.com/developers/gitignore?templates=gradle,java,android,androidstudio,xcode,xcodeinjection
+
+### Android ###
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Log/OS Files
+*.log
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+output.json
+
+# IntelliJ
+*.iml
+.idea/
+misc.xml
+deploymentTargetDropDown.xml
+render.experimental.xml
+
+# Keystore files
+*.jks
+*.keystore
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Android Profiling
+*.hprof
+
+### Android Patch ###
+gen-external-apklibs
+
+# Replacement of .externalNativeBuild directories introduced
+# with Android Studio 3.5.
+
+### Java ###
+# Compiled class file
+*.class
+
+# Log file
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
 
 ### Xcode ###
 ## User settings
@@ -18,11 +84,44 @@ xcuserdata/
 /*.gcno
 **/xcshareddata/WorkspaceSettings.xcsettings
 
+### XcodeInjection ###
+# Code Injection
+#
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/
+
+### Gradle ###
+.gradle
+**/build/
+!src/**/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Avoid ignore Gradle wrappper properties
+!gradle-wrapper.properties
+
+# Cache of project
+.gradletasknamecache
+
+# Eclipse Gradle plugin generated files
+# Eclipse Core
+.project
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+### Gradle Patch ###
+# Java heap dump
+
 ### AndroidStudio ###
 # Covers files to be ignored for android development using Android Studio.
 
 # Built application files
-*.apk
 *.ap_
 *.aab
 
@@ -30,7 +129,6 @@ xcuserdata/
 *.dex
 
 # Java class files
-*.class
 
 # Generated files
 bin/
@@ -38,21 +136,16 @@ gen/
 out/
 
 # Gradle files
-.gradle
-.gradle/
-build/
 
 # Signing files
 .signing/
 
 # Local configuration file (sdk path, etc)
-local.properties
 
 # Proguard folder generated by Eclipse
 proguard/
 
 # Log Files
-*.log
 
 # Android Studio
 /*/build/
@@ -60,21 +153,17 @@ proguard/
 /*/out
 /*/*/build
 /*/*/production
-captures/
 .navigation/
 *.ipr
 *~
 *.swp
 
 # Keystore files
-*.jks
-*.keystore
 
 # Google Services (e.g. APIs or Firebase)
 # google-services.json
 
 # Android Patch
-gen-external-apklibs
 
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
@@ -83,7 +172,6 @@ gen-external-apklibs
 obj/
 
 # IntelliJ IDEA
-*.iml
 *.iws
 /out/
 
@@ -114,20 +202,14 @@ obj/
 .idea/navEditor.xml
 
 # Legacy Eclipse project files
-.classpath
-.project
 .cproject
 .settings/
 
 # Mobile Tools for Java (J2ME)
-.mtj.tmp/
 
 # Package Files #
-*.war
-*.ear
 
 # virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
-hs_err_pid*
 
 ## Plugin-specific files:
 
@@ -150,4 +232,4 @@ fabric.properties
 
 !/gradle/wrapper/gradle-wrapper.jar
 
-# End of https://www.toptal.com/developers/gitignore/api/androidstudio,xcode
\ No newline at end of file
+# End of https://www.toptal.com/developers/gitignore/api/gradle,java,android,androidstudio,xcode,xcodeinjection
\ No newline at end of file