p57486102
/
minote
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/ziji_wu' into develop 

# Conflicts:
#	src/.gradle/5.4.1/executionHistory/executionHistory.bin
#	src/.gradle/5.4.1/executionHistory/executionHistory.lock
#	src/.gradle/5.4.1/fileHashes/fileHashes.bin
#	src/.gradle/5.4.1/fileHashes/fileHashes.lock
#	src/.gradle/5.4.1/fileHashes/resourceHashesCache.bin
#	src/.gradle/5.4.1/javaCompile/javaCompile.lock
#	src/.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	src/.gradle/buildOutputCleanup/outputFiles.bin
#	src/.idea/caches/build_file_checksums.ser
#	src/.idea/caches/gradle_models.ser
#	src/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13
#	src/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710
#	src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
#	src/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5
#	src/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5
#	src/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
#	src/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb
#	src/.idea/workspace.xml
#	src/app/app.iml
#	src/app/build.gradle
#	src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex
#	src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
#	src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M=
#	src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
#	src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
#	src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_
#	src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex
#	src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex
#	src/app/build/outputs/apk/debug/app-debug.apk
#	src/app/src/main/java/net/micode/notes/data/NotesProvider.java
This commit is contained in:
ziji Wu 2019-10-12 00:06:58 +08:00
parent ee13ee922c
commit 73f37833b8
1 changed files with 216 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

276
src/.idea/workspace.xml
View File

