diff --git a/doc/开源软件泛读、标注和维护报告.docx b/doc/开源软件泛读、标注和维护报告.docx index f5f4fbc..cec1fd2 100644 Binary files a/doc/开源软件泛读、标注和维护报告.docx and b/doc/开源软件泛读、标注和维护报告.docx differ diff --git a/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin b/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin index 4d52080..12f04d1 100644 Binary files a/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb index 0173990..8b3d800 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb +++ b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb @@ -16,4 +16,10 @@ k o ?app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java,2\b\2bfc771e07e87c37d3a76a2c815bc8fb30649798 p -@app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java,4\5\4529b3a97b0f3b19b895aa06f23bed63ff38a312 \ No newline at end of file +@app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java,4\5\4529b3a97b0f3b19b895aa06f23bed63ff38a312 +P + app/src/main/AndroidManifest.xml,8\c\8c55c3ccc257e5907959013f99656e4c8ec3903e +k +;app/src/main/java/net/micode/notes/ui/NoteEditActivity.java,5\7\577f30d26378ec8a2bd2e4a43f3c79b3f04c402c +g +7app/src/main/java/net/micode/notes/ui/NoteEditText.java,5\0\503adcf2a0be1ecdb94a15efba4433b6589877b9 \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/securityhotspotstore/index.pb b/src/Notes-master1/.idea/sonarlint/securityhotspotstore/index.pb index 0173990..8b3d800 100644 --- a/src/Notes-master1/.idea/sonarlint/securityhotspotstore/index.pb +++ b/src/Notes-master1/.idea/sonarlint/securityhotspotstore/index.pb @@ -16,4 +16,10 @@ k o ?app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java,2\b\2bfc771e07e87c37d3a76a2c815bc8fb30649798 p -@app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java,4\5\4529b3a97b0f3b19b895aa06f23bed63ff38a312 \ No newline at end of file +@app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java,4\5\4529b3a97b0f3b19b895aa06f23bed63ff38a312 +P + app/src/main/AndroidManifest.xml,8\c\8c55c3ccc257e5907959013f99656e4c8ec3903e +k +;app/src/main/java/net/micode/notes/ui/NoteEditActivity.java,5\7\577f30d26378ec8a2bd2e4a43f3c79b3f04c402c +g +7app/src/main/java/net/micode/notes/ui/NoteEditText.java,5\0\503adcf2a0be1ecdb94a15efba4433b6589877b9 \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index b894c6e..2f891eb 100644 Binary files a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index bb5f917..015853c 100644 Binary files a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml index d65e0cc..fe2f251 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml @@ -64,6 +64,7 @@ 取消同步 选择文件夹 已过期 + 字符数 发送邮件 打开地图 呼叫电话 diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml index 226b5bc..a4b6300 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml @@ -64,6 +64,7 @@ 取消同步 選擇文件夾 已過期 + 字符數 發送郵件 打開地圖 呼叫電話 diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml index e49b0c3..a3c61fc 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml @@ -81,6 +81,7 @@ Cancel syncing Select folder Expired + Length Send email Open map Call diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml index d65e0cc..fe2f251 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml @@ -64,6 +64,7 @@ 取消同步 选择文件夹 已过期 + 字符数 发送邮件 打开地图 呼叫电话 diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml index 226b5bc..a4b6300 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml @@ -64,6 +64,7 @@ 取消同步 選擇文件夾 已過期 + 字符數 發送郵件 打開地圖 呼叫電話 diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml index e49b0c3..a3c61fc 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml @@ -81,6 +81,7 @@ Cancel syncing Select folder Expired + Length Send email Open map Call diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index ee4873f..820b107 100644 Binary files a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index 690ee05..8165610 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index 5dfccb8..afe8560 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index d7f2b7e..4354abc 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index 7011069..3c39825 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index 6bf1d0a..4971679 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt b/src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt index 5bec0cd..72b69cd 100644 --- a/src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt +++ b/src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt @@ -32,6 +32,7 @@ drawable font_size_selector_bg drawable font_small drawable font_super drawable icon_app +drawable icon_app_yuan drawable list_background drawable list_blue_down drawable list_blue_middle @@ -134,6 +135,7 @@ id prefenerece_sync_status_textview id preference_sync_button id selection_menu id sv_note_edit +id text_num id tv_alert_date id tv_folder_name id tv_modified_date @@ -226,6 +228,7 @@ string menu_sync string menu_sync_cancel string menu_title_select_folder string note_alert_expired +string note_length string note_link_email string note_link_other string note_link_tel diff --git a/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index f237bf5..3b32345 100644 --- a/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -35,7 +35,7 @@ + + 取消同步 选择文件夹 已过期 + 字符数 发送邮件 打开地图 呼叫电话 diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/values-zh-rTW/values-zh-rTW.xml index 226b5bc..a4b6300 100644 --- a/src/Notes-master1/app/build/intermediates/packaged_res/debug/values-zh-rTW/values-zh-rTW.xml +++ b/src/Notes-master1/app/build/intermediates/packaged_res/debug/values-zh-rTW/values-zh-rTW.xml @@ -64,6 +64,7 @@ 取消同步 選擇文件夾 已過期 + 字符數 發送郵件 打開地圖 呼叫電話 diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml index e49b0c3..a3c61fc 100644 --- a/src/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml +++ b/src/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml @@ -81,6 +81,7 @@ Cancel syncing Select folder Expired + Length Send email Open map Call diff --git a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index c2f3271..cb07588 100644 Binary files a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/6fb608442905b936dce52f16a181c025151faf92e41d064ee3771f89d763e519_5.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/6fb608442905b936dce52f16a181c025151faf92e41d064ee3771f89d763e519_5.jar deleted file mode 100644 index 5aec7fc..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/6fb608442905b936dce52f16a181c025151faf92e41d064ee3771f89d763e519_5.jar and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex index 56fa57a..06d4033 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index 3072bb3..aad6d78 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index 828e07a..f4a7dd4 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex index 1d1ec6b..8019dc9 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index b7c1a80..8233f60 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt index 00d6e91..d193ad6 100644 --- a/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ b/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt @@ -30,6 +30,7 @@ int drawable font_size_selector_bg 0x7f040012 int drawable font_small 0x7f040013 int drawable font_super 0x7f040014 int drawable icon_app 0x7f040015 +int drawable icon_app_yuan 0x7f040042 int drawable list_background 0x7f040016 int drawable list_blue_down 0x7f040017 int drawable list_blue_middle 0x7f040018 @@ -132,6 +133,7 @@ int id prefenerece_sync_status_textview 0x7f050036 int id preference_sync_button 0x7f050037 int id selection_menu 0x7f050038 int id sv_note_edit 0x7f050039 +int id text_num 0x7f050043 int id tv_alert_date 0x7f05003a int id tv_folder_name 0x7f05003b int id tv_modified_date 0x7f05003c @@ -224,6 +226,7 @@ int string menu_sync 0x7f0a0038 int string menu_sync_cancel 0x7f0a0039 int string menu_title_select_folder 0x7f0a003a int string note_alert_expired 0x7f0a003b +int string note_length 0x7f0a0066 int string note_link_email 0x7f0a003c int string note_link_other 0x7f0a003d int string note_link_tel 0x7f0a003e diff --git a/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt index 4461006..0ef46ef 100644 --- a/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ b/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -1,129 +1,136 @@ -net.micode.notes:xml/widget_4x_info = 0x7f0c0003 +net.micode.notes:id/text_num = 0x7f050043 +net.micode.notes:drawable/icon_app_yuan = 0x7f040042 +net.micode.notes:string/ticker_success = 0x7f0a0062 +net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052 net.micode.notes:xml/preferences = 0x7f0c0000 -net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 -net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 -net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 -net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 -net.micode.notes:string/widget_havenot_content = 0x7f0a0064 +net.micode.notes:string/menu_font_small = 0x7f0a002a +net.micode.notes:id/tv_title_bar = 0x7f050040 +net.micode.notes:string/preferences_account_summary = 0x7f0a0044 +net.micode.notes:string/menu_export_text = 0x7f0a0023 +net.micode.notes:layout/note_list = 0x7f060008 +net.micode.notes:string/file_path = 0x7f0a0016 net.micode.notes:string/ticker_syncing = 0x7f0a0063 -net.micode.notes:string/ticker_success = 0x7f0a0062 -net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 -net.micode.notes:string/ticker_cancel = 0x7f0a0060 +net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 +net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 +net.micode.notes:string/note_link_other = 0x7f0a003d +net.micode.notes:string/note_alert_expired = 0x7f0a003b net.micode.notes:string/sync_progress_syncing = 0x7f0a005f -net.micode.notes:string/sync_progress_init_list = 0x7f0a005d -net.micode.notes:string/search_label = 0x7f0a0058 -net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055 +net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054 -net.micode.notes:string/preferences_title = 0x7f0a0053 -net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052 +net.micode.notes:string/search_label = 0x7f0a0058 +net.micode.notes:id/selection_menu = 0x7f050038 net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002 net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051 +net.micode.notes:string/menu_sync = 0x7f0a0038 +net.micode.notes:string/sync_progress_init_list = 0x7f0a005d net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050 +net.micode.notes:string/menu_normal_mode = 0x7f0a002f +net.micode.notes:string/menu_sync_cancel = 0x7f0a0039 +net.micode.notes:drawable/title_alert = 0x7f040036 +net.micode.notes:id/note_title = 0x7f050034 +net.micode.notes:string/menu_search = 0x7f0a0031 net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e +net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d +net.micode.notes:id/menu_search = 0x7f050028 +net.micode.notes:xml/widget_4x_info = 0x7f0c0003 net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b +net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 +net.micode.notes:string/preferences_title = 0x7f0a0053 +net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a +net.micode.notes:id/notes_list = 0x7f050035 +net.micode.notes:layout/note_edit = 0x7f060005 +net.micode.notes:string/widget_havenot_content = 0x7f0a0064 net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049 net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048 -net.micode.notes:string/preferences_account_summary = 0x7f0a0044 -net.micode.notes:string/success_sdcard_export = 0x7f0a005b -net.micode.notes:string/notelist_string_info = 0x7f0a0043 +net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 net.micode.notes:string/notelist_menu_new = 0x7f0a0042 +net.micode.notes:menu/sub_folder = 0x7f070006 +net.micode.notes:string/menu_share = 0x7f0a0037 +net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 +net.micode.notes:string/ticker_cancel = 0x7f0a0060 net.micode.notes:string/notealert_ok = 0x7f0a0041 -net.micode.notes:string/notealert_enter = 0x7f0a0040 net.micode.notes:string/note_link_web = 0x7f0a003f -net.micode.notes:string/note_link_tel = 0x7f0a003e -net.micode.notes:string/note_link_other = 0x7f0a003d -net.micode.notes:string/note_link_email = 0x7f0a003c -net.micode.notes:string/note_alert_expired = 0x7f0a003b -net.micode.notes:string/menu_sync_cancel = 0x7f0a0039 -net.micode.notes:string/menu_sync = 0x7f0a0038 -net.micode.notes:string/menu_share = 0x7f0a0037 -net.micode.notes:string/menu_select_title = 0x7f0a0034 -net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 -net.micode.notes:string/menu_select_none = 0x7f0a0033 net.micode.notes:string/menu_title_select_folder = 0x7f0a003a net.micode.notes:string/menu_select_all = 0x7f0a0032 -net.micode.notes:string/menu_search = 0x7f0a0031 -net.micode.notes:string/menu_remove_remind = 0x7f0a0030 -net.micode.notes:string/menu_normal_mode = 0x7f0a002f +net.micode.notes:string/note_link_email = 0x7f0a003c net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e +net.micode.notes:string/notelist_string_info = 0x7f0a0043 +net.micode.notes:string/success_sdcard_export = 0x7f0a005b +net.micode.notes:string/call_record_folder_name = 0x7f0a0008 +net.micode.notes:drawable/list_green_up = 0x7f040020 net.micode.notes:string/menu_move = 0x7f0a002d +net.micode.notes:menu/note_edit = 0x7f070002 net.micode.notes:string/menu_list_mode = 0x7f0a002c +net.micode.notes:id/iv_bg_blue_select = 0x7f05000f +net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c net.micode.notes:string/menu_font_super = 0x7f0a002b -net.micode.notes:string/menu_font_small = 0x7f0a002a -net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 -net.micode.notes:string/menu_export_text = 0x7f0a0023 net.micode.notes:string/menu_deselect_all = 0x7f0a0022 net.micode.notes:string/menu_create_folder = 0x7f0a0020 -net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 -net.micode.notes:string/folder_exist = 0x7f0a0017 +net.micode.notes:id/menu_share = 0x7f05002b +net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e +net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 +net.micode.notes:string/menu_select_none = 0x7f0a0033 net.micode.notes:string/hint_foler_name = 0x7f0a001d +net.micode.notes:string/folder_exist = 0x7f0a0017 +net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 +net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055 +net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065 +net.micode.notes:id/menu_send_to_desktop = 0x7f050029 net.micode.notes:string/format_date_ymd = 0x7f0a0018 -net.micode.notes:string/file_path = 0x7f0a0016 net.micode.notes:string/set_remind_time_message = 0x7f0a005a net.micode.notes:string/error_sync_network = 0x7f0a0013 net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010 -net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a -net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 -net.micode.notes:drawable/list_green_up = 0x7f040020 -net.micode.notes:string/call_record_folder_name = 0x7f0a0008 net.micode.notes:drawable/new_note_normal = 0x7f040030 net.micode.notes:string/button_delete = 0x7f0a0007 net.micode.notes:string/app_widget2x2 = 0x7f0a0005 -net.micode.notes:string/menu_font_normal = 0x7f0a0028 -net.micode.notes:string/format_exported_file_location = 0x7f0a001a +net.micode.notes:string/menu_select_title = 0x7f0a0034 net.micode.notes:raw/introduction = 0x7f090000 +net.micode.notes:string/format_exported_file_location = 0x7f0a001a +net.micode.notes:string/menu_font_normal = 0x7f0a0028 +net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 +net.micode.notes:layout/datetime_picker = 0x7f060002 +net.micode.notes:xml/widget_2x_info = 0x7f0c0002 +net.micode.notes:string/notealert_enter = 0x7f0a0040 +net.micode.notes:id/sv_note_edit = 0x7f050039 +net.micode.notes:drawable/new_note = 0x7f04002f +net.micode.notes:string/menu_remove_remind = 0x7f0a0030 net.micode.notes:string/delete_remind_time_message = 0x7f0a000b -net.micode.notes:dimen/text_font_size_super = 0x7f030004 net.micode.notes:drawable/selected = 0x7f040035 net.micode.notes:plurals/search_results_title = 0x7f080000 -net.micode.notes:menu/sub_folder = 0x7f070006 -net.micode.notes:menu/note_edit = 0x7f070002 -net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 -net.micode.notes:color/secondary_text_dark = 0x7f020001 -net.micode.notes:id/move = 0x7f05002e -net.micode.notes:id/iv_bg_yellow_select = 0x7f050017 -net.micode.notes:menu/call_note_edit = 0x7f070000 -net.micode.notes:drawable/new_note_pressed = 0x7f040031 +net.micode.notes:dimen/text_font_size_super = 0x7f030004 +net.micode.notes:layout/widget_4x = 0x7f06000d +net.micode.notes:id/et_foler_name = 0x7f05000a +net.micode.notes:drawable/edit_green = 0x7f040007 +net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 net.micode.notes:id/iv_bg_blue = 0x7f05000e net.micode.notes:layout/settings_header = 0x7f06000b -net.micode.notes:layout/note_list = 0x7f060008 +net.micode.notes:drawable/new_note_pressed = 0x7f040031 +net.micode.notes:id/iv_bg_yellow_select = 0x7f050017 +net.micode.notes:id/move = 0x7f05002e +net.micode.notes:menu/call_note_edit = 0x7f070000 +net.micode.notes:color/secondary_text_dark = 0x7f020001 +net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 net.micode.notes:drawable/list_white_single = 0x7f040027 net.micode.notes:layout/note_item = 0x7f060007 -net.micode.notes:xml/widget_2x_info = 0x7f0c0002 -net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 -net.micode.notes:layout/datetime_picker = 0x7f060002 +net.micode.notes:string/note_link_tel = 0x7f0a003e +net.micode.notes:id/widget_text = 0x7f050042 net.micode.notes:id/btn_new_note = 0x7f050004 net.micode.notes:layout/note_list_footer = 0x7f06000a -net.micode.notes:id/widget_text = 0x7f050042 -net.micode.notes:id/tv_title_bar = 0x7f050040 net.micode.notes:drawable/widget_2x_blue = 0x7f040038 net.micode.notes:id/tv_time = 0x7f05003e net.micode.notes:id/tv_name = 0x7f05003d -net.micode.notes:drawable/new_note = 0x7f04002f -net.micode.notes:id/sv_note_edit = 0x7f050039 -net.micode.notes:id/selection_menu = 0x7f050038 net.micode.notes:string/error_sdcard_export = 0x7f0a000f net.micode.notes:id/preference_sync_button = 0x7f050037 -net.micode.notes:layout/note_edit = 0x7f060005 -net.micode.notes:id/notes_list = 0x7f050035 -net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 -net.micode.notes:drawable/title_alert = 0x7f040036 -net.micode.notes:id/note_title = 0x7f050034 -net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f net.micode.notes:id/note_edit_view = 0x7f050032 +net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f net.micode.notes:id/navigation_bar = 0x7f05002f net.micode.notes:string/app_widget4x4 = 0x7f0a0006 -net.micode.notes:drawable/font_normal = 0x7f040011 net.micode.notes:id/minute = 0x7f05002d +net.micode.notes:drawable/font_normal = 0x7f040011 net.micode.notes:drawable/font_super = 0x7f040014 net.micode.notes:id/menu_sync = 0x7f05002c -net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e -net.micode.notes:id/menu_share = 0x7f05002b net.micode.notes:id/menu_setting = 0x7f05002a -net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065 -net.micode.notes:id/menu_send_to_desktop = 0x7f050029 -net.micode.notes:id/menu_search = 0x7f050028 net.micode.notes:drawable/list_green_down = 0x7f04001d net.micode.notes:id/menu_new_note = 0x7f050027 net.micode.notes:string/error_note_not_exist = 0x7f0a000e @@ -133,14 +140,14 @@ net.micode.notes:id/iv_medium_select = 0x7f050019 net.micode.notes:id/menu_export_text = 0x7f050023 net.micode.notes:string/menu_folder_view = 0x7f0a0026 net.micode.notes:id/menu_delete = 0x7f050021 -net.micode.notes:string/ticker_fail = 0x7f0a0061 net.micode.notes:string/file_name_txt_format = 0x7f0a0015 -net.micode.notes:drawable/edit_blue = 0x7f040006 +net.micode.notes:string/ticker_fail = 0x7f0a0061 net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050036 +net.micode.notes:drawable/edit_blue = 0x7f040006 +net.micode.notes:id/menu_alert = 0x7f050020 net.micode.notes:string/menu_font_size = 0x7f0a0029 -net.micode.notes:string/menu_alert = 0x7f0a001f net.micode.notes:drawable/edit_title_yellow = 0x7f04000d -net.micode.notes:id/menu_alert = 0x7f050020 +net.micode.notes:string/menu_alert = 0x7f0a001f net.micode.notes:string/success_sync_account = 0x7f0a005c net.micode.notes:id/ll_font_super = 0x7f05001f net.micode.notes:id/ll_font_small = 0x7f05001e @@ -148,49 +155,44 @@ net.micode.notes:menu/call_record_folder = 0x7f070001 net.micode.notes:id/ll_font_normal = 0x7f05001d net.micode.notes:id/ll_font_large = 0x7f05001c net.micode.notes:id/note_bg_color_selector = 0x7f050030 -net.micode.notes:drawable/search_result = 0x7f040034 net.micode.notes:id/iv_super_select = 0x7f05001b +net.micode.notes:drawable/search_result = 0x7f040034 net.micode.notes:id/iv_bg_yellow = 0x7f050016 +net.micode.notes:drawable/widget_2x_green = 0x7f040039 net.micode.notes:string/error_sync_cancelled = 0x7f0a0011 net.micode.notes:id/iv_bg_white_select = 0x7f050015 +net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c +net.micode.notes:drawable/widget_2x_red = 0x7f04003a net.micode.notes:id/tv_alert_date = 0x7f05003a net.micode.notes:dimen/text_font_size_large = 0x7f030000 net.micode.notes:drawable/notification = 0x7f040033 net.micode.notes:id/iv_bg_red = 0x7f050012 +net.micode.notes:id/iv_large_select = 0x7f050018 net.micode.notes:string/menu_font_large = 0x7f0a0027 net.micode.notes:drawable/widget_4x_blue = 0x7f04003d -net.micode.notes:id/iv_large_select = 0x7f050018 -net.micode.notes:id/widget_bg_image = 0x7f050041 net.micode.notes:id/iv_bg_green_select = 0x7f050011 -net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c +net.micode.notes:id/widget_bg_image = 0x7f050041 net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a net.micode.notes:drawable/menu_move = 0x7f04002e net.micode.notes:drawable/widget_4x_white = 0x7f040040 -net.micode.notes:id/iv_bg_blue_select = 0x7f05000f -net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c net.micode.notes:id/font_size_selector = 0x7f05000b +net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c net.micode.notes:id/et_edit_text = 0x7f050009 -net.micode.notes:id/et_foler_name = 0x7f05000a -net.micode.notes:drawable/edit_green = 0x7f040007 -net.micode.notes:layout/widget_4x = 0x7f06000d net.micode.notes:string/search = 0x7f0a0056 net.micode.notes:id/cb_edit_item = 0x7f050006 net.micode.notes:id/btn_set_bg_color = 0x7f050005 net.micode.notes:id/account_dialog_subtitle = 0x7f050000 net.micode.notes:menu/note_list = 0x7f070003 net.micode.notes:id/account_dialog_title = 0x7f050001 -net.micode.notes:id/iv_bg_green = 0x7f050010 net.micode.notes:id/amPm = 0x7f050003 +net.micode.notes:id/iv_bg_green = 0x7f050010 net.micode.notes:drawable/widget_4x_green = 0x7f04003e -net.micode.notes:style/NoteTheme = 0x7f0b0003 net.micode.notes:id/hour = 0x7f05000c net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032 +net.micode.notes:style/NoteTheme = 0x7f0b0003 net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c -net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c -net.micode.notes:drawable/widget_2x_red = 0x7f04003a net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a net.micode.notes:id/delete = 0x7f050008 -net.micode.notes:drawable/widget_2x_green = 0x7f040039 net.micode.notes:drawable/title_bar_bg = 0x7f040037 net.micode.notes:drawable/menu_delete = 0x7f04002d net.micode.notes:string/error_sync_internal = 0x7f0a0012 @@ -279,5 +281,6 @@ net.micode.notes:menu/note_list_dropdown = 0x7f070004 net.micode.notes:string/menu_setting = 0x7f0a0036 net.micode.notes:dimen/text_font_size_medium = 0x7f030001 net.micode.notes:layout/note_edit_list_item = 0x7f060006 +net.micode.notes:string/note_length = 0x7f0a0066 net.micode.notes:layout/account_dialog_title = 0x7f060000 net.micode.notes:array/format_for_exported_note = 0x7f010000 diff --git a/src/Notes-master1/app/src/main/AndroidManifest.xml b/src/Notes-master1/app/src/main/AndroidManifest.xml index e5c7d47..9a44928 100644 --- a/src/Notes-master1/app/src/main/AndroidManifest.xml +++ b/src/Notes-master1/app/src/main/AndroidManifest.xml @@ -33,7 +33,7 @@ "); + if (Flag1 != -1 && Flag2 != -1) { + stringBuffer = stringBuffer.replace(Flag1, Flag2+1, ""); + } + } while (Flag1 != -1 && Flag2 != -1); + + do {//不计入换行字符 + Flag1 = stringBuffer.indexOf("\n"); + + if (Flag1 != -1){ + stringBuffer = stringBuffer.replace(Flag1, Flag1+1, ""); + } + } while (Flag1 != -1); + do {//不计入空格字符 + Flag1 = stringBuffer.indexOf(" "); + + if (Flag1 != -1) { + stringBuffer = stringBuffer.replace(Flag1, Flag1+1, ""); + } + } while (Flag1 != -1); + return stringBuffer.toString(); + } + + private void count() { + mNoteEditor.addTextChangedListener(new TextWatcher() { + int currentLength = 0; + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + textView.setText("字符数：" + currentLength); + } + public void onTextChanged(CharSequence s, int start, int before, int count) { + currentLength = Textchange(mNoteEditor.getText().toString()).length(); + } + public void afterTextChanged(Editable s) { + textView.setText("字符数：" + currentLength); + } + }); + } } \ No newline at end of file diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index 5efccd9..0ebcc7f 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -79,6 +79,7 @@ import java.io.InputStreamReader; import java.util.HashSet; public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener { + private int mode = -1; private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0; private static final int FOLDER_LIST_QUERY_TOKEN = 1; @@ -139,6 +140,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.note_list); + getWindow().setBackgroundDrawableResource(R.drawable.cat); initResources(); /** diff --git a/src/Notes-master1/app/src/main/res/layout/note_edit.xml b/src/Notes-master1/app/src/main/res/layout/note_edit.xml index 10b2aa7..9d3e52a 100644 --- a/src/Notes-master1/app/src/main/res/layout/note_edit.xml +++ b/src/Notes-master1/app/src/main/res/layout/note_edit.xml @@ -40,6 +40,14 @@ android:layout_marginRight="8dip" android:textAppearance="@style/TextAppearanceSecondaryItem" /> + + + android:title="Background:lattice"/> + android:title="Background:notes"/> + android:title="Background:house"/> diff --git a/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml b/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml index 09f75ed..a4d025b 100644 --- a/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml +++ b/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml @@ -122,5 +122,6 @@ %1$s 条符合“%2$s”的搜索结果 + 字符数 diff --git a/src/Notes-master1/app/src/main/res/values-zh-rTW/strings.xml b/src/Notes-master1/app/src/main/res/values-zh-rTW/strings.xml index e29b79b..9e565e3 100644 --- a/src/Notes-master1/app/src/main/res/values-zh-rTW/strings.xml +++ b/src/Notes-master1/app/src/main/res/values-zh-rTW/strings.xml @@ -123,5 +123,6 @@ %1$s 條符合”%2$s“的搜尋結果 + 字符數 diff --git a/src/Notes-master1/app/src/main/res/values/strings.xml b/src/Notes-master1/app/src/main/res/values/strings.xml index 293c571..682804f 100644 --- a/src/Notes-master1/app/src/main/res/values/strings.xml +++ b/src/Notes-master1/app/src/main/res/values/strings.xml @@ -138,5 +138,6 @@ %1$s results for \"%2$s\" + Length