From 8c79b6f353654f0b3f7d1c843e5c1715285eacdf Mon Sep 17 00:00:00 2001 From: Ivan Pizhenko Date: Thu, 11 Mar 2021 19:38:15 +0200 Subject: [PATCH 1/3] issue #1074 Introduce project specific code formatting settings --- .idea/codeStyles/Project.xml | 14 ++++++++++++++ .idea/codeStyles/codeStyleConfig.xml | 2 +- .idea/modules.xml | 4 ++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 0d156937bb..b17c02e4eb 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -18,6 +18,13 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml index 6bb2ff594e..79ee123c2b 100644 --- a/.idea/codeStyles/codeStyleConfig.xml +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -1,5 +1,5 @@ - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 3a8542cc2f..c7f4e06668 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,8 @@ - + - + \ No newline at end of file From e4cc974c97df8f57ab152234bddd7527bffae6a0 Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Thu, 11 Mar 2021 21:06:39 +0200 Subject: [PATCH 2/3] Modified Project.xml(imports settings). Modified .gitignore. Removed unused code.| #1074 --- .gitignore | 60 ++++++------------- .idea/codeStyles/Project.xml | 2 + FlowCrypt/src/main/assets/.idea/.name | 1 - .../inspectionProfiles/Project_Default.xml | 6 -- FlowCrypt/src/main/assets/.idea/modules.xml | 8 --- 5 files changed, 21 insertions(+), 56 deletions(-) delete mode 100644 FlowCrypt/src/main/assets/.idea/.name delete mode 100644 FlowCrypt/src/main/assets/.idea/inspectionProfiles/Project_Default.xml delete mode 100644 FlowCrypt/src/main/assets/.idea/modules.xml 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 b17c02e4eb..b8ebed962e 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -17,6 +17,8 @@ +