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

merge

This commit is contained in:
ziji Wu 2019-10-12 08:10:26 +08:00
parent edf21b2915
commit a3069cd470
1 changed files with 133 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

262
src/.idea/workspace.xml
View File

@ -40,7 +40,7 @@
<favorites_list name="src" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
<leaf />
</component>
<component name="FindInProjectRecents">
<findStrings>
@ -105,7 +105,7 @@
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="7">
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="85" />
<option name="y" value="25" />
<option name="width" value="1750" />
@ -117,6 +117,113 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="src" type="b2602c69:ProjectViewProjectNode" />
<item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</path>
<path>
<item name="src" type="b2602c69:ProjectViewProjectNode" />
<item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</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" />
</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" />
</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" />
</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" />
</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="data" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="src" type="b2602c69:ProjectViewProjectNode" />
<item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="res" type="462c0819:PsiDirectoryNode" />
</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="data" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="AndroidView">
<subPane>
<expand>
<path>
<item name="src" type="1abcf292:AndroidViewProjectNode" />
<item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope">
<subPane subId="Scope '产品'; set:产品; class com.intellij.psi.search.scope.ProjectProductionScope">
<expand>
@ -270,124 +377,6 @@
<select />
</subPane>
</pane>
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="src" type="b2602c69:ProjectViewProjectNode" />
<item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</path>
<path>
<item name="src" type="b2602c69:ProjectViewProjectNode" />
<item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</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" />
</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" />
</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" />
</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" />
</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="data" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="src" type="b2602c69:ProjectViewProjectNode" />
<item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="res" type="462c0819:PsiDirectoryNode" />
</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="data" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="AndroidView">
<subPane>
<expand>
<path>
<item name="src" type="1abcf292:AndroidViewProjectNode" />
<item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="AndroidView">
<subPane>
<expand>
<path>
<item name="src" type="1abcf292:AndroidViewProjectNode" />
<item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
</path>
</expand>
<select />
</subPane>
</pane>
</panes>
</component>
<component name="PropertiesComponent">
@ -741,7 +730,21 @@
<option name="project" value="LOCAL" />
<updated>1570811358152</updated>
</task>
<option name="localTasksCounter" value="36" />
<task id="LOCAL-00036" summary="merge">
<created>1570838709377</created>
<option name="number" value="00036" />
<option name="presentableId" value="LOCAL-00036" />
<option name="project" value="LOCAL" />
<updated>1570838709377</updated>
</task>
<task id="LOCAL-00037" summary="merge">
<created>1570838781879</created>
<option name="number" value="00037" />
<option name="presentableId" value="LOCAL-00037" />
<option name="project" value="LOCAL" />
<updated>1570838781879</updated>
</task>
<option name="localTasksCounter" value="38" />
<servers />
</component>
<component name="TodoView">
@ -826,7 +829,8 @@
<MESSAGE value="sdk 23 &#10;comment more" />
<MESSAGE value="comment more" />
<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" />
<MESSAGE value="merge" />
<option name="LAST_COMMIT_MESSAGE" value="merge" />
</component>
<component name="editorHistoryManager">
<entry file="file://D:/Android_SDK/SDK/sources/android-28/android/widget/Button.java">
@ -847,8 +851,8 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/call_note_edit.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable-hdpi/icon_app.png">
<provider selected="true" editor-type-id="images" />
@ -974,15 +978,15 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/dialog_edit_text.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor" />
</entry>
<entry file="file://D:/Android_SDK/SDK/platforms/android-28/data/res/drawable-hdpi/ic_dialog_alert.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/sub_folder.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
@ -999,20 +1003,20 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/call_record_folder.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/note_edit.xml">
<provider selected="true" editor-type-id="text-editor" />
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/note_list.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96">
<caret line="28" column="20" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Contact.java">
<provider selected="true" editor-type-id="text-editor">
@ -1094,12 +1098,12 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/note_edit.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="434">
<caret line="274" column="28" selection-start-line="274" selection-start-column="28" selection-end-line="274" selection-end-column="28" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/WorkingNote.java">
<provider selected="true" editor-type-id="text-editor">