diff --git a/src/Notes/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 0989a91..8816016 100644 Binary files a/src/Notes/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes/.gradle/file-system.probe b/src/Notes/.gradle/file-system.probe index b3a730e..0f5bd13 100644 Binary files a/src/Notes/.gradle/file-system.probe and b/src/Notes/.gradle/file-system.probe differ diff --git a/src/Notes/.idea/misc.xml b/src/Notes/.idea/misc.xml index d91324e..57ada48 100644 --- a/src/Notes/.idea/misc.xml +++ b/src/Notes/.idea/misc.xml @@ -15,4 +15,11 @@ + + + \ No newline at end of file diff --git a/src/Notes/.idea/modules/app/Notes.app.main.iml b/src/Notes/.idea/modules/app/Notes.app.main.iml index 99ea4d6..f0fea56 100644 --- a/src/Notes/.idea/modules/app/Notes.app.main.iml +++ b/src/Notes/.idea/modules/app/Notes.app.main.iml @@ -30,6 +30,7 @@ + diff --git a/src/Notes/.idea/vcs.xml b/src/Notes/.idea/vcs.xml index fdf1fc8..778506d 100644 --- a/src/Notes/.idea/vcs.xml +++ b/src/Notes/.idea/vcs.xml @@ -1,7 +1,7 @@ - - + + \ No newline at end of file diff --git a/src/Notes/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes/app/build/intermediates/apk/debug/app-debug.apk index c47fa72..c142d98 100644 Binary files a/src/Notes/app/build/intermediates/apk/debug/app-debug.apk and b/src/Notes/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/Notes/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index 00518a8..b1946db 100644 Binary files a/src/Notes/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/src/Notes/app/build/intermediates/compile_app_classes_jar/debug/classes.jar b/src/Notes/app/build/intermediates/compile_app_classes_jar/debug/classes.jar index 0144a87..bf6e4b2 100644 Binary files a/src/Notes/app/build/intermediates/compile_app_classes_jar/debug/classes.jar and b/src/Notes/app/build/intermediates/compile_app_classes_jar/debug/classes.jar differ diff --git a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex index e020f72..5ad78f3 100644 Binary files a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex and b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex differ diff --git a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex index 299c211..529b368 100644 Binary files a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex and b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex differ diff --git a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex index fa7a7cb..9a03b42 100644 Binary files a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex and b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex differ diff --git a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex index 7823b3f..ce83ee6 100644 Binary files a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex and b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex differ diff --git a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex index 2da4b04..40f4b30 100644 Binary files a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex and b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex differ diff --git a/src/Notes/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index b2e6555..5f6e01b 100644 Binary files a/src/Notes/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 2379d7b..fb1316c 100644 --- a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,6 +1,7 @@ -#Tue Dec 17 23:47:43 CST 2024 +#Mon Dec 23 15:33:53 CST 2024 net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/background.png=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_background.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat @@ -24,6 +25,8 @@ net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\Android Studio\\ net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background1.png=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background1.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background2.png=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background2.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat @@ -53,6 +56,7 @@ net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\Android Stu net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/old_list_background.png=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_old_list_background.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat diff --git a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml deleted file mode 100644 index cb4bd4a..0000000 --- a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ /dev/null @@ -1,171 +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 - quit secret model - Delete reminder - Search - secret model - Select all - Nothing selected, the operation is invalid - %d selected - Send to home - Settings - Share - Sync - Cancel syncing - Select folder - Expired - Send email - Open map - Call - Browse web - Take a look - Got it - Add note - ... - Sync notes with google task - Sync account - Add account - New note background color random - Cancel syncing - Sync immediately - Current account %1$s - All sync related information will be deleted, which may result in duplicated items sometime - Please select a google account. Local notes will be synced with google task. - Sync notes - Last sync time %1$s - yyyy-MM-dd hh:mm:ss - Cancel - Change sync account - Remove sync account - Settings - Cannot change the account because sync is in progress - %1$s has been set as the sync account - Notes - Search notes - Searching Notes - Text in your notes - Set reminder - Export successful - Sync is successful with account %1$s - Getting remote note list... - Logging into %1$s... - Synchronize local notes with Google Task... - Sync is canceled - Sync is failed - Sync is successful - Syncing notes... - No associated note found, click to create associated note. - Privacy mode，can not see note content - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index 4ed1470..c3ed65f 100644 --- a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ - + -%s --%s --%s @@ -7,11 +7,11 @@ 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.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 notesNotessetcancelsecret modelquit secret modellight modenight mode %1$s result for \"%2$s\" %1$s results for \"%2$s\" - quit secret modelsecret model 短信 邮件 - 便签便签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/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 0d58883..e17060e 100644 --- a/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Wed Dec 18 09:10:31 CST 2024 +#Mon Dec 23 18:58:21 CST 2024 base.0=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex base.1=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex base.2=D\:\\Android Studio\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex diff --git a/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 573f763..a3e3044 100644 Binary files a/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class index 7ef202f..f424c62 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class index e93b426..4f3fb45 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class index c702e29..c9c3083 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class index 80c1b84..b897ef4 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class index 40f3b1c..9541f0b 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class index 3d5c2ed..ffe50ab 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class index cf6d86f..167e6ca 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class index 2eee28b..f48a948 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index 83d7a15..2970508 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index 47b4c6c..a0c845b 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class index 928ce77..b335fbf 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index f1ba606..4fc4618 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index 1d41298..12e016f 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index 65133f6..28221b9 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index 4c2dbba..7c8764d 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index 91c3a7f..699770d 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class index db582ff..3dd253f 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index c386586..783f5cb 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index e2daf9e..1bd3be2 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index 53b7242..9de2c10 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index af234b7..49e7c97 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index 4b00fbf..38e08ee 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index 47b569c..e5abc5a 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index 34a5741..16cb72b 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index 7ef5a28..5094ebf 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index f39441e..ab1107b 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index df46f8f..d9995d7 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class index 85c1e20..c583ba6 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class index fdf723e..6c689d1 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class index 564e1ea..4ca5d91 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index cd0205f..0e1cc15 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class index e30072d..c8c7eeb 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index 137d329..c0d2786 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 755a982..604601b 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index 43c2a3f..294879d 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class index 5fa4606..35fa86e 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index f2aa9ec..72d191f 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index 6d0c56d..464f0b7 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index 6daf5f7..16b46c0 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/src/Notes/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat b/src/Notes/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat deleted file mode 100644 index 0bda0bc..0000000 Binary files a/src/Notes/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat and /dev/null differ diff --git a/src/Notes/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/Notes/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat index ee01338..637e898 100644 Binary files a/src/Notes/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/src/Notes/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ diff --git a/src/Notes/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/src/Notes/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat index e18958c..2e09324 100644 Binary files a/src/Notes/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat and b/src/Notes/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat differ diff --git a/src/Notes/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/src/Notes/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat index 9c59b79..8a337cb 100644 Binary files a/src/Notes/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and b/src/Notes/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ diff --git a/src/Notes/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/Notes/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat index 1db602a..e418563 100644 Binary files a/src/Notes/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and b/src/Notes/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ diff --git a/src/Notes/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/Notes/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat index 2c57674..6e87bb3 100644 Binary files a/src/Notes/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/src/Notes/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ diff --git a/src/Notes/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/src/Notes/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat index fa65fd5..d0464bb 100644 Binary files a/src/Notes/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat and b/src/Notes/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ diff --git a/src/Notes/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/Notes/app/build/intermediates/merged_res/debug/values_values.arsc.flat index bdcd434..5885a83 100644 Binary files a/src/Notes/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/Notes/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 16f1d18..6179ecb 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -23,20 +23,20 @@ { "source": "D:\\Android Studio\\Notes\\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": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", - "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": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" + "startLines": "135,72,75,74,73,19,20,21,118,119,127,126,131,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,129,68,47,128,52,51,50,66,46,65,44,45,69,132,28,140,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,4,4,4,4,4", + "startOffsets": "8360,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,8256,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,8190,3699,2471,8136,2769,2680,2621,3586,2420,3540,2315,2359,3763,8305,1459,8774,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", + "endLines": "139,72,75,74,73,19,20,21,118,119,127,126,131,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,129,68,47,128,52,51,50,66,46,65,44,45,69,132,28,140,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,47,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,62,46,52,54,87,57,61,49,44,42,59,66,49,54,46,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": "8768,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,8299,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,8248,3757,2513,8184,2819,2763,2674,3643,2465,3580,2353,2414,3825,8350,1509,8816,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" }, "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,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", + "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", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1852,1936,2030,2138,2209,2293,2376,2442,2525,2627,2688,2750,2801,2879,2932,2992,3097,3156,3258,3313,3384,3433,3491,3538,3597,3654,3725,3786,3843,3893,3945,3998,4048,4098,4158,4211,4277,4339,4402,4465,4512,4565,4620,4708,4766,4828,4878,4923,4966,5026,5093,5143,5198,5245,5300,5353,5400,5453,5509,5557,5612,5665,5749,5816,5880,5976,6050,6131,6220,6383,6527,6606,6681,6763,6822,6902,6982,7037,7159,7262,7303,7356,7413,7487,7552,7620,7706,7786,7855,7949,8008,8063,8125,8185,8295", + "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,125,126,127,128,129", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,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,62,46,52,54,87,57,61,49,44,42,59,66,49,54,46,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,1847,1931,2025,2133,2204,2288,2371,2437,2520,2622,2683,2745,2796,2874,2927,2987,3092,3151,3253,3308,3379,3428,3486,3533,3592,3649,3720,3781,3838,3888,3940,3993,4043,4093,4153,4206,4272,4334,4397,4460,4507,4560,4615,4703,4761,4823,4873,4918,4961,5021,5088,5138,5193,5240,5295,5348,5395,5448,5504,5552,5607,5660,5744,5811,5875,5971,6045,6126,6215,6378,6522,6601,6676,6758,6817,6897,6977,7032,7154,7257,7298,7351,7408,7482,7547,7615,7701,7781,7850,7944,8003,8058,8120,8180,8290,8380" } }, { @@ -50,12 +50,12 @@ "endOffsets": "2053,2307,2782,2517,617,831,1045,1298,1555,406,1802" }, "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startLines": "130,134,138,142,145,149,153,157,161,165,169", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8332,8543,8753,8913,9096,9281,9466,9669,9875,10058", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "startOffsets": "8385,8593,8804,9014,9174,9357,9542,9727,9930,10136,10319", + "endLines": "133,137,141,144,148,152,156,160,164,168,172", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8327,8538,8748,8908,9091,9276,9461,9664,9870,10053,10254" + "endOffsets": "8588,8799,9009,9169,9352,9537,9722,9925,10131,10314,10515" } }, { @@ -96,151 +96,26 @@ } ] }, - { - "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ - { - "source": "D:\\Android Studio\\Notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,122,-1,-1,121,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6699,-1,-1,6653,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6746,-1,-1,6693,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "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": "D:\\Android Studio\\Notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", - "map": [ - { - "source": "D:\\Android Studio\\Notes\\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": "D:\\Android Studio\\Notes\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "130,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,129,-1,-1,128,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "8254,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8190,-1,-1,8136,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,129,-1,-1,128,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,52,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8662,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8248,-1,-1,8184,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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", - "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,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,4417,4464,4517,4572,4660,4718,4780,4830,4875,4918,4978,5045,5100,5155,5208,5255,5308,5364,5412,5467,5520,5604,5671,5735,5831,5905,5986,6075,6238,6382,6461,6536,6618,6677,6757,6837,6892,7014,7117,7158,7211,7268,7342,7407,7475,7561,7641,7710,7804,7863,7918,7980,8040,8150", - "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,125,126", - "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,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,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,4412,4459,4512,4567,4655,4713,4775,4825,4870,4913,4973,5040,5095,5150,5203,5250,5303,5359,5407,5462,5515,5599,5666,5730,5826,5900,5981,6070,6233,6377,6456,6531,6613,6672,6752,6832,6887,7009,7112,7153,7206,7263,7337,7402,7470,7556,7636,7705,7799,7858,7913,7975,8035,8145,8235" - } - }, - { - "source": "D:\\Android Studio\\Notes\\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": "127,131,135,139,142,146,150,154,158,162,166", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8240,8448,8659,8869,9029,9212,9397,9582,9785,9991,10174", - "endLines": "130,134,138,141,145,149,153,157,161,165,169", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8443,8654,8864,9024,9207,9392,9577,9780,9986,10169,10370" - } - }, - { - "source": "D:\\Android Studio\\Notes\\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": "D:\\Android Studio\\Notes\\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": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { "source": "D:\\Android Studio\\Notes\\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": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", - "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": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" + "startLines": "128,71,70,69,68,19,20,21,112,113,120,119,124,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,122,64,43,121,48,47,46,62,42,61,40,41,65,125,28,131,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,4,4,4,4,4", + "startOffsets": "6846,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,6754,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,6699,3141,2079,6653,2326,2269,2213,3041,2034,2998,1941,1983,3194,6797,1346,7026,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", + "endLines": "130,71,70,69,68,19,20,21,112,113,120,119,124,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,122,64,43,121,48,47,46,62,42,61,40,41,65,125,28,131,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,41,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,43,50,43,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": "7020,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,6791,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,6746,3188,2117,6693,2368,2320,2263,3091,2073,3035,1977,2028,3248,6836,1392,7065,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" }, "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,109,110,111", + "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", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1030,1092,1160,1237,1296,1361,1424,1479,1539,1602,1656,1716,1769,1831,1916,1997,2047,2106,2149,2202,2245,2296,2346,2406,2459,2510,2556,2604,2652,2698,2745,2795,2840,2899,2951,3003,3055,3098,3143,3190,3246,3301,3356,3400,3442,3483,3533,3592,3636,3687,3731,3780,3829,3876,3923,3970,4015,4066,4119,4194,4253,4310,4384,4448,4517,4595,4705,4809,4882,4948,5003,5068,5133,5182,5265,5343,5381,5426,5474,5536,5593,5648,5707,5774,5832,5894,5942,5987,6035,6086,6152", + "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,109,110,111", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,41,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,43,50,43,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,1025,1087,1155,1232,1291,1356,1419,1474,1534,1597,1651,1711,1764,1826,1911,1992,2042,2101,2144,2197,2240,2291,2341,2401,2454,2505,2551,2599,2647,2693,2740,2790,2835,2894,2946,2998,3050,3093,3138,3185,3241,3296,3351,3395,3437,3478,3528,3587,3631,3682,3726,3775,3824,3871,3918,3965,4010,4061,4114,4189,4248,4305,4379,4443,4512,4590,4700,4804,4877,4943,4998,5063,5128,5177,5260,5338,5376,5421,5469,5531,5588,5643,5702,5769,5827,5889,5937,5982,6030,6081,6147,6213" } }, { @@ -264,65 +139,26 @@ } ] }, - { - "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ - { - "source": "D:\\Android Studio\\Notes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,123,-1,-1,122,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6675,-1,-1,6629,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6722,-1,-1,6669,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "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" - } - }, - { - "source": "D:\\Android Studio\\Notes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - } - ] - }, { "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { "source": "D:\\Android Studio\\Notes\\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": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", - "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": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" + "startLines": "128,72,71,70,69,19,20,21,112,113,121,120,125,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,123,65,44,122,49,48,47,63,43,62,41,42,66,126,28,131,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,4,4,4,4,4", + "startOffsets": "6820,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,6730,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,6675,3222,2160,6629,2407,2350,2294,3122,2115,3079,2022,2064,3275,6773,1346,7000,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", + "endLines": "130,72,71,70,69,19,20,21,112,113,121,120,125,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,123,65,44,122,49,48,47,63,43,62,41,42,66,126,28,131,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,41,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,43,50,43,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": "6994,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,6767,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,6722,3269,2198,6669,2449,2401,2344,3172,2154,3116,2058,2109,3329,6812,1392,7039,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" }, "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,109,110,111", + "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", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1029,1091,1159,1236,1295,1361,1424,1479,1539,1602,1656,1716,1769,1831,1915,1995,2045,2104,2147,2200,2243,2294,2344,2404,2457,2508,2554,2602,2650,2696,2743,2793,2838,2897,2949,3001,3053,3096,3141,3188,3244,3299,3354,3398,3440,3481,3531,3590,3634,3685,3729,3778,3827,3874,3921,3968,4013,4064,4117,4192,4251,4308,4382,4446,4515,4593,4703,4807,4880,4946,5001,5066,5131,5180,5263,5341,5379,5424,5472,5534,5591,5646,5705,5772,5830,5892,5940,5985,6033,6084,6150", + "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,109,110,111", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,41,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,43,50,43,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,1024,1086,1154,1231,1290,1356,1419,1474,1534,1597,1651,1711,1764,1826,1910,1990,2040,2099,2142,2195,2238,2289,2339,2399,2452,2503,2549,2597,2645,2691,2738,2788,2833,2892,2944,2996,3048,3091,3136,3183,3239,3294,3349,3393,3435,3476,3526,3585,3629,3680,3724,3773,3822,3869,3916,3963,4008,4059,4112,4187,4246,4303,4377,4441,4510,4588,4698,4802,4875,4941,4996,5061,5126,5175,5258,5336,5374,5419,5467,5529,5586,5641,5700,5767,5825,5887,5935,5980,6028,6079,6145,6211" } }, { diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index c828399..d090338 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -6,59 +6,20 @@ { "source": "D:\\Android Studio\\Notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,122,-1,-1,121,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6699,-1,-1,6653,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6746,-1,-1,6693,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "128,71,70,69,68,19,20,21,112,113,120,119,124,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,122,64,43,121,48,47,46,62,42,61,40,41,65,125,28,131,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,4,4,4,4,4", + "startOffsets": "6846,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,6754,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,6699,3141,2079,6653,2326,2269,2213,3041,2034,2998,1941,1983,3194,6797,1346,7026,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", + "endLines": "130,71,70,69,68,19,20,21,112,113,120,119,124,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,122,64,43,121,48,47,46,62,42,61,40,41,65,125,28,131,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,41,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,43,50,43,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": "7020,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,6791,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,6746,3188,2117,6693,2368,2320,2263,3091,2073,3035,1977,2028,3248,6836,1392,7065,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" }, "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": "D:\\Android Studio\\Notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - } - ] - }, - { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values-zh-rCN\\values-zh-rCN.xml", - "map": [ - { - "source": "D:\\Android Studio\\Notes\\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": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", - "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": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" - }, - "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,109,110,111", + "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", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1030,1092,1160,1237,1296,1361,1424,1479,1539,1602,1656,1716,1769,1831,1916,1997,2047,2106,2149,2202,2245,2296,2346,2406,2459,2510,2556,2604,2652,2698,2745,2795,2840,2899,2951,3003,3055,3098,3143,3190,3246,3301,3356,3400,3442,3483,3533,3592,3636,3687,3731,3780,3829,3876,3923,3970,4015,4066,4119,4194,4253,4310,4384,4448,4517,4595,4705,4809,4882,4948,5003,5068,5133,5182,5265,5343,5381,5426,5474,5536,5593,5648,5707,5774,5832,5894,5942,5987,6035,6086,6152", + "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,109,110,111", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,41,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,43,50,43,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,1025,1087,1155,1232,1291,1356,1419,1474,1534,1597,1651,1711,1764,1826,1911,1992,2042,2101,2144,2197,2240,2291,2341,2401,2454,2505,2551,2599,2647,2693,2740,2790,2835,2894,2946,2998,3050,3093,3138,3185,3241,3296,3351,3395,3437,3478,3528,3587,3631,3682,3726,3775,3824,3871,3918,3965,4010,4061,4114,4189,4248,4305,4379,4443,4512,4590,4700,4804,4877,4943,4998,5063,5128,5177,5260,5338,5376,5421,5469,5531,5588,5643,5702,5769,5827,5889,5937,5982,6030,6081,6147,6213" } }, { diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index 7d4a162..0c93e27 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -1,25 +1,25 @@ { "logs": [ { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values-zh-rTW\\values-zh-rTW.xml", + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", "map": [ { "source": "D:\\Android Studio\\Notes\\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": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", - "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": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" + "startLines": "128,72,71,70,69,19,20,21,112,113,121,120,125,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,123,65,44,122,49,48,47,63,43,62,41,42,66,126,28,131,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,4,4,4,4,4", + "startOffsets": "6820,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,6730,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,6675,3222,2160,6629,2407,2350,2294,3122,2115,3079,2022,2064,3275,6773,1346,7000,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", + "endLines": "130,72,71,70,69,19,20,21,112,113,121,120,125,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,123,65,44,122,49,48,47,63,43,62,41,42,66,126,28,131,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,41,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,43,50,43,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": "6994,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,6767,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,6722,3269,2198,6669,2449,2401,2344,3172,2154,3116,2058,2109,3329,6812,1392,7039,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" }, "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,109,110,111", + "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", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1029,1091,1159,1236,1295,1361,1424,1479,1539,1602,1656,1716,1769,1831,1915,1995,2045,2104,2147,2200,2243,2294,2344,2404,2457,2508,2554,2602,2650,2696,2743,2793,2838,2897,2949,3001,3053,3096,3141,3188,3244,3299,3354,3398,3440,3481,3531,3590,3634,3685,3729,3778,3827,3874,3921,3968,4013,4064,4117,4192,4251,4308,4382,4446,4515,4593,4703,4807,4880,4946,5001,5066,5131,5180,5263,5341,5379,5424,5472,5534,5591,5646,5705,5772,5830,5892,5940,5985,6033,6084,6150", + "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,109,110,111", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,41,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,43,50,43,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,1024,1086,1154,1231,1290,1356,1419,1474,1534,1597,1651,1711,1764,1826,1910,1990,2040,2099,2142,2195,2238,2289,2339,2399,2452,2503,2549,2597,2645,2691,2738,2788,2833,2892,2944,2996,3048,3091,3136,3183,3239,3294,3349,3393,3435,3476,3526,3585,3629,3680,3724,3773,3822,3869,3916,3963,4008,4059,4112,4187,4246,4303,4377,4441,4510,4588,4698,4802,4875,4941,4996,5061,5126,5175,5258,5336,5374,5419,5467,5529,5586,5641,5700,5767,5825,5887,5935,5980,6028,6079,6145,6211" } }, { @@ -42,45 +42,6 @@ } } ] - }, - { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", - "map": [ - { - "source": "D:\\Android Studio\\Notes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,123,-1,-1,122,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6675,-1,-1,6629,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6722,-1,-1,6669,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "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" - } - }, - { - "source": "D:\\Android Studio\\Notes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - } - ] } ] } \ No newline at end of file diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 247e1f1..77471f3 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml", + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", "map": [ { "source": "D:\\Android Studio\\Notes\\app\\src\\main\\res\\values\\colors.xml", @@ -23,20 +23,20 @@ { "source": "D:\\Android Studio\\Notes\\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": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", - "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": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" + "startLines": "135,72,75,74,73,19,20,21,118,119,127,126,131,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,129,68,47,128,52,51,50,66,46,65,44,45,69,132,28,140,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,4,4,4,4,4", + "startOffsets": "8360,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,8256,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,8190,3699,2471,8136,2769,2680,2621,3586,2420,3540,2315,2359,3763,8305,1459,8774,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", + "endLines": "139,72,75,74,73,19,20,21,118,119,127,126,131,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,129,68,47,128,52,51,50,66,46,65,44,45,69,132,28,140,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,47,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,62,46,52,54,87,57,61,49,44,42,59,66,49,54,46,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": "8768,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,8299,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,8248,3757,2513,8184,2819,2763,2674,3643,2465,3580,2353,2414,3825,8350,1509,8816,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" }, "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,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", + "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", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1852,1936,2030,2138,2209,2293,2376,2442,2525,2627,2688,2750,2801,2879,2932,2992,3097,3156,3258,3313,3384,3433,3491,3538,3597,3654,3725,3786,3843,3893,3945,3998,4048,4098,4158,4211,4277,4339,4402,4465,4512,4565,4620,4708,4766,4828,4878,4923,4966,5026,5093,5143,5198,5245,5300,5353,5400,5453,5509,5557,5612,5665,5749,5816,5880,5976,6050,6131,6220,6383,6527,6606,6681,6763,6822,6902,6982,7037,7159,7262,7303,7356,7413,7487,7552,7620,7706,7786,7855,7949,8008,8063,8125,8185,8295", + "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,125,126,127,128,129", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,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,62,46,52,54,87,57,61,49,44,42,59,66,49,54,46,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,1847,1931,2025,2133,2204,2288,2371,2437,2520,2622,2683,2745,2796,2874,2927,2987,3092,3151,3253,3308,3379,3428,3486,3533,3592,3649,3720,3781,3838,3888,3940,3993,4043,4093,4153,4206,4272,4334,4397,4460,4507,4560,4615,4703,4761,4823,4873,4918,4961,5021,5088,5138,5193,5240,5295,5348,5395,5448,5504,5552,5607,5660,5744,5811,5875,5971,6045,6126,6215,6378,6522,6601,6676,6758,6817,6897,6977,7032,7154,7257,7298,7351,7408,7482,7547,7615,7701,7781,7850,7944,8003,8058,8120,8180,8290,8380" } }, { @@ -50,12 +50,12 @@ "endOffsets": "2053,2307,2782,2517,617,831,1045,1298,1555,406,1802" }, "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startLines": "130,134,138,142,145,149,153,157,161,165,169", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8332,8543,8753,8913,9096,9281,9466,9669,9875,10058", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "startOffsets": "8385,8593,8804,9014,9174,9357,9542,9727,9930,10136,10319", + "endLines": "133,137,141,144,148,152,156,160,164,168,172", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8327,8538,8748,8908,9091,9276,9461,9664,9870,10053,10254" + "endOffsets": "8588,8799,9009,9169,9352,9537,9722,9925,10131,10314,10515" } }, { @@ -95,92 +95,6 @@ } } ] - }, - { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", - "map": [ - { - "source": "D:\\Android Studio\\Notes\\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": "D:\\Android Studio\\Notes\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "130,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,129,-1,-1,128,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "8254,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8190,-1,-1,8136,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,129,-1,-1,128,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,52,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8662,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8248,-1,-1,8184,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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", - "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,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,4417,4464,4517,4572,4660,4718,4780,4830,4875,4918,4978,5045,5100,5155,5208,5255,5308,5364,5412,5467,5520,5604,5671,5735,5831,5905,5986,6075,6238,6382,6461,6536,6618,6677,6757,6837,6892,7014,7117,7158,7211,7268,7342,7407,7475,7561,7641,7710,7804,7863,7918,7980,8040,8150", - "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,125,126", - "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,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,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,4412,4459,4512,4567,4655,4713,4775,4825,4870,4913,4973,5040,5095,5150,5203,5250,5303,5359,5407,5462,5515,5599,5666,5730,5826,5900,5981,6070,6233,6377,6456,6531,6613,6672,6752,6832,6887,7009,7112,7153,7206,7263,7337,7402,7470,7556,7636,7705,7799,7858,7913,7975,8035,8145,8235" - } - }, - { - "source": "D:\\Android Studio\\Notes\\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": "127,131,135,139,142,146,150,154,158,162,166", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8240,8448,8659,8869,9029,9212,9397,9582,9785,9991,10174", - "endLines": "130,134,138,141,145,149,153,157,161,165,169", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8443,8654,8864,9024,9207,9392,9577,9780,9986,10169,10370" - } - }, - { - "source": "D:\\Android Studio\\Notes\\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": "D:\\Android Studio\\Notes\\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/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json index 9893787..1504e05 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -4,12 +4,12 @@ "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_middle.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_color_btn_mask.png" + "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background1.png.flat", + "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background1.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_sub_folder.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/sub_folder.xml" + "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_color_btn_mask.png" }, { "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_dropdown_menu.xml.flat", @@ -47,14 +47,14 @@ "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_green.png.flat", "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_green.png" }, - { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png" - }, { "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_middle.9.png.flat", "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_middle.9.png" }, + { + "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat", + "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png" + }, { "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_middle.9.png.flat", "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_middle.9.png" @@ -71,6 +71,10 @@ "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_up.9.png.flat", "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_up.9.png" }, + { + "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background2.png.flat", + "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background2.png" + }, { "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_top.png.flat", "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_top.png" @@ -112,25 +116,25 @@ "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_white.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml" + "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png" }, { "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat", "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png" - }, - { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_move.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_move.png" + "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat", + "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml" }, { "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_4x_info.xml.flat", "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_4x_info.xml" }, + { + "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_move.png.flat", + "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_move.png" + }, { "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_size_selector_bg.9.png.flat", "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_size_selector_bg.9.png" @@ -139,10 +143,6 @@ "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list.xml.flat", "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list.xml" }, - { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_list.xml" - }, { "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat", "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.9.png" @@ -183,6 +183,10 @@ "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_yellow.png.flat", "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_yellow.png" }, + { + "merged": "net.micode.notes.app-merged_res-5:/menu_note_edit.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/note_edit.xml" + }, { "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat", "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_options.xml" @@ -219,6 +223,10 @@ "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw_introduction.flat", "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw\\introduction" }, + { + "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_background.png.flat", + "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\background.png" + }, { "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app.png.flat", "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app.png" @@ -375,6 +383,10 @@ "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_call_record.png.flat", "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\call_record.png" }, + { + "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_old_list_background.png.flat", + "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\old_list_background.png" + }, { "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_yellow.9.png.flat", "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_yellow.9.png" diff --git a/src/Notes/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index e5c4ab8..8657c4e 100644 Binary files a/src/Notes/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex index 5a9a2fb..dda4c93 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex index 2e4e77e..e415fba 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex index a726a88..d6a8561 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex index d40c547..44fced2 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex index 5d78e30..2415a35 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex index 887e252..0645a00 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex index 4b2c37b..4c1f24b 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex index 1384a09..72737fa 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex index 9c99002..50a0152 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index a2903d7..dd4e97a 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex index 4a13d6c..5d49b09 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex index 99d5f25..f7554ae 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index b124637..30a7689 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index 24e94eb..b88d338 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex index b09ddc9..f1e8a1b 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index 77c19b8..a2d1ed3 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex index c307684..df44bac 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex index 60cff32..6a1a2f5 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex index 25b4dc0..0e3662c 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex index f9ccd76..b8185bc 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex index b84bf80..ae79c68 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex index 9b2f3a4..5d1d8ca 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index 185262b..44d2258 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex index 98299df..ee9b291 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index 9c8acab..6bbcc03 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex index bde9d23..3e760e9 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex index a5ae42c..dd72aac 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex index ef6f063..a4a86a6 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex index 5a919bf..8d0f489 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex index 2649456..a91f6a7 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index 372c9be..0823103 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex index e154756..da7a3f6 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex index 71888bd..5936c4a 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index ab91fac..e737493 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index 8430849..81bbf81 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex index 7350005..82811a4 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex index 7ff660c..e26990f 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex index 6d6d3d4..a0f5280 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index 10d6934..32b82cc 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/src/Notes/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes/app/build/intermediates/runtime_symbol_list/debug/R.txt index bb22778..e60a799 100644 --- a/src/Notes/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ b/src/Notes/app/build/intermediates/runtime_symbol_list/debug/R.txt @@ -30,51 +30,53 @@ int drawable font_size_selector_bg 0x7f040012 int drawable font_small 0x7f040013 int drawable font_super 0x7f040014 int drawable icon_app 0x7f040015 -int drawable list_background 0x7f040016 -int drawable list_blue_down 0x7f040017 -int drawable list_blue_middle 0x7f040018 -int drawable list_blue_single 0x7f040019 -int drawable list_blue_up 0x7f04001a -int drawable list_folder 0x7f04001b -int drawable list_footer_bg 0x7f04001c -int drawable list_green_down 0x7f04001d -int drawable list_green_middle 0x7f04001e -int drawable list_green_single 0x7f04001f -int drawable list_green_up 0x7f040020 -int drawable list_red_down 0x7f040021 -int drawable list_red_middle 0x7f040022 -int drawable list_red_single 0x7f040023 -int drawable list_red_up 0x7f040024 -int drawable list_white_down 0x7f040025 -int drawable list_white_middle 0x7f040026 -int drawable list_white_single 0x7f040027 -int drawable list_white_up 0x7f040028 -int drawable list_yellow_down 0x7f040029 -int drawable list_yellow_middle 0x7f04002a -int drawable list_yellow_single 0x7f04002b -int drawable list_yellow_up 0x7f04002c -int drawable menu_delete 0x7f04002d -int drawable menu_move 0x7f04002e -int drawable menu_top 0x7f04002f -int drawable new_note 0x7f040030 -int drawable new_note_normal 0x7f040031 -int drawable new_note_pressed 0x7f040032 -int drawable note_edit_color_selector_panel 0x7f040033 -int drawable notification 0x7f040034 -int drawable search_result 0x7f040035 -int drawable selected 0x7f040036 -int drawable title_alert 0x7f040037 -int drawable title_bar_bg 0x7f040038 -int drawable widget_2x_blue 0x7f040039 -int drawable widget_2x_green 0x7f04003a -int drawable widget_2x_red 0x7f04003b -int drawable widget_2x_white 0x7f04003c -int drawable widget_2x_yellow 0x7f04003d -int drawable widget_4x_blue 0x7f04003e -int drawable widget_4x_green 0x7f04003f -int drawable widget_4x_red 0x7f040040 -int drawable widget_4x_white 0x7f040041 -int drawable widget_4x_yellow 0x7f040042 +int drawable list_background1 0x7f040016 +int drawable list_background2 0x7f040017 +int drawable list_blue_down 0x7f040018 +int drawable list_blue_middle 0x7f040019 +int drawable list_blue_single 0x7f04001a +int drawable list_blue_up 0x7f04001b +int drawable list_folder 0x7f04001c +int drawable list_footer_bg 0x7f04001d +int drawable list_green_down 0x7f04001e +int drawable list_green_middle 0x7f04001f +int drawable list_green_single 0x7f040020 +int drawable list_green_up 0x7f040021 +int drawable list_red_down 0x7f040022 +int drawable list_red_middle 0x7f040023 +int drawable list_red_single 0x7f040024 +int drawable list_red_up 0x7f040025 +int drawable list_white_down 0x7f040026 +int drawable list_white_middle 0x7f040027 +int drawable list_white_single 0x7f040028 +int drawable list_white_up 0x7f040029 +int drawable list_yellow_down 0x7f04002a +int drawable list_yellow_middle 0x7f04002b +int drawable list_yellow_single 0x7f04002c +int drawable list_yellow_up 0x7f04002d +int drawable menu_delete 0x7f04002e +int drawable menu_move 0x7f04002f +int drawable menu_top 0x7f040030 +int drawable new_note 0x7f040031 +int drawable new_note_normal 0x7f040032 +int drawable new_note_pressed 0x7f040033 +int drawable note_edit_color_selector_panel 0x7f040034 +int drawable notification 0x7f040035 +int drawable old_list_background 0x7f040036 +int drawable search_result 0x7f040037 +int drawable selected 0x7f040038 +int drawable title_alert 0x7f040039 +int drawable title_bar_bg 0x7f04003a +int drawable widget_2x_blue 0x7f04003b +int drawable widget_2x_green 0x7f04003c +int drawable widget_2x_red 0x7f04003d +int drawable widget_2x_white 0x7f04003e +int drawable widget_2x_yellow 0x7f04003f +int drawable widget_4x_blue 0x7f040040 +int drawable widget_4x_green 0x7f040041 +int drawable widget_4x_red 0x7f040042 +int drawable widget_4x_white 0x7f040043 +int drawable widget_4x_yellow 0x7f040044 int id account_dialog_subtitle 0x7f050000 int id account_dialog_title 0x7f050001 int id action_select_all 0x7f050002 @@ -109,44 +111,48 @@ int id ll_font_normal 0x7f05001e int id ll_font_small 0x7f05001f int id ll_font_super 0x7f050020 int id menu_alert 0x7f050021 -int id menu_delete 0x7f050022 -int id menu_delete_remind 0x7f050023 -int id menu_export_text 0x7f050024 -int id menu_font_size 0x7f050025 -int id menu_list_mode 0x7f050026 -int id menu_new_folder 0x7f050027 -int id menu_new_note 0x7f050028 -int id menu_quit_secret 0x7f050029 -int id menu_search 0x7f05002a -int id menu_secret 0x7f05002b -int id menu_send_to_desktop 0x7f05002c -int id menu_setting 0x7f05002d -int id menu_share 0x7f05002e -int id menu_sync 0x7f05002f -int id menu_top 0x7f050030 -int id minute 0x7f050031 -int id move 0x7f050032 -int id navigation_bar 0x7f050033 -int id note_bg_color_selector 0x7f050034 -int id note_edit_list 0x7f050035 -int id note_edit_view 0x7f050036 -int id note_item 0x7f050037 -int id note_title 0x7f050038 -int id notes_list 0x7f050039 -int id prefenerece_sync_status_textview 0x7f05003a -int id preference_sync_button 0x7f05003b -int id selection_menu 0x7f05003c -int id sv_note_edit 0x7f05003d -int id tv_alert_date 0x7f05003e -int id tv_folder_name 0x7f05003f -int id tv_modified_date 0x7f050040 -int id tv_name 0x7f050041 -int id tv_time 0x7f050042 -int id tv_title 0x7f050043 -int id tv_title_bar 0x7f050044 -int id tv_top_text 0x7f050045 -int id widget_bg_image 0x7f050046 -int id widget_text 0x7f050047 +int id menu_count_word 0x7f050022 +int id menu_daytime 0x7f050023 +int id menu_delete 0x7f050024 +int id menu_delete_remind 0x7f050025 +int id menu_export_text 0x7f050026 +int id menu_font_size 0x7f050027 +int id menu_list_mode 0x7f050028 +int id menu_new_folder 0x7f050029 +int id menu_new_note 0x7f05002a +int id menu_night_time 0x7f05002b +int id menu_quit_secret 0x7f05002c +int id menu_search 0x7f05002d +int id menu_secret 0x7f05002e +int id menu_send_to_desktop 0x7f05002f +int id menu_setting 0x7f050030 +int id menu_share 0x7f050031 +int id menu_sync 0x7f050032 +int id menu_top 0x7f050033 +int id minute 0x7f050034 +int id move 0x7f050035 +int id navigation_bar 0x7f050036 +int id note_bg_color_selector 0x7f050037 +int id note_edit_list 0x7f050038 +int id note_edit_view 0x7f050039 +int id note_item 0x7f05003a +int id note_title 0x7f05003b +int id notes_list 0x7f05003c +int id prefenerece_sync_status_textview 0x7f05003d +int id preference_sync_button 0x7f05003e +int id selection_menu 0x7f05003f +int id sv_note_edit 0x7f050040 +int id text_num 0x7f050041 +int id tv_alert_date 0x7f050042 +int id tv_folder_name 0x7f050043 +int id tv_modified_date 0x7f050044 +int id tv_name 0x7f050045 +int id tv_time 0x7f050046 +int id tv_title 0x7f050047 +int id tv_title_bar 0x7f050048 +int id tv_top_text 0x7f050049 +int id widget_bg_image 0x7f05004a +int id widget_text 0x7f05004b int layout account_dialog_title 0x7f060000 int layout add_account_text 0x7f060001 int layout datetime_picker 0x7f060002 @@ -181,99 +187,102 @@ int string button_delete 0x7f0a0007 int string call_record_folder_name 0x7f0a0008 int string datetime_dialog_cancel 0x7f0a0009 int string datetime_dialog_ok 0x7f0a000a -int string delete_remind_time_message 0x7f0a000b -int string error_note_empty_for_clock 0x7f0a000c -int string error_note_empty_for_send_to_desktop 0x7f0a000d -int string error_note_not_exist 0x7f0a000e -int string error_sdcard_export 0x7f0a000f -int string error_sdcard_unmounted 0x7f0a0010 -int string error_sync_cancelled 0x7f0a0011 -int string error_sync_internal 0x7f0a0012 -int string error_sync_network 0x7f0a0013 -int string failed_sdcard_export 0x7f0a0014 -int string file_name_txt_format 0x7f0a0015 -int string file_path 0x7f0a0016 -int string folder_exist 0x7f0a0017 -int string format_date_ymd 0x7f0a0018 -int string format_datetime_mdhm 0x7f0a0019 -int string format_exported_file_location 0x7f0a001a -int string format_folder_files_count 0x7f0a001b -int string format_move_notes_to_folder 0x7f0a001c -int string hint_foler_name 0x7f0a001d -int string info_note_enter_desktop 0x7f0a001e -int string menu_alert 0x7f0a001f -int string menu_create_folder 0x7f0a0020 -int string menu_delete 0x7f0a0021 -int string menu_deselect_all 0x7f0a0022 -int string menu_export_text 0x7f0a0023 -int string menu_folder_change_name 0x7f0a0024 -int string menu_folder_delete 0x7f0a0025 -int string menu_folder_view 0x7f0a0026 -int string menu_font_large 0x7f0a0027 -int string menu_font_normal 0x7f0a0028 -int string menu_font_size 0x7f0a0029 -int string menu_font_small 0x7f0a002a -int string menu_font_super 0x7f0a002b -int string menu_list_mode 0x7f0a002c -int string menu_move 0x7f0a002d -int string menu_move_parent_folder 0x7f0a002e -int string menu_normal_mode 0x7f0a002f -int string menu_quit_secret 0x7f0a0030 -int string menu_remove_remind 0x7f0a0031 -int string menu_search 0x7f0a0032 -int string menu_secret 0x7f0a0033 -int string menu_select_all 0x7f0a0034 -int string menu_select_none 0x7f0a0035 -int string menu_select_title 0x7f0a0036 -int string menu_send_to_desktop 0x7f0a0037 -int string menu_setting 0x7f0a0038 -int string menu_share 0x7f0a0039 -int string menu_sync 0x7f0a003a -int string menu_sync_cancel 0x7f0a003b -int string menu_title_select_folder 0x7f0a003c -int string note_alert_expired 0x7f0a003d -int string note_link_email 0x7f0a003e -int string note_link_other 0x7f0a003f -int string note_link_tel 0x7f0a0040 -int string note_link_web 0x7f0a0041 -int string notealert_enter 0x7f0a0042 -int string notealert_ok 0x7f0a0043 -int string notelist_menu_new 0x7f0a0044 -int string notelist_string_info 0x7f0a0045 -int string preferences_account_summary 0x7f0a0046 -int string preferences_account_title 0x7f0a0047 -int string preferences_add_account 0x7f0a0048 -int string preferences_bg_random_appear_title 0x7f0a0049 -int string preferences_button_sync_cancel 0x7f0a004a -int string preferences_button_sync_immediately 0x7f0a004b -int string preferences_dialog_change_account_title 0x7f0a004c -int string preferences_dialog_change_account_warn_msg 0x7f0a004d -int string preferences_dialog_select_account_tips 0x7f0a004e -int string preferences_dialog_select_account_title 0x7f0a004f -int string preferences_last_sync_time 0x7f0a0050 -int string preferences_last_sync_time_format 0x7f0a0051 -int string preferences_menu_cancel 0x7f0a0052 -int string preferences_menu_change_account 0x7f0a0053 -int string preferences_menu_remove_account 0x7f0a0054 -int string preferences_title 0x7f0a0055 -int string preferences_toast_cannot_change_account 0x7f0a0056 -int string preferences_toast_success_set_accout 0x7f0a0057 -int string search 0x7f0a0058 -int string search_hint 0x7f0a0059 -int string search_label 0x7f0a005a -int string search_setting_description 0x7f0a005b -int string set_remind_time_message 0x7f0a005c -int string success_sdcard_export 0x7f0a005d -int string success_sync_account 0x7f0a005e -int string sync_progress_init_list 0x7f0a005f -int string sync_progress_login 0x7f0a0060 -int string sync_progress_syncing 0x7f0a0061 -int string ticker_cancel 0x7f0a0062 -int string ticker_fail 0x7f0a0063 -int string ticker_success 0x7f0a0064 -int string ticker_syncing 0x7f0a0065 -int string widget_havenot_content 0x7f0a0066 -int string widget_under_visit_mode 0x7f0a0067 +int string day_time 0x7f0a000b +int string delete_remind_time_message 0x7f0a000c +int string error_note_empty_for_clock 0x7f0a000d +int string error_note_empty_for_send_to_desktop 0x7f0a000e +int string error_note_not_exist 0x7f0a000f +int string error_sdcard_export 0x7f0a0010 +int string error_sdcard_unmounted 0x7f0a0011 +int string error_sync_cancelled 0x7f0a0012 +int string error_sync_internal 0x7f0a0013 +int string error_sync_network 0x7f0a0014 +int string failed_sdcard_export 0x7f0a0015 +int string file_name_txt_format 0x7f0a0016 +int string file_path 0x7f0a0017 +int string folder_exist 0x7f0a0018 +int string format_date_ymd 0x7f0a0019 +int string format_datetime_mdhm 0x7f0a001a +int string format_exported_file_location 0x7f0a001b +int string format_folder_files_count 0x7f0a001c +int string format_move_notes_to_folder 0x7f0a001d +int string hint_foler_name 0x7f0a001e +int string info_note_enter_desktop 0x7f0a001f +int string menu_alert 0x7f0a0020 +int string menu_create_folder 0x7f0a0021 +int string menu_delete 0x7f0a0022 +int string menu_deselect_all 0x7f0a0023 +int string menu_export_text 0x7f0a0024 +int string menu_folder_change_name 0x7f0a0025 +int string menu_folder_delete 0x7f0a0026 +int string menu_folder_view 0x7f0a0027 +int string menu_font_large 0x7f0a0028 +int string menu_font_normal 0x7f0a0029 +int string menu_font_size 0x7f0a002a +int string menu_font_small 0x7f0a002b +int string menu_font_super 0x7f0a002c +int string menu_list_mode 0x7f0a002d +int string menu_move 0x7f0a002e +int string menu_move_parent_folder 0x7f0a002f +int string menu_normal_mode 0x7f0a0030 +int string menu_quit_secret 0x7f0a0031 +int string menu_remove_remind 0x7f0a0032 +int string menu_search 0x7f0a0033 +int string menu_secret 0x7f0a0034 +int string menu_select_all 0x7f0a0035 +int string menu_select_none 0x7f0a0036 +int string menu_select_title 0x7f0a0037 +int string menu_send_to_desktop 0x7f0a0038 +int string menu_setting 0x7f0a0039 +int string menu_share 0x7f0a003a +int string menu_sync 0x7f0a003b +int string menu_sync_cancel 0x7f0a003c +int string menu_title_select_folder 0x7f0a003d +int string night_time 0x7f0a003e +int string note_alert_expired 0x7f0a003f +int string note_length 0x7f0a0040 +int string note_link_email 0x7f0a0041 +int string note_link_other 0x7f0a0042 +int string note_link_tel 0x7f0a0043 +int string note_link_web 0x7f0a0044 +int string notealert_enter 0x7f0a0045 +int string notealert_ok 0x7f0a0046 +int string notelist_menu_new 0x7f0a0047 +int string notelist_string_info 0x7f0a0048 +int string preferences_account_summary 0x7f0a0049 +int string preferences_account_title 0x7f0a004a +int string preferences_add_account 0x7f0a004b +int string preferences_bg_random_appear_title 0x7f0a004c +int string preferences_button_sync_cancel 0x7f0a004d +int string preferences_button_sync_immediately 0x7f0a004e +int string preferences_dialog_change_account_title 0x7f0a004f +int string preferences_dialog_change_account_warn_msg 0x7f0a0050 +int string preferences_dialog_select_account_tips 0x7f0a0051 +int string preferences_dialog_select_account_title 0x7f0a0052 +int string preferences_last_sync_time 0x7f0a0053 +int string preferences_last_sync_time_format 0x7f0a0054 +int string preferences_menu_cancel 0x7f0a0055 +int string preferences_menu_change_account 0x7f0a0056 +int string preferences_menu_remove_account 0x7f0a0057 +int string preferences_title 0x7f0a0058 +int string preferences_toast_cannot_change_account 0x7f0a0059 +int string preferences_toast_success_set_accout 0x7f0a005a +int string search 0x7f0a005b +int string search_hint 0x7f0a005c +int string search_label 0x7f0a005d +int string search_setting_description 0x7f0a005e +int string set_remind_time_message 0x7f0a005f +int string success_sdcard_export 0x7f0a0060 +int string success_sync_account 0x7f0a0061 +int string sync_progress_init_list 0x7f0a0062 +int string sync_progress_login 0x7f0a0063 +int string sync_progress_syncing 0x7f0a0064 +int string ticker_cancel 0x7f0a0065 +int string ticker_fail 0x7f0a0066 +int string ticker_success 0x7f0a0067 +int string ticker_syncing 0x7f0a0068 +int string widget_havenot_content 0x7f0a0069 +int string widget_under_visit_mode 0x7f0a006a int style HighlightTextAppearancePrimary 0x7f0b0000 int style HighlightTextAppearanceSecondary 0x7f0b0001 int style NoteActionBarStyle 0x7f0b0002 diff --git a/src/Notes/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt index 00ec23f..6195d2b 100644 --- a/src/Notes/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ b/src/Notes/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -4,288 +4,297 @@ net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 -net.micode.notes:style/NoteTheme = 0x7f0b0003 net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 -net.micode.notes:string/ticker_syncing = 0x7f0a0065 -net.micode.notes:string/ticker_success = 0x7f0a0064 -net.micode.notes:string/ticker_fail = 0x7f0a0063 -net.micode.notes:string/ticker_cancel = 0x7f0a0062 -net.micode.notes:string/sync_progress_login = 0x7f0a0060 -net.micode.notes:string/success_sdcard_export = 0x7f0a005d -net.micode.notes:string/set_remind_time_message = 0x7f0a005c -net.micode.notes:string/search_hint = 0x7f0a0059 -net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0057 -net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0056 -net.micode.notes:string/preferences_title = 0x7f0a0055 -net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0054 -net.micode.notes:string/preferences_menu_change_account = 0x7f0a0053 -net.micode.notes:string/preferences_menu_cancel = 0x7f0a0052 -net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0051 -net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004e -net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004d -net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004c -net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a004b -net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a004a -net.micode.notes:string/preferences_add_account = 0x7f0a0048 -net.micode.notes:string/preferences_account_title = 0x7f0a0047 -net.micode.notes:string/preferences_account_summary = 0x7f0a0046 -net.micode.notes:string/widget_havenot_content = 0x7f0a0066 -net.micode.notes:string/notelist_string_info = 0x7f0a0045 -net.micode.notes:string/notelist_menu_new = 0x7f0a0044 -net.micode.notes:string/notealert_ok = 0x7f0a0043 -net.micode.notes:string/notealert_enter = 0x7f0a0042 -net.micode.notes:string/note_link_web = 0x7f0a0041 -net.micode.notes:string/sync_progress_init_list = 0x7f0a005f -net.micode.notes:string/note_link_tel = 0x7f0a0040 -net.micode.notes:string/note_link_email = 0x7f0a003e -net.micode.notes:string/note_alert_expired = 0x7f0a003d -net.micode.notes:string/menu_sync = 0x7f0a003a -net.micode.notes:string/menu_share = 0x7f0a0039 -net.micode.notes:string/menu_setting = 0x7f0a0038 -net.micode.notes:string/menu_select_title = 0x7f0a0036 -net.micode.notes:string/menu_select_none = 0x7f0a0035 -net.micode.notes:string/menu_select_all = 0x7f0a0034 -net.micode.notes:string/menu_quit_secret = 0x7f0a0030 -net.micode.notes:string/menu_list_mode = 0x7f0a002c -net.micode.notes:string/menu_font_super = 0x7f0a002b -net.micode.notes:string/menu_font_size = 0x7f0a0029 -net.micode.notes:string/menu_font_normal = 0x7f0a0028 -net.micode.notes:string/menu_font_large = 0x7f0a0027 -net.micode.notes:string/menu_export_text = 0x7f0a0023 -net.micode.notes:string/menu_create_folder = 0x7f0a0020 -net.micode.notes:string/menu_alert = 0x7f0a001f -net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e -net.micode.notes:string/hint_foler_name = 0x7f0a001d -net.micode.notes:string/format_folder_files_count = 0x7f0a001b -net.micode.notes:string/search_label = 0x7f0a005a -net.micode.notes:string/format_exported_file_location = 0x7f0a001a -net.micode.notes:string/file_path = 0x7f0a0016 -net.micode.notes:string/error_sync_cancelled = 0x7f0a0011 -net.micode.notes:string/error_sdcard_export = 0x7f0a000f +net.micode.notes:string/ticker_syncing = 0x7f0a0068 +net.micode.notes:string/ticker_success = 0x7f0a0067 +net.micode.notes:string/ticker_fail = 0x7f0a0066 +net.micode.notes:string/ticker_cancel = 0x7f0a0065 +net.micode.notes:string/sync_progress_login = 0x7f0a0063 +net.micode.notes:string/set_remind_time_message = 0x7f0a005f +net.micode.notes:string/search_hint = 0x7f0a005c +net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a005a +net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0059 +net.micode.notes:string/preferences_title = 0x7f0a0058 +net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0057 +net.micode.notes:string/preferences_menu_change_account = 0x7f0a0056 +net.micode.notes:string/preferences_menu_cancel = 0x7f0a0055 +net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0054 +net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a0051 +net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a0050 +net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004f +net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a004e +net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a004d +net.micode.notes:string/preferences_add_account = 0x7f0a004b +net.micode.notes:string/preferences_account_title = 0x7f0a004a +net.micode.notes:string/preferences_account_summary = 0x7f0a0049 +net.micode.notes:string/widget_havenot_content = 0x7f0a0069 +net.micode.notes:string/notelist_string_info = 0x7f0a0048 +net.micode.notes:string/notelist_menu_new = 0x7f0a0047 +net.micode.notes:string/notealert_ok = 0x7f0a0046 +net.micode.notes:string/notealert_enter = 0x7f0a0045 +net.micode.notes:string/note_link_web = 0x7f0a0044 +net.micode.notes:string/sync_progress_init_list = 0x7f0a0062 +net.micode.notes:string/note_link_tel = 0x7f0a0043 +net.micode.notes:string/note_link_email = 0x7f0a0041 +net.micode.notes:string/note_alert_expired = 0x7f0a003f +net.micode.notes:string/night_time = 0x7f0a003e +net.micode.notes:string/menu_sync = 0x7f0a003b +net.micode.notes:string/menu_share = 0x7f0a003a +net.micode.notes:string/menu_setting = 0x7f0a0039 +net.micode.notes:string/menu_select_title = 0x7f0a0037 +net.micode.notes:string/menu_select_none = 0x7f0a0036 +net.micode.notes:string/menu_select_all = 0x7f0a0035 +net.micode.notes:string/menu_quit_secret = 0x7f0a0031 +net.micode.notes:string/menu_list_mode = 0x7f0a002d +net.micode.notes:string/menu_font_super = 0x7f0a002c +net.micode.notes:string/menu_font_size = 0x7f0a002a +net.micode.notes:string/menu_font_normal = 0x7f0a0029 +net.micode.notes:string/menu_font_large = 0x7f0a0028 +net.micode.notes:string/menu_export_text = 0x7f0a0024 +net.micode.notes:string/menu_delete = 0x7f0a0022 +net.micode.notes:string/menu_create_folder = 0x7f0a0021 +net.micode.notes:string/menu_alert = 0x7f0a0020 +net.micode.notes:string/info_note_enter_desktop = 0x7f0a001f +net.micode.notes:string/hint_foler_name = 0x7f0a001e +net.micode.notes:string/format_folder_files_count = 0x7f0a001c +net.micode.notes:string/search_label = 0x7f0a005d +net.micode.notes:string/format_exported_file_location = 0x7f0a001b +net.micode.notes:string/note_link_other = 0x7f0a0042 +net.micode.notes:string/folder_exist = 0x7f0a0018 +net.micode.notes:string/file_path = 0x7f0a0017 +net.micode.notes:string/file_name_txt_format = 0x7f0a0016 +net.micode.notes:string/error_sync_network = 0x7f0a0014 +net.micode.notes:string/error_sync_cancelled = 0x7f0a0012 +net.micode.notes:string/error_sdcard_export = 0x7f0a0010 +net.micode.notes:xml/widget_2x_info = 0x7f0c0002 +net.micode.notes:drawable/edit_white = 0x7f04000e +net.micode.notes:string/day_time = 0x7f0a000b net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a net.micode.notes:layout/settings_header = 0x7f06000b net.micode.notes:string/button_delete = 0x7f0a0007 net.micode.notes:string/alert_message_delete_note = 0x7f0a0001 -net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c +net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001d net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 -net.micode.notes:id/move = 0x7f050032 +net.micode.notes:id/move = 0x7f050035 net.micode.notes:raw/introduction = 0x7f090000 -net.micode.notes:drawable/list_blue_down = 0x7f040017 +net.micode.notes:drawable/list_blue_down = 0x7f040018 +net.micode.notes:drawable/list_yellow_middle = 0x7f04002b net.micode.notes:id/iv_bg_red = 0x7f050012 -net.micode.notes:drawable/list_yellow_middle = 0x7f04002a -net.micode.notes:id/widget_bg_image = 0x7f050046 +net.micode.notes:id/widget_bg_image = 0x7f05004a net.micode.notes:menu/sub_folder = 0x7f070006 -net.micode.notes:drawable/widget_2x_yellow = 0x7f04003d +net.micode.notes:drawable/widget_2x_yellow = 0x7f04003f net.micode.notes:menu/note_list_options = 0x7f070005 net.micode.notes:menu/note_list = 0x7f070003 net.micode.notes:menu/call_note_edit = 0x7f070000 net.micode.notes:string/app_name = 0x7f0a0004 net.micode.notes:layout/widget_4x = 0x7f06000d -net.micode.notes:string/menu_sync_cancel = 0x7f0a003b -net.micode.notes:string/menu_send_to_desktop = 0x7f0a0037 -net.micode.notes:id/menu_secret = 0x7f05002b -net.micode.notes:string/error_sync_internal = 0x7f0a0012 +net.micode.notes:string/format_date_ymd = 0x7f0a0019 +net.micode.notes:id/ll_font_super = 0x7f050020 +net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009 net.micode.notes:layout/folder_list_item = 0x7f060004 net.micode.notes:menu/note_edit = 0x7f070002 -net.micode.notes:string/menu_folder_view = 0x7f0a0026 +net.micode.notes:string/menu_folder_view = 0x7f0a0027 net.micode.notes:drawable/font_super = 0x7f040014 net.micode.notes:layout/note_list = 0x7f060008 -net.micode.notes:id/menu_share = 0x7f05002e +net.micode.notes:id/menu_share = 0x7f050031 net.micode.notes:string/app_widget4x4 = 0x7f0a0006 net.micode.notes:menu/call_record_folder = 0x7f070001 -net.micode.notes:id/tv_name = 0x7f050041 +net.micode.notes:id/tv_name = 0x7f050045 net.micode.notes:layout/note_item = 0x7f060007 net.micode.notes:dimen/text_font_size_normal = 0x7f030002 net.micode.notes:layout/note_edit_list_item = 0x7f060006 net.micode.notes:layout/datetime_picker = 0x7f060002 net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 net.micode.notes:layout/account_dialog_title = 0x7f060000 -net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004f -net.micode.notes:drawable/list_green_up = 0x7f040020 +net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a0052 +net.micode.notes:drawable/list_green_up = 0x7f040021 net.micode.notes:id/iv_top_icon = 0x7f05001c net.micode.notes:layout/add_account_text = 0x7f060001 -net.micode.notes:id/widget_text = 0x7f050047 +net.micode.notes:id/widget_text = 0x7f05004b net.micode.notes:menu/note_list_dropdown = 0x7f070004 net.micode.notes:id/iv_bg_blue_select = 0x7f05000f -net.micode.notes:id/tv_title_bar = 0x7f050044 -net.micode.notes:id/tv_folder_name = 0x7f05003f -net.micode.notes:id/tv_alert_date = 0x7f05003e -net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 -net.micode.notes:id/sv_note_edit = 0x7f05003d -net.micode.notes:id/prefenerece_sync_status_textview = 0x7f05003a -net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009 -net.micode.notes:id/ll_font_super = 0x7f050020 -net.micode.notes:string/format_date_ymd = 0x7f0a0018 +net.micode.notes:id/tv_title_bar = 0x7f050048 +net.micode.notes:id/tv_alert_date = 0x7f050042 +net.micode.notes:string/menu_folder_change_name = 0x7f0a0025 +net.micode.notes:id/sv_note_edit = 0x7f050040 +net.micode.notes:id/prefenerece_sync_status_textview = 0x7f05003d net.micode.notes:id/iv_bg_yellow_select = 0x7f050017 -net.micode.notes:id/note_edit_view = 0x7f050036 -net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d +net.micode.notes:id/note_edit_view = 0x7f050039 +net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000e net.micode.notes:drawable/font_small = 0x7f040013 -net.micode.notes:id/note_bg_color_selector = 0x7f050034 -net.micode.notes:id/navigation_bar = 0x7f050033 +net.micode.notes:id/note_bg_color_selector = 0x7f050037 +net.micode.notes:id/navigation_bar = 0x7f050036 net.micode.notes:id/ll_font_normal = 0x7f05001e -net.micode.notes:id/minute = 0x7f050031 -net.micode.notes:id/menu_sync = 0x7f05002f -net.micode.notes:string/file_name_txt_format = 0x7f0a0015 +net.micode.notes:id/minute = 0x7f050034 +net.micode.notes:id/menu_sync = 0x7f050032 net.micode.notes:color/primary_text_dark = 0x7f020000 -net.micode.notes:id/menu_setting = 0x7f05002d -net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010 -net.micode.notes:id/menu_search = 0x7f05002a -net.micode.notes:drawable/list_white_down = 0x7f040025 +net.micode.notes:id/menu_setting = 0x7f050030 +net.micode.notes:string/menu_sync_cancel = 0x7f0a003c +net.micode.notes:string/menu_send_to_desktop = 0x7f0a0038 +net.micode.notes:string/error_sync_internal = 0x7f0a0013 +net.micode.notes:id/menu_secret = 0x7f05002e +net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0011 +net.micode.notes:id/menu_search = 0x7f05002d +net.micode.notes:drawable/list_white_down = 0x7f040026 net.micode.notes:drawable/dropdown_icon = 0x7f040005 -net.micode.notes:id/menu_quit_secret = 0x7f050029 -net.micode.notes:id/menu_new_note = 0x7f050028 -net.micode.notes:id/menu_new_folder = 0x7f050027 +net.micode.notes:id/menu_quit_secret = 0x7f05002c +net.micode.notes:id/menu_new_note = 0x7f05002a +net.micode.notes:id/menu_new_folder = 0x7f050029 +net.micode.notes:id/menu_daytime = 0x7f050023 +net.micode.notes:id/menu_count_word = 0x7f050022 net.micode.notes:layout/note_list_footer = 0x7f06000a net.micode.notes:id/iv_bg_green = 0x7f050010 -net.micode.notes:id/tv_time = 0x7f050042 +net.micode.notes:id/tv_time = 0x7f050046 net.micode.notes:id/menu_alert = 0x7f050021 net.micode.notes:id/et_foler_name = 0x7f05000a net.micode.notes:id/ll_font_small = 0x7f05001f net.micode.notes:id/iv_super_select = 0x7f05001b -net.micode.notes:drawable/widget_2x_white = 0x7f04003c +net.micode.notes:string/success_sdcard_export = 0x7f0a0060 +net.micode.notes:id/menu_night_time = 0x7f05002b +net.micode.notes:drawable/widget_2x_white = 0x7f04003e net.micode.notes:id/iv_medium_select = 0x7f050019 net.micode.notes:id/iv_large_select = 0x7f050018 -net.micode.notes:string/menu_search = 0x7f0a0032 +net.micode.notes:string/menu_search = 0x7f0a0033 net.micode.notes:string/alert_title_delete = 0x7f0a0003 -net.micode.notes:string/success_sync_account = 0x7f0a005e +net.micode.notes:string/success_sync_account = 0x7f0a0061 net.micode.notes:id/iv_bg_white = 0x7f050014 -net.micode.notes:string/sync_progress_syncing = 0x7f0a0061 -net.micode.notes:drawable/list_blue_middle = 0x7f040018 -net.micode.notes:drawable/font_normal = 0x7f040011 -net.micode.notes:id/et_edit_text = 0x7f050009 -net.micode.notes:id/iv_bg_yellow = 0x7f050016 -net.micode.notes:id/iv_bg_red_select = 0x7f050013 -net.micode.notes:drawable/list_blue_up = 0x7f04001a +net.micode.notes:drawable/list_blue_up = 0x7f04001b net.micode.notes:id/date = 0x7f050007 -net.micode.notes:id/tv_top_text = 0x7f050045 -net.micode.notes:id/menu_top = 0x7f050030 -net.micode.notes:id/menu_delete_remind = 0x7f050023 -net.micode.notes:string/search = 0x7f0a0058 -net.micode.notes:string/menu_deselect_all = 0x7f0a0022 +net.micode.notes:id/tv_top_text = 0x7f050049 +net.micode.notes:id/menu_top = 0x7f050033 +net.micode.notes:id/menu_delete_remind = 0x7f050025 +net.micode.notes:string/search = 0x7f0a005b +net.micode.notes:string/menu_deselect_all = 0x7f0a0023 net.micode.notes:id/font_size_selector = 0x7f05000b -net.micode.notes:id/notes_list = 0x7f050039 +net.micode.notes:id/notes_list = 0x7f05003c +net.micode.notes:id/iv_bg_red_select = 0x7f050013 +net.micode.notes:id/et_edit_text = 0x7f050009 +net.micode.notes:id/iv_bg_yellow = 0x7f050016 +net.micode.notes:drawable/list_background1 = 0x7f040016 net.micode.notes:id/btn_set_bg_color = 0x7f050005 -net.micode.notes:drawable/list_yellow_single = 0x7f04002b +net.micode.notes:drawable/list_yellow_single = 0x7f04002c net.micode.notes:id/amPm = 0x7f050003 -net.micode.notes:string/menu_move = 0x7f0a002d +net.micode.notes:string/menu_move = 0x7f0a002e net.micode.notes:id/action_select_all = 0x7f050002 -net.micode.notes:drawable/new_note_pressed = 0x7f040032 +net.micode.notes:drawable/new_note_pressed = 0x7f040033 net.micode.notes:layout/dialog_edit_text = 0x7f060003 net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001 -net.micode.notes:drawable/widget_4x_white = 0x7f040041 -net.micode.notes:string/menu_secret = 0x7f0a0033 +net.micode.notes:drawable/widget_4x_white = 0x7f040043 +net.micode.notes:string/menu_secret = 0x7f0a0034 net.micode.notes:id/ll_font_large = 0x7f05001d -net.micode.notes:drawable/list_red_single = 0x7f040023 +net.micode.notes:drawable/list_red_single = 0x7f040024 net.micode.notes:drawable/edit_blue = 0x7f040006 -net.micode.notes:drawable/widget_4x_red = 0x7f040040 -net.micode.notes:string/note_link_other = 0x7f0a003f -net.micode.notes:string/folder_exist = 0x7f0a0017 -net.micode.notes:drawable/widget_2x_green = 0x7f04003a -net.micode.notes:drawable/title_alert = 0x7f040037 -net.micode.notes:drawable/widget_2x_blue = 0x7f040039 -net.micode.notes:drawable/widget_4x_green = 0x7f04003f -net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c -net.micode.notes:string/preferences_last_sync_time = 0x7f0a0050 -net.micode.notes:drawable/new_note_normal = 0x7f040031 +net.micode.notes:drawable/widget_4x_red = 0x7f040042 +net.micode.notes:drawable/widget_2x_green = 0x7f04003c +net.micode.notes:plurals/search_results_title = 0x7f080000 +net.micode.notes:drawable/list_background2 = 0x7f040017 +net.micode.notes:drawable/title_alert = 0x7f040039 +net.micode.notes:drawable/widget_2x_blue = 0x7f04003b +net.micode.notes:drawable/widget_4x_green = 0x7f040041 +net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000d +net.micode.notes:string/preferences_last_sync_time = 0x7f0a0053 +net.micode.notes:drawable/new_note_normal = 0x7f040032 net.micode.notes:string/call_record_folder_name = 0x7f0a0008 -net.micode.notes:drawable/new_note = 0x7f040030 -net.micode.notes:id/note_title = 0x7f050038 +net.micode.notes:drawable/new_note = 0x7f040031 +net.micode.notes:id/note_title = 0x7f05003b net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 net.micode.notes:array/format_for_exported_note = 0x7f010000 -net.micode.notes:drawable/menu_top = 0x7f04002f +net.micode.notes:drawable/menu_top = 0x7f040030 net.micode.notes:drawable/edit_title_white = 0x7f04000c -net.micode.notes:drawable/menu_delete = 0x7f04002d +net.micode.notes:drawable/menu_delete = 0x7f04002e net.micode.notes:id/cb_edit_item = 0x7f050006 net.micode.notes:xml/widget_4x_info = 0x7f0c0003 -net.micode.notes:drawable/list_yellow_up = 0x7f04002c -net.micode.notes:drawable/widget_2x_red = 0x7f04003b -net.micode.notes:id/note_edit_list = 0x7f050035 -net.micode.notes:drawable/list_yellow_down = 0x7f040029 -net.micode.notes:plurals/search_results_title = 0x7f080000 -net.micode.notes:drawable/selected = 0x7f040036 -net.micode.notes:drawable/list_white_middle = 0x7f040026 +net.micode.notes:drawable/list_yellow_up = 0x7f04002d +net.micode.notes:drawable/widget_2x_red = 0x7f04003d +net.micode.notes:id/note_edit_list = 0x7f050038 +net.micode.notes:drawable/list_yellow_down = 0x7f04002a +net.micode.notes:drawable/selected = 0x7f040038 +net.micode.notes:drawable/list_white_middle = 0x7f040027 net.micode.notes:drawable/edit_title_yellow = 0x7f04000d net.micode.notes:layout/note_edit = 0x7f060005 net.micode.notes:id/hour = 0x7f05000c net.micode.notes:id/iv_bg_white_select = 0x7f050015 -net.micode.notes:drawable/list_red_up = 0x7f040024 +net.micode.notes:drawable/list_red_up = 0x7f040025 net.micode.notes:xml/preferences = 0x7f0c0000 -net.micode.notes:id/menu_export_text = 0x7f050024 -net.micode.notes:drawable/widget_4x_yellow = 0x7f040042 -net.micode.notes:drawable/list_red_down = 0x7f040021 -net.micode.notes:string/error_note_not_exist = 0x7f0a000e +net.micode.notes:id/menu_export_text = 0x7f050026 +net.micode.notes:drawable/widget_4x_yellow = 0x7f040044 +net.micode.notes:drawable/list_red_down = 0x7f040022 +net.micode.notes:string/error_note_not_exist = 0x7f0a000f net.micode.notes:array/menu_share_ways = 0x7f010001 net.micode.notes:id/iv_bg_green_select = 0x7f050011 -net.micode.notes:id/menu_font_size = 0x7f050025 +net.micode.notes:id/menu_font_size = 0x7f050027 net.micode.notes:id/iv_bg_blue = 0x7f05000e -net.micode.notes:drawable/list_green_middle = 0x7f04001e -net.micode.notes:drawable/list_footer_bg = 0x7f04001c -net.micode.notes:drawable/list_white_single = 0x7f040027 -net.micode.notes:drawable/list_white_up = 0x7f040028 -net.micode.notes:string/menu_remove_remind = 0x7f0a0031 -net.micode.notes:drawable/list_green_down = 0x7f04001d -net.micode.notes:id/preference_sync_button = 0x7f05003b -net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e -net.micode.notes:string/failed_sdcard_export = 0x7f0a0014 +net.micode.notes:drawable/list_green_middle = 0x7f04001f +net.micode.notes:drawable/list_footer_bg = 0x7f04001d +net.micode.notes:string/sync_progress_syncing = 0x7f0a0064 +net.micode.notes:drawable/font_normal = 0x7f040011 +net.micode.notes:drawable/list_blue_middle = 0x7f040019 +net.micode.notes:id/tv_folder_name = 0x7f050043 +net.micode.notes:drawable/old_list_background = 0x7f040036 +net.micode.notes:drawable/list_white_single = 0x7f040028 +net.micode.notes:drawable/list_white_up = 0x7f040029 +net.micode.notes:string/menu_remove_remind = 0x7f0a0032 +net.micode.notes:drawable/list_green_down = 0x7f04001e +net.micode.notes:id/preference_sync_button = 0x7f05003e +net.micode.notes:string/menu_move_parent_folder = 0x7f0a002f +net.micode.notes:string/failed_sdcard_export = 0x7f0a0015 net.micode.notes:id/account_dialog_title = 0x7f050001 net.micode.notes:layout/widget_2x = 0x7f06000c -net.micode.notes:id/note_item = 0x7f050037 +net.micode.notes:id/note_item = 0x7f05003a net.micode.notes:dimen/text_font_size_super = 0x7f030004 -net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0049 +net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a004c net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 -net.micode.notes:string/menu_title_select_folder = 0x7f0a003c -net.micode.notes:string/menu_folder_delete = 0x7f0a0025 +net.micode.notes:string/menu_title_select_folder = 0x7f0a003d +net.micode.notes:string/menu_folder_delete = 0x7f0a0026 net.micode.notes:drawable/clock = 0x7f040003 -net.micode.notes:id/menu_delete = 0x7f050022 +net.micode.notes:id/menu_delete = 0x7f050024 net.micode.notes:drawable/icon_app = 0x7f040015 net.micode.notes:drawable/edit_yellow = 0x7f04000f -net.micode.notes:drawable/list_blue_single = 0x7f040019 -net.micode.notes:drawable/list_red_middle = 0x7f040022 -net.micode.notes:string/menu_normal_mode = 0x7f0a002f +net.micode.notes:drawable/list_blue_single = 0x7f04001a +net.micode.notes:drawable/list_red_middle = 0x7f040023 +net.micode.notes:string/menu_normal_mode = 0x7f0a0030 net.micode.notes:drawable/edit_title_blue = 0x7f040009 -net.micode.notes:string/menu_delete = 0x7f0a0021 -net.micode.notes:drawable/list_background = 0x7f040016 -net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019 -net.micode.notes:id/menu_send_to_desktop = 0x7f05002c -net.micode.notes:drawable/title_bar_bg = 0x7f040038 +net.micode.notes:string/format_datetime_mdhm = 0x7f0a001a +net.micode.notes:id/menu_send_to_desktop = 0x7f05002f +net.micode.notes:drawable/title_bar_bg = 0x7f04003a net.micode.notes:id/delete = 0x7f050008 -net.micode.notes:drawable/search_result = 0x7f040035 +net.micode.notes:drawable/search_result = 0x7f040037 net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 -net.micode.notes:id/tv_modified_date = 0x7f050040 -net.micode.notes:string/menu_font_small = 0x7f0a002a +net.micode.notes:id/tv_modified_date = 0x7f050044 +net.micode.notes:string/note_length = 0x7f0a0040 +net.micode.notes:string/menu_font_small = 0x7f0a002b net.micode.notes:drawable/font_large = 0x7f040010 net.micode.notes:id/iv_alert_icon = 0x7f05000d -net.micode.notes:drawable/list_green_single = 0x7f04001f -net.micode.notes:xml/widget_2x_info = 0x7f0c0002 -net.micode.notes:drawable/edit_white = 0x7f04000e -net.micode.notes:drawable/menu_move = 0x7f04002e +net.micode.notes:drawable/list_green_single = 0x7f040020 +net.micode.notes:drawable/menu_move = 0x7f04002f net.micode.notes:id/btn_new_note = 0x7f050004 net.micode.notes:drawable/edit_title_red = 0x7f04000b net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002 -net.micode.notes:string/search_setting_description = 0x7f0a005b -net.micode.notes:id/menu_list_mode = 0x7f050026 +net.micode.notes:string/search_setting_description = 0x7f0a005e +net.micode.notes:id/menu_list_mode = 0x7f050028 net.micode.notes:dimen/text_font_size_medium = 0x7f030001 -net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040033 -net.micode.notes:drawable/list_folder = 0x7f04001b +net.micode.notes:style/NoteTheme = 0x7f0b0003 +net.micode.notes:id/text_num = 0x7f050041 +net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040034 +net.micode.notes:drawable/list_folder = 0x7f04001c net.micode.notes:id/iv_small_select = 0x7f05001a -net.micode.notes:string/widget_under_visit_mode = 0x7f0a0067 +net.micode.notes:string/widget_under_visit_mode = 0x7f0a006a net.micode.notes:color/user_query_highlight = 0x7f020002 net.micode.notes:drawable/edit_red = 0x7f040008 net.micode.notes:drawable/edit_green = 0x7f040007 net.micode.notes:string/app_widget2x2 = 0x7f0a0005 -net.micode.notes:id/tv_title = 0x7f050043 +net.micode.notes:id/tv_title = 0x7f050047 net.micode.notes:drawable/delete = 0x7f040004 -net.micode.notes:string/error_sync_network = 0x7f0a0013 net.micode.notes:drawable/edit_title_green = 0x7f04000a -net.micode.notes:drawable/widget_4x_blue = 0x7f04003e +net.micode.notes:drawable/widget_4x_blue = 0x7f040040 net.micode.notes:drawable/bg_btn_set_color = 0x7f040000 net.micode.notes:drawable/font_size_selector_bg = 0x7f040012 net.micode.notes:dimen/text_font_size_large = 0x7f030000 -net.micode.notes:string/delete_remind_time_message = 0x7f0a000b +net.micode.notes:string/delete_remind_time_message = 0x7f0a000c net.micode.notes:dimen/text_font_size_small = 0x7f030003 -net.micode.notes:id/selection_menu = 0x7f05003c +net.micode.notes:id/selection_menu = 0x7f05003f net.micode.notes:id/account_dialog_subtitle = 0x7f050000 net.micode.notes:drawable/call_record = 0x7f040002 -net.micode.notes:drawable/notification = 0x7f040034 +net.micode.notes:drawable/notification = 0x7f040035 net.micode.notes:color/secondary_text_dark = 0x7f020001 diff --git a/src/Notes/app/build/outputs/apk/debug/app-debug.apk b/src/Notes/app/build/outputs/apk/debug/app-debug.apk index b25901c..44ab58d 100644 Binary files a/src/Notes/app/build/outputs/apk/debug/app-debug.apk and b/src/Notes/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index d47dfcd..9a975e6 100644 Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 724d604..0b29dc4 100644 --- a/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -52,6 +52,11 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; +import android.text.TextWatcher; +import android.text.Editable; // 如果还使用到了Editable，也要导入 + + + import net.micode.notes.R; import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.TextNote; @@ -139,6 +144,13 @@ public class NoteEditActivity extends Activity implements OnClickListener, sFontSelectorSelectionMap.put(ResourceParser.TEXT_SUPER, R.id.iv_super_select); } + private EditText editText; + + private TextView textView; + + + + private static final String TAG = "NoteEditActivity"; // 日志标签 private HeadViewHolder mNoteHeaderHolder; // 头部视图的ViewHolder @@ -182,6 +194,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, return; } initResources(); // 初始化资源 + count(); } /** @@ -473,6 +486,10 @@ public class NoteEditActivity extends Activity implements OnClickListener, // 初始化头部视图和相关组件 mHeadViewPanel = findViewById(R.id.note_title); mNoteHeaderHolder = new HeadViewHolder(); + + editText = (EditText) findViewById(R.id.note_edit_view); + textView = (TextView) findViewById(R.id.text_num); + mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date); mNoteHeaderHolder.ivAlertIcon = (ImageView) findViewById(R.id.iv_alert_icon); mNoteHeaderHolder.tvAlertDate = (TextView) findViewById(R.id.tv_alert_date); @@ -505,6 +522,24 @@ public class NoteEditActivity extends Activity implements OnClickListener, } // 初始化编辑列表 mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list); + + editText.addTextChangedListener(new TextWatcher() { + + int currentLength = 0; + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + textView.setText("字符数：" + currentLength); + } + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + currentLength = editText.getText().length(); + } + @Override + public void afterTextChanged(Editable s) { + textView.setText("字符数：" + currentLength); + } + + }); } /** @@ -736,6 +771,23 @@ public class NoteEditActivity extends Activity implements OnClickListener, } showTopHeader(); break; + case R.id.menu_count_word: + AlertDialog.Builder builder1 = new AlertDialog.Builder(this); + builder1.setIcon(android.R.drawable.ic_dialog_alert); + TextView content = (TextView)findViewById(R.id.note_edit_view); + int c = content.length(); + builder1.setMessage("all characters num is " + c); + builder1.setPositiveButton(android.R.string.ok, + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + finish(); + } + }); + builder1.setNegativeButton(android.R.string.cancel, null); + builder1.show(); + break; + + default: break; } @@ -1170,4 +1222,78 @@ public class NoteEditActivity extends Activity implements OnClickListener, Toast.makeText(this, resId, duration).show(); } + + private void count(){ + mNoteEditor.addTextChangedListener(new TextWatcher(){ + int currentLength = 0; + + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + Textchange(s); + textView.setText("字符" + currentLength ); + } + + public void onTextChanged(CharSequence s, int start, int before, int count) { + Textchange(s); + currentLength = editText.getText().length() - countSpacesAndNewlines(s)[0] - countSpacesAndNewlines(s)[1]; + } + + public void afterTextChanged(Editable s) { + Textchange(s); + textView.setText("字符" + currentLength); + } + + + }); + } + + + + private int[] countSpacesAndNewlines(CharSequence text) { + int spaceCount = 0; + int newlineCount = 0; + + for (int i = 0; i < text.length(); i++) { + char currentChar = text.charAt(i); + if (currentChar == ' ') { + spaceCount++; + } else if (currentChar == '\n') { + newlineCount++; + } + } + + return new int[]{spaceCount, newlineCount}; // 返回空格和换行的数量 + } + + + + private String Textchange(CharSequence oriText){ + StringBuffer stringBuffer = new StringBuffer(oriText); + int Flag1 = -1; + int Flag2 = -1; + + do {//不计入表示图片的字符 + Flag1 = stringBuffer.indexOf(""); + if (Flag1 != -1 && Flag2 != -1) { + stringBuffer = stringBuffer.replace(Flag1, Flag2+1, ""); + } + } while (Flag1 != -1 && Flag2 != -1); + + do {//不计入换行字符 + Flag1 = stringBuffer.indexOf("\n"); + + if (Flag1 != -1){ + stringBuffer = stringBuffer.replace(Flag1, Flag1+1, ""); + } + } while (Flag1 != -1); + do {//不计入空格字符 + Flag1 = stringBuffer.indexOf(" "); + + if (Flag1 != -1) { + stringBuffer = stringBuffer.replace(Flag1, Flag1+1, ""); + } + } while (Flag1 != -1); + return stringBuffer.toString(); + } + } diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index f18364c..d783473 100644 --- a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -81,6 +81,9 @@ import java.util.HashSet; public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener { public static int secret_mode = 0; + + public static int time_mode = 1; + // 定义文件夹中笔记列表查询的标记 private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0; @@ -174,6 +177,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.note_list); + getWindow().setBackgroundDrawableResource(R.drawable.list_background1); initResources(); // 用户首次使用时插入介绍信息 @@ -559,7 +563,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); } else{ - String str1 = "520"; + String str1 = "88888888"; String [] PROJECTION = new String [] { //定义一个新的PROJECTION数组，只换掉SNIPPET NoteColumns.ID, NoteColumns.ALERTED_DATE, @@ -576,6 +580,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt NoteColumns.WIDGET_TYPE, NoteColumns.TOP }; + mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, Notes.CONTENT_NOTE_URI, PROJECTION, selection, new String[]{ String.valueOf(mCurrentFolderId) @@ -1099,6 +1104,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt menu.findItem(R.id.menu_secret).setVisible(false); else menu.findItem(R.id.menu_quit_secret).setVisible(false); + + if(time_mode == 1) + { + menu.findItem(R.id.menu_daytime).setVisible(false); + }else{ + menu.findItem(R.id.menu_night_time).setVisible(false); + } + return true; } @@ -1144,19 +1157,21 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt secret_mode = 1; AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this); dialog.setTitle("重要提醒"); - dialog.setMessage("您确认进入私密模式吗？"); + dialog.setMessage("您已经进入私密模式！"); dialog.setCancelable(false); - dialog.setPositiveButton("确认", new DialogInterface.OnClickListener() { + dialog.setPositiveButton("确定", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { startAsyncNotesListQuery(); Toast.makeText(NotesListActivity.this,"您已进入私密模式",Toast.LENGTH_SHORT).show(); } }); + /* dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which){} - }); + }) + */ dialog.show(); startAsyncNotesListQuery(); Toast.makeText(this,"您已进入私密模式",Toast.LENGTH_SHORT).show(); @@ -1167,23 +1182,36 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt secret_mode = 0; AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this); dialog.setTitle("重要提醒"); - dialog.setMessage("您确认退出私密模式吗？"); + dialog.setMessage("您已经退出私密模式！"); dialog.setCancelable(false); - dialog.setPositiveButton("确认", new DialogInterface.OnClickListener() { + dialog.setPositiveButton("确定", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { startAsyncNotesListQuery(); Toast.makeText(NotesListActivity.this,"您已退出私密模式",Toast.LENGTH_SHORT).show(); } }); + /* dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which){} }); + */ dialog.show(); break; } + case R.id.menu_daytime: { + time_mode = 1; + getWindow().setBackgroundDrawableResource(R.drawable.list_background1); + break; + } + + case R.id.menu_night_time: { + time_mode = 0; + getWindow().setBackgroundDrawableResource(R.drawable.list_background2); + break; + } case R.id.menu_search: onSearchRequested(); // 触发搜索请求 diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListItem.java index 92d4eb2..19d0ee4 100644 --- a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListItem.java +++ b/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListItem.java @@ -98,17 +98,14 @@ public class NotesListItem extends LinearLayout { } else { mAlert.setVisibility(View.GONE); } - if (data.isTOP()) { - mTop.setImageResource(R.drawable.menu_top); - mTop.setVisibility(View.VISIBLE); - }else { - mTop.setVisibility(View.GONE); - } + } else { // 其他类型的笔记或文件夹 mCallName.setVisibility(View.GONE); mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem); + + if (data.getType() == Notes.TYPE_FOLDER) { mTitle.setText(data.getSnippet() + context.getString(R.string.format_folder_files_count, @@ -124,6 +121,12 @@ public class NotesListItem extends LinearLayout { } } } + if (data.isTOP()) { + mTop.setImageResource(R.drawable.menu_top); + mTop.setVisibility(View.VISIBLE); + }else { + mTop.setVisibility(View.GONE); + } // 设置时间显示 mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate())); diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_background.png b/src/Notes/app/src/main/res/drawable-hdpi/list_background.png deleted file mode 100644 index 087e1f9..0000000 Binary files a/src/Notes/app/src/main/res/drawable-hdpi/list_background.png and /dev/null differ diff --git a/src/Notes/app/src/main/res/layout/note_edit.xml b/src/Notes/app/src/main/res/layout/note_edit.xml index 255a0f4..5e17d64 100644 --- a/src/Notes/app/src/main/res/layout/note_edit.xml +++ b/src/Notes/app/src/main/res/layout/note_edit.xml @@ -18,7 +18,7 @@ + + + + > + + + diff --git a/src/Notes/app/src/main/res/menu/note_edit.xml b/src/Notes/app/src/main/res/menu/note_edit.xml index bf86fae..88d581a 100644 --- a/src/Notes/app/src/main/res/menu/note_edit.xml +++ b/src/Notes/app/src/main/res/menu/note_edit.xml @@ -51,4 +51,10 @@ + + + + diff --git a/src/Notes/app/src/main/res/menu/note_list.xml b/src/Notes/app/src/main/res/menu/note_list.xml index 68baf2a..a9517b0 100644 --- a/src/Notes/app/src/main/res/menu/note_list.xml +++ b/src/Notes/app/src/main/res/menu/note_list.xml @@ -49,5 +49,12 @@ + + + diff --git a/src/Notes/app/src/main/res/values-zh-rCN/strings.xml b/src/Notes/app/src/main/res/values-zh-rCN/strings.xml index 211a881..d102ab7 100644 --- a/src/Notes/app/src/main/res/values-zh-rCN/strings.xml +++ b/src/Notes/app/src/main/res/values-zh-rCN/strings.xml @@ -121,8 +121,14 @@ 取消 私密模式 退出私密模式 + + 白天模式 + 夜晚模式 + + %1$s 条符合“%2$s”的搜索结果 + 字符数 diff --git a/src/Notes/app/src/main/res/values-zh-rTW/strings.xml b/src/Notes/app/src/main/res/values-zh-rTW/strings.xml index cd9b6a1..5d1f113 100644 --- a/src/Notes/app/src/main/res/values-zh-rTW/strings.xml +++ b/src/Notes/app/src/main/res/values-zh-rTW/strings.xml @@ -122,8 +122,13 @@ 取消 私密模式 退出私密模式 + + 白天模式 + 夜晚模式 + %1$s 條符合”%2$s“的搜尋結果 + 字符数 diff --git a/src/Notes/app/src/main/res/values/strings.xml b/src/Notes/app/src/main/res/values/strings.xml index 3919b3f..3432f90 100644 --- a/src/Notes/app/src/main/res/values/strings.xml +++ b/src/Notes/app/src/main/res/values/strings.xml @@ -128,10 +128,16 @@ cancel secret model quit secret model + + light mode + night mode + + %1$s result for \"%2$s\" %1$s results for \"%2$s\" + Length