From b35e0f131b73fba40412322fa6f4795422ef7a9a Mon Sep 17 00:00:00 2001
From: Matt Brown <gitmattb@gmail.com>
Date: Tue, 21 Mar 2023 19:31:11 -0700
Subject: [PATCH] merge main

---
 .gitignore                   |   1 +
 .idea/codeStyles/Project.xml | 116 -----------------------------------
 .idea/compiler.xml           |   6 --
 .idea/misc.xml               |  33 ----------
 4 files changed, 1 insertion(+), 155 deletions(-)
 delete mode 100644 .idea/codeStyles/Project.xml
 delete mode 100644 .idea/compiler.xml
 delete mode 100644 .idea/misc.xml

diff --git a/.gitignore b/.gitignore
index de6891a..856b95b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ captures/
 
 # IntelliJ
 *.iml*
+.idea
 .idea/workspace.xml
 .idea/tasks.xml
 .idea/gradle.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 681f41a..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <codeStyleSettings language="XML">
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 7d7ec2e..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index ac7d43a..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CMakeSettings">
-    <configurations>
-      <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
-    </configurations>
-  </component>
-  <component name="DesignSurface">
-    <option name="filePathToZoomLevelMap">
-      <map>
-        <entry key="..\:/Users/Matt/StudioProjects/EverSpinner/app/src/main/res/layout/fragment_saved_text.xml" value="0.55" />
-        <entry key="..\:/Users/Matt/StudioProjects/EverSpinner/app/src/main/res/layout/fragment_saved_text_list.xml" value="0.55" />
-        <entry key="..\:/Users/Matt/StudioProjects/EverSpinner/app/src/main/res/layout/fragment_spinner.xml" value="0.25" />
-        <entry key="..\:/Users/Matt/StudioProjects/EverSpinner/app/src/main/res/layout/synonym_list_item.xml" value="0.5027173913043478" />
-        <entry key="..\:/project/Everspinner/app/src/main/res/layout/fragment_edit_saved_text.xml" value="0.21875" />
-        <entry key="..\:/project/Everspinner/app/src/main/res/layout/fragment_saved_text.xml" value="0.21875" />
-        <entry key="..\:/project/Everspinner/app/src/main/res/layout/fragment_saved_text_list.xml" value="0.21875" />
-        <entry key="..\:/project/Everspinner/app/src/main/res/layout/fragment_saved_text_list_wrapper.xml" value="0.21875" />
-        <entry key="..\:/project/Everspinner/app/src/main/res/layout/fragment_synonym_item_list.xml" value="0.21875" />
-        <entry key="..\:/project/Everspinner/app/src/main/res/layout/synonym_item_list_group.xml" value="0.21875" />
-        <entry key="..\:/project/Everspinner/app/src/main/res/layout/synonym_list_item.xml" value="0.1911231884057971" />
-        <entry key="..\:/project/Everspinner/app/src/main/res/layout/synonym_new_syn_alert.xml" value="0.21875" />
-      </map>
-    </option>
-  </component>
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Embedded JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
\ No newline at end of file