Merge pull request 'switch' (#3) from 111 into main

3 months ago · 5377b71c80
parent 5f7bad9ff9 a11034ee3f
commit 5377b71c80
20 changed files with 91 additions and 2 deletions
--- a/Notes-master/.gradle/8.11.1/executionHistory/executionHistory.bin
+++ b/Notes-master/.gradle/8.11.1/executionHistory/executionHistory.bin
--- a/Notes-master/.gradle/8.11.1/executionHistory/executionHistory.lock
+++ b/Notes-master/.gradle/8.11.1/executionHistory/executionHistory.lock
--- a/Notes-master/.gradle/8.11.1/fileHashes/fileHashes.bin
+++ b/Notes-master/.gradle/8.11.1/fileHashes/fileHashes.bin
--- a/Notes-master/.gradle/8.11.1/fileHashes/fileHashes.lock
+++ b/Notes-master/.gradle/8.11.1/fileHashes/fileHashes.lock
--- a/Notes-master/.gradle/8.11.1/fileHashes/resourceHashesCache.bin
+++ b/Notes-master/.gradle/8.11.1/fileHashes/resourceHashesCache.bin
--- a/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin
+++ b/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin
--- a/Notes-master/.gradle/file-system.probe
+++ b/Notes-master/.gradle/file-system.probe
--- a/Notes-master/.idea/.gitignore
+++ b/Notes-master/.idea/.gitignore
@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
--- a/Notes-master/.idea/.name
+++ b/Notes-master/.idea/.name
@ -0,0 +1 @@
+My Application
--- a/Notes-master/.idea/AndroidProjectSystem.xml
+++ b/Notes-master/.idea/AndroidProjectSystem.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidProjectSystem">
+    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
+  </component>
+</project>
--- a/Notes-master/.idea/compiler.xml
+++ b/Notes-master/.idea/compiler.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="21" />
+  </component>
+</project>
--- a/Notes-master/.idea/deploymentTargetSelector.xml
+++ b/Notes-master/.idea/deploymentTargetSelector.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>
--- a/Notes-master/.idea/gradle.xml
+++ b/Notes-master/.idea/gradle.xml
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
--- a/Notes-master/.idea/migrations.xml
+++ b/Notes-master/.idea/migrations.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
--- a/Notes-master/.idea/misc.xml
+++ b/Notes-master/.idea/misc.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>
--- a/Notes-master/.idea/runConfigurations.xml
+++ b/Notes-master/.idea/runConfigurations.xml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
--- a/Notes-master/.idea/vcs.xml
+++ b/Notes-master/.idea/vcs.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
--- a/Notes-master/build/reports/problems/problems-report.html
+++ b/Notes-master/build/reports/problems/problems-report.html
--- a/Notes-master/gradle.properties
+++ b/Notes-master/gradle.properties
@ -18,4 +18,5 @@ android.useAndroidX=true
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+android.nonFinalResIds=false