From df8bb1cae265e7967ee192f046f2c9918e41a165 Mon Sep 17 00:00:00 2001
From: JaniruTEC <52893617+JaniruTEC@users.noreply.github.com>
Date: Mon, 12 Feb 2024 00:20:49 +0100
Subject: [PATCH 1/4] Removed outdated settings from code style
"PACKAGES_TO_USE_STAR_IMPORTS" is unneeded if empty.
"NAME_COUNT_TO_USE_STAR_IMPORT" and "NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" are treated as "never" when not set.
---
.idea/codeStyles/Project.xml | 5 -----
1 file changed, 5 deletions(-)
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 7928f60d5..341709a61 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -46,9 +46,6 @@
-
-
-
From 17e6c2ba405e902a70adcfd08ea9c91120bb3773 Mon Sep 17 00:00:00 2001
From: JaniruTEC <52893617+JaniruTEC@users.noreply.github.com>
Date: Mon, 12 Feb 2024 00:26:48 +0100
Subject: [PATCH 2/4] Fixed invalid code style configuration
See: https://github.com/JetBrains/intellij-community/blob/bbea9cb467dbc7d2d3ae579216346e13e409757d/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesModel.java#L100
---
.idea/codeStyles/codeStyleConfig.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index 82c2e2f0b..79ee123c2 100755
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,6 +1,5 @@
-
\ No newline at end of file
From a12dd39e5c7b95fa7039d3df100bf813ef4a5daf Mon Sep 17 00:00:00 2001
From: JaniruTEC <52893617+JaniruTEC@users.noreply.github.com>
Date: Mon, 12 Feb 2024 00:33:26 +0100
Subject: [PATCH 3/4] Removed deprecated code style setting
See: https://github.com/JetBrains/intellij-community/commit/fefba5b419a659f75b27c863c368d4a0aae78d80#diff-07c799e7bc2e542c00f542a8f2fea0e971d78b9d51a9b209f609eaf1b4861db9L75-L77
---
.idea/codeStyles/Project.xml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 341709a61..1e0cc37b9 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -65,9 +65,6 @@
-
-
-
From 9862c12c944a7ea580add55ddc938e12b16fd195 Mon Sep 17 00:00:00 2001
From: JaniruTEC <52893617+JaniruTEC@users.noreply.github.com>
Date: Mon, 12 Feb 2024 00:46:30 +0100
Subject: [PATCH 4/4] Added additional files from ".idea" to .gitignore
---
.gitignore | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitignore b/.gitignore
index 333a4c41d..c25d06b3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,12 +9,14 @@
.idea/assetWizardSettings.xml
.idea/dictionaries
.idea/**/libraries/
+.idea/**/shelf
.idea/caches
.idea/modules.xml
.idea/navEditor.xml
.idea/encodings.xml
.idea/compiler.xml
.idea/jarRepositories.xml
+.idea/androidTestResultsUserPreferences.xml
###Android###