diff --git a/.gradle/8.0/checksums/checksums.lock b/.gradle/8.0/checksums/checksums.lock deleted file mode 100644 index 038d584..0000000 Binary files a/.gradle/8.0/checksums/checksums.lock and /dev/null differ diff --git a/.gradle/8.0/checksums/md5-checksums.bin b/.gradle/8.0/checksums/md5-checksums.bin deleted file mode 100644 index 4f30393..0000000 Binary files a/.gradle/8.0/checksums/md5-checksums.bin and /dev/null differ diff --git a/.gradle/8.0/checksums/sha1-checksums.bin b/.gradle/8.0/checksums/sha1-checksums.bin deleted file mode 100644 index 6c086c4..0000000 Binary files a/.gradle/8.0/checksums/sha1-checksums.bin and /dev/null differ diff --git a/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock b/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock deleted file mode 100644 index aec7aa0..0000000 Binary files a/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock and /dev/null differ diff --git a/.gradle/8.0/executionHistory/executionHistory.bin b/.gradle/8.0/executionHistory/executionHistory.bin deleted file mode 100644 index 5683c98..0000000 Binary files a/.gradle/8.0/executionHistory/executionHistory.bin and /dev/null differ diff --git a/.gradle/8.0/executionHistory/executionHistory.lock b/.gradle/8.0/executionHistory/executionHistory.lock deleted file mode 100644 index abf208f..0000000 Binary files a/.gradle/8.0/executionHistory/executionHistory.lock and /dev/null differ diff --git a/.gradle/8.0/fileHashes/fileHashes.bin b/.gradle/8.0/fileHashes/fileHashes.bin deleted file mode 100644 index c916269..0000000 Binary files a/.gradle/8.0/fileHashes/fileHashes.bin and /dev/null differ diff --git a/.gradle/8.0/fileHashes/fileHashes.lock b/.gradle/8.0/fileHashes/fileHashes.lock deleted file mode 100644 index a163fb2..0000000 Binary files a/.gradle/8.0/fileHashes/fileHashes.lock and /dev/null differ diff --git a/.gradle/8.4/checksums/checksums.lock b/.gradle/8.4/checksums/checksums.lock new file mode 100644 index 0000000..4296696 Binary files /dev/null and b/.gradle/8.4/checksums/checksums.lock differ diff --git a/.gradle/8.4/checksums/sha1-checksums.bin b/.gradle/8.4/checksums/sha1-checksums.bin new file mode 100644 index 0000000..846b0e7 Binary files /dev/null and b/.gradle/8.4/checksums/sha1-checksums.bin differ diff --git a/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock b/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock new file mode 100644 index 0000000..fbe541d Binary files /dev/null and b/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock differ diff --git a/.gradle/8.0/dependencies-accessors/gc.properties b/.gradle/8.4/dependencies-accessors/gc.properties similarity index 100% rename from .gradle/8.0/dependencies-accessors/gc.properties rename to .gradle/8.4/dependencies-accessors/gc.properties diff --git a/.gradle/8.0/fileChanges/last-build.bin b/.gradle/8.4/fileChanges/last-build.bin similarity index 100% rename from .gradle/8.0/fileChanges/last-build.bin rename to .gradle/8.4/fileChanges/last-build.bin diff --git a/.gradle/8.4/fileHashes/fileHashes.lock b/.gradle/8.4/fileHashes/fileHashes.lock new file mode 100644 index 0000000..66cd84f Binary files /dev/null and b/.gradle/8.4/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.0/gc.properties b/.gradle/8.4/gc.properties similarity index 100% rename from .gradle/8.0/gc.properties rename to .gradle/8.4/gc.properties diff --git a/.gradle/8.6/checksums/checksums.lock b/.gradle/8.6/checksums/checksums.lock new file mode 100644 index 0000000..fdb6601 Binary files /dev/null and b/.gradle/8.6/checksums/checksums.lock differ diff --git a/.gradle/8.6/checksums/md5-checksums.bin b/.gradle/8.6/checksums/md5-checksums.bin new file mode 100644 index 0000000..ec489a7 Binary files /dev/null and b/.gradle/8.6/checksums/md5-checksums.bin differ diff --git a/.gradle/8.6/checksums/sha1-checksums.bin b/.gradle/8.6/checksums/sha1-checksums.bin new file mode 100644 index 0000000..9cd4b83 Binary files /dev/null and b/.gradle/8.6/checksums/sha1-checksums.bin differ diff --git a/.gradle/8.6/dependencies-accessors/gc.properties b/.gradle/8.6/dependencies-accessors/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/8.6/executionHistory/executionHistory.bin b/.gradle/8.6/executionHistory/executionHistory.bin new file mode 100644 index 0000000..39f3c51 Binary files /dev/null and b/.gradle/8.6/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.6/executionHistory/executionHistory.lock b/.gradle/8.6/executionHistory/executionHistory.lock new file mode 100644 index 0000000..f06eb04 Binary files /dev/null and b/.gradle/8.6/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.6/fileChanges/last-build.bin b/.gradle/8.6/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/.gradle/8.6/fileChanges/last-build.bin differ diff --git a/.gradle/8.6/fileHashes/fileHashes.bin b/.gradle/8.6/fileHashes/fileHashes.bin new file mode 100644 index 0000000..811637b Binary files /dev/null and b/.gradle/8.6/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.6/fileHashes/fileHashes.lock b/.gradle/8.6/fileHashes/fileHashes.lock new file mode 100644 index 0000000..c7de9b9 Binary files /dev/null and b/.gradle/8.6/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.6/fileHashes/resourceHashesCache.bin b/.gradle/8.6/fileHashes/resourceHashesCache.bin new file mode 100644 index 0000000..f1a9ff2 Binary files /dev/null and b/.gradle/8.6/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/8.6/gc.properties b/.gradle/8.6/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/8.7/checksums/checksums.lock b/.gradle/8.7/checksums/checksums.lock new file mode 100644 index 0000000..0fb576f Binary files /dev/null and b/.gradle/8.7/checksums/checksums.lock differ diff --git a/.gradle/8.7/checksums/md5-checksums.bin b/.gradle/8.7/checksums/md5-checksums.bin new file mode 100644 index 0000000..19a57ea Binary files /dev/null and b/.gradle/8.7/checksums/md5-checksums.bin differ diff --git a/.gradle/8.7/checksums/sha1-checksums.bin b/.gradle/8.7/checksums/sha1-checksums.bin new file mode 100644 index 0000000..02d31f6 Binary files /dev/null and b/.gradle/8.7/checksums/sha1-checksums.bin differ diff --git a/.gradle/8.7/dependencies-accessors/gc.properties b/.gradle/8.7/dependencies-accessors/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/8.7/executionHistory/executionHistory.lock b/.gradle/8.7/executionHistory/executionHistory.lock new file mode 100644 index 0000000..8a3741c Binary files /dev/null and b/.gradle/8.7/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.7/fileChanges/last-build.bin b/.gradle/8.7/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/.gradle/8.7/fileChanges/last-build.bin differ diff --git a/.gradle/8.7/fileHashes/fileHashes.bin b/.gradle/8.7/fileHashes/fileHashes.bin new file mode 100644 index 0000000..b6048f8 Binary files /dev/null and b/.gradle/8.7/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.7/fileHashes/fileHashes.lock b/.gradle/8.7/fileHashes/fileHashes.lock new file mode 100644 index 0000000..cff7abe Binary files /dev/null and b/.gradle/8.7/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.0/fileHashes/resourceHashesCache.bin b/.gradle/8.7/fileHashes/resourceHashesCache.bin similarity index 81% rename from .gradle/8.0/fileHashes/resourceHashesCache.bin rename to .gradle/8.7/fileHashes/resourceHashesCache.bin index 5300c6c..dabeb0e 100644 Binary files a/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/.gradle/8.7/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/8.7/gc.properties b/.gradle/8.7/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 1240f80..868e950 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties index 67c94f7..77a867a 100644 --- a/.gradle/buildOutputCleanup/cache.properties +++ b/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Mon Sep 25 19:53:35 CST 2023 -gradle.version=8.0 +#Wed May 15 01:28:25 CST 2024 +gradle.version=8.6 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index c7a854f..0367e9d 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/config.properties b/.gradle/config.properties new file mode 100644 index 0000000..1aaad75 --- /dev/null +++ b/.gradle/config.properties @@ -0,0 +1,2 @@ +#Wed Dec 20 23:17:28 CST 2023 +java.home=C\:\\Users\\Lenovo\\AppData\\Local\\Programs\\Android Studio\\jbr diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 5094d8b..30d8f29 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..0c0c338 --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ae388c2..0897082 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,16 +4,15 @@ diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml new file mode 100644 index 0000000..eabda06 --- /dev/null +++ b/.idea/runConfigurations/app.xml @@ -0,0 +1,68 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..6a25385 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e0d9493..e6b1837 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,12 +2,14 @@ apply plugin: 'com.android.application' android { namespace "net.micode.notes" - compileSdkVersion 30 + compileSdkVersion 34 buildToolsVersion "34.0.0" + useLibrary 'org.apache.http.legacy' defaultConfig { applicationId "net.micode.notes" minSdkVersion 14 + //noinspection ExpiredTargetSdkVersion targetSdkVersion 29 } @@ -18,3 +20,4 @@ android { } } } + diff --git a/app/build/intermediates/apk/debug/app-debug.apk b/app/build/intermediates/apk/debug/app-debug.apk index f38c4e3..4aac207 100644 Binary files a/app/build/intermediates/apk/debug/app-debug.apk and b/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/app/build/intermediates/app_metadata/debug/app-metadata.properties b/app/build/intermediates/app_metadata/debug/app-metadata.properties index 687af7d..1ca1a4c 100644 --- a/app/build/intermediates/app_metadata/debug/app-metadata.properties +++ b/app/build/intermediates/app_metadata/debug/app-metadata.properties @@ -1,2 +1,2 @@ appMetadataVersion=1.1 -androidGradlePluginVersion=8.1.1 +androidGradlePluginVersion=8.2.2 diff --git a/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index b894c6e..e22e412 100644 Binary files a/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 15a8799..52c2066 100644 Binary files a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 3d0c2c1..349c270 100644 Binary files a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index cb8bfc2..ac9ae63 100644 --- a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,9 +1,11 @@ -#Mon Oct 02 22:46:47 CST 2023 +#Sat May 18 18:31:47 CST 2024 net.micode.notes.app-main-6\:/color/primary_text_dark.xml=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/bck.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bck.png.flat net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat net.micode.notes.app-main-6\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat net.micode.notes.app-main-6\:/drawable-hdpi/call_record.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/chock.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_chock.png.flat net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat net.micode.notes.app-main-6\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat @@ -54,6 +56,7 @@ net.micode.notes.app-main-6\:/drawable-hdpi/note_edit_color_selector_panel.png=C net.micode.notes.app-main-6\:/drawable-hdpi/notification.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat net.micode.notes.app-main-6\:/drawable-hdpi/search_result.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat net.micode.notes.app-main-6\:/drawable-hdpi/selected.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/sky.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_sky.png.flat net.micode.notes.app-main-6\:/drawable-hdpi/title_alert.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat net.micode.notes.app-main-6\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat @@ -66,6 +69,7 @@ net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\Leno net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/xiaomei.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_xiaomei.png.flat net.micode.notes.app-main-6\:/drawable/new_note.xml=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat net.micode.notes.app-main-6\:/layout/add_account_text.xml=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml deleted file mode 100644 index d65e0cc..0000000 --- a/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/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml deleted file mode 100644 index 226b5bc..0000000 --- a/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/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml deleted file mode 100644 index e49b0c3..0000000 --- a/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/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index 4727b9e..9c1b4e5 100644 --- a/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -7,11 +7,12 @@ Messaging Email - #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txtsecret modelquit secret model(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel %1$s result for \"%2$s\" %1$s results for \"%2$s\" - 短信 邮件 - 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图私密模式退出私密模式新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 %1$s 条符合“%2$s”的搜索结果 短信 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾私密模式退出私密模式新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 %1$s 條符合”%2$s“的搜尋結果 - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties index 25e9721..7e47168 100644 --- a/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties +++ b/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties @@ -1,9 +1,11 @@ -#Mon Oct 02 22:46:49 CST 2023 +#Sat May 18 18:31:47 CST 2024 net.micode.notes.app-main-5\:/color/primary_text_dark.xml=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml +net.micode.notes.app-main-5\:/drawable-hdpi/bck.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bck.png net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png +net.micode.notes.app-main-5\:/drawable-hdpi/chock.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\chock.png net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png @@ -54,6 +56,7 @@ net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=C net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png +net.micode.notes.app-main-5\:/drawable-hdpi/sky.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\sky.png net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png @@ -66,6 +69,7 @@ net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\Leno net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png +net.micode.notes.app-main-5\:/drawable-hdpi/xiaomei.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\xiaomei.png net.micode.notes.app-main-5\:/drawable/new_note.xml=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml net.micode.notes.app-main-5\:/layout/add_account_text.xml=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml diff --git a/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml deleted file mode 100644 index d65e0cc..0000000 --- a/app/build/intermediates/incremental/debug/packageDebugResources/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/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml deleted file mode 100644 index 226b5bc..0000000 --- a/app/build/intermediates/incremental/debug/packageDebugResources/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/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml b/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml deleted file mode 100644 index e49b0c3..0000000 --- a/app/build/intermediates/incremental/debug/packageDebugResources/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/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml index 4727b9e..9c1b4e5 100644 --- a/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml +++ b/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml @@ -7,11 +7,12 @@ Messaging Email - #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txtsecret modelquit secret model(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel %1$s result for \"%2$s\" %1$s results for \"%2$s\" - 短信 邮件 - 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图私密模式退出私密模式新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 %1$s 条符合“%2$s”的搜索结果 短信 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾私密模式退出私密模式新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 %1$s 條符合”%2$s“的搜尋結果 - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index d48bb91..f900149 100644 --- a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Mon Oct 02 22:46:54 CST 2023 +#Sat May 18 18:31:48 CST 2024 base.0=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex path.0=classes.dex renamed.0=classes.dex diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index b0cceb6..9169bcc 100644 Binary files a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/DefaultHttpClient.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/DefaultHttpClient.class new file mode 100644 index 0000000..bf8c732 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/DefaultHttpClient.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class index 771aa91..abbf211 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index f1ba220..1ceb678 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class new file mode 100644 index 0000000..aa1d670 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class new file mode 100644 index 0000000..9c5639e Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class new file mode 100644 index 0000000..bbdd6fc Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class new file mode 100644 index 0000000..f72b91a Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index 76c0c9d..bc780d6 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index 0fd6977..82f914b 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index 0468652..46303ff 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index 54fa572..757f94d 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index 062ecb5..f463311 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index c217873..113ea13 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index d3dbb60..18093f1 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index 8f0a21b..1c7ffc0 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index 127437f..6f8caef 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class index 2edab7b..3774a29 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class index 3981f16..e0b44ff 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class index 99e161f..5e68562 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index f249e33..70b4274 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class index 81f06d3..1e7b9f0 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index 3d4e8b1..2b17032 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 83dc6c8..fa54e47 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/app/build/intermediates/local_only_symbol_list/debug/R-def.txt b/app/build/intermediates/local_only_symbol_list/debug/R-def.txt index 5bec0cd..ed0e37b 100644 --- a/app/build/intermediates/local_only_symbol_list/debug/R-def.txt +++ b/app/build/intermediates/local_only_symbol_list/debug/R-def.txt @@ -10,9 +10,11 @@ dimen text_font_size_medium dimen text_font_size_normal dimen text_font_size_small dimen text_font_size_super +drawable bck drawable bg_btn_set_color drawable bg_color_btn_mask drawable call_record +drawable chock drawable clock drawable delete drawable dropdown_icon @@ -64,6 +66,7 @@ drawable note_edit_color_selector_panel drawable notification drawable search_result drawable selected +drawable sky drawable title_alert drawable title_bar_bg drawable widget_2x_blue @@ -76,6 +79,7 @@ drawable widget_4x_green drawable widget_4x_red drawable widget_4x_white drawable widget_4x_yellow +drawable xiaomei id account_dialog_subtitle id account_dialog_title id action_select_all @@ -109,6 +113,8 @@ id ll_font_normal id ll_font_small id ll_font_super id menu_alert +id menu_bck +id menu_chock id menu_delete id menu_delete_remind id menu_export_text @@ -116,11 +122,15 @@ id menu_font_size id menu_list_mode id menu_new_folder id menu_new_note +id menu_quit_secret id menu_search +id menu_secret id menu_send_to_desktop id menu_setting id menu_share +id menu_sky id menu_sync +id menu_xiaomei id minute id move id navigation_bar @@ -198,6 +208,8 @@ string format_move_notes_to_folder string hint_foler_name string info_note_enter_desktop string menu_alert +string menu_bck +string menu_chock string menu_create_folder string menu_delete string menu_deselect_all @@ -214,17 +226,21 @@ string menu_list_mode string menu_move string menu_move_parent_folder string menu_normal_mode +string menu_quit_secret string menu_remove_remind string menu_search +string menu_secret string menu_select_all string menu_select_none string menu_select_title string menu_send_to_desktop string menu_setting string menu_share +string menu_sky string menu_sync string menu_sync_cancel string menu_title_select_folder +string menu_xiaomei string note_alert_expired string note_link_email string note_link_other diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_bck.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_bck.png.flat new file mode 100644 index 0000000..a219467 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_bck.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_chock.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_chock.png.flat new file mode 100644 index 0000000..66068f5 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_chock.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_sky.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_sky.png.flat new file mode 100644 index 0000000..1a734d4 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_sky.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_xiaomei.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_xiaomei.png.flat new file mode 100644 index 0000000..750d65a Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_xiaomei.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat index 8f48256..0dd3545 100644 Binary files a/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat and b/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat index 4316da7..e64ecad 100644 Binary files a/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and b/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat b/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat index ad66757..0f7184c 100644 Binary files a/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat and b/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat index 4e7bd33..cb8501b 100644 Binary files a/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ diff --git a/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat index 0e5932b..573cb6e 100644 Binary files a/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat and b/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ diff --git a/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/app/build/intermediates/merged_res/debug/values_values.arsc.flat index 40e69d2..1b1fdcc 100644 Binary files a/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index ad49c6d..2144c1c 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,50 +1,7 @@ { "logs": [ { - "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ - { - "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" - } - }, - { - "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat", + "outputFile": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\values_values.arsc.flat", "map": [ { "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", @@ -68,20 +25,20 @@ { "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" + "startLines": "130,74,77,76,75,19,20,21,120,121,129,128,26,83,84,82,81,80,96,95,94,86,39,38,66,29,30,87,43,78,122,73,69,44,50,55,45,65,64,63,59,58,56,57,60,61,51,72,62,42,70,49,41,54,53,52,68,48,67,46,47,71,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8208,4077,4338,4242,4173,827,870,922,7706,7755,8150,8099,1282,4792,4886,4721,4637,4554,5753,5670,5568,5062,2025,1953,3576,1486,1539,5123,2255,4421,7818,4006,3761,2335,2650,2951,2393,3505,3444,3387,3165,3113,3010,3063,3215,3265,2697,3940,3325,2192,3810,2603,2139,2896,2808,2750,3699,2553,3654,2450,2493,3873,1431,1750,1858,1703,1805,1647,1599,1227,1174,6209,6142,6471,7609,6835,6754,6909,6998,7240,7161,6293,6368,6695,6535,6615,6087,7384,7506,8058,7931,7874,7984,1366,4994,5482,5888,5819,5968,5423,5368,5306,5246,974,1084", + "endLines": "135,74,77,76,75,19,20,21,120,121,129,128,26,83,84,82,81,80,96,95,94,86,39,38,66,29,30,87,43,78,122,73,69,44,50,55,45,65,64,63,59,58,56,57,60,61,51,72,62,42,70,49,41,54,53,52,68,48,67,46,47,71,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,82,71,77,52,59,104,79,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,102,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8621,4168,4416,4333,4237,865,917,969,7750,7813,8203,8145,1361,4881,4989,4787,4716,4632,5814,5748,5665,5118,2103,2020,3649,1534,1594,5223,2330,4518,7868,4072,3805,2388,2692,3005,2445,3571,3500,3439,3210,3160,3058,3108,3260,3320,2745,4001,3382,2250,3868,2645,2187,2946,2891,2803,3756,2598,3694,2488,2548,3935,1481,1800,1906,1745,1853,1698,1642,1277,1222,6288,6204,6530,7700,6904,6830,6993,7156,7379,7235,6363,6466,6749,6610,6690,6137,7501,7604,8094,7979,7926,8053,1426,5057,5563,5963,5883,6057,5477,5418,5363,5301,1079,1169" }, "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + "startLines": "18,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1101,1197,1280,1376,1445,1488,1540,1592,1641,1704,1762,1813,1897,1991,2099,2170,2254,2337,2403,2486,2588,2649,2732,2804,2882,2935,2995,3100,3180,3282,3337,3408,3457,3515,3562,3621,3678,3749,3810,3867,3917,3969,4022,4072,4122,4182,4235,4301,4363,4426,4489,4536,4589,4644,4732,4790,4852,4902,4947,4990,5050,5117,5172,5227,5280,5327,5380,5436,5484,5539,5592,5676,5743,5807,5903,5977,6058,6147,6310,6454,6533,6608,6711,6770,6850,6930,6985,7107,7210,7251,7304,7361,7435,7500,7568,7654,7734,7803,7897,7956,8011,8073,8133,8243", + "endLines": "23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,82,71,77,52,59,104,79,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,102,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1096,1192,1275,1371,1440,1483,1535,1587,1636,1699,1757,1808,1892,1986,2094,2165,2249,2332,2398,2481,2583,2644,2727,2799,2877,2930,2990,3095,3175,3277,3332,3403,3452,3510,3557,3616,3673,3744,3805,3862,3912,3964,4017,4067,4117,4177,4230,4296,4358,4421,4484,4531,4584,4639,4727,4785,4847,4897,4942,4985,5045,5112,5167,5222,5275,5322,5375,5431,5479,5534,5587,5671,5738,5802,5898,5972,6053,6142,6305,6449,6528,6603,6706,6765,6845,6925,6980,7102,7205,7246,7299,7356,7430,7495,7563,7649,7729,7798,7892,7951,8006,8068,8128,8238,8328" } }, { @@ -109,15 +66,15 @@ "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", "endLines": "53,58,67,62,25,29,33,38,43,21,48", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + "endOffsets": "2261,2473,2846,2634,1073,1258,1443,1647,1854,890,2056" }, "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startLines": "128,132,136,140,143,147,151,155,159,163,167", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "startOffsets": "8333,8537,8748,8958,9118,9301,9486,9671,9874,10080,10263", + "endLines": "131,135,139,142,146,150,154,158,162,166,170", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + "endOffsets": "8532,8743,8953,9113,9296,9481,9666,9869,10075,10258,10459" } }, { @@ -140,25 +97,111 @@ ] }, { - "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat", + "map": [ + { + "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "135,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,43,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,41,-1,-1,-1,44,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "8429,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2191,2243,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2139,-1,-1,-1,2299,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "140,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,43,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,41,-1,-1,-1,44,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,51,55,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,51,-1,-1,-1,59,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "8842,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2238,2294,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2186,-1,-1,-1,2354,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "18,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1101,1197,1280,1376,1445,1488,1540,1592,1641,1704,1762,1813,1897,1991,2099,2170,2254,2337,2403,2486,2588,2649,2732,2804,2882,2935,2995,3100,3180,3282,3337,3408,3457,3509,3565,3623,3670,3729,3786,3857,3918,3975,4025,4077,4130,4180,4230,4290,4343,4409,4471,4534,4597,4644,4697,4752,4840,4898,4960,5010,5055,5107,5150,5210,5277,5337,5392,5447,5500,5547,5600,5656,5704,5759,5812,5896,5963,6027,6123,6197,6278,6367,6530,6674,6753,6828,6931,6990,7070,7150,7205,7327,7430,7471,7524,7581,7655,7720,7788,7874,7954,8023,8117,8176,8231,8293,8353,8463", + "endLines": "23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,82,71,77,52,59,104,79,101,54,70,48,51,55,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,51,42,59,66,59,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,102,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1096,1192,1275,1371,1440,1483,1535,1587,1636,1699,1757,1808,1892,1986,2094,2165,2249,2332,2398,2481,2583,2644,2727,2799,2877,2930,2990,3095,3175,3277,3332,3403,3452,3504,3560,3618,3665,3724,3781,3852,3913,3970,4020,4072,4125,4175,4225,4285,4338,4404,4466,4529,4592,4639,4692,4747,4835,4893,4955,5005,5050,5102,5145,5205,5272,5332,5387,5442,5495,5542,5595,5651,5699,5754,5807,5891,5958,6022,6118,6192,6273,6362,6525,6669,6748,6823,6926,6985,7065,7145,7200,7322,7425,7466,7519,7576,7650,7715,7783,7869,7949,8018,8112,8171,8226,8288,8348,8458,8548" + } + }, + { + "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "132,136,140,144,147,151,155,159,163,167,171", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8553,8757,8968,9178,9338,9521,9706,9891,10094,10300,10483", + "endLines": "135,139,143,146,150,154,158,162,166,170,174", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8752,8963,9173,9333,9516,9701,9886,10089,10295,10478,10679" + } + }, + { + "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } + } + ] + }, + { + "outputFile": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { - "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + "startLines": "124,74,73,72,71,19,20,21,114,115,123,122,26,78,79,77,76,75,91,90,89,81,63,29,30,82,37,116,70,66,41,47,52,42,62,61,60,56,55,53,54,57,58,48,69,59,40,67,46,39,51,50,49,65,45,64,43,44,68,28,34,36,33,35,32,31,25,24,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,121,119,118,120,27,80,88,93,92,94,87,86,85,84,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6604,3672,3606,3533,3483,827,867,915,6154,6199,6550,6500,1199,3932,4000,3873,3807,3744,4662,4602,4539,4132,3054,1369,1422,4186,1768,6256,3424,3211,1975,2256,2502,2028,2994,2941,2890,2695,2647,2553,2601,2741,2788,2299,3365,2838,1923,3254,2213,1878,2455,2399,2344,3156,2169,3114,2078,2119,3306,1318,1623,1719,1576,1672,1529,1484,1148,1095,5037,4978,5178,6079,5489,5420,5553,5631,5814,5741,5112,5365,5235,5300,4929,5918,6001,6462,6355,6307,6400,1261,4077,4480,4775,4717,4842,4432,4387,4339,4288,963,1029", + "endLines": "126,74,73,72,71,19,20,21,114,115,123,122,26,78,79,77,76,75,91,90,89,81,63,29,30,82,37,116,70,66,41,47,52,42,62,61,60,56,55,53,54,57,58,48,69,59,40,67,46,39,51,50,49,65,45,64,43,44,68,28,34,36,33,35,32,31,25,24,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,121,119,118,120,27,80,88,93,92,94,87,86,85,84,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6776,3739,3667,3601,3528,862,910,958,6194,6251,6599,6545,1256,3995,4072,3927,3868,3802,4712,4657,4597,4181,3109,1417,1479,4265,1843,6301,3478,3249,2023,2294,2548,2073,3049,2989,2936,2736,2690,2596,2642,2783,2833,2339,3419,2885,1970,3301,2251,1918,2497,2450,2394,3206,2208,3151,2114,2164,3360,1364,1667,1763,1618,1714,1571,1524,1194,1143,5107,5032,5230,6148,5548,5484,5626,5736,5913,5809,5173,5415,5295,5360,4973,5996,6074,6495,6395,6350,6457,1313,4127,4534,4837,4770,4899,4475,4427,4382,4334,1024,1090" }, "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3011,3054,3099,3146,3202,3257,3312,3356,3398,3439,3489,3548,3599,3648,3697,3744,3791,3838,3883,3934,3987,4062,4121,4178,4252,4316,4385,4463,4573,4677,4750,4816,4871,4936,5001,5050,5133,5211,5249,5294,5342,5404,5461,5516,5575,5642,5700,5762,5810,5855,5903,5954,6020", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,3006,3049,3094,3141,3197,3252,3307,3351,3393,3434,3484,3543,3594,3643,3692,3739,3786,3833,3878,3929,3982,4057,4116,4173,4247,4311,4380,4458,4568,4672,4745,4811,4866,4931,4996,5045,5128,5206,5244,5289,5337,5399,5456,5511,5570,5637,5695,5757,5805,5850,5898,5949,6015,6081" } }, { @@ -181,6 +224,49 @@ } } ] + }, + { + "outputFile": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\values-zh-rCN_values-zh-rCN.arsc.flat", + "map": [ + { + "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "123,73,72,71,70,19,20,21,114,115,122,121,26,79,80,78,77,76,92,91,90,82,62,29,30,83,74,116,69,65,40,46,51,41,61,60,59,55,54,52,53,56,57,47,68,58,39,66,45,38,50,49,48,64,44,63,42,43,67,28,34,36,33,35,32,31,25,24,99,98,101,113,106,105,107,108,110,109,100,104,102,103,97,111,112,120,118,117,119,27,81,89,94,93,95,88,87,86,85,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6629,3592,3526,3453,3403,827,867,915,6180,6225,6575,6525,1199,3958,4026,3899,3834,3771,4689,4629,4566,4158,2974,1369,1422,4212,3665,6282,3344,3131,1895,2176,2422,1948,2914,2861,2810,2615,2567,2473,2521,2661,2708,2219,3285,2758,1843,3174,2133,1798,2375,2319,2264,3076,2089,3034,1998,2039,3226,1318,1623,1719,1576,1672,1529,1484,1148,1095,5064,5005,5205,6106,5516,5447,5580,5658,5841,5768,5139,5392,5262,5327,4956,5945,6028,6487,6380,6332,6425,1261,4103,4507,4802,4744,4869,4459,4414,4366,4315,963,1029", + "endLines": "125,73,72,71,70,19,20,21,114,115,122,121,26,79,80,78,77,76,92,91,90,82,62,29,30,83,74,116,69,65,40,46,51,41,61,60,59,55,54,52,53,56,57,47,68,58,39,66,45,38,50,49,48,64,44,63,42,43,67,28,34,36,33,35,32,31,25,24,99,98,101,113,106,105,107,108,110,109,100,104,102,103,97,111,112,120,118,117,119,27,81,89,94,93,95,88,87,86,85,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6801,3660,3587,3521,3448,862,910,958,6220,6277,6624,6570,1256,4021,4098,3953,3894,3829,4739,4684,4624,4207,3029,1417,1479,4292,3741,6327,3398,3169,1943,2214,2468,1993,2969,2909,2856,2656,2610,2516,2562,2703,2753,2259,3339,2805,1890,3221,2171,1838,2417,2370,2314,3126,2128,3071,2034,2084,3280,1364,1667,1763,1618,1714,1571,1524,1194,1143,5134,5059,5257,6175,5575,5511,5653,5763,5940,5836,5200,5442,5322,5387,5000,6023,6101,6520,6420,6375,6482,1313,4153,4561,4864,4797,4926,4502,4454,4409,4361,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3013,3056,3101,3148,3204,3259,3314,3358,3400,3441,3491,3550,3601,3650,3699,3746,3793,3840,3885,3936,3989,4064,4123,4180,4254,4318,4387,4465,4575,4679,4752,4818,4873,4938,5003,5052,5135,5213,5251,5296,5344,5406,5463,5518,5577,5644,5702,5764,5812,5857,5905,5956,6022", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,3008,3051,3096,3143,3199,3254,3309,3353,3395,3436,3486,3545,3596,3645,3694,3741,3788,3835,3880,3931,3984,4059,4118,4175,4249,4313,4382,4460,4570,4674,4747,4813,4868,4933,4998,5047,5130,5208,5246,5291,5339,5401,5458,5513,5572,5639,5697,5759,5807,5852,5900,5951,6017,6083" + } + }, + { + "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + } + ] } ] } \ No newline at end of file diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index ec57dd5..53fc01c 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -6,20 +6,20 @@ { "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + "startLines": "123,73,72,71,70,19,20,21,114,115,122,121,26,79,80,78,77,76,92,91,90,82,62,29,30,83,74,116,69,65,40,46,51,41,61,60,59,55,54,52,53,56,57,47,68,58,39,66,45,38,50,49,48,64,44,63,42,43,67,28,34,36,33,35,32,31,25,24,99,98,101,113,106,105,107,108,110,109,100,104,102,103,97,111,112,120,118,117,119,27,81,89,94,93,95,88,87,86,85,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6629,3592,3526,3453,3403,827,867,915,6180,6225,6575,6525,1199,3958,4026,3899,3834,3771,4689,4629,4566,4158,2974,1369,1422,4212,3665,6282,3344,3131,1895,2176,2422,1948,2914,2861,2810,2615,2567,2473,2521,2661,2708,2219,3285,2758,1843,3174,2133,1798,2375,2319,2264,3076,2089,3034,1998,2039,3226,1318,1623,1719,1576,1672,1529,1484,1148,1095,5064,5005,5205,6106,5516,5447,5580,5658,5841,5768,5139,5392,5262,5327,4956,5945,6028,6487,6380,6332,6425,1261,4103,4507,4802,4744,4869,4459,4414,4366,4315,963,1029", + "endLines": "125,73,72,71,70,19,20,21,114,115,122,121,26,79,80,78,77,76,92,91,90,82,62,29,30,83,74,116,69,65,40,46,51,41,61,60,59,55,54,52,53,56,57,47,68,58,39,66,45,38,50,49,48,64,44,63,42,43,67,28,34,36,33,35,32,31,25,24,99,98,101,113,106,105,107,108,110,109,100,104,102,103,97,111,112,120,118,117,119,27,81,89,94,93,95,88,87,86,85,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6801,3660,3587,3521,3448,862,910,958,6220,6277,6624,6570,1256,4021,4098,3953,3894,3829,4739,4684,4624,4207,3029,1417,1479,4292,3741,6327,3398,3169,1943,2214,2468,1993,2969,2909,2856,2656,2610,2516,2562,2703,2753,2259,3339,2805,1890,3221,2171,1838,2417,2370,2314,3126,2128,3071,2034,2084,3280,1364,1667,1763,1618,1714,1571,1524,1194,1143,5134,5059,5257,6175,5575,5511,5653,5763,5940,5836,5200,5442,5322,5387,5000,6023,6101,6520,6420,6375,6482,1313,4153,4561,4864,4797,4926,4502,4454,4409,4361,1024,1090" }, "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3013,3056,3101,3148,3204,3259,3314,3358,3400,3441,3491,3550,3601,3650,3699,3746,3793,3840,3885,3936,3989,4064,4123,4180,4254,4318,4387,4465,4575,4679,4752,4818,4873,4938,5003,5052,5135,5213,5251,5296,5344,5406,5463,5518,5577,5644,5702,5764,5812,5857,5905,5956,6022", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,3008,3051,3096,3143,3199,3254,3309,3353,3395,3436,3486,3545,3596,3645,3694,3741,3788,3835,3880,3931,3984,4059,4118,4175,4249,4313,4382,4460,4570,4674,4747,4813,4868,4933,4998,5047,5130,5208,5246,5291,5339,5401,5458,5513,5572,5639,5697,5759,5807,5852,5900,5951,6017,6083" } }, { diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index 42a209e..5267844 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -6,20 +6,20 @@ { "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { - "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + "startLines": "124,74,73,72,71,19,20,21,114,115,123,122,26,78,79,77,76,75,91,90,89,81,63,29,30,82,37,116,70,66,41,47,52,42,62,61,60,56,55,53,54,57,58,48,69,59,40,67,46,39,51,50,49,65,45,64,43,44,68,28,34,36,33,35,32,31,25,24,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,121,119,118,120,27,80,88,93,92,94,87,86,85,84,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6604,3672,3606,3533,3483,827,867,915,6154,6199,6550,6500,1199,3932,4000,3873,3807,3744,4662,4602,4539,4132,3054,1369,1422,4186,1768,6256,3424,3211,1975,2256,2502,2028,2994,2941,2890,2695,2647,2553,2601,2741,2788,2299,3365,2838,1923,3254,2213,1878,2455,2399,2344,3156,2169,3114,2078,2119,3306,1318,1623,1719,1576,1672,1529,1484,1148,1095,5037,4978,5178,6079,5489,5420,5553,5631,5814,5741,5112,5365,5235,5300,4929,5918,6001,6462,6355,6307,6400,1261,4077,4480,4775,4717,4842,4432,4387,4339,4288,963,1029", + "endLines": "126,74,73,72,71,19,20,21,114,115,123,122,26,78,79,77,76,75,91,90,89,81,63,29,30,82,37,116,70,66,41,47,52,42,62,61,60,56,55,53,54,57,58,48,69,59,40,67,46,39,51,50,49,65,45,64,43,44,68,28,34,36,33,35,32,31,25,24,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,121,119,118,120,27,80,88,93,92,94,87,86,85,84,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6776,3739,3667,3601,3528,862,910,958,6194,6251,6599,6545,1256,3995,4072,3927,3868,3802,4712,4657,4597,4181,3109,1417,1479,4265,1843,6301,3478,3249,2023,2294,2548,2073,3049,2989,2936,2736,2690,2596,2642,2783,2833,2339,3419,2885,1970,3301,2251,1918,2497,2450,2394,3206,2208,3151,2114,2164,3360,1364,1667,1763,1618,1714,1571,1524,1194,1143,5107,5032,5230,6148,5548,5484,5626,5736,5913,5809,5173,5415,5295,5360,4973,5996,6074,6495,6395,6350,6457,1313,4127,4534,4837,4770,4899,4475,4427,4382,4334,1024,1090" }, "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3011,3054,3099,3146,3202,3257,3312,3356,3398,3439,3489,3548,3599,3648,3697,3744,3791,3838,3883,3934,3987,4062,4121,4178,4252,4316,4385,4463,4573,4677,4750,4816,4871,4936,5001,5050,5133,5211,5249,5294,5342,5404,5461,5516,5575,5642,5700,5762,5810,5855,5903,5954,6020", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,3006,3049,3094,3141,3197,3252,3307,3351,3393,3434,3484,3543,3594,3643,3692,3739,3786,3833,3878,3929,3982,4057,4116,4173,4247,4311,4380,4458,4568,4672,4745,4811,4866,4931,4996,5045,5128,5206,5244,5289,5337,5399,5456,5511,5570,5637,5695,5757,5805,5850,5898,5949,6015,6081" } }, { diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index abc320b..baa05e1 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml", + "outputFile": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-mergeDebugResources-2:\\values\\values.xml", "map": [ { "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", @@ -25,20 +25,20 @@ { "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" + "startLines": "130,74,77,76,75,19,20,21,120,121,129,128,26,83,84,82,81,80,96,95,94,86,39,38,66,29,30,87,43,78,122,73,69,44,50,55,45,65,64,63,59,58,56,57,60,61,51,72,62,42,70,49,41,54,53,52,68,48,67,46,47,71,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8208,4077,4338,4242,4173,827,870,922,7706,7755,8150,8099,1282,4792,4886,4721,4637,4554,5753,5670,5568,5062,2025,1953,3576,1486,1539,5123,2255,4421,7818,4006,3761,2335,2650,2951,2393,3505,3444,3387,3165,3113,3010,3063,3215,3265,2697,3940,3325,2192,3810,2603,2139,2896,2808,2750,3699,2553,3654,2450,2493,3873,1431,1750,1858,1703,1805,1647,1599,1227,1174,6209,6142,6471,7609,6835,6754,6909,6998,7240,7161,6293,6368,6695,6535,6615,6087,7384,7506,8058,7931,7874,7984,1366,4994,5482,5888,5819,5968,5423,5368,5306,5246,974,1084", + "endLines": "135,74,77,76,75,19,20,21,120,121,129,128,26,83,84,82,81,80,96,95,94,86,39,38,66,29,30,87,43,78,122,73,69,44,50,55,45,65,64,63,59,58,56,57,60,61,51,72,62,42,70,49,41,54,53,52,68,48,67,46,47,71,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,82,71,77,52,59,104,79,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,102,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8621,4168,4416,4333,4237,865,917,969,7750,7813,8203,8145,1361,4881,4989,4787,4716,4632,5814,5748,5665,5118,2103,2020,3649,1534,1594,5223,2330,4518,7868,4072,3805,2388,2692,3005,2445,3571,3500,3439,3210,3160,3058,3108,3260,3320,2745,4001,3382,2250,3868,2645,2187,2946,2891,2803,3756,2598,3694,2488,2548,3935,1481,1800,1906,1745,1853,1698,1642,1277,1222,6288,6204,6530,7700,6904,6830,6993,7156,7379,7235,6363,6466,6749,6610,6690,6137,7501,7604,8094,7979,7926,8053,1426,5057,5563,5963,5883,6057,5477,5418,5363,5301,1079,1169" }, "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + "startLines": "18,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1101,1197,1280,1376,1445,1488,1540,1592,1641,1704,1762,1813,1897,1991,2099,2170,2254,2337,2403,2486,2588,2649,2732,2804,2882,2935,2995,3100,3180,3282,3337,3408,3457,3515,3562,3621,3678,3749,3810,3867,3917,3969,4022,4072,4122,4182,4235,4301,4363,4426,4489,4536,4589,4644,4732,4790,4852,4902,4947,4990,5050,5117,5172,5227,5280,5327,5380,5436,5484,5539,5592,5676,5743,5807,5903,5977,6058,6147,6310,6454,6533,6608,6711,6770,6850,6930,6985,7107,7210,7251,7304,7361,7435,7500,7568,7654,7734,7803,7897,7956,8011,8073,8133,8243", + "endLines": "23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,82,71,77,52,59,104,79,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,102,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1096,1192,1275,1371,1440,1483,1535,1587,1636,1699,1757,1808,1892,1986,2094,2165,2249,2332,2398,2481,2583,2644,2727,2799,2877,2930,2990,3095,3175,3277,3332,3403,3452,3510,3557,3616,3673,3744,3805,3862,3912,3964,4017,4067,4117,4177,4230,4296,4358,4421,4484,4531,4584,4639,4727,4785,4847,4897,4942,4985,5045,5112,5167,5222,5275,5322,5375,5431,5479,5534,5587,5671,5738,5802,5898,5972,6053,6142,6305,6449,6528,6603,6706,6765,6845,6925,6980,7102,7205,7246,7299,7356,7430,7495,7563,7649,7729,7798,7892,7951,8006,8068,8128,8238,8328" } }, { @@ -66,15 +66,15 @@ "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", "endLines": "53,58,67,62,25,29,33,38,43,21,48", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + "endOffsets": "2261,2473,2846,2634,1073,1258,1443,1647,1854,890,2056" }, "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startLines": "128,132,136,140,143,147,151,155,159,163,167", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "startOffsets": "8333,8537,8748,8958,9118,9301,9486,9671,9874,10080,10263", + "endLines": "131,135,139,142,146,150,154,158,162,166,170", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + "endOffsets": "8532,8743,8953,9113,9296,9481,9666,9869,10075,10258,10459" } }, { @@ -95,6 +95,92 @@ } } ] + }, + { + "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml", + "map": [ + { + "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "135,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,43,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,41,-1,-1,-1,44,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "8429,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2191,2243,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2139,-1,-1,-1,2299,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "140,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,43,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,41,-1,-1,-1,44,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,51,55,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,51,-1,-1,-1,59,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "8842,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2238,2294,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2186,-1,-1,-1,2354,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "18,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1101,1197,1280,1376,1445,1488,1540,1592,1641,1704,1762,1813,1897,1991,2099,2170,2254,2337,2403,2486,2588,2649,2732,2804,2882,2935,2995,3100,3180,3282,3337,3408,3457,3509,3565,3623,3670,3729,3786,3857,3918,3975,4025,4077,4130,4180,4230,4290,4343,4409,4471,4534,4597,4644,4697,4752,4840,4898,4960,5010,5055,5107,5150,5210,5277,5337,5392,5447,5500,5547,5600,5656,5704,5759,5812,5896,5963,6027,6123,6197,6278,6367,6530,6674,6753,6828,6931,6990,7070,7150,7205,7327,7430,7471,7524,7581,7655,7720,7788,7874,7954,8023,8117,8176,8231,8293,8353,8463", + "endLines": "23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,82,71,77,52,59,104,79,101,54,70,48,51,55,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,51,42,59,66,59,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,102,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1096,1192,1275,1371,1440,1483,1535,1587,1636,1699,1757,1808,1892,1986,2094,2165,2249,2332,2398,2481,2583,2644,2727,2799,2877,2930,2990,3095,3175,3277,3332,3403,3452,3504,3560,3618,3665,3724,3781,3852,3913,3970,4020,4072,4125,4175,4225,4285,4338,4404,4466,4529,4592,4639,4692,4747,4835,4893,4955,5005,5050,5102,5145,5205,5272,5332,5387,5442,5495,5542,5595,5651,5699,5754,5807,5891,5958,6022,6118,6192,6273,6362,6525,6669,6748,6823,6926,6985,7065,7145,7200,7322,7425,7466,7519,7576,7650,7715,7783,7869,7949,8018,8112,8171,8226,8288,8348,8458,8548" + } + }, + { + "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "132,136,140,144,147,151,155,159,163,167,171", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8553,8757,8968,9178,9338,9521,9706,9891,10094,10300,10483", + "endLines": "135,139,143,146,150,154,158,162,166,170,174", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8752,8963,9173,9333,9516,9701,9886,10089,10295,10478,10679" + } + }, + { + "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } + } + ] } ] } \ No newline at end of file diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json index 2603807..88ae5ea 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -1,382 +1,402 @@ [ { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_middle.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_yellow_down.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_yellow_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_normal.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_normal.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable_new_note.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable\\new_note.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_single.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_single.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\layout_dialog_edit_text.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\layout\\dialog_edit_text.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_green.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_green.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\note_edit_color_selector_panel.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_search_result.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/search_result.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_clock.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\clock.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/layout_note_list_dropdown_menu.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/note_list_dropdown_menu.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\menu_note_list.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\menu\\note_list.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_super.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_super.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_font_small.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\font_small.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_blue.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_blue.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_2x_green.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_2x_green.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/menu_sub_folder.xml.flat", - "source": "net.micode.notes.app-main-6:/menu/sub_folder.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\xml_widget_4x_info.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\xml\\widget_4x_info.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_yellow.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_yellow.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_selected.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\selected.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_new_note_pressed.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/new_note_pressed.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\layout_note_item.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\layout\\note_item.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/color_secondary_text_dark.xml.flat", - "source": "net.micode.notes.app-main-6:/color/secondary_text_dark.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_chock.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\chock.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_dropdown_icon.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/dropdown_icon.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_menu_delete.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\menu_delete.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_middle.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_middle.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\layout_datetime_picker.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\layout\\datetime_picker.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/color_primary_text_dark.xml.flat", - "source": "net.micode.notes.app-main-6:/color/primary_text_dark.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_yellow_single.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_yellow_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_single.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_single.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\layout_note_list.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\layout\\note_list.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_delete.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/delete.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\color_secondary_text_dark.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\color\\secondary_text_dark.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_middle.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_middle.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\layout_note_edit.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\layout\\note_edit.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_new_note_normal.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/new_note_normal.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_title_green.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_title_green.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/layout_dialog_edit_text.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/dialog_edit_text.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_red.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_red.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_background.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_background.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\font_size_selector_bg.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/layout_note_edit.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/note_edit.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_green_single.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_green_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_down.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_down.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\bg_color_btn_mask.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/layout_note_edit_list_item.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/note_edit_list_item.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\menu_note_list_options.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\menu\\note_list_options.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_size_selector_bg.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_blue_down.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_blue_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_title_bar_bg.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/title_bar_bg.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\layout_folder_list_item.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\layout\\folder_list_item.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_up.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_up.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_blue_up.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_blue_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_yellow.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_yellow.png" + "merged": "net.micode.notes.app-merged_res-4:/layout_note_list.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/note_list.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_footer_bg.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_footer_bg.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_sky.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\sky.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_down.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_down.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\menu_call_note_edit.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\menu\\call_note_edit.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/layout_folder_list_item.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/folder_list_item.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\raw_introduction.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\raw\\introduction" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_small.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_small.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_green_up.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_green_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_green.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_green.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_title_white.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_title_white.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/bg_color_btn_mask.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_dropdown_icon.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\dropdown_icon.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_down.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_down.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_new_note_pressed.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\new_note_pressed.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_up.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_up.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_2x_white.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_2x_white.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_single.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_single.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_icon_app.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\icon_app.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_green.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_green.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\menu_call_record_folder.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\menu\\call_record_folder.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/note_edit_color_selector_panel.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\layout_note_list_dropdown_menu.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\layout\\note_list_dropdown_menu.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_up.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_up.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\menu_note_list_dropdown.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\menu\\note_list_dropdown.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_clock.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/clock.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_2x_blue.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_2x_blue.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_white.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_white.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_title_bar_bg.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\title_bar_bg.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/layout_note_list.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/note_list.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_green_middle.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_green_middle.9.png" + }, + { + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\layout_widget_4x.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\layout\\widget_4x.xml" + }, + { + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_xiaomei.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\xiaomei.png" + }, + { + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\color_primary_text_dark.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\color\\primary_text_dark.xml" + }, + { + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_yellow_up.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_yellow_up.9.png" + }, + { + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_red_up.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_red_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_red.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_red.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\menu_sub_folder.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\menu\\sub_folder.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/menu_note_list_dropdown.xml.flat", - "source": "net.micode.notes.app-main-6:/menu/note_list_dropdown.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_call_record.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\call_record.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/layout_note_item.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/note_item.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\layout_widget_2x.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\layout\\widget_2x.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/xml_searchable.xml.flat", - "source": "net.micode.notes.app-main-6:/xml/searchable.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_font_super.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\font_super.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_icon_app.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/icon_app.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\layout_note_edit_list_item.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\layout\\note_edit_list_item.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_menu_move.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/menu_move.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_yellow.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_yellow.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_bg_btn_set_color.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/bg_btn_set_color.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_title_alert.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\title_alert.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_down.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_down.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_search_result.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\search_result.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/layout_note_list_footer.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/note_list_footer.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\layout_settings_header.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\layout\\settings_header.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_green.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_green.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\raw-zh-rCN_introduction.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\raw-zh-rCN\\introduction" }, { - "merged": "net.micode.notes.app-merged_res-4:/menu_note_edit.xml.flat", - "source": "net.micode.notes.app-main-6:/menu/note_edit.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\xml_searchable.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\xml\\searchable.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_middle.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_middle.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_bck.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\bck.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/raw-zh-rCN_introduction.flat", - "source": "net.micode.notes.app-main-6:/raw-zh-rCN/introduction" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\layout_account_dialog_title.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\layout\\account_dialog_title.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_blue.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_blue.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_title_red.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_title_red.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/layout_add_account_text.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/add_account_text.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_delete.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\delete.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_title_alert.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/title_alert.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_red_down.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_red_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_notification.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/notification.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_white_down.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_white_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/menu_note_list.xml.flat", - "source": "net.micode.notes.app-main-6:/menu/note_list.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_2x_yellow.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_2x_yellow.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_single.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_single.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_white_single.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_white_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_white.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_white.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_red_single.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_red_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/menu_note_list_options.xml.flat", - "source": "net.micode.notes.app-main-6:/menu/note_list_options.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_notification.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\notification.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_white.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_white.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\xml_widget_2x_info.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\xml\\widget_2x_info.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_red.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_red.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_font_large.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\font_large.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/xml_widget_2x_info.xml.flat", - "source": "net.micode.notes.app-main-6:/xml/widget_2x_info.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_4x_blue.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_4x_blue.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_white.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_white.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_4x_red.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_4x_red.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/layout_widget_2x.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/widget_2x.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_footer_bg.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_footer_bg.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/menu_call_record_folder.xml.flat", - "source": "net.micode.notes.app-main-6:/menu/call_record_folder.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_new_note_normal.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\new_note_normal.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_large.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_large.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_green_down.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_green_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/menu_call_note_edit.xml.flat", - "source": "net.micode.notes.app-main-6:/menu/call_note_edit.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_background.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_background.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_blue.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_blue.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\xml_preferences.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\xml\\preferences.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_yellow.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_font_normal.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\font_normal.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_up.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_up.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_white_up.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_white_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_call_record.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/call_record.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_blue_single.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_blue_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/xml_widget_4x_info.xml.flat", - "source": "net.micode.notes.app-main-6:/xml/widget_4x_info.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_white.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_white.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_down.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_down.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_folder.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_folder.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_menu_delete.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/menu_delete.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_2x_red.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_2x_red.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_red.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_red.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_white_middle.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_white_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/xml_preferences.xml.flat", - "source": "net.micode.notes.app-main-6:/xml/preferences.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_4x_white.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_4x_white.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_selected.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/selected.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_yellow_middle.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_yellow_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_yellow.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_yellow.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_title_yellow.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_up.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_up.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_green.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_green.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/layout_datetime_picker.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/datetime_picker.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_red_middle.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_red_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/raw_introduction.flat", - "source": "net.micode.notes.app-main-6:/raw/introduction" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_title_blue.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_title_blue.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/layout_settings_header.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/settings_header.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_menu_move.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\menu_move.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_blue.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_blue.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_bg_btn_set_color.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\bg_btn_set_color.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/layout_widget_4x.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/widget_4x.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_4x_green.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_4x_green.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_middle.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_middle.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_blue.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_blue.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable_new_note.xml.flat", - "source": "net.micode.notes.app-main-6:/drawable/new_note.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_blue_middle.9.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_blue_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_red.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_red.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\layout_note_list_footer.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\layout\\note_list_footer.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_single.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_single.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_4x_yellow.png.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_4x_yellow.png" }, { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_folder.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_folder.9.png" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\menu_note_edit.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\menu\\note_edit.xml" }, { - "merged": "net.micode.notes.app-merged_res-4:/layout_account_dialog_title.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/account_dialog_title.xml" + "merged": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\layout_add_account_text.xml.flat", + "source": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-main-6:\\layout\\add_account_text.xml" } ] \ No newline at end of file diff --git a/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/bck.png b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/bck.png new file mode 100644 index 0000000..fc1d4ce Binary files /dev/null and b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/bck.png differ diff --git a/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/chock.png b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/chock.png new file mode 100644 index 0000000..d9e291d Binary files /dev/null and b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/chock.png differ diff --git a/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/sky.png b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/sky.png new file mode 100644 index 0000000..1ca542d Binary files /dev/null and b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/sky.png differ diff --git a/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/xiaomei.png b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/xiaomei.png new file mode 100644 index 0000000..a646f9b Binary files /dev/null and b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/xiaomei.png differ diff --git a/app/build/intermediates/packaged_res/debug/layout/note_list.xml b/app/build/intermediates/packaged_res/debug/layout/note_list.xml index 6b25d38..50d3a00 100644 --- a/app/build/intermediates/packaged_res/debug/layout/note_list.xml +++ b/app/build/intermediates/packaged_res/debug/layout/note_list.xml @@ -18,8 +18,8 @@ + android:layout_height="fill_parent"> + + + + + + + + + + + + + + diff --git a/app/build/intermediates/packaged_res/debug/menu/sub_folder.xml b/app/build/intermediates/packaged_res/debug/menu/sub_folder.xml index b00de26..a6efc07 100644 --- a/app/build/intermediates/packaged_res/debug/menu/sub_folder.xml +++ b/app/build/intermediates/packaged_res/debug/menu/sub_folder.xml @@ -21,4 +21,12 @@ + + + + \ No newline at end of file diff --git a/app/build/intermediates/packaged_res/debug/values-zh-rCN/values-zh-rCN.xml b/app/build/intermediates/packaged_res/debug/values-zh-rCN/values-zh-rCN.xml index d65e0cc..698b5f1 100644 --- a/app/build/intermediates/packaged_res/debug/values-zh-rCN/values-zh-rCN.xml +++ b/app/build/intermediates/packaged_res/debug/values-zh-rCN/values-zh-rCN.xml @@ -52,8 +52,10 @@ 移动到文件夹 上一级文件夹 退出清单模式 + 退出私密模式 删除提醒 搜索 + 私密模式 全选 没有选中项，操作无效 选中了 %d 项 diff --git a/app/build/intermediates/packaged_res/debug/values-zh-rTW/values-zh-rTW.xml b/app/build/intermediates/packaged_res/debug/values-zh-rTW/values-zh-rTW.xml index 226b5bc..cf60fba 100644 --- a/app/build/intermediates/packaged_res/debug/values-zh-rTW/values-zh-rTW.xml +++ b/app/build/intermediates/packaged_res/debug/values-zh-rTW/values-zh-rTW.xml @@ -52,8 +52,10 @@ 移動到文件夾 上一級文件夾 退出清單模式 + 退出私密模式 刪除提醒 搜尋 + 私密模式 全選 沒有選中項，操作無效 選中了 %d 項 diff --git a/app/build/intermediates/packaged_res/debug/values/values.xml b/app/build/intermediates/packaged_res/debug/values/values.xml index e49b0c3..f51dd46 100644 --- a/app/build/intermediates/packaged_res/debug/values/values.xml +++ b/app/build/intermediates/packaged_res/debug/values/values.xml @@ -20,6 +20,7 @@ %1$s result for \"%2$s\" %1$s results for \"%2$s\" + Confirm to delete folder and its notes? Confirm to delete this note? @@ -42,17 +43,19 @@ Sync failed, internal error occurs Sync failed, please check network and account settings Export fail - notes_%s.txt - /MIUI/notes/ + 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) + (%d) Have moved selected %1$d notes to %2$s folder Input name Note added to home Remind me + Background:bck + Background:chock New Folder Delete Deselect all @@ -69,17 +72,21 @@ Move to folder Parent folder Leave check list + quit secret model Delete reminder Search + secret model Select all Nothing selected, the operation is invalid %d selected Send to home Settings Share + Background:sky Sync Cancel syncing Select folder + Background:xiaomei Expired Send email Open map @@ -100,7 +107,7 @@ 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 + yyyy-MM-dd hh:mm:ss Cancel Change sync account Remove sync account @@ -133,7 +140,7 @@ \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8e7cbcf..f8085a1 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.1' + classpath "com.android.tools.build:gradle:8.2.2" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f4a23db..26c8378 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 25 19:53:33 CST 2023 +#Wed May 15 01:28:23 CST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists