diff --git a/src/Notes-master/.gradle/6.1.1/executionHistory/executionHistory.bin b/src/Notes-master/.gradle/6.1.1/executionHistory/executionHistory.bin deleted file mode 100644 index 86be70f..0000000 Binary files a/src/Notes-master/.gradle/6.1.1/executionHistory/executionHistory.bin and /dev/null differ diff --git a/src/Notes-master/.gradle/6.1.1/executionHistory/executionHistory.lock b/src/Notes-master/.gradle/6.1.1/executionHistory/executionHistory.lock deleted file mode 100644 index 54ee088..0000000 Binary files a/src/Notes-master/.gradle/6.1.1/executionHistory/executionHistory.lock and /dev/null differ diff --git a/src/Notes-master/.gradle/6.1.1/fileChanges/last-build.bin b/src/Notes-master/.gradle/6.1.1/fileChanges/last-build.bin deleted file mode 100644 index f76dd23..0000000 Binary files a/src/Notes-master/.gradle/6.1.1/fileChanges/last-build.bin and /dev/null differ diff --git a/src/Notes-master/.gradle/6.1.1/fileContent/fileContent.lock b/src/Notes-master/.gradle/6.1.1/fileContent/fileContent.lock deleted file mode 100644 index fefad30..0000000 Binary files a/src/Notes-master/.gradle/6.1.1/fileContent/fileContent.lock and /dev/null differ diff --git a/src/Notes-master/.gradle/6.1.1/fileHashes/fileHashes.bin b/src/Notes-master/.gradle/6.1.1/fileHashes/fileHashes.bin deleted file mode 100644 index d299381..0000000 Binary files a/src/Notes-master/.gradle/6.1.1/fileHashes/fileHashes.bin and /dev/null differ diff --git a/src/Notes-master/.gradle/6.1.1/fileHashes/fileHashes.lock b/src/Notes-master/.gradle/6.1.1/fileHashes/fileHashes.lock deleted file mode 100644 index aa6c10e..0000000 Binary files a/src/Notes-master/.gradle/6.1.1/fileHashes/fileHashes.lock and /dev/null differ diff --git a/src/Notes-master/.gradle/6.1.1/fileHashes/resourceHashesCache.bin b/src/Notes-master/.gradle/6.1.1/fileHashes/resourceHashesCache.bin deleted file mode 100644 index b202cbb..0000000 Binary files a/src/Notes-master/.gradle/6.1.1/fileHashes/resourceHashesCache.bin and /dev/null differ diff --git a/src/Notes-master/.gradle/6.1.1/gc.properties b/src/Notes-master/.gradle/6.1.1/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/src/Notes-master/.gradle/6.1.1/javaCompile/classAnalysis.bin b/src/Notes-master/.gradle/6.1.1/javaCompile/classAnalysis.bin deleted file mode 100644 index b732882..0000000 Binary files a/src/Notes-master/.gradle/6.1.1/javaCompile/classAnalysis.bin and /dev/null differ diff --git a/src/Notes-master/.gradle/6.1.1/javaCompile/jarAnalysis.bin b/src/Notes-master/.gradle/6.1.1/javaCompile/jarAnalysis.bin deleted file mode 100644 index e962b37..0000000 Binary files a/src/Notes-master/.gradle/6.1.1/javaCompile/jarAnalysis.bin and /dev/null differ diff --git a/src/Notes-master/.gradle/6.1.1/javaCompile/javaCompile.lock b/src/Notes-master/.gradle/6.1.1/javaCompile/javaCompile.lock deleted file mode 100644 index ffd34e1..0000000 Binary files a/src/Notes-master/.gradle/6.1.1/javaCompile/javaCompile.lock and /dev/null differ diff --git a/src/Notes-master/.gradle/6.1.1/javaCompile/taskHistory.bin b/src/Notes-master/.gradle/6.1.1/javaCompile/taskHistory.bin deleted file mode 100644 index fd5bda3..0000000 Binary files a/src/Notes-master/.gradle/6.1.1/javaCompile/taskHistory.bin and /dev/null differ diff --git a/src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.bin b/src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.bin index 87c1ad6..626d298 100644 Binary files a/src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.bin and b/src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.lock b/src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.lock index 14526ee..4ce3972 100644 Binary files a/src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.lock and b/src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.bin b/src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.bin index 40de292..8c9923b 100644 Binary files a/src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.bin and b/src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.lock b/src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.lock index 7373e78..4953097 100644 Binary files a/src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.lock and b/src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master/.gradle/7.3.3/fileHashes/resourceHashesCache.bin b/src/Notes-master/.gradle/7.3.3/fileHashes/resourceHashesCache.bin index f7f4ed3..97d4e26 100644 Binary files a/src/Notes-master/.gradle/7.3.3/fileHashes/resourceHashesCache.bin and b/src/Notes-master/.gradle/7.3.3/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock index cac300d..53929fb 100644 Binary files a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin index 1b0470b..d96e871 100644 Binary files a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/Notes-master/.gradle/file-system.probe b/src/Notes-master/.gradle/file-system.probe index 8bbcfbf..0c3ef44 100644 Binary files a/src/Notes-master/.gradle/file-system.probe and b/src/Notes-master/.gradle/file-system.probe differ diff --git a/src/Notes-master/.idea/misc.xml b/src/Notes-master/.idea/misc.xml index 9ba2680..b00c285 100644 --- a/src/Notes-master/.idea/misc.xml +++ b/src/Notes-master/.idea/misc.xml @@ -25,7 +25,11 @@ - + + + + + diff --git a/src/Notes-master/.idea/modules/app/Notes-master.app.androidTest.iml b/src/Notes-master/.idea/modules/app/Notes-master.app.androidTest.iml index 4e47eda..f3eaa35 100644 --- a/src/Notes-master/.idea/modules/app/Notes-master.app.androidTest.iml +++ b/src/Notes-master/.idea/modules/app/Notes-master.app.androidTest.iml @@ -21,11 +21,17 @@ - + + + - + + + - + + + diff --git a/src/Notes-master/.idea/sonarlint/issuestore/index.pb b/src/Notes-master/.idea/sonarlint/issuestore/index.pb index d6899a4..654a566 100644 --- a/src/Notes-master/.idea/sonarlint/issuestore/index.pb +++ b/src/Notes-master/.idea/sonarlint/issuestore/index.pb @@ -5,8 +5,6 @@ p @app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java,1\e\1eb2363b523dbcae43d3c6e4790c64436af61b13 i 9app/src/main/java/net/micode/notes/model/WorkingNote.java,8\7\876016634c6642b35109680ccac740dc8271b236 -P - app/src/main/AndroidManifest.xml,8\c\8c55c3ccc257e5907959013f99656e4c8ec3903e B import-summary.txt,3\7\370b55b9ba807597d2aa123506d4091d242d570f X @@ -29,15 +27,25 @@ m =app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java,c\4\c42ad3cd6e664963fa1849c760a57d417d500ee7 h 8app/src/main/java/net/micode/notes/tool/BackupUtils.java,a\4\a446c87b1013132f8adaf83656b582028e8809af +@ +local.properties,0\7\0712df971a99ac4d2fccb8e0fb19f377f3374cca +< + build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35 g 7app/src/main/java/net/micode/notes/ui/NoteEditText.java,5\0\503adcf2a0be1ecdb94a15efba4433b6589877b9 -k -;app/src/main/java/net/micode/notes/ui/NoteEditActivity.java,5\7\577f30d26378ec8a2bd2e4a43f3c79b3f04c402c +g +7app/src/main/java/net/micode/notes/ui/NoteItemData.java,0\8\08c35f02f11c35ae9ebf8db0a482054dfa1cf493 +l + - - - 短信 - 邮件 - - - %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/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml deleted file mode 100644 index 4417fb4..0000000 --- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ /dev/null @@ -1,174 +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\" - - LoginSetting - 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 password - 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 - countallNotes" - New Folder - Delete - Deselect all - Export text - Change folder name - Delete folder - View folder - Large - Medium - Font size - Small - Select font - Super - Enter check list - Move to folder - Parent folder - Leave check list - Read_note - 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/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index bf70214..8ce1ac0 100644 --- a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,22 @@ -#Tue Oct 25 23:37:02 CST 2022 -base.0=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Tue Nov 01 18:11:03 CST 2022 +path.4=15/classes.dex +path.3=13/classes.dex +path.2=12/classes.dex +path.1=11/classes.dex +path.6=5/classes.dex +path.5=4/classes.dex +path.0=0/classes.dex +base.4=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex +base.3=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex +base.2=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex +base.1=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex +base.0=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex +renamed.3=classes4.dex +renamed.2=classes3.dex +renamed.1=classes2.dex renamed.0=classes.dex -path.0=classes.dex +renamed.6=classes7.dex +renamed.5=classes6.dex +base.6=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex +renamed.4=classes5.dex +base.5=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 6a5e8d7..1904ff7 100644 Binary files a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeletingPassword.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeletingPassword.class index d8dcac2..9154733 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeletingPassword.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeletingPassword.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index 09dfc43..2aa5c76 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index 8da9eab..d78a9ba 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index eda8872..98f6c28 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index 801e7c1..a97b9e8 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index f9311c8..30ba112 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index e0addd3..a7efe89 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index f692648..a45e71b 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index 145e7cb..555b9d2 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index a3e6d35..baba660 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 221cabf..c834226 100644 --- a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,7 +20,7 @@ 20 android:versionName="0.1" > 21 22 D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml 24 android:targetSdkVersion="30" /> 24-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml diff --git a/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index d070e75..3132d86 100644 --- a/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -20,7 +20,7 @@ android:versionName="0.1" > diff --git a/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index d070e75..3132d86 100644 --- a/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -20,7 +20,7 @@ android:versionName="0.1" > diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat index 6cb2484..138d5be 100644 Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json index cae75f7..335a159 100644 --- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -1,398 +1,402 @@ [ { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_middle.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\xml_preferences.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\xml\\preferences.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_bar_bg.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_bar_bg.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_red.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_red.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_dropdown_menu.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_list_dropdown_menu.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_settings_header.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\settings_header.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_folder_list_item.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/folder_list_item.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\xml_searchable.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\xml\\searchable.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_selected.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/selected.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_yellow.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_activity_set_loginpassword.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\activity_set_loginpassword.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_sub_folder.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/sub_folder.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_footer_bg.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_footer_bg.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_up.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_clock.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/clock.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_dropdown_icon.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\dropdown_icon.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/raw_introduction.flat", - "source": "net.micode.notes.app-main-7:/raw/introduction" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_normal.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_normal.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_yellow.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_yellow.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_single.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_up.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\color_secondary_text_dark.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\color\\secondary_text_dark.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_blue.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_blue.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_down.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_green.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_green.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable_new_note.xml.flat", - "source": "net.micode.notes.app-main-7:/drawable/new_note.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_widget_2x.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/widget_2x.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\xml_widget_2x_info.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\xml\\widget_2x_info.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_widget_2x_info.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/widget_2x_info.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\color_primary_text_dark.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\color\\primary_text_dark.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_call_record_folder.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/call_record_folder.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_green.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_green.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/preferences.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_white.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_white.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_dialog_edit_text.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/dialog_edit_text.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_bar_bg.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_bar_bg.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_blue.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_blue.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_blue.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_blue.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_single.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_middle.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/color_secondary_text_dark.xml.flat", - "source": "net.micode.notes.app-main-7:/color/secondary_text_dark.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_note_edit_list_item.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\note_edit_list_item.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_widget_4x_info.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/widget_4x_info.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_yellow.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_yellow.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_up.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\raw_introduction.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\raw\\introduction" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_middle.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_color_btn_mask.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_single.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_yellow.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_yellow.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_middle.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_edit.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_down.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_down.9.png" + }, + { + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_call_record_folder.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\call_record_folder.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_widget_4x.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/widget_4x.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_footer_bg.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_footer_bg.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_green.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_green.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\xml_widget_4x_info.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\xml\\widget_4x_info.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_delete.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_delete.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_delete.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\delete.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_list.xml" + "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_edit.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_down.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_widget_2x.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\widget_2x.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_icon_app.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/icon_app.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_note_edit.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\note_edit.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_dropdown_icon.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/dropdown_icon.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_activity_delete_password.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\activity_delete_password.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_btn_set_color.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_btn_set_color.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_activity_login.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\activity_login.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_activity_delete_password.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/activity_delete_password.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_green.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_green.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_list.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_middle.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_list_footer.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_down.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_move.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_move.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_single.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_color_btn_mask.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_blue.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_blue.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_add_account_text.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/add_account_text.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_delete.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_delete.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_datetime_picker.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/datetime_picker.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\raw-zh-rCN_introduction.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\raw-zh-rCN\\introduction" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_super.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_super.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_account_dialog_title.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\account_dialog_title.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_single.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_yellow.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_yellow.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_clock.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\clock.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_delete.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/delete.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_middle.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_green.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_green.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_single.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_edit.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_widget_4x.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\widget_4x.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_account_dialog_title.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/account_dialog_title.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\note_list_options.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_call_record.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/call_record.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_call_record.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\call_record.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_up.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_folder.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_folder.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_yellow.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_yellow.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_single.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_activity_change_password.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\activity_change_password.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_notification.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/notification.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_selected.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\selected.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_down.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_note_list.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\note_list.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_pressed.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_pressed.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_size_selector_bg.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_white.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_white.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable_new_note.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable\\new_note.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_item.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_item.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_normal.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_settings_header.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/settings_header.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_up.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/note_edit_color_selector_panel.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_search_result.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\search_result.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_alert.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_alert.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_datetime_picker.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_red.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_red.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_white.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_white.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_large.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_large.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_yellow.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_middle.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_up.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_blue.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_blue.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_single.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_up.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_super.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_super.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_white.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_white.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_green.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_green.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_activity_set_loginpassword.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/activity_set_loginpassword.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\note_edit.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_up.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_blue.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_blue.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_white.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_white.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_move.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_move.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_white.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_white.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_small.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_small.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_down.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_up.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/raw-zh-rCN_introduction.flat", - "source": "net.micode.notes.app-main-7:/raw-zh-rCN/introduction" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_note_list_footer.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\note_list_footer.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_background.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_background.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_note_list.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\note_list.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_search_result.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/search_result.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_red.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_red.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_green.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_green.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_call_note_edit.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\call_note_edit.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_red.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_red.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_folder.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_folder.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_searchable.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/searchable.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_note_list_dropdown.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\note_list_dropdown.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_middle.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_normal.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_normal.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_middle.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_white.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_white.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_activity_change_password.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/activity_change_password.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_red.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_red.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_dropdown.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_list_dropdown.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_pressed.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_pressed.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_normal.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_normal.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit_list_item.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_edit_list_item.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_white.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_white.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_down.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_note_item.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\note_item.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_size_selector_bg.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_sub_folder.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\sub_folder.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_red.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_red.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_up.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_blue.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_blue.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_large.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_large.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_options.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_list_options.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_note_list_dropdown_menu.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_call_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/call_note_edit.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_blue.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_blue.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_single.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_red.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_red.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/color_primary_text_dark.xml.flat", - "source": "net.micode.notes.app-main-7:/color/primary_text_dark.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_down.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_activity_login.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/activity_login.xml" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_single.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_down.9.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_small.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_small.png" + "merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_down.9.png.flat", + "source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_down.9.png" } ] \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml index d070e75..3132d86 100644 --- a/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml +++ b/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml @@ -20,7 +20,7 @@ android:versionName="0.1" > diff --git a/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index d0abcc1..da07b3e 100644 Binary files a/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeletingPassword.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeletingPassword.dex index 63e36a3..8f6ee83 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeletingPassword.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeletingPassword.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index 4ad17ea..0e0baca 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex index 27be58b..38feb14 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index a75ce1e..09d7709 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index 972e5e2..698e5ab 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex index 590b37f..cd99b10 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index e012690..2a99add 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index cab857c..c45d4a7 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index 829ade1..bd5498e 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index 6dc1f6c..5ef2d67 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt index cfae870..a97ecf0 100644 --- a/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ b/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt @@ -147,16 +147,17 @@ int id prefenerece_sync_status_textview 0x7f050045 int id preference_sync_button 0x7f050046 int id selection_menu 0x7f050047 int id sv_note_edit 0x7f050048 -int id thepassword 0x7f050049 -int id tv_alert_date 0x7f05004a -int id tv_folder_name 0x7f05004b -int id tv_modified_date 0x7f05004c -int id tv_name 0x7f05004d -int id tv_time 0x7f05004e -int id tv_title 0x7f05004f -int id tv_title_bar 0x7f050050 -int id widget_bg_image 0x7f050051 -int id widget_text 0x7f050052 +int id text_num 0x7f050049 +int id thepassword 0x7f05004a +int id tv_alert_date 0x7f05004b +int id tv_folder_name 0x7f05004c +int id tv_modified_date 0x7f05004d +int id tv_name 0x7f05004e +int id tv_time 0x7f05004f +int id tv_title 0x7f050050 +int id tv_title_bar 0x7f050051 +int id widget_bg_image 0x7f050052 +int id widget_text 0x7f050053 int layout account_dialog_title 0x7f060000 int layout activity_change_password 0x7f060001 int layout activity_delete_password 0x7f060002 diff --git a/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt index 1d3586c..01d99c4 100644 --- a/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ b/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -1,109 +1,125 @@ -net.micode.notes:xml/searchable = 0x7f0c0001 -net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a -net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 -net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 -net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 -net.micode.notes:style/NoteTheme = 0x7f0b0003 -net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 -net.micode.notes:string/ticker_syncing = 0x7f0a0068 -net.micode.notes:string/ticker_success = 0x7f0a0067 +net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0059 +net.micode.notes:string/preferences_account_summary = 0x7f0a0049 +net.micode.notes:string/menu_select_all = 0x7f0a0037 +net.micode.notes:string/menu_select_none = 0x7f0a0038 net.micode.notes:string/ticker_fail = 0x7f0a0066 -net.micode.notes:string/ticker_cancel = 0x7f0a0065 -net.micode.notes:string/sync_progress_login = 0x7f0a0063 +net.micode.notes:drawable/list_yellow_single = 0x7f04002b +net.micode.notes:id/amPm = 0x7f050008 +net.micode.notes:string/ticker_success = 0x7f0a0067 net.micode.notes:string/success_sdcard_export = 0x7f0a0060 +net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 +net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 +net.micode.notes:string/error_sync_network = 0x7f0a0015 +net.micode.notes:string/info_note_enter_desktop = 0x7f0a0020 net.micode.notes:string/set_remind_time_message = 0x7f0a005f -net.micode.notes:string/search_hint = 0x7f0a005c -net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a005a -net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0059 -net.micode.notes:string/preferences_title = 0x7f0a0058 -net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0057 -net.micode.notes:string/preferences_menu_change_account = 0x7f0a0056 -net.micode.notes:string/preferences_menu_cancel = 0x7f0a0055 +net.micode.notes:string/menu_alert = 0x7f0a0021 +net.micode.notes:layout/note_edit_list_item = 0x7f06000a +net.micode.notes:dimen/text_font_size_normal = 0x7f030002 +net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0012 +net.micode.notes:id/menu_search = 0x7f050033 net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0054 +net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a +net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0057 +net.micode.notes:id/widget_text = 0x7f050053 +net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 +net.micode.notes:string/sync_progress_login = 0x7f0a0063 +net.micode.notes:drawable/widget_4x_yellow = 0x7f040041 net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a0051 +net.micode.notes:string/ticker_cancel = 0x7f0a0065 +net.micode.notes:menu/note_list = 0x7f070003 +net.micode.notes:string/preferences_menu_change_account = 0x7f0a0056 +net.micode.notes:id/tv_folder_name = 0x7f05004c +net.micode.notes:string/ticker_syncing = 0x7f0a0068 +net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a005a net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a0050 net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004f +net.micode.notes:layout/activity_login = 0x7f060003 +net.micode.notes:string/menu_font_large = 0x7f0a002a +net.micode.notes:id/tv_alert_date = 0x7f05004b net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a004e net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a004d -net.micode.notes:string/preferences_add_account = 0x7f0a004b net.micode.notes:string/preferences_account_title = 0x7f0a004a -net.micode.notes:string/preferences_account_summary = 0x7f0a0049 -net.micode.notes:string/widget_havenot_content = 0x7f0a0069 -net.micode.notes:string/notelist_string_info = 0x7f0a0048 +net.micode.notes:string/notealert_enter = 0x7f0a0045 +net.micode.notes:string/preferences_title = 0x7f0a0058 +net.micode.notes:string/note_alert_expired = 0x7f0a0040 net.micode.notes:string/notelist_menu_new = 0x7f0a0047 +net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 net.micode.notes:string/notealert_ok = 0x7f0a0046 -net.micode.notes:string/notealert_enter = 0x7f0a0045 +net.micode.notes:string/preferences_menu_cancel = 0x7f0a0055 +net.micode.notes:string/preferences_add_account = 0x7f0a004b +net.micode.notes:string/folder_exist = 0x7f0a0019 +net.micode.notes:string/note_link_other = 0x7f0a0042 net.micode.notes:string/note_link_web = 0x7f0a0044 net.micode.notes:string/sync_progress_init_list = 0x7f0a0062 net.micode.notes:string/note_link_tel = 0x7f0a0043 +net.micode.notes:string/menu_select_title = 0x7f0a0039 +net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000e net.micode.notes:string/note_link_email = 0x7f0a0041 -net.micode.notes:string/note_alert_expired = 0x7f0a0040 +net.micode.notes:string/menu_font_super = 0x7f0a002f net.micode.notes:string/menu_sync = 0x7f0a003d -net.micode.notes:string/menu_share = 0x7f0a003c -net.micode.notes:string/menu_select_title = 0x7f0a0039 -net.micode.notes:string/menu_select_none = 0x7f0a0038 -net.micode.notes:string/menu_select_all = 0x7f0a0037 +net.micode.notes:xml/preferences = 0x7f0c0000 +net.micode.notes:id/menu_export_text = 0x7f05002c net.micode.notes:string/menu_list_mode = 0x7f0a0030 -net.micode.notes:string/menu_font_super = 0x7f0a002f -net.micode.notes:string/menu_font_size = 0x7f0a002c -net.micode.notes:string/menu_font_large = 0x7f0a002a +net.micode.notes:layout/settings_header = 0x7f06000f +net.micode.notes:string/button_delete = 0x7f0a0008 net.micode.notes:string/menu_export_text = 0x7f0a0026 -net.micode.notes:string/menu_create_folder = 0x7f0a0023 -net.micode.notes:string/menu_alert = 0x7f0a0021 -net.micode.notes:string/info_note_enter_desktop = 0x7f0a0020 -net.micode.notes:string/hint_foler_name = 0x7f0a001f +net.micode.notes:string/search_hint = 0x7f0a005c net.micode.notes:string/format_folder_files_count = 0x7f0a001d +net.micode.notes:string/widget_havenot_content = 0x7f0a0069 +net.micode.notes:string/notelist_string_info = 0x7f0a0048 net.micode.notes:string/search_label = 0x7f0a005d net.micode.notes:string/format_exported_file_location = 0x7f0a001c -net.micode.notes:string/note_link_other = 0x7f0a0042 -net.micode.notes:string/folder_exist = 0x7f0a0019 +net.micode.notes:id/menu_new_note = 0x7f050031 net.micode.notes:string/file_path = 0x7f0a0018 -net.micode.notes:string/file_name_txt_format = 0x7f0a0017 -net.micode.notes:string/error_sync_network = 0x7f0a0015 net.micode.notes:string/menu_sync_cancel = 0x7f0a003e net.micode.notes:string/menu_send_to_desktop = 0x7f0a003a net.micode.notes:string/error_sync_internal = 0x7f0a0014 -net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0012 net.micode.notes:string/error_sdcard_export = 0x7f0a0011 -net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000e +net.micode.notes:string/menu_create_folder = 0x7f0a0023 +net.micode.notes:layout/note_item = 0x7f06000b +net.micode.notes:id/tv_name = 0x7f05004e +net.micode.notes:menu/call_record_folder = 0x7f070001 net.micode.notes:string/menu_setting = 0x7f0a003b net.micode.notes:string/delete_password = 0x7f0a000c +net.micode.notes:id/menu_delete_remind = 0x7f05002b net.micode.notes:string/datetime_dialog_ok = 0x7f0a000b -net.micode.notes:layout/settings_header = 0x7f06000f -net.micode.notes:string/button_delete = 0x7f0a0008 +net.micode.notes:string/datetime_dialog_cancel = 0x7f0a000a +net.micode.notes:id/menu_share = 0x7f050036 +net.micode.notes:string/app_widget4x4 = 0x7f0a0007 +net.micode.notes:string/file_name_txt_format = 0x7f0a0017 +net.micode.notes:id/menu_setting = 0x7f050035 +net.micode.notes:color/primary_text_dark = 0x7f020000 net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001e net.micode.notes:string/alert_message_delete_folder = 0x7f0a0001 +net.micode.notes:menu/note_edit = 0x7f070002 +net.micode.notes:layout/folder_list_item = 0x7f060008 net.micode.notes:string/LoginSetting = 0x7f0a0000 -net.micode.notes:drawable/list_blue_down = 0x7f040017 +net.micode.notes:string/hint_foler_name = 0x7f0a001f net.micode.notes:drawable/list_yellow_middle = 0x7f04002a net.micode.notes:id/iv_bg_red = 0x7f050018 -net.micode.notes:id/widget_bg_image = 0x7f050051 +net.micode.notes:id/widget_bg_image = 0x7f050052 net.micode.notes:menu/sub_folder = 0x7f070006 -net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c +net.micode.notes:drawable/list_blue_down = 0x7f040017 +net.micode.notes:xml/searchable = 0x7f0c0001 net.micode.notes:menu/note_list_options = 0x7f070005 -net.micode.notes:menu/note_list = 0x7f070003 +net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c +net.micode.notes:string/menu_font_size = 0x7f0a002c net.micode.notes:menu/call_note_edit = 0x7f070000 net.micode.notes:string/app_name = 0x7f0a0005 net.micode.notes:layout/widget_4x = 0x7f060011 -net.micode.notes:layout/folder_list_item = 0x7f060008 -net.micode.notes:menu/note_edit = 0x7f070002 net.micode.notes:string/menu_folder_view = 0x7f0a0029 -net.micode.notes:drawable/font_super = 0x7f040014 net.micode.notes:layout/note_list = 0x7f06000c -net.micode.notes:id/menu_share = 0x7f050036 -net.micode.notes:string/app_widget4x4 = 0x7f0a0007 -net.micode.notes:menu/call_record_folder = 0x7f070001 -net.micode.notes:id/tv_name = 0x7f05004d -net.micode.notes:layout/note_item = 0x7f06000b -net.micode.notes:dimen/text_font_size_normal = 0x7f030002 -net.micode.notes:layout/note_edit_list_item = 0x7f06000a +net.micode.notes:drawable/font_super = 0x7f040014 +net.micode.notes:string/menu_share = 0x7f0a003c net.micode.notes:layout/datetime_picker = 0x7f060006 net.micode.notes:id/menu_font_select = 0x7f05002d net.micode.notes:string/alert_message_delete_note = 0x7f0a0002 -net.micode.notes:drawable/new_note_pressed = 0x7f040031 -net.micode.notes:layout/dialog_edit_text = 0x7f060007 net.micode.notes:layout/activity_set_loginpassword = 0x7f060004 -net.micode.notes:layout/activity_login = 0x7f060003 +net.micode.notes:layout/dialog_edit_text = 0x7f060007 +net.micode.notes:drawable/new_note_pressed = 0x7f040031 +net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001 +net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 +net.micode.notes:drawable/widget_4x_white = 0x7f040040 net.micode.notes:id/menu_new_folder = 0x7f050030 net.micode.notes:layout/activity_delete_password = 0x7f060002 net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 @@ -111,42 +127,36 @@ net.micode.notes:layout/account_dialog_title = 0x7f060000 net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a0052 net.micode.notes:drawable/list_green_up = 0x7f040020 net.micode.notes:layout/add_account_text = 0x7f060005 -net.micode.notes:id/widget_text = 0x7f050052 +net.micode.notes:id/tv_title_bar = 0x7f050051 net.micode.notes:menu/note_list_dropdown = 0x7f070004 net.micode.notes:id/iv_bg_blue_select = 0x7f050015 -net.micode.notes:id/tv_title_bar = 0x7f050050 -net.micode.notes:id/tv_folder_name = 0x7f05004b -net.micode.notes:id/tv_alert_date = 0x7f05004a net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032 -net.micode.notes:id/thepassword = 0x7f050049 +net.micode.notes:id/thepassword = 0x7f05004a net.micode.notes:string/menu_folder_change_name = 0x7f0a0027 net.micode.notes:id/sv_note_edit = 0x7f050048 net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050045 net.micode.notes:drawable/list_folder = 0x7f04001b net.micode.notes:id/password_ack = 0x7f050044 net.micode.notes:id/old_password = 0x7f050042 -net.micode.notes:id/iv_bg_yellow_select = 0x7f05001d net.micode.notes:id/note_edit_view = 0x7f05003e -net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000f +net.micode.notes:id/iv_bg_yellow_select = 0x7f05001d net.micode.notes:id/LoginSetting = 0x7f050002 -net.micode.notes:drawable/font_small = 0x7f040013 net.micode.notes:id/note_bg_color_selector = 0x7f05003c +net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000f +net.micode.notes:drawable/font_small = 0x7f040013 net.micode.notes:id/navigation_bar = 0x7f05003a net.micode.notes:raw/introduction = 0x7f090000 net.micode.notes:id/move = 0x7f050039 net.micode.notes:id/ll_font_normal = 0x7f050024 net.micode.notes:id/minute = 0x7f050038 net.micode.notes:id/menu_sync = 0x7f050037 -net.micode.notes:color/primary_text_dark = 0x7f020000 -net.micode.notes:id/menu_setting = 0x7f050035 -net.micode.notes:id/menu_search = 0x7f050033 net.micode.notes:id/account_dialog_subtitle = 0x7f050003 net.micode.notes:id/menu_read_note = 0x7f050032 -net.micode.notes:id/menu_new_note = 0x7f050031 net.micode.notes:layout/note_list_footer = 0x7f06000e -net.micode.notes:id/iv_bg_green = 0x7f050016 -net.micode.notes:id/tv_time = 0x7f05004e net.micode.notes:id/menu_alert = 0x7f050028 +net.micode.notes:id/iv_bg_green = 0x7f050016 +net.micode.notes:id/tv_time = 0x7f05004f +net.micode.notes:layout/activity_change_password = 0x7f060001 net.micode.notes:string/error_sync_cancelled = 0x7f0a0013 net.micode.notes:id/login = 0x7f050027 net.micode.notes:id/et_foler_name = 0x7f050010 @@ -156,43 +166,33 @@ net.micode.notes:drawable/widget_2x_white = 0x7f04003b net.micode.notes:id/iv_medium_select = 0x7f05001f net.micode.notes:string/menu_font_normal = 0x7f0a002b net.micode.notes:id/new_password = 0x7f05003b -net.micode.notes:string/format_date_ymd = 0x7f0a001a +net.micode.notes:id/iv_large_select = 0x7f05001e net.micode.notes:layout/note_list_dropdown_menu = 0x7f06000d net.micode.notes:id/ll_font_super = 0x7f050026 -net.micode.notes:id/iv_large_select = 0x7f05001e +net.micode.notes:string/format_date_ymd = 0x7f0a001a net.micode.notes:string/menu_search = 0x7f0a0036 net.micode.notes:string/alert_title_delete = 0x7f0a0004 -net.micode.notes:string/success_sync_account = 0x7f0a0061 net.micode.notes:id/iv_bg_white = 0x7f05001a -net.micode.notes:layout/activity_change_password = 0x7f060001 +net.micode.notes:string/success_sync_account = 0x7f0a0061 net.micode.notes:id/delete_password = 0x7f05000e net.micode.notes:drawable/list_blue_up = 0x7f04001a net.micode.notes:id/date = 0x7f05000c -net.micode.notes:id/menu_delete_remind = 0x7f05002b -net.micode.notes:string/search = 0x7f0a005b net.micode.notes:string/menu_deselect_all = 0x7f0a0025 +net.micode.notes:string/search = 0x7f0a005b net.micode.notes:id/font_size_selector = 0x7f050011 net.micode.notes:id/notes_list = 0x7f050041 +net.micode.notes:id/btn_set_bg_color = 0x7f05000a net.micode.notes:id/iv_bg_red_select = 0x7f050019 net.micode.notes:id/et_edit_text = 0x7f05000f net.micode.notes:id/iv_bg_yellow = 0x7f05001c -net.micode.notes:id/btn_set_bg_color = 0x7f05000a -net.micode.notes:drawable/list_yellow_single = 0x7f04002b -net.micode.notes:id/amPm = 0x7f050008 net.micode.notes:string/menu_move = 0x7f0a0031 net.micode.notes:id/action_select_all = 0x7f050007 -net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 net.micode.notes:id/acknowledge = 0x7f050006 -net.micode.notes:xml/preferences = 0x7f0c0000 -net.micode.notes:id/menu_export_text = 0x7f05002c -net.micode.notes:drawable/widget_4x_yellow = 0x7f040041 +net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 net.micode.notes:string/menu_move_parent_folder = 0x7f0a0032 net.micode.notes:string/failed_sdcard_export = 0x7f0a0016 net.micode.notes:id/account_dialog_title = 0x7f050004 net.micode.notes:id/ack_password = 0x7f050005 -net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 -net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001 -net.micode.notes:drawable/widget_4x_white = 0x7f040040 net.micode.notes:id/ll_font_large = 0x7f050023 net.micode.notes:drawable/list_red_single = 0x7f040023 net.micode.notes:drawable/edit_blue = 0x7f040006 @@ -263,8 +263,7 @@ net.micode.notes:id/password = 0x7f050043 net.micode.notes:string/format_datetime_mdhm = 0x7f0a001b net.micode.notes:id/menu_send_to_desktop = 0x7f050034 net.micode.notes:drawable/search_result = 0x7f040034 -net.micode.notes:string/datetime_dialog_cancel = 0x7f0a000a -net.micode.notes:id/tv_modified_date = 0x7f05004c +net.micode.notes:id/tv_modified_date = 0x7f05004d net.micode.notes:string/menu_font_small = 0x7f0a002d net.micode.notes:drawable/font_large = 0x7f040010 net.micode.notes:id/iv_alert_icon = 0x7f050013 @@ -280,13 +279,15 @@ net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002 net.micode.notes:string/search_setting_description = 0x7f0a005e net.micode.notes:id/menu_list_mode = 0x7f05002f net.micode.notes:dimen/text_font_size_medium = 0x7f030001 +net.micode.notes:style/NoteTheme = 0x7f0b0003 +net.micode.notes:id/text_num = 0x7f050049 net.micode.notes:id/iv_small_select = 0x7f050020 net.micode.notes:string/widget_under_visit_mode = 0x7f0a006a net.micode.notes:color/user_query_highlight = 0x7f020002 net.micode.notes:drawable/edit_red = 0x7f040008 net.micode.notes:drawable/edit_green = 0x7f040007 net.micode.notes:string/app_widget2x2 = 0x7f0a0006 -net.micode.notes:id/tv_title = 0x7f05004f +net.micode.notes:id/tv_title = 0x7f050050 net.micode.notes:drawable/delete = 0x7f040004 net.micode.notes:string/menu_countallNotes = 0x7f0a0022 net.micode.notes:drawable/edit_title_green = 0x7f04000a diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 020192d..ece3d7c 100644 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 39339b2..e6e777a 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -31,9 +31,11 @@ import android.graphics.Paint; import android.graphics.Typeface; import android.os.Bundle; import android.preference.PreferenceManager; +import android.text.Editable; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; +import android.text.TextWatcher; import android.text.format.DateUtils; import android.text.style.BackgroundColorSpan; import android.util.Log; @@ -168,6 +170,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, return; } initResources(); + count(); } /** @@ -958,4 +961,57 @@ public class NoteEditActivity extends Activity implements OnClickListener, private void TextToSpeech(){ mTTS.speak(mNoteEditor.getText().toString(),TextToSpeech.QUEUE_FLUSH,null,null); } -} \ No newline at end of file + private EditText editText; + private TextView textView; + + private String Textchange(String oriText){ + StringBuffer stringBuffer = new StringBuffer(oriText); + int Flag1 = -1; + int Flag2 = -1; + do {//不计入表示图片的字符 + Flag1 = stringBuffer.indexOf(""); + 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() { + editText = (EditText) findViewById(R.id.note_edit_view); + textView = (TextView) findViewById(R.id.text_num); + mNoteEditor.addTextChangedListener(new TextWatcher() { + int currentLength = 0; + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + textView.setText("字数：" + currentLength); + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + currentLength = Textchange(mNoteEditor.getText().toString()).length(); + } + + @Override + public void afterTextChanged(Editable s) { + textView.setText("字数：" + currentLength); + } + }); + } +} diff --git a/src/Notes-master/app/src/main/res/layout/note_edit.xml b/src/Notes-master/app/src/main/res/layout/note_edit.xml index 10b2aa7..c0bbfe0 100644 --- a/src/Notes-master/app/src/main/res/layout/note_edit.xml +++ b/src/Notes-master/app/src/main/res/layout/note_edit.xml @@ -40,6 +40,8 @@ android:layout_marginRight="8dip" android:textAppearance="@style/TextAppearanceSecondaryItem" /> + + + + + android:layout_height="30dp" + android:layout_gravity="top|right" + android:background="@drawable/bg_color_btn_mask" /> + \ No newline at end of file diff --git a/src/Notes-master/build.gradle b/src/Notes-master/build.gradle index fe65808..00890e6 100644 --- a/src/Notes-master/build.gradle +++ b/src/Notes-master/build.gradle @@ -29,4 +29,21 @@ allprojects { } } +} +sonarqube { + properties { + //Sonar服务器地址 + property "sonar.host.url", "http://localhost:9000" + //Token模式 //可选择该该模式 + property "sonar.login","18da3f843a86bed9c897e19479c01463db9cc796"//你的Token + //账号密码模式 + property "sonar.login","admin" + property "sonar.password","tsc123456" //XXX为你的密码 + property "sonar.sourceEncoding", "UTF-8" + property "sonar.projectKey", "XiaoMi_Notes"//你的项目名字 + property "sonar.projectName", project.name + //需要扫描的上传检测代码的模块，可以选择也可以配置哪一些需要或者不需要上传的模块(这里指APP模块下面的java包里面的全部) + property "sonar.sources", "src/main/java" + property "sonar.projectVersion", project.version + } } \ No newline at end of file