change more about ui ,add note length in the title bar

This commit is contained in:
ziji Wu 2019-10-17 23:11:03 +08:00
parent 3b0c485fae
commit bad253c27f
37 changed files with 210 additions and 101 deletions

View File

@ -7,45 +7,48 @@
</config>
</shared>
</component>
<component name="AndroidLogFilters">
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
</component>
<component name="ChangeListManager">
<list default="true" id="c8515555-ebbc-49d5-889b-0c59bd6c3b6d" name="默认更改列表" comment="">
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/generated/not_namespaced_r_class_sources/debug/r/net/micode/notes/R.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/not_namespaced_r_class_sources/debug/r/net/micode/notes/R.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/debug.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/debug.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merger.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M=" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/R$string.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/R$string.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/R$style.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/R$style.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/R$xml.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/R$xml.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/res/merged/debug/values_values.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/res/merged/debug/values_values.arsc.flat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/symbols/debug/R.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/symbols/debug/R.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$8.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$8.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$string.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$string.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$style.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$style.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$xml.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$xml.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskASyncTask.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskASyncTask.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskManager.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskManager.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/AlarmAlertActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/AlarmAlertActivity.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$1.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$2.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$2.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$3.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$3.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditText.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditText.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$1.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/widget/NoteWidgetProvider.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/widget/NoteWidgetProvider.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/WorkingNote.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/WorkingNote.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values-zh-rCN/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-zh-rCN/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values-zh-rTW/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-zh-rTW/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -82,16 +85,45 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="155" column="67" selection-start-line="155" selection-start-column="67" selection-end-line="155" selection-end-column="67" />
<state relative-caret-position="1435">
<caret line="211" column="5" lean-forward="true" selection-start-line="211" selection-start-column="5" selection-end-line="211" selection-end-column="5" />
<folding>
<element signature="initializer##0;class#NoteEditActivity#0" />
<element signature="e#3738#3756#0" expanded="true" />
<element signature="initializer##1;class#NoteEditActivity#0" />
<element signature="initializer##2;class#NoteEditActivity#0" />
<element signature="initializer##3;class#NoteEditActivity#0" />
<element signature="e#7350#11252#0" />
<element signature="e#12546#12592#0" expanded="true" />
<element signature="e#12675#13468#0" />
<element signature="e#12912#12939#0" expanded="true" />
<element signature="e#13474#13607#0" />
<element signature="e#13613#14206#0" />
<element signature="e#14212#14764#0" />
<element signature="e#14770#15215#0" />
<element signature="e#15221#16988#0" />
<element signature="e#16994#17226#0" />
<element signature="e#17232#17909#0" />
<element signature="e#23115#23478#0" />
<element signature="e#23484#23843#0" />
<element signature="e#23849#24259#0" />
<element signature="e#24551#25395#0" />
<element signature="e#25547#26829#0" />
<element signature="e#26588#27455#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/values-zh-rCN/strings.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="157">
<caret line="66" column="18" selection-start-line="66" selection-start-column="18" selection-end-line="66" selection-end-column="18" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
@ -110,12 +142,16 @@
<find>mHelper</find>
<find>//</find>
<find>menu</find>
<find>initResources</find>
<find>tvModified</find>
<find>initResources</find>
<find>working_</find>
<find>working_note_length</find>
<find>mNoteEditor</find>
</findStrings>
<replaceStrings>
<replace>WRONGNOTEID</replace>
<replace>LOGGER.log(&quot;context&quot;, e);</replace>
<replace>mNoteLength</replace>
</replaceStrings>
</component>
<component name="Git.Settings">
@ -152,7 +188,6 @@
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java" />
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesProvider.java" />
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/Note.java" />
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/WorkingNote.java" />
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/menu/call_note_edit.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/menu/note_edit.xml" />
@ -166,6 +201,7 @@
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/values-zh-rCN/strings.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/note_edit.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/WorkingNote.java" />
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java" />
</list>
</option>
@ -235,6 +271,16 @@
<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" />
@ -869,7 +915,14 @@
<option name="project" value="LOCAL" />
<updated>1571274300170</updated>
</task>
<option name="localTasksCounter" value="42" />
<task id="LOCAL-00042" summary="change more about ui ,add note length in the title bar">
<created>1571316576886</created>
<option name="number" value="00042" />
<option name="presentableId" value="LOCAL-00042" />
<option name="project" value="LOCAL" />
<updated>1571316576886</updated>
</task>
<option name="localTasksCounter" value="43" />
<servers />
</component>
<component name="TodoView">
@ -886,17 +939,17 @@
<editor active="true" />
<layout>
<window_info id="Captures" order="0" sideWeight="0.5019305" side_tool="true" weight="0.16957104" />
<window_info active="true" content_ui="combo" id="Project" order="1" sideWeight="0.48771265" visible="true" weight="0.15281501" />
<window_info content_ui="combo" id="Project" order="1" sideWeight="0.48659518" visible="true" weight="0.15281501" />
<window_info id="设计器" order="2" />
<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.51340485" side_tool="true" weight="0.15281501" />
<window_info id="Build Variants" order="5" sideWeight="0.5085066" side_tool="true" weight="0.15281501" />
<window_info id="Image Layers" order="6" />
<window_info id="Capture Tool" order="7" />
<window_info id="Favorites" order="8" sideWeight="0.5085066" side_tool="true" weight="0.15281501" />
<window_info anchor="bottom" id="Run" order="0" weight="0.32291666" />
<window_info anchor="bottom" id="Run" order="0" weight="0.32171583" />
<window_info anchor="bottom" id="SonarLint" order="1" weight="0.3297587" />
<window_info anchor="bottom" id="Logcat" order="2" />
<window_info anchor="bottom" id="Logcat" order="2" weight="0.3297587" />
<window_info anchor="bottom" id="TODO" order="3" weight="0.3297587" />
<window_info anchor="bottom" id="Android Profiler" order="4" weight="0.9597855" />
<window_info anchor="bottom" id="Find" order="5" weight="0.3297587" />
@ -992,27 +1045,10 @@
<MESSAGE value="before change" />
<MESSAGE value="changed action bar" />
<MESSAGE value="moved the actionbar to the top of screen" />
<option name="LAST_COMMIT_MESSAGE" value="moved the actionbar to the top of screen" />
<MESSAGE value="change more about ui ,add note length in the title bar" />
<option name="LAST_COMMIT_MESSAGE" value="change more about ui ,add note length in the title bar" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/src/main/res/xml/searchable.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="226">
<caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
<folding>
<element signature="e#789#811#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/xml/preferences.xml">
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/note_item.xml">
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/dialog_edit_text.xml">
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor" />
@ -1030,14 +1066,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/note_list.xml">
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor">
<state relative-caret-position="780">
<caret line="39" column="17" lean-forward="true" selection-start-line="39" selection-start-column="17" selection-end-line="39" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/account_dialog_title.xml">
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor" />
@ -1050,10 +1078,6 @@
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/note_list_footer.xml">
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140">
@ -1083,13 +1107,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteEditText.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="42" column="34" selection-start-line="42" selection-start-column="34" selection-end-line="42" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteItemData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2724">
@ -1210,16 +1227,6 @@
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="891" column="35" selection-start-line="891" selection-start-column="35" selection-end-line="891" selection-end-column="35" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider editor-type-id="android-manifest" />
<provider selected="true" editor-type-id="text-editor">
@ -1271,13 +1278,6 @@
<entry file="android-dummy://C:/Project/minote/src/app/Translations Editor">
<provider selected="true" editor-type-id="string-resource-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/values-zh-rCN/strings.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="205">
<caret line="38" column="40" lean-forward="true" selection-start-line="38" selection-start-column="40" selection-end-line="38" selection-end-column="40" />
</state>
</provider>
</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">
@ -1297,11 +1297,77 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/note_edit.xml">
<provider editor-type-id="android-designer2" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteEditText.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="61">
<caret line="41" lean-forward="true" selection-start-line="41" selection-end-line="41" />
<state relative-caret-position="-2706">
<caret line="42" column="34" selection-start-line="42" selection-start-column="34" selection-end-line="42" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesProvider.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2187">
<caret line="232" column="18" lean-forward="true" selection-start-line="232" selection-start-column="18" selection-end-line="232" selection-end-column="18" />
<folding>
<element signature="method#query#0;class#NotesProvider#0" />
<element signature="method#insert#0;class#NotesProvider#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Notes.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-4629">
<caret line="26" column="25" lean-forward="true" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/note_list.xml">
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor">
<state relative-caret-position="99">
<caret line="40" column="24" selection-start-line="40" selection-start-column="24" selection-end-line="40" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/note_list_footer.xml">
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/values-zh-rCN/strings.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="157">
<caret line="66" column="18" selection-start-line="66" selection-start-column="18" selection-end-line="66" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="365">
<caret line="525" lean-forward="true" selection-start-line="525" selection-end-line="525" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#9058#14353#0" />
<element signature="e#14359#17556#0" />
<element signature="e#17563#18050#0" />
<element signature="e#18056#19086#0" />
<element signature="e#19348#19381#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/WorkingNote.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="231">
<caret line="270" column="16" selection-start-line="270" selection-start-column="16" selection-end-line="270" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/note_edit.xml">
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor">
<state relative-caret-position="140">
<caret line="66" column="24" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
<folding>
<element signature="e#1627#1909#0" />
<element signature="e#1923#2320#0" />
@ -1312,11 +1378,31 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="155" column="67" selection-start-line="155" selection-start-column="67" selection-end-line="155" selection-end-column="67" />
<state relative-caret-position="1435">
<caret line="211" column="5" lean-forward="true" selection-start-line="211" selection-start-column="5" selection-end-line="211" selection-end-column="5" />
<folding>
<element signature="initializer##0;class#NoteEditActivity#0" />
<element signature="e#3738#3756#0" expanded="true" />
<element signature="initializer##1;class#NoteEditActivity#0" />
<element signature="initializer##2;class#NoteEditActivity#0" />
<element signature="initializer##3;class#NoteEditActivity#0" />
<element signature="e#7350#11252#0" />
<element signature="e#12546#12592#0" expanded="true" />
<element signature="e#12675#13468#0" />
<element signature="e#12912#12939#0" expanded="true" />
<element signature="e#13474#13607#0" />
<element signature="e#13613#14206#0" />
<element signature="e#14212#14764#0" />
<element signature="e#14770#15215#0" />
<element signature="e#15221#16988#0" />
<element signature="e#16994#17226#0" />
<element signature="e#17232#17909#0" />
<element signature="e#23115#23478#0" />
<element signature="e#23484#23843#0" />
<element signature="e#23849#24259#0" />
<element signature="e#24551#25395#0" />
<element signature="e#25547#26829#0" />
<element signature="e#26588#27455#0" />
</folding>
</state>
</provider>

