diff --git a/Notes-master2/.gradle/7.5/executionHistory/executionHistory.bin b/Notes-master2/.gradle/7.5/executionHistory/executionHistory.bin index 72a6c5a..c273d19 100644 Binary files a/Notes-master2/.gradle/7.5/executionHistory/executionHistory.bin and b/Notes-master2/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/Notes-master2/.gradle/7.5/executionHistory/executionHistory.lock b/Notes-master2/.gradle/7.5/executionHistory/executionHistory.lock index d29b333..eaf9c76 100644 Binary files a/Notes-master2/.gradle/7.5/executionHistory/executionHistory.lock and b/Notes-master2/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/Notes-master2/.gradle/7.5/fileHashes/fileHashes.bin b/Notes-master2/.gradle/7.5/fileHashes/fileHashes.bin index 4e495bc..038859f 100644 Binary files a/Notes-master2/.gradle/7.5/fileHashes/fileHashes.bin and b/Notes-master2/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/Notes-master2/.gradle/7.5/fileHashes/fileHashes.lock b/Notes-master2/.gradle/7.5/fileHashes/fileHashes.lock index a7f7607..1f95353 100644 Binary files a/Notes-master2/.gradle/7.5/fileHashes/fileHashes.lock and b/Notes-master2/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/Notes-master2/.gradle/7.5/fileHashes/resourceHashesCache.bin b/Notes-master2/.gradle/7.5/fileHashes/resourceHashesCache.bin index 5efbc34..007c7e0 100644 Binary files a/Notes-master2/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/Notes-master2/.gradle/7.5/fileHashes/resourceHashesCache.bin differ diff --git a/Notes-master2/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Notes-master2/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 643d742..fc1e95f 100644 Binary files a/Notes-master2/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/Notes-master2/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/Notes-master2/.gradle/buildOutputCleanup/outputFiles.bin b/Notes-master2/.gradle/buildOutputCleanup/outputFiles.bin index 3da6d93..18f7692 100644 Binary files a/Notes-master2/.gradle/buildOutputCleanup/outputFiles.bin and b/Notes-master2/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/Notes-master2/.gradle/file-system.probe b/Notes-master2/.gradle/file-system.probe index 9f1e1aa..c5ce0df 100644 Binary files a/Notes-master2/.gradle/file-system.probe and b/Notes-master2/.gradle/file-system.probe differ diff --git a/Notes-master2/app/build/intermediates/apk/debug/app-debug.apk b/Notes-master2/app/build/intermediates/apk/debug/app-debug.apk index 7bc15ce..a7ab97a 100644 Binary files a/Notes-master2/app/build/intermediates/apk/debug/app-debug.apk and b/Notes-master2/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/Notes-master2/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/Notes-master2/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index a54964f..d077654 100644 Binary files a/Notes-master2/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/Notes-master2/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/Notes-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/Notes-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin index 601f245..0748acd 100644 Binary files a/Notes-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/Notes-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ diff --git a/Notes-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/Notes-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin index 601f245..4e14d56 100644 Binary files a/Notes-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and b/Notes-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/Notes-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/Notes-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin index 601f245..3a551d1 100644 Binary files a/Notes-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin and b/Notes-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin differ diff --git a/Notes-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/Notes-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin index 601f245..4aa58f1 100644 Binary files a/Notes-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and b/Notes-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ diff --git a/Notes-master2/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/Notes-master2/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 0929139..ff7beb0 100644 Binary files a/Notes-master2/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/Notes-master2/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/Notes-master2/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/Notes-master2/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index a37d366..f03961c 100644 Binary files a/Notes-master2/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/Notes-master2/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/Notes-master2/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/Notes-master2/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 019dd69..e04198f 100644 --- a/Notes-master2/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/Notes-master2/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Fri Apr 14 09:04:28 CST 2023 +#Thu May 11 20:56:47 CST 2023 net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat diff --git a/Notes-master2/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/Notes-master2/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml deleted file mode 100644 index d65e0cc..0000000 --- a/Notes-master2/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 邮件 - - - %1$s 条符合“%2$s”的搜索结果 - - 确认删除文件夹及所包含的便签吗？ - 确认要删除该条便签吗? - 确认要删除所选的 %d 条便签吗? - 删除 - 便签 - 便签2x2 - 便签4x4 - 删除 - 通话便签 - 取消 - 设置 - 成功删除提醒 - 不能为空便签设置闹钟提醒 - 不能将空便签发送到桌面 - 要查看的便签不存在 - 导出文本时发生错误，请检查SD卡 - SD卡被占用，不能操作 - 同步已取消 - 同步失败，发生内部错误 - 同步失败，请检查网络和帐号设置 - 导出失败 - 文件夹 %1$s 已存在，请重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已将文本文件(%1$s)输出至SD卡(%2$s)目录 - 已将所选 %1$d 条便签移到 %2$s 文件夹 - 请输入名称 - 已添加到桌面 - 提醒我 - 新建文件夹 - 删除 - 取消全选 - 导出文本 - 修改文件夹名称 - 刪除文件夹 - 查看文件夹 - 大 - 正常 - 文字大小 - 小 - 超大 - 进入清单模式 - 移动到文件夹 - 上一级文件夹 - 退出清单模式 - 删除提醒 - 搜索 - 全选 - 没有选中项，操作无效 - 选中了 %d 项 - 发送到桌面 - 设置 - 分享 - 同步 - 取消同步 - 选择文件夹 - 已过期 - 发送邮件 - 打开地图 - 呼叫电话 - 浏览网页 - 查看 - 知道了 - 新建便签 - ... - 与google task同步便签记录 - 同步账号 - 添加账号 - 新建便签背景颜色随机 - 取消同步 - 立即同步 - 当前帐号 %1$s - 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复 - 请选择google帐号，便签将与该帐号的google task内容同步。 - 同步便签 - 上次同步于 %1$s - 取消 - 更换账号 - 删除账号 - 设置 - 正在同步中，不能修改同步帐号 - 同步帐号已设置为%1$s - 便签 - 搜索便签 - 正在搜索便签 - 便签中的文字 - 创建提醒 - 导出成功 - 与%1$s同步成功 - 正在获取服务器便签列表... - 登录%1$s... - 正在同步本地便签... - 同步已取消 - 同步失败 - 同步成功 - 同步便签... - 没有关联内容，点击新建便签。 - 访客模式下，便签内容不可见 - \ No newline at end of file diff --git a/Notes-master2/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/Notes-master2/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml deleted file mode 100644 index 226b5bc..0000000 --- a/Notes-master2/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 郵件 - - - %1$s 條符合”%2$s“的搜尋結果 - - 確認刪除檔夾及所包含的便簽嗎？ - 确认要删除該條便籤嗎? - 确认要刪除所選的 %d 條便籤嗎? - 刪除 - 便簽 - 便簽2x2 - 便簽4x4 - 刪除 - 通話便籤 - 取消 - 設置 - 成功刪除提醒 - 不能爲空便籤設置鬧鐘提醒 - 不能將空便籤發送到桌面 - 要查看的便籤不存在 - 導出TXT時發生錯誤，請檢查SD卡 - SD卡被佔用，不能操作 - 同步已取消 - 同步失敗，發生內部錯誤 - 同步失敗，請檢查網絡和帳號設置 - 導出失敗 - 文件夾 %1$s 已存在，請重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已將文本文件(%1$s)導出至SD(%2$s)目錄 - 已將所選 %1$d 便籤移到 %2$s 文件夾 - 請輸入名稱 - 已添加到桌面 - 提醒我 - 新建文件夾 - 刪除 - 取消全選 - 導出文本 - 修改文件夾名稱 - 刪除文件夾 - 查看文件夾 - 大 - 正常 - 文字大小 - 小 - 超大 - 進入清單模式 - 移動到文件夾 - 上一級文件夾 - 退出清單模式 - 刪除提醒 - 搜尋 - 全選 - 沒有選中項，操作無效 - 選中了 %d 項 - 發送到桌面 - 設置 - 分享 - 同步 - 取消同步 - 選擇文件夾 - 已過期 - 發送郵件 - 打開地圖 - 呼叫電話 - 浏覽網頁 - 查看 - 知道了 - 新建便簽 - ... - 与google task同步便簽記錄 - 同步賬號 - 添加賬號 - 新建便籤背景顏色隨機 - 取消同步 - 立即同步 - 當前帳號 %1$s - 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復 - 請選擇google帳號，便簽將與該帳號的google task內容同步。 - 同步便簽 - 上次同步于 %1$s - 取消 - 更換賬號 - 刪除賬號 - 設置 - 正在同步中，不能修改同步帳號 - 同步帳號已設置為%1$s - 便籤 - 搜索便籤 - 正在搜索便籤 - 便籤中的文字 - 創建提醒 - 導出成功 - 與%1$s同步成功 - 正在獲取服務器便籤列表... - 登陸%1$s... - 正在同步本地便籤... - 同步已取消 - 同步失敗 - 同步成功 - 同步便簽... - 沒有關聯內容，點擊新建便簽。 - 訪客模式下，便籤內容不可見 - \ No newline at end of file diff --git a/Notes-master2/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/Notes-master2/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml deleted file mode 100644 index e49b0c3..0000000 --- a/Notes-master2/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - -%s - --%s - --%s - --%s - - - Messaging - Email - - #335b5b5b - 26sp - 20sp - 17sp - 14sp - 33sp - - %1$s result for \"%2$s\" - - %1$s results for \"%2$s\" - - Confirm to delete folder and its notes? - Confirm to delete this note? - Confirm to delete the selected %d notes? - Delete selected notes - Notes - Notes 2x2 - Notes 4x4 - Delete - Call notes - cancel - set - Delete reminder successfully - Sorry, can not set clock on empty note - Sorry, can not send and empty note to home - The note is not exist - Export failed, please check SD card - SD card busy, not available now - Sync is canceled - Sync failed, internal error occurs - Sync failed, please check network and account settings - Export fail - notes_%s.txt - /MIUI/notes/ - The folder %1$s exist, please rename - yyyyMMdd - MMMd kk:mm - Export text file (%1$s) to SD (%2$s) directory - (%d) - Have moved selected %1$d notes to %2$s folder - Input name - Note added to home - Remind me - New Folder - Delete - Deselect all - Export text - Change folder name - Delete folder - View folder - Large - Medium - Font size - Small - Super - Enter check list - Move to folder - Parent folder - Leave check list - Delete reminder - Search - Select all - Nothing selected, the operation is invalid - %d selected - Send to home - Settings - Share - Sync - Cancel syncing - Select folder - Expired - Send email - Open map - Call - Browse web - Take a look - Got it - Add note - ... - Sync notes with google task - Sync account - Add account - New note background color random - Cancel syncing - Sync immediately - Current account %1$s - All sync related information will be deleted, which may result in duplicated items sometime - Please select a google account. Local notes will be synced with google task. - Sync notes - Last sync time %1$s - yyyy-MM-dd hh:mm:ss - Cancel - Change sync account - Remove sync account - Settings - Cannot change the account because sync is in progress - %1$s has been set as the sync account - Notes - Search notes - Searching Notes - Text in your notes - Set reminder - Export successful - Sync is successful with account %1$s - Getting remote note list... - Logging into %1$s... - Synchronize local notes with Google Task... - Sync is canceled - Sync is failed - Sync is successful - Syncing notes... - No associated note found, click to create associated note. - Privacy mode，can not see note content - - - - - - - - - - - - \ No newline at end of file diff --git a/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 74b458e..fbdc2e7 100644 --- a/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Wed Apr 19 22:32:26 CST 2023 +#Thu May 11 21:12:56 CST 2023 base.0=D\:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 5f5a841..7387766 100644 Binary files a/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class index df71afc..371c8ff 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class index 51317a3..def268f 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index 505c291..6f10a05 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index 45d174e..5baff15 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index f7afcae..27d4a33 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index 24c7362..4aa5e7e 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index 1725d92..7adb9ac 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index 8e1f0bf..0a43181 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index 26e0ea0..f105e70 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index 83ee57b..3672690 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 38309dd..37b5776 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index 3f69317..f5ad7a2 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class index 00ee0c3..460c1ca 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class index 8523228..5e57761 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class index d91bc85..e3404b0 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class index 99c7a64..6c8cdd7 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class index 17e4d3b..7cab1be 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class index 7b80036..af09653 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class index d9abeb9..bc4a82b 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class index 39e534a..f937517 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index 2e15406..29356de 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index a19956f..325cf13 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index b06613f..a060094 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/Notes-master2/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/Notes-master2/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index d506bff..d1fcb2e 100644 --- a/Notes-master2/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/Notes-master2/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -55,7 +55,7 @@ 34-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:33:22-78 35 36 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:35:5-149:19 +36-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:35:5-150:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" 38-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:36:9-42 @@ -153,121 +153,123 @@ 85 86 87 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:83:9-86:43 +87-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:83:9-87:43 88 android:name="net.micode.notes.data.NotesProvider" 88-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:84:13-63 89 android:authorities="micode_notes" 89-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:85:13-47 -90 android:multiprocess="true" /> -90-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:86:13-40 -91 -92 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:88:9-100:20 -93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:89:13-57 -94 android:label="@string/app_widget2x2" > -94-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:90:13-50 -95 -95-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:91:13-95:29 -96 -96-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:92:17-84 -96-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:92:25-81 -97 -97-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:93:17-85 -97-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:93:25-82 -98 +90 android:exported="true" +90-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:86:13-36 +91 android:multiprocess="true" /> +91-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:87:13-40 +92 +93 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:89:9-101:20 +94 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +94-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:90:13-57 +95 android:label="@string/app_widget2x2" > +95-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:91:13-50 +96 +96-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:92:13-96:29 +97 +97-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:93:17-84 +97-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:93:25-81 +98 98-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:17-85 98-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:25-82 -99 -100 -101 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:97:13-99:58 -102 android:name="android.appwidget.provider" -102-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:98:17-58 -103 android:resource="@xml/widget_2x_info" /> -103-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:99:17-55 -104 -105 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:101:9-114:20 -106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:102:13-57 -107 android:label="@string/app_widget4x4" > -107-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:103:13-50 -108 -108-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:91:13-95:29 -109 -109-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:92:17-84 -109-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:92:25-81 -110 -110-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:93:17-85 -110-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:93:25-82 -111 +99 +99-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:95:17-85 +99-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:95:25-82 +100 +101 +102 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:98:13-100:58 +103 android:name="android.appwidget.provider" +103-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:99:17-58 +104 android:resource="@xml/widget_2x_info" /> +104-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:100:17-55 +105 +106 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:102:9-115:20 +107 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +107-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:103:13-57 +108 android:label="@string/app_widget4x4" > +108-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:104:13-50 +109 +109-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:92:13-96:29 +110 +110-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:93:17-84 +110-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:93:25-81 +111 111-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:17-85 111-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:25-82 -112 -113 -114 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:97:13-99:58 -115 android:name="android.appwidget.provider" -115-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:98:17-58 -116 android:resource="@xml/widget_4x_info" /> -116-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:99:17-55 -117 -118 -118-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:116:9-120:20 -118-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:116:19-55 -119 -119-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:117:13-119:29 -120 -120-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:118:17-79 -120-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:118:25-76 -121 -122 -123 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:122:9-125:20 -124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:123:13-61 -125 android:process=":remote" > -125-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:124:13-38 -126 -127 -128 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:127:9-132:20 -129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:128:13-50 -130 android:label="@string/app_name" -130-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:129:13-45 -131 android:launchMode="singleInstance" -131-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:130:13-48 -132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:131:13-75 -133 -134 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:134:9-139:20 -135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:135:13-71 -136 android:label="@string/preferences_title" -136-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:136:13-54 -137 android:launchMode="singleTop" -137-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:137:13-43 -138 android:theme="@android:style/Theme.Holo.Light" > -138-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:138:13-60 -139 -140 -141 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:141:9-144:19 -142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:142:13-74 -143 android:exported="false" > -143-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:143:13-37 -144 -145 -146 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:146:9-148:52 -147 android:name="android.app.default_searchable" -147-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:147:13-58 -148 android:value=".ui.NoteEditActivity" /> -148-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:148:13-49 -149 -150 -151 +112 +112-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:95:17-85 +112-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:95:25-82 +113 +114 +115 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:98:13-100:58 +116 android:name="android.appwidget.provider" +116-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:99:17-58 +117 android:resource="@xml/widget_4x_info" /> +117-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:100:17-55 +118 +119 +119-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:117:9-121:20 +119-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:117:19-55 +120 +120-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:118:13-120:29 +121 +121-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:119:17-79 +121-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:119:25-76 +122 +123 +124 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:123:9-126:20 +125 android:name="net.micode.notes.ui.AlarmReceiver" +125-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:124:13-61 +126 android:process=":remote" > +126-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:125:13-38 +127 +128 +129 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:128:9-133:20 +130 android:name="net.micode.notes.ui.AlarmAlertActivity" +130-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:129:13-50 +131 android:label="@string/app_name" +131-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:130:13-45 +132 android:launchMode="singleInstance" +132-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:131:13-48 +133 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +133-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:132:13-75 +134 +135 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:135:9-140:20 +136 android:name="net.micode.notes.ui.NotesPreferenceActivity" +136-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:136:13-71 +137 android:label="@string/preferences_title" +137-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:137:13-54 +138 android:launchMode="singleTop" +138-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:138:13-43 +139 android:theme="@android:style/Theme.Holo.Light" > +139-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:139:13-60 +140 +141 +142 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:142:9-145:19 +143 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +143-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:143:13-74 +144 android:exported="false" > +144-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:144:13-37 +145 +146 +147 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:147:9-149:52 +148 android:name="android.app.default_searchable" +148-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:148:13-58 +149 android:value=".ui.NoteEditActivity" /> +149-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:149:13-49 +150 +151 +152 diff --git a/Notes-master2/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/Notes-master2/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index f17b551..7968c45 100644 --- a/Notes-master2/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/Notes-master2/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -87,6 +87,7 @@ 15 && img_fragment.endsWith("[/local]") && img_fragment.startsWith("[local]")){ + int limit = 7; //[local]为7个字符 + //[local][/local]共15个字符，剩下的为真正的path长度 + int len = img_fragment.length()-15; + //从[local]之后的len个字符就是path + String path = img_fragment.substring(limit,limit+len);//获取到了图片路径 + Bitmap bitmap = null; + Log.d(TAG, "图片的路径是："+path); + try { + bitmap = BitmapFactory.decodeFile(path);//将图片路径解码为图片格式 + } catch (Exception e) { + e.printStackTrace(); + } + if(bitmap!=null){ //若图片存在 + Log.d(TAG, "图片不为null"); + ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap); + //4.创建一个SpannableString对象，以便插入用ImageSpan对象封装的图像 + String ss = "[local]" + path + "[/local]"; + SpannableString spannableString = new SpannableString(ss); + //5.将指定的标记对象附加到文本的开始...结束范围 + spannableString.setSpan(imageSpan, 0, ss.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + Log.d(TAG, "Create spannable string success!"); + Editable edit_text = noteEditText.getEditableText(); + edit_text.delete(i,i+len+15); //6.删掉图片路径的文字 + edit_text.insert(i, spannableString); //7.在路径的起始位置插入图片 + } + } + } + } + } + + /** + * 重写onActivityResult()来处理返回的数据 + */ + protected void onActivityResult(int requestCode, int resultCode, Intent intent) { + super.onActivityResult(requestCode, resultCode, intent); + ContentResolver resolver = getContentResolver(); + switch (requestCode) { + case PHOTO_REQUEST: + Uri originalUri = intent.getData(); //1.获得图片的真实路径 + Bitmap bitmap = null; + try { + bitmap = BitmapFactory.decodeStream(resolver.openInputStream(originalUri));//2.解码图片 + } catch (FileNotFoundException e) { + Log.d(TAG, "onActivityResult: get file_exception"); + e.printStackTrace(); + } + + if(bitmap != null){ + //3.根据Bitmap对象创建ImageSpan对象 + Log.d(TAG, "onActivityResult: bitmap is not null"); + ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap); + String path = getPath(this,originalUri); + //4.使用[local][/local]将path括起来，用于之后方便识别图片路径在note中的位置 + String img_fragment= "[local]" + path + "[/local]"; + //创建一个SpannableString对象，以便插入用ImageSpan对象封装的图像 + SpannableString spannableString = new SpannableString(img_fragment); + spannableString.setSpan(imageSpan, 0, img_fragment.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + //5.将选择的图片追加到EditText中光标所在位置 + NoteEditText e = (NoteEditText) findViewById(R.id.note_edit_view); + int index = e.getSelectionStart(); //获取光标所在位置 + Log.d(TAG, "Index是: " + index); + Editable edit_text = e.getEditableText(); + edit_text.insert(index, spannableString); //将图片插入到光标所在位置 + + mWorkingNote.mContent = e.getText().toString(); + //6.把改动提交到数据库中,两个数据库表都要改的 + ContentResolver contentResolver = getContentResolver(); + ContentValues contentValues = new ContentValues(); + final long id = mWorkingNote.getNoteId(); + contentValues.put("snippet",mWorkingNote.mContent); + contentResolver.update(Uri.parse("content://micode_notes/note"), contentValues,"_id=?",new String[]{""+id}); + ContentValues contentValues1 = new ContentValues(); + contentValues1.put("content",mWorkingNote.mContent); + contentResolver.update(Uri.parse("content://micode_notes/data"), contentValues1,"mime_type=? and note_id=?", new String[]{"vnd.android.cursor.item/text_note",""+id}); + + }else{ + Toast.makeText(NoteEditActivity.this, "获取图片失败", Toast.LENGTH_SHORT).show(); + } + break; + default: + break; + } + } + + + /** + * 获取文件的real path + * @param context 文件内容 + * @param uri 文件路径 + * @return + */ + @SuppressLint("NewApi") + public String getPath(final Context context, final Uri uri) { + + final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT; + + // DocumentProvider + if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) { + // ExternalStorageProvider +// if (isExternalStorageDocument(uri)) { +// final String docId = DocumentsContract.getDocumentId(uri); +// final String[] split = docId.split(":"); +// final String type = split[0]; +// +// if ("primary".equalsIgnoreCase(type)) { +// return Environment.getExternalStorageDirectory() + "/" + split[1]; +// } +// } +// // DownloadsProvider +// else if (isDownloadsDocument(uri)) { +// final String id = DocumentsContract.getDocumentId(uri); +// final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(id)); +// return getDataColumn(context, contentUri, null, null); +// } + // MediaProvider +// else + if (isMediaDocument(uri)) { + final String docId = DocumentsContract.getDocumentId(uri); + final String[] split = docId.split(":"); + final String type = split[0]; + + Uri contentUri = null; + if ("image".equals(type)) { + contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI; + } + + final String selection = "_id=?"; + final String[] selectionArgs = new String[]{split[1]}; + + return getDataColumn(context, contentUri, selection, selectionArgs); + } + } + // Media + else if ("content".equalsIgnoreCase(uri.getScheme())) { + return getDataColumn(context, uri, null, null); + } + // File + else if ("file".equalsIgnoreCase(uri.getScheme())) { + return uri.getPath(); + } + return null; + } + + /** + * 是否为媒体文件 + * @param uri 文件地址 + * @return 返回判断Boolean结果 + */ + public boolean isMediaDocument(Uri uri) { + return "com.android.providers.media.documents".equals(uri.getAuthority()); + } + + /** + * 获取数据列_获取此 Uri 的数据列的值。这对MediaStore Uris 和其他基于文件的 ContentProvider + * @param context 文本内容 + * @param uri 文件地址 + * @param selection 选择 + * @param selectionArgs 选择参数 + * @return + */ + public String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) { + + Cursor cursor = null; + final String column = "_data"; + final String[] projection = {column}; + + try { + cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null); + if (cursor != null && cursor.moveToFirst()) { + final int column_index = cursor.getColumnIndexOrThrow(column); + return cursor.getString(column_index); + } + } finally { + if (cursor != null) + cursor.close(); + } + return null; } + /** - * Current activity may be killed when the memory is low. Once it is killed, for another time - * user load this activity, we should restore the former state + * 当内存不足时，当前活动可能被杀死。一旦它被杀死，对于另一个时间 + * 用户加载这个活动，我们应该恢复以前的状态 */ @Override protected void onRestoreInstanceState(Bundle savedInstanceState) { @@ -271,9 +497,9 @@ public class NoteEditActivity extends Activity implements OnClickListener, } @Override - protected void onResume() { + protected void onResume() {//能获得用户焦点：可以操作 super.onResume(); - initNoteScreen(); + initNoteScreen();//初始化便签屏幕 } private void initNoteScreen() { @@ -301,6 +527,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, * is not ready */ showAlertHeader(); + //将有图片路径的位置转换为图片 + convertToImage(); } private void showAlertHeader() { @@ -438,7 +666,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, if (id == R.id.btn_set_bg_color) { mNoteBgColorSelector.setVisibility(View.VISIBLE); findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( - - View.VISIBLE); + View.VISIBLE); } else if (sBgSelectorBtnsMap.containsKey(id)) { findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( View.GONE); diff --git a/Notes-master2/app/src/main/res/layout/note_edit.xml b/Notes-master2/app/src/main/res/layout/note_edit.xml index 10b2aa7..517eb20 100644 --- a/Notes-master2/app/src/main/res/layout/note_edit.xml +++ b/Notes-master2/app/src/main/res/layout/note_edit.xml @@ -397,4 +397,13 @@ android:src="@drawable/selected" /> + +