Compare commits

..

No commits in common. 'main' and 'dev' have entirely different histories.
main ... dev

Binary file not shown.

Binary file not shown.

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Software_Engineer\Notes_new\Notes\app\src\androidTest\res"/><source path="D:\Software_Engineer\Notes_new\Notes\app\build\generated\res\rs\androidTest\debug"/><source path="D:\Software_Engineer\Notes_new\Notes\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest" generated-set="androidTest$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Software_Engineer\Notes_new\Notes\app\src\androidTest\res"/><source path="D:\Software_Engineer\Notes_new\Notes\app\build\generated\res\rs\androidTest\debug"/><source path="D:\Software_Engineer\Notes_new\Notes\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Software_Engineer\Notes_new\Notes\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug" generated-set="androidTestDebug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Software_Engineer\Notes_new\Notes\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Software_Engineer\Notes_new\Notes\app\src\androidTest\assets"/><source path="D:\Software_Engineer\Notes_new\Notes\app\build\intermediates\shader_assets\debugAndroidTest\out"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Software_Engineer\Notes_new\Notes\app\src\androidTestDebug\assets"/></dataSet></merger>

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Software_Engineer\Notes_new\Notes\app\src\androidTest\jniLibs"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Software_Engineer\Notes_new\Notes\app\src\androidTestDebug\jniLibs"/></dataSet></merger>

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Software_Engineer\Notes_new\Notes\app\src\androidTest\shaders"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Software_Engineer\Notes_new\Notes\app\src\androidTestDebug\shaders"/></dataSet></merger>

@ -1,7 +0,0 @@
#Sun Jun 02 23:53:47 CST 2024
base.0=D\:\\Software_Engineer\\Notes_new\\Notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\0\\classes.dex
base.1=D\:\\Software_Engineer\\Notes_new\\Notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\13\\classes.dex
path.0=0/classes.dex
path.1=13/classes.dex
renamed.0=classes.dex
renamed.1=classes2.dex

@ -1,32 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 package="net.micode.notes.test" >
4
5 <uses-sdk
5-->D:\Software_Engineer\Notes_new\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest6999913525841111300.xml:5:5-74
6 android:minSdkVersion="21"
6-->D:\Software_Engineer\Notes_new\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest6999913525841111300.xml:5:15-41
7 android:targetSdkVersion="21" />
7-->D:\Software_Engineer\Notes_new\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest6999913525841111300.xml:5:42-71
8
9 <instrumentation
9-->D:\Software_Engineer\Notes_new\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest6999913525841111300.xml:11:5-15:66
10 android:name="android.test.InstrumentationTestRunner"
10-->D:\Software_Engineer\Notes_new\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest6999913525841111300.xml:11:22-75
11 android:functionalTest="false"
11-->D:\Software_Engineer\Notes_new\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest6999913525841111300.xml:14:22-52
12 android:handleProfiling="false"
12-->D:\Software_Engineer\Notes_new\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest6999913525841111300.xml:13:22-53
13 android:label="Tests for net.micode.notes"
13-->D:\Software_Engineer\Notes_new\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest6999913525841111300.xml:15:22-64
14 android:targetPackage="net.micode.notes" />
14-->D:\Software_Engineer\Notes_new\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest6999913525841111300.xml:12:22-62
15
16 <application android:debuggable="true" >
16-->D:\Software_Engineer\Notes_new\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest6999913525841111300.xml:7:5-9:19
17 <uses-library android:name="android.test.runner" />
17-->D:\Software_Engineer\Notes_new\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest6999913525841111300.xml:8:9-60
17-->D:\Software_Engineer\Notes_new\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest6999913525841111300.xml:8:23-57
18 </application>
19
20</manifest>

@ -1,5 +0,0 @@
net.micode.notes.test.app-androidTest-0 D:\Software_Engineer\Notes_new\Notes\app\build\generated\res\resValues\androidTest\debug
net.micode.notes.test.app-androidTest-1 D:\Software_Engineer\Notes_new\Notes\app\build\generated\res\rs\androidTest\debug
net.micode.notes.test.app-mergeDebugAndroidTestResources-2 D:\Software_Engineer\Notes_new\Notes\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir
net.micode.notes.test.app-mergeDebugAndroidTestResources-3 D:\Software_Engineer\Notes_new\Notes\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir
net.micode.notes.test.app-merged_res-4 D:\Software_Engineer\Notes_new\Notes\app\build\intermediates\merged_res\debugAndroidTest

Binary file not shown.

@ -59,9 +59,9 @@ java:S1126
java:S3776É "RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(ôŒùb8…«™ý1J$69c0fc47-60a7-46b6-87c4-5d21e0c7ed55
x
java:S3398ã"/Move this method into "BackgroundQueryHandler".(—÷õŽüÿÿÿÿ8«™ý1J$857f87be-a0eb-47c3-8516-3b0ef29f6834
i
java:S3398"%Move this method into "ModeCallback".(ãìîí8«™ý1J$a7bb0df0-fca4-47dd-9751-b530cf4f0555
n
java:S3398ö "%Move this method into "ModeCallback".(“ðÉçýÿÿÿÿ8«™ý1J$529426cb-8d11-4e17-a7de-c9bb02babeb4
i
java:S3398"%Move this method into "ModeCallback".(ãìîí8«™ý1J$a7bb0df0-fca4-47dd-9751-b530cf4f0555
t
java:S3398ð"0Move this method into "OnListItemClickListener".(‘ðð¡8«™ý1J$1f0fbfc7-91d6-429d-a28b-dafa3472a34b

@ -392,7 +392,7 @@
<component name="ClangdSettings">
<option name="formatViaClangd" value="false" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\19699\.android\avd\Pixel_7_Pro_API_21.avd]" />
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[]" />
<component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$">
<ProjectState />
@ -404,9 +404,6 @@
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
<component name="ProblemsViewState">
<option name="selectedTabId" value="ProjectErrors" />
</component>
<component name="ProjectId" id="2hB2vKFS61mHmLK5rm1EfHOFrIV" />
<component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="2" id="Add" />
@ -425,11 +422,10 @@
"cf.first.check.clang-format": "false",
"cidr.known.project.marker": "true",
"ignore.virus.scanning.warn.message": "true",
"last_opened_file_path": "D:/Software_Engineer/Notes_new/Notes",
"last_opened_file_path": "D:/Software_Engineer/Andriod/.gradle",
"project.structure.last.edited": "Suggestions",
"project.structure.proportion": "0.17",
"project.structure.side.proportion": "0.20180723",
"settings.editor.selected.configurable": "reference.settingsdialog.project.gradle"
"project.structure.side.proportion": "0.20180723"
}
}]]></component>
<component name="PsdUISettings">

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save