diff --git a/.gitignore b/.gitignore index e48ef1992f..56580994de 100644 --- a/.gitignore +++ b/.gitignore @@ -1,47 +1,25 @@ -# Generated files -bin/ -gen/ - -# Gradle files -.gradle/ -build/ -.cxx - -# 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/ - -# Android Studio files +# From Android Studio template +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml .DS_Store +/build +/captures .externalNativeBuild +.cxx +local.properties -# Intellij -*.iml -.idea/workspace.xml -.idea/libraries -.idea/misc.xml -.idea/caches/* -.idea/codeStyles/codeStyleConfig.xml - +# Custom settings +/.idea/misc.xml +/release +/docker-mailserver/maildata_volume/ # Keystore files *.jks - # keystore info -FlowCrypt/keystore.properties - -FlowCrypt/src/main/assets/.idea/vcs.xml -FlowCrypt/src/main/assets/.idea/workspace.xml - -release/*.apk -docker-mailserver/maildata_volume/ +/FlowCrypt/keystore.properties \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 0d156937bb..b8ebed962e 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -17,7 +17,16 @@ +