View File

@ -1,4 +1,4 @@
#Thu Oct 17 20:46:05 CST 2019
#Thu Oct 17 22:05:25 CST 2019
base.0=C\:\\Project\\minote\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\out\\classes.dex
path.0=classes.dex
renamed.0=classes.dex

View File

@ -216,7 +216,7 @@ public class WorkingNote {
return note;
}
//该方法实现了加载便签的功能
//该方法返回当前便签的功能
//@ id 要加载的便签id号
public static WorkingNote load(Context context, long id) {
return new WorkingNote(context, id, 0);

View File

@ -145,8 +145,10 @@ public class NoteEditActivity extends Activity implements OnClickListener,
//定义便签编辑页面
private EditText mNoteEditor;
//便签编辑面板
private View mNoteEditorPanel;
//当前显示的便签
private WorkingNote mWorkingNote;
private SharedPreferences mSharedPrefs;
@ -156,6 +158,9 @@ public class NoteEditActivity extends Activity implements OnClickListener,
//定义title时间后与字符数的空格
private static final String space_after_title_time = " ";
//保存便签字符数量
private int mNoteLength;
//记录默认字体大小
private static final String PREFERENCE_FONT_SIZE = "pref_font_size";
@ -249,6 +254,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
AppWidgetManager.INVALID_APPWIDGET_ID);
int widgetType = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_TYPE,
Notes.TYPE_WIDGET_INVALIDE);
//背景色id
int bgResId = intent.getIntExtra(Notes.INTENT_EXTRA_BACKGROUND_ID,
ResourceParser.getDefaultBgId(this));
@ -290,6 +296,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
return true;
}
@Override
protected void onResume() {
super.onResume();
@ -297,7 +305,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
/*
* 该方法实现了对便签屏幕的初始化
* 该方法实现了对便签编辑屏幕的初始化
* */
private void initNoteScreen() {
mNoteEditor.setTextAppearance(this, TextAppearanceResources
@ -305,6 +313,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
switchToListMode(mWorkingNote.getContent());
} else {
//获取便签中已经保存的内容
mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
mNoteEditor.setSelection(mNoteEditor.getText().length());
}
@ -314,13 +323,17 @@ public class NoteEditActivity extends Activity implements OnClickListener,
mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());
//获取已保存便签的字符数
mNoteLength = mNoteEditor.getText().toString().length();
mNoteHeaderHolder.tvModified.setText(DateUtils.formatDateTime(this,
mWorkingNote.getModifiedDate(), DateUtils.FORMAT_SHOW_DATE
| DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME
| DateUtils.FORMAT_SHOW_YEAR)
+ space_after_title_time +getResources().getString(R.string.note_length) + " : " + "128");
+ space_after_title_time +getResources().getString(R.string.note_length) + " : "
+ mNoteLength);
/**
/*
* TODO: Add the menu for setting alert. Currently disable it because the DateTimePicker
* is not ready
*/
@ -404,6 +417,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color);
mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this);
mNoteEditor = (EditText) findViewById(R.id.note_edit_view);
mNoteLength = mNoteEditor.getText().toString().length();
mNoteEditorPanel = findViewById(R.id.sv_note_edit);
mNoteBgColorSelector = findViewById(R.id.note_bg_color_selector);
for (int id : sBgSelectorBtnsMap.keySet()) {
@ -617,7 +631,11 @@ public class NoteEditActivity extends Activity implements OnClickListener,
startActivity(intent);
}
/*
* 该方法实现了删除当前便签
* */
private void deleteCurrentNote() {
//如果当前便签存在于数据库中
if (mWorkingNote.existInDatabase()) {
HashSet<Long> ids = new HashSet<Long>();
long id = mWorkingNote.getNoteId();
@ -639,6 +657,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
mWorkingNote.markDeleted(true);
}
//判断是否为同步模式的方法
private boolean isSyncMode() {
return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
}
@ -673,6 +692,9 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
}
/*
* 该方法实现了当窗口小部件更改时更新窗口部件的方法
* */
public void onWidgetChanged() {
updateWidget();
}
@ -801,6 +823,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
public void onCheckListModeChanged(int oldMode, int newMode) {
if (newMode == TextNote.MODE_CHECK_LIST) {
//将模式转换为列表模式
switchToListMode(mNoteEditor.getText().toString());
} else {
if (!getWorkingText()) {