diff --git a/.gradle/7.5/checksums/checksums.lock b/.gradle/7.5/checksums/checksums.lock index 9db14bc..cbcbd9d 100644 Binary files a/.gradle/7.5/checksums/checksums.lock and b/.gradle/7.5/checksums/checksums.lock differ diff --git a/.gradle/7.5/executionHistory/executionHistory.bin b/.gradle/7.5/executionHistory/executionHistory.bin index 8beafae..c5dc9d6 100644 Binary files a/.gradle/7.5/executionHistory/executionHistory.bin and b/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/.gradle/7.5/executionHistory/executionHistory.lock b/.gradle/7.5/executionHistory/executionHistory.lock index 2a30bac..50022d0 100644 Binary files a/.gradle/7.5/executionHistory/executionHistory.lock and b/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.5/fileHashes/fileHashes.bin b/.gradle/7.5/fileHashes/fileHashes.bin index a734527..17fe3cf 100644 Binary files a/.gradle/7.5/fileHashes/fileHashes.bin and b/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/.gradle/7.5/fileHashes/fileHashes.lock b/.gradle/7.5/fileHashes/fileHashes.lock index 3406c3f..8861c12 100644 Binary files a/.gradle/7.5/fileHashes/fileHashes.lock and b/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/.gradle/7.5/fileHashes/resourceHashesCache.bin b/.gradle/7.5/fileHashes/resourceHashesCache.bin index 8a629e8..ce3a154 100644 Binary files a/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/.gradle/7.5/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 37ef7b5..4f854ee 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties index 35fb573..d403ed4 100644 --- a/.gradle/buildOutputCleanup/cache.properties +++ b/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Mon Apr 10 21:32:01 HKT 2023 +#Sun Jun 04 20:08:15 HKT 2023 gradle.version=7.5 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 6bbc209..bf5de26 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index bf7ef31..83ed21a 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 5d23646..b6543dd 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -7,11 +7,11 @@ - + - + \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493 b/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493 index c100822..b886f15 100644 --- a/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493 +++ b/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493 @@ -1,11 +1,11 @@ s -java:S4144"\Update this method so that its implementation is not identical to "getParentId" on line 185.( +java:S4144"\Update this method so that its implementation is not identical to "getParentId" on line 190.( > -java:S1125T"(Remove the unnecessary boolean literals.( +java:S1125X"(Remove the unnecessary boolean literals.( m -java:S3776p"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.( +java:S3776u"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.( C -java:S1125q"(Remove the unnecessary boolean literals.( +java:S1125v"(Remove the unnecessary boolean literals.( > -java:S1125r"(Remove the unnecessary boolean literals.( \ No newline at end of file +java:S1125w"(Remove the unnecessary boolean literals.( \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a b/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a index 69f4968..9a2e541 100644 --- a/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a +++ b/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a @@ -1,39 +1,39 @@ t -java:S22930"YReplace the type specification in this constructor call with the diamond operator ("<>").(ə +java:S22931"YReplace the type specification in this constructor call with the diamond operator ("<>").(ə o -java:S2293]"YReplace the type specification in this constructor call with the diamond operator ("<>").( +java:S2293d"YReplace the type specification in this constructor call with the diamond operator ("<>").( o -java:S2293m"YReplace the type specification in this constructor call with the diamond operator ("<>").(Ȫ +java:S2293u"YReplace the type specification in this constructor call with the diamond operator ("<>").(Ȫ J -java:S1066U"/Merge this if statement with the enclosing one.(ڧ +java:S1066["/Merge this if statement with the enclosing one.(ڧ  -java:S1319\"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( +java:S1319c"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".(  -java:S1319l"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( +java:S1319t"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( j -java:S1104*"TMake widgetId a static final constant or non-public and provide accessors if needed.(ǎ +java:S1104+"TMake widgetId a static final constant or non-public and provide accessors if needed.(ǎ q -java:S1104+"VMake widgetType a static final constant or non-public and provide accessors if needed.(漬 +java:S1104,"VMake widgetType a static final constant or non-public and provide accessors if needed.(漬 C -java:S5411_"(Use a primitive boolean expression here.(ɯ +java:S5411f"(Use a primitive boolean expression here.(ɯ C -java:S5411o"(Use a primitive boolean expression here.(ɯ +java:S5411w"(Use a primitive boolean expression here.(ɯ D -java:S5411"(Use a primitive boolean expression here.( +java:S5411"(Use a primitive boolean expression here.( 7 -java:S1116,"Remove this empty statement.( +java:S1116-"Remove this empty statement.( D -java:S1874/".Remove this use of ""; it is deprecated.( +java:S18740".Remove this use of ""; it is deprecated.( J -java:S2864^"4Iterate over the "entrySet" instead of the "keySet".(਷ +java:S2864e"4Iterate over the "entrySet" instead of the "keySet".(਷ B -java:S1125_"'Remove the unnecessary boolean literal.(ɯ +java:S1125f"'Remove the unnecessary boolean literal.(ɯ J -java:S2864n"4Iterate over the "entrySet" instead of the "keySet".(਷ +java:S2864v"4Iterate over the "entrySet" instead of the "keySet".(਷ B -java:S1125o"'Remove the unnecessary boolean literal.(ɯ -A -java:S1168|"+Return an empty collection instead of null.( +java:S1125w"'Remove the unnecessary boolean literal.(ɯ +B +java:S1168"+Return an empty collection instead of null.( C -java:S1125"'Remove the unnecessary boolean literal.( \ No newline at end of file +java:S1125"'Remove the unnecessary boolean literal.( \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 b/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 index 367ade5..6907883 100644 --- a/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 +++ b/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 @@ -2,34 +2,38 @@ t java:S22932"YReplace the type specification in this constructor call with the diamond operator ("<>").(л t -java:S2293Z"YReplace the type specification in this constructor call with the diamond operator ("<>").(л +java:S2293\"YReplace the type specification in this constructor call with the diamond operator ("<>").(л u -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(ª +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(ª b -java:S1192D"GDefine a constant instead of duplicating this literal "%s: %s" 4 times.( +java:S1192E"GDefine a constant instead of duplicating this literal "%s: %s" 4 times.( c -java:S1192x"HDefine a constant instead of duplicating this literal "=? AND " 4 times.( -J -java:S1066~"/Merge this if statement with the enclosing one.(䲜 +java:S1192z"HDefine a constant instead of duplicating this literal "=? AND " 4 times.( +K +java:S1066"/Merge this if statement with the enclosing one.(䲜 v java:S1319("`The type of "ids" should be an interface such as "Set" rather than the implementation "HashSet".( { -java:S1319S"`The type of "ids" should be an interface such as "Set" rather than the implementation "HashSet".(󆱋 +java:S1319U"`The type of "ids" should be an interface such as "Set" rather than the implementation "HashSet".(󆱋  -java:S1319"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( -U -java:S1118&":Add a private constructor to hide the implicit public one.( +java:S1319"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( +Z +java:S2589g"8Remove this expression which always evaluates to "false"(Е8˦1 +Z +java:S2589?"8Remove this expression which always evaluates to "false"(Ύ8˦1 +O +java:S1118&":Add a private constructor to hide the implicit public one.(P T java:S1155-">Use isEmpty() to check whether the collection is empty or not.( Z -java:S2147E"DCombine this catch with the one at line 67, which has the same body.(暩 -[ -java:S2147l"ECombine this catch with the one at line 106, which has the same body.(暩 +java:S2147F"DCombine this catch with the one at line 68, which has the same body.(暩 +b +java:S2147n"ECombine this catch with the one at line 108, which has the same body.(8˦1 k -java:S3252"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".( +java:S3252"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".( +m +java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".( m -java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".( -f -java:S3252"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".(ʹ +java:S3252"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".(8˦1 m -java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".( \ No newline at end of file +java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".( \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad b/.idea/sonarlint/issuestore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad index c2e6fb3..c8de337 100644 --- a/.idea/sonarlint/issuestore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad +++ b/.idea/sonarlint/issuestore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad @@ -1,3 +1,9 @@ m -java:S37763"RRefactor this method to reduce its Cognitive Complexity from 16 to the 15 allowed.( \ No newline at end of file +java:S37766"RRefactor this method to reduce its Cognitive Complexity from 16 to the 15 allowed.( +V +java:S1874F"9Remove this use of "setTextAppearance"; it is deprecated.(81 +V +java:S1874M"9Remove this use of "setTextAppearance"; it is deprecated.(81 +V +java:S1874W"9Remove this use of "setTextAppearance"; it is deprecated.(81 \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/f/9/f9f49497f95afd327db7a7a512612aa1089003d4 b/.idea/sonarlint/issuestore/f/9/f9f49497f95afd327db7a7a512612aa1089003d4 index fafb6c2..c2327c3 100644 --- a/.idea/sonarlint/issuestore/f/9/f9f49497f95afd327db7a7a512612aa1089003d4 +++ b/.idea/sonarlint/issuestore/f/9/f9f49497f95afd327db7a7a512612aa1089003d4 @@ -1,7 +1,7 @@ -3 -java:S2386!"Make this member "protected".(Ꙗ -D -java:S1874*".Remove this use of ""; it is deprecated.(ж -M -java:S1135+"2Complete the task associated to this TODO comment.( \ No newline at end of file +: +java:S2386$"Make this member "protected".(Ꙗ81 +K +java:S1874/".Remove this use of ""; it is deprecated.(ж81 +T +java:S11350"2Complete the task associated to this TODO comment.(81 \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb index c1d5e39..286d25a 100644 --- a/.idea/sonarlint/issuestore/index.pb +++ b/.idea/sonarlint/issuestore/index.pb @@ -1,29 +1,41 @@ -g -7app/src/main/java/net/micode/notes/ui/NoteItemData.java,0\8\08c35f02f11c35ae9ebf8db0a482054dfa1cf493 -m -=app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java,f\9\f9f49497f95afd327db7a7a512612aa1089003d4 -k -;app/src/main/java/net/micode/notes/ui/NotesListAdapter.java,2\8\283f16cc23da56ca65616082bc810304d3511d0a -h -8app/src/main/java/net/micode/notes/ui/NotesListItem.java,5\d\5dfe6902d8ec740690f88d644e74362c3be08fad -f -6app/src/main/java/net/micode/notes/tool/DataUtils.java,3\2\32360bf24febc78f20db52498c7576b3d8650d56 d 4app/src/main/java/net/micode/notes/data/Contact.java,9\a\9a3a19793537958b8b1b03a81985999e22705a2f -b -2app/src/main/java/net/micode/notes/data/Notes.java,a\7\a7641cfac724321d508c2a284223a711011a93f5 -g -7app/src/main/java/net/micode/notes/ui/NoteEditText.java,5\0\503adcf2a0be1ecdb94a15efba4433b6589877b9 7 gradlew,5\b\5bbfa66edb4db3c7c33c5181f43510990d3307f9 -@ -app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164 +g +7app/src/main/java/net/micode/notes/ui/NoteEditText.java,5\0\503adcf2a0be1ecdb94a15efba4433b6589877b9 +j +:app/src/main/java/net/micode/notes/data/NotesProvider.java,6\a\6a65e747031f27aef20597b4181148a9fbf963d5 +b +2app/src/main/java/net/micode/notes/model/Note.java,d\d\dd970bd8ce083850fca1d4d159647ccd110e57cb i 9app/src/main/java/net/micode/notes/model/WorkingNote.java,8\7\876016634c6642b35109680ccac740dc8271b236 p @app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java,1\e\1eb2363b523dbcae43d3c6e4790c64436af61b13 +h +8app/src/main/java/net/micode/notes/ui/NotesListItem.java,5\d\5dfe6902d8ec740690f88d644e74362c3be08fad +r +Bapp/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java,d\a\da57ce446af85bbd9aefee65e969869f0cff78b0 +f +6app/src/main/java/net/micode/notes/tool/DataUtils.java,3\2\32360bf24febc78f20db52498c7576b3d8650d56 +k +;app/src/main/java/net/micode/notes/ui/NotesListAdapter.java,2\8\283f16cc23da56ca65616082bc810304d3511d0a +g +7app/src/main/java/net/micode/notes/ui/NoteItemData.java,0\8\08c35f02f11c35ae9ebf8db0a482054dfa1cf493 +k +;app/src/main/java/net/micode/notes/ui/NoteEditActivity.java,5\7\577f30d26378ec8a2bd2e4a43f3c79b3f04c402c +b +2app/src/main/java/net/micode/notes/data/Notes.java,a\7\a7641cfac724321d508c2a284223a711011a93f5 +P + app/src/main/AndroidManifest.xml,8\c\8c55c3ccc257e5907959013f99656e4c8ec3903e < build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35 -k -;app/src/main/java/net/micode/notes/ui/NoteEditActivity.java,5\7\577f30d26378ec8a2bd2e4a43f3c79b3f04c402c \ No newline at end of file +m +=app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java,f\9\f9f49497f95afd327db7a7a512612aa1089003d4 +p +@app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java,4\5\4529b3a97b0f3b19b895aa06f23bed63ff38a312 +@ +app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164 +l + - + -%s --%s --%s @@ -7,11 +7,11 @@ Messaging Email - #335b5b5b33sp26sp20sp17sp14sp#00FF00#FF0000#0000FF#FFFF00#000000#00FFFFNotesNotes 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 folderChange Selected Text ColorInsert ImageSD 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改变文本颜色 + #335b5b5b33sp26sp20sp17sp14sp#00FF00#FF0000#0000FF#FFFF00#000000#00FFFFNotesNotes 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 folderMove to private folderOpen private folderPlease enter the passwordBack to all notes%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 folderChange Selected Text ColorInsert ImageSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel改变文本颜色 %1$s result for \"%2$s\" %1$s results for \"%2$s\" - + 短信 邮件 - 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图/MIUI/notes/notes_%s.txt(%d)新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹更改选中文本颜色插入图片SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$syyyy-MM-dd hh:mm:ss添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消改变文本颜色 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图/MIUI/notes/notes_%s.txt(%d)新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹隐藏笔记" 查看隐藏笔记"请输入密码选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹更改选中文本颜色插入图片SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$syyyy-MM-dd hh:mm:ss添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消改变文本颜色 %1$s 条符合“%2$s”的搜索结果 - + 全部笔记移出隐藏列表 短信 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾/MIUI/notes/notes_%s.txt(%d)新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？更改选中文本颜色插入图像SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$syyyy-MM-dd hh:mm:ss添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消改变文本颜色 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾/MIUI/notes/notes_%s.txt(%d)新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾隐藏笔记查看隐藏笔记请键入密码選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？更改选中文本颜色插入图像SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$syyyy-MM-dd hh:mm:ss添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消改变文本颜色 %1$s 條符合”%2$s“的搜尋結果 - \ No newline at end of file + 全部笔记移除隐藏列表 \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index c9f5d16..41d025e 100644 --- a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 4f557c8..95449c5 100644 --- a/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 08d6782..d8aa5b4 100644 --- a/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 9e2119c..9300429 100644 --- a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,25 @@ -#Thu Apr 27 20:45:53 HKT 2023 -base.0=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex -renamed.0=classes.dex +#Mon Jun 05 07:28:36 HKT 2023 +path.4=13/classes.dex +path.3=12/classes.dex +path.2=11/classes.dex +path.1=0/classes.dex +path.7=5/classes.dex +path.6=4/classes.dex +path.5=15/classes.dex path.0=classes.dex +base.4=D\:\\MINOTES\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex +base.3=D\:\\MINOTES\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex +base.2=D\:\\MINOTES\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex +base.1=D\:\\MINOTES\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex +base.0=D\:\\MINOTES\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex +renamed.3=classes4.dex +renamed.2=classes3.dex +renamed.1=classes2.dex +renamed.0=classes.dex +renamed.7=classes8.dex +renamed.6=classes7.dex +base.7=D\:\\MINOTES\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex +renamed.5=classes6.dex +base.6=D\:\\MINOTES\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex +renamed.4=classes5.dex +base.5=D\:\\MINOTES\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 603c336..3c78179 100644 Binary files a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 index 945a7c5..d81d1fa 100644 Binary files a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 and b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 differ diff --git a/app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt b/app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt deleted file mode 100644 index 5aafad5..0000000 --- a/app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt +++ /dev/null @@ -1 +0,0 @@ -C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\color_primary_text_dark.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\color_secondary_text_dark.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_bg_btn_set_color.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_bg_color_btn_mask.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_call_record.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_clock.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_delete.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_dropdown_icon.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_blue.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_green.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_red.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_blue.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_green.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_red.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_white.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_yellow.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_white.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_yellow.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_font_color_green.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_font_large.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_font_normal.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_font_size_selector_bg.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_font_small.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_font_super.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_icon_app.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_background.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_down.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_middle.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_single.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_up.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_folder.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_footer_bg.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_down.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_middle.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_single.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_up.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_down.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_middle.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_single.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_up.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_down.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_middle.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_single.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_up.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_down.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_middle.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_single.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_up.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_menu_delete.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_menu_move.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_new_note_normal.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_new_note_pressed.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_note_edit_color_selector_panel.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_notification.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_search_result.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_selected.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_title_alert.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_title_bar_bg.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_blue.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_green.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_red.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_white.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_yellow.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_blue.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_green.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_red.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_white.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_yellow.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable_new_note.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_account_dialog_title.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_add_account_text.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_datetime_picker.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_dialog_edit_text.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_folder_list_item.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_note_edit.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_note_edit_list_item.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_note_item.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_note_list.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_note_list_dropdown_menu.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_note_list_footer.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_settings_header.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_widget_2x.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_widget_4x.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\menu_call_note_edit.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\menu_call_record_folder.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\menu_note_edit.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\menu_note_list.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\menu_note_list_dropdown.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\menu_note_list_options.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\menu_sub_folder.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\raw-zh-rCN_introduction.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\raw_introduction.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\values-zh-rCN_values-zh-rCN.arsc.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\values-zh-rTW_values-zh-rTW.arsc.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\values_values.arsc.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\xml_preferences.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\xml_searchable.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\xml_widget_2x_info.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\xml_widget_4x_info.xml.flat \ No newline at end of file diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class index 42394b7..9f4d27e 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class index 76ef96e..ddaec8f 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class index 42461a2..03f890d 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class index 413745e..3c40c6a 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class index 0b075b4..38dd14f 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class index f50998a..f4cbc24 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class index 5ffa71d..beb1278 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class index 2b0fbe6..3d9560d 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class index 3091c3e..ec7e4b8 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class index 9ea668c..5700670 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class index a3157df..6145e0d 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class index b9de96e..3120a8e 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index cd461f8..3bbd65c 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class index 3d51519..e2f05d2 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index bc44cf0..31d4b1f 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class index 1a2b75f..8911567 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index 259aa97..d1b337b 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index e1d83ca..ac8174e 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index c569e6a..049c6f0 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index be18b58..d0b8ade 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index d1b13cf..5884550 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class index 3e3c5f5..abfb9e1 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index 201dc95..0db7ea3 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index e2bccbe..aaa5d24 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index 9dc928a..f0af557 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index f8d11c2..86fbf97 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index 4bd4777..ef343cd 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index 527392c..e516b1d 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index 33f1629..522b593 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index d1cd65d..7092505 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index 0000a99..7624a4c 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index b9e2606..072aa0d 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class index 2edab7b..204625c 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class index 3d7a7fc..1377e93 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class index de35790..9fdfde5 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index 7801541..0986be8 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class index 7fbad50..97ff529 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index f733a10..8a8557c 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index bffc0d9..248f527 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index 4636402..4f3d301 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class index a28a718..e8d5661 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index 619e22f..d691efd 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index 953b301..ca99794 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index 23a80dd..d050a6a 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 90e91b7..484436a 100644 --- a/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,254 +20,255 @@ 20 android:versionName="0.1" > 21 22 D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44 -23 android:minSdkVersion="14" -23-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:15-41 -24 android:targetSdkVersion="14" /> -24-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44 +22-->D:\MINOTES\app\src\main\AndroidManifest.xml:23:5-44 +23 android:minSdkVersion="24" +23-->D:\MINOTES\app\src\main\AndroidManifest.xml:23:15-41 +24 android:targetSdkVersion="24" /> +24-->D:\MINOTES\app\src\main\AndroidManifest.xml:23:5-44 25 26 -26-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:25:5-81 -26-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:25:22-78 +26-->D:\MINOTES\app\src\main\AndroidManifest.xml:25:5-81 +26-->D:\MINOTES\app\src\main\AndroidManifest.xml:25:22-78 27 -27-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:26:5-88 -27-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:26:22-85 +27-->D:\MINOTES\app\src\main\AndroidManifest.xml:26:5-88 +27-->D:\MINOTES\app\src\main\AndroidManifest.xml:26:22-85 28 -28-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:27:5-67 -28-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:27:22-64 +28-->D:\MINOTES\app\src\main\AndroidManifest.xml:27:5-67 +28-->D:\MINOTES\app\src\main\AndroidManifest.xml:27:22-64 29 -29-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:28:5-72 -29-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:28:22-69 +29-->D:\MINOTES\app\src\main\AndroidManifest.xml:28:5-72 +29-->D:\MINOTES\app\src\main\AndroidManifest.xml:28:22-69 30 -30-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:29:5-74 -30-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:29:22-71 +30-->D:\MINOTES\app\src\main\AndroidManifest.xml:29:5-74 +30-->D:\MINOTES\app\src\main\AndroidManifest.xml:29:22-71 31 -31-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:30:5-80 -31-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:30:22-77 +31-->D:\MINOTES\app\src\main\AndroidManifest.xml:30:5-80 +31-->D:\MINOTES\app\src\main\AndroidManifest.xml:30:22-77 32 -32-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:31:5-71 -32-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:31:22-68 +32-->D:\MINOTES\app\src\main\AndroidManifest.xml:31:5-71 +32-->D:\MINOTES\app\src\main\AndroidManifest.xml:31:22-68 33 -33-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:32:5-74 -33-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:32:22-71 +33-->D:\MINOTES\app\src\main\AndroidManifest.xml:32:5-74 +33-->D:\MINOTES\app\src\main\AndroidManifest.xml:32:22-71 34 -34-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:33:5-81 -34-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:33:22-78 +34-->D:\MINOTES\app\src\main\AndroidManifest.xml:33:5-81 +34-->D:\MINOTES\app\src\main\AndroidManifest.xml:33:22-78 35 36 D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:35:5-149:19 +36-->D:\MINOTES\app\src\main\AndroidManifest.xml:35:5-149:19 37 android:debuggable="true" -38 android:icon="@drawable/icon_app" -38-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:36:9-42 -39 android:label="@string/app_name" -39-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:37:9-41 -40 android:testOnly="true" > -41 D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:38:9-51:20 -42 android:name="net.micode.notes.ui.NotesListActivity" -42-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:39:13-49 -43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:40:13-74 -44 android:label="@string/app_name" -44-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:41:13-45 -45 android:launchMode="singleTop" -45-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:42:13-43 -46 android:theme="@style/NoteTheme" -46-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:43:13-45 -47 android:uiOptions="splitActionBarWhenNarrow" -47-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:44:13-57 -48 android:windowSoftInputMode="adjustPan" > -48-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:45:13-52 -49 -49-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:47:13-50:29 -50 -50-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:48:17-69 -50-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:48:25-66 -51 -52 -52-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:49:17-77 -52-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:49:27-74 -53 -54 -55 D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:53:9-81:20 -56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:54:13-48 -57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:55:13-74 -58 android:launchMode="singleTop" -58-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:56:13-43 -59 android:theme="@style/NoteTheme" > -59-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:57:13-45 -60 -60-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:59:13-64:29 -61 -61-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:60:17-69 -61-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:60:25-66 -62 -63 -63-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:17-76 -63-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:27-73 -64 -65 -65-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:17-78 -65-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:23-75 -66 -66-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:17-78 -66-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:23-75 -67 -68 -68-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:66:13-71:29 -69 -69-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:67:17-79 -69-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:67:25-76 -70 -71 -71-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:17-76 -71-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:27-73 -72 -73 -73-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:17-78 -73-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:23-75 -74 -74-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:17-78 -74-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:23-75 -75 -76 -76-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:73:13-76:29 -77 -77-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:74:17-71 -77-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:74:25-68 -78 -79 -79-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:17-76 -79-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:27-73 -80 -81 -82 D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:78:13-80:54 -83 android:name="android.app.searchable" -83-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:79:17-54 -84 android:resource="@xml/searchable" /> -84-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:80:17-51 -85 -86 -87 D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:83:9-86:43 -88 android:name="net.micode.notes.data.NotesProvider" -88-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:84:13-63 -89 android:authorities="micode_notes" -89-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:85:13-47 -90 android:multiprocess="true" /> -90-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:86:13-40 -91 -92 D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:88:9-100:20 -93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:89:13-57 -94 android:label="@string/app_widget2x2" > -94-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:90:13-50 -95 -95-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:91:13-95:29 -96 -96-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:92:17-84 -96-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:92:25-81 -97 -97-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:93:17-85 -97-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:93:25-82 -98 -98-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:94:17-85 -98-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:94:25-82 -99 -100 -101 D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:97:13-99:58 -102 android:name="android.appwidget.provider" -102-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:98:17-58 -103 android:resource="@xml/widget_2x_info" /> -103-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:99:17-55 -104 -105 D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:101:9-114:20 -106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:102:13-57 -107 android:label="@string/app_widget4x4" > -107-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:103:13-50 -108 -108-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:91:13-95:29 -109 -109-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:92:17-84 -109-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:92:25-81 -110 -110-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:93:17-85 -110-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:93:25-82 -111 -111-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:94:17-85 -111-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:94:25-82 -112 -113 -114 D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:97:13-99:58 -115 android:name="android.appwidget.provider" -115-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:98:17-58 -116 android:resource="@xml/widget_4x_info" /> -116-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:99:17-55 -117 -118 -118-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:116:9-120:20 -118-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:116:19-55 -119 -119-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:117:13-119:29 -120 -120-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:118:17-79 -120-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:118:25-76 -121 -122 -123 D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:122:9-125:20 -124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:123:13-61 -125 android:process=":remote" > -125-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:124:13-38 -126 -127 -128 D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:127:9-132:20 -129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:128:13-50 -130 android:label="@string/app_name" -130-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:129:13-45 -131 android:launchMode="singleInstance" -131-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:130:13-48 -132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:131:13-75 -133 -134 D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:134:9-139:20 -135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:135:13-71 -136 android:label="@string/preferences_title" -136-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:136:13-54 -137 android:launchMode="singleTop" -137-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:137:13-43 -138 android:theme="@android:style/Theme.Holo.Light" > -138-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:138:13-60 -139 -140 -141 D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:141:9-144:19 -142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:142:13-74 -143 android:exported="false" > -143-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:143:13-37 -144 -145 -146 D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:146:9-148:52 -147 android:name="android.app.default_searchable" -147-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:147:13-58 -148 android:value=".ui.NoteEditActivity" /> -148-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:148:13-49 -149 -150 -151 +38 android:extractNativeLibs="false" +39 android:icon="@drawable/icon_app" +39-->D:\MINOTES\app\src\main\AndroidManifest.xml:36:9-42 +40 android:label="@string/app_name" +40-->D:\MINOTES\app\src\main\AndroidManifest.xml:37:9-41 +41 android:testOnly="true" > +42 D:\MINOTES\app\src\main\AndroidManifest.xml:38:9-51:20 +43 android:name="net.micode.notes.ui.NotesListActivity" +43-->D:\MINOTES\app\src\main\AndroidManifest.xml:39:13-49 +44 android:configChanges="keyboardHidden|orientation|screenSize" +44-->D:\MINOTES\app\src\main\AndroidManifest.xml:40:13-74 +45 android:label="@string/app_name" +45-->D:\MINOTES\app\src\main\AndroidManifest.xml:41:13-45 +46 android:launchMode="singleTop" +46-->D:\MINOTES\app\src\main\AndroidManifest.xml:42:13-43 +47 android:theme="@style/NoteTheme" +47-->D:\MINOTES\app\src\main\AndroidManifest.xml:43:13-45 +48 android:uiOptions="splitActionBarWhenNarrow" +48-->D:\MINOTES\app\src\main\AndroidManifest.xml:44:13-57 +49 android:windowSoftInputMode="adjustPan" > +49-->D:\MINOTES\app\src\main\AndroidManifest.xml:45:13-52 +50 +50-->D:\MINOTES\app\src\main\AndroidManifest.xml:47:13-50:29 +51 +51-->D:\MINOTES\app\src\main\AndroidManifest.xml:48:17-69 +51-->D:\MINOTES\app\src\main\AndroidManifest.xml:48:25-66 +52 +53 +53-->D:\MINOTES\app\src\main\AndroidManifest.xml:49:17-77 +53-->D:\MINOTES\app\src\main\AndroidManifest.xml:49:27-74 +54 +55 +56 D:\MINOTES\app\src\main\AndroidManifest.xml:53:9-81:20 +57 android:name="net.micode.notes.ui.NoteEditActivity" +57-->D:\MINOTES\app\src\main\AndroidManifest.xml:54:13-48 +58 android:configChanges="keyboardHidden|orientation|screenSize" +58-->D:\MINOTES\app\src\main\AndroidManifest.xml:55:13-74 +59 android:launchMode="singleTop" +59-->D:\MINOTES\app\src\main\AndroidManifest.xml:56:13-43 +60 android:theme="@style/NoteTheme" > +60-->D:\MINOTES\app\src\main\AndroidManifest.xml:57:13-45 +61 +61-->D:\MINOTES\app\src\main\AndroidManifest.xml:59:13-64:29 +62 +62-->D:\MINOTES\app\src\main\AndroidManifest.xml:60:17-69 +62-->D:\MINOTES\app\src\main\AndroidManifest.xml:60:25-66 +63 +64 +64-->D:\MINOTES\app\src\main\AndroidManifest.xml:61:17-76 +64-->D:\MINOTES\app\src\main\AndroidManifest.xml:61:27-73 +65 +66 +66-->D:\MINOTES\app\src\main\AndroidManifest.xml:62:17-78 +66-->D:\MINOTES\app\src\main\AndroidManifest.xml:62:23-75 +67 +67-->D:\MINOTES\app\src\main\AndroidManifest.xml:62:17-78 +67-->D:\MINOTES\app\src\main\AndroidManifest.xml:62:23-75 +68 +69 +69-->D:\MINOTES\app\src\main\AndroidManifest.xml:66:13-71:29 +70 +70-->D:\MINOTES\app\src\main\AndroidManifest.xml:67:17-79 +70-->D:\MINOTES\app\src\main\AndroidManifest.xml:67:25-76 +71 +72 +72-->D:\MINOTES\app\src\main\AndroidManifest.xml:61:17-76 +72-->D:\MINOTES\app\src\main\AndroidManifest.xml:61:27-73 +73 +74 +74-->D:\MINOTES\app\src\main\AndroidManifest.xml:62:17-78 +74-->D:\MINOTES\app\src\main\AndroidManifest.xml:62:23-75 +75 +75-->D:\MINOTES\app\src\main\AndroidManifest.xml:62:17-78 +75-->D:\MINOTES\app\src\main\AndroidManifest.xml:62:23-75 +76 +77 +77-->D:\MINOTES\app\src\main\AndroidManifest.xml:73:13-76:29 +78 +78-->D:\MINOTES\app\src\main\AndroidManifest.xml:74:17-71 +78-->D:\MINOTES\app\src\main\AndroidManifest.xml:74:25-68 +79 +80 +80-->D:\MINOTES\app\src\main\AndroidManifest.xml:61:17-76 +80-->D:\MINOTES\app\src\main\AndroidManifest.xml:61:27-73 +81 +82 +83 D:\MINOTES\app\src\main\AndroidManifest.xml:78:13-80:54 +84 android:name="android.app.searchable" +84-->D:\MINOTES\app\src\main\AndroidManifest.xml:79:17-54 +85 android:resource="@xml/searchable" /> +85-->D:\MINOTES\app\src\main\AndroidManifest.xml:80:17-51 +86 +87 +88 D:\MINOTES\app\src\main\AndroidManifest.xml:83:9-86:43 +89 android:name="net.micode.notes.data.NotesProvider" +89-->D:\MINOTES\app\src\main\AndroidManifest.xml:84:13-63 +90 android:authorities="micode_notes" +90-->D:\MINOTES\app\src\main\AndroidManifest.xml:85:13-47 +91 android:multiprocess="true" /> +91-->D:\MINOTES\app\src\main\AndroidManifest.xml:86:13-40 +92 +93 D:\MINOTES\app\src\main\AndroidManifest.xml:88:9-100:20 +94 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +94-->D:\MINOTES\app\src\main\AndroidManifest.xml:89:13-57 +95 android:label="@string/app_widget2x2" > +95-->D:\MINOTES\app\src\main\AndroidManifest.xml:90:13-50 +96 +96-->D:\MINOTES\app\src\main\AndroidManifest.xml:91:13-95:29 +97 +97-->D:\MINOTES\app\src\main\AndroidManifest.xml:92:17-84 +97-->D:\MINOTES\app\src\main\AndroidManifest.xml:92:25-81 +98 +98-->D:\MINOTES\app\src\main\AndroidManifest.xml:93:17-85 +98-->D:\MINOTES\app\src\main\AndroidManifest.xml:93:25-82 +99 +99-->D:\MINOTES\app\src\main\AndroidManifest.xml:94:17-85 +99-->D:\MINOTES\app\src\main\AndroidManifest.xml:94:25-82 +100 +101 +102 D:\MINOTES\app\src\main\AndroidManifest.xml:97:13-99:58 +103 android:name="android.appwidget.provider" +103-->D:\MINOTES\app\src\main\AndroidManifest.xml:98:17-58 +104 android:resource="@xml/widget_2x_info" /> +104-->D:\MINOTES\app\src\main\AndroidManifest.xml:99:17-55 +105 +106 D:\MINOTES\app\src\main\AndroidManifest.xml:101:9-114:20 +107 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +107-->D:\MINOTES\app\src\main\AndroidManifest.xml:102:13-57 +108 android:label="@string/app_widget4x4" > +108-->D:\MINOTES\app\src\main\AndroidManifest.xml:103:13-50 +109 +109-->D:\MINOTES\app\src\main\AndroidManifest.xml:91:13-95:29 +110 +110-->D:\MINOTES\app\src\main\AndroidManifest.xml:92:17-84 +110-->D:\MINOTES\app\src\main\AndroidManifest.xml:92:25-81 +111 +111-->D:\MINOTES\app\src\main\AndroidManifest.xml:93:17-85 +111-->D:\MINOTES\app\src\main\AndroidManifest.xml:93:25-82 +112 +112-->D:\MINOTES\app\src\main\AndroidManifest.xml:94:17-85 +112-->D:\MINOTES\app\src\main\AndroidManifest.xml:94:25-82 +113 +114 +115 D:\MINOTES\app\src\main\AndroidManifest.xml:97:13-99:58 +116 android:name="android.appwidget.provider" +116-->D:\MINOTES\app\src\main\AndroidManifest.xml:98:17-58 +117 android:resource="@xml/widget_4x_info" /> +117-->D:\MINOTES\app\src\main\AndroidManifest.xml:99:17-55 +118 +119 +119-->D:\MINOTES\app\src\main\AndroidManifest.xml:116:9-120:20 +119-->D:\MINOTES\app\src\main\AndroidManifest.xml:116:19-55 +120 +120-->D:\MINOTES\app\src\main\AndroidManifest.xml:117:13-119:29 +121 +121-->D:\MINOTES\app\src\main\AndroidManifest.xml:118:17-79 +121-->D:\MINOTES\app\src\main\AndroidManifest.xml:118:25-76 +122 +123 +124 D:\MINOTES\app\src\main\AndroidManifest.xml:122:9-125:20 +125 android:name="net.micode.notes.ui.AlarmReceiver" +125-->D:\MINOTES\app\src\main\AndroidManifest.xml:123:13-61 +126 android:process=":remote" > +126-->D:\MINOTES\app\src\main\AndroidManifest.xml:124:13-38 +127 +128 +129 D:\MINOTES\app\src\main\AndroidManifest.xml:127:9-132:20 +130 android:name="net.micode.notes.ui.AlarmAlertActivity" +130-->D:\MINOTES\app\src\main\AndroidManifest.xml:128:13-50 +131 android:label="@string/app_name" +131-->D:\MINOTES\app\src\main\AndroidManifest.xml:129:13-45 +132 android:launchMode="singleInstance" +132-->D:\MINOTES\app\src\main\AndroidManifest.xml:130:13-48 +133 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +133-->D:\MINOTES\app\src\main\AndroidManifest.xml:131:13-75 +134 +135 D:\MINOTES\app\src\main\AndroidManifest.xml:134:9-139:20 +136 android:name="net.micode.notes.ui.NotesPreferenceActivity" +136-->D:\MINOTES\app\src\main\AndroidManifest.xml:135:13-71 +137 android:label="@string/preferences_title" +137-->D:\MINOTES\app\src\main\AndroidManifest.xml:136:13-54 +138 android:launchMode="singleTop" +138-->D:\MINOTES\app\src\main\AndroidManifest.xml:137:13-43 +139 android:theme="@android:style/Theme.Holo.Light" > +139-->D:\MINOTES\app\src\main\AndroidManifest.xml:138:13-60 +140 +141 +142 D:\MINOTES\app\src\main\AndroidManifest.xml:141:9-144:19 +143 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +143-->D:\MINOTES\app\src\main\AndroidManifest.xml:142:13-74 +144 android:exported="false" > +144-->D:\MINOTES\app\src\main\AndroidManifest.xml:143:13-37 +145 +146 +147 D:\MINOTES\app\src\main\AndroidManifest.xml:146:9-148:52 +148 android:name="android.app.default_searchable" +148-->D:\MINOTES\app\src\main\AndroidManifest.xml:147:13-58 +149 android:value=".ui.NoteEditActivity" /> +149-->D:\MINOTES\app\src\main\AndroidManifest.xml:148:13-49 +150 +151 +152 diff --git a/app/build/intermediates/merged_java_res/debug/base.jar b/app/build/intermediates/merged_java_res/debug/base.jar index 15cb0ec..0dbf6fb 100644 Binary files a/app/build/intermediates/merged_java_res/debug/base.jar and b/app/build/intermediates/merged_java_res/debug/base.jar differ diff --git a/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index f237bf5..73e3e7c 100644 --- a/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -20,8 +20,8 @@ android:versionName="0.1" > + android:minSdkVersion="24" + android:targetSdkVersion="24" /> @@ -35,6 +35,7 @@ diff --git a/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index f237bf5..73e3e7c 100644 --- a/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -20,8 +20,8 @@ android:versionName="0.1" > + android:minSdkVersion="24" + android:targetSdkVersion="24" /> @@ -35,6 +35,7 @@ diff --git a/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat index b092461..5ed2c41 100644 Binary files a/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat and b/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat index c138bc9..8e2034d 100644 Binary files a/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and b/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat b/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat index 60513de..94778e9 100644 Binary files a/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat and b/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat index 9e45558..caaaa65 100644 Binary files a/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ diff --git a/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat index cda43a8..d6baf96 100644 Binary files a/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat and b/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ diff --git a/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/app/build/intermediates/merged_res/debug/values_values.arsc.flat index 3640e7f..4616917 100644 Binary files a/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 2430049..2750ef9 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,53 +1,29 @@ { "logs": [ { - "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", + "outputFile": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat", "map": [ { - "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" + "startLines": "135,76,79,78,77,19,20,21,53,124,125,134,133,132,26,87,88,86,85,84,100,99,98,90,39,38,68,29,30,91,41,80,126,75,71,81,42,48,57,43,67,66,65,61,60,58,59,62,82,63,49,74,50,64,72,47,56,55,54,70,46,69,44,45,73,28,34,36,33,35,32,31,25,24,52,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,51,131,129,128,130,27,89,97,102,101,103,96,95,94,93,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,4,4", + "startOffsets": "8600,4244,4508,4411,4341,846,890,943,2835,8035,8085,8547,8488,8436,1308,5105,5200,5033,4948,4864,6079,5995,5892,5378,2043,1991,3735,1515,1569,5440,2138,4592,8149,4172,3923,4695,2198,2519,3099,2257,3663,3601,3543,3317,3264,3159,3213,3368,4774,3419,2567,4105,2621,3480,3973,2471,3043,2954,2895,3860,2420,3814,2315,2359,4037,1459,1784,1894,1736,1840,1679,1630,1252,1198,2758,6542,6474,6786,7936,7155,7073,7230,7320,7564,7484,6627,6703,7013,6851,6932,6418,7709,7832,2694,8394,8265,8207,8319,1393,5309,5805,6216,6146,6297,5745,5689,5626,5565,996,1107", + "endLines": "139,76,79,78,77,19,20,21,53,124,125,134,133,132,26,87,88,86,85,84,100,99,98,90,39,38,68,29,30,91,41,80,126,75,71,81,42,48,57,43,67,66,65,61,60,58,59,62,82,63,49,74,50,64,72,47,56,55,54,70,46,69,44,45,73,28,34,36,33,35,32,31,25,24,52,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,51,131,129,128,130,27,89,97,102,101,103,96,95,94,93,22,23", + "endColumns": "14,95,82,95,68,42,51,51,58,48,62,51,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,77,57,46,58,56,70,60,56,49,51,52,49,49,56,59,52,65,71,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,75,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,62,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "9008,4335,4586,4502,4405,884,937,990,2889,8079,8143,8594,8541,8482,1387,5194,5303,5099,5027,4942,6140,6073,5989,5434,2100,2037,3808,1563,1624,5540,2192,4689,8199,4238,3967,4768,2251,2561,3153,2309,3729,3657,3595,3362,3311,3207,3258,3413,4826,3474,2615,4166,2688,3537,4031,2513,3093,3037,2948,3917,2465,3854,2353,2414,4099,1509,1834,1942,1778,1888,1730,1673,1302,1246,2829,6621,6536,6845,8027,7224,7149,7314,7478,7703,7558,6697,6780,7067,6926,7007,6468,7826,7930,2752,8430,8313,8259,8388,1453,5372,5886,6291,6210,6386,5799,5739,5683,5620,1101,1192" }, "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" + "startLines": "24,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "985,1338,1434,1517,1613,1682,1725,1777,1829,1888,1937,2000,2052,2110,2161,2245,2339,2447,2518,2602,2685,2751,2834,2936,2997,3059,3110,3188,3241,3301,3406,3465,3567,3622,3693,3742,3820,3878,3925,3984,4041,4112,4173,4230,4280,4332,4385,4435,4485,4542,4602,4655,4721,4793,4855,4918,4965,5020,5108,5166,5228,5278,5323,5366,5426,5493,5548,5603,5656,5703,5756,5812,5860,5915,5968,6044,6128,6195,6259,6355,6429,6510,6599,6762,6906,6985,7060,7142,7201,7281,7361,7416,7538,7641,7704,7745,7798,7855,7929,7994,8062,8148,8228,8297,8391,8450,8505,8567,8627,8737", + "endLines": "28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137", + "endColumns": "14,95,82,95,68,42,51,51,58,48,62,51,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,77,57,46,58,56,70,60,56,49,51,52,49,49,56,59,52,65,71,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,75,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,62,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1333,1429,1512,1608,1677,1720,1772,1824,1883,1932,1995,2047,2105,2156,2240,2334,2442,2513,2597,2680,2746,2829,2931,2992,3054,3105,3183,3236,3296,3401,3460,3562,3617,3688,3737,3815,3873,3920,3979,4036,4107,4168,4225,4275,4327,4380,4430,4480,4537,4597,4650,4716,4788,4850,4913,4960,5015,5103,5161,5223,5273,5318,5361,5421,5488,5543,5598,5651,5698,5751,5807,5855,5910,5963,6039,6123,6190,6254,6350,6424,6505,6594,6757,6901,6980,7055,7137,7196,7276,7356,7411,7533,7636,7699,7740,7793,7850,7924,7989,8057,8143,8223,8292,8386,8445,8500,8562,8622,8732,8822" } }, { - "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "128,74,73,72,71,19,20,21,118,119,127,126,125,26,82,83,81,80,79,95,94,93,85,39,38,63,29,30,86,40,75,120,70,66,77,41,47,52,42,62,61,60,56,55,53,54,57,78,58,48,69,59,67,46,51,50,49,65,45,64,43,44,68,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,124,122,121,123,27,84,92,97,96,98,91,90,89,88,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", - "startOffsets": "6947,3667,3601,3528,3478,827,867,915,6446,6491,6895,6841,6791,1199,4142,4210,4083,4018,3955,4873,4813,4750,4342,1849,1798,3049,1369,1422,4396,1911,3740,6548,3419,3206,3846,1970,2251,2497,2023,2989,2936,2885,2690,2642,2548,2596,2736,3906,2783,2294,3360,2833,3249,2208,2450,2394,2339,3151,2164,3109,2073,2114,3301,1318,1623,1719,1576,1672,1529,1484,1148,1095,5248,5189,5471,6372,5782,5713,5846,5924,6107,6034,5323,5389,5658,5528,5593,5140,6211,6294,6753,6646,6598,6691,1261,4287,4691,4986,4928,5053,4643,4598,4550,4499,963,1029", - "endLines": "130,74,73,72,71,19,20,21,118,119,127,126,125,26,82,83,81,80,79,95,94,93,85,39,38,63,29,30,86,40,75,120,70,66,77,41,47,52,42,62,61,60,56,55,53,54,57,78,58,48,69,59,67,46,51,50,49,65,45,64,43,44,68,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,124,122,121,123,27,84,92,97,96,98,91,90,89,88,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,64,62,54,59,62,53,61,50,59,52,61,84,58,80,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,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,81,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "7119,3735,3662,3596,3523,862,910,958,6486,6543,6942,6890,6836,1256,4205,4282,4137,4078,4013,4923,4868,4808,4391,1906,1844,3104,1417,1479,4476,1965,3816,6593,3473,3244,3901,2018,2289,2543,2068,3044,2984,2931,2731,2685,2591,2637,2778,3950,2828,2334,3414,2880,3296,2246,2492,2445,2389,3201,2203,3146,2109,2159,3355,1364,1667,1763,1618,1714,1571,1524,1194,1143,5318,5243,5523,6441,5841,5777,5919,6029,6206,6102,5384,5466,5708,5588,5653,5184,6289,6367,6786,6686,6641,6748,1313,4337,4745,5048,4981,5110,4686,4638,4593,4545,1024,1090" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113", - "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", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,936,990,1040,1102,1170,1247,1306,1371,1434,1489,1549,1612,1666,1728,1779,1839,1892,1954,2039,2098,2179,2229,2288,2331,2391,2444,2487,2538,2588,2648,2701,2752,2798,2846,2894,2940,2987,3036,3086,3131,3190,3242,3294,3337,3384,3440,3495,3550,3594,3636,3677,3727,3786,3837,3886,3935,3982,4029,4076,4121,4172,4225,4300,4359,4416,4490,4554,4623,4701,4811,4915,4988,5054,5136,5191,5256,5321,5370,5453,5531,5569,5614,5662,5724,5781,5836,5895,5962,6020,6082,6130,6175,6223,6274,6340", - "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,112,113", - "endColumns": "14,72,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,64,62,54,59,62,53,61,50,59,52,61,84,58,80,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,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,81,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,931,985,1035,1097,1165,1242,1301,1366,1429,1484,1544,1607,1661,1723,1774,1834,1887,1949,2034,2093,2174,2224,2283,2326,2386,2439,2482,2533,2583,2643,2696,2747,2793,2841,2889,2935,2982,3031,3081,3126,3185,3237,3289,3332,3379,3435,3490,3545,3589,3631,3672,3722,3781,3832,3881,3930,3977,4024,4071,4116,4167,4220,4295,4354,4411,4485,4549,4618,4696,4806,4910,4983,5049,5131,5186,5251,5316,5365,5448,5526,5564,5609,5657,5719,5776,5831,5890,5957,6015,6077,6125,6170,6218,6269,6335,6401" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", - "map": [ - { - "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\FontColor.xml", + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\FontColor.xml", "from": { "startLines": "4,7,6,2,3,5", "startColumns": "4,4,4,4,4,4", @@ -64,45 +40,26 @@ } }, { - "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "131,72,75,74,73,19,20,21,120,121,130,129,128,26,83,84,82,81,80,96,95,94,86,39,38,64,29,30,87,41,76,122,71,67,77,42,48,53,43,63,62,61,57,56,54,55,58,78,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8195,3898,4159,4063,3994,827,870,922,7641,7690,8143,8085,8034,1282,4748,4842,4677,4593,4510,5709,5626,5524,5018,2004,1953,3397,1486,1539,5079,2097,4242,7753,3827,3582,4344,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,4422,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6165,6098,6406,7544,6770,6689,6844,6933,7175,7096,6249,6324,6630,6470,6550,6043,7319,7441,7993,7866,7809,7919,1366,4950,5438,5844,5775,5924,5379,5324,5262,5202,974,1084", - "endLines": "135,72,75,74,73,19,20,21,120,121,130,129,128,26,83,84,82,81,80,96,95,94,86,39,38,64,29,30,87,41,76,122,71,67,77,42,48,53,43,63,62,61,57,56,54,55,58,78,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,51,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,77,57,46,58,56,70,60,56,49,51,52,49,49,56,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": "8599,3989,4237,4154,4058,865,917,969,7685,7748,8190,8138,8080,1361,4837,4945,4743,4672,4588,5770,5704,5621,5074,2061,1999,3470,1534,1594,5179,2151,4339,7803,3893,3626,4417,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,4474,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6244,6160,6465,7635,6839,6765,6928,7091,7314,7170,6319,6401,6684,6545,6625,6093,7436,7539,8029,7914,7861,7988,1426,5013,5519,5919,5839,6013,5433,5374,5319,5257,1079,1169" - }, - "to": { - "startLines": "24,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133", - "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", - "startOffsets": "985,1338,1434,1517,1613,1682,1725,1777,1829,1878,1941,1993,2051,2102,2186,2280,2388,2459,2543,2626,2692,2775,2877,2938,3000,3051,3129,3182,3242,3347,3406,3508,3563,3634,3683,3761,3819,3866,3925,3982,4053,4114,4171,4221,4273,4326,4376,4426,4483,4543,4596,4662,4724,4787,4834,4889,4977,5035,5097,5147,5192,5235,5295,5362,5417,5472,5525,5572,5625,5681,5729,5784,5837,5921,5988,6052,6148,6222,6303,6392,6555,6699,6778,6853,6935,6994,7074,7154,7209,7331,7434,7475,7528,7585,7659,7724,7792,7878,7958,8027,8121,8180,8235,8297,8357,8467", - "endLines": "28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133", - "endColumns": "14,95,82,95,68,42,51,51,48,62,51,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,77,57,46,58,56,70,60,56,49,51,52,49,49,56,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": "1333,1429,1512,1608,1677,1720,1772,1824,1873,1936,1988,2046,2097,2181,2275,2383,2454,2538,2621,2687,2770,2872,2933,2995,3046,3124,3177,3237,3342,3401,3503,3558,3629,3678,3756,3814,3861,3920,3977,4048,4109,4166,4216,4268,4321,4371,4421,4478,4538,4591,4657,4719,4782,4829,4884,4972,5030,5092,5142,5187,5230,5290,5357,5412,5467,5520,5567,5620,5676,5724,5779,5832,5916,5983,6047,6143,6217,6298,6387,6550,6694,6773,6848,6930,6989,7069,7149,7204,7326,7429,7470,7523,7580,7654,7719,7787,7873,7953,8022,8116,8175,8230,8292,8352,8462,8552" - } - }, - { - "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "64,69,78,74,36,40,44,49,54,32,59,28,25,19,22", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2499,2704,3077,2916,1332,1515,1700,1886,2090,1149,2297,1031,921,713,819", - "endLines": "67,72,81,76,39,43,47,52,57,35,62,30,27,21,24", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2698,2910,3283,3071,1510,1695,1880,2084,2291,1327,2493,1143,1026,814,916" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "739,1047", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1041,1162" }, "to": { - "startLines": "134,138,142,146,149,153,157,161,165,169,173,177,180,183,186", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8557,8761,8972,9182,9342,9525,9710,9895,10098,10304,10487,10688,10805,10915,11021", - "endLines": "137,141,145,148,152,156,160,164,168,172,176,179,182,185,188", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8756,8967,9177,9337,9520,9705,9890,10093,10299,10482,10683,10800,10910,11016,11118" + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" } }, { - "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\dimens.xml", "from": { "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", @@ -119,14 +76,125 @@ } }, { - "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endColumns": "56", + "endOffsets": "764" + }, + "to": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "666", + "endColumns": "56", + "endOffsets": "718" + } + }, + { + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "64,69,78,74,36,40,44,49,54,32,59,28,25,19,22,82", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2563,2773,3155,2990,1368,1555,1744,1935,2144,1181,2356,1059,946,732,841,3370", + "endLines": "67,72,81,76,39,43,47,52,57,35,62,30,27,21,24,85", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2765,2982,3364,3147,1549,1738,1927,2136,2348,1362,2555,1173,1053,835,940,3527" + }, + "to": { + "startLines": "138,142,146,150,153,157,161,165,169,173,177,181,184,187,190,193", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8827,9031,9242,9452,9612,9795,9980,10165,10368,10574,10757,10958,11075,11185,11291,11393", + "endLines": "141,145,149,152,156,160,164,168,172,176,180,183,186,189,192,196", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "9026,9237,9447,9607,9790,9975,10160,10363,10569,10752,10953,11070,11180,11286,11388,11547" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", + "map": [ + { + "source": "D:\\MINOTES\\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,-1,-1,-1,-1,-1,-1,-1,135,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,7468,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-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,-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,-1,-1,-1,-1,-1,-1,-1,7516,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,109,110,111,112,113,114,115,116,117,118", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,828,873,930,982,1036,1086,1148,1216,1293,1352,1417,1480,1535,1595,1658,1712,1774,1825,1885,1938,2000,2085,2144,2225,2275,2334,2377,2437,2490,2533,2584,2634,2694,2747,2798,2844,2892,2940,2986,3033,3082,3132,3177,3236,3290,3343,3395,3447,3490,3537,3593,3648,3703,3747,3789,3830,3880,3939,3990,4039,4088,4135,4182,4229,4274,4325,4378,4434,4509,4568,4625,4699,4763,4832,4910,5020,5124,5197,5263,5345,5400,5465,5530,5579,5662,5740,5793,5831,5876,5924,5986,6043,6098,6157,6224,6282,6344,6392,6437,6485,6536,6602", + "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,112,113,114,115,116,117,118", + "endColumns": "14,72,65,72,49,39,47,47,45,44,56,51,53,49,61,67,76,58,64,62,54,59,62,53,61,50,59,52,61,84,58,80,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,49,44,58,53,52,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,55,74,58,56,73,63,68,77,109,103,72,65,81,54,64,64,48,82,77,52,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,823,868,925,977,1031,1081,1143,1211,1288,1347,1412,1475,1530,1590,1653,1707,1769,1820,1880,1933,1995,2080,2139,2220,2270,2329,2372,2432,2485,2528,2579,2629,2689,2742,2793,2839,2887,2935,2981,3028,3077,3127,3172,3231,3285,3338,3390,3442,3485,3532,3588,3643,3698,3742,3784,3825,3875,3934,3985,4034,4083,4130,4177,4224,4269,4320,4373,4429,4504,4563,4620,4694,4758,4827,4905,5015,5119,5192,5258,5340,5395,5460,5525,5574,5657,5735,5788,5826,5871,5919,5981,6038,6093,6152,6219,6277,6339,6387,6432,6480,6531,6597,6663" + } + }, + { + "source": "D:\\MINOTES\\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:\\MINOTES\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "136,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,51,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "8672,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2694,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "140,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,51,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,70,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "9080,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2760,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "24,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "985,1338,1434,1517,1613,1682,1725,1777,1829,1888,1937,2000,2052,2110,2161,2245,2339,2447,2518,2602,2685,2751,2834,2936,2997,3059,3110,3188,3241,3301,3406,3465,3567,3622,3693,3742,3820,3878,3925,3984,4041,4112,4173,4230,4280,4332,4385,4435,4485,4542,4602,4655,4721,4793,4864,4926,4989,5036,5091,5179,5237,5299,5349,5394,5437,5497,5564,5619,5674,5727,5774,5827,5883,5931,5986,6039,6115,6199,6266,6330,6426,6500,6581,6670,6833,6977,7056,7131,7213,7272,7352,7432,7487,7609,7712,7775,7816,7869,7926,8000,8065,8133,8219,8299,8368,8462,8521,8576,8638,8698,8808", + "endLines": "28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138", + "endColumns": "14,95,82,95,68,42,51,51,58,48,62,51,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,77,57,46,58,56,70,60,56,49,51,52,49,49,56,59,52,65,71,70,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,75,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,62,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1333,1429,1512,1608,1677,1720,1772,1824,1883,1932,1995,2047,2105,2156,2240,2334,2442,2513,2597,2680,2746,2829,2931,2992,3054,3105,3183,3236,3296,3401,3460,3562,3617,3688,3737,3815,3873,3920,3979,4036,4107,4168,4225,4275,4327,4380,4430,4480,4537,4597,4650,4716,4788,4859,4921,4984,5031,5086,5174,5232,5294,5344,5389,5432,5492,5559,5614,5669,5722,5769,5822,5878,5926,5981,6034,6110,6194,6261,6325,6421,6495,6576,6665,6828,6972,7051,7126,7208,7267,7347,7427,7482,7604,7707,7770,7811,7864,7921,7995,8060,8128,8214,8294,8363,8457,8516,8571,8633,8693,8803,8893" + } + }, + { + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\FontColor.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "12,13,14,15,16,17", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "420,459,505,547,587,625", + "endColumns": "38,45,41,39,37,40", + "endOffsets": "454,500,542,582,620,661" + } + }, + { + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" }, "to": { "startLines": "2,8", @@ -138,13 +206,26 @@ } }, { - "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endColumns": "56", - "endOffsets": "764" + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "19,20,21,22,23", + "startColumns": "4,4,4,4,4", + "startOffsets": "723,775,828,881,933", + "endColumns": "51,52,52,51,51", + "endOffsets": "770,823,876,928,980" + } + }, + { + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" }, "to": { "startLines": "18", @@ -153,6 +234,65 @@ "endColumns": "56", "endOffsets": "718" } + }, + { + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "-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", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "139,143,147,151,154,158,162,166,170,174,178,182,185,188,191,194", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8898,9102,9313,9523,9683,9866,10051,10236,10439,10645,10828,11029,11146,11256,11362,11464", + "endLines": "142,146,150,153,157,161,165,169,173,177,181,184,187,190,193,197", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "9097,9308,9518,9678,9861,10046,10231,10434,10640,10823,11024,11141,11251,11357,11459,11618" + } + } + ] + }, + { + "outputFile": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat", + "map": [ + { + "source": "D:\\MINOTES\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "131,77,76,75,74,19,20,21,134,121,122,130,129,128,26,85,86,84,83,82,98,97,96,88,39,38,66,29,30,89,40,78,123,73,69,80,41,47,55,42,65,64,63,59,58,56,57,60,81,61,48,72,49,62,70,46,54,53,52,68,45,67,43,44,71,28,34,36,33,35,32,31,25,24,51,105,104,108,120,113,112,114,115,117,116,106,107,111,109,110,103,118,119,50,127,125,124,126,27,87,95,100,99,101,94,93,92,91,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,4,4", + "startOffsets": "7241,3907,3840,3766,3715,846,887,936,7421,6730,6776,7188,7133,7082,1225,4390,4459,4330,4264,4200,5134,5073,5009,4593,1888,1836,3278,1398,1452,4648,1951,3981,6834,3655,3438,4089,2011,2298,2715,2065,3217,3163,3111,2912,2863,2767,2816,2959,4150,3007,2342,3595,2388,3058,3482,2254,2667,2610,2554,3382,2209,3339,2116,2158,3535,1346,1657,1755,1609,1707,1561,1515,1173,1119,2497,5516,5456,5742,6655,6058,5988,6123,6202,6387,6313,5592,5659,5932,5800,5866,5406,6492,6576,2443,7043,6934,6885,6980,1288,4537,4949,5249,5190,5317,4900,4854,4805,4753,985,1052", + "endLines": "133,77,76,75,74,19,20,21,134,121,122,130,129,128,26,85,86,84,83,82,98,97,96,88,39,38,66,29,30,89,40,78,123,73,69,80,41,47,55,42,65,64,63,59,58,56,57,60,81,61,48,72,49,62,70,46,54,53,52,68,45,67,43,44,71,28,34,36,33,35,32,31,25,24,51,105,104,108,120,113,112,114,115,117,116,106,107,111,109,110,103,118,119,50,127,125,124,126,27,87,95,100,99,101,94,93,92,91,22,23", + "endColumns": "14,72,65,72,49,39,47,47,45,44,56,51,53,49,61,67,76,58,64,62,54,59,62,53,61,50,59,52,61,84,58,80,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,49,44,58,53,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,55,74,58,56,73,63,68,77,109,103,72,65,81,54,64,64,48,82,77,52,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "7415,3975,3901,3834,3760,881,930,979,7462,6770,6828,7235,7182,7127,1282,4453,4531,4384,4324,4258,5184,5128,5067,4642,1945,1882,3333,1446,1509,4728,2005,4057,6879,3709,3476,4144,2059,2336,2761,2110,3272,3211,3157,2953,2906,2810,2857,3001,4194,3052,2382,3649,2437,3105,3529,2292,2709,2661,2604,3432,2248,3376,2152,2203,3589,1392,1701,1799,1651,1749,1603,1555,1219,1167,2548,5586,5510,5794,6724,6117,6052,6196,6307,6486,6381,5653,5736,5982,5860,5926,5450,6570,6649,2491,7076,6974,6928,7037,1340,4587,5003,5311,5243,5374,4943,4894,4848,4799,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,109,110,111,112,113,114,115,116,117", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,828,873,930,982,1036,1086,1148,1216,1293,1352,1417,1480,1535,1595,1658,1712,1774,1825,1885,1938,2000,2085,2144,2225,2275,2334,2377,2437,2490,2533,2584,2634,2694,2747,2798,2844,2892,2940,2986,3033,3082,3132,3177,3236,3290,3342,3394,3437,3484,3540,3595,3650,3694,3736,3777,3827,3886,3937,3986,4035,4082,4129,4176,4221,4272,4325,4381,4456,4515,4572,4646,4710,4779,4857,4967,5071,5144,5210,5292,5347,5412,5477,5526,5609,5687,5740,5778,5823,5871,5933,5990,6045,6104,6171,6229,6291,6339,6384,6432,6483,6549", + "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,112,113,114,115,116,117", + "endColumns": "14,72,65,72,49,39,47,47,45,44,56,51,53,49,61,67,76,58,64,62,54,59,62,53,61,50,59,52,61,84,58,80,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,49,44,58,53,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,55,74,58,56,73,63,68,77,109,103,72,65,81,54,64,64,48,82,77,52,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,823,868,925,977,1031,1081,1143,1211,1288,1347,1412,1475,1530,1590,1653,1707,1769,1820,1880,1933,1995,2080,2139,2220,2270,2329,2372,2432,2485,2528,2579,2629,2689,2742,2793,2839,2887,2935,2981,3028,3077,3127,3172,3231,3285,3337,3389,3432,3479,3535,3590,3645,3689,3731,3772,3822,3881,3932,3981,4030,4077,4124,4171,4216,4267,4320,4376,4451,4510,4567,4641,4705,4774,4852,4962,5066,5139,5205,5287,5342,5407,5472,5521,5604,5682,5735,5773,5818,5866,5928,5985,6040,6099,6166,6224,6286,6334,6379,6427,6478,6544,6610" + } + }, + { + "source": "D:\\MINOTES\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } } ] }, @@ -160,7 +300,46 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { - "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\MINOTES\\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" + } + }, + { + "source": "D:\\MINOTES\\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,-1,-1,-1,-1,-1,-1,-1,136,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,7457,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-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,-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,-1,-1,-1,-1,-1,-1,-1,7505,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,109,110,111,112,113,114,115,116,117,118", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,827,872,929,981,1035,1085,1147,1215,1292,1351,1417,1480,1535,1595,1658,1712,1774,1825,1885,1938,2000,2084,2143,2223,2273,2332,2375,2435,2488,2531,2582,2632,2692,2745,2796,2842,2890,2938,2984,3031,3080,3130,3175,3234,3288,3341,3393,3445,3488,3535,3591,3646,3701,3745,3787,3828,3878,3937,3988,4037,4086,4133,4180,4227,4272,4323,4376,4432,4507,4566,4623,4697,4761,4830,4908,5018,5122,5195,5261,5343,5398,5463,5528,5577,5660,5738,5788,5826,5871,5919,5981,6038,6093,6152,6219,6277,6339,6387,6432,6480,6531,6597", + "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,112,113,114,115,116,117,118", + "endColumns": "14,71,65,72,49,39,47,47,45,44,56,51,53,49,61,67,76,58,65,62,54,59,62,53,61,50,59,52,61,83,58,79,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,49,44,58,53,52,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,55,74,58,56,73,63,68,77,109,103,72,65,81,54,64,64,48,82,77,49,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,822,867,924,976,1030,1080,1142,1210,1287,1346,1412,1475,1530,1590,1653,1707,1769,1820,1880,1933,1995,2079,2138,2218,2268,2327,2370,2430,2483,2526,2577,2627,2687,2740,2791,2837,2885,2933,2979,3026,3075,3125,3170,3229,3283,3336,3388,3440,3483,3530,3586,3641,3696,3740,3782,3823,3873,3932,3983,4032,4081,4128,4175,4222,4267,4318,4371,4427,4502,4561,4618,4692,4756,4825,4903,5013,5117,5190,5256,5338,5393,5458,5523,5572,5655,5733,5783,5821,5866,5914,5976,6033,6088,6147,6214,6272,6334,6382,6427,6475,6526,6592,6658" + } + } + ] + }, + { + "outputFile": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat", + "map": [ + { + "source": "D:\\MINOTES\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -179,22 +358,22 @@ } }, { - "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\MINOTES\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { - "startLines": "129,75,74,73,72,19,20,21,118,119,128,127,126,26,81,82,80,79,78,94,93,92,84,40,39,64,29,30,85,41,37,120,71,67,76,42,48,53,43,63,62,61,57,56,54,55,58,77,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,4,4,4", - "startOffsets": "6938,3763,3697,3624,3574,843,883,931,6436,6481,6886,6832,6782,1215,4132,4200,4073,4007,3944,4862,4802,4739,4332,1945,1894,3145,1385,1438,4386,2007,1784,6538,3515,3302,3835,2066,2347,2593,2119,3085,3032,2981,2786,2738,2644,2692,2832,3895,2879,2390,3456,2929,3345,2304,2546,2490,2435,3247,2260,3205,2169,2210,3397,1334,1639,1735,1592,1688,1545,1500,1164,1111,5237,5178,5460,6361,5771,5702,5835,5913,6096,6023,5312,5378,5647,5517,5582,5129,6200,6283,6744,6637,6589,6682,1277,4277,4680,4975,4917,5042,4632,4587,4539,4488,979,1045", - "endLines": "131,75,74,73,72,19,20,21,118,119,128,127,126,26,81,82,80,79,78,94,93,92,84,40,39,64,29,30,85,41,37,120,71,67,76,42,48,53,43,63,62,61,57,56,54,55,58,77,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,71,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,65,62,54,59,62,53,61,50,59,52,61,83,58,79,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,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,81,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "7110,3830,3758,3692,3619,878,926,974,6476,6533,6933,6881,6827,1272,4195,4272,4127,4068,4002,4912,4857,4797,4381,2002,1940,3200,1433,1495,4465,2061,1859,6583,3569,3340,3890,2114,2385,2639,2164,3140,3080,3027,2827,2781,2687,2733,2874,3939,2924,2430,3510,2976,3392,2342,2588,2541,2485,3297,2299,3242,2205,2255,3451,1380,1683,1779,1634,1730,1587,1540,1210,1159,5307,5232,5512,6430,5830,5766,5908,6018,6195,6091,5373,5455,5697,5577,5642,5173,6278,6356,6777,6677,6632,6739,1329,4327,4734,5037,4970,5099,4675,4627,4582,4534,1040,1106" + "startLines": "132,78,77,76,75,19,20,21,135,121,122,131,130,129,26,84,85,83,82,81,97,96,95,87,40,39,67,29,30,88,41,37,123,74,70,79,42,48,56,43,66,65,64,60,59,57,58,61,80,62,49,73,50,63,71,47,55,54,53,69,46,68,44,45,72,28,34,36,33,35,32,31,25,24,52,104,103,107,119,112,111,113,114,116,115,105,106,110,108,109,102,117,118,51,128,126,125,127,27,86,94,99,98,100,93,92,91,90,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,4,4", + "startOffsets": "7230,4001,3934,3860,3809,862,903,952,7410,6717,6763,7177,7122,7071,1241,4376,4445,4316,4249,4185,5119,5058,4994,4579,1985,1933,3372,1414,1468,4634,2048,1821,6821,3749,3532,4074,2108,2395,2809,2162,3311,3257,3205,3006,2957,2861,2910,3053,4135,3101,2439,3689,2485,3152,3576,2351,2761,2704,2648,3476,2306,3433,2213,2255,3629,1362,1673,1771,1625,1723,1577,1531,1189,1135,2591,5501,5441,5727,6640,6043,5973,6108,6187,6372,6298,5577,5644,5917,5785,5851,5391,6477,6561,2540,7032,6923,6874,6969,1304,4523,4934,5234,5175,5302,4885,4839,4790,4738,1001,1068", + "endLines": "134,78,77,76,75,19,20,21,135,121,122,131,130,129,26,84,85,83,82,81,97,96,95,87,40,39,67,29,30,88,41,37,123,74,70,79,42,48,56,43,66,65,64,60,59,57,58,61,80,62,49,73,50,63,71,47,55,54,53,69,46,68,44,45,72,28,34,36,33,35,32,31,25,24,52,104,103,107,119,112,111,113,114,116,115,105,106,110,108,109,102,117,118,51,128,126,125,127,27,86,94,99,98,100,93,92,91,90,22,23", + "endColumns": "14,71,65,72,49,39,47,47,45,44,56,51,53,49,61,67,76,58,65,62,54,59,62,53,61,50,59,52,61,83,58,79,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,49,44,58,53,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,55,74,58,56,73,63,68,77,109,103,72,65,81,54,64,64,48,82,77,49,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "7404,4068,3995,3928,3854,897,946,995,7451,6757,6815,7224,7171,7116,1298,4439,4517,4370,4310,4243,5169,5113,5052,4628,2042,1979,3427,1462,1525,4713,2102,1896,6866,3803,3570,4129,2156,2433,2855,2207,3366,3305,3251,3047,3000,2904,2951,3095,4179,3146,2479,3743,2534,3199,3623,2389,2803,2755,2698,3526,2345,3470,2249,2300,3683,1408,1717,1815,1667,1765,1619,1571,1235,1183,2642,5571,5495,5779,6709,6102,6037,6181,6292,6471,6366,5638,5721,5967,5845,5911,5435,6555,6634,2585,7065,6963,6917,7026,1356,4573,4988,5296,5228,5359,4928,4879,4833,4784,1062,1129" }, "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,109,110,111,112,113", - "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", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,935,989,1039,1101,1169,1246,1305,1371,1434,1489,1549,1612,1666,1728,1779,1839,1892,1954,2038,2097,2177,2227,2286,2329,2389,2442,2485,2536,2586,2646,2699,2750,2796,2844,2892,2938,2985,3034,3084,3129,3188,3240,3292,3335,3382,3438,3493,3548,3592,3634,3675,3725,3784,3835,3884,3933,3980,4027,4074,4119,4170,4223,4298,4357,4414,4488,4552,4621,4699,4809,4913,4986,5052,5134,5189,5254,5319,5368,5451,5529,5567,5612,5660,5722,5779,5834,5893,5960,6018,6080,6128,6173,6221,6272,6338", - "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,112,113", - "endColumns": "14,71,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,65,62,54,59,62,53,61,50,59,52,61,83,58,79,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,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,81,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,930,984,1034,1096,1164,1241,1300,1366,1429,1484,1544,1607,1661,1723,1774,1834,1887,1949,2033,2092,2172,2222,2281,2324,2384,2437,2480,2531,2581,2641,2694,2745,2791,2839,2887,2933,2980,3029,3079,3124,3183,3235,3287,3330,3377,3433,3488,3543,3587,3629,3670,3720,3779,3830,3879,3928,3975,4022,4069,4114,4165,4218,4293,4352,4409,4483,4547,4616,4694,4804,4908,4981,5047,5129,5184,5249,5314,5363,5446,5524,5562,5607,5655,5717,5774,5829,5888,5955,6013,6075,6123,6168,6216,6267,6333,6399" + "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,112,113,114,115,116,117", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,827,872,929,981,1035,1085,1147,1215,1292,1351,1417,1480,1535,1595,1658,1712,1774,1825,1885,1938,2000,2084,2143,2223,2273,2332,2375,2435,2488,2531,2582,2632,2692,2745,2796,2842,2890,2938,2984,3031,3080,3130,3175,3234,3288,3340,3392,3435,3482,3538,3593,3648,3692,3734,3775,3825,3884,3935,3984,4033,4080,4127,4174,4219,4270,4323,4379,4454,4513,4570,4644,4708,4777,4855,4965,5069,5142,5208,5290,5345,5410,5475,5524,5607,5685,5735,5773,5818,5866,5928,5985,6040,6099,6166,6224,6286,6334,6379,6427,6478,6544", + "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,112,113,114,115,116,117", + "endColumns": "14,71,65,72,49,39,47,47,45,44,56,51,53,49,61,67,76,58,65,62,54,59,62,53,61,50,59,52,61,83,58,79,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,49,44,58,53,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,55,74,58,56,73,63,68,77,109,103,72,65,81,54,64,64,48,82,77,49,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,822,867,924,976,1030,1080,1142,1210,1287,1346,1412,1475,1530,1590,1653,1707,1769,1820,1880,1933,1995,2079,2138,2218,2268,2327,2370,2430,2483,2526,2577,2627,2687,2740,2791,2837,2885,2933,2979,3026,3075,3125,3170,3229,3283,3335,3387,3430,3477,3533,3588,3643,3687,3729,3770,3820,3879,3930,3979,4028,4075,4122,4169,4214,4265,4318,4374,4449,4508,4565,4639,4703,4772,4850,4960,5064,5137,5203,5285,5340,5405,5470,5519,5602,5680,5730,5768,5813,5861,5923,5980,6035,6094,6161,6219,6281,6329,6374,6422,6473,6539,6605" } } ] diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index 5494f20..af38f53 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -1,10 +1,29 @@ { "logs": [ { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", + "outputFile": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values-zh-rCN\\values-zh-rCN.xml", "map": [ { - "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\MINOTES\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "131,77,76,75,74,19,20,21,134,121,122,130,129,128,26,85,86,84,83,82,98,97,96,88,39,38,66,29,30,89,40,78,123,73,69,80,41,47,55,42,65,64,63,59,58,56,57,60,81,61,48,72,49,62,70,46,54,53,52,68,45,67,43,44,71,28,34,36,33,35,32,31,25,24,51,105,104,108,120,113,112,114,115,117,116,106,107,111,109,110,103,118,119,50,127,125,124,126,27,87,95,100,99,101,94,93,92,91,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,4,4", + "startOffsets": "7241,3907,3840,3766,3715,846,887,936,7421,6730,6776,7188,7133,7082,1225,4390,4459,4330,4264,4200,5134,5073,5009,4593,1888,1836,3278,1398,1452,4648,1951,3981,6834,3655,3438,4089,2011,2298,2715,2065,3217,3163,3111,2912,2863,2767,2816,2959,4150,3007,2342,3595,2388,3058,3482,2254,2667,2610,2554,3382,2209,3339,2116,2158,3535,1346,1657,1755,1609,1707,1561,1515,1173,1119,2497,5516,5456,5742,6655,6058,5988,6123,6202,6387,6313,5592,5659,5932,5800,5866,5406,6492,6576,2443,7043,6934,6885,6980,1288,4537,4949,5249,5190,5317,4900,4854,4805,4753,985,1052", + "endLines": "133,77,76,75,74,19,20,21,134,121,122,130,129,128,26,85,86,84,83,82,98,97,96,88,39,38,66,29,30,89,40,78,123,73,69,80,41,47,55,42,65,64,63,59,58,56,57,60,81,61,48,72,49,62,70,46,54,53,52,68,45,67,43,44,71,28,34,36,33,35,32,31,25,24,51,105,104,108,120,113,112,114,115,117,116,106,107,111,109,110,103,118,119,50,127,125,124,126,27,87,95,100,99,101,94,93,92,91,22,23", + "endColumns": "14,72,65,72,49,39,47,47,45,44,56,51,53,49,61,67,76,58,64,62,54,59,62,53,61,50,59,52,61,84,58,80,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,49,44,58,53,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,55,74,58,56,73,63,68,77,109,103,72,65,81,54,64,64,48,82,77,52,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "7415,3975,3901,3834,3760,881,930,979,7462,6770,6828,7235,7182,7127,1282,4453,4531,4384,4324,4258,5184,5128,5067,4642,1945,1882,3333,1446,1509,4728,2005,4057,6879,3709,3476,4144,2059,2336,2761,2110,3272,3211,3157,2953,2906,2810,2857,3001,4194,3052,2382,3649,2437,3105,3529,2292,2709,2661,2604,3432,2248,3376,2152,2203,3589,1392,1701,1799,1651,1749,1603,1555,1219,1167,2548,5586,5510,5794,6724,6117,6052,6196,6307,6486,6381,5653,5736,5982,5860,5926,5450,6570,6649,2491,7076,6974,6928,7037,1340,4587,5003,5311,5243,5374,4943,4894,4848,4799,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,109,110,111,112,113,114,115,116,117", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,828,873,930,982,1036,1086,1148,1216,1293,1352,1417,1480,1535,1595,1658,1712,1774,1825,1885,1938,2000,2085,2144,2225,2275,2334,2377,2437,2490,2533,2584,2634,2694,2747,2798,2844,2892,2940,2986,3033,3082,3132,3177,3236,3290,3342,3394,3437,3484,3540,3595,3650,3694,3736,3777,3827,3886,3937,3986,4035,4082,4129,4176,4221,4272,4325,4381,4456,4515,4572,4646,4710,4779,4857,4967,5071,5144,5210,5292,5347,5412,5477,5526,5609,5687,5740,5778,5823,5871,5933,5990,6045,6104,6171,6229,6291,6339,6384,6432,6483,6549", + "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,112,113,114,115,116,117", + "endColumns": "14,72,65,72,49,39,47,47,45,44,56,51,53,49,61,67,76,58,64,62,54,59,62,53,61,50,59,52,61,84,58,80,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,49,44,58,53,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,55,74,58,56,73,63,68,77,109,103,72,65,81,54,64,64,48,82,77,52,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,823,868,925,977,1031,1081,1143,1211,1288,1347,1412,1475,1530,1590,1653,1707,1769,1820,1880,1933,1995,2080,2139,2220,2270,2329,2372,2432,2485,2528,2579,2629,2689,2742,2793,2839,2887,2935,2981,3028,3077,3127,3172,3231,3285,3337,3389,3432,3479,3535,3590,3645,3689,3731,3772,3822,3881,3932,3981,4030,4077,4124,4171,4216,4267,4320,4376,4451,4510,4567,4641,4705,4774,4852,4962,5066,5139,5205,5287,5342,5407,5472,5521,5604,5682,5735,5773,5818,5866,5928,5985,6040,6099,6166,6224,6286,6334,6379,6427,6478,6544,6610" + } + }, + { + "source": "D:\\MINOTES\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -21,24 +40,44 @@ "endColumns": "19", "endOffsets": "210" } + } + ] + }, + { + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", + "map": [ + { + "source": "D:\\MINOTES\\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,-1,-1,-1,-1,-1,-1,-1,135,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,7468,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-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,-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,-1,-1,-1,-1,-1,-1,-1,7516,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,109,110,111,112,113,114,115,116,117,118", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,828,873,930,982,1036,1086,1148,1216,1293,1352,1417,1480,1535,1595,1658,1712,1774,1825,1885,1938,2000,2085,2144,2225,2275,2334,2377,2437,2490,2533,2584,2634,2694,2747,2798,2844,2892,2940,2986,3033,3082,3132,3177,3236,3290,3343,3395,3447,3490,3537,3593,3648,3703,3747,3789,3830,3880,3939,3990,4039,4088,4135,4182,4229,4274,4325,4378,4434,4509,4568,4625,4699,4763,4832,4910,5020,5124,5197,5263,5345,5400,5465,5530,5579,5662,5740,5793,5831,5876,5924,5986,6043,6098,6157,6224,6282,6344,6392,6437,6485,6536,6602", + "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,112,113,114,115,116,117,118", + "endColumns": "14,72,65,72,49,39,47,47,45,44,56,51,53,49,61,67,76,58,64,62,54,59,62,53,61,50,59,52,61,84,58,80,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,49,44,58,53,52,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,55,74,58,56,73,63,68,77,109,103,72,65,81,54,64,64,48,82,77,52,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,823,868,925,977,1031,1081,1143,1211,1288,1347,1412,1475,1530,1590,1653,1707,1769,1820,1880,1933,1995,2080,2139,2220,2270,2329,2372,2432,2485,2528,2579,2629,2689,2742,2793,2839,2887,2935,2981,3028,3077,3127,3172,3231,3285,3338,3390,3442,3485,3532,3588,3643,3698,3742,3784,3825,3875,3934,3985,4034,4083,4130,4177,4224,4269,4320,4373,4429,4504,4563,4620,4694,4758,4827,4905,5015,5119,5192,5258,5340,5395,5460,5525,5574,5657,5735,5788,5826,5871,5919,5981,6038,6093,6152,6219,6277,6339,6387,6432,6480,6531,6597,6663" + } }, { - "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\MINOTES\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { - "startLines": "128,74,73,72,71,19,20,21,118,119,127,126,125,26,82,83,81,80,79,95,94,93,85,39,38,63,29,30,86,40,75,120,70,66,77,41,47,52,42,62,61,60,56,55,53,54,57,78,58,48,69,59,67,46,51,50,49,65,45,64,43,44,68,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,124,122,121,123,27,84,92,97,96,98,91,90,89,88,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", - "startOffsets": "6947,3667,3601,3528,3478,827,867,915,6446,6491,6895,6841,6791,1199,4142,4210,4083,4018,3955,4873,4813,4750,4342,1849,1798,3049,1369,1422,4396,1911,3740,6548,3419,3206,3846,1970,2251,2497,2023,2989,2936,2885,2690,2642,2548,2596,2736,3906,2783,2294,3360,2833,3249,2208,2450,2394,2339,3151,2164,3109,2073,2114,3301,1318,1623,1719,1576,1672,1529,1484,1148,1095,5248,5189,5471,6372,5782,5713,5846,5924,6107,6034,5323,5389,5658,5528,5593,5140,6211,6294,6753,6646,6598,6691,1261,4287,4691,4986,4928,5053,4643,4598,4550,4499,963,1029", - "endLines": "130,74,73,72,71,19,20,21,118,119,127,126,125,26,82,83,81,80,79,95,94,93,85,39,38,63,29,30,86,40,75,120,70,66,77,41,47,52,42,62,61,60,56,55,53,54,57,78,58,48,69,59,67,46,51,50,49,65,45,64,43,44,68,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,124,122,121,123,27,84,92,97,96,98,91,90,89,88,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,64,62,54,59,62,53,61,50,59,52,61,84,58,80,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,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,81,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "7119,3735,3662,3596,3523,862,910,958,6486,6543,6942,6890,6836,1256,4205,4282,4137,4078,4013,4923,4868,4808,4391,1906,1844,3104,1417,1479,4476,1965,3816,6593,3473,3244,3901,2018,2289,2543,2068,3044,2984,2931,2731,2685,2591,2637,2778,3950,2828,2334,3414,2880,3296,2246,2492,2445,2389,3201,2203,3146,2109,2159,3355,1364,1667,1763,1618,1714,1571,1524,1194,1143,5318,5243,5523,6441,5841,5777,5919,6029,6206,6102,5384,5466,5708,5588,5653,5184,6289,6367,6786,6686,6641,6748,1313,4337,4745,5048,4981,5110,4686,4638,4593,4545,1024,1090" + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-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,109,110,111,112,113", - "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", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,936,990,1040,1102,1170,1247,1306,1371,1434,1489,1549,1612,1666,1728,1779,1839,1892,1954,2039,2098,2179,2229,2288,2331,2391,2444,2487,2538,2588,2648,2701,2752,2798,2846,2894,2940,2987,3036,3086,3131,3190,3242,3294,3337,3384,3440,3495,3550,3594,3636,3677,3727,3786,3837,3886,3935,3982,4029,4076,4121,4172,4225,4300,4359,4416,4490,4554,4623,4701,4811,4915,4988,5054,5136,5191,5256,5321,5370,5453,5531,5569,5614,5662,5724,5781,5836,5895,5962,6020,6082,6130,6175,6223,6274,6340", - "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,112,113", - "endColumns": "14,72,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,64,62,54,59,62,53,61,50,59,52,61,84,58,80,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,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,81,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,931,985,1035,1097,1165,1242,1301,1366,1429,1484,1544,1607,1661,1723,1774,1834,1887,1949,2034,2093,2174,2224,2283,2326,2386,2439,2482,2533,2583,2643,2696,2747,2793,2841,2889,2935,2982,3031,3081,3126,3185,3237,3289,3332,3379,3435,3490,3545,3589,3631,3672,3722,3781,3832,3881,3930,3977,4024,4071,4116,4167,4220,4295,4354,4411,4485,4549,4618,4696,4806,4910,4983,5049,5131,5186,5251,5316,5365,5448,5526,5564,5609,5657,5719,5776,5831,5890,5957,6015,6077,6125,6170,6218,6269,6335,6401" + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" } } ] diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index 7584261..61ac59c 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", + "outputFile": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values-zh-rTW\\values-zh-rTW.xml", "map": [ { - "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\MINOTES\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -23,22 +23,61 @@ } }, { - "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\MINOTES\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "132,78,77,76,75,19,20,21,135,121,122,131,130,129,26,84,85,83,82,81,97,96,95,87,40,39,67,29,30,88,41,37,123,74,70,79,42,48,56,43,66,65,64,60,59,57,58,61,80,62,49,73,50,63,71,47,55,54,53,69,46,68,44,45,72,28,34,36,33,35,32,31,25,24,52,104,103,107,119,112,111,113,114,116,115,105,106,110,108,109,102,117,118,51,128,126,125,127,27,86,94,99,98,100,93,92,91,90,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,4,4", + "startOffsets": "7230,4001,3934,3860,3809,862,903,952,7410,6717,6763,7177,7122,7071,1241,4376,4445,4316,4249,4185,5119,5058,4994,4579,1985,1933,3372,1414,1468,4634,2048,1821,6821,3749,3532,4074,2108,2395,2809,2162,3311,3257,3205,3006,2957,2861,2910,3053,4135,3101,2439,3689,2485,3152,3576,2351,2761,2704,2648,3476,2306,3433,2213,2255,3629,1362,1673,1771,1625,1723,1577,1531,1189,1135,2591,5501,5441,5727,6640,6043,5973,6108,6187,6372,6298,5577,5644,5917,5785,5851,5391,6477,6561,2540,7032,6923,6874,6969,1304,4523,4934,5234,5175,5302,4885,4839,4790,4738,1001,1068", + "endLines": "134,78,77,76,75,19,20,21,135,121,122,131,130,129,26,84,85,83,82,81,97,96,95,87,40,39,67,29,30,88,41,37,123,74,70,79,42,48,56,43,66,65,64,60,59,57,58,61,80,62,49,73,50,63,71,47,55,54,53,69,46,68,44,45,72,28,34,36,33,35,32,31,25,24,52,104,103,107,119,112,111,113,114,116,115,105,106,110,108,109,102,117,118,51,128,126,125,127,27,86,94,99,98,100,93,92,91,90,22,23", + "endColumns": "14,71,65,72,49,39,47,47,45,44,56,51,53,49,61,67,76,58,65,62,54,59,62,53,61,50,59,52,61,83,58,79,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,49,44,58,53,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,55,74,58,56,73,63,68,77,109,103,72,65,81,54,64,64,48,82,77,49,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "7404,4068,3995,3928,3854,897,946,995,7451,6757,6815,7224,7171,7116,1298,4439,4517,4370,4310,4243,5169,5113,5052,4628,2042,1979,3427,1462,1525,4713,2102,1896,6866,3803,3570,4129,2156,2433,2855,2207,3366,3305,3251,3047,3000,2904,2951,3095,4179,3146,2479,3743,2534,3199,3623,2389,2803,2755,2698,3526,2345,3470,2249,2300,3683,1408,1717,1815,1667,1765,1619,1571,1235,1183,2642,5571,5495,5779,6709,6102,6037,6181,6292,6471,6366,5638,5721,5967,5845,5911,5435,6555,6634,2585,7065,6963,6917,7026,1356,4573,4988,5296,5228,5359,4928,4879,4833,4784,1062,1129" + }, + "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,109,110,111,112,113,114,115,116,117", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,827,872,929,981,1035,1085,1147,1215,1292,1351,1417,1480,1535,1595,1658,1712,1774,1825,1885,1938,2000,2084,2143,2223,2273,2332,2375,2435,2488,2531,2582,2632,2692,2745,2796,2842,2890,2938,2984,3031,3080,3130,3175,3234,3288,3340,3392,3435,3482,3538,3593,3648,3692,3734,3775,3825,3884,3935,3984,4033,4080,4127,4174,4219,4270,4323,4379,4454,4513,4570,4644,4708,4777,4855,4965,5069,5142,5208,5290,5345,5410,5475,5524,5607,5685,5735,5773,5818,5866,5928,5985,6040,6099,6166,6224,6286,6334,6379,6427,6478,6544", + "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,112,113,114,115,116,117", + "endColumns": "14,71,65,72,49,39,47,47,45,44,56,51,53,49,61,67,76,58,65,62,54,59,62,53,61,50,59,52,61,83,58,79,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,49,44,58,53,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,55,74,58,56,73,63,68,77,109,103,72,65,81,54,64,64,48,82,77,49,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,822,867,924,976,1030,1080,1142,1210,1287,1346,1412,1475,1530,1590,1653,1707,1769,1820,1880,1933,1995,2079,2138,2218,2268,2327,2370,2430,2483,2526,2577,2627,2687,2740,2791,2837,2885,2933,2979,3026,3075,3125,3170,3229,3283,3335,3387,3430,3477,3533,3588,3643,3687,3729,3770,3820,3879,3930,3979,4028,4075,4122,4169,4214,4265,4318,4374,4449,4508,4565,4639,4703,4772,4850,4960,5064,5137,5203,5285,5340,5405,5470,5519,5602,5680,5730,5768,5813,5861,5923,5980,6035,6094,6161,6219,6281,6329,6374,6422,6473,6539,6605" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", + "map": [ + { + "source": "D:\\MINOTES\\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" + } + }, + { + "source": "D:\\MINOTES\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { - "startLines": "129,75,74,73,72,19,20,21,118,119,128,127,126,26,81,82,80,79,78,94,93,92,84,40,39,64,29,30,85,41,37,120,71,67,76,42,48,53,43,63,62,61,57,56,54,55,58,77,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,4,4,4", - "startOffsets": "6938,3763,3697,3624,3574,843,883,931,6436,6481,6886,6832,6782,1215,4132,4200,4073,4007,3944,4862,4802,4739,4332,1945,1894,3145,1385,1438,4386,2007,1784,6538,3515,3302,3835,2066,2347,2593,2119,3085,3032,2981,2786,2738,2644,2692,2832,3895,2879,2390,3456,2929,3345,2304,2546,2490,2435,3247,2260,3205,2169,2210,3397,1334,1639,1735,1592,1688,1545,1500,1164,1111,5237,5178,5460,6361,5771,5702,5835,5913,6096,6023,5312,5378,5647,5517,5582,5129,6200,6283,6744,6637,6589,6682,1277,4277,4680,4975,4917,5042,4632,4587,4539,4488,979,1045", - "endLines": "131,75,74,73,72,19,20,21,118,119,128,127,126,26,81,82,80,79,78,94,93,92,84,40,39,64,29,30,85,41,37,120,71,67,76,42,48,53,43,63,62,61,57,56,54,55,58,77,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,71,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,65,62,54,59,62,53,61,50,59,52,61,83,58,79,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,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,81,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "7110,3830,3758,3692,3619,878,926,974,6476,6533,6933,6881,6827,1272,4195,4272,4127,4068,4002,4912,4857,4797,4381,2002,1940,3200,1433,1495,4465,2061,1859,6583,3569,3340,3890,2114,2385,2639,2164,3140,3080,3027,2827,2781,2687,2733,2874,3939,2924,2430,3510,2976,3392,2342,2588,2541,2485,3297,2299,3242,2205,2255,3451,1380,1683,1779,1634,1730,1587,1540,1210,1159,5307,5232,5512,6430,5830,5766,5908,6018,6195,6091,5373,5455,5697,5577,5642,5173,6278,6356,6777,6677,6632,6739,1329,4327,4734,5037,4970,5099,4675,4627,4582,4534,1040,1106" + "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,-1,-1,-1,-1,-1,-1,-1,136,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,7457,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-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,-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,-1,-1,-1,-1,-1,-1,-1,7505,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,109,110,111,112,113", - "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", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,935,989,1039,1101,1169,1246,1305,1371,1434,1489,1549,1612,1666,1728,1779,1839,1892,1954,2038,2097,2177,2227,2286,2329,2389,2442,2485,2536,2586,2646,2699,2750,2796,2844,2892,2938,2985,3034,3084,3129,3188,3240,3292,3335,3382,3438,3493,3548,3592,3634,3675,3725,3784,3835,3884,3933,3980,4027,4074,4119,4170,4223,4298,4357,4414,4488,4552,4621,4699,4809,4913,4986,5052,5134,5189,5254,5319,5368,5451,5529,5567,5612,5660,5722,5779,5834,5893,5960,6018,6080,6128,6173,6221,6272,6338", - "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,112,113", - "endColumns": "14,71,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,65,62,54,59,62,53,61,50,59,52,61,83,58,79,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,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,81,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,930,984,1034,1096,1164,1241,1300,1366,1429,1484,1544,1607,1661,1723,1774,1834,1887,1949,2033,2092,2172,2222,2281,2324,2384,2437,2480,2531,2581,2641,2694,2745,2791,2839,2887,2933,2980,3029,3079,3124,3183,3235,3287,3330,3377,3433,3488,3543,3587,3629,3670,3720,3779,3830,3879,3928,3975,4022,4069,4114,4165,4218,4293,4352,4409,4483,4547,4616,4694,4804,4908,4981,5047,5129,5184,5249,5314,5363,5446,5524,5562,5607,5655,5717,5774,5829,5888,5955,6013,6075,6123,6168,6216,6267,6333,6399" + "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,112,113,114,115,116,117,118", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,827,872,929,981,1035,1085,1147,1215,1292,1351,1417,1480,1535,1595,1658,1712,1774,1825,1885,1938,2000,2084,2143,2223,2273,2332,2375,2435,2488,2531,2582,2632,2692,2745,2796,2842,2890,2938,2984,3031,3080,3130,3175,3234,3288,3341,3393,3445,3488,3535,3591,3646,3701,3745,3787,3828,3878,3937,3988,4037,4086,4133,4180,4227,4272,4323,4376,4432,4507,4566,4623,4697,4761,4830,4908,5018,5122,5195,5261,5343,5398,5463,5528,5577,5660,5738,5788,5826,5871,5919,5981,6038,6093,6152,6219,6277,6339,6387,6432,6480,6531,6597", + "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,112,113,114,115,116,117,118", + "endColumns": "14,71,65,72,49,39,47,47,45,44,56,51,53,49,61,67,76,58,65,62,54,59,62,53,61,50,59,52,61,83,58,79,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,49,44,58,53,52,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,55,74,58,56,73,63,68,77,109,103,72,65,81,54,64,64,48,82,77,49,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,822,867,924,976,1030,1080,1142,1210,1287,1346,1412,1475,1530,1590,1653,1707,1769,1820,1880,1933,1995,2079,2138,2218,2268,2327,2370,2430,2483,2526,2577,2627,2687,2740,2791,2837,2885,2933,2979,3026,3075,3125,3170,3229,3283,3336,3388,3440,3483,3530,3586,3641,3696,3740,3782,3823,3873,3932,3983,4032,4081,4128,4175,4222,4267,4318,4371,4427,4502,4561,4618,4692,4756,4825,4903,5013,5117,5190,5256,5338,5393,5458,5523,5572,5655,5733,5783,5821,5866,5914,5976,6033,6088,6147,6214,6272,6334,6382,6427,6475,6526,6592,6658" } } ] diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 90bd93e..d167260 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -4,68 +4,61 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", "map": [ { - "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\FontColor.xml", + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "4,7,6,2,3,5", - "startColumns": "4,4,4,4,4,4", - "startOffsets": "133,255,213,55,95,172", - "endColumns": "38,45,41,39,37,40", - "endOffsets": "167,296,250,90,128,208" + "startLines": "136,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,51,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "8672,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2694,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "140,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,51,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,70,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "9080,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2760,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "12,13,14,15,16,17", - "startColumns": "4,4,4,4,4,4", - "startOffsets": "420,459,505,547,587,625", - "endColumns": "38,45,41,39,37,40", - "endOffsets": "454,500,542,582,620,661" + "startLines": "24,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "985,1338,1434,1517,1613,1682,1725,1777,1829,1888,1937,2000,2052,2110,2161,2245,2339,2447,2518,2602,2685,2751,2834,2936,2997,3059,3110,3188,3241,3301,3406,3465,3567,3622,3693,3742,3820,3878,3925,3984,4041,4112,4173,4230,4280,4332,4385,4435,4485,4542,4602,4655,4721,4793,4864,4926,4989,5036,5091,5179,5237,5299,5349,5394,5437,5497,5564,5619,5674,5727,5774,5827,5883,5931,5986,6039,6115,6199,6266,6330,6426,6500,6581,6670,6833,6977,7056,7131,7213,7272,7352,7432,7487,7609,7712,7775,7816,7869,7926,8000,8065,8133,8219,8299,8368,8462,8521,8576,8638,8698,8808", + "endLines": "28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138", + "endColumns": "14,95,82,95,68,42,51,51,58,48,62,51,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,77,57,46,58,56,70,60,56,49,51,52,49,49,56,59,52,65,71,70,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,75,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,62,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1333,1429,1512,1608,1677,1720,1772,1824,1883,1932,1995,2047,2105,2156,2240,2334,2442,2513,2597,2680,2746,2829,2931,2992,3054,3105,3183,3236,3296,3401,3460,3562,3617,3688,3737,3815,3873,3920,3979,4036,4107,4168,4225,4275,4327,4380,4430,4480,4537,4597,4650,4716,4788,4859,4921,4984,5031,5086,5174,5232,5294,5344,5389,5432,5492,5559,5614,5669,5722,5769,5822,5878,5926,5981,6034,6110,6194,6261,6325,6421,6495,6576,6665,6828,6972,7051,7126,7208,7267,7347,7427,7482,7604,7707,7770,7811,7864,7921,7995,8060,8128,8214,8294,8363,8457,8516,8571,8633,8693,8803,8893" } }, { - "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\FontColor.xml", "from": { - "startLines": "131,72,75,74,73,19,20,21,120,121,130,129,128,26,83,84,82,81,80,96,95,94,86,39,38,64,29,30,87,41,76,122,71,67,77,42,48,53,43,63,62,61,57,56,54,55,58,78,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8195,3898,4159,4063,3994,827,870,922,7641,7690,8143,8085,8034,1282,4748,4842,4677,4593,4510,5709,5626,5524,5018,2004,1953,3397,1486,1539,5079,2097,4242,7753,3827,3582,4344,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,4422,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6165,6098,6406,7544,6770,6689,6844,6933,7175,7096,6249,6324,6630,6470,6550,6043,7319,7441,7993,7866,7809,7919,1366,4950,5438,5844,5775,5924,5379,5324,5262,5202,974,1084", - "endLines": "135,72,75,74,73,19,20,21,120,121,130,129,128,26,83,84,82,81,80,96,95,94,86,39,38,64,29,30,87,41,76,122,71,67,77,42,48,53,43,63,62,61,57,56,54,55,58,78,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,51,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,77,57,46,58,56,70,60,56,49,51,52,49,49,56,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": "8599,3989,4237,4154,4058,865,917,969,7685,7748,8190,8138,8080,1361,4837,4945,4743,4672,4588,5770,5704,5621,5074,2061,1999,3470,1534,1594,5179,2151,4339,7803,3893,3626,4417,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,4474,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6244,6160,6465,7635,6839,6765,6928,7091,7314,7170,6319,6401,6684,6545,6625,6093,7436,7539,8029,7914,7861,7988,1426,5013,5519,5919,5839,6013,5433,5374,5319,5257,1079,1169" + "startLines": "-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1" }, "to": { - "startLines": "24,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133", - "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", - "startOffsets": "985,1338,1434,1517,1613,1682,1725,1777,1829,1878,1941,1993,2051,2102,2186,2280,2388,2459,2543,2626,2692,2775,2877,2938,3000,3051,3129,3182,3242,3347,3406,3508,3563,3634,3683,3761,3819,3866,3925,3982,4053,4114,4171,4221,4273,4326,4376,4426,4483,4543,4596,4662,4724,4787,4834,4889,4977,5035,5097,5147,5192,5235,5295,5362,5417,5472,5525,5572,5625,5681,5729,5784,5837,5921,5988,6052,6148,6222,6303,6392,6555,6699,6778,6853,6935,6994,7074,7154,7209,7331,7434,7475,7528,7585,7659,7724,7792,7878,7958,8027,8121,8180,8235,8297,8357,8467", - "endLines": "28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133", - "endColumns": "14,95,82,95,68,42,51,51,48,62,51,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,77,57,46,58,56,70,60,56,49,51,52,49,49,56,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": "1333,1429,1512,1608,1677,1720,1772,1824,1873,1936,1988,2046,2097,2181,2275,2383,2454,2538,2621,2687,2770,2872,2933,2995,3046,3124,3177,3237,3342,3401,3503,3558,3629,3678,3756,3814,3861,3920,3977,4048,4109,4166,4216,4268,4321,4371,4421,4478,4538,4591,4657,4719,4782,4829,4884,4972,5030,5092,5142,5187,5230,5290,5357,5412,5467,5520,5567,5620,5676,5724,5779,5832,5916,5983,6047,6143,6217,6298,6387,6550,6694,6773,6848,6930,6989,7069,7149,7204,7326,7429,7470,7523,7580,7654,7719,7787,7873,7953,8022,8116,8175,8230,8292,8352,8462,8552" + "startLines": "12,13,14,15,16,17", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "420,459,505,547,587,625", + "endColumns": "38,45,41,39,37,40", + "endOffsets": "454,500,542,582,620,661" } }, { - "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "64,69,78,74,36,40,44,49,54,32,59,28,25,19,22", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2499,2704,3077,2916,1332,1515,1700,1886,2090,1149,2297,1031,921,713,819", - "endLines": "67,72,81,76,39,43,47,52,57,35,62,30,27,21,24", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2698,2910,3283,3071,1510,1695,1880,2084,2291,1327,2493,1143,1026,814,916" + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" }, "to": { - "startLines": "134,138,142,146,149,153,157,161,165,169,173,177,180,183,186", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8557,8761,8972,9182,9342,9525,9710,9895,10098,10304,10487,10688,10805,10915,11021", - "endLines": "137,141,145,148,152,156,160,164,168,172,176,179,182,185,188", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8756,8967,9177,9337,9520,9705,9890,10093,10299,10482,10683,10800,10910,11016,11118" + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" } }, { - "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" }, "to": { "startLines": "19,20,21,22,23", @@ -76,7 +69,79 @@ } }, { - "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" + }, + "to": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "666", + "endColumns": "56", + "endOffsets": "718" + } + }, + { + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "-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", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "139,143,147,151,154,158,162,166,170,174,178,182,185,188,191,194", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8898,9102,9313,9523,9683,9866,10051,10236,10439,10645,10828,11029,11146,11256,11362,11464", + "endLines": "142,146,150,153,157,161,165,169,173,177,181,184,187,190,193,197", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "9097,9308,9518,9678,9861,10046,10231,10434,10640,10823,11024,11141,11251,11357,11459,11618" + } + } + ] + }, + { + "outputFile": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml", + "map": [ + { + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "135,76,79,78,77,19,20,21,53,124,125,134,133,132,26,87,88,86,85,84,100,99,98,90,39,38,68,29,30,91,41,80,126,75,71,81,42,48,57,43,67,66,65,61,60,58,59,62,82,63,49,74,50,64,72,47,56,55,54,70,46,69,44,45,73,28,34,36,33,35,32,31,25,24,52,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,51,131,129,128,130,27,89,97,102,101,103,96,95,94,93,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,4,4", + "startOffsets": "8600,4244,4508,4411,4341,846,890,943,2835,8035,8085,8547,8488,8436,1308,5105,5200,5033,4948,4864,6079,5995,5892,5378,2043,1991,3735,1515,1569,5440,2138,4592,8149,4172,3923,4695,2198,2519,3099,2257,3663,3601,3543,3317,3264,3159,3213,3368,4774,3419,2567,4105,2621,3480,3973,2471,3043,2954,2895,3860,2420,3814,2315,2359,4037,1459,1784,1894,1736,1840,1679,1630,1252,1198,2758,6542,6474,6786,7936,7155,7073,7230,7320,7564,7484,6627,6703,7013,6851,6932,6418,7709,7832,2694,8394,8265,8207,8319,1393,5309,5805,6216,6146,6297,5745,5689,5626,5565,996,1107", + "endLines": "139,76,79,78,77,19,20,21,53,124,125,134,133,132,26,87,88,86,85,84,100,99,98,90,39,38,68,29,30,91,41,80,126,75,71,81,42,48,57,43,67,66,65,61,60,58,59,62,82,63,49,74,50,64,72,47,56,55,54,70,46,69,44,45,73,28,34,36,33,35,32,31,25,24,52,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,51,131,129,128,130,27,89,97,102,101,103,96,95,94,93,22,23", + "endColumns": "14,95,82,95,68,42,51,51,58,48,62,51,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,77,57,46,58,56,70,60,56,49,51,52,49,49,56,59,52,65,71,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,75,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,62,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "9008,4335,4586,4502,4405,884,937,990,2889,8079,8143,8594,8541,8482,1387,5194,5303,5099,5027,4942,6140,6073,5989,5434,2100,2037,3808,1563,1624,5540,2192,4689,8199,4238,3967,4768,2251,2561,3153,2309,3729,3657,3595,3362,3311,3207,3258,3413,4826,3474,2615,4166,2688,3537,4031,2513,3093,3037,2948,3917,2465,3854,2353,2414,4099,1509,1834,1942,1778,1888,1730,1673,1302,1246,2829,6621,6536,6845,8027,7224,7149,7314,7478,7703,7558,6697,6780,7067,6926,7007,6468,7826,7930,2752,8430,8313,8259,8388,1453,5372,5886,6291,6210,6386,5799,5739,5683,5620,1101,1192" + }, + "to": { + "startLines": "24,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "985,1338,1434,1517,1613,1682,1725,1777,1829,1888,1937,2000,2052,2110,2161,2245,2339,2447,2518,2602,2685,2751,2834,2936,2997,3059,3110,3188,3241,3301,3406,3465,3567,3622,3693,3742,3820,3878,3925,3984,4041,4112,4173,4230,4280,4332,4385,4435,4485,4542,4602,4655,4721,4793,4855,4918,4965,5020,5108,5166,5228,5278,5323,5366,5426,5493,5548,5603,5656,5703,5756,5812,5860,5915,5968,6044,6128,6195,6259,6355,6429,6510,6599,6762,6906,6985,7060,7142,7201,7281,7361,7416,7538,7641,7704,7745,7798,7855,7929,7994,8062,8148,8228,8297,8391,8450,8505,8567,8627,8737", + "endLines": "28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137", + "endColumns": "14,95,82,95,68,42,51,51,58,48,62,51,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,77,57,46,58,56,70,60,56,49,51,52,49,49,56,59,52,65,71,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,75,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,62,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1333,1429,1512,1608,1677,1720,1772,1824,1883,1932,1995,2047,2105,2156,2240,2334,2442,2513,2597,2680,2746,2829,2931,2992,3054,3105,3183,3236,3296,3401,3460,3562,3617,3688,3737,3815,3873,3920,3979,4036,4107,4168,4225,4275,4327,4380,4430,4480,4537,4597,4650,4716,4788,4850,4913,4960,5015,5103,5161,5223,5273,5318,5361,5421,5488,5543,5598,5651,5698,5751,5807,5855,5910,5963,6039,6123,6190,6254,6350,6424,6505,6594,6757,6901,6980,7055,7137,7196,7276,7356,7411,7533,7636,7699,7740,7793,7850,7924,7989,8057,8143,8223,8292,8386,8445,8500,8562,8622,8732,8822" + } + }, + { + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\FontColor.xml", + "from": { + "startLines": "4,7,6,2,3,5", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "133,255,213,55,95,172", + "endColumns": "38,45,41,39,37,40", + "endOffsets": "167,296,250,90,128,208" + }, + "to": { + "startLines": "12,13,14,15,16,17", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "420,459,505,547,587,625", + "endColumns": "38,45,41,39,37,40", + "endOffsets": "454,500,542,582,620,661" + } + }, + { + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\arrays.xml", "from": { "startLines": "19,26", "startColumns": "4,4", @@ -95,7 +160,24 @@ } }, { - "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "764,816,869,922,712", + "endColumns": "51,52,52,51,51", + "endOffsets": "811,864,917,969,759" + }, + "to": { + "startLines": "19,20,21,22,23", + "startColumns": "4,4,4,4,4", + "startOffsets": "723,775,828,881,933", + "endColumns": "51,52,52,51,51", + "endOffsets": "770,823,876,928,980" + } + }, + { + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", @@ -110,6 +192,25 @@ "endColumns": "56", "endOffsets": "718" } + }, + { + "source": "D:\\MINOTES\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "64,69,78,74,36,40,44,49,54,32,59,28,25,19,22,82", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2563,2773,3155,2990,1368,1555,1744,1935,2144,1181,2356,1059,946,732,841,3370", + "endLines": "67,72,81,76,39,43,47,52,57,35,62,30,27,21,24,85", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2765,2982,3364,3147,1549,1738,1927,2136,2348,1362,2555,1173,1053,835,940,3527" + }, + "to": { + "startLines": "138,142,146,150,153,157,161,165,169,173,177,181,184,187,190,193", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8827,9031,9242,9452,9612,9795,9980,10165,10368,10574,10757,10958,11075,11185,11291,11393", + "endLines": "141,145,149,152,156,160,164,168,172,176,180,183,186,189,192,196", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "9026,9237,9447,9607,9790,9975,10160,10363,10569,10752,10953,11070,11180,11286,11388,11547" + } } ] } diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json index 450a98d..221959c 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -1,386 +1,406 @@ [ { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_middle.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw_introduction.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw\\introduction" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_bar_bg.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_bar_bg.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw-zh-rCN_introduction.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw-zh-rCN\\introduction" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_dropdown_menu.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_list_dropdown_menu.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_call_record.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\call_record.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_folder_list_item.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/folder_list_item.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_selected.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/selected.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_delete.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_delete.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_yellow.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.9.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": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_up.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_footer_bg.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_footer_bg.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_green.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_green.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_color_green.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_color_green.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_single.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_clock.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/clock.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_4x.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_4x.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/raw_introduction.flat", - "source": "net.micode.notes.app-main-7:/raw/introduction" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_datetime_picker.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_yellow.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_yellow.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_folder.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_folder.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_up.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_middle.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_blue.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_blue.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_green.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_green.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable_new_note.xml.flat", - "source": "net.micode.notes.app-main-7:/drawable/new_note.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_red.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_red.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_widget_2x.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/widget_2x.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_yellow.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_yellow.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_widget_2x_info.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/widget_2x_info.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_footer_bg.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_footer_bg.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_call_record_folder.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/call_record_folder.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_blue.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_blue.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/preferences.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_yellow.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_yellow.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_dialog_edit_text.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/dialog_edit_text.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_searchable.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\searchable.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_blue.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_blue.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_down.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_single.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_blue.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_blue.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/color_secondary_text_dark.xml.flat", - "source": "net.micode.notes.app-main-7:/color/secondary_text_dark.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_down.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_widget_4x_info.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/widget_4x_info.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_middle.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_up.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_white.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_white.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_middle.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_up.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_single.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_move.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_move.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_yellow.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_yellow.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_private_folder_menu.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\private_folder_menu.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_edit.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_widget_4x.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/widget_4x.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_up.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_green.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_green.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_normal.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_delete.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_delete.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_list.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_selected.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\selected.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_down.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_delete.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\delete.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_icon_app.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/icon_app.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_green.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_green.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_dropdown_icon.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/dropdown_icon.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_record_folder.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_record_folder.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_btn_set_color.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_btn_set_color.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_settings_header.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\settings_header.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": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_small.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_small.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_list_footer.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_move.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_move.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_single.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_color_btn_mask.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_account_dialog_title.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\account_dialog_title.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_add_account_text.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/add_account_text.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_item.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_item.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_datetime_picker.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/datetime_picker.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_preferences.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\preferences.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_super.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_super.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_footer.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_footer.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_single.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_white.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_white.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_yellow.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_yellow.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_delete.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/delete.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_options.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_green.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_green.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_white.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_white.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_edit.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_yellow.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_account_dialog_title.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/account_dialog_title.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_down.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_call_record.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/call_record.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_secondary_text_dark.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\secondary_text_dark.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_up.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_middle.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_folder.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_folder.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_up.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_single.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_private_folder_options.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\private_folder_options.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_notification.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/notification.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_blue.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_blue.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_down.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_white.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_white.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_pressed.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_pressed.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_large.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_large.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_white.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_white.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_new_note.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\new_note.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_item.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_item.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_settings_header.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/settings_header.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit_list_item.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit_list_item.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/note_edit_color_selector_panel.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_red.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_red.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_alert.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_alert.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_primary_text_dark.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\primary_text_dark.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_red.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_red.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_large.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_large.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_2x_info.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_2x_info.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_middle.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_blue.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_blue.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_single.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_up.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_bar_bg.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_bar_bg.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_white.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_white.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_2x.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_2x.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_up.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_white.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_white.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_pressed.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_pressed.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_white.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_white.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_middle.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_down.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/raw-zh-rCN_introduction.flat", - "source": "net.micode.notes.app-main-7:/raw-zh-rCN/introduction" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_background.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_background.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_clock.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\clock.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_search_result.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/search_result.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_green.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_green.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_green.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_green.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_red.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_red.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_blue.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_blue.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_searchable.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/searchable.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_down.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_middle.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_dropdown_icon.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\dropdown_icon.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_normal.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_normal.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_up.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_middle.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_dropdown.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_list_dropdown.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_search_result.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\search_result.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_normal.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_normal.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_dropdown_menu.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit_list_item.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_edit_list_item.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_edit.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_down.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_down.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_size_selector_bg.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_red.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_red.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_red.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_red.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_color_btn_mask.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_blue.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_blue.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_normal.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_normal.png" + }, + { + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_note_edit.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_note_edit.xml" + }, + { + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_single.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_single.9.png" }, { "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_options.xml.flat", "source": "net.micode.notes.app-main-7:/menu/note_list_options.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_call_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/call_note_edit.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_super.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_super.png" + }, + { + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_menu_visible.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\menu_visible.png" + }, + { + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_color_green.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_color_green.png" + }, + { + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_4x_info.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_4x_info.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_single.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_menu_invisible.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\menu_invisible.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_red.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_red.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_sub_folder.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\sub_folder.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/color_primary_text_dark.xml.flat", - "source": "net.micode.notes.app-main-7:/color/primary_text_dark.xml" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_dropdown.xml.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_dropdown.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_down.9.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_size_selector_bg.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_small.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_small.png" + "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_single.9.png.flat", + "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_single.9.png" } ] \ No newline at end of file diff --git a/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml index f237bf5..73e3e7c 100644 --- a/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml +++ b/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml @@ -20,8 +20,8 @@ android:versionName="0.1" > + android:minSdkVersion="24" + android:targetSdkVersion="24" /> @@ -35,6 +35,7 @@ diff --git a/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 7135a18..05fadb6 100644 Binary files a/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex index a961bc4..678b836 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex index 720f42c..4431452 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex index 37e4878..fab84e3 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex index 1baae91..935f7b2 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex index d9a2ab4..4387715 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex index 4729c21..3747236 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex index dd43cb4..48c25f1 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex index 3167a05..cacc62c 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex index 31a0c14..1f0771f 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex index 7aadaca..b9089bf 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex index 5f75934..9abe4b0 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex index bcfa6e9..3c34e13 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex index bcdbefa..5368171 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex index c183d73..16910cf 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index c213131..6ac7315 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex index f93288a..7a2ff09 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex index 24727dc..4379a0c 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index c6aa311..c4ee2c9 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index 5d30cee..6ce8670 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex index 3c00a32..2c6fa0d 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index 1af261e..f3f2993 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex index e7289ce..7736c01 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex index f451fb3..23feef5 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex index 95b5c38..fee6e25 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex index 7a56f6d..0a0ee64 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex index 34018b6..1f715e9 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex index 5cbd255..77ac2ac 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index 9016fe9..0d24fbf 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex index 9a5113e..1eaa635 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index 46a48ad..72595c8 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex index d89c751..745958b 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex index f769567..ec795b7 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex index 74086ad..50d0c0b 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex index a19ad22..8057b3c 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex index 379c5ef..a039e50 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index 55d55a1..ba62de7 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex index fc94e16..bf1c922 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex index 771e84c..c9da571 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index a90f86d..42bf394 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index 32d3200..e05fab5 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex index 98f2a30..d3f6d8a 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex index a3cdcd0..a5e194f 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex index 4f69626..e8e576f 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index 332ebea..f0c4f2e 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/app/build/intermediates/runtime_symbol_list/debug/R.txt b/app/build/intermediates/runtime_symbol_list/debug/R.txt index 4f814fb..c6ce95d 100644 --- a/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ b/app/build/intermediates/runtime_symbol_list/debug/R.txt @@ -61,104 +61,110 @@ 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 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 menu_invisible 0x7f04002f +int drawable menu_move 0x7f040030 +int drawable menu_visible 0x7f040031 +int drawable new_note 0x7f040032 +int drawable new_note_normal 0x7f040033 +int drawable new_note_pressed 0x7f040034 +int drawable note_edit_color_selector_panel 0x7f040035 +int drawable notification 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 int id amPm 0x7f050003 -int id btn_new_note 0x7f050004 -int id btn_set_bg_color 0x7f050005 -int id cb_edit_item 0x7f050006 -int id date 0x7f050007 -int id delete 0x7f050008 -int id et_edit_text 0x7f050009 -int id et_foler_name 0x7f05000a -int id font_size_selector 0x7f05000b -int id hour 0x7f05000c -int id iv_Bright_blue_select 0x7f05000d -int id iv_alert_icon 0x7f05000e -int id iv_bg_blue 0x7f05000f -int id iv_bg_blue_select 0x7f050010 -int id iv_bg_green 0x7f050011 -int id iv_bg_green_select 0x7f050012 -int id iv_bg_red 0x7f050013 -int id iv_bg_red_select 0x7f050014 -int id iv_bg_white 0x7f050015 -int id iv_bg_white_select 0x7f050016 -int id iv_bg_yellow 0x7f050017 -int id iv_bg_yellow_select 0x7f050018 -int id iv_default_select 0x7f050019 -int id iv_green_select 0x7f05001a -int id iv_large_select 0x7f05001b -int id iv_medium_select 0x7f05001c -int id iv_red_select 0x7f05001d -int id iv_small_select 0x7f05001e -int id iv_super_select 0x7f05001f -int id ll_font_Bright_blue 0x7f050020 -int id ll_font_color_selector 0x7f050021 -int id ll_font_default 0x7f050022 -int id ll_font_green 0x7f050023 -int id ll_font_large 0x7f050024 -int id ll_font_normal 0x7f050025 -int id ll_font_red 0x7f050026 -int id ll_font_small 0x7f050027 -int id ll_font_super 0x7f050028 -int id menu_alert 0x7f050029 -int id menu_change_font_color 0x7f05002a -int id menu_delete 0x7f05002b -int id menu_delete_remind 0x7f05002c -int id menu_export_text 0x7f05002d -int id menu_font_size 0x7f05002e -int id menu_insert_img 0x7f05002f -int id menu_list_mode 0x7f050030 -int id menu_new_folder 0x7f050031 -int id menu_new_note 0x7f050032 -int id menu_search 0x7f050033 -int id menu_send_to_desktop 0x7f050034 -int id menu_setting 0x7f050035 -int id menu_share 0x7f050036 -int id menu_sync 0x7f050037 -int id minute 0x7f050038 -int id move 0x7f050039 -int id navigation_bar 0x7f05003a -int id note_bg_color_selector 0x7f05003b -int id note_edit_list 0x7f05003c -int id note_edit_view 0x7f05003d -int id note_item 0x7f05003e -int id note_title 0x7f05003f -int id notes_list 0x7f050040 -int id prefenerece_sync_status_textview 0x7f050041 -int id preference_sync_button 0x7f050042 -int id selection_menu 0x7f050043 -int id sv_note_edit 0x7f050044 -int id tv_alert_date 0x7f050045 -int id tv_folder_name 0x7f050046 -int id tv_modified_date 0x7f050047 -int id tv_name 0x7f050048 -int id tv_time 0x7f050049 -int id tv_title 0x7f05004a -int id tv_title_bar 0x7f05004b -int id widget_bg_image 0x7f05004c -int id widget_text 0x7f05004d +int id backToRoot 0x7f050004 +int id btn_new_note 0x7f050005 +int id btn_set_bg_color 0x7f050006 +int id cb_edit_item 0x7f050007 +int id date 0x7f050008 +int id delete 0x7f050009 +int id et_edit_text 0x7f05000a +int id et_foler_name 0x7f05000b +int id font_size_selector 0x7f05000c +int id hour 0x7f05000d +int id iv_Bright_blue_select 0x7f05000e +int id iv_alert_icon 0x7f05000f +int id iv_bg_blue 0x7f050010 +int id iv_bg_blue_select 0x7f050011 +int id iv_bg_green 0x7f050012 +int id iv_bg_green_select 0x7f050013 +int id iv_bg_red 0x7f050014 +int id iv_bg_red_select 0x7f050015 +int id iv_bg_white 0x7f050016 +int id iv_bg_white_select 0x7f050017 +int id iv_bg_yellow 0x7f050018 +int id iv_bg_yellow_select 0x7f050019 +int id iv_default_select 0x7f05001a +int id iv_green_select 0x7f05001b +int id iv_large_select 0x7f05001c +int id iv_medium_select 0x7f05001d +int id iv_red_select 0x7f05001e +int id iv_small_select 0x7f05001f +int id iv_super_select 0x7f050020 +int id ll_font_Bright_blue 0x7f050021 +int id ll_font_color_selector 0x7f050022 +int id ll_font_default 0x7f050023 +int id ll_font_green 0x7f050024 +int id ll_font_large 0x7f050025 +int id ll_font_normal 0x7f050026 +int id ll_font_red 0x7f050027 +int id ll_font_small 0x7f050028 +int id ll_font_super 0x7f050029 +int id menu_alert 0x7f05002a +int id menu_change_font_color 0x7f05002b +int id menu_delete 0x7f05002c +int id menu_delete_remind 0x7f05002d +int id menu_export_text 0x7f05002e +int id menu_font_size 0x7f05002f +int id menu_insert_img 0x7f050030 +int id menu_list_mode 0x7f050031 +int id menu_new_folder 0x7f050032 +int id menu_new_note 0x7f050033 +int id menu_search 0x7f050034 +int id menu_send_to_desktop 0x7f050035 +int id menu_setting 0x7f050036 +int id menu_share 0x7f050037 +int id menu_sync 0x7f050038 +int id minute 0x7f050039 +int id move 0x7f05003a +int id move_to_private 0x7f05003b +int id move_to_root 0x7f05003c +int id navigation_bar 0x7f05003d +int id note_bg_color_selector 0x7f05003e +int id note_edit_list 0x7f05003f +int id note_edit_view 0x7f050040 +int id note_item 0x7f050041 +int id note_title 0x7f050042 +int id notes_list 0x7f050043 +int id prefenerece_sync_status_textview 0x7f050044 +int id preference_sync_button 0x7f050045 +int id private_folder 0x7f050046 +int id selection_menu 0x7f050047 +int id sv_note_edit 0x7f050048 +int id tv_alert_date 0x7f050049 +int id tv_folder_name 0x7f05004a +int id tv_modified_date 0x7f05004b +int id tv_name 0x7f05004c +int id tv_time 0x7f05004d +int id tv_title 0x7f05004e +int id tv_title_bar 0x7f05004f +int id widget_bg_image 0x7f050050 +int id widget_text 0x7f050051 int layout account_dialog_title 0x7f060000 int layout add_account_text 0x7f060001 int layout datetime_picker 0x7f060002 @@ -179,7 +185,9 @@ int menu note_edit 0x7f070002 int menu note_list 0x7f070003 int menu note_list_dropdown 0x7f070004 int menu note_list_options 0x7f070005 -int menu sub_folder 0x7f070006 +int menu private_folder_menu 0x7f070006 +int menu private_folder_options 0x7f070007 +int menu sub_folder 0x7f070008 int plurals search_results_title 0x7f080000 int raw introduction 0x7f090000 int string alert_message_delete_folder 0x7f0a0000 @@ -189,104 +197,109 @@ int string alert_title_delete 0x7f0a0003 int string app_name 0x7f0a0004 int string app_widget2x2 0x7f0a0005 int string app_widget4x4 0x7f0a0006 -int string button_delete 0x7f0a0007 -int string call_record_folder_name 0x7f0a0008 -int string change_txt_color 0x7f0a0009 -int string datetime_dialog_cancel 0x7f0a000a -int string datetime_dialog_ok 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_change_font_color 0x7f0a0021 -int string menu_create_folder 0x7f0a0022 -int string menu_delete 0x7f0a0023 -int string menu_deselect_all 0x7f0a0024 -int string menu_export_text 0x7f0a0025 -int string menu_folder_change_name 0x7f0a0026 -int string menu_folder_delete 0x7f0a0027 -int string menu_folder_view 0x7f0a0028 -int string menu_font_large 0x7f0a0029 -int string menu_font_normal 0x7f0a002a -int string menu_font_size 0x7f0a002b -int string menu_font_small 0x7f0a002c -int string menu_font_super 0x7f0a002d -int string menu_insert_img 0x7f0a002e -int string menu_list_mode 0x7f0a002f -int string menu_move 0x7f0a0030 -int string menu_move_parent_folder 0x7f0a0031 -int string menu_normal_mode 0x7f0a0032 -int string menu_remove_remind 0x7f0a0033 -int string menu_search 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 note_alert_expired 0x7f0a003e -int string note_link_email 0x7f0a003f -int string note_link_other 0x7f0a0040 -int string note_link_tel 0x7f0a0041 -int string note_link_web 0x7f0a0042 -int string notealert_enter 0x7f0a0043 -int string notealert_ok 0x7f0a0044 -int string notelist_menu_new 0x7f0a0045 -int string notelist_string_info 0x7f0a0046 -int string preferences_account_summary 0x7f0a0047 -int string preferences_account_title 0x7f0a0048 -int string preferences_add_account 0x7f0a0049 -int string preferences_bg_random_appear_title 0x7f0a004a -int string preferences_button_sync_cancel 0x7f0a004b -int string preferences_button_sync_immediately 0x7f0a004c -int string preferences_dialog_change_account_title 0x7f0a004d -int string preferences_dialog_change_account_warn_msg 0x7f0a004e -int string preferences_dialog_select_account_tips 0x7f0a004f -int string preferences_dialog_select_account_title 0x7f0a0050 -int string preferences_last_sync_time 0x7f0a0051 -int string preferences_last_sync_time_format 0x7f0a0052 -int string preferences_menu_cancel 0x7f0a0053 -int string preferences_menu_change_account 0x7f0a0054 -int string preferences_menu_remove_account 0x7f0a0055 -int string preferences_title 0x7f0a0056 -int string preferences_toast_cannot_change_account 0x7f0a0057 -int string preferences_toast_success_set_accout 0x7f0a0058 -int string search 0x7f0a0059 -int string search_hint 0x7f0a005a -int string search_label 0x7f0a005b -int string search_setting_description 0x7f0a005c -int string set_remind_time_message 0x7f0a005d -int string success_sdcard_export 0x7f0a005e -int string success_sync_account 0x7f0a005f -int string sync_progress_init_list 0x7f0a0060 -int string sync_progress_login 0x7f0a0061 -int string sync_progress_syncing 0x7f0a0062 -int string ticker_cancel 0x7f0a0063 -int string ticker_fail 0x7f0a0064 -int string ticker_success 0x7f0a0065 -int string ticker_syncing 0x7f0a0066 -int string widget_havenot_content 0x7f0a0067 -int string widget_under_visit_mode 0x7f0a0068 +int string back_to_root 0x7f0a0007 +int string button_delete 0x7f0a0008 +int string call_record_folder_name 0x7f0a0009 +int string change_txt_color 0x7f0a000a +int string datetime_dialog_cancel 0x7f0a000b +int string datetime_dialog_ok 0x7f0a000c +int string delete_remind_time_message 0x7f0a000d +int string error_note_empty_for_clock 0x7f0a000e +int string error_note_empty_for_send_to_desktop 0x7f0a000f +int string error_note_not_exist 0x7f0a0010 +int string error_sdcard_export 0x7f0a0011 +int string error_sdcard_unmounted 0x7f0a0012 +int string error_sync_cancelled 0x7f0a0013 +int string error_sync_internal 0x7f0a0014 +int string error_sync_network 0x7f0a0015 +int string failed_sdcard_export 0x7f0a0016 +int string file_name_txt_format 0x7f0a0017 +int string file_path 0x7f0a0018 +int string folder_exist 0x7f0a0019 +int string format_date_ymd 0x7f0a001a +int string format_datetime_mdhm 0x7f0a001b +int string format_exported_file_location 0x7f0a001c +int string format_folder_files_count 0x7f0a001d +int string format_move_notes_to_folder 0x7f0a001e +int string hint_foler_name 0x7f0a001f +int string info_note_enter_desktop 0x7f0a0020 +int string menu_alert 0x7f0a0021 +int string menu_change_font_color 0x7f0a0022 +int string menu_create_folder 0x7f0a0023 +int string menu_delete 0x7f0a0024 +int string menu_deselect_all 0x7f0a0025 +int string menu_export_text 0x7f0a0026 +int string menu_folder_change_name 0x7f0a0027 +int string menu_folder_delete 0x7f0a0028 +int string menu_folder_view 0x7f0a0029 +int string menu_font_large 0x7f0a002a +int string menu_font_normal 0x7f0a002b +int string menu_font_size 0x7f0a002c +int string menu_font_small 0x7f0a002d +int string menu_font_super 0x7f0a002e +int string menu_insert_img 0x7f0a002f +int string menu_list_mode 0x7f0a0030 +int string menu_move 0x7f0a0031 +int string menu_move_parent_folder 0x7f0a0032 +int string menu_move_to_private 0x7f0a0033 +int string menu_move_to_root 0x7f0a0034 +int string menu_normal_mode 0x7f0a0035 +int string menu_remove_remind 0x7f0a0036 +int string menu_search 0x7f0a0037 +int string menu_select_all 0x7f0a0038 +int string menu_select_none 0x7f0a0039 +int string menu_select_title 0x7f0a003a +int string menu_send_to_desktop 0x7f0a003b +int string menu_setting 0x7f0a003c +int string menu_share 0x7f0a003d +int string menu_sync 0x7f0a003e +int string menu_sync_cancel 0x7f0a003f +int string menu_title_select_folder 0x7f0a0040 +int string note_alert_expired 0x7f0a0041 +int string note_link_email 0x7f0a0042 +int string note_link_other 0x7f0a0043 +int string note_link_tel 0x7f0a0044 +int string note_link_web 0x7f0a0045 +int string notealert_enter 0x7f0a0046 +int string notealert_ok 0x7f0a0047 +int string notelist_menu_new 0x7f0a0048 +int string notelist_string_info 0x7f0a0049 +int string please_enter_password 0x7f0a004a +int string preferences_account_summary 0x7f0a004b +int string preferences_account_title 0x7f0a004c +int string preferences_add_account 0x7f0a004d +int string preferences_bg_random_appear_title 0x7f0a004e +int string preferences_button_sync_cancel 0x7f0a004f +int string preferences_button_sync_immediately 0x7f0a0050 +int string preferences_dialog_change_account_title 0x7f0a0051 +int string preferences_dialog_change_account_warn_msg 0x7f0a0052 +int string preferences_dialog_select_account_tips 0x7f0a0053 +int string preferences_dialog_select_account_title 0x7f0a0054 +int string preferences_last_sync_time 0x7f0a0055 +int string preferences_last_sync_time_format 0x7f0a0056 +int string preferences_menu_cancel 0x7f0a0057 +int string preferences_menu_change_account 0x7f0a0058 +int string preferences_menu_remove_account 0x7f0a0059 +int string preferences_title 0x7f0a005a +int string preferences_toast_cannot_change_account 0x7f0a005b +int string preferences_toast_success_set_accout 0x7f0a005c +int string private_folder 0x7f0a005d +int string search 0x7f0a005e +int string search_hint 0x7f0a005f +int string search_label 0x7f0a0060 +int string search_setting_description 0x7f0a0061 +int string set_remind_time_message 0x7f0a0062 +int string success_sdcard_export 0x7f0a0063 +int string success_sync_account 0x7f0a0064 +int string sync_progress_init_list 0x7f0a0065 +int string sync_progress_login 0x7f0a0066 +int string sync_progress_syncing 0x7f0a0067 +int string ticker_cancel 0x7f0a0068 +int string ticker_fail 0x7f0a0069 +int string ticker_success 0x7f0a006a +int string ticker_syncing 0x7f0a006b +int string widget_havenot_content 0x7f0a006c +int string widget_under_visit_mode 0x7f0a006d int style HighlightTextAppearancePrimary 0x7f0b0000 int style HighlightTextAppearanceSecondary 0x7f0b0001 int style NoteActionBarStyle 0x7f0b0002 @@ -302,6 +315,7 @@ int style TextColorBrightBlue 0x7f0b000b int style TextColorDefault 0x7f0b000c int style TextColorGreen 0x7f0b000d int style TextColorRed 0x7f0b000e +int style my_dialog 0x7f0b000f int xml preferences 0x7f0c0000 int xml searchable 0x7f0c0001 int xml widget_2x_info 0x7f0c0002 diff --git a/app/build/intermediates/source_set_path_map/debug/file-map.txt b/app/build/intermediates/source_set_path_map/debug/file-map.txt index c73f3d0..b21d8c7 100644 --- a/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,8 +1,8 @@ -net.micode.notes.app-pngs-0 D:\Work-java\MINOTES\minotes\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 D:\Work-java\MINOTES\minotes\app\build\generated\res\resValues\debug -net.micode.notes.app-rs-2 D:\Work-java\MINOTES\minotes\app\build\generated\res\rs\debug -net.micode.notes.app-mergeDebugResources-3 D:\Work-java\MINOTES\minotes\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir -net.micode.notes.app-mergeDebugResources-4 D:\Work-java\MINOTES\minotes\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir -net.micode.notes.app-merged_res-5 D:\Work-java\MINOTES\minotes\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-6 D:\Work-java\MINOTES\minotes\app\src\debug\res -net.micode.notes.app-main-7 D:\Work-java\MINOTES\minotes\app\src\main\res +net.micode.notes.app-pngs-0 D:\MINOTES\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 D:\MINOTES\app\build\generated\res\resValues\debug +net.micode.notes.app-rs-2 D:\MINOTES\app\build\generated\res\rs\debug +net.micode.notes.app-mergeDebugResources-3 D:\MINOTES\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir +net.micode.notes.app-mergeDebugResources-4 D:\MINOTES\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir +net.micode.notes.app-merged_res-5 D:\MINOTES\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-6 D:\MINOTES\app\src\debug\res +net.micode.notes.app-main-7 D:\MINOTES\app\src\main\res diff --git a/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt index 0085047..e879dfe 100644 --- a/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ b/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -1,97 +1,96 @@ net.micode.notes:xml/widget_4x_info = 0x7f0c0003 net.micode.notes:xml/preferences = 0x7f0c0000 +net.micode.notes:style/my_dialog = 0x7f0b000f net.micode.notes:style/TextColorGreen = 0x7f0b000d net.micode.notes:style/TextColorDefault = 0x7f0b000c net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 -net.micode.notes:string/widget_havenot_content = 0x7f0a0067 -net.micode.notes:string/ticker_syncing = 0x7f0a0066 -net.micode.notes:string/ticker_success = 0x7f0a0065 +net.micode.notes:string/widget_havenot_content = 0x7f0a006c +net.micode.notes:string/ticker_syncing = 0x7f0a006b +net.micode.notes:string/ticker_success = 0x7f0a006a net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 -net.micode.notes:string/ticker_cancel = 0x7f0a0063 -net.micode.notes:string/sync_progress_syncing = 0x7f0a0062 -net.micode.notes:string/sync_progress_init_list = 0x7f0a0060 -net.micode.notes:string/search_label = 0x7f0a005b -net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0058 -net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0057 -net.micode.notes:string/preferences_title = 0x7f0a0056 -net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0055 +net.micode.notes:string/ticker_cancel = 0x7f0a0068 +net.micode.notes:string/sync_progress_init_list = 0x7f0a0065 +net.micode.notes:string/search_label = 0x7f0a0060 +net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a005b +net.micode.notes:string/preferences_title = 0x7f0a005a +net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0059 net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002 -net.micode.notes:string/preferences_menu_change_account = 0x7f0a0054 -net.micode.notes:string/preferences_menu_cancel = 0x7f0a0053 -net.micode.notes:string/preferences_last_sync_time = 0x7f0a0051 -net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a0050 -net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004e -net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a004c -net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a004b -net.micode.notes:string/preferences_account_summary = 0x7f0a0047 -net.micode.notes:string/success_sdcard_export = 0x7f0a005e -net.micode.notes:string/notelist_string_info = 0x7f0a0046 -net.micode.notes:string/notelist_menu_new = 0x7f0a0045 -net.micode.notes:string/notealert_ok = 0x7f0a0044 -net.micode.notes:string/notealert_enter = 0x7f0a0043 -net.micode.notes:string/note_link_web = 0x7f0a0042 -net.micode.notes:string/note_link_tel = 0x7f0a0041 -net.micode.notes:string/note_link_other = 0x7f0a0040 -net.micode.notes:string/note_link_email = 0x7f0a003f -net.micode.notes:string/note_alert_expired = 0x7f0a003e -net.micode.notes:string/menu_sync_cancel = 0x7f0a003c -net.micode.notes:string/menu_sync = 0x7f0a003b -net.micode.notes:string/menu_share = 0x7f0a003a -net.micode.notes:string/menu_select_title = 0x7f0a0037 +net.micode.notes:string/preferences_menu_change_account = 0x7f0a0058 +net.micode.notes:string/preferences_menu_cancel = 0x7f0a0057 +net.micode.notes:string/preferences_last_sync_time = 0x7f0a0055 +net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a0054 +net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a0052 +net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0050 +net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a004f +net.micode.notes:string/preferences_account_summary = 0x7f0a004b +net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a005c +net.micode.notes:string/please_enter_password = 0x7f0a004a +net.micode.notes:string/success_sdcard_export = 0x7f0a0063 +net.micode.notes:string/notelist_string_info = 0x7f0a0049 +net.micode.notes:string/notelist_menu_new = 0x7f0a0048 +net.micode.notes:string/notealert_ok = 0x7f0a0047 +net.micode.notes:string/notealert_enter = 0x7f0a0046 +net.micode.notes:string/note_link_web = 0x7f0a0045 +net.micode.notes:string/note_link_tel = 0x7f0a0044 +net.micode.notes:string/note_link_other = 0x7f0a0043 +net.micode.notes:string/note_link_email = 0x7f0a0042 +net.micode.notes:string/note_alert_expired = 0x7f0a0041 +net.micode.notes:string/menu_sync_cancel = 0x7f0a003f +net.micode.notes:string/menu_sync = 0x7f0a003e +net.micode.notes:string/menu_share = 0x7f0a003d +net.micode.notes:string/menu_select_title = 0x7f0a003a net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 -net.micode.notes:string/menu_select_none = 0x7f0a0036 -net.micode.notes:string/menu_title_select_folder = 0x7f0a003d -net.micode.notes:string/menu_select_all = 0x7f0a0035 -net.micode.notes:string/menu_search = 0x7f0a0034 -net.micode.notes:string/menu_remove_remind = 0x7f0a0033 -net.micode.notes:string/menu_normal_mode = 0x7f0a0032 -net.micode.notes:string/menu_move_parent_folder = 0x7f0a0031 -net.micode.notes:string/menu_move = 0x7f0a0030 -net.micode.notes:string/menu_list_mode = 0x7f0a002f -net.micode.notes:string/menu_insert_img = 0x7f0a002e -net.micode.notes:string/menu_font_super = 0x7f0a002d -net.micode.notes:string/menu_font_small = 0x7f0a002c -net.micode.notes:string/menu_export_text = 0x7f0a0025 -net.micode.notes:string/menu_deselect_all = 0x7f0a0024 -net.micode.notes:string/menu_create_folder = 0x7f0a0022 -net.micode.notes:string/info_note_enter_desktop = 0x7f0a001f -net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001d -net.micode.notes:string/format_folder_files_count = 0x7f0a001c -net.micode.notes:string/format_date_ymd = 0x7f0a0019 +net.micode.notes:string/menu_select_none = 0x7f0a0039 +net.micode.notes:string/menu_title_select_folder = 0x7f0a0040 +net.micode.notes:string/menu_select_all = 0x7f0a0038 +net.micode.notes:string/menu_search = 0x7f0a0037 +net.micode.notes:string/menu_remove_remind = 0x7f0a0036 +net.micode.notes:string/menu_normal_mode = 0x7f0a0035 +net.micode.notes:string/menu_move_to_root = 0x7f0a0034 +net.micode.notes:string/menu_move_to_private = 0x7f0a0033 +net.micode.notes:string/menu_move_parent_folder = 0x7f0a0032 +net.micode.notes:string/menu_move = 0x7f0a0031 +net.micode.notes:string/menu_list_mode = 0x7f0a0030 +net.micode.notes:string/menu_insert_img = 0x7f0a002f +net.micode.notes:string/menu_font_super = 0x7f0a002e +net.micode.notes:string/menu_font_small = 0x7f0a002d +net.micode.notes:string/menu_export_text = 0x7f0a0026 +net.micode.notes:string/menu_deselect_all = 0x7f0a0025 +net.micode.notes:string/menu_create_folder = 0x7f0a0023 +net.micode.notes:string/info_note_enter_desktop = 0x7f0a0020 +net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001e +net.micode.notes:string/format_folder_files_count = 0x7f0a001d +net.micode.notes:string/format_date_ymd = 0x7f0a001a net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 -net.micode.notes:string/hint_foler_name = 0x7f0a001e -net.micode.notes:string/folder_exist = 0x7f0a0018 -net.micode.notes:string/file_path = 0x7f0a0017 -net.micode.notes:string/ticker_fail = 0x7f0a0064 -net.micode.notes:string/file_name_txt_format = 0x7f0a0016 -net.micode.notes:string/failed_sdcard_export = 0x7f0a0015 -net.micode.notes:string/set_remind_time_message = 0x7f0a005d -net.micode.notes:string/error_sync_network = 0x7f0a0014 -net.micode.notes:string/error_note_not_exist = 0x7f0a000f -net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000e -net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000d +net.micode.notes:string/hint_foler_name = 0x7f0a001f +net.micode.notes:string/folder_exist = 0x7f0a0019 +net.micode.notes:string/file_path = 0x7f0a0018 +net.micode.notes:string/ticker_fail = 0x7f0a0069 +net.micode.notes:string/file_name_txt_format = 0x7f0a0017 +net.micode.notes:string/failed_sdcard_export = 0x7f0a0016 +net.micode.notes:string/set_remind_time_message = 0x7f0a0062 +net.micode.notes:string/private_folder = 0x7f0a005d +net.micode.notes:string/error_sync_network = 0x7f0a0015 +net.micode.notes:string/error_note_not_exist = 0x7f0a0010 +net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000f +net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000e +net.micode.notes:string/delete_remind_time_message = 0x7f0a000d net.micode.notes:style/TextColorBrightBlue = 0x7f0b000b -net.micode.notes:string/datetime_dialog_ok = 0x7f0a000b -net.micode.notes:string/datetime_dialog_cancel = 0x7f0a000a -net.micode.notes:string/menu_folder_view = 0x7f0a0028 -net.micode.notes:id/menu_delete = 0x7f05002b -net.micode.notes:string/change_txt_color = 0x7f0a0009 -net.micode.notes:drawable/list_green_up = 0x7f040021 -net.micode.notes:string/call_record_folder_name = 0x7f0a0008 -net.micode.notes:drawable/new_note_normal = 0x7f040031 -net.micode.notes:string/button_delete = 0x7f0a0007 +net.micode.notes:string/datetime_dialog_ok = 0x7f0a000c +net.micode.notes:string/datetime_dialog_cancel = 0x7f0a000b +net.micode.notes:string/back_to_root = 0x7f0a0007 net.micode.notes:string/app_widget2x2 = 0x7f0a0005 -net.micode.notes:string/menu_font_normal = 0x7f0a002a -net.micode.notes:string/format_exported_file_location = 0x7f0a001b +net.micode.notes:string/menu_font_normal = 0x7f0a002b +net.micode.notes:string/format_exported_file_location = 0x7f0a001c net.micode.notes:raw/introduction = 0x7f090000 -net.micode.notes:string/delete_remind_time_message = 0x7f0a000c net.micode.notes:dimen/text_font_size_super = 0x7f030004 -net.micode.notes:drawable/selected = 0x7f040036 +net.micode.notes:drawable/selected = 0x7f040038 net.micode.notes:plurals/search_results_title = 0x7f080000 -net.micode.notes:menu/sub_folder = 0x7f070006 +net.micode.notes:menu/sub_folder = 0x7f070008 +net.micode.notes:menu/private_folder_options = 0x7f070007 net.micode.notes:menu/note_edit = 0x7f070002 net.micode.notes:layout/note_list = 0x7f060008 net.micode.notes:drawable/list_white_single = 0x7f040028 @@ -99,210 +98,225 @@ net.micode.notes:layout/note_item = 0x7f060007 net.micode.notes:xml/widget_2x_info = 0x7f0c0002 net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 net.micode.notes:layout/datetime_picker = 0x7f060002 -net.micode.notes:id/btn_new_note = 0x7f050004 -net.micode.notes:id/ll_font_Bright_blue = 0x7f050020 +net.micode.notes:id/btn_new_note = 0x7f050005 +net.micode.notes:id/ll_font_Bright_blue = 0x7f050021 net.micode.notes:layout/note_list_footer = 0x7f06000a -net.micode.notes:id/widget_text = 0x7f05004d -net.micode.notes:id/tv_title_bar = 0x7f05004b -net.micode.notes:drawable/widget_2x_blue = 0x7f040039 -net.micode.notes:id/tv_time = 0x7f050049 +net.micode.notes:id/widget_text = 0x7f050051 +net.micode.notes:id/tv_title_bar = 0x7f05004f +net.micode.notes:drawable/widget_2x_blue = 0x7f04003b +net.micode.notes:id/tv_time = 0x7f05004d net.micode.notes:color/Red = 0x7f020004 -net.micode.notes:id/tv_name = 0x7f050048 -net.micode.notes:id/selection_menu = 0x7f050043 -net.micode.notes:string/error_sdcard_export = 0x7f0a0010 -net.micode.notes:id/preference_sync_button = 0x7f050042 +net.micode.notes:id/tv_name = 0x7f05004c +net.micode.notes:id/selection_menu = 0x7f050047 +net.micode.notes:id/menu_list_mode = 0x7f050031 +net.micode.notes:id/private_folder = 0x7f050046 +net.micode.notes:string/error_sdcard_export = 0x7f0a0011 +net.micode.notes:id/preference_sync_button = 0x7f050045 net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 -net.micode.notes:drawable/title_alert = 0x7f040037 -net.micode.notes:id/note_title = 0x7f05003f -net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0052 -net.micode.notes:id/note_edit_view = 0x7f05003d -net.micode.notes:id/navigation_bar = 0x7f05003a -net.micode.notes:string/app_widget4x4 = 0x7f0a0006 +net.micode.notes:drawable/title_alert = 0x7f040039 +net.micode.notes:id/note_title = 0x7f050042 +net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0056 +net.micode.notes:id/note_edit_view = 0x7f050040 +net.micode.notes:id/navigation_bar = 0x7f05003d +net.micode.notes:id/move_to_root = 0x7f05003c +net.micode.notes:string/sync_progress_syncing = 0x7f0a0067 +net.micode.notes:id/move_to_private = 0x7f05003b net.micode.notes:drawable/font_normal = 0x7f040012 -net.micode.notes:id/minute = 0x7f050038 +net.micode.notes:id/minute = 0x7f050039 net.micode.notes:drawable/font_super = 0x7f040015 -net.micode.notes:id/menu_sync = 0x7f050037 -net.micode.notes:id/menu_share = 0x7f050036 -net.micode.notes:id/menu_setting = 0x7f050035 -net.micode.notes:string/widget_under_visit_mode = 0x7f0a0068 -net.micode.notes:id/menu_send_to_desktop = 0x7f050034 -net.micode.notes:id/menu_search = 0x7f050033 +net.micode.notes:id/menu_sync = 0x7f050038 +net.micode.notes:id/menu_share = 0x7f050037 +net.micode.notes:id/menu_setting = 0x7f050036 +net.micode.notes:string/widget_under_visit_mode = 0x7f0a006d +net.micode.notes:id/backToRoot = 0x7f050004 +net.micode.notes:id/menu_send_to_desktop = 0x7f050035 +net.micode.notes:id/menu_search = 0x7f050034 net.micode.notes:drawable/list_green_down = 0x7f04001e -net.micode.notes:id/menu_new_note = 0x7f050032 -net.micode.notes:id/menu_new_folder = 0x7f050031 -net.micode.notes:id/menu_list_mode = 0x7f050030 -net.micode.notes:id/iv_medium_select = 0x7f05001c -net.micode.notes:id/menu_export_text = 0x7f05002d +net.micode.notes:id/menu_new_note = 0x7f050033 +net.micode.notes:id/menu_new_folder = 0x7f050032 +net.micode.notes:id/iv_medium_select = 0x7f05001d +net.micode.notes:id/menu_export_text = 0x7f05002e +net.micode.notes:string/menu_folder_view = 0x7f0a0029 +net.micode.notes:string/change_txt_color = 0x7f0a000a +net.micode.notes:id/menu_delete = 0x7f05002c net.micode.notes:drawable/edit_blue = 0x7f040006 -net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050041 -net.micode.notes:string/menu_font_size = 0x7f0a002b -net.micode.notes:string/menu_change_font_color = 0x7f0a0021 -net.micode.notes:string/menu_alert = 0x7f0a0020 +net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050044 +net.micode.notes:string/menu_font_size = 0x7f0a002c +net.micode.notes:string/menu_change_font_color = 0x7f0a0022 +net.micode.notes:string/menu_alert = 0x7f0a0021 net.micode.notes:drawable/edit_title_yellow = 0x7f04000d -net.micode.notes:id/ll_font_color_selector = 0x7f050021 -net.micode.notes:id/menu_alert = 0x7f050029 -net.micode.notes:string/success_sync_account = 0x7f0a005f -net.micode.notes:id/ll_font_super = 0x7f050028 -net.micode.notes:id/ll_font_small = 0x7f050027 +net.micode.notes:id/ll_font_color_selector = 0x7f050022 +net.micode.notes:id/menu_alert = 0x7f05002a +net.micode.notes:string/success_sync_account = 0x7f0a0064 +net.micode.notes:id/ll_font_super = 0x7f050029 +net.micode.notes:id/ll_font_small = 0x7f050028 net.micode.notes:menu/call_record_folder = 0x7f070001 -net.micode.notes:id/ll_font_normal = 0x7f050025 -net.micode.notes:id/ll_font_large = 0x7f050024 -net.micode.notes:id/note_bg_color_selector = 0x7f05003b -net.micode.notes:drawable/search_result = 0x7f040035 -net.micode.notes:id/iv_super_select = 0x7f05001f +net.micode.notes:id/ll_font_normal = 0x7f050026 +net.micode.notes:id/ll_font_large = 0x7f050025 +net.micode.notes:id/note_bg_color_selector = 0x7f05003e +net.micode.notes:drawable/search_result = 0x7f040037 +net.micode.notes:id/iv_super_select = 0x7f050020 net.micode.notes:layout/note_edit = 0x7f060005 -net.micode.notes:id/notes_list = 0x7f050040 -net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0011 +net.micode.notes:id/notes_list = 0x7f050043 +net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0012 net.micode.notes:drawable/font_color_green = 0x7f040010 -net.micode.notes:id/iv_red_select = 0x7f05001d -net.micode.notes:drawable/new_note = 0x7f040030 -net.micode.notes:id/sv_note_edit = 0x7f050044 -net.micode.notes:id/iv_green_select = 0x7f05001a +net.micode.notes:id/iv_red_select = 0x7f05001e +net.micode.notes:drawable/new_note = 0x7f040032 +net.micode.notes:id/sv_note_edit = 0x7f050048 +net.micode.notes:id/iv_green_select = 0x7f05001b net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 net.micode.notes:color/secondary_text_dark = 0x7f020007 -net.micode.notes:id/move = 0x7f050039 -net.micode.notes:id/iv_bg_yellow_select = 0x7f050018 +net.micode.notes:id/move = 0x7f05003a +net.micode.notes:id/iv_bg_yellow_select = 0x7f050019 net.micode.notes:menu/call_note_edit = 0x7f070000 -net.micode.notes:drawable/new_note_pressed = 0x7f040032 -net.micode.notes:id/iv_bg_blue = 0x7f05000f +net.micode.notes:drawable/new_note_pressed = 0x7f040034 +net.micode.notes:id/iv_bg_blue = 0x7f050010 net.micode.notes:layout/settings_header = 0x7f06000b -net.micode.notes:id/iv_default_select = 0x7f050019 -net.micode.notes:id/iv_bg_yellow = 0x7f050017 -net.micode.notes:string/error_sync_cancelled = 0x7f0a0012 -net.micode.notes:id/iv_bg_white_select = 0x7f050016 -net.micode.notes:id/iv_bg_white = 0x7f050015 -net.micode.notes:string/menu_font_large = 0x7f0a0029 -net.micode.notes:drawable/widget_4x_blue = 0x7f04003e -net.micode.notes:id/iv_large_select = 0x7f05001b -net.micode.notes:id/widget_bg_image = 0x7f05004c -net.micode.notes:id/iv_bg_green_select = 0x7f050012 +net.micode.notes:id/iv_default_select = 0x7f05001a +net.micode.notes:id/iv_bg_yellow = 0x7f050018 +net.micode.notes:string/error_sync_cancelled = 0x7f0a0013 +net.micode.notes:id/iv_bg_white_select = 0x7f050017 +net.micode.notes:id/iv_bg_white = 0x7f050016 +net.micode.notes:string/menu_font_large = 0x7f0a002a +net.micode.notes:drawable/widget_4x_blue = 0x7f040040 +net.micode.notes:menu/private_folder_menu = 0x7f070006 +net.micode.notes:id/iv_large_select = 0x7f05001c +net.micode.notes:id/widget_bg_image = 0x7f050050 +net.micode.notes:id/iv_bg_green_select = 0x7f050013 net.micode.notes:id/amPm = 0x7f050003 -net.micode.notes:id/iv_bg_green = 0x7f050011 -net.micode.notes:id/et_edit_text = 0x7f050009 -net.micode.notes:id/et_foler_name = 0x7f05000a +net.micode.notes:id/iv_bg_green = 0x7f050012 +net.micode.notes:id/iv_small_select = 0x7f05001f +net.micode.notes:menu/note_list_options = 0x7f070005 +net.micode.notes:style/NoteTheme = 0x7f0b0003 +net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040035 +net.micode.notes:id/hour = 0x7f05000d +net.micode.notes:id/menu_insert_img = 0x7f050030 +net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a0053 +net.micode.notes:id/font_size_selector = 0x7f05000c +net.micode.notes:id/et_edit_text = 0x7f05000a +net.micode.notes:id/et_foler_name = 0x7f05000b net.micode.notes:drawable/edit_green = 0x7f040007 net.micode.notes:layout/widget_4x = 0x7f06000d -net.micode.notes:string/search = 0x7f0a0059 -net.micode.notes:id/cb_edit_item = 0x7f050006 -net.micode.notes:id/btn_set_bg_color = 0x7f050005 +net.micode.notes:string/search = 0x7f0a005e +net.micode.notes:id/cb_edit_item = 0x7f050007 +net.micode.notes:id/btn_set_bg_color = 0x7f050006 net.micode.notes:id/account_dialog_subtitle = 0x7f050000 -net.micode.notes:id/iv_bg_blue_select = 0x7f050010 -net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004d -net.micode.notes:drawable/menu_move = 0x7f04002f -net.micode.notes:drawable/widget_4x_white = 0x7f040041 +net.micode.notes:id/iv_bg_blue_select = 0x7f050011 +net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a0051 +net.micode.notes:drawable/menu_move = 0x7f040030 +net.micode.notes:drawable/widget_4x_white = 0x7f040043 net.micode.notes:menu/note_list = 0x7f070003 net.micode.notes:id/account_dialog_title = 0x7f050001 -net.micode.notes:drawable/widget_4x_green = 0x7f04003f -net.micode.notes:style/NoteTheme = 0x7f0b0003 -net.micode.notes:id/hour = 0x7f05000c -net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040033 -net.micode.notes:drawable/widget_2x_yellow = 0x7f04003d +net.micode.notes:drawable/widget_4x_green = 0x7f040041 +net.micode.notes:drawable/widget_2x_yellow = 0x7f04003f net.micode.notes:dimen/text_font_size_large = 0x7f030000 -net.micode.notes:id/tv_alert_date = 0x7f050045 -net.micode.notes:drawable/widget_2x_red = 0x7f04003b +net.micode.notes:id/tv_alert_date = 0x7f050049 +net.micode.notes:drawable/widget_2x_red = 0x7f04003d net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a -net.micode.notes:id/delete = 0x7f050008 -net.micode.notes:drawable/widget_2x_green = 0x7f04003a -net.micode.notes:drawable/title_bar_bg = 0x7f040038 -net.micode.notes:id/iv_bg_red = 0x7f050013 -net.micode.notes:drawable/notification = 0x7f040034 +net.micode.notes:id/delete = 0x7f050009 +net.micode.notes:drawable/widget_2x_green = 0x7f04003c +net.micode.notes:drawable/title_bar_bg = 0x7f04003a +net.micode.notes:id/iv_bg_red = 0x7f050014 +net.micode.notes:drawable/notification = 0x7f040036 net.micode.notes:drawable/list_green_single = 0x7f040020 net.micode.notes:string/alert_message_delete_note = 0x7f0a0001 -net.micode.notes:id/tv_modified_date = 0x7f050047 +net.micode.notes:id/tv_modified_date = 0x7f05004b net.micode.notes:drawable/list_blue_middle = 0x7f040019 -net.micode.notes:id/iv_small_select = 0x7f05001e -net.micode.notes:menu/note_list_options = 0x7f070005 net.micode.notes:xml/searchable = 0x7f0c0001 -net.micode.notes:string/menu_folder_delete = 0x7f0a0027 -net.micode.notes:id/ll_font_green = 0x7f050023 +net.micode.notes:string/menu_folder_delete = 0x7f0a0028 +net.micode.notes:id/ll_font_green = 0x7f050024 net.micode.notes:drawable/dropdown_icon = 0x7f040005 -net.micode.notes:id/date = 0x7f050007 +net.micode.notes:string/button_delete = 0x7f0a0008 +net.micode.notes:drawable/new_note_normal = 0x7f040033 +net.micode.notes:drawable/menu_visible = 0x7f040031 +net.micode.notes:id/date = 0x7f050008 net.micode.notes:color/Bright_Blue = 0x7f020001 net.micode.notes:color/Yellow = 0x7f020005 net.micode.notes:drawable/list_yellow_single = 0x7f04002c +net.micode.notes:string/app_widget4x4 = 0x7f0a0006 +net.micode.notes:drawable/menu_invisible = 0x7f04002f net.micode.notes:drawable/list_red_up = 0x7f040025 -net.micode.notes:drawable/widget_4x_yellow = 0x7f040042 +net.micode.notes:drawable/widget_4x_yellow = 0x7f040044 net.micode.notes:drawable/list_yellow_middle = 0x7f04002b -net.micode.notes:id/tv_folder_name = 0x7f050046 +net.micode.notes:id/tv_folder_name = 0x7f05004a net.micode.notes:drawable/list_yellow_down = 0x7f04002a net.micode.notes:drawable/clock = 0x7f040003 net.micode.notes:drawable/list_white_up = 0x7f040029 net.micode.notes:layout/dialog_edit_text = 0x7f060003 -net.micode.notes:string/preferences_account_title = 0x7f0a0048 +net.micode.notes:string/preferences_account_title = 0x7f0a004c net.micode.notes:drawable/edit_white = 0x7f04000e net.micode.notes:drawable/list_white_middle = 0x7f040027 -net.micode.notes:id/menu_change_font_color = 0x7f05002a +net.micode.notes:id/menu_change_font_color = 0x7f05002b net.micode.notes:color/user_query_highlight = 0x7f020008 -net.micode.notes:id/iv_Bright_blue_select = 0x7f05000d +net.micode.notes:id/iv_Bright_blue_select = 0x7f05000e net.micode.notes:drawable/list_white_down = 0x7f040026 -net.micode.notes:layout/folder_list_item = 0x7f060004 net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009 net.micode.notes:drawable/list_blue_down = 0x7f040018 net.micode.notes:drawable/list_red_middle = 0x7f040023 net.micode.notes:drawable/list_red_down = 0x7f040022 net.micode.notes:id/action_select_all = 0x7f050002 net.micode.notes:drawable/list_green_middle = 0x7f04001f -net.micode.notes:string/menu_send_to_desktop = 0x7f0a0038 +net.micode.notes:string/menu_send_to_desktop = 0x7f0a003b net.micode.notes:drawable/list_red_single = 0x7f040024 -net.micode.notes:string/preferences_add_account = 0x7f0a0049 +net.micode.notes:string/preferences_add_account = 0x7f0a004d net.micode.notes:drawable/bg_btn_set_color = 0x7f040000 -net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a004a +net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a004e net.micode.notes:layout/widget_2x = 0x7f06000c net.micode.notes:drawable/list_footer_bg = 0x7f04001d net.micode.notes:string/alert_title_delete = 0x7f0a0003 net.micode.notes:drawable/edit_title_green = 0x7f04000a net.micode.notes:drawable/icon_app = 0x7f040016 net.micode.notes:drawable/font_small = 0x7f040014 -net.micode.notes:string/sync_progress_login = 0x7f0a0061 +net.micode.notes:string/sync_progress_login = 0x7f0a0066 net.micode.notes:array/menu_share_ways = 0x7f010001 -net.micode.notes:drawable/widget_2x_white = 0x7f04003c +net.micode.notes:drawable/widget_2x_white = 0x7f04003e +net.micode.notes:layout/folder_list_item = 0x7f060004 net.micode.notes:layout/add_account_text = 0x7f060001 net.micode.notes:style/TextColorRed = 0x7f0b000e -net.micode.notes:id/tv_title = 0x7f05004a +net.micode.notes:id/tv_title = 0x7f05004e net.micode.notes:color/primary_text_dark = 0x7f020006 net.micode.notes:drawable/font_size_selector_bg = 0x7f040013 net.micode.notes:drawable/list_blue_up = 0x7f04001b -net.micode.notes:drawable/widget_4x_red = 0x7f040040 -net.micode.notes:string/search_setting_description = 0x7f0a005c +net.micode.notes:drawable/widget_4x_red = 0x7f040042 +net.micode.notes:string/call_record_folder_name = 0x7f0a0009 +net.micode.notes:drawable/list_green_up = 0x7f040021 +net.micode.notes:string/search_setting_description = 0x7f0a0061 net.micode.notes:drawable/list_blue_single = 0x7f04001a net.micode.notes:drawable/font_large = 0x7f040011 net.micode.notes:drawable/delete = 0x7f040004 net.micode.notes:drawable/edit_yellow = 0x7f04000f -net.micode.notes:id/note_item = 0x7f05003e -net.micode.notes:id/ll_font_default = 0x7f050022 +net.micode.notes:id/note_item = 0x7f050041 +net.micode.notes:id/ll_font_default = 0x7f050023 net.micode.notes:color/Blue = 0x7f020000 net.micode.notes:drawable/edit_title_white = 0x7f04000c -net.micode.notes:id/note_edit_list = 0x7f05003c -net.micode.notes:id/iv_alert_icon = 0x7f05000e +net.micode.notes:id/note_edit_list = 0x7f05003f +net.micode.notes:id/iv_alert_icon = 0x7f05000f net.micode.notes:drawable/edit_red = 0x7f040008 net.micode.notes:drawable/edit_title_red = 0x7f04000b -net.micode.notes:string/menu_delete = 0x7f0a0023 +net.micode.notes:string/menu_delete = 0x7f0a0024 net.micode.notes:drawable/list_folder = 0x7f04001c net.micode.notes:drawable/call_record = 0x7f040002 net.micode.notes:drawable/edit_title_blue = 0x7f040009 -net.micode.notes:id/iv_bg_red_select = 0x7f050014 -net.micode.notes:string/error_sync_internal = 0x7f0a0013 +net.micode.notes:id/iv_bg_red_select = 0x7f050015 +net.micode.notes:string/error_sync_internal = 0x7f0a0014 net.micode.notes:drawable/menu_delete = 0x7f04002e -net.micode.notes:string/menu_folder_change_name = 0x7f0a0026 +net.micode.notes:string/menu_folder_change_name = 0x7f0a0027 net.micode.notes:color/Default = 0x7f020002 -net.micode.notes:string/search_hint = 0x7f0a005a -net.micode.notes:id/menu_font_size = 0x7f05002e +net.micode.notes:string/search_hint = 0x7f0a005f +net.micode.notes:id/menu_font_size = 0x7f05002f net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001 net.micode.notes:dimen/text_font_size_small = 0x7f030003 net.micode.notes:dimen/text_font_size_normal = 0x7f030002 net.micode.notes:drawable/list_background = 0x7f040017 net.micode.notes:string/app_name = 0x7f0a0004 net.micode.notes:menu/note_list_dropdown = 0x7f070004 -net.micode.notes:string/menu_setting = 0x7f0a0039 +net.micode.notes:string/menu_setting = 0x7f0a003c net.micode.notes:dimen/text_font_size_medium = 0x7f030001 -net.micode.notes:string/format_datetime_mdhm = 0x7f0a001a +net.micode.notes:string/format_datetime_mdhm = 0x7f0a001b net.micode.notes:color/Green = 0x7f020003 net.micode.notes:drawable/list_yellow_up = 0x7f04002d -net.micode.notes:id/menu_insert_img = 0x7f05002f -net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004f -net.micode.notes:id/font_size_selector = 0x7f05000b net.micode.notes:layout/note_edit_list_item = 0x7f060006 net.micode.notes:layout/account_dialog_title = 0x7f060000 -net.micode.notes:id/ll_font_red = 0x7f050026 +net.micode.notes:id/ll_font_red = 0x7f050027 net.micode.notes:array/format_for_exported_note = 0x7f010000 -net.micode.notes:id/menu_delete_remind = 0x7f05002c +net.micode.notes:id/menu_delete_remind = 0x7f05002d diff --git a/app/build/outputs/logs/manifest-merger-debug-report.txt b/app/build/outputs/logs/manifest-merger-debug-report.txt index 2b20b1f..93ee1ee 100644 --- a/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,235 +1,235 @@ -- Merging decision tree log --- manifest -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:1-150:12 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\MINOTES\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\MINOTES\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\MINOTES\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\MINOTES\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\MINOTES\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\MINOTES\app\src\main\AndroidManifest.xml:18:1-150:12 package - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:19:5-31 - INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml - INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:19:5-31 + INJECTED from D:\MINOTES\app\src\main\AndroidManifest.xml + INJECTED from D:\MINOTES\app\src\main\AndroidManifest.xml android:versionName - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:21:5-30 - INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml - INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:21:5-30 + INJECTED from D:\MINOTES\app\src\main\AndroidManifest.xml + INJECTED from D:\MINOTES\app\src\main\AndroidManifest.xml xmlns:android - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:20:5-28 - INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml - INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:20:5-28 + INJECTED from D:\MINOTES\app\src\main\AndroidManifest.xml + INJECTED from D:\MINOTES\app\src\main\AndroidManifest.xml uses-sdk -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\MINOTES\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\MINOTES\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\MINOTES\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\MINOTES\app\src\main\AndroidManifest.xml:23:5-44 android:targetSdkVersion - INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44 - INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml + INJECTED from D:\MINOTES\app\src\main\AndroidManifest.xml + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:23:5-44 + INJECTED from D:\MINOTES\app\src\main\AndroidManifest.xml android:minSdkVersion - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:15-41 - INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml - INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:23:15-41 + INJECTED from D:\MINOTES\app\src\main\AndroidManifest.xml + INJECTED from D:\MINOTES\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:25:5-81 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:25:5-81 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:25:22-78 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:25:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:26:5-88 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:26:5-88 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:26:22-85 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:26:22-85 uses-permission#android.permission.INTERNET -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:27:5-67 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:27:5-67 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:27:22-64 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:27:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:28:5-72 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:28:5-72 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:28:22-69 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:28:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:29:5-74 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:29:5-74 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:29:22-71 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:29:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:30:5-80 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:30:5-80 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:30:22-77 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:30:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:31:5-71 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:31:5-71 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:31:22-68 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:31:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:32:5-74 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:32:5-74 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:32:22-71 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:32:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:33:5-81 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:33:5-81 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:33:22-78 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:33:22-78 application -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:35:5-149:19 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:35:5-149:19 android:label - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:37:9-41 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:37:9-41 android:icon - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:36:9-42 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:36:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:38:9-51:20 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:38:9-51:20 android:label - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:41:13-45 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:41:13-45 android:launchMode - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:42:13-43 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:42:13-43 android:windowSoftInputMode - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:45:13-52 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:45:13-52 android:uiOptions - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:44:13-57 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:44:13-57 android:configChanges - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:40:13-74 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:40:13-74 android:theme - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:43:13-45 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:43:13-45 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:39:13-49 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:39:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:47:13-50:29 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:47:13-50:29 action#android.intent.action.MAIN -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:48:17-69 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:48:17-69 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:48:25-66 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:48:25-66 category#android.intent.category.LAUNCHER -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:49:17-77 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:49:17-77 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:49:27-74 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:49:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:53:9-81:20 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:53:9-81:20 android:launchMode - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:56:13-43 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:56:13-43 android:configChanges - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:55:13-74 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:55:13-74 android:theme - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:57:13-45 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:57:13-45 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:54:13-48 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:54:13-48 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:59:13-64:29 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:59:13-64:29 action#android.intent.action.VIEW -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:60:17-69 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:60:17-69 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:60:25-66 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:60:25-66 category#android.intent.category.DEFAULT -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:17-76 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:61:17-76 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:27-73 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:61:27-73 data -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:17-78 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:62:17-78 android:mimeType - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:23-75 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:62:23-75 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:66:13-71:29 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:66:13-71:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:67:17-79 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:67:17-79 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:67:25-76 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:67:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:73:13-76:29 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:73:13-76:29 action#android.intent.action.SEARCH -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:74:17-71 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:74:17-71 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:74:25-68 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:74:25-68 meta-data#android.app.searchable -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:78:13-80:54 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:78:13-80:54 android:resource - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:80:17-51 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:80:17-51 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:79:17-54 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:79:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:83:9-86:43 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:83:9-86:43 android:authorities - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:85:13-47 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:85:13-47 android:multiprocess - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:86:13-40 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:86:13-40 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:84:13-63 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:84:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:88:9-100:20 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:88:9-100:20 android:label - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:90:13-50 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:90:13-50 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:89:13-57 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:89:13-57 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:91:13-95:29 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:91:13-95:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:92:17-84 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:92:17-84 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:92:25-81 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:92:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:93:17-85 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:93:17-85 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:93:25-82 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:93:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:94:17-85 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:94:17-85 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:94:25-82 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:94:25-82 meta-data#android.appwidget.provider -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:97:13-99:58 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:97:13-99:58 android:resource - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:99:17-55 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:99:17-55 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:98:17-58 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:98:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:101:9-114:20 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:101:9-114:20 android:label - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:103:13-50 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:103:13-50 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:102:13-57 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:102:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:116:9-120:20 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:116:9-120:20 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:116:19-55 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:116:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:117:13-119:29 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:117:13-119:29 action#android.intent.action.BOOT_COMPLETED -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:118:17-79 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:118:17-79 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:118:25-76 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:118:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:122:9-125:20 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:122:9-125:20 android:process - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:124:13-38 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:124:13-38 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:123:13-61 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:123:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:127:9-132:20 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:127:9-132:20 android:label - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:129:13-45 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:129:13-45 android:launchMode - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:130:13-48 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:130:13-48 android:theme - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:131:13-75 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:131:13-75 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:128:13-50 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:128:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:134:9-139:20 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:134:9-139:20 android:label - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:136:13-54 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:136:13-54 android:launchMode - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:137:13-43 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:137:13-43 android:theme - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:138:13-60 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:138:13-60 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:135:13-71 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:135:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:141:9-144:19 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:141:9-144:19 android:exported - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:143:13-37 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:143:13-37 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:142:13-74 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:142:13-74 meta-data#android.app.default_searchable -ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:146:9-148:52 +ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:146:9-148:52 android:value - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:148:13-49 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:148:13-49 android:name - ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:147:13-58 + ADDED from D:\MINOTES\app\src\main\AndroidManifest.xml:147:13-58 diff --git a/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index cd844ab..c282581 100644 Binary files a/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e5c7d47..84d2390 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,7 +20,7 @@ android:versionCode="1" android:versionName="0.1" > - + diff --git a/app/src/main/java/net/micode/notes/data/Notes.java b/app/src/main/java/net/micode/notes/data/Notes.java index f240604..e15c4f7 100644 --- a/app/src/main/java/net/micode/notes/data/Notes.java +++ b/app/src/main/java/net/micode/notes/data/Notes.java @@ -34,6 +34,7 @@ public class Notes { public static final int ID_TEMPARAY_FOLDER = -1; public static final int ID_CALL_RECORD_FOLDER = -2; public static final int ID_TRASH_FOLER = -3; + public static final int ID_PRIVATE_FOLDER = -4; public static final String INTENT_EXTRA_ALERT_DATE = "net.micode.notes.alert_date"; public static final String INTENT_EXTRA_BACKGROUND_ID = "net.micode.notes.background_color_id"; diff --git a/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java index ffe5d57..83a1114 100644 --- a/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java +++ b/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java @@ -43,168 +43,180 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { private static NotesDatabaseHelper mInstance; private static final String CREATE_NOTE_TABLE_SQL = - "CREATE TABLE " + TABLE.NOTE + "(" + - NoteColumns.ID + " INTEGER PRIMARY KEY," + - NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," + - NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," + - NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + - NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" + - ")"; + "CREATE TABLE " + TABLE.NOTE + "(" + + NoteColumns.ID + " INTEGER PRIMARY KEY," + + NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + + NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + + NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," + + NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," + + NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" + + ")"; private static final String CREATE_DATA_TABLE_SQL = - "CREATE TABLE " + TABLE.DATA + "(" + - DataColumns.ID + " INTEGER PRIMARY KEY," + - DataColumns.MIME_TYPE + " TEXT NOT NULL," + - DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," + - DataColumns.DATA1 + " INTEGER," + - DataColumns.DATA2 + " INTEGER," + - DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," + - DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," + - DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" + - ")"; + "CREATE TABLE " + TABLE.DATA + "(" + + DataColumns.ID + " INTEGER PRIMARY KEY," + + DataColumns.MIME_TYPE + " TEXT NOT NULL," + + DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + + NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + + DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," + + DataColumns.DATA1 + " INTEGER," + + DataColumns.DATA2 + " INTEGER," + + DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," + + DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," + + DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" + + ")"; private static final String CREATE_DATA_NOTE_ID_INDEX_SQL = - "CREATE INDEX IF NOT EXISTS note_id_index ON " + - TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; + "CREATE INDEX IF NOT EXISTS note_id_index ON " + + TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; /** * Increase folder's note count when move note to the folder */ private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = - "CREATE TRIGGER increase_folder_count_on_update "+ - " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + - " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + - " END"; + "CREATE TRIGGER increase_folder_count_on_update " + + " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + + " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + + " END"; /** * Decrease folder's note count when move note from folder */ private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = - "CREATE TRIGGER decrease_folder_count_on_update " + - " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + - " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + - " AND " + NoteColumns.NOTES_COUNT + ">0" + ";" + - " END"; + "CREATE TRIGGER decrease_folder_count_on_update " + + " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + + " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + + " AND " + NoteColumns.NOTES_COUNT + ">0" + ";" + + " END"; /** * Increase folder's note count when insert new note to the folder */ private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER = - "CREATE TRIGGER increase_folder_count_on_insert " + - " AFTER INSERT ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + - " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + - " END"; + "CREATE TRIGGER increase_folder_count_on_insert " + + " AFTER INSERT ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + + " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + + " END"; /** * Decrease folder's note count when delete note from the folder */ private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER = - "CREATE TRIGGER decrease_folder_count_on_delete " + - " AFTER DELETE ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + - " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + - " AND " + NoteColumns.NOTES_COUNT + ">0;" + - " END"; + "CREATE TRIGGER decrease_folder_count_on_delete " + + " AFTER DELETE ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + + " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + + " AND " + NoteColumns.NOTES_COUNT + ">0;" + + " END"; /** * Update note's content when insert data with type {@link DataConstants#NOTE} */ private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER = - "CREATE TRIGGER update_note_content_on_insert " + - " AFTER INSERT ON " + TABLE.DATA + - " WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + - " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + - " END"; + "CREATE TRIGGER update_note_content_on_insert " + + " AFTER INSERT ON " + TABLE.DATA + + " WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + + " BEGIN" + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + + " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + + " END"; /** * Update note's content when data with {@link DataConstants#NOTE} type has changed */ private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER = - "CREATE TRIGGER update_note_content_on_update " + - " AFTER UPDATE ON " + TABLE.DATA + - " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + - " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + - " END"; + "CREATE TRIGGER update_note_content_on_update " + + " AFTER UPDATE ON " + TABLE.DATA + + " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + + " BEGIN" + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + + " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + + " END"; /** * Update note's content when data with {@link DataConstants#NOTE} type has deleted */ private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER = - "CREATE TRIGGER update_note_content_on_delete " + - " AFTER delete ON " + TABLE.DATA + - " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.SNIPPET + "=''" + - " WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" + - " END"; + "CREATE TRIGGER update_note_content_on_delete " + + " AFTER delete ON " + TABLE.DATA + + " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + + " BEGIN" + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.SNIPPET + "=''" + + " WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" + + " END"; /** * Delete datas belong to note which has been deleted */ private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER = - "CREATE TRIGGER delete_data_on_delete " + - " AFTER DELETE ON " + TABLE.NOTE + - " BEGIN" + - " DELETE FROM " + TABLE.DATA + - " WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" + - " END"; + "CREATE TRIGGER delete_data_on_delete " + + " AFTER DELETE ON " + TABLE.NOTE + + " BEGIN" + + " DELETE FROM " + TABLE.DATA + + " WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" + + " END"; /** * Delete notes belong to folder which has been deleted */ private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER = - "CREATE TRIGGER folder_delete_notes_on_delete " + - " AFTER DELETE ON " + TABLE.NOTE + - " BEGIN" + - " DELETE FROM " + TABLE.NOTE + - " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + - " END"; + "CREATE TRIGGER folder_delete_notes_on_delete " + + " AFTER DELETE ON " + TABLE.NOTE + + " BEGIN" + + " DELETE FROM " + TABLE.NOTE + + " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + + " END"; /** * Move notes belong to folder which has been moved to trash folder */ private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER = - "CREATE TRIGGER folder_move_notes_on_trash " + - " AFTER UPDATE ON " + TABLE.NOTE + - " WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + - " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + - " END"; + "CREATE TRIGGER folder_move_notes_on_trash " + + " AFTER UPDATE ON " + TABLE.NOTE + + " WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + + " BEGIN" + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + + " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + + " END"; + /** + * Move notes belong to folder which has been moved to private folder + */ + private static final String FOLDER_MOVE_NOTES_ON_PRIVATE_TRIGGER = + "CREATE TRIGGER folder_move_notes_on_private " + + " AFTER UPDATE ON " + TABLE.NOTE + + " WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_PRIVATE_FOLDER + + " BEGIN" + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_PRIVATE_FOLDER + + " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + + " END"; public NotesDatabaseHelper(Context context) { super(context, DB_NAME, null, DB_VERSION); @@ -233,11 +245,16 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER); db.execSQL(FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER); db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER); + db.execSQL(FOLDER_MOVE_NOTES_ON_PRIVATE_TRIGGER); } private void createSystemFolder(SQLiteDatabase db) { ContentValues values = new ContentValues(); + values.put(NoteColumns.ID, Notes.ID_PRIVATE_FOLDER); + values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); + db.insert(TABLE.NOTE, null, values); + /** * call record foler for call notes */ @@ -268,6 +285,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER); values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); db.insert(TABLE.NOTE, null, values); + /** + * create private folder + */ + values.clear(); + values.put(NoteColumns.ID, Notes.ID_PRIVATE_FOLDER); + values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); + db.insert(TABLE.NOTE, null, values); } public void createDataTable(SQLiteDatabase db) { @@ -281,6 +305,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert"); db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update"); db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_delete"); + db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_private"); db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER); db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER); @@ -353,6 +378,12 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER); values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); db.insert(TABLE.NOTE, null, values); + + // add a private system folder + ContentValues values1 = new ContentValues(); + values1.put(NoteColumns.ID, Notes.ID_PRIVATE_FOLDER); + values1.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); + db.insert(TABLE.NOTE, null, values); } private void upgradeToV4(SQLiteDatabase db) { diff --git a/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index e5ec2e4..d72c96c 100644 --- a/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -19,6 +19,7 @@ package net.micode.notes.ui; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; +import android.app.KeyguardManager; import android.appwidget.AppWidgetManager; import android.content.AsyncQueryHandler; import android.content.ContentResolver; @@ -29,6 +30,7 @@ import android.content.Intent; import android.content.SharedPreferences; import android.database.Cursor; import android.os.AsyncTask; +import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.text.Editable; @@ -60,6 +62,8 @@ import android.widget.PopupMenu; import android.widget.TextView; import android.widget.Toast; +import androidx.annotation.RequiresApi; + import net.micode.notes.R; import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.NoteColumns; @@ -81,7 +85,7 @@ import java.util.HashSet; public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener { private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0; - private static final int FOLDER_LIST_QUERY_TOKEN = 1; + private static final int FOLDER_LIST_QUERY_TOKEN = 1; private static final int MENU_FOLDER_DELETE = 0; @@ -92,7 +96,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private static final String PREFERENCE_ADD_INTRODUCTION = "net.micode.notes.introduction"; private enum ListEditState { - NOTE_LIST, SUB_FOLDER, CALL_RECORD_FOLDER + NOTE_LIST, SUB_FOLDER, CALL_RECORD_FOLDER, PRIVATE_FOLDER } private ListEditState mState; @@ -133,7 +137,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt + NoteColumns.NOTES_COUNT + ">0)"; private final static int REQUEST_CODE_OPEN_NODE = 102; - private final static int REQUEST_CODE_NEW_NODE = 103; + private final static int REQUEST_CODE_NEW_NODE = 103; // 在Activity创建时调用 @Override @@ -156,10 +160,19 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt if (resultCode == RESULT_OK && (requestCode == REQUEST_CODE_OPEN_NODE || requestCode == REQUEST_CODE_NEW_NODE)) { mNotesListAdapter.changeCursor(null); + } else if (requestCode == 1101) { + if (resultCode == RESULT_OK) { + callPrivateFolder(); + } else { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + showScreenLockPwd(); + } + } } else { // 否则，调用父类的方法处理结果 super.onActivityResult(requestCode, resultCode, data); } + } // 从raw资源文件中读取应用的介绍信息，并保存为一个笔记 @@ -173,14 +186,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt InputStream in = null; try { // 从raw资源文件中打开介绍信息的输入流 - in = getResources().openRawResource(R.raw.introduction); + in = getResources().openRawResource(R.raw.introduction); if (in != null) { // 用于读取输入流 InputStreamReader isr = new InputStreamReader(in); // 用于缓冲输入流 BufferedReader br = new BufferedReader(isr); // 用于存储读取到的字符 - char [] buf = new char[1024]; + char[] buf = new char[1024]; int len = 0; // 循环读取输入流中的字符，直到结束 while ((len = br.read(buf)) > 0) { @@ -195,7 +208,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt e.printStackTrace(); return; } finally { - if(in != null) { + if (in != null) { try { // 关闭输入流 in.close(); @@ -276,14 +289,21 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private DropdownMenu mDropDownMenu; private ActionMode mActionMode; private MenuItem mMoveMenu; + private MenuItem mMoveToPrivate; + private MenuItem mMoveToRoot; + // 用户长按一个笔记时触发的，用于创建一个操作模式(ActionMode)， // 在这个模式下，用户可以对笔记进行一些操作，比如删除或移动 public boolean onCreateActionMode(ActionMode mode, Menu menu) { //从资源文件中加载菜单项 getMenuInflater().inflate(R.menu.note_list_options, menu); + menu.findItem(R.id.move_to_root).setOnMenuItemClickListener(this); + menu.findItem(R.id.move_to_private).setOnMenuItemClickListener(this); //找到删除菜单项，并设置点击监听器 menu.findItem(R.id.delete).setOnMenuItemClickListener(this); //找到移动菜单项，并保存为一个成员变量 + mMoveToPrivate = menu.findItem(R.id.move_to_private); + mMoveToRoot = menu.findItem(R.id.move_to_root); mMoveMenu = menu.findItem(R.id.move); //判断当前笔记是否属于通话记录文件夹，或者用户没有创建任何自定义文件夹， //如果是，则隐藏移动菜单项，否则显示移动菜单项，并设置点击监听器 @@ -294,6 +314,15 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt mMoveMenu.setVisible(true); mMoveMenu.setOnMenuItemClickListener(this); } + if (mFocusNoteDataItem.getParentId() == Notes.ID_PRIVATE_FOLDER) { + mMoveToPrivate.setVisible(false); + mMoveToRoot.setVisible(true); + mMoveToRoot.setOnMenuItemClickListener(this); + } else{ + mMoveToPrivate.setVisible(true); + mMoveToRoot.setVisible(false); + mMoveToPrivate.setOnMenuItemClickListener(this); + } //保存操作模式为一个成员变量 mActionMode = mode; //设置笔记列表适配器的选择模式为true，表示可以多选笔记 @@ -314,7 +343,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt R.menu.note_list_dropdown); //设置下拉菜单的点击监听器，当用户点击下拉菜单项时， // 根据当前的选择状态，全选或取消全选所有笔记，并更新菜单项的状态 - mDropDownMenu.setOnDropdownMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){ + mDropDownMenu.setOnDropdownMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { public boolean onMenuItemClick(MenuItem item) { mNotesListAdapter.selectAll(!mNotesListAdapter.isAllSelected()); updateMenu(); @@ -379,7 +408,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt // 在用户改变某个笔记的选择状态时调用，用于更新笔记列表适配器和菜单项的状态 public void onItemCheckedStateChanged(ActionMode mode, int position, long id, - boolean checked) { + boolean checked) { //设置笔记列表适配器中指定位置的笔记的选择状态 mNotesListAdapter.setCheckedItem(position, checked); //更新菜单项的状态和标题 @@ -404,15 +433,15 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt builder.setTitle(getString(R.string.alert_title_delete)); builder.setIcon(android.R.drawable.ic_dialog_alert); builder.setMessage(getString(R.string.alert_message_delete_notes, - mNotesListAdapter.getSelectedCount())); + mNotesListAdapter.getSelectedCount())); builder.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, - int which) { - //如果用户点击确定按钮，则调用批量删除的方法 - batchDelete(); - } - }); + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, + int which) { + //如果用户点击确定按钮，则调用批量删除的方法 + batchDelete(); + } + }); builder.setNegativeButton(android.R.string.cancel, null); //显示对话框 builder.show(); @@ -420,6 +449,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt case R.id.move: startQueryDestinationFolders(); break; + case R.id.move_to_private: + movToPrivate(); + break; + case R.id.move_to_root: + movToRoot(); + break; default: return false; } @@ -513,7 +548,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt return false; } - }; + } + + ; // 用来异步查询笔记列表 private void startAsyncNotesListQuery() { @@ -521,8 +558,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION : NORMAL_SELECTION; mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, - Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] { - String.valueOf(mCurrentFolderId) + Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[]{ + String.valueOf(mCurrentFolderId) }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); } @@ -664,6 +701,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt if (folderId == Notes.ID_ROOT_FOLDER) { Log.e(TAG, "Wrong folder id, should not happen " + folderId); return; + } else if (folderId == Notes.ID_PRIVATE_FOLDER) { + Log.e(TAG, "Wrong folder id, should not happen " + folderId); + return; } HashSet ids = new HashSet(); @@ -723,6 +763,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt // 显示标题栏 mTitleBar.setVisibility(View.VISIBLE); } + // 处理点击事件 public void onClick(View v) { switch (v.getId()) { @@ -793,7 +834,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt // 设置对话框的视图,并显示 final Dialog dialog = builder.setView(view).show(); // 根据ID找到正面按钮，然后将其转换为Button类型 - final Button positive = (Button)dialog.findViewById(android.R.id.button1); + final Button positive = (Button) dialog.findViewById(android.R.id.button1); // 设置positive按钮的点击事件 positive.setOnClickListener(new OnClickListener() { public void onClick(View v) { @@ -825,8 +866,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt values.put(NoteColumns.LOCAL_MODIFIED, 1); // 根据便签ID更新数据库中的数据 mContentResolver.update(Notes.CONTENT_NOTE_URI, values, NoteColumns.ID - + "=?", new String[] { - String.valueOf(mFocusNoteDataItem.getId()) + + "=?", new String[]{ + String.valueOf(mFocusNoteDataItem.getId()) }); } } else if (!TextUtils.isEmpty(name)) { @@ -882,6 +923,15 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt @Override public void onBackPressed() { switch (mState) { + case PRIVATE_FOLDER: + mCurrentFolderId = Notes.ID_ROOT_FOLDER; + mState = ListEditState.NOTE_LIST; + //开始异步查询笔记列表 + startAsyncNotesListQuery(); + //隐藏标题栏 + mTitleBar.setVisibility(View.GONE); + mAddNewNote.setVisibility(View.VISIBLE); + break; case SUB_FOLDER: //如果当前状态是子文件夹，那么返回到根文件夹 mCurrentFolderId = Notes.ID_ROOT_FOLDER; @@ -928,8 +978,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } //将小部件的id放入意图中 - intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] { - appWidgetId + intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[]{ + appWidgetId }); //发送广播更新小部件 @@ -1032,6 +1082,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt // 如果当前状态是通话记录文件夹 // 从call_record_folder.xml文件中加载菜单项 getMenuInflater().inflate(R.menu.call_record_folder, menu); + } else if (mState == ListEditState.PRIVATE_FOLDER) { + getMenuInflater().inflate(R.menu.private_folder_menu, menu); } else { // 如果当前状态不属于以上任何一种 // 打印错误日志，显示错误的状态 @@ -1095,6 +1147,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt // 调用onSearchRequested方法，启动搜索界面 onSearchRequested(); break; + case R.id.private_folder: + showScreenLockPwd(); + break; + case R.id.backToRoot: + backToRoot(); default: break; } @@ -1102,6 +1159,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt return true; } + // 用于启动搜索界面 @Override public boolean onSearchRequested() { @@ -1214,6 +1272,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt // 根据当前状态进行分支判断 switch (mState) { + case PRIVATE_FOLDER: // 如果当前状态是笔记列表 case NOTE_LIST: // 如果笔记数据项的类型是文件夹或系统文件夹 @@ -1260,8 +1319,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt // 如果当前状态是笔记列表，不改变查询条件， // 否则在查询条件的基础上增加一个或条件，表示id等于根文件夹 - selection = (mState == ListEditState.NOTE_LIST) ? selection: - "(" + selection + ") OR (" + NoteColumns.ID + "=" + Notes.ID_ROOT_FOLDER + ")"; + selection = (mState == ListEditState.NOTE_LIST) ? selection : + "(" + selection + ") OR (" + NoteColumns.ID + "=" + Notes.ID_ROOT_FOLDER + ")"; // 调用后台查询处理器的startQuery方法，传入文件夹列表查询标记， // null表示不指定cookie对象，笔记内容的uri，文件夹列表适配器的投影数组，查询条件和参数数组，以及按修改日期降序排序 @@ -1270,7 +1329,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt Notes.CONTENT_NOTE_URI, FoldersListAdapter.PROJECTION, selection, - new String[] { + new String[]{ String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLER), String.valueOf(mCurrentFolderId) @@ -1307,4 +1366,106 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt // 返回false表示不消费长按事件 return false; } + + /*newthing*/ + private void movToPrivate() { + new AsyncTask>() { + // 在后台线程执行的方法，传入空参数 + protected HashSet doInBackground(Void... unused) { + // 获取选中的小部件的属性集合 + HashSet widgets = mNotesListAdapter.getSelectedWidget(); + // 如果不是同步模式 + // if not synced, delete notes directly + // 调用数据工具类的方法，直接删除选中的笔记，传入内容解析器和选中的笔记的id + if (DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter + .getSelectedItemIds(), Notes.ID_PRIVATE_FOLDER)) { + } + // 返回小部件属性集合 + return widgets; + } + + // 在主线程执行的方法，传入小部件属性集合 + @Override + protected void onPostExecute(HashSet widgets) { + // 如果小部件属性集合不为空 + if (widgets != null) { + // 遍历每个小部件属性 + for (AppWidgetAttribute widget : widgets) { + // 如果小部件的id和类型都有效 + if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID + && widget.widgetType != Notes.TYPE_WIDGET_INVALIDE) { + // 更新小部件，传入小部件的id和类型 + updateWidget(widget.widgetId, widget.widgetType); + } + } + } + // 结束操作模式，取消选择 + mModeCallBack.finishActionMode(); + } + }.execute(); // 执行异步任务 + } + + private void backToRoot() { + mCurrentFolderId = Notes.ID_ROOT_FOLDER; + startAsyncNotesListQuery(); + mState = ListEditState.NOTE_LIST; + mAddNewNote.setVisibility(View.VISIBLE); + } + + private void callPrivateFolder() { + mCurrentFolderId = Notes.ID_PRIVATE_FOLDER; + startAsyncNotesListQuery(); + mState = ListEditState.PRIVATE_FOLDER; + mAddNewNote.setVisibility(View.GONE); + } + @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) + public void showScreenLockPwd() { + KeyguardManager mKeyguardMgr = null; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + mKeyguardMgr = getSystemService(KeyguardManager.class); + } + Intent intent = mKeyguardMgr.createConfirmDeviceCredentialIntent(null, null); + if (intent != null) { + startActivityForResult(intent, 1101); + } else { + Toast.makeText(this, "intent==null", Toast.LENGTH_LONG).show(); + } + } + private void movToRoot() { + new AsyncTask>() { + // 在后台线程执行的方法，传入空参数 + protected HashSet doInBackground(Void... unused) { + // 获取选中的小部件的属性集合 + HashSet widgets = mNotesListAdapter.getSelectedWidget(); + // 如果不是同步模式 + // if not synced, delete notes directly + // 调用数据工具类的方法，直接删除选中的笔记，传入内容解析器和选中的笔记的id + if (DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter + .getSelectedItemIds(), Notes.ID_ROOT_FOLDER)) { + } + // 返回小部件属性集合 + return widgets; + } + + // 在主线程执行的方法，传入小部件属性集合 + @Override + protected void onPostExecute(HashSet widgets) { + // 如果小部件属性集合不为空 + if (widgets != null) { + // 遍历每个小部件属性 + for (AppWidgetAttribute widget : widgets) { + // 如果小部件的id和类型都有效 + if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID + && widget.widgetType != Notes.TYPE_WIDGET_INVALIDE) { + // 更新小部件，传入小部件的id和类型 + updateWidget(widget.widgetId, widget.widgetType); + } + } + } + // 结束操作模式，取消选择 + mModeCallBack.finishActionMode(); + } + }.execute(); // 执行异步任务 + } } + diff --git a/app/src/main/res/drawable/menu_invisible.png b/app/src/main/res/drawable/menu_invisible.png new file mode 100644 index 0000000..697e637 Binary files /dev/null and b/app/src/main/res/drawable/menu_invisible.png differ diff --git a/app/src/main/res/drawable/menu_visible.png b/app/src/main/res/drawable/menu_visible.png new file mode 100644 index 0000000..4e48481 Binary files /dev/null and b/app/src/main/res/drawable/menu_visible.png differ diff --git a/app/src/main/res/layout/note_list.xml b/app/src/main/res/layout/note_list.xml index 6b25d38..a398d98 100644 --- a/app/src/main/res/layout/note_list.xml +++ b/app/src/main/res/layout/note_list.xml @@ -50,9 +50,11 @@