@ -8,7 +8,9 @@
</shared> </shared>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="c8515555-ebbc-49d5-889b-0c59bd6c3b6d" name="默认更改列表" comment="" /> <list default="true" id="c8515555-ebbc-49d5-889b-0c59bd6c3b6d" name="默认更改列表" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -50,7 +52,7 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340"> <state relative-caret-position="340">
@ -66,10 +68,74 @@
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/tool/BackupUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3507">
<caret line="38" column="13" selection-start-line="38" selection-start-column="13" selection-end-line="38" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/Note.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="320">
<caret line="287" column="30" lean-forward="true" selection-start-line="287" selection-start-column="30" selection-end-line="287" selection-end-column="30" />
<folding>
<element signature="e#3356#3357#0" expanded="true" />
<element signature="e#3399#3400#0" expanded="true" />
<element signature="e#3434#3435#0" expanded="true" />
<element signature="e#3478#3479#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/gtask/data/MetaData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-664">
<caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/gtask/data/Node.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-944">
<caret line="22" column="22" selection-start-line="22" selection-start-column="22" selection-end-line="22" selection-end-column="22" />
<folding>
<element signature="e#1923#1924#0" expanded="true" />
<element signature="e#1954#1955#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/gtask/data/SqlData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-500">
<caret line="37" column="13" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="574">
<caret line="172" column="34" lean-forward="true" selection-start-line="172" selection-start-column="34" selection-end-line="172" selection-end-column="34" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/tool/DataUtils.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140"> <state relative-caret-position="140">
<caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" /> <caret line="37" column="13" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -377,6 +443,17 @@
<item name="notes" type="462c0819:PsiDirectoryNode" /> <item name="notes" type="462c0819:PsiDirectoryNode" />
<item name="gtask" type="462c0819:PsiDirectoryNode" /> <item name="gtask" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="src" type="b2602c69:ProjectViewProjectNode" />
<item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="notes" type="462c0819:PsiDirectoryNode" />
<item name="gtask" type="462c0819:PsiDirectoryNode" />
<item name="data" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="src" type="b2602c69:ProjectViewProjectNode" /> <item name="src" type="b2602c69:ProjectViewProjectNode" />
<item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
@ -388,6 +465,17 @@
<item name="gtask" type="462c0819:PsiDirectoryNode" /> <item name="gtask" type="462c0819:PsiDirectoryNode" />
<item name="exception" type="462c0819:PsiDirectoryNode" /> <item name="exception" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="src" type="b2602c69:ProjectViewProjectNode" />
<item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="notes" type="462c0819:PsiDirectoryNode" />
<item name="gtask" type="462c0819:PsiDirectoryNode" />
<item name="remote" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="src" type="b2602c69:ProjectViewProjectNode" /> <item name="src" type="b2602c69:ProjectViewProjectNode" />
<item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
@ -481,6 +569,51 @@
<item name="res" type="462c0819:PsiDirectoryNode" /> <item name="res" type="462c0819:PsiDirectoryNode" />
<item name="values-zh-rCN" type="462c0819:PsiDirectoryNode" /> <item name="values-zh-rCN" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="src" type="b2602c69:ProjectViewProjectNode" />
<item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="src" type="b2602c69:ProjectViewProjectNode" />
<item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="net" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="src" type="b2602c69:ProjectViewProjectNode" />
<item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="net" type="462c0819:PsiDirectoryNode" />
<item name="micode" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="src" type="b2602c69:ProjectViewProjectNode" />
<item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="net" type="462c0819:PsiDirectoryNode" />
<item name="micode" type="462c0819:PsiDirectoryNode" />
<item name="notes" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="src" type="b2602c69:ProjectViewProjectNode" />
<item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="net" type="462c0819:PsiDirectoryNode" />
<item name="micode" type="462c0819:PsiDirectoryNode" />
<item name="notes" type="462c0819:PsiDirectoryNode" />
<item name="gtask" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="src" type="b2602c69:ProjectViewProjectNode" />
<item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="net" type="462c0819:PsiDirectoryNode" />
<item name="micode" type="462c0819:PsiDirectoryNode" />
<item name="notes" type="462c0819:PsiDirectoryNode" />
<item name="gtask" type="462c0819:PsiDirectoryNode" />
<item name="data" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
@ -810,7 +943,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1570807703651</updated> <updated>1570807703651</updated>
</task> </task>
<option name="localTasksCounter" value="32" /> <task id="LOCAL-00032" summary="Merge remote-tracking branch 'origin/ziji_wu' into develop&#10;&#10;# Conflicts:&#10;#&#9;src/.gradle/5.4.1/executionHistory/executionHistory.bin&#10;#&#9;src/.gradle/5.4.1/executionHistory/executionHistory.lock&#10;#&#9;src/.gradle/5.4.1/fileHashes/fileHashes.bin&#10;#&#9;src/.gradle/5.4.1/fileHashes/fileHashes.lock&#10;#&#9;src/.gradle/5.4.1/fileHashes/resourceHashesCache.bin&#10;#&#9;src/.gradle/5.4.1/javaCompile/javaCompile.lock&#10;#&#9;src/.gradle/buildOutputCleanup/buildOutputCleanup.lock&#10;#&#9;src/.gradle/buildOutputCleanup/outputFiles.bin&#10;#&#9;src/.idea/caches/build_file_checksums.ser&#10;#&#9;src/.idea/caches/gradle_models.ser&#10;#&#9;src/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13&#10;#&#9;src/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710&#10;#&#9;src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c&#10;#&#9;src/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5&#10;#&#9;src/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5&#10;#&#9;src/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32&#10;#&#9;src/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb&#10;#&#9;src/.idea/workspace.xml&#10;#&#9;src/app/app.iml&#10;#&#9;src/app/build.gradle&#10;#&#9;src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex&#10;#&#9;src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt&#10;#&#9;src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M=&#10;#&#9;src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class&#10;#&#9;src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class&#10;#&#9;src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_&#10;#&#9;src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex&#10;#&#9;src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex&#10;#&#9;src/app/build/outputs/apk/debug/app-debug.apk&#10;#&#9;src/app/src/main/java/net/micode/notes/data/NotesProvider.java">
<created>1570809551671</created>
<option name="number" value="00032" />
<option name="presentableId" value="LOCAL-00032" />
<option name="project" value="LOCAL" />
<updated>1570809551671</updated>
</task>
<option name="localTasksCounter" value="33" />
<servers /> <servers />
</component> </component>
<component name="TodoView"> <component name="TodoView">
@ -827,7 +967,7 @@
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="Captures" order="0" sideWeight="0.5019305" side_tool="true" weight="0.16957104" /> <window_info id="Captures" order="0" sideWeight="0.5019305" side_tool="true" weight="0.16957104" />
<window_info content_ui="combo" id="Project" order="1" sideWeight="0.48771265" visible="true" weight="0.15281501" /> <window_info active="true" content_ui="combo" id="Project" order="1" sideWeight="0.48771265" visible="true" weight="0.15281501" />
<window_info id="设计器" order="2" /> <window_info id="设计器" order="2" />
<window_info id="Resources Explorer" order="3" weight="0.3297587" /> <window_info id="Resources Explorer" order="3" weight="0.3297587" />
<window_info id="Structure" order="4" sideWeight="0.51132077" side_tool="true" weight="0.15281501" /> <window_info id="Structure" order="4" sideWeight="0.51132077" side_tool="true" weight="0.15281501" />
@ -844,8 +984,8 @@
<window_info anchor="bottom" id="Debug" order="6" /> <window_info anchor="bottom" id="Debug" order="6" />
<window_info anchor="bottom" id="Terminal" order="7" weight="0.3297587" /> <window_info anchor="bottom" id="Terminal" order="7" weight="0.3297587" />
<window_info anchor="bottom" id="Event Log" order="8" side_tool="true" weight="0.3294271" /> <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" weight="0.3294271" />
<window_info anchor="bottom" id="Version Control" order="9" weight="0.3297587" /> <window_info anchor="bottom" id="Version Control" order="9" visible="true" weight="0.3297587" />
<window_info active="true" anchor="bottom" id="Build" order="10" visible="true" weight="0.29088473" /> <window_info anchor="bottom" id="Build" order="10" weight="0.29088473" />
<window_info anchor="bottom" id="Messages" order="11" weight="0.3297587" /> <window_info anchor="bottom" id="Messages" order="11" weight="0.3297587" />
<window_info anchor="right" id="Gradle" order="0" weight="0.3297587" /> <window_info anchor="right" id="Gradle" order="0" weight="0.3297587" />
<window_info anchor="right" id="Device File Explorer" order="1" side_tool="true" weight="0.3297587" /> <window_info anchor="right" id="Device File Explorer" order="1" side_tool="true" weight="0.3297587" />
@ -899,44 +1039,6 @@
<option name="LAST_COMMIT_MESSAGE" value="Merge remote-tracking branch 'origin/ziji_wu' into develop&#10;&#10;# Conflicts:&#10;#&#9;src/.gradle/5.4.1/executionHistory/executionHistory.bin&#10;#&#9;src/.gradle/5.4.1/executionHistory/executionHistory.lock&#10;#&#9;src/.gradle/5.4.1/fileHashes/fileHashes.bin&#10;#&#9;src/.gradle/5.4.1/fileHashes/fileHashes.lock&#10;#&#9;src/.gradle/5.4.1/fileHashes/resourceHashesCache.bin&#10;#&#9;src/.gradle/5.4.1/javaCompile/javaCompile.lock&#10;#&#9;src/.gradle/buildOutputCleanup/buildOutputCleanup.lock&#10;#&#9;src/.gradle/buildOutputCleanup/outputFiles.bin&#10;#&#9;src/.idea/caches/build_file_checksums.ser&#10;#&#9;src/.idea/caches/gradle_models.ser&#10;#&#9;src/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13&#10;#&#9;src/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710&#10;#&#9;src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c&#10;#&#9;src/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5&#10;#&#9;src/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5&#10;#&#9;src/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32&#10;#&#9;src/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb&#10;#&#9;src/.idea/workspace.xml&#10;#&#9;src/app/app.iml&#10;#&#9;src/app/build.gradle&#10;#&#9;src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex&#10;#&#9;src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt&#10;#&#9;src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M=&#10;#&#9;src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class&#10;#&#9;src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class&#10;#&#9;src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_&#10;#&#9;src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex&#10;#&#9;src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex&#10;#&#9;src/app/build/outputs/apk/debug/app-debug.apk&#10;#&#9;src/app/src/main/java/net/micode/notes/data/NotesProvider.java" /> <option name="LAST_COMMIT_MESSAGE" value="Merge remote-tracking branch 'origin/ziji_wu' into develop&#10;&#10;# Conflicts:&#10;#&#9;src/.gradle/5.4.1/executionHistory/executionHistory.bin&#10;#&#9;src/.gradle/5.4.1/executionHistory/executionHistory.lock&#10;#&#9;src/.gradle/5.4.1/fileHashes/fileHashes.bin&#10;#&#9;src/.gradle/5.4.1/fileHashes/fileHashes.lock&#10;#&#9;src/.gradle/5.4.1/fileHashes/resourceHashesCache.bin&#10;#&#9;src/.gradle/5.4.1/javaCompile/javaCompile.lock&#10;#&#9;src/.gradle/buildOutputCleanup/buildOutputCleanup.lock&#10;#&#9;src/.gradle/buildOutputCleanup/outputFiles.bin&#10;#&#9;src/.idea/caches/build_file_checksums.ser&#10;#&#9;src/.idea/caches/gradle_models.ser&#10;#&#9;src/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13&#10;#&#9;src/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710&#10;#&#9;src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c&#10;#&#9;src/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5&#10;#&#9;src/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5&#10;#&#9;src/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32&#10;#&#9;src/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb&#10;#&#9;src/.idea/workspace.xml&#10;#&#9;src/app/app.iml&#10;#&#9;src/app/build.gradle&#10;#&#9;src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex&#10;#&#9;src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt&#10;#&#9;src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M=&#10;#&#9;src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class&#10;#&#9;src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class&#10;#&#9;src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_&#10;#&#9;src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex&#10;#&#9;src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex&#10;#&#9;src/app/build/outputs/apk/debug/app-debug.apk&#10;#&#9;src/app/src/main/java/net/micode/notes/data/NotesProvider.java" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://D:/Android_SDK/SDK/sources/android-28/android/content/Intent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="239">
<caret line="628" column="13" selection-start-line="628" selection-start-column="13" selection-end-line="628" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="449">
<caret line="40" column="27" selection-start-line="40" selection-start-column="27" selection-end-line="40" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/settings.gradle">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/raw-zh-rCN/introduction">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140">
<caret line="7" column="38" selection-start-line="7" selection-start-column="38" selection-end-line="7" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/raw/introduction">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="20">
<caret line="1" column="47" selection-start-line="1" selection-start-column="47" selection-end-line="1" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://D:/Android_SDK/SDK/sources/android-28/android/widget/Button.java"> <entry file="file://D:/Android_SDK/SDK/sources/android-28/android/widget/Button.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="631"> <state relative-caret-position="631">
@ -978,13 +1080,6 @@
</provider> </provider>
<provider editor-type-id="android-manifest" /> <provider editor-type-id="android-manifest" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/gtask/data/MetaData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140">
<caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/styles.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/values/styles.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1200"> <state relative-caret-position="1200">
@ -1201,13 +1296,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/Note.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="457">
<caret line="218" column="15" lean-forward="true" selection-start-line="218" selection-start-column="15" selection-end-line="218" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/tool/ResourceParser.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/tool/ResourceParser.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="166"> <state relative-caret-position="166">
@ -1261,6 +1349,74 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/tool/BackupUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3507">
<caret line="38" column="13" selection-start-line="38" selection-start-column="13" selection-end-line="38" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/gtask/data/MetaData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-664">
<caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/gtask/data/Node.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-944">
<caret line="22" column="22" selection-start-line="22" selection-start-column="22" selection-end-line="22" selection-end-column="22" />
<folding>
<element signature="e#1923#1924#0" expanded="true" />
<element signature="e#1954#1955#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/gtask/data/SqlData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-500">
<caret line="37" column="13" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="574">
<caret line="172" column="34" lean-forward="true" selection-start-line="172" selection-start-column="34" selection-end-line="172" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/tool/DataUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140">
<caret line="37" column="13" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../app/src/main/java/net/micode/notes/tool/BackupUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3286">
<folding>
<element signature="e#0#14478#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/Note.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="320">
<caret line="287" column="30" lean-forward="true" selection-start-line="287" selection-start-column="30" selection-end-line="287" selection-end-column="30" />
<folding>
<element signature="e#3356#3357#0" expanded="true" />
<element signature="e#3399#3400#0" expanded="true" />
<element signature="e#3434#3435#0" expanded="true" />
<element signature="e#3478#3479#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>