diff --git a/src/Notes-master1/.gradle/8.0/checksums/checksums.lock b/src/Notes-master1/.gradle/8.0/checksums/checksums.lock
index 8b01d94..115ec43 100644
Binary files a/src/Notes-master1/.gradle/8.0/checksums/checksums.lock and b/src/Notes-master1/.gradle/8.0/checksums/checksums.lock differ
diff --git a/src/Notes-master1/.gradle/8.0/checksums/md5-checksums.bin b/src/Notes-master1/.gradle/8.0/checksums/md5-checksums.bin
index 0327294..0ee46d2 100644
Binary files a/src/Notes-master1/.gradle/8.0/checksums/md5-checksums.bin and b/src/Notes-master1/.gradle/8.0/checksums/md5-checksums.bin differ
diff --git a/src/Notes-master1/.gradle/8.0/checksums/sha1-checksums.bin b/src/Notes-master1/.gradle/8.0/checksums/sha1-checksums.bin
index cdf10fd..449dcb3 100644
Binary files a/src/Notes-master1/.gradle/8.0/checksums/sha1-checksums.bin and b/src/Notes-master1/.gradle/8.0/checksums/sha1-checksums.bin differ
diff --git a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin
index 6d59abb..07a62ba 100644
Binary files a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin and b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin differ
diff --git a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock
index 664f10b..7cf3828 100644
Binary files a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock and b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock differ
diff --git a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin
index e1d33ef..7041b3b 100644
Binary files a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin and b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin differ
diff --git a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock
index 1b0787c..98009ce 100644
Binary files a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock and b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock differ
diff --git a/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin b/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin
index ba3ea97..ebf842d 100644
Binary files a/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin differ
diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 1e5529c..9530f9e 100644
Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin
index a4114fd..b782d62 100644
Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/src/Notes-master1/.gradle/file-system.probe b/src/Notes-master1/.gradle/file-system.probe
index ef8cb57..f6bc0ab 100644
Binary files a/src/Notes-master1/.gradle/file-system.probe and b/src/Notes-master1/.gradle/file-system.probe differ
diff --git a/src/Notes-master1/.idea/deploymentTargetDropDown.xml b/src/Notes-master1/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..1fe7e43
--- /dev/null
+++ b/src/Notes-master1/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/8/c/8c55c3ccc257e5907959013f99656e4c8ec3903e b/src/Notes-master1/.idea/sonarlint/issuestore/8/c/8c55c3ccc257e5907959013f99656e4c8ec3903e
index 8b4834f..6a6e0e8 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/8/c/8c55c3ccc257e5907959013f99656e4c8ec3903e
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/8/c/8c55c3ccc257e5907959013f99656e4c8ec3903e
@@ -1,2 +1,2 @@
-x xml:S5594,"1Implement permissions on this exported component.(8ˁ1J$53eacfb5-d43b-4f6a-a9f6-511a0df49c69
\ No newline at end of file
+x xml:S5594,"1Implement permissions on this exported component.(8ˁ1J$75d5745e-3ba2-466c-8531-486ef0a2e827
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 b/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
index 12674ef..ced47ea 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
@@ -1,85 +1,63 @@
-
-AYy_MCKNhZ96u27hlWRk
-java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥81J$ac22eb65-2e1e-4bb5-a659-85c8798c4d60
-
-AYy_MCKNhZ96u27hlWRl
-java:S1604"(Make this anonymous inner class a lambda(̺V81J$24a19e5f-8aa9-46b8-9fc5-9452b29bcd1c
-
-AYy_MCKNhZ96u27hlWRm
-java:S1604"(Make this anonymous inner class a lambda(ά81J$8ea37c12-d937-4594-8e1c-3d45dcdd7651
-
-AYy_MCKNhZ96u27hlWRn
-java:S1604"(Make this anonymous inner class a lambda(ܴ81J$51c0677b-f3b5-47f8-8dd3-f4f720af35b8
-
-AYy_MCKNhZ96u27hlWRo
-java:S1604"(Make this anonymous inner class a lambda(81J$004f0e32-967d-4a67-8bf5-7b1ba05f79c6
-
-AYy_MCKNhZ96u27hlWRp
-java:S1604"(Make this anonymous inner class a lambda(81J$be53ebb8-ae81-49ce-8592-b24aeb11a5f8
-
-AYy_MCKNhZ96u27hlWRq
-java:S1604"(Make this anonymous inner class a lambda(۱81J$e26b98e6-8e52-4b17-a707-063ac69a97d2
-
-AYy_MCKNhZ96u27hlWRr
-java:S1604"(Make this anonymous inner class a lambda(ά81J$a45f84e6-14e8-420e-a3a6-e16ad2052d2b
+
+java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥81J$930f1fbf-0951-47fe-a630-f4a3e0d86ec5
+k
+java:S1604"(Make this anonymous inner class a lambda(̺V81J$30220161-b794-4cd4-a9a0-fcb1ea154ce4
+l
+java:S1604"(Make this anonymous inner class a lambda(ά81J$a5f8cecd-b462-4d12-ad8f-ed430b3cf719
+l
+java:S1604"(Make this anonymous inner class a lambda(ܴ81J$a3126d98-4e2e-45b1-8e06-e6e06d090007
+q
+java:S1604"(Make this anonymous inner class a lambda(81J$88fc9794-0e48-4c9a-bb00-69c6f3749d11
+l
+java:S1604"(Make this anonymous inner class a lambda(81J$e88ca270-b67b-457d-977d-328ca9d21284
+l
+java:S1604"(Make this anonymous inner class a lambda(۱81J$cbe3ef3c-31ed-46d1-9fef-1ccabbe89d96
+l
+java:S1604"(Make this anonymous inner class a lambda(ά81J$736b65bc-e499-4170-9262-ad0f1130f282
z
-AYy_MCKNhZ96u27hlWR_
-java:S1116`"Remove this empty statement.(81J$fd374c03-43b3-4b16-a754-58a855fdbd9b
+AYy_MCKNhZ96u27hlWRu
+java:S1116`"Remove this empty statement.(81J$d9d37c46-f020-443d-a287-559bcf588ddd
+AYy_MCKNhZ96u27hlWRv
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(81J$9daee7f4-4274-4f67-97f8-7e46317fd46a
+
AYy_MCKNhZ96u27hlWRw
-java:S1124"EReorder the modifiers to comply with the Java Language Specification.(81J$bbec4b96-49b3-424c-af89-4de93a60fbda
-
-java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ѿk8ϕ1J$8554636e-c5fb-4c21-8e43-ba5bd9e251cb
- java:S125"
-
-
- - -%s
- - --%s
- - --%s
- - --%s
-
-
- - Messaging
- - Email
-
-
-
-
-
- true
- false
- true
- true
- false
- true
- false
- @android:color/black
- #7fa87f
- @android:color/black
- @android:color/black
- @color/material_deep_teal_200
- @color/material_deep_teal_500
- #ff424242
- #ffeeeeee
- #ff303030
- #ffeeeeee
- #66000000
- #80ffffff
- #80000000
- @color/bright_foreground_material_light
- @color/bright_foreground_material_dark
- @android:color/white
- @android:color/black
- #ff5a595b
- #ffd6d7d7
- #80bebebe
- #80323232
- #ffbebebe
- #ff323232
- #6680cbc4
- #66009688
- @color/bright_foreground_disabled_material_dark
- @color/bright_foreground_disabled_material_light
- #FF039BE5
- #FF01579B
- #FF40C4FF
- #FF00B0FF
- @color/material_deep_teal_200
- @color/material_deep_teal_500
- #ff37474f
- #ff263238
- #ff21272b
- #ff80cbc4
- #ff009688
- #ff000000
- #ff757575
- #ff212121
- #ffefefef
- #ffffffff
- #de000000
- #4Dffffff
- #39000000
- #4dffffff
- #1f000000
- #b3ffffff
- #8a000000
- #36ffffff
- #24000000
- #ff616161
- #ffbdbdbd
- #ffbdbdbd
- #fff1f1f1
- #335b5b5b
- 16dp
- 56dp
- 4dp
- 16dp
- 0dp
- 10dp
- 6dp
- 40dp
- 48dp
- 180dp
- 5dp
- -3dp
- 48dp
- 48dp
- 36dp
- 48dp
- @dimen/abc_control_inset_material
- 6dp
- 8dp
- @dimen/abc_control_padding_material
- 320dp
- 2dp
- 4dp
- 4dp
- 8dp
- - 65%
- - 95%
- 24dp
- 18dp
- - 0.30
- - 0.26
- 32dip
- 8dip
- 8dip
- 7dp
- 4dp
- 10dp
- 16dp
- @dimen/abc_action_bar_content_inset_material
- 296dp
- 320dip
- 160dip
- 3dp
- 14sp
- 14sp
- 14sp
- 12sp
- 34sp
- 45sp
- 56sp
- 112sp
- 24sp
- 22sp
- 18sp
- 16sp
- 14sp
- 16sp
- 16dp
- 20sp
- 20dp
- - 80%
- - 100%
- - 320dp
- - 320dp
- - 0.30
- - 0.26
- 64dp
- 64dp
- 12dp
- 26sp
- 20sp
- 17sp
- 14sp
- 33sp
- #3333B5E5
-
-
-
-
-
-
-
-
-
- 220
- 150
- 2
- 127
- 999
-
- - %1$s result for \"%2$s\"
-
- - %1$s results for \"%2$s\"
-
- Navigate home
- %1$s, %2$s
- %1$s, %2$s, %3$s
- Navigate up
- More options
- Done
- See all
- Choose an app
- Search…
- Clear query
- Search query
- Search
- Submit query
- Voice search
- Share with
- Share with %s
- Collapse
- Confirm to delete folder and its notes?
- Confirm to delete this note?
- Confirm to delete the selected %d notes?
- Delete selected notes
- 原神
- Notes 2x2
- Notes 4x4
- Delete
- Call notes
- cancel
- set
- Delete reminder successfully
- Dummy Button
- DUMMY\nCONTENT
- Sorry, can not set clock on empty note
- Sorry, can not send and empty note to home
- The note is not exist
- Export failed, please check SD card
- SD card busy, not available now
- Sync is canceled
- Sync failed, internal error occurs
- Sync failed, please check network and account settings
- Export fail
- notes_%s.txt
- /MIUI/notes/
- The folder %1$s exist, please rename
- yyyyMMdd
- MMMd kk:mm
- Export text file (%1$s) to SD (%2$s) directory
- (%d)
- Have moved selected %1$d notes to %2$s folder
- Input name
- Note added to home
- Remind me
- New Folder
- Delete
- Deselect all
- Export text
- Change folder name
- Delete folder
- View folder
- Large
- Medium
- Font size
- Small
- Super
- Enter check list
- Move to folder
- Parent folder
- Leave check list
- Delete reminder
- Search
- Select all
- Nothing selected, the operation is invalid
- %d selected
- Send to home
- Settings
- Share
- Sync
- Cancel syncing
- Select folder
- Expired
- Length
- Send email
- Open map
- Call
- Browse web
- Take a look
- Got it
- Add note
- ...
- Sync notes with google task
- Sync account
- Add account
- New note background color random
- Cancel syncing
- Sync immediately
- Current account %1$s
- All sync related information will be deleted, which may result in duplicated items sometime
- Please select a google account. Local notes will be synced with google task.
- Sync notes
- Last sync time %1$s
- yyyy-MM-dd hh:mm:ss
- Cancel
- Change sync account
- Remove sync account
- Settings
- Cannot change the account because sync is in progress
- %1$s has been set as the sync account
- Notes
- Search notes
- Searching Notes
- Text in your notes
- Set reminder
- 999+
- Export successful
- Sync is successful with account %1$s
- Getting remote note list...
- Logging into %1$s...
- Synchronize local notes with Google Task...
- Sync is canceled
- Sync is failed
- Sync is successful
- Syncing notes...
- SplashActivity
- No associated note found, click to create associated note.
- Privacy mode,can not see note content
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
index 7ca3e78..db3d9dd 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
@@ -1332,7 +1332,7 @@
- ?attr/colorControlActivated
- ?attr/colorControlHighlight
- ?attr/colorButtonNormal
- "Điều hướng về trang chủ""Điều hướng lên trên""Thêm tùy chọn""Xong""Xem tất cả""Chọn một ứng dụng""Xóa truy vấn""Tìm kiếm truy vấn""Tìm kiếm""Gửi truy vấn""Tìm kiếm bằng giọng nói""Chia sẻ với""Chia sẻ với %s"3truetrue4192dip5falsefalse192dip- 60%
- 90%
- 50%
- 70%
5256dip"转到主屏幕""转到上一层级""更多选项""完成""查看全部""选择应用""清除查询""搜索查询""搜索""提交查询""语音搜索""分享方式""通过%s分享""瀏覽主頁""向上瀏覽""更多選項""完成""顯示全部""選擇應用程式""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""分享對象""與「%s」分享""瀏覽首頁""向上瀏覽""更多選項""完成""查看全部""選擇應用程式""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""選擇分享對象""與「%s」分享""Zulazulela ekhaya""Zulazulela phezulu""Izinketho eziningi""Kwenziwe""Buka konke""Khetha uhlelo lokusebenza""Sula inkinga""Umbuzo wosesho""Sesha""Hambisa umbuzo""Ukusesha ngezwi""Yabelana no-""Yabelana no-%s"
+ "Điều hướng về trang chủ""Điều hướng lên trên""Thêm tùy chọn""Xong""Xem tất cả""Chọn một ứng dụng""Xóa truy vấn""Tìm kiếm truy vấn""Tìm kiếm""Gửi truy vấn""Tìm kiếm bằng giọng nói""Chia sẻ với""Chia sẻ với %s"3truetrue4192dip5falsefalse192dip- 60%
- 90%
- 50%
- 70%
5256dip"转到主屏幕""转到上一层级""更多选项""完成""查看全部""选择应用""清除查询""搜索查询""搜索""提交查询""语音搜索""分享方式""通过%s分享""瀏覽主頁""向上瀏覽""更多選項""完成""顯示全部""選擇應用程式""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""分享對象""與「%s」分享""瀏覽首頁""向上瀏覽""更多選項""完成""查看全部""選擇應用程式""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""選擇分享對象""與「%s」分享""Zulazulela ekhaya""Zulazulela phezulu""Izinketho eziningi""Kwenziwe""Buka konke""Khetha uhlelo lokusebenza""Sula inkinga""Umbuzo wosesho""Sesha""Hambisa umbuzo""Ukusesha ngezwi""Yabelana no-""Yabelana no-%s"
- -%s
- --%s
- --%s
@@ -1343,11 +1343,11 @@
- #335b5b5b#FF039BE5#FF01579B#FF40C4FF#FF00B0FF#6600000033sp26sp20sp17sp14sp原神Notes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode,can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel
+ #335b5b5b#FF039BE5#FF01579B#FF40C4FF#FF00B0FF#6600000033sp26sp20sp17sp14sp原神Notes 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.txtBackground: flyBackground: moon(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel
- %1$s result for \"%2$s\"
- %1$s results for \"%2$s\"
- LengthSplashActivityDummy ButtonDUMMY\nCONTENT
- 短信
- 邮件
- 便签便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消
+ 原神便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消
- %1$s 条符合“%2$s”的搜索结果
- 字符数
+ 字符数回收站
- 短信
- 郵件
便簽便簽2x2便簽4x4沒有關聯內容,點擊新建便簽。訪客模式下,便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項,操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在,請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎?SD卡被佔用,不能操作導出TXT時發生錯誤,請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗,請檢查網絡和帳號設置同步失敗,發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復同步便簽請選擇google帳號,便簽將與該帳號的google task內容同步。正在同步中,不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/stripped.dir/layout/note_list.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/stripped.dir/layout/note_list.xml
new file mode 100644
index 0000000..234fa83
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/stripped.dir/layout/note_list.xml
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
index 94399ea..86dda76 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
@@ -1,7 +1,6 @@
-#Thu Jan 18 10:11:11 CST 2024
+#Thu Jan 18 15:22:07 CST 2024
net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
-net.micode.notes.app-main-5\:/drawable-hdpi/batterfly.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\batterfly.png
net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png
net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png
net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png
@@ -18,6 +17,7 @@ net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=D\:\\Android\
net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/fly.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\fly.png
net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png
net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png
net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png
@@ -50,6 +50,7 @@ net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=D\:\\Androi
net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png
net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png
+net.micode.notes.app-main-5\:/drawable-hdpi/moon.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\moon.png
net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png
net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png
net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
deleted file mode 100644
index 51528df..0000000
--- a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-
-
-
- - -%s
- - --%s
- - --%s
- - --%s
-
-
- - Messaging
- - Email
-
- #66000000
- #FF039BE5
- #FF01579B
- #FF40C4FF
- #FF00B0FF
- #335b5b5b
- 26sp
- 20sp
- 17sp
- 14sp
- 33sp
-
- - %1$s result for \"%2$s\"
-
- - %1$s results for \"%2$s\"
-
- Confirm to delete folder and its notes?
- Confirm to delete this note?
- Confirm to delete the selected %d notes?
- Delete selected notes
- 原神
- Notes 2x2
- Notes 4x4
- Delete
- Call notes
- cancel
- set
- Delete reminder successfully
- Dummy Button
- DUMMY\nCONTENT
- Sorry, can not set clock on empty note
- Sorry, can not send and empty note to home
- The note is not exist
- Export failed, please check SD card
- SD card busy, not available now
- Sync is canceled
- Sync failed, internal error occurs
- Sync failed, please check network and account settings
- Export fail
- notes_%s.txt
- /MIUI/notes/
- The folder %1$s exist, please rename
- yyyyMMdd
- MMMd kk:mm
- Export text file (%1$s) to SD (%2$s) directory
- (%d)
- Have moved selected %1$d notes to %2$s folder
- Input name
- Note added to home
- Remind me
- New Folder
- Delete
- Deselect all
- Export text
- Change folder name
- Delete folder
- View folder
- Large
- Medium
- Font size
- Small
- Super
- Enter check list
- Move to folder
- Parent folder
- Leave check list
- Delete reminder
- Search
- Select all
- Nothing selected, the operation is invalid
- %d selected
- Send to home
- Settings
- Share
- Sync
- Cancel syncing
- Select folder
- Expired
- Length
- Send email
- Open map
- Call
- Browse web
- Take a look
- Got it
- Add note
- ...
- Sync notes with google task
- Sync account
- Add account
- New note background color random
- Cancel syncing
- Sync immediately
- Current account %1$s
- All sync related information will be deleted, which may result in duplicated items sometime
- Please select a google account. Local notes will be synced with google task.
- Sync notes
- Last sync time %1$s
- yyyy-MM-dd hh:mm:ss
- Cancel
- Change sync account
- Remove sync account
- Settings
- Cannot change the account because sync is in progress
- %1$s has been set as the sync account
- Notes
- Search notes
- Searching Notes
- Text in your notes
- Set reminder
- Export successful
- Sync is successful with account %1$s
- Getting remote note list...
- Logging into %1$s...
- Synchronize local notes with Google Task...
- Sync is canceled
- Sync is failed
- Sync is successful
- Syncing notes...
- SplashActivity
- No associated note found, click to create associated note.
- Privacy mode,can not see note content
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
index 44a1cc7..d9d6ad5 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
@@ -1,5 +1,5 @@
-
+
- -%s
- --%s
- --%s
@@ -10,11 +10,11 @@
- #335b5b5b#FF039BE5#FF01579B#FF40C4FF#FF00B0FF#6600000033sp26sp20sp17sp14sp原神Notes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode,can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel
+ #335b5b5b#FF039BE5#FF01579B#FF40C4FF#FF00B0FF#6600000033sp26sp20sp17sp14sp原神Notes 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.txtBackground: flyBackground: moon(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel
- %1$s result for \"%2$s\"
- %1$s results for \"%2$s\"
- LengthSplashActivityDummy ButtonDUMMY\nCONTENT
- 短信
- 邮件
- 便签便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消
+ 原神便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消
- %1$s 条符合“%2$s”的搜索结果
- 字符数
+ 字符数回收站
- 短信
- 郵件
便簽便簽2x2便簽4x4沒有關聯內容,點擊新建便簽。訪客模式下,便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項,操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在,請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎?SD卡被佔用,不能操作導出TXT時發生錯誤,請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗,請檢查網絡和帳號設置同步失敗,發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復同步便簽請選擇google帳號,便簽將與該帳號的google task內容同步。正在同步中,不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/stripped.dir/layout/note_list.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/stripped.dir/layout/note_list.xml
new file mode 100644
index 0000000..234fa83
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/stripped.dir/layout/note_list.xml
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index 8f25a4f..bd74049 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Thu Jan 18 10:11:12 CST 2024
+#Thu Jan 18 15:31:28 CST 2024
base.0=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
path.0=classes.dex
renamed.0=classes.dex
diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
index 6031893..7a19b7d 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
index d97a43f..468aa2d 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
index 533b7bb..e36c662 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
index 7bfddda..497cb9a 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
index c451141..f3f6409 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ
diff --git a/src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt b/src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
index af33237..99d8c71 100644
--- a/src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
+++ b/src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
@@ -17,7 +17,6 @@ dimen text_font_size_medium
dimen text_font_size_normal
dimen text_font_size_small
dimen text_font_size_super
-drawable batterfly
drawable bg_btn_set_color
drawable bg_color_btn_mask
drawable call_record
@@ -34,6 +33,7 @@ drawable edit_title_white
drawable edit_title_yellow
drawable edit_white
drawable edit_yellow
+drawable fly
drawable font_large
drawable font_normal
drawable font_size_selector_bg
@@ -66,6 +66,7 @@ drawable list_yellow_single
drawable list_yellow_up
drawable menu_delete
drawable menu_move
+drawable moon
drawable new_note
drawable new_note_normal
drawable new_note_pressed
@@ -126,8 +127,10 @@ id menu_alert
id menu_delete
id menu_delete_remind
id menu_export_text
+id menu_fly
id menu_font_size
id menu_list_mode
+id menu_moon
id menu_new_folder
id menu_new_note
id menu_search
@@ -135,6 +138,7 @@ id menu_send_to_desktop
id menu_setting
id menu_share
id menu_sync
+id menu_trash
id minute
id move
id navigation_bar
@@ -220,6 +224,7 @@ string menu_create_folder
string menu_delete
string menu_deselect_all
string menu_export_text
+string menu_fly
string menu_folder_change_name
string menu_folder_delete
string menu_folder_view
@@ -229,6 +234,7 @@ string menu_font_size
string menu_font_small
string menu_font_super
string menu_list_mode
+string menu_moon
string menu_move
string menu_move_parent_folder
string menu_normal_mode
@@ -243,6 +249,7 @@ string menu_share
string menu_sync
string menu_sync_cancel
string menu_title_select_folder
+string menu_trash
string note_alert_expired
string note_length
string note_link_email
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_batterfly.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_fly.png.flat
similarity index 99%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_batterfly.png.flat
rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_fly.png.flat
index ffe39f6..d0a9022 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_batterfly.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_fly.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_moon.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_moon.png.flat
new file mode 100644
index 0000000..6b306c0
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_moon.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat
index 4dcd577..ea17551 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat
index c138bc9..8154404 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat
index b829c70..4840b10 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat
index 105885d..b40d1e7 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
index 9ea9676..74c2726 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@@ -1428,6 +1428,60 @@
}
]
},
+ {
+ "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\15536\\.gradle\\caches\\transforms-3\\fe9cb8b071b8c19740ff245deea528af\\transformed\\appcompat-v7-22.2.1\\res\\values-zh-rCN\\values-zh-rCN.xml",
+ "from": {
+ "startLines": "-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",
+ "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+ },
+ "to": {
+ "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "384,480,575,675,757,854,960,1056,1152,1247,1344,1439,1537",
+ "endColumns": "95,94,99,81,96,105,95,95,94,96,94,97,111",
+ "endOffsets": "475,570,670,752,849,955,1051,1147,1242,1339,1434,1532,1644"
+ }
+ },
+ {
+ "source": "D:\\Android\\MiNote\\src\\Notes-master1\\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,-1,-1,-1,-1,37,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-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",
+ "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,-1,-1,-1,-1,1805,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,1843,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "215,1649,1722,1788,1861,1911,1951,1999,2047,2092,2149,2203,2253,2315,2383,2460,2519,2584,2647,2702,2762,2825,2879,2939,2992,3054,3139,3220,3270,3329,3372,3425,3468,3519,3569,3629,3682,3733,3779,3827,3875,3921,3968,4018,4063,4122,4174,4226,4269,4316,4372,4427,4482,4526,4568,4609,4659,4718,4761,4812,4856,4905,4954,5001,5048,5095,5140,5191,5244,5319,5378,5435,5509,5573,5642,5720,5830,5934,6007,6073,6128,6193,6258,6307,6390,6468,6506,6551,6599,6661,6718,6773,6832,6899,6957,7019,7067,7112,7160,7211,7277",
+ "endLines": "8,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,42,50,43,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,1717,1783,1856,1906,1946,1994,2042,2087,2144,2198,2248,2310,2378,2455,2514,2579,2642,2697,2757,2820,2874,2934,2987,3049,3134,3215,3265,3324,3367,3420,3463,3514,3564,3624,3677,3728,3774,3822,3870,3916,3963,4013,4058,4117,4169,4221,4264,4311,4367,4422,4477,4521,4563,4604,4654,4713,4756,4807,4851,4900,4949,4996,5043,5090,5135,5186,5239,5314,5373,5430,5504,5568,5637,5715,5825,5929,6002,6068,6123,6188,6253,6302,6385,6463,6501,6546,6594,6656,6713,6768,6827,6894,6952,7014,7062,7107,7155,7206,7272,7338"
+ }
+ },
+ {
+ "source": "D:\\Android\\MiNote\\src\\Notes-master1\\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": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\values-large-v4_values-large-v4.arsc.flat",
"map": [
@@ -1471,17 +1525,20 @@
{
"source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+ "startLines": "134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,36,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-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",
+ "startOffsets": "8320,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1940,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "138,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,36,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-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",
+ "endOffsets": "8727,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1987,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "169,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,286,287,288,289,290,291,292,293,294,295,296,297",
- "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",
- "startOffsets": "10826,12430,12526,12609,12705,12774,12814,12866,12918,12967,13030,13088,13139,13223,13277,13334,13428,13536,13607,13691,13774,13840,13923,14025,14086,14148,14199,14277,14330,14390,14495,14554,14656,14711,14782,14831,14889,14936,14995,15052,15123,15184,15241,15291,15343,15396,15446,15496,15556,15609,15675,15737,15800,15847,15902,15990,16048,16110,16160,16205,16248,16308,16375,16430,16477,16532,16585,16632,16685,16741,16789,16844,16897,16981,17048,17112,17208,17282,17363,17452,17615,17759,17838,17913,17995,18054,18134,18214,18269,18391,18494,18535,18588,18645,18719,18855,18923,19009,19089,19158,19252,19311,19366,19428,19488,19553,19663",
- "endLines": "173,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,286,287,288,289,290,291,292,293,294,295,296,297",
- "endColumns": "14,95,82,95,68,39,51,51,48,62,57,50,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89",
- "endOffsets": "11173,12521,12604,12700,12769,12809,12861,12913,12962,13025,13083,13134,13218,13272,13329,13423,13531,13602,13686,13769,13835,13918,14020,14081,14143,14194,14272,14325,14385,14490,14549,14651,14706,14777,14826,14884,14931,14990,15047,15118,15179,15236,15286,15338,15391,15441,15491,15551,15604,15670,15732,15795,15842,15897,15985,16043,16105,16155,16200,16243,16303,16370,16425,16472,16527,16580,16627,16680,16736,16784,16839,16892,16976,17043,17107,17203,17277,17358,17447,17610,17754,17833,17908,17990,18049,18129,18209,18264,18386,18489,18530,18583,18640,18714,18779,18918,19004,19084,19153,19247,19306,19361,19423,19483,19548,19658,19748"
+ "startLines": "169,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,289,290,291,292,293,294,295,296,297,298,299,300",
+ "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": "10826,12430,12526,12609,12705,12774,12814,12866,12918,12967,13030,13088,13139,13223,13277,13334,13428,13536,13607,13691,13774,13840,13923,14025,14086,14148,14199,14277,14330,14390,14495,14554,14656,14711,14782,14831,14889,14936,14995,15052,15105,15176,15237,15294,15344,15396,15449,15499,15549,15609,15664,15717,15783,15845,15908,15955,16010,16098,16156,16218,16268,16313,16356,16416,16483,16535,16590,16637,16692,16745,16792,16845,16901,16949,17004,17057,17141,17208,17272,17368,17442,17523,17612,17775,17919,17998,18073,18155,18214,18294,18374,18429,18551,18654,18695,18748,18805,18879,19015,19083,19169,19249,19318,19412,19471,19526,19588,19648,19713,19823",
+ "endLines": "173,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,289,290,291,292,293,294,295,296,297,298,299,300",
+ "endColumns": "14,95,82,95,68,39,51,51,48,62,57,50,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,52,70,60,56,49,51,52,49,49,59,54,52,65,61,62,46,54,87,57,61,49,44,42,59,66,51,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89",
+ "endOffsets": "11173,12521,12604,12700,12769,12809,12861,12913,12962,13025,13083,13134,13218,13272,13329,13423,13531,13602,13686,13769,13835,13918,14020,14081,14143,14194,14272,14325,14385,14490,14549,14651,14706,14777,14826,14884,14931,14990,15047,15100,15171,15232,15289,15339,15391,15444,15494,15544,15604,15659,15712,15778,15840,15903,15950,16005,16093,16151,16213,16263,16308,16351,16411,16478,16530,16585,16632,16687,16740,16787,16840,16896,16944,16999,17052,17136,17203,17267,17363,17437,17518,17607,17770,17914,17993,18068,18150,18209,18289,18369,18424,18546,18649,18690,18743,18800,18874,18939,19078,19164,19244,19313,19407,19466,19521,19583,19643,19708,19818,19908"
}
},
{
@@ -1492,12 +1549,12 @@
"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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,285,298,299,300,301,302,309,310,314,318,323,329,336,340,344,349,353,357,361,365,369,373,377,381,385,387,389,393,397,401,406,410,413,417,421,425,429,433,437,442,445,448,451,454,457,460,463,465,467,468,469,472,474,476,478,483,484,488,494,498,499,501,512,513,517,523,527,528,529,533,560,564,592,737,759,904,926,933,938,959,964,969,979,988,999,1003,1010,1018,1025,1026,1035,1038,1041,1046,1050,1053,1056,1060,1064,1072,1077,1084,1090,1091,1095,1100,1102,1104,1107,1110,1112,1116,1123,1126,1129,1133,1135,1139,1141,1147,1149,1153,1165,1171,1176,1191,1194,1199,1209,1229,1267,1306,1316,1325,1327,1331,1335,1338,1341,1344,1347,1351,1354,1357,1360,1364,1367,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1387,1389,1390,1391,1392,1394,1396,1397,1398,1399,1400,1401,1402,1404,1406,1408,1410,1412,1414,1415,1417,1418,1420,1422,1424,1425,1426,1427,1428,1429,1430,1431,1433,1435,1465,1466,1467,1468,1469,1470,1472,1473,1474,1475,1476,1477,1479,1483,1494,1495,1496,1497,1498,1503,1505,1507,1509,1511,1513,1514,1515,1516,1518,1520,1522,1523,1524,1525,1526,1527,1528,1529,1530,1531,1532,1535,1536,1537,1539,1541,1542,1544,1545,1547,1549,1551,1552,1553,1554,1555,1556,1557,1558,1559,1560,1561,1563,1565,1566,1567,1569,1570,1571,1573,1575,1577,1579,1581,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592",
+ "startLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,288,301,302,303,304,305,312,313,317,321,326,332,339,343,347,352,356,360,364,368,372,376,380,384,388,390,392,396,400,404,409,413,416,420,424,428,432,436,440,445,448,451,454,457,460,463,466,468,470,471,472,475,477,479,481,486,487,491,497,501,502,504,515,516,520,526,530,531,532,536,563,567,595,740,762,907,929,936,941,962,967,972,982,991,1002,1006,1013,1021,1028,1029,1038,1041,1044,1049,1053,1056,1059,1063,1067,1075,1080,1087,1093,1094,1098,1103,1105,1107,1110,1113,1115,1119,1126,1129,1132,1136,1138,1142,1144,1150,1152,1156,1168,1174,1179,1194,1197,1202,1212,1232,1270,1309,1319,1328,1330,1334,1338,1341,1344,1347,1350,1354,1357,1360,1363,1367,1370,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1390,1392,1393,1394,1395,1397,1399,1400,1401,1402,1403,1404,1405,1407,1409,1411,1413,1415,1417,1418,1420,1421,1423,1425,1427,1428,1429,1430,1431,1432,1433,1434,1436,1438,1468,1469,1470,1471,1472,1473,1475,1476,1477,1478,1479,1480,1482,1486,1497,1498,1499,1500,1501,1506,1508,1510,1512,1514,1516,1517,1518,1519,1521,1523,1525,1526,1527,1528,1529,1530,1531,1532,1533,1534,1535,1538,1539,1540,1542,1544,1545,1547,1548,1550,1552,1554,1555,1556,1557,1558,1559,1560,1561,1562,1563,1564,1566,1568,1569,1570,1572,1573,1574,1576,1578,1580,1582,1584,1586,1587,1588,1589,1590,1591,1592,1593,1594,1595",
"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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "420,475,520,569,610,665,728,804,866,939,1007,1085,1166,1227,1302,1378,1455,1533,1603,1674,1735,1847,1924,2002,2108,2214,2293,2373,2430,2488,2562,2637,2702,2768,2835,2903,3007,3319,3399,3480,3539,3598,3657,3716,3775,3838,3902,3960,4019,4090,4162,4234,4307,4364,4422,4495,4569,4643,4718,4790,4863,4933,5061,5130,5200,5270,5347,5426,5502,5579,5643,5708,5777,5854,5929,5998,6066,6143,6209,6306,6371,6440,6539,6598,6656,6713,6772,6844,6912,6980,7039,7102,7192,7283,7343,7409,7476,7542,7612,7676,7729,7842,7900,7965,8029,8078,8139,8200,8261,8323,8387,8451,8515,8580,8643,8703,8764,8823,8883,8945,9016,9076,9144,9211,9279,9347,9415,9501,9588,9650,9711,10030,10102,10159,10207,10256,10307,10341,10388,10437,10483,10515,10579,10641,10696,10756,11178,11252,11330,11423,11493,11571,11625,11695,11780,11832,11905,11979,12048,12123,12197,12271,12360,18784,19753,19831,19921,20009,20105,20606,20695,20942,21223,21508,21901,22378,22600,22822,23090,23317,23547,23777,24007,24237,24464,24703,24929,25174,25304,25434,25664,25912,26131,26414,26622,26753,26980,27226,27451,27700,27921,28166,28461,28683,28921,29135,29365,29588,29803,30011,30135,30259,30364,30481,30695,30841,30981,31067,31415,31503,31733,32135,32368,32450,32548,33140,33240,33476,33884,34123,34217,34275,34512,36530,36772,38922,47636,48903,57727,59008,59544,59874,60997,61253,61489,62036,62530,63203,63418,63946,64510,64885,65003,65541,65698,65842,66162,66332,66473,66602,66901,67204,67763,68025,68375,68728,68822,69128,69390,69515,69642,69881,70092,70211,70404,70859,71040,71162,71421,71534,71721,71823,72267,72391,72676,73563,73857,74187,75107,75279,75615,76281,77310,80137,83105,83693,84287,84400,84629,84967,85127,85279,85450,85617,85860,86030,86203,86374,86648,86847,87094,87178,87274,87370,87468,87568,87670,87772,87874,87976,88078,88178,88274,88386,88515,88638,88792,88946,89044,89158,89252,89392,89526,89622,89734,89834,89950,90046,90158,90298,90446,90610,90752,90910,91060,91201,91345,91480,91616,91758,91900,92012,92152,92220,92293,92367,92440,92514,92660,92804,94288,94354,94444,94524,94616,94714,94824,94902,95008,95100,95204,95314,95436,95599,96153,96233,96333,96423,96533,96860,96960,97072,97186,97302,97418,97512,97626,97744,97846,97966,98088,98170,98274,98394,98520,98614,98702,98814,98930,99052,99164,99339,99455,99541,99653,99777,99844,99970,100038,100166,100310,100438,100507,100602,100717,100830,100929,101038,101149,101260,101361,101466,101578,101708,101799,101922,102034,102120,102224,102332,102432,102550,102654,102758,102884,102972,103062,103172,103256,103310,103432,103538,103648,103732",
- "endLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,285,298,299,300,301,308,309,313,317,322,328,335,339,343,348,352,356,360,364,368,372,376,380,384,386,388,392,396,400,405,409,412,416,420,424,428,432,436,441,444,447,450,453,456,459,462,464,466,467,468,471,473,475,477,482,483,487,493,497,498,500,511,512,516,522,526,527,528,532,559,563,591,736,758,903,925,932,937,958,963,968,978,987,998,1002,1009,1017,1024,1025,1034,1037,1040,1045,1049,1052,1055,1059,1063,1071,1076,1083,1089,1090,1094,1099,1101,1103,1106,1109,1111,1115,1122,1125,1128,1132,1134,1138,1140,1146,1148,1152,1164,1170,1175,1190,1193,1198,1208,1213,1266,1305,1315,1324,1326,1330,1334,1337,1340,1343,1346,1350,1353,1356,1359,1363,1366,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1386,1388,1389,1390,1391,1393,1395,1396,1397,1398,1399,1400,1401,1403,1405,1407,1409,1411,1413,1414,1416,1417,1419,1421,1423,1424,1425,1426,1427,1428,1429,1430,1432,1434,1436,1465,1466,1467,1468,1469,1471,1472,1473,1474,1475,1476,1478,1482,1486,1494,1495,1496,1497,1498,1504,1506,1508,1510,1512,1513,1514,1515,1517,1519,1521,1522,1523,1524,1525,1526,1527,1528,1529,1530,1531,1534,1535,1536,1538,1540,1541,1543,1544,1546,1548,1550,1551,1552,1553,1554,1555,1556,1557,1558,1559,1560,1562,1564,1565,1566,1568,1569,1570,1572,1574,1576,1578,1580,1582,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592",
+ "startOffsets": "420,475,520,569,610,665,728,804,866,939,1007,1085,1166,1227,1302,1378,1455,1533,1603,1674,1735,1847,1924,2002,2108,2214,2293,2373,2430,2488,2562,2637,2702,2768,2835,2903,3007,3319,3399,3480,3539,3598,3657,3716,3775,3838,3902,3960,4019,4090,4162,4234,4307,4364,4422,4495,4569,4643,4718,4790,4863,4933,5061,5130,5200,5270,5347,5426,5502,5579,5643,5708,5777,5854,5929,5998,6066,6143,6209,6306,6371,6440,6539,6598,6656,6713,6772,6844,6912,6980,7039,7102,7192,7283,7343,7409,7476,7542,7612,7676,7729,7842,7900,7965,8029,8078,8139,8200,8261,8323,8387,8451,8515,8580,8643,8703,8764,8823,8883,8945,9016,9076,9144,9211,9279,9347,9415,9501,9588,9650,9711,10030,10102,10159,10207,10256,10307,10341,10388,10437,10483,10515,10579,10641,10696,10756,11178,11252,11330,11423,11493,11571,11625,11695,11780,11832,11905,11979,12048,12123,12197,12271,12360,18944,19913,19991,20081,20169,20265,20766,20855,21102,21383,21668,22061,22538,22760,22982,23250,23477,23707,23937,24167,24397,24624,24863,25089,25334,25464,25594,25824,26072,26291,26574,26782,26913,27140,27386,27611,27860,28081,28326,28621,28843,29081,29295,29525,29748,29963,30171,30295,30419,30524,30641,30855,31001,31141,31227,31575,31663,31893,32295,32528,32610,32708,33300,33400,33636,34044,34283,34377,34435,34672,36690,36932,39082,47796,49063,57887,59168,59704,60034,61157,61413,61649,62196,62690,63363,63578,64106,64670,65045,65163,65701,65858,66002,66322,66492,66633,66762,67061,67364,67923,68185,68535,68888,68982,69288,69550,69675,69802,70041,70252,70371,70564,71019,71200,71322,71581,71694,71881,71983,72427,72551,72836,73723,74017,74347,75267,75439,75775,76441,77470,80297,83265,83853,84447,84560,84789,85127,85287,85439,85610,85777,86020,86190,86363,86534,86808,87007,87254,87338,87434,87530,87628,87728,87830,87932,88034,88136,88238,88338,88434,88546,88675,88798,88952,89106,89204,89318,89412,89552,89686,89782,89894,89994,90110,90206,90318,90458,90606,90770,90912,91070,91220,91361,91505,91640,91776,91918,92060,92172,92312,92380,92453,92527,92600,92674,92820,92964,94448,94514,94604,94684,94776,94874,94984,95062,95168,95260,95364,95474,95596,95759,96313,96393,96493,96583,96693,97020,97120,97232,97346,97462,97578,97672,97786,97904,98006,98126,98248,98330,98434,98554,98680,98774,98862,98974,99090,99212,99324,99499,99615,99701,99813,99937,100004,100130,100198,100326,100470,100598,100667,100762,100877,100990,101089,101198,101309,101420,101521,101626,101738,101868,101959,102082,102194,102280,102384,102492,102592,102710,102814,102918,103044,103132,103222,103332,103416,103470,103592,103698,103808,103892",
+ "endLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,288,301,302,303,304,311,312,316,320,325,331,338,342,346,351,355,359,363,367,371,375,379,383,387,389,391,395,399,403,408,412,415,419,423,427,431,435,439,444,447,450,453,456,459,462,465,467,469,470,471,474,476,478,480,485,486,490,496,500,501,503,514,515,519,525,529,530,531,535,562,566,594,739,761,906,928,935,940,961,966,971,981,990,1001,1005,1012,1020,1027,1028,1037,1040,1043,1048,1052,1055,1058,1062,1066,1074,1079,1086,1092,1093,1097,1102,1104,1106,1109,1112,1114,1118,1125,1128,1131,1135,1137,1141,1143,1149,1151,1155,1167,1173,1178,1193,1196,1201,1211,1216,1269,1308,1318,1327,1329,1333,1337,1340,1343,1346,1349,1353,1356,1359,1362,1366,1369,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1389,1391,1392,1393,1394,1396,1398,1399,1400,1401,1402,1403,1404,1406,1408,1410,1412,1414,1416,1417,1419,1420,1422,1424,1426,1427,1428,1429,1430,1431,1432,1433,1435,1437,1439,1468,1469,1470,1471,1472,1474,1475,1476,1477,1478,1479,1481,1485,1489,1497,1498,1499,1500,1501,1507,1509,1511,1513,1515,1516,1517,1518,1520,1522,1524,1525,1526,1527,1528,1529,1530,1531,1532,1533,1534,1537,1538,1539,1541,1543,1544,1546,1547,1549,1551,1553,1554,1555,1556,1557,1558,1559,1560,1561,1562,1563,1565,1567,1568,1569,1571,1572,1573,1575,1577,1579,1581,1583,1585,1586,1587,1588,1589,1590,1591,1592,1593,1594,1595",
"endColumns": "54,44,48,40,54,62,75,61,72,67,77,80,60,74,75,76,77,69,70,60,61,76,77,105,105,78,79,56,57,73,74,64,65,66,67,103,105,79,80,58,58,58,58,58,62,63,57,58,70,71,71,72,56,57,72,73,73,74,71,72,69,70,68,69,69,76,78,75,76,63,64,68,76,74,68,67,76,65,96,64,68,98,58,57,56,58,71,67,67,58,62,89,90,59,65,66,65,69,63,52,112,57,64,63,48,60,60,60,61,63,63,63,64,62,59,60,58,59,61,70,59,67,66,67,67,67,85,86,61,60,56,71,56,47,48,50,33,46,48,45,31,63,61,54,59,69,73,77,92,69,77,53,69,84,51,72,73,68,74,73,73,88,69,70,77,89,87,95,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,57,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,12,12,97,113,93,12,12,95,111,99,115,95,111,12,12,12,12,12,12,140,12,134,12,12,12,111,139,67,72,73,72,73,12,12,12,65,89,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,91,12,12,12,12,12,93,113,117,12,12,12,81,103,119,125,93,87,111,115,121,111,12,115,85,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,12,12,90,122,12,85,103,12,12,12,12,12,12,87,89,109,83,53,121,105,109,83,125",
- "endOffsets": "470,515,564,605,660,723,799,861,934,1002,1080,1161,1222,1297,1373,1450,1528,1598,1669,1730,1792,1919,1997,2103,2209,2288,2368,2425,2483,2557,2632,2697,2763,2830,2898,3002,3108,3394,3475,3534,3593,3652,3711,3770,3833,3897,3955,4014,4085,4157,4229,4302,4359,4417,4490,4564,4638,4713,4785,4858,4928,4999,5125,5195,5265,5342,5421,5497,5574,5638,5703,5772,5849,5924,5993,6061,6138,6204,6301,6366,6435,6534,6593,6651,6708,6767,6839,6907,6975,7034,7097,7187,7278,7338,7404,7471,7537,7607,7671,7724,7837,7895,7960,8024,8073,8134,8195,8256,8318,8382,8446,8510,8575,8638,8698,8759,8818,8878,8940,9011,9071,9139,9206,9274,9342,9410,9496,9583,9645,9706,9763,10097,10154,10202,10251,10302,10336,10383,10432,10478,10510,10574,10636,10691,10751,10821,11247,11325,11418,11488,11566,11620,11690,11775,11827,11900,11974,12043,12118,12192,12266,12355,12425,18850,19826,19916,20004,20100,20601,20690,20937,21218,21503,21896,22373,22595,22817,23085,23312,23542,23772,24002,24232,24459,24698,24924,25169,25299,25429,25659,25907,26126,26409,26617,26748,26975,27221,27446,27695,27916,28161,28456,28678,28916,29130,29360,29583,29798,30006,30130,30254,30359,30476,30690,30836,30976,31062,31410,31498,31728,32130,32363,32445,32543,33135,33235,33471,33879,34118,34212,34270,34507,36525,36767,38917,47631,48898,57722,59003,59539,59869,60992,61248,61484,62031,62525,63198,63413,63941,64505,64880,64998,65536,65693,65837,66157,66327,66468,66597,66896,67199,67758,68020,68370,68723,68817,69123,69385,69510,69637,69876,70087,70206,70399,70854,71035,71157,71416,71529,71716,71818,72262,72386,72671,73558,73852,74182,75102,75274,75610,76276,76561,80132,83100,83688,84282,84395,84624,84962,85122,85274,85445,85612,85855,86025,86198,86369,86643,86842,87089,87173,87269,87365,87463,87563,87665,87767,87869,87971,88073,88173,88269,88381,88510,88633,88787,88941,89039,89153,89247,89387,89521,89617,89729,89829,89945,90041,90153,90293,90441,90605,90747,90905,91055,91196,91340,91475,91611,91753,91895,92007,92147,92215,92288,92362,92435,92509,92655,92799,92937,94349,94439,94519,94611,94709,94819,94897,95003,95095,95199,95309,95431,95594,95751,96228,96328,96418,96528,96620,96955,97067,97181,97297,97413,97507,97621,97739,97841,97961,98083,98165,98269,98389,98515,98609,98697,98809,98925,99047,99159,99334,99450,99536,99648,99772,99839,99965,100033,100161,100305,100433,100502,100597,100712,100825,100924,101033,101144,101255,101356,101461,101573,101703,101794,101917,102029,102115,102219,102327,102427,102545,102649,102753,102879,102967,103057,103167,103251,103305,103427,103533,103643,103727,103853"
+ "endOffsets": "470,515,564,605,660,723,799,861,934,1002,1080,1161,1222,1297,1373,1450,1528,1598,1669,1730,1792,1919,1997,2103,2209,2288,2368,2425,2483,2557,2632,2697,2763,2830,2898,3002,3108,3394,3475,3534,3593,3652,3711,3770,3833,3897,3955,4014,4085,4157,4229,4302,4359,4417,4490,4564,4638,4713,4785,4858,4928,4999,5125,5195,5265,5342,5421,5497,5574,5638,5703,5772,5849,5924,5993,6061,6138,6204,6301,6366,6435,6534,6593,6651,6708,6767,6839,6907,6975,7034,7097,7187,7278,7338,7404,7471,7537,7607,7671,7724,7837,7895,7960,8024,8073,8134,8195,8256,8318,8382,8446,8510,8575,8638,8698,8759,8818,8878,8940,9011,9071,9139,9206,9274,9342,9410,9496,9583,9645,9706,9763,10097,10154,10202,10251,10302,10336,10383,10432,10478,10510,10574,10636,10691,10751,10821,11247,11325,11418,11488,11566,11620,11690,11775,11827,11900,11974,12043,12118,12192,12266,12355,12425,19010,19986,20076,20164,20260,20761,20850,21097,21378,21663,22056,22533,22755,22977,23245,23472,23702,23932,24162,24392,24619,24858,25084,25329,25459,25589,25819,26067,26286,26569,26777,26908,27135,27381,27606,27855,28076,28321,28616,28838,29076,29290,29520,29743,29958,30166,30290,30414,30519,30636,30850,30996,31136,31222,31570,31658,31888,32290,32523,32605,32703,33295,33395,33631,34039,34278,34372,34430,34667,36685,36927,39077,47791,49058,57882,59163,59699,60029,61152,61408,61644,62191,62685,63358,63573,64101,64665,65040,65158,65696,65853,65997,66317,66487,66628,66757,67056,67359,67918,68180,68530,68883,68977,69283,69545,69670,69797,70036,70247,70366,70559,71014,71195,71317,71576,71689,71876,71978,72422,72546,72831,73718,74012,74342,75262,75434,75770,76436,76721,80292,83260,83848,84442,84555,84784,85122,85282,85434,85605,85772,86015,86185,86358,86529,86803,87002,87249,87333,87429,87525,87623,87723,87825,87927,88029,88131,88233,88333,88429,88541,88670,88793,88947,89101,89199,89313,89407,89547,89681,89777,89889,89989,90105,90201,90313,90453,90601,90765,90907,91065,91215,91356,91500,91635,91771,91913,92055,92167,92307,92375,92448,92522,92595,92669,92815,92959,93097,94509,94599,94679,94771,94869,94979,95057,95163,95255,95359,95469,95591,95754,95911,96388,96488,96578,96688,96780,97115,97227,97341,97457,97573,97667,97781,97899,98001,98121,98243,98325,98429,98549,98675,98769,98857,98969,99085,99207,99319,99494,99610,99696,99808,99932,99999,100125,100193,100321,100465,100593,100662,100757,100872,100985,101084,101193,101304,101415,101516,101621,101733,101863,101954,102077,102189,102275,102379,102487,102587,102705,102809,102913,103039,103127,103217,103327,103411,103465,103587,103693,103803,103887,104013"
}
},
{
@@ -1508,12 +1565,12 @@
"startOffsets": "-1,-1,-1"
},
"to": {
- "startLines": "1487,1488,1499",
+ "startLines": "1490,1491,1502",
"startColumns": "4,4,4",
- "startOffsets": "95756,95826,96625",
- "endLines": "1487,1493,1502",
+ "startOffsets": "95916,95986,96785",
+ "endLines": "1490,1496,1505",
"endColumns": "69,12,12",
- "endOffsets": "95821,96148,96855"
+ "endOffsets": "95981,96308,97015"
}
},
{
@@ -1534,20 +1591,17 @@
{
"source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
"from": {
- "startLines": "-1,-1,68,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startOffsets": "-1,-1,2648,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "endLines": "-1,-1,71,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "endOffsets": "-1,-1,2861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+ "startLines": "-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",
+ "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
- "startLines": "1214,1218,1222,1226,1437,1441,1445,1449,1453,1457,1461,1593,1596",
+ "startLines": "1217,1221,1225,1229,1440,1444,1448,1452,1456,1460,1464,1596,1599",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "76566,76774,76985,77150,92942,93125,93310,93495,93698,93904,94087,103858,104041",
- "endLines": "1217,1221,1225,1228,1440,1444,1448,1452,1456,1460,1464,1595,1599",
+ "startOffsets": "76726,76934,77145,77310,93102,93285,93470,93655,93858,94064,94247,104018,104201",
+ "endLines": "1220,1224,1228,1231,1443,1447,1451,1455,1459,1463,1467,1598,1602",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "76769,76980,77145,77305,93120,93305,93490,93693,93899,94082,94283,104036,104273"
+ "endOffsets": "76929,77140,77305,77465,93280,93465,93650,93853,94059,94242,94443,104196,104433"
}
},
{
@@ -1591,20 +1645,20 @@
{
"source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
"from": {
- "startLines": "134,78,81,80,79,18,19,20,124,125,133,132,25,141,142,87,88,86,85,84,100,99,98,90,38,37,70,28,29,91,47,82,126,77,73,41,48,54,59,49,69,68,67,63,62,60,61,64,44,42,65,55,76,66,43,74,53,58,57,56,72,52,71,50,51,75,27,139,33,35,32,34,31,30,24,23,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,131,129,128,130,26,89,97,102,101,103,96,95,94,93,140,21,22",
- "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": "8386,4220,4484,4387,4317,841,885,938,7874,7924,8327,8275,1303,8913,8968,4944,5039,4872,4787,4703,5918,5834,5731,5217,2038,1986,3711,1510,1564,5279,2388,4568,7988,4148,3899,2120,2448,2769,3075,2507,3639,3577,3519,3293,3240,3135,3189,3344,2297,2173,3395,2817,4081,3456,2240,3949,2721,3019,2930,2871,3836,2670,3790,2565,2609,4013,1454,8799,1779,1889,1731,1835,1674,1625,1247,1193,6381,6313,6625,7775,6994,6912,7069,7159,7403,7323,6466,6542,6852,6690,6771,6257,7548,7671,8233,8104,8046,8158,1388,5148,5644,6055,5985,6136,5584,5528,5465,5404,8847,991,1102",
- "endLines": "138,78,81,80,79,18,19,20,124,125,133,132,25,141,142,87,88,86,85,84,100,99,98,90,38,37,70,28,29,91,47,82,126,77,73,41,48,54,59,49,69,68,67,63,62,60,61,64,44,42,65,55,76,66,43,74,53,58,57,56,72,52,71,50,51,75,27,139,33,35,32,34,31,30,24,23,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,131,129,128,130,26,89,97,102,101,103,96,95,94,93,140,21,22",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,51,57,46,58,56,70,60,56,49,51,52,49,49,55,65,59,52,65,61,55,62,46,54,87,57,61,49,44,42,59,66,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89",
- "endOffsets": "8793,4311,4562,4478,4381,879,932,985,7918,7982,8380,8321,1382,8962,9020,5033,5142,4938,4866,4781,5979,5912,5828,5273,2095,2032,3784,1558,1619,5379,2442,4665,8038,4214,3943,2167,2501,2811,3129,2559,3705,3633,3571,3338,3287,3183,3234,3389,2348,2234,3450,2865,4142,3513,2291,4007,2763,3069,3013,2924,3893,2715,3830,2603,2664,4075,1504,8841,1829,1937,1773,1883,1725,1668,1297,1241,6460,6375,6684,7866,7063,6988,7153,7317,7542,7397,6536,6619,6906,6765,6846,6307,7665,7769,8269,8152,8098,8227,1448,5211,5725,6130,6049,6225,5638,5578,5522,5459,8907,1096,1187"
+ "startLines": "132,76,79,78,77,18,19,20,122,123,131,130,25,139,140,85,86,84,83,82,98,97,96,88,38,37,68,28,29,89,45,80,124,75,71,46,52,57,47,41,67,66,65,61,60,58,59,62,63,42,53,74,64,72,51,56,55,54,70,50,69,48,49,73,27,137,33,35,32,34,31,30,24,23,105,104,108,120,113,112,114,115,117,116,106,107,111,109,110,103,118,119,129,127,126,128,26,87,95,100,99,101,94,93,92,91,138,21,22",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8265,4099,4363,4266,4196,841,882,935,7753,7803,8206,8154,1300,8792,8847,4823,4918,4751,4666,4582,5797,5713,5610,5096,2035,1983,3590,1507,1561,5158,2267,4447,7867,4027,3778,2327,2648,2954,2386,2123,3518,3456,3398,3172,3119,3014,3068,3223,3274,2177,2696,3960,3335,3828,2600,2898,2809,2750,3715,2549,3669,2444,2488,3892,1451,8678,1776,1886,1728,1832,1671,1622,1244,1190,6260,6192,6504,7654,6873,6791,6948,7038,7282,7202,6345,6421,6731,6569,6650,6136,7427,7550,8112,7983,7925,8037,1385,5027,5523,5934,5864,6015,5463,5407,5344,5283,8726,988,1099",
+ "endLines": "136,76,79,78,77,18,19,20,122,123,131,130,25,139,140,85,86,84,83,82,98,97,96,88,38,37,68,28,29,89,45,80,124,75,71,46,52,57,47,41,67,66,65,61,60,58,59,62,63,42,53,74,64,72,51,56,55,54,70,50,69,48,49,73,27,137,33,35,32,34,31,30,24,23,105,104,108,120,113,112,114,115,117,116,106,107,111,109,110,103,118,119,129,127,126,128,26,87,95,100,99,101,94,93,92,91,138,21,22",
+ "endColumns": "14,95,82,95,68,39,51,51,48,62,57,50,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,52,70,60,56,49,51,52,49,49,59,54,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89",
+ "endOffsets": "8672,4190,4441,4357,4260,876,929,982,7797,7861,8259,8200,1379,8841,8899,4912,5021,4817,4745,4660,5858,5791,5707,5152,2092,2029,3663,1555,1616,5258,2321,4544,7917,4093,3822,2380,2690,3008,2438,2171,3584,3512,3450,3217,3166,3062,3113,3268,3329,2227,2744,4021,3392,3886,2642,2948,2892,2803,3772,2594,3709,2482,2543,3954,1501,8720,1826,1934,1770,1880,1722,1665,1294,1238,6339,6254,6563,7745,6942,6867,7032,7196,7421,7276,6415,6498,6785,6644,6725,6186,7544,7648,8148,8031,7977,8106,1445,5090,5604,6009,5928,6104,5517,5457,5401,5338,8786,1093,1184"
},
"to": {
- "startLines": "169,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,290,291,292,293,294,295,296,297,298,299,300,301",
- "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": "10826,12430,12526,12609,12705,12774,12817,12869,12921,12970,13033,13091,13142,13226,13280,13337,13431,13539,13610,13694,13777,13843,13926,14028,14089,14151,14202,14280,14333,14393,14498,14557,14659,14714,14785,14834,14886,14944,14991,15050,15107,15178,15239,15296,15346,15398,15451,15501,15551,15607,15673,15733,15786,15852,15914,15970,16033,16080,16135,16223,16281,16343,16393,16438,16481,16541,16608,16663,16710,16765,16818,16865,16918,16974,17022,17077,17130,17214,17281,17345,17441,17515,17596,17685,17848,17992,18071,18146,18228,18287,18367,18447,18502,18624,18727,18768,18821,18878,18952,19088,19156,19242,19322,19391,19485,19544,19599,19661,19721,19786,19896",
- "endLines": "173,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,290,291,292,293,294,295,296,297,298,299,300,301",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,51,57,46,58,56,70,60,56,49,51,52,49,49,55,65,59,52,65,61,55,62,46,54,87,57,61,49,44,42,59,66,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89",
- "endOffsets": "11173,12521,12604,12700,12769,12812,12864,12916,12965,13028,13086,13137,13221,13275,13332,13426,13534,13605,13689,13772,13838,13921,14023,14084,14146,14197,14275,14328,14388,14493,14552,14654,14709,14780,14829,14881,14939,14986,15045,15102,15173,15234,15291,15341,15393,15446,15496,15546,15602,15668,15728,15781,15847,15909,15965,16028,16075,16130,16218,16276,16338,16388,16433,16476,16536,16603,16658,16705,16760,16813,16860,16913,16969,17017,17072,17125,17209,17276,17340,17436,17510,17591,17680,17843,17987,18066,18141,18223,18282,18362,18442,18497,18619,18722,18763,18816,18873,18947,19012,19151,19237,19317,19386,19480,19539,19594,19656,19716,19781,19891,19981"
+ "startLines": "169,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,288,289,290,291,292,293,294,295,296,297,298,299",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "10826,12430,12526,12609,12705,12774,12814,12866,12918,12967,13030,13088,13139,13223,13277,13334,13428,13536,13607,13691,13774,13840,13923,14025,14086,14148,14199,14277,14330,14390,14495,14554,14656,14711,14782,14831,14889,14936,14995,15052,15105,15176,15237,15294,15344,15396,15449,15499,15549,15609,15664,15717,15783,15845,15908,15955,16010,16098,16156,16218,16268,16313,16356,16416,16483,16538,16585,16640,16693,16740,16793,16849,16897,16952,17005,17089,17156,17220,17316,17390,17471,17560,17723,17867,17946,18021,18103,18162,18242,18322,18377,18499,18602,18643,18696,18753,18827,18963,19031,19117,19197,19266,19360,19419,19474,19536,19596,19661,19771",
+ "endLines": "173,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,288,289,290,291,292,293,294,295,296,297,298,299",
+ "endColumns": "14,95,82,95,68,39,51,51,48,62,57,50,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,52,70,60,56,49,51,52,49,49,59,54,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89",
+ "endOffsets": "11173,12521,12604,12700,12769,12809,12861,12913,12962,13025,13083,13134,13218,13272,13329,13423,13531,13602,13686,13769,13835,13918,14020,14081,14143,14194,14272,14325,14385,14490,14549,14651,14706,14777,14826,14884,14931,14990,15047,15100,15171,15232,15289,15339,15391,15444,15494,15544,15604,15659,15712,15778,15840,15903,15950,16005,16093,16151,16213,16263,16308,16351,16411,16478,16533,16580,16635,16688,16735,16788,16844,16892,16947,17000,17084,17151,17215,17311,17385,17466,17555,17718,17862,17941,18016,18098,18157,18237,18317,18372,18494,18597,18638,18691,18748,18822,18887,19026,19112,19192,19261,19355,19414,19469,19531,19591,19656,19766,19856"
}
},
{
@@ -1618,12 +1672,12 @@
"endOffsets": "336,381,430,471,757,820,896,1190,1263,1331,1640,1953,2014,2089,2165,2483,2561,2631,2702,2763,2825,2902,2980,3086,3192,3271,3351,3408,3466,3540,3615,3680,3746,3813,3881,3985,4091,4171,4252,4311,4370,4429,4488,4547,4610,4674,4732,4791,4862,4934,5006,5079,5136,5194,5267,5341,5415,5490,5562,5635,5705,5776,21553,21623,21693,21770,21849,21925,22002,22298,22363,22432,22750,22825,22894,22962,23039,23337,23434,23499,23568,23667,23958,24248,24305,24364,24436,24504,24572,24631,24694,25025,25116,25408,25474,25541,25607,25677,25741,26035,26148,26438,26503,26567,26616,26918,26979,27040,27102,27166,27230,27294,27359,27422,27482,27543,27602,27662,27724,27795,27855,27923,28222,28290,28358,28426,28753,28840,29134,29195,29252,29556,29842,29890,29939,29990,30024,30071,30120,30166,30198,30494,30556,30843,31135,31205,31512,31590,31683,31753,31831,31885,31955,32040,32092,32165,32239,32308,32383,32457,32531,32620,32690,32761,33071,33161,33249,33345,34083,34172,34419,34700,34985,35378,36097,36319,36541,36809,37036,37266,37496,37726,37956,38183,38422,38648,38893,39260,39390,39862,40110,40329,40849,41057,41188,41657,41903,42128,42377,42598,42843,43375,43597,43835,44049,44279,44502,44717,44925,45049,45173,45278,45395,45609,45755,45895,46218,46566,46654,46884,47286,47519,47601,47699,48316,48416,48652,49060,49299,49393,49451,49688,51734,51976,54154,63433,64700,74089,75370,76143,76473,77596,77852,78088,78635,79129,79802,80017,80545,81109,81484,81602,82140,82297,82441,82761,82931,83072,83201,83500,83803,84362,84624,84974,85327,85421,85727,85989,86114,86241,86480,86691,86810,87003,87458,87639,87761,88020,88133,88320,88422,88866,88990,89275,90162,90456,90786,91706,91878,92214,92880,93165,96291,99321,99961,100585,100934,101163,101501,101661,101813,101984,102151,102394,102564,102737,102908,103182,103381,103628,103944,104040,104136,104234,104334,104436,104538,104640,104742,104844,104944,105040,105152,105281,105404,105558,105712,105810,105924,106018,106158,106292,106388,106500,106600,106716,106812,106924,107064,107212,107376,107518,107676,107826,107967,108111,108246,108382,108524,108666,108778,108918,108986,109059,109133,109206,109280,109426,109570,109708,110006,110096,110176,110268,110366,110476,110554,110660,110752,110856,110966,111088,111251,111408,111488,111588,111678,111788,111880,112212,112324,112438,112554,112670,112764,112878,112996,113098,113218,113340,113422,113526,113646,113772,113866,113954,114066,114182,114304,114416,114591,114707,114793,114905,115029,115096,115222,115290,115418,115562,115690,115759,115854,115969,116082,116181,116290,116401,116512,116613,116718,116830,116960,117051,117174,117286,117372,117476,117584,117684,117802,117906,118010,118136,118224,118314,118424,118508,118562,118684,118790,118900,118984,119110,7379,7483,7584,7631,7879,8071,8421,8580,9009,9541,9762,9921,10180,11004,11397,11543,11671,12452,13037,13508,13726,19674,20599,21090,21243"
},
"to": {
- "startLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,289,302,303,304,305,306,313,314,318,322,327,333,340,344,348,353,357,361,365,369,373,377,381,385,389,391,393,397,401,405,410,414,417,421,425,429,433,437,441,446,449,452,455,458,461,464,467,469,471,472,473,476,478,480,482,487,488,492,498,502,503,505,516,517,521,527,531,532,533,537,564,568,596,741,763,908,930,937,942,963,968,973,983,992,1003,1007,1014,1022,1029,1030,1039,1042,1045,1050,1054,1057,1060,1064,1068,1076,1081,1088,1094,1095,1099,1104,1106,1108,1111,1114,1116,1120,1127,1130,1133,1137,1139,1143,1145,1151,1153,1157,1169,1175,1180,1195,1198,1203,1213,1233,1271,1310,1320,1329,1331,1335,1339,1342,1345,1348,1351,1355,1358,1361,1364,1368,1371,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1391,1393,1394,1395,1396,1398,1400,1401,1402,1403,1404,1405,1406,1408,1410,1412,1414,1416,1418,1419,1421,1422,1424,1426,1428,1429,1430,1431,1432,1433,1434,1435,1437,1439,1469,1470,1471,1472,1473,1474,1476,1477,1478,1479,1480,1481,1483,1487,1498,1499,1500,1501,1502,1507,1509,1511,1513,1515,1517,1518,1519,1520,1522,1524,1526,1527,1528,1529,1530,1531,1532,1533,1534,1535,1536,1539,1540,1541,1543,1545,1546,1548,1549,1551,1553,1555,1556,1557,1558,1559,1560,1561,1562,1563,1564,1565,1567,1569,1570,1571,1573,1574,1575,1577,1579,1581,1583,1585,1587,1588,1589,1590,1591,1592,1593,1594,1595,1596,1604,1605,1606,1607,1608,1609,1610,1611,1612,1617,1618,1619,1620,1621,1622,1623,1624,1625,1626,1627,1628,1629,1630,1631,1632",
+ "startLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,287,300,301,302,303,304,311,312,316,320,325,331,338,342,346,351,355,359,363,367,371,375,379,383,387,389,391,395,399,403,408,412,415,419,423,427,431,435,439,444,447,450,453,456,459,462,465,467,469,470,471,474,476,478,480,485,486,490,496,500,501,503,514,515,519,525,529,530,531,535,562,566,594,739,761,906,928,935,940,961,966,971,981,990,1001,1005,1012,1020,1027,1028,1037,1040,1043,1048,1052,1055,1058,1062,1066,1074,1079,1086,1092,1093,1097,1102,1104,1106,1109,1112,1114,1118,1125,1128,1131,1135,1137,1141,1143,1149,1151,1155,1167,1173,1178,1193,1196,1201,1211,1231,1269,1308,1318,1327,1329,1333,1337,1340,1343,1346,1349,1353,1356,1359,1362,1366,1369,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1389,1391,1392,1393,1394,1396,1398,1399,1400,1401,1402,1403,1404,1406,1408,1410,1412,1414,1416,1417,1419,1420,1422,1424,1426,1427,1428,1429,1430,1431,1432,1433,1435,1437,1467,1468,1469,1470,1471,1472,1474,1475,1476,1477,1478,1479,1481,1485,1496,1497,1498,1499,1500,1505,1507,1509,1511,1513,1515,1516,1517,1518,1520,1522,1524,1525,1526,1527,1528,1529,1530,1531,1532,1533,1534,1537,1538,1539,1541,1543,1544,1546,1547,1549,1551,1553,1554,1555,1556,1557,1558,1559,1560,1561,1562,1563,1565,1567,1568,1569,1571,1572,1573,1575,1577,1579,1581,1583,1585,1586,1587,1588,1589,1590,1591,1592,1593,1594,1602,1603,1604,1605,1606,1607,1608,1609,1610,1615,1616,1617,1618,1619,1620,1621,1622,1623,1624,1625,1626,1627,1628,1629,1630",
"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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "420,475,520,569,610,665,728,804,866,939,1007,1085,1166,1227,1302,1378,1455,1533,1603,1674,1735,1847,1924,2002,2108,2214,2293,2373,2430,2488,2562,2637,2702,2768,2835,2903,3007,3319,3399,3480,3539,3598,3657,3716,3775,3838,3902,3960,4019,4090,4162,4234,4307,4364,4422,4495,4569,4643,4718,4790,4863,4933,5061,5130,5200,5270,5347,5426,5502,5579,5643,5708,5777,5854,5929,5998,6066,6143,6209,6306,6371,6440,6539,6598,6656,6713,6772,6844,6912,6980,7039,7102,7192,7283,7343,7409,7476,7542,7612,7676,7729,7842,7900,7965,8029,8078,8139,8200,8261,8323,8387,8451,8515,8580,8643,8703,8764,8823,8883,8945,9016,9076,9144,9211,9279,9347,9415,9501,9588,9650,9711,10030,10102,10159,10207,10256,10307,10341,10388,10437,10483,10515,10579,10641,10696,10756,11178,11252,11330,11423,11493,11571,11625,11695,11780,11832,11905,11979,12048,12123,12197,12271,12360,19017,19986,20064,20154,20242,20338,20839,20928,21175,21456,21741,22134,22611,22833,23055,23323,23550,23780,24010,24240,24470,24697,24936,25162,25407,25537,25667,25897,26145,26364,26647,26855,26986,27213,27459,27684,27933,28154,28399,28694,28916,29154,29368,29598,29821,30036,30244,30368,30492,30597,30714,30928,31074,31214,31300,31648,31736,31966,32368,32601,32683,32781,33373,33473,33709,34117,34356,34450,34508,34745,36763,37005,39155,47869,49136,57960,59241,59777,60107,61230,61486,61722,62269,62763,63436,63651,64179,64743,65118,65236,65774,65931,66075,66395,66565,66706,66835,67134,67437,67996,68258,68608,68961,69055,69361,69623,69748,69875,70114,70325,70444,70637,71092,71273,71395,71654,71767,71954,72056,72500,72624,72909,73796,74090,74420,75340,75512,75848,76514,77585,80412,83380,83968,84562,84675,84904,85242,85402,85554,85725,85892,86135,86305,86478,86649,86923,87122,87369,87453,87549,87645,87743,87843,87945,88047,88149,88251,88353,88453,88549,88661,88790,88913,89067,89221,89319,89433,89527,89667,89801,89897,90009,90109,90225,90321,90433,90573,90721,90885,91027,91185,91335,91476,91620,91755,91891,92033,92175,92287,92427,92495,92568,92642,92715,92789,92935,93079,94563,94629,94719,94799,94891,94989,95099,95177,95283,95375,95479,95589,95711,95874,96428,96508,96608,96698,96808,97135,97235,97347,97461,97577,97693,97787,97901,98019,98121,98241,98363,98445,98549,98669,98795,98889,98977,99089,99205,99327,99439,99614,99730,99816,99928,100052,100119,100245,100313,100441,100585,100713,100782,100877,100992,101105,101204,101313,101424,101535,101636,101741,101853,101983,102074,102197,102309,102395,102499,102607,102707,102825,102929,103033,103159,103247,103337,103447,103531,103585,103707,103813,103923,104007,104553,106156,106260,106361,106408,106656,106848,107198,107357,107980,108512,108733,108892,109151,109975,110368,110514,110642,111423,112008,112479,112697,118645,119570,120061",
- "endLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,289,302,303,304,305,312,313,317,321,326,332,339,343,347,352,356,360,364,368,372,376,380,384,388,390,392,396,400,404,409,413,416,420,424,428,432,436,440,445,448,451,454,457,460,463,466,468,470,471,472,475,477,479,481,486,487,491,497,501,502,504,515,516,520,526,530,531,532,536,563,567,595,740,762,907,929,936,941,962,967,972,982,991,1002,1006,1013,1021,1028,1029,1038,1041,1044,1049,1053,1056,1059,1063,1067,1075,1080,1087,1093,1094,1098,1103,1105,1107,1110,1113,1115,1119,1126,1129,1132,1136,1138,1142,1144,1150,1152,1156,1168,1174,1179,1194,1197,1202,1212,1217,1270,1309,1319,1328,1330,1334,1338,1341,1344,1347,1350,1354,1357,1360,1363,1367,1370,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1390,1392,1393,1394,1395,1397,1399,1400,1401,1402,1403,1404,1405,1407,1409,1411,1413,1415,1417,1418,1420,1421,1423,1425,1427,1428,1429,1430,1431,1432,1433,1434,1436,1438,1440,1469,1470,1471,1472,1473,1475,1476,1477,1478,1479,1480,1482,1486,1490,1498,1499,1500,1501,1502,1508,1510,1512,1514,1516,1517,1518,1519,1521,1523,1525,1526,1527,1528,1529,1530,1531,1532,1533,1534,1535,1538,1539,1540,1542,1544,1545,1547,1548,1550,1552,1554,1555,1556,1557,1558,1559,1560,1561,1562,1563,1564,1566,1568,1569,1570,1572,1573,1574,1576,1578,1580,1582,1584,1586,1587,1588,1589,1590,1591,1592,1593,1594,1595,1596,1604,1605,1606,1607,1608,1609,1610,1611,1612,1617,1618,1619,1620,1621,1622,1623,1624,1625,1626,1627,1628,1629,1630,1631,1632",
+ "startOffsets": "420,475,520,569,610,665,728,804,866,939,1007,1085,1166,1227,1302,1378,1455,1533,1603,1674,1735,1847,1924,2002,2108,2214,2293,2373,2430,2488,2562,2637,2702,2768,2835,2903,3007,3319,3399,3480,3539,3598,3657,3716,3775,3838,3902,3960,4019,4090,4162,4234,4307,4364,4422,4495,4569,4643,4718,4790,4863,4933,5061,5130,5200,5270,5347,5426,5502,5579,5643,5708,5777,5854,5929,5998,6066,6143,6209,6306,6371,6440,6539,6598,6656,6713,6772,6844,6912,6980,7039,7102,7192,7283,7343,7409,7476,7542,7612,7676,7729,7842,7900,7965,8029,8078,8139,8200,8261,8323,8387,8451,8515,8580,8643,8703,8764,8823,8883,8945,9016,9076,9144,9211,9279,9347,9415,9501,9588,9650,9711,10030,10102,10159,10207,10256,10307,10341,10388,10437,10483,10515,10579,10641,10696,10756,11178,11252,11330,11423,11493,11571,11625,11695,11780,11832,11905,11979,12048,12123,12197,12271,12360,18892,19861,19939,20029,20117,20213,20714,20803,21050,21331,21616,22009,22486,22708,22930,23198,23425,23655,23885,24115,24345,24572,24811,25037,25282,25412,25542,25772,26020,26239,26522,26730,26861,27088,27334,27559,27808,28029,28274,28569,28791,29029,29243,29473,29696,29911,30119,30243,30367,30472,30589,30803,30949,31089,31175,31523,31611,31841,32243,32476,32558,32656,33248,33348,33584,33992,34231,34325,34383,34620,36638,36880,39030,47744,49011,57835,59116,59652,59982,61105,61361,61597,62144,62638,63311,63526,64054,64618,64993,65111,65649,65806,65950,66270,66440,66581,66710,67009,67312,67871,68133,68483,68836,68930,69236,69498,69623,69750,69989,70200,70319,70512,70967,71148,71270,71529,71642,71829,71931,72375,72499,72784,73671,73965,74295,75215,75387,75723,76389,77418,80245,83213,83801,84395,84508,84737,85075,85235,85387,85558,85725,85968,86138,86311,86482,86756,86955,87202,87286,87382,87478,87576,87676,87778,87880,87982,88084,88186,88286,88382,88494,88623,88746,88900,89054,89152,89266,89360,89500,89634,89730,89842,89942,90058,90154,90266,90406,90554,90718,90860,91018,91168,91309,91453,91588,91724,91866,92008,92120,92260,92328,92401,92475,92548,92622,92768,92912,94396,94462,94552,94632,94724,94822,94932,95010,95116,95208,95312,95422,95544,95707,96261,96341,96441,96531,96641,96968,97068,97180,97294,97410,97526,97620,97734,97852,97954,98074,98196,98278,98382,98502,98628,98722,98810,98922,99038,99160,99272,99447,99563,99649,99761,99885,99952,100078,100146,100274,100418,100546,100615,100710,100825,100938,101037,101146,101257,101368,101469,101574,101686,101816,101907,102030,102142,102228,102332,102440,102540,102658,102762,102866,102992,103080,103170,103280,103364,103418,103540,103646,103756,103840,104386,105989,106093,106194,106241,106489,106681,107031,107190,107813,108345,108566,108725,108984,109808,110201,110347,110475,111256,111841,112312,112530,118478,119403,119894",
+ "endLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,287,300,301,302,303,310,311,315,319,324,330,337,341,345,350,354,358,362,366,370,374,378,382,386,388,390,394,398,402,407,411,414,418,422,426,430,434,438,443,446,449,452,455,458,461,464,466,468,469,470,473,475,477,479,484,485,489,495,499,500,502,513,514,518,524,528,529,530,534,561,565,593,738,760,905,927,934,939,960,965,970,980,989,1000,1004,1011,1019,1026,1027,1036,1039,1042,1047,1051,1054,1057,1061,1065,1073,1078,1085,1091,1092,1096,1101,1103,1105,1108,1111,1113,1117,1124,1127,1130,1134,1136,1140,1142,1148,1150,1154,1166,1172,1177,1192,1195,1200,1210,1215,1268,1307,1317,1326,1328,1332,1336,1339,1342,1345,1348,1352,1355,1358,1361,1365,1368,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1388,1390,1391,1392,1393,1395,1397,1398,1399,1400,1401,1402,1403,1405,1407,1409,1411,1413,1415,1416,1418,1419,1421,1423,1425,1426,1427,1428,1429,1430,1431,1432,1434,1436,1438,1467,1468,1469,1470,1471,1473,1474,1475,1476,1477,1478,1480,1484,1488,1496,1497,1498,1499,1500,1506,1508,1510,1512,1514,1515,1516,1517,1519,1521,1523,1524,1525,1526,1527,1528,1529,1530,1531,1532,1533,1536,1537,1538,1540,1542,1543,1545,1546,1548,1550,1552,1553,1554,1555,1556,1557,1558,1559,1560,1561,1562,1564,1566,1567,1568,1570,1571,1572,1574,1576,1578,1580,1582,1584,1585,1586,1587,1588,1589,1590,1591,1592,1593,1594,1602,1603,1604,1605,1606,1607,1608,1609,1610,1615,1616,1617,1618,1619,1620,1621,1622,1623,1624,1625,1626,1627,1628,1629,1630",
"endColumns": "54,44,48,40,54,62,75,61,72,67,77,80,60,74,75,76,77,69,70,60,61,76,77,105,105,78,79,56,57,73,74,64,65,66,67,103,105,79,80,58,58,58,58,58,62,63,57,58,70,71,71,72,56,57,72,73,73,74,71,72,69,70,68,69,69,76,78,75,76,63,64,68,76,74,68,67,76,65,96,64,68,98,58,57,56,58,71,67,67,58,62,89,90,59,65,66,65,69,63,52,112,57,64,63,48,60,60,60,61,63,63,63,64,62,59,60,58,59,61,70,59,67,66,67,67,67,85,86,61,60,56,71,56,47,48,50,33,46,48,45,31,63,61,54,59,69,73,77,92,69,77,53,69,84,51,72,73,68,74,73,73,88,69,70,77,89,87,95,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,57,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,12,12,97,113,93,12,12,95,111,99,115,95,111,12,12,12,12,12,12,140,12,134,12,12,12,111,139,67,72,73,72,73,12,12,12,65,89,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,91,12,12,12,12,12,93,113,117,12,12,12,81,103,119,125,93,87,111,115,121,111,12,115,85,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,12,12,90,122,12,85,103,12,12,12,12,12,12,87,89,109,83,53,121,105,109,83,125,1602,103,100,46,247,191,349,158,428,531,220,158,258,823,392,145,127,780,584,470,217,5947,924,490,152",
- "endOffsets": "470,515,564,605,660,723,799,861,934,1002,1080,1161,1222,1297,1373,1450,1528,1598,1669,1730,1792,1919,1997,2103,2209,2288,2368,2425,2483,2557,2632,2697,2763,2830,2898,3002,3108,3394,3475,3534,3593,3652,3711,3770,3833,3897,3955,4014,4085,4157,4229,4302,4359,4417,4490,4564,4638,4713,4785,4858,4928,4999,5125,5195,5265,5342,5421,5497,5574,5638,5703,5772,5849,5924,5993,6061,6138,6204,6301,6366,6435,6534,6593,6651,6708,6767,6839,6907,6975,7034,7097,7187,7278,7338,7404,7471,7537,7607,7671,7724,7837,7895,7960,8024,8073,8134,8195,8256,8318,8382,8446,8510,8575,8638,8698,8759,8818,8878,8940,9011,9071,9139,9206,9274,9342,9410,9496,9583,9645,9706,9763,10097,10154,10202,10251,10302,10336,10383,10432,10478,10510,10574,10636,10691,10751,10821,11247,11325,11418,11488,11566,11620,11690,11775,11827,11900,11974,12043,12118,12192,12266,12355,12425,19083,20059,20149,20237,20333,20834,20923,21170,21451,21736,22129,22606,22828,23050,23318,23545,23775,24005,24235,24465,24692,24931,25157,25402,25532,25662,25892,26140,26359,26642,26850,26981,27208,27454,27679,27928,28149,28394,28689,28911,29149,29363,29593,29816,30031,30239,30363,30487,30592,30709,30923,31069,31209,31295,31643,31731,31961,32363,32596,32678,32776,33368,33468,33704,34112,34351,34445,34503,34740,36758,37000,39150,47864,49131,57955,59236,59772,60102,61225,61481,61717,62264,62758,63431,63646,64174,64738,65113,65231,65769,65926,66070,66390,66560,66701,66830,67129,67432,67991,68253,68603,68956,69050,69356,69618,69743,69870,70109,70320,70439,70632,71087,71268,71390,71649,71762,71949,72051,72495,72619,72904,73791,74085,74415,75335,75507,75843,76509,76794,80407,83375,83963,84557,84670,84899,85237,85397,85549,85720,85887,86130,86300,86473,86644,86918,87117,87364,87448,87544,87640,87738,87838,87940,88042,88144,88246,88348,88448,88544,88656,88785,88908,89062,89216,89314,89428,89522,89662,89796,89892,90004,90104,90220,90316,90428,90568,90716,90880,91022,91180,91330,91471,91615,91750,91886,92028,92170,92282,92422,92490,92563,92637,92710,92784,92930,93074,93212,94624,94714,94794,94886,94984,95094,95172,95278,95370,95474,95584,95706,95869,96026,96503,96603,96693,96803,96895,97230,97342,97456,97572,97688,97782,97896,98014,98116,98236,98358,98440,98544,98664,98790,98884,98972,99084,99200,99322,99434,99609,99725,99811,99923,100047,100114,100240,100308,100436,100580,100708,100777,100872,100987,101100,101199,101308,101419,101530,101631,101736,101848,101978,102069,102192,102304,102390,102494,102602,102702,102820,102924,103028,103154,103242,103332,103442,103526,103580,103702,103808,103918,104002,104128,106151,106255,106356,106403,106651,106843,107193,107352,107781,108507,108728,108887,109146,109970,110363,110509,110637,111418,112003,112474,112692,118640,119565,120056,120209"
+ "endOffsets": "470,515,564,605,660,723,799,861,934,1002,1080,1161,1222,1297,1373,1450,1528,1598,1669,1730,1792,1919,1997,2103,2209,2288,2368,2425,2483,2557,2632,2697,2763,2830,2898,3002,3108,3394,3475,3534,3593,3652,3711,3770,3833,3897,3955,4014,4085,4157,4229,4302,4359,4417,4490,4564,4638,4713,4785,4858,4928,4999,5125,5195,5265,5342,5421,5497,5574,5638,5703,5772,5849,5924,5993,6061,6138,6204,6301,6366,6435,6534,6593,6651,6708,6767,6839,6907,6975,7034,7097,7187,7278,7338,7404,7471,7537,7607,7671,7724,7837,7895,7960,8024,8073,8134,8195,8256,8318,8382,8446,8510,8575,8638,8698,8759,8818,8878,8940,9011,9071,9139,9206,9274,9342,9410,9496,9583,9645,9706,9763,10097,10154,10202,10251,10302,10336,10383,10432,10478,10510,10574,10636,10691,10751,10821,11247,11325,11418,11488,11566,11620,11690,11775,11827,11900,11974,12043,12118,12192,12266,12355,12425,18958,19934,20024,20112,20208,20709,20798,21045,21326,21611,22004,22481,22703,22925,23193,23420,23650,23880,24110,24340,24567,24806,25032,25277,25407,25537,25767,26015,26234,26517,26725,26856,27083,27329,27554,27803,28024,28269,28564,28786,29024,29238,29468,29691,29906,30114,30238,30362,30467,30584,30798,30944,31084,31170,31518,31606,31836,32238,32471,32553,32651,33243,33343,33579,33987,34226,34320,34378,34615,36633,36875,39025,47739,49006,57830,59111,59647,59977,61100,61356,61592,62139,62633,63306,63521,64049,64613,64988,65106,65644,65801,65945,66265,66435,66576,66705,67004,67307,67866,68128,68478,68831,68925,69231,69493,69618,69745,69984,70195,70314,70507,70962,71143,71265,71524,71637,71824,71926,72370,72494,72779,73666,73960,74290,75210,75382,75718,76384,76669,80240,83208,83796,84390,84503,84732,85070,85230,85382,85553,85720,85963,86133,86306,86477,86751,86950,87197,87281,87377,87473,87571,87671,87773,87875,87977,88079,88181,88281,88377,88489,88618,88741,88895,89049,89147,89261,89355,89495,89629,89725,89837,89937,90053,90149,90261,90401,90549,90713,90855,91013,91163,91304,91448,91583,91719,91861,92003,92115,92255,92323,92396,92470,92543,92617,92763,92907,93045,94457,94547,94627,94719,94817,94927,95005,95111,95203,95307,95417,95539,95702,95859,96336,96436,96526,96636,96728,97063,97175,97289,97405,97521,97615,97729,97847,97949,98069,98191,98273,98377,98497,98623,98717,98805,98917,99033,99155,99267,99442,99558,99644,99756,99880,99947,100073,100141,100269,100413,100541,100610,100705,100820,100933,101032,101141,101252,101363,101464,101569,101681,101811,101902,102025,102137,102223,102327,102435,102535,102653,102757,102861,102987,103075,103165,103275,103359,103413,103535,103641,103751,103835,103961,105984,106088,106189,106236,106484,106676,107026,107185,107614,108340,108561,108720,108979,109803,110196,110342,110470,111251,111836,112307,112525,118473,119398,119889,120042"
}
},
{
@@ -1637,12 +1691,12 @@
"endOffsets": "83,411,647"
},
"to": {
- "startLines": "1491,1492,1503",
+ "startLines": "1489,1490,1501",
"startColumns": "4,4,4",
- "startOffsets": "96031,96101,96900",
- "endLines": "1491,1497,1506",
+ "startOffsets": "95864,95934,96733",
+ "endLines": "1489,1495,1504",
"endColumns": "69,12,12",
- "endOffsets": "96096,96423,97130"
+ "endOffsets": "95929,96256,96963"
}
},
{
@@ -1656,12 +1710,12 @@
"endOffsets": "207"
},
"to": {
- "startLines": "1613",
+ "startLines": "1611",
"startColumns": "4",
- "startOffsets": "107786",
- "endLines": "1616",
+ "startOffsets": "107619",
+ "endLines": "1614",
"endColumns": "24",
- "endOffsets": "107975"
+ "endOffsets": "107808"
}
},
{
@@ -1686,18 +1740,18 @@
"from": {
"startLines": "54,59,68,64,24,29,34,39,44,19,49,73,77",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2066,2275,2648,2487,897,1081,1267,1453,1657,713,1864,2857,3041",
+ "startOffsets": "2120,2334,2716,2551,921,1110,1301,1492,1701,732,1913,2940,3128",
"endLines": "57,62,71,66,27,32,37,42,47,22,52,75,80",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "2269,2481,2851,2642,1075,1261,1447,1651,1858,891,2060,3035,3273"
+ "endOffsets": "2326,2543,2932,2708,1102,1293,1484,1693,1905,913,2112,3120,3363"
},
"to": {
- "startLines": "1218,1222,1226,1230,1441,1445,1449,1453,1457,1461,1465,1597,1600",
+ "startLines": "1216,1220,1224,1228,1439,1443,1447,1451,1455,1459,1463,1595,1598",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "76799,77007,77218,77425,93217,93400,93585,93770,93973,94179,94362,104133,104316",
- "endLines": "1221,1225,1229,1232,1444,1448,1452,1456,1460,1464,1468,1599,1603",
+ "startOffsets": "76674,76882,77093,77258,93050,93233,93418,93603,93806,94012,94195,103966,104149",
+ "endLines": "1219,1223,1227,1230,1442,1446,1450,1454,1458,1462,1466,1597,1601",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "77002,77213,77420,77580,93395,93580,93765,93968,94174,94357,94558,104311,104548"
+ "endOffsets": "76877,77088,77253,77413,93228,93413,93598,93801,94007,94190,94391,104144,104381"
}
},
{
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
index 5621e08..2bd4125 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@@ -2,6 +2,60 @@
"logs": [
{
"outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml",
+ "map": [
+ {
+ "source": "C:\\Users\\15536\\.gradle\\caches\\transforms-3\\fe9cb8b071b8c19740ff245deea528af\\transformed\\appcompat-v7-22.2.1\\res\\values-zh-rCN\\values-zh-rCN.xml",
+ "from": {
+ "startLines": "-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",
+ "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+ },
+ "to": {
+ "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "384,480,575,675,757,854,960,1056,1152,1247,1344,1439,1537",
+ "endColumns": "95,94,99,81,96,105,95,95,94,96,94,97,111",
+ "endOffsets": "475,570,670,752,849,955,1051,1147,1242,1339,1434,1532,1644"
+ }
+ },
+ {
+ "source": "D:\\Android\\MiNote\\src\\Notes-master1\\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,-1,-1,-1,-1,37,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-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",
+ "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,-1,-1,-1,-1,1805,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,1843,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "215,1649,1722,1788,1861,1911,1951,1999,2047,2092,2149,2203,2253,2315,2383,2460,2519,2584,2647,2702,2762,2825,2879,2939,2992,3054,3139,3220,3270,3329,3372,3425,3468,3519,3569,3629,3682,3733,3779,3827,3875,3921,3968,4018,4063,4122,4174,4226,4269,4316,4372,4427,4482,4526,4568,4609,4659,4718,4761,4812,4856,4905,4954,5001,5048,5095,5140,5191,5244,5319,5378,5435,5509,5573,5642,5720,5830,5934,6007,6073,6128,6193,6258,6307,6390,6468,6506,6551,6599,6661,6718,6773,6832,6899,6957,7019,7067,7112,7160,7211,7277",
+ "endLines": "8,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,42,50,43,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,1717,1783,1856,1906,1946,1994,2042,2087,2144,2198,2248,2310,2378,2455,2514,2579,2642,2697,2757,2820,2874,2934,2987,3049,3134,3215,3265,3324,3367,3420,3463,3514,3564,3624,3677,3728,3774,3822,3870,3916,3963,4013,4058,4117,4169,4221,4264,4311,4367,4422,4477,4521,4563,4604,4654,4713,4756,4807,4851,4900,4949,4996,5043,5090,5135,5186,5239,5314,5373,5430,5504,5568,5637,5715,5825,5929,6002,6068,6123,6188,6253,6302,6385,6463,6501,6546,6594,6656,6713,6768,6827,6894,6952,7014,7062,7107,7155,7206,7272,7338"
+ }
+ },
+ {
+ "source": "D:\\Android\\MiNote\\src\\Notes-master1\\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": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-3:\\values-zh-rCN\\values-zh-rCN.xml",
"map": [
{
"source": "C:\\Users\\15536\\.gradle\\caches\\transforms-3\\fe9cb8b071b8c19740ff245deea528af\\transformed\\appcompat-v7-22.2.1\\res\\values-zh-rCN\\values-zh-rCN.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
index 3d98ab3..ced838e 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@@ -21,17 +21,20 @@
{
"source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+ "startLines": "134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,36,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-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",
+ "startOffsets": "8320,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1940,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "138,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,36,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-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",
+ "endOffsets": "8727,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1987,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "169,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,286,287,288,289,290,291,292,293,294,295,296,297",
- "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",
- "startOffsets": "10826,12430,12526,12609,12705,12774,12814,12866,12918,12967,13030,13088,13139,13223,13277,13334,13428,13536,13607,13691,13774,13840,13923,14025,14086,14148,14199,14277,14330,14390,14495,14554,14656,14711,14782,14831,14889,14936,14995,15052,15123,15184,15241,15291,15343,15396,15446,15496,15556,15609,15675,15737,15800,15847,15902,15990,16048,16110,16160,16205,16248,16308,16375,16430,16477,16532,16585,16632,16685,16741,16789,16844,16897,16981,17048,17112,17208,17282,17363,17452,17615,17759,17838,17913,17995,18054,18134,18214,18269,18391,18494,18535,18588,18645,18719,18855,18923,19009,19089,19158,19252,19311,19366,19428,19488,19553,19663",
- "endLines": "173,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,286,287,288,289,290,291,292,293,294,295,296,297",
- "endColumns": "14,95,82,95,68,39,51,51,48,62,57,50,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89",
- "endOffsets": "11173,12521,12604,12700,12769,12809,12861,12913,12962,13025,13083,13134,13218,13272,13329,13423,13531,13602,13686,13769,13835,13918,14020,14081,14143,14194,14272,14325,14385,14490,14549,14651,14706,14777,14826,14884,14931,14990,15047,15118,15179,15236,15286,15338,15391,15441,15491,15551,15604,15670,15732,15795,15842,15897,15985,16043,16105,16155,16200,16243,16303,16370,16425,16472,16527,16580,16627,16680,16736,16784,16839,16892,16976,17043,17107,17203,17277,17358,17447,17610,17754,17833,17908,17990,18049,18129,18209,18264,18386,18489,18530,18583,18640,18714,18779,18918,19004,19084,19153,19247,19306,19361,19423,19483,19548,19658,19748"
+ "startLines": "169,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,289,290,291,292,293,294,295,296,297,298,299,300",
+ "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": "10826,12430,12526,12609,12705,12774,12814,12866,12918,12967,13030,13088,13139,13223,13277,13334,13428,13536,13607,13691,13774,13840,13923,14025,14086,14148,14199,14277,14330,14390,14495,14554,14656,14711,14782,14831,14889,14936,14995,15052,15105,15176,15237,15294,15344,15396,15449,15499,15549,15609,15664,15717,15783,15845,15908,15955,16010,16098,16156,16218,16268,16313,16356,16416,16483,16535,16590,16637,16692,16745,16792,16845,16901,16949,17004,17057,17141,17208,17272,17368,17442,17523,17612,17775,17919,17998,18073,18155,18214,18294,18374,18429,18551,18654,18695,18748,18805,18879,19015,19083,19169,19249,19318,19412,19471,19526,19588,19648,19713,19823",
+ "endLines": "173,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,289,290,291,292,293,294,295,296,297,298,299,300",
+ "endColumns": "14,95,82,95,68,39,51,51,48,62,57,50,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,52,70,60,56,49,51,52,49,49,59,54,52,65,61,62,46,54,87,57,61,49,44,42,59,66,51,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89",
+ "endOffsets": "11173,12521,12604,12700,12769,12809,12861,12913,12962,13025,13083,13134,13218,13272,13329,13423,13531,13602,13686,13769,13835,13918,14020,14081,14143,14194,14272,14325,14385,14490,14549,14651,14706,14777,14826,14884,14931,14990,15047,15100,15171,15232,15289,15339,15391,15444,15494,15544,15604,15659,15712,15778,15840,15903,15950,16005,16093,16151,16213,16263,16308,16351,16411,16478,16530,16585,16632,16687,16740,16787,16840,16896,16944,16999,17052,17136,17203,17267,17363,17437,17518,17607,17770,17914,17993,18068,18150,18209,18289,18369,18424,18546,18649,18690,18743,18800,18874,18939,19078,19164,19244,19313,19407,19466,19521,19583,19643,19708,19818,19908"
}
},
{
@@ -42,12 +45,12 @@
"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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,285,298,299,300,301,302,309,310,314,318,323,329,336,340,344,349,353,357,361,365,369,373,377,381,385,387,389,393,397,401,406,410,413,417,421,425,429,433,437,442,445,448,451,454,457,460,463,465,467,468,469,472,474,476,478,483,484,488,494,498,499,501,512,513,517,523,527,528,529,533,560,564,592,737,759,904,926,933,938,959,964,969,979,988,999,1003,1010,1018,1025,1026,1035,1038,1041,1046,1050,1053,1056,1060,1064,1072,1077,1084,1090,1091,1095,1100,1102,1104,1107,1110,1112,1116,1123,1126,1129,1133,1135,1139,1141,1147,1149,1153,1165,1171,1176,1191,1194,1199,1209,1229,1267,1306,1316,1325,1327,1331,1335,1338,1341,1344,1347,1351,1354,1357,1360,1364,1367,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1387,1389,1390,1391,1392,1394,1396,1397,1398,1399,1400,1401,1402,1404,1406,1408,1410,1412,1414,1415,1417,1418,1420,1422,1424,1425,1426,1427,1428,1429,1430,1431,1433,1435,1465,1466,1467,1468,1469,1470,1472,1473,1474,1475,1476,1477,1479,1483,1494,1495,1496,1497,1498,1503,1505,1507,1509,1511,1513,1514,1515,1516,1518,1520,1522,1523,1524,1525,1526,1527,1528,1529,1530,1531,1532,1535,1536,1537,1539,1541,1542,1544,1545,1547,1549,1551,1552,1553,1554,1555,1556,1557,1558,1559,1560,1561,1563,1565,1566,1567,1569,1570,1571,1573,1575,1577,1579,1581,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592",
+ "startLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,288,301,302,303,304,305,312,313,317,321,326,332,339,343,347,352,356,360,364,368,372,376,380,384,388,390,392,396,400,404,409,413,416,420,424,428,432,436,440,445,448,451,454,457,460,463,466,468,470,471,472,475,477,479,481,486,487,491,497,501,502,504,515,516,520,526,530,531,532,536,563,567,595,740,762,907,929,936,941,962,967,972,982,991,1002,1006,1013,1021,1028,1029,1038,1041,1044,1049,1053,1056,1059,1063,1067,1075,1080,1087,1093,1094,1098,1103,1105,1107,1110,1113,1115,1119,1126,1129,1132,1136,1138,1142,1144,1150,1152,1156,1168,1174,1179,1194,1197,1202,1212,1232,1270,1309,1319,1328,1330,1334,1338,1341,1344,1347,1350,1354,1357,1360,1363,1367,1370,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1390,1392,1393,1394,1395,1397,1399,1400,1401,1402,1403,1404,1405,1407,1409,1411,1413,1415,1417,1418,1420,1421,1423,1425,1427,1428,1429,1430,1431,1432,1433,1434,1436,1438,1468,1469,1470,1471,1472,1473,1475,1476,1477,1478,1479,1480,1482,1486,1497,1498,1499,1500,1501,1506,1508,1510,1512,1514,1516,1517,1518,1519,1521,1523,1525,1526,1527,1528,1529,1530,1531,1532,1533,1534,1535,1538,1539,1540,1542,1544,1545,1547,1548,1550,1552,1554,1555,1556,1557,1558,1559,1560,1561,1562,1563,1564,1566,1568,1569,1570,1572,1573,1574,1576,1578,1580,1582,1584,1586,1587,1588,1589,1590,1591,1592,1593,1594,1595",
"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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "420,475,520,569,610,665,728,804,866,939,1007,1085,1166,1227,1302,1378,1455,1533,1603,1674,1735,1847,1924,2002,2108,2214,2293,2373,2430,2488,2562,2637,2702,2768,2835,2903,3007,3319,3399,3480,3539,3598,3657,3716,3775,3838,3902,3960,4019,4090,4162,4234,4307,4364,4422,4495,4569,4643,4718,4790,4863,4933,5061,5130,5200,5270,5347,5426,5502,5579,5643,5708,5777,5854,5929,5998,6066,6143,6209,6306,6371,6440,6539,6598,6656,6713,6772,6844,6912,6980,7039,7102,7192,7283,7343,7409,7476,7542,7612,7676,7729,7842,7900,7965,8029,8078,8139,8200,8261,8323,8387,8451,8515,8580,8643,8703,8764,8823,8883,8945,9016,9076,9144,9211,9279,9347,9415,9501,9588,9650,9711,10030,10102,10159,10207,10256,10307,10341,10388,10437,10483,10515,10579,10641,10696,10756,11178,11252,11330,11423,11493,11571,11625,11695,11780,11832,11905,11979,12048,12123,12197,12271,12360,18784,19753,19831,19921,20009,20105,20606,20695,20942,21223,21508,21901,22378,22600,22822,23090,23317,23547,23777,24007,24237,24464,24703,24929,25174,25304,25434,25664,25912,26131,26414,26622,26753,26980,27226,27451,27700,27921,28166,28461,28683,28921,29135,29365,29588,29803,30011,30135,30259,30364,30481,30695,30841,30981,31067,31415,31503,31733,32135,32368,32450,32548,33140,33240,33476,33884,34123,34217,34275,34512,36530,36772,38922,47636,48903,57727,59008,59544,59874,60997,61253,61489,62036,62530,63203,63418,63946,64510,64885,65003,65541,65698,65842,66162,66332,66473,66602,66901,67204,67763,68025,68375,68728,68822,69128,69390,69515,69642,69881,70092,70211,70404,70859,71040,71162,71421,71534,71721,71823,72267,72391,72676,73563,73857,74187,75107,75279,75615,76281,77310,80137,83105,83693,84287,84400,84629,84967,85127,85279,85450,85617,85860,86030,86203,86374,86648,86847,87094,87178,87274,87370,87468,87568,87670,87772,87874,87976,88078,88178,88274,88386,88515,88638,88792,88946,89044,89158,89252,89392,89526,89622,89734,89834,89950,90046,90158,90298,90446,90610,90752,90910,91060,91201,91345,91480,91616,91758,91900,92012,92152,92220,92293,92367,92440,92514,92660,92804,94288,94354,94444,94524,94616,94714,94824,94902,95008,95100,95204,95314,95436,95599,96153,96233,96333,96423,96533,96860,96960,97072,97186,97302,97418,97512,97626,97744,97846,97966,98088,98170,98274,98394,98520,98614,98702,98814,98930,99052,99164,99339,99455,99541,99653,99777,99844,99970,100038,100166,100310,100438,100507,100602,100717,100830,100929,101038,101149,101260,101361,101466,101578,101708,101799,101922,102034,102120,102224,102332,102432,102550,102654,102758,102884,102972,103062,103172,103256,103310,103432,103538,103648,103732",
- "endLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,285,298,299,300,301,308,309,313,317,322,328,335,339,343,348,352,356,360,364,368,372,376,380,384,386,388,392,396,400,405,409,412,416,420,424,428,432,436,441,444,447,450,453,456,459,462,464,466,467,468,471,473,475,477,482,483,487,493,497,498,500,511,512,516,522,526,527,528,532,559,563,591,736,758,903,925,932,937,958,963,968,978,987,998,1002,1009,1017,1024,1025,1034,1037,1040,1045,1049,1052,1055,1059,1063,1071,1076,1083,1089,1090,1094,1099,1101,1103,1106,1109,1111,1115,1122,1125,1128,1132,1134,1138,1140,1146,1148,1152,1164,1170,1175,1190,1193,1198,1208,1213,1266,1305,1315,1324,1326,1330,1334,1337,1340,1343,1346,1350,1353,1356,1359,1363,1366,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1386,1388,1389,1390,1391,1393,1395,1396,1397,1398,1399,1400,1401,1403,1405,1407,1409,1411,1413,1414,1416,1417,1419,1421,1423,1424,1425,1426,1427,1428,1429,1430,1432,1434,1436,1465,1466,1467,1468,1469,1471,1472,1473,1474,1475,1476,1478,1482,1486,1494,1495,1496,1497,1498,1504,1506,1508,1510,1512,1513,1514,1515,1517,1519,1521,1522,1523,1524,1525,1526,1527,1528,1529,1530,1531,1534,1535,1536,1538,1540,1541,1543,1544,1546,1548,1550,1551,1552,1553,1554,1555,1556,1557,1558,1559,1560,1562,1564,1565,1566,1568,1569,1570,1572,1574,1576,1578,1580,1582,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592",
+ "startOffsets": "420,475,520,569,610,665,728,804,866,939,1007,1085,1166,1227,1302,1378,1455,1533,1603,1674,1735,1847,1924,2002,2108,2214,2293,2373,2430,2488,2562,2637,2702,2768,2835,2903,3007,3319,3399,3480,3539,3598,3657,3716,3775,3838,3902,3960,4019,4090,4162,4234,4307,4364,4422,4495,4569,4643,4718,4790,4863,4933,5061,5130,5200,5270,5347,5426,5502,5579,5643,5708,5777,5854,5929,5998,6066,6143,6209,6306,6371,6440,6539,6598,6656,6713,6772,6844,6912,6980,7039,7102,7192,7283,7343,7409,7476,7542,7612,7676,7729,7842,7900,7965,8029,8078,8139,8200,8261,8323,8387,8451,8515,8580,8643,8703,8764,8823,8883,8945,9016,9076,9144,9211,9279,9347,9415,9501,9588,9650,9711,10030,10102,10159,10207,10256,10307,10341,10388,10437,10483,10515,10579,10641,10696,10756,11178,11252,11330,11423,11493,11571,11625,11695,11780,11832,11905,11979,12048,12123,12197,12271,12360,18944,19913,19991,20081,20169,20265,20766,20855,21102,21383,21668,22061,22538,22760,22982,23250,23477,23707,23937,24167,24397,24624,24863,25089,25334,25464,25594,25824,26072,26291,26574,26782,26913,27140,27386,27611,27860,28081,28326,28621,28843,29081,29295,29525,29748,29963,30171,30295,30419,30524,30641,30855,31001,31141,31227,31575,31663,31893,32295,32528,32610,32708,33300,33400,33636,34044,34283,34377,34435,34672,36690,36932,39082,47796,49063,57887,59168,59704,60034,61157,61413,61649,62196,62690,63363,63578,64106,64670,65045,65163,65701,65858,66002,66322,66492,66633,66762,67061,67364,67923,68185,68535,68888,68982,69288,69550,69675,69802,70041,70252,70371,70564,71019,71200,71322,71581,71694,71881,71983,72427,72551,72836,73723,74017,74347,75267,75439,75775,76441,77470,80297,83265,83853,84447,84560,84789,85127,85287,85439,85610,85777,86020,86190,86363,86534,86808,87007,87254,87338,87434,87530,87628,87728,87830,87932,88034,88136,88238,88338,88434,88546,88675,88798,88952,89106,89204,89318,89412,89552,89686,89782,89894,89994,90110,90206,90318,90458,90606,90770,90912,91070,91220,91361,91505,91640,91776,91918,92060,92172,92312,92380,92453,92527,92600,92674,92820,92964,94448,94514,94604,94684,94776,94874,94984,95062,95168,95260,95364,95474,95596,95759,96313,96393,96493,96583,96693,97020,97120,97232,97346,97462,97578,97672,97786,97904,98006,98126,98248,98330,98434,98554,98680,98774,98862,98974,99090,99212,99324,99499,99615,99701,99813,99937,100004,100130,100198,100326,100470,100598,100667,100762,100877,100990,101089,101198,101309,101420,101521,101626,101738,101868,101959,102082,102194,102280,102384,102492,102592,102710,102814,102918,103044,103132,103222,103332,103416,103470,103592,103698,103808,103892",
+ "endLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,288,301,302,303,304,311,312,316,320,325,331,338,342,346,351,355,359,363,367,371,375,379,383,387,389,391,395,399,403,408,412,415,419,423,427,431,435,439,444,447,450,453,456,459,462,465,467,469,470,471,474,476,478,480,485,486,490,496,500,501,503,514,515,519,525,529,530,531,535,562,566,594,739,761,906,928,935,940,961,966,971,981,990,1001,1005,1012,1020,1027,1028,1037,1040,1043,1048,1052,1055,1058,1062,1066,1074,1079,1086,1092,1093,1097,1102,1104,1106,1109,1112,1114,1118,1125,1128,1131,1135,1137,1141,1143,1149,1151,1155,1167,1173,1178,1193,1196,1201,1211,1216,1269,1308,1318,1327,1329,1333,1337,1340,1343,1346,1349,1353,1356,1359,1362,1366,1369,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1389,1391,1392,1393,1394,1396,1398,1399,1400,1401,1402,1403,1404,1406,1408,1410,1412,1414,1416,1417,1419,1420,1422,1424,1426,1427,1428,1429,1430,1431,1432,1433,1435,1437,1439,1468,1469,1470,1471,1472,1474,1475,1476,1477,1478,1479,1481,1485,1489,1497,1498,1499,1500,1501,1507,1509,1511,1513,1515,1516,1517,1518,1520,1522,1524,1525,1526,1527,1528,1529,1530,1531,1532,1533,1534,1537,1538,1539,1541,1543,1544,1546,1547,1549,1551,1553,1554,1555,1556,1557,1558,1559,1560,1561,1562,1563,1565,1567,1568,1569,1571,1572,1573,1575,1577,1579,1581,1583,1585,1586,1587,1588,1589,1590,1591,1592,1593,1594,1595",
"endColumns": "54,44,48,40,54,62,75,61,72,67,77,80,60,74,75,76,77,69,70,60,61,76,77,105,105,78,79,56,57,73,74,64,65,66,67,103,105,79,80,58,58,58,58,58,62,63,57,58,70,71,71,72,56,57,72,73,73,74,71,72,69,70,68,69,69,76,78,75,76,63,64,68,76,74,68,67,76,65,96,64,68,98,58,57,56,58,71,67,67,58,62,89,90,59,65,66,65,69,63,52,112,57,64,63,48,60,60,60,61,63,63,63,64,62,59,60,58,59,61,70,59,67,66,67,67,67,85,86,61,60,56,71,56,47,48,50,33,46,48,45,31,63,61,54,59,69,73,77,92,69,77,53,69,84,51,72,73,68,74,73,73,88,69,70,77,89,87,95,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,57,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,12,12,97,113,93,12,12,95,111,99,115,95,111,12,12,12,12,12,12,140,12,134,12,12,12,111,139,67,72,73,72,73,12,12,12,65,89,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,91,12,12,12,12,12,93,113,117,12,12,12,81,103,119,125,93,87,111,115,121,111,12,115,85,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,12,12,90,122,12,85,103,12,12,12,12,12,12,87,89,109,83,53,121,105,109,83,125",
- "endOffsets": "470,515,564,605,660,723,799,861,934,1002,1080,1161,1222,1297,1373,1450,1528,1598,1669,1730,1792,1919,1997,2103,2209,2288,2368,2425,2483,2557,2632,2697,2763,2830,2898,3002,3108,3394,3475,3534,3593,3652,3711,3770,3833,3897,3955,4014,4085,4157,4229,4302,4359,4417,4490,4564,4638,4713,4785,4858,4928,4999,5125,5195,5265,5342,5421,5497,5574,5638,5703,5772,5849,5924,5993,6061,6138,6204,6301,6366,6435,6534,6593,6651,6708,6767,6839,6907,6975,7034,7097,7187,7278,7338,7404,7471,7537,7607,7671,7724,7837,7895,7960,8024,8073,8134,8195,8256,8318,8382,8446,8510,8575,8638,8698,8759,8818,8878,8940,9011,9071,9139,9206,9274,9342,9410,9496,9583,9645,9706,9763,10097,10154,10202,10251,10302,10336,10383,10432,10478,10510,10574,10636,10691,10751,10821,11247,11325,11418,11488,11566,11620,11690,11775,11827,11900,11974,12043,12118,12192,12266,12355,12425,18850,19826,19916,20004,20100,20601,20690,20937,21218,21503,21896,22373,22595,22817,23085,23312,23542,23772,24002,24232,24459,24698,24924,25169,25299,25429,25659,25907,26126,26409,26617,26748,26975,27221,27446,27695,27916,28161,28456,28678,28916,29130,29360,29583,29798,30006,30130,30254,30359,30476,30690,30836,30976,31062,31410,31498,31728,32130,32363,32445,32543,33135,33235,33471,33879,34118,34212,34270,34507,36525,36767,38917,47631,48898,57722,59003,59539,59869,60992,61248,61484,62031,62525,63198,63413,63941,64505,64880,64998,65536,65693,65837,66157,66327,66468,66597,66896,67199,67758,68020,68370,68723,68817,69123,69385,69510,69637,69876,70087,70206,70399,70854,71035,71157,71416,71529,71716,71818,72262,72386,72671,73558,73852,74182,75102,75274,75610,76276,76561,80132,83100,83688,84282,84395,84624,84962,85122,85274,85445,85612,85855,86025,86198,86369,86643,86842,87089,87173,87269,87365,87463,87563,87665,87767,87869,87971,88073,88173,88269,88381,88510,88633,88787,88941,89039,89153,89247,89387,89521,89617,89729,89829,89945,90041,90153,90293,90441,90605,90747,90905,91055,91196,91340,91475,91611,91753,91895,92007,92147,92215,92288,92362,92435,92509,92655,92799,92937,94349,94439,94519,94611,94709,94819,94897,95003,95095,95199,95309,95431,95594,95751,96228,96328,96418,96528,96620,96955,97067,97181,97297,97413,97507,97621,97739,97841,97961,98083,98165,98269,98389,98515,98609,98697,98809,98925,99047,99159,99334,99450,99536,99648,99772,99839,99965,100033,100161,100305,100433,100502,100597,100712,100825,100924,101033,101144,101255,101356,101461,101573,101703,101794,101917,102029,102115,102219,102327,102427,102545,102649,102753,102879,102967,103057,103167,103251,103305,103427,103533,103643,103727,103853"
+ "endOffsets": "470,515,564,605,660,723,799,861,934,1002,1080,1161,1222,1297,1373,1450,1528,1598,1669,1730,1792,1919,1997,2103,2209,2288,2368,2425,2483,2557,2632,2697,2763,2830,2898,3002,3108,3394,3475,3534,3593,3652,3711,3770,3833,3897,3955,4014,4085,4157,4229,4302,4359,4417,4490,4564,4638,4713,4785,4858,4928,4999,5125,5195,5265,5342,5421,5497,5574,5638,5703,5772,5849,5924,5993,6061,6138,6204,6301,6366,6435,6534,6593,6651,6708,6767,6839,6907,6975,7034,7097,7187,7278,7338,7404,7471,7537,7607,7671,7724,7837,7895,7960,8024,8073,8134,8195,8256,8318,8382,8446,8510,8575,8638,8698,8759,8818,8878,8940,9011,9071,9139,9206,9274,9342,9410,9496,9583,9645,9706,9763,10097,10154,10202,10251,10302,10336,10383,10432,10478,10510,10574,10636,10691,10751,10821,11247,11325,11418,11488,11566,11620,11690,11775,11827,11900,11974,12043,12118,12192,12266,12355,12425,19010,19986,20076,20164,20260,20761,20850,21097,21378,21663,22056,22533,22755,22977,23245,23472,23702,23932,24162,24392,24619,24858,25084,25329,25459,25589,25819,26067,26286,26569,26777,26908,27135,27381,27606,27855,28076,28321,28616,28838,29076,29290,29520,29743,29958,30166,30290,30414,30519,30636,30850,30996,31136,31222,31570,31658,31888,32290,32523,32605,32703,33295,33395,33631,34039,34278,34372,34430,34667,36685,36927,39077,47791,49058,57882,59163,59699,60029,61152,61408,61644,62191,62685,63358,63573,64101,64665,65040,65158,65696,65853,65997,66317,66487,66628,66757,67056,67359,67918,68180,68530,68883,68977,69283,69545,69670,69797,70036,70247,70366,70559,71014,71195,71317,71576,71689,71876,71978,72422,72546,72831,73718,74012,74342,75262,75434,75770,76436,76721,80292,83260,83848,84442,84555,84784,85122,85282,85434,85605,85772,86015,86185,86358,86529,86803,87002,87249,87333,87429,87525,87623,87723,87825,87927,88029,88131,88233,88333,88429,88541,88670,88793,88947,89101,89199,89313,89407,89547,89681,89777,89889,89989,90105,90201,90313,90453,90601,90765,90907,91065,91215,91356,91500,91635,91771,91913,92055,92167,92307,92375,92448,92522,92595,92669,92815,92959,93097,94509,94599,94679,94771,94869,94979,95057,95163,95255,95359,95469,95591,95754,95911,96388,96488,96578,96688,96780,97115,97227,97341,97457,97573,97667,97781,97899,98001,98121,98243,98325,98429,98549,98675,98769,98857,98969,99085,99207,99319,99494,99610,99696,99808,99932,99999,100125,100193,100321,100465,100593,100662,100757,100872,100985,101084,101193,101304,101415,101516,101621,101733,101863,101954,102077,102189,102275,102379,102487,102587,102705,102809,102913,103039,103127,103217,103327,103411,103465,103587,103693,103803,103887,104013"
}
},
{
@@ -58,12 +61,12 @@
"startOffsets": "-1,-1,-1"
},
"to": {
- "startLines": "1487,1488,1499",
+ "startLines": "1490,1491,1502",
"startColumns": "4,4,4",
- "startOffsets": "95756,95826,96625",
- "endLines": "1487,1493,1502",
+ "startOffsets": "95916,95986,96785",
+ "endLines": "1490,1496,1505",
"endColumns": "69,12,12",
- "endOffsets": "95821,96148,96855"
+ "endOffsets": "95981,96308,97015"
}
},
{
@@ -84,20 +87,17 @@
{
"source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
"from": {
- "startLines": "-1,-1,68,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "startOffsets": "-1,-1,2648,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "endLines": "-1,-1,71,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "endOffsets": "-1,-1,2861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+ "startLines": "-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",
+ "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
- "startLines": "1214,1218,1222,1226,1437,1441,1445,1449,1453,1457,1461,1593,1596",
+ "startLines": "1217,1221,1225,1229,1440,1444,1448,1452,1456,1460,1464,1596,1599",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "76566,76774,76985,77150,92942,93125,93310,93495,93698,93904,94087,103858,104041",
- "endLines": "1217,1221,1225,1228,1440,1444,1448,1452,1456,1460,1464,1595,1599",
+ "startOffsets": "76726,76934,77145,77310,93102,93285,93470,93655,93858,94064,94247,104018,104201",
+ "endLines": "1220,1224,1228,1231,1443,1447,1451,1455,1459,1463,1467,1598,1602",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "76769,76980,77145,77305,93120,93305,93490,93693,93899,94082,94283,104036,104273"
+ "endOffsets": "76929,77140,77305,77465,93280,93465,93650,93853,94059,94242,94443,104196,104433"
}
},
{
@@ -141,20 +141,20 @@
{
"source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
"from": {
- "startLines": "134,78,81,80,79,18,19,20,124,125,133,132,25,141,142,87,88,86,85,84,100,99,98,90,38,37,70,28,29,91,47,82,126,77,73,41,48,54,59,49,69,68,67,63,62,60,61,64,44,42,65,55,76,66,43,74,53,58,57,56,72,52,71,50,51,75,27,139,33,35,32,34,31,30,24,23,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,131,129,128,130,26,89,97,102,101,103,96,95,94,93,140,21,22",
- "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": "8386,4220,4484,4387,4317,841,885,938,7874,7924,8327,8275,1303,8913,8968,4944,5039,4872,4787,4703,5918,5834,5731,5217,2038,1986,3711,1510,1564,5279,2388,4568,7988,4148,3899,2120,2448,2769,3075,2507,3639,3577,3519,3293,3240,3135,3189,3344,2297,2173,3395,2817,4081,3456,2240,3949,2721,3019,2930,2871,3836,2670,3790,2565,2609,4013,1454,8799,1779,1889,1731,1835,1674,1625,1247,1193,6381,6313,6625,7775,6994,6912,7069,7159,7403,7323,6466,6542,6852,6690,6771,6257,7548,7671,8233,8104,8046,8158,1388,5148,5644,6055,5985,6136,5584,5528,5465,5404,8847,991,1102",
- "endLines": "138,78,81,80,79,18,19,20,124,125,133,132,25,141,142,87,88,86,85,84,100,99,98,90,38,37,70,28,29,91,47,82,126,77,73,41,48,54,59,49,69,68,67,63,62,60,61,64,44,42,65,55,76,66,43,74,53,58,57,56,72,52,71,50,51,75,27,139,33,35,32,34,31,30,24,23,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,131,129,128,130,26,89,97,102,101,103,96,95,94,93,140,21,22",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,51,57,46,58,56,70,60,56,49,51,52,49,49,55,65,59,52,65,61,55,62,46,54,87,57,61,49,44,42,59,66,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89",
- "endOffsets": "8793,4311,4562,4478,4381,879,932,985,7918,7982,8380,8321,1382,8962,9020,5033,5142,4938,4866,4781,5979,5912,5828,5273,2095,2032,3784,1558,1619,5379,2442,4665,8038,4214,3943,2167,2501,2811,3129,2559,3705,3633,3571,3338,3287,3183,3234,3389,2348,2234,3450,2865,4142,3513,2291,4007,2763,3069,3013,2924,3893,2715,3830,2603,2664,4075,1504,8841,1829,1937,1773,1883,1725,1668,1297,1241,6460,6375,6684,7866,7063,6988,7153,7317,7542,7397,6536,6619,6906,6765,6846,6307,7665,7769,8269,8152,8098,8227,1448,5211,5725,6130,6049,6225,5638,5578,5522,5459,8907,1096,1187"
+ "startLines": "132,76,79,78,77,18,19,20,122,123,131,130,25,139,140,85,86,84,83,82,98,97,96,88,38,37,68,28,29,89,45,80,124,75,71,46,52,57,47,41,67,66,65,61,60,58,59,62,63,42,53,74,64,72,51,56,55,54,70,50,69,48,49,73,27,137,33,35,32,34,31,30,24,23,105,104,108,120,113,112,114,115,117,116,106,107,111,109,110,103,118,119,129,127,126,128,26,87,95,100,99,101,94,93,92,91,138,21,22",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8265,4099,4363,4266,4196,841,882,935,7753,7803,8206,8154,1300,8792,8847,4823,4918,4751,4666,4582,5797,5713,5610,5096,2035,1983,3590,1507,1561,5158,2267,4447,7867,4027,3778,2327,2648,2954,2386,2123,3518,3456,3398,3172,3119,3014,3068,3223,3274,2177,2696,3960,3335,3828,2600,2898,2809,2750,3715,2549,3669,2444,2488,3892,1451,8678,1776,1886,1728,1832,1671,1622,1244,1190,6260,6192,6504,7654,6873,6791,6948,7038,7282,7202,6345,6421,6731,6569,6650,6136,7427,7550,8112,7983,7925,8037,1385,5027,5523,5934,5864,6015,5463,5407,5344,5283,8726,988,1099",
+ "endLines": "136,76,79,78,77,18,19,20,122,123,131,130,25,139,140,85,86,84,83,82,98,97,96,88,38,37,68,28,29,89,45,80,124,75,71,46,52,57,47,41,67,66,65,61,60,58,59,62,63,42,53,74,64,72,51,56,55,54,70,50,69,48,49,73,27,137,33,35,32,34,31,30,24,23,105,104,108,120,113,112,114,115,117,116,106,107,111,109,110,103,118,119,129,127,126,128,26,87,95,100,99,101,94,93,92,91,138,21,22",
+ "endColumns": "14,95,82,95,68,39,51,51,48,62,57,50,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,52,70,60,56,49,51,52,49,49,59,54,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89",
+ "endOffsets": "8672,4190,4441,4357,4260,876,929,982,7797,7861,8259,8200,1379,8841,8899,4912,5021,4817,4745,4660,5858,5791,5707,5152,2092,2029,3663,1555,1616,5258,2321,4544,7917,4093,3822,2380,2690,3008,2438,2171,3584,3512,3450,3217,3166,3062,3113,3268,3329,2227,2744,4021,3392,3886,2642,2948,2892,2803,3772,2594,3709,2482,2543,3954,1501,8720,1826,1934,1770,1880,1722,1665,1294,1238,6339,6254,6563,7745,6942,6867,7032,7196,7421,7276,6415,6498,6785,6644,6725,6186,7544,7648,8148,8031,7977,8106,1445,5090,5604,6009,5928,6104,5517,5457,5401,5338,8786,1093,1184"
},
"to": {
- "startLines": "169,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,290,291,292,293,294,295,296,297,298,299,300,301",
- "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": "10826,12430,12526,12609,12705,12774,12817,12869,12921,12970,13033,13091,13142,13226,13280,13337,13431,13539,13610,13694,13777,13843,13926,14028,14089,14151,14202,14280,14333,14393,14498,14557,14659,14714,14785,14834,14886,14944,14991,15050,15107,15178,15239,15296,15346,15398,15451,15501,15551,15607,15673,15733,15786,15852,15914,15970,16033,16080,16135,16223,16281,16343,16393,16438,16481,16541,16608,16663,16710,16765,16818,16865,16918,16974,17022,17077,17130,17214,17281,17345,17441,17515,17596,17685,17848,17992,18071,18146,18228,18287,18367,18447,18502,18624,18727,18768,18821,18878,18952,19088,19156,19242,19322,19391,19485,19544,19599,19661,19721,19786,19896",
- "endLines": "173,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,290,291,292,293,294,295,296,297,298,299,300,301",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,51,57,46,58,56,70,60,56,49,51,52,49,49,55,65,59,52,65,61,55,62,46,54,87,57,61,49,44,42,59,66,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89",
- "endOffsets": "11173,12521,12604,12700,12769,12812,12864,12916,12965,13028,13086,13137,13221,13275,13332,13426,13534,13605,13689,13772,13838,13921,14023,14084,14146,14197,14275,14328,14388,14493,14552,14654,14709,14780,14829,14881,14939,14986,15045,15102,15173,15234,15291,15341,15393,15446,15496,15546,15602,15668,15728,15781,15847,15909,15965,16028,16075,16130,16218,16276,16338,16388,16433,16476,16536,16603,16658,16705,16760,16813,16860,16913,16969,17017,17072,17125,17209,17276,17340,17436,17510,17591,17680,17843,17987,18066,18141,18223,18282,18362,18442,18497,18619,18722,18763,18816,18873,18947,19012,19151,19237,19317,19386,19480,19539,19594,19656,19716,19781,19891,19981"
+ "startLines": "169,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,288,289,290,291,292,293,294,295,296,297,298,299",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "10826,12430,12526,12609,12705,12774,12814,12866,12918,12967,13030,13088,13139,13223,13277,13334,13428,13536,13607,13691,13774,13840,13923,14025,14086,14148,14199,14277,14330,14390,14495,14554,14656,14711,14782,14831,14889,14936,14995,15052,15105,15176,15237,15294,15344,15396,15449,15499,15549,15609,15664,15717,15783,15845,15908,15955,16010,16098,16156,16218,16268,16313,16356,16416,16483,16538,16585,16640,16693,16740,16793,16849,16897,16952,17005,17089,17156,17220,17316,17390,17471,17560,17723,17867,17946,18021,18103,18162,18242,18322,18377,18499,18602,18643,18696,18753,18827,18963,19031,19117,19197,19266,19360,19419,19474,19536,19596,19661,19771",
+ "endLines": "173,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,288,289,290,291,292,293,294,295,296,297,298,299",
+ "endColumns": "14,95,82,95,68,39,51,51,48,62,57,50,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,52,70,60,56,49,51,52,49,49,59,54,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89",
+ "endOffsets": "11173,12521,12604,12700,12769,12809,12861,12913,12962,13025,13083,13134,13218,13272,13329,13423,13531,13602,13686,13769,13835,13918,14020,14081,14143,14194,14272,14325,14385,14490,14549,14651,14706,14777,14826,14884,14931,14990,15047,15100,15171,15232,15289,15339,15391,15444,15494,15544,15604,15659,15712,15778,15840,15903,15950,16005,16093,16151,16213,16263,16308,16351,16411,16478,16533,16580,16635,16688,16735,16788,16844,16892,16947,17000,17084,17151,17215,17311,17385,17466,17555,17718,17862,17941,18016,18098,18157,18237,18317,18372,18494,18597,18638,18691,18748,18822,18887,19026,19112,19192,19261,19355,19414,19469,19531,19591,19656,19766,19856"
}
},
{
@@ -168,12 +168,12 @@
"endOffsets": "336,381,430,471,757,820,896,1190,1263,1331,1640,1953,2014,2089,2165,2483,2561,2631,2702,2763,2825,2902,2980,3086,3192,3271,3351,3408,3466,3540,3615,3680,3746,3813,3881,3985,4091,4171,4252,4311,4370,4429,4488,4547,4610,4674,4732,4791,4862,4934,5006,5079,5136,5194,5267,5341,5415,5490,5562,5635,5705,5776,21553,21623,21693,21770,21849,21925,22002,22298,22363,22432,22750,22825,22894,22962,23039,23337,23434,23499,23568,23667,23958,24248,24305,24364,24436,24504,24572,24631,24694,25025,25116,25408,25474,25541,25607,25677,25741,26035,26148,26438,26503,26567,26616,26918,26979,27040,27102,27166,27230,27294,27359,27422,27482,27543,27602,27662,27724,27795,27855,27923,28222,28290,28358,28426,28753,28840,29134,29195,29252,29556,29842,29890,29939,29990,30024,30071,30120,30166,30198,30494,30556,30843,31135,31205,31512,31590,31683,31753,31831,31885,31955,32040,32092,32165,32239,32308,32383,32457,32531,32620,32690,32761,33071,33161,33249,33345,34083,34172,34419,34700,34985,35378,36097,36319,36541,36809,37036,37266,37496,37726,37956,38183,38422,38648,38893,39260,39390,39862,40110,40329,40849,41057,41188,41657,41903,42128,42377,42598,42843,43375,43597,43835,44049,44279,44502,44717,44925,45049,45173,45278,45395,45609,45755,45895,46218,46566,46654,46884,47286,47519,47601,47699,48316,48416,48652,49060,49299,49393,49451,49688,51734,51976,54154,63433,64700,74089,75370,76143,76473,77596,77852,78088,78635,79129,79802,80017,80545,81109,81484,81602,82140,82297,82441,82761,82931,83072,83201,83500,83803,84362,84624,84974,85327,85421,85727,85989,86114,86241,86480,86691,86810,87003,87458,87639,87761,88020,88133,88320,88422,88866,88990,89275,90162,90456,90786,91706,91878,92214,92880,93165,96291,99321,99961,100585,100934,101163,101501,101661,101813,101984,102151,102394,102564,102737,102908,103182,103381,103628,103944,104040,104136,104234,104334,104436,104538,104640,104742,104844,104944,105040,105152,105281,105404,105558,105712,105810,105924,106018,106158,106292,106388,106500,106600,106716,106812,106924,107064,107212,107376,107518,107676,107826,107967,108111,108246,108382,108524,108666,108778,108918,108986,109059,109133,109206,109280,109426,109570,109708,110006,110096,110176,110268,110366,110476,110554,110660,110752,110856,110966,111088,111251,111408,111488,111588,111678,111788,111880,112212,112324,112438,112554,112670,112764,112878,112996,113098,113218,113340,113422,113526,113646,113772,113866,113954,114066,114182,114304,114416,114591,114707,114793,114905,115029,115096,115222,115290,115418,115562,115690,115759,115854,115969,116082,116181,116290,116401,116512,116613,116718,116830,116960,117051,117174,117286,117372,117476,117584,117684,117802,117906,118010,118136,118224,118314,118424,118508,118562,118684,118790,118900,118984,119110,7379,7483,7584,7631,7879,8071,8421,8580,9009,9541,9762,9921,10180,11004,11397,11543,11671,12452,13037,13508,13726,19674,20599,21090,21243"
},
"to": {
- "startLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,289,302,303,304,305,306,313,314,318,322,327,333,340,344,348,353,357,361,365,369,373,377,381,385,389,391,393,397,401,405,410,414,417,421,425,429,433,437,441,446,449,452,455,458,461,464,467,469,471,472,473,476,478,480,482,487,488,492,498,502,503,505,516,517,521,527,531,532,533,537,564,568,596,741,763,908,930,937,942,963,968,973,983,992,1003,1007,1014,1022,1029,1030,1039,1042,1045,1050,1054,1057,1060,1064,1068,1076,1081,1088,1094,1095,1099,1104,1106,1108,1111,1114,1116,1120,1127,1130,1133,1137,1139,1143,1145,1151,1153,1157,1169,1175,1180,1195,1198,1203,1213,1233,1271,1310,1320,1329,1331,1335,1339,1342,1345,1348,1351,1355,1358,1361,1364,1368,1371,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1391,1393,1394,1395,1396,1398,1400,1401,1402,1403,1404,1405,1406,1408,1410,1412,1414,1416,1418,1419,1421,1422,1424,1426,1428,1429,1430,1431,1432,1433,1434,1435,1437,1439,1469,1470,1471,1472,1473,1474,1476,1477,1478,1479,1480,1481,1483,1487,1498,1499,1500,1501,1502,1507,1509,1511,1513,1515,1517,1518,1519,1520,1522,1524,1526,1527,1528,1529,1530,1531,1532,1533,1534,1535,1536,1539,1540,1541,1543,1545,1546,1548,1549,1551,1553,1555,1556,1557,1558,1559,1560,1561,1562,1563,1564,1565,1567,1569,1570,1571,1573,1574,1575,1577,1579,1581,1583,1585,1587,1588,1589,1590,1591,1592,1593,1594,1595,1596,1604,1605,1606,1607,1608,1609,1610,1611,1612,1617,1618,1619,1620,1621,1622,1623,1624,1625,1626,1627,1628,1629,1630,1631,1632",
+ "startLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,287,300,301,302,303,304,311,312,316,320,325,331,338,342,346,351,355,359,363,367,371,375,379,383,387,389,391,395,399,403,408,412,415,419,423,427,431,435,439,444,447,450,453,456,459,462,465,467,469,470,471,474,476,478,480,485,486,490,496,500,501,503,514,515,519,525,529,530,531,535,562,566,594,739,761,906,928,935,940,961,966,971,981,990,1001,1005,1012,1020,1027,1028,1037,1040,1043,1048,1052,1055,1058,1062,1066,1074,1079,1086,1092,1093,1097,1102,1104,1106,1109,1112,1114,1118,1125,1128,1131,1135,1137,1141,1143,1149,1151,1155,1167,1173,1178,1193,1196,1201,1211,1231,1269,1308,1318,1327,1329,1333,1337,1340,1343,1346,1349,1353,1356,1359,1362,1366,1369,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1389,1391,1392,1393,1394,1396,1398,1399,1400,1401,1402,1403,1404,1406,1408,1410,1412,1414,1416,1417,1419,1420,1422,1424,1426,1427,1428,1429,1430,1431,1432,1433,1435,1437,1467,1468,1469,1470,1471,1472,1474,1475,1476,1477,1478,1479,1481,1485,1496,1497,1498,1499,1500,1505,1507,1509,1511,1513,1515,1516,1517,1518,1520,1522,1524,1525,1526,1527,1528,1529,1530,1531,1532,1533,1534,1537,1538,1539,1541,1543,1544,1546,1547,1549,1551,1553,1554,1555,1556,1557,1558,1559,1560,1561,1562,1563,1565,1567,1568,1569,1571,1572,1573,1575,1577,1579,1581,1583,1585,1586,1587,1588,1589,1590,1591,1592,1593,1594,1602,1603,1604,1605,1606,1607,1608,1609,1610,1615,1616,1617,1618,1619,1620,1621,1622,1623,1624,1625,1626,1627,1628,1629,1630",
"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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "420,475,520,569,610,665,728,804,866,939,1007,1085,1166,1227,1302,1378,1455,1533,1603,1674,1735,1847,1924,2002,2108,2214,2293,2373,2430,2488,2562,2637,2702,2768,2835,2903,3007,3319,3399,3480,3539,3598,3657,3716,3775,3838,3902,3960,4019,4090,4162,4234,4307,4364,4422,4495,4569,4643,4718,4790,4863,4933,5061,5130,5200,5270,5347,5426,5502,5579,5643,5708,5777,5854,5929,5998,6066,6143,6209,6306,6371,6440,6539,6598,6656,6713,6772,6844,6912,6980,7039,7102,7192,7283,7343,7409,7476,7542,7612,7676,7729,7842,7900,7965,8029,8078,8139,8200,8261,8323,8387,8451,8515,8580,8643,8703,8764,8823,8883,8945,9016,9076,9144,9211,9279,9347,9415,9501,9588,9650,9711,10030,10102,10159,10207,10256,10307,10341,10388,10437,10483,10515,10579,10641,10696,10756,11178,11252,11330,11423,11493,11571,11625,11695,11780,11832,11905,11979,12048,12123,12197,12271,12360,19017,19986,20064,20154,20242,20338,20839,20928,21175,21456,21741,22134,22611,22833,23055,23323,23550,23780,24010,24240,24470,24697,24936,25162,25407,25537,25667,25897,26145,26364,26647,26855,26986,27213,27459,27684,27933,28154,28399,28694,28916,29154,29368,29598,29821,30036,30244,30368,30492,30597,30714,30928,31074,31214,31300,31648,31736,31966,32368,32601,32683,32781,33373,33473,33709,34117,34356,34450,34508,34745,36763,37005,39155,47869,49136,57960,59241,59777,60107,61230,61486,61722,62269,62763,63436,63651,64179,64743,65118,65236,65774,65931,66075,66395,66565,66706,66835,67134,67437,67996,68258,68608,68961,69055,69361,69623,69748,69875,70114,70325,70444,70637,71092,71273,71395,71654,71767,71954,72056,72500,72624,72909,73796,74090,74420,75340,75512,75848,76514,77585,80412,83380,83968,84562,84675,84904,85242,85402,85554,85725,85892,86135,86305,86478,86649,86923,87122,87369,87453,87549,87645,87743,87843,87945,88047,88149,88251,88353,88453,88549,88661,88790,88913,89067,89221,89319,89433,89527,89667,89801,89897,90009,90109,90225,90321,90433,90573,90721,90885,91027,91185,91335,91476,91620,91755,91891,92033,92175,92287,92427,92495,92568,92642,92715,92789,92935,93079,94563,94629,94719,94799,94891,94989,95099,95177,95283,95375,95479,95589,95711,95874,96428,96508,96608,96698,96808,97135,97235,97347,97461,97577,97693,97787,97901,98019,98121,98241,98363,98445,98549,98669,98795,98889,98977,99089,99205,99327,99439,99614,99730,99816,99928,100052,100119,100245,100313,100441,100585,100713,100782,100877,100992,101105,101204,101313,101424,101535,101636,101741,101853,101983,102074,102197,102309,102395,102499,102607,102707,102825,102929,103033,103159,103247,103337,103447,103531,103585,103707,103813,103923,104007,104553,106156,106260,106361,106408,106656,106848,107198,107357,107980,108512,108733,108892,109151,109975,110368,110514,110642,111423,112008,112479,112697,118645,119570,120061",
- "endLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,289,302,303,304,305,312,313,317,321,326,332,339,343,347,352,356,360,364,368,372,376,380,384,388,390,392,396,400,404,409,413,416,420,424,428,432,436,440,445,448,451,454,457,460,463,466,468,470,471,472,475,477,479,481,486,487,491,497,501,502,504,515,516,520,526,530,531,532,536,563,567,595,740,762,907,929,936,941,962,967,972,982,991,1002,1006,1013,1021,1028,1029,1038,1041,1044,1049,1053,1056,1059,1063,1067,1075,1080,1087,1093,1094,1098,1103,1105,1107,1110,1113,1115,1119,1126,1129,1132,1136,1138,1142,1144,1150,1152,1156,1168,1174,1179,1194,1197,1202,1212,1217,1270,1309,1319,1328,1330,1334,1338,1341,1344,1347,1350,1354,1357,1360,1363,1367,1370,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1390,1392,1393,1394,1395,1397,1399,1400,1401,1402,1403,1404,1405,1407,1409,1411,1413,1415,1417,1418,1420,1421,1423,1425,1427,1428,1429,1430,1431,1432,1433,1434,1436,1438,1440,1469,1470,1471,1472,1473,1475,1476,1477,1478,1479,1480,1482,1486,1490,1498,1499,1500,1501,1502,1508,1510,1512,1514,1516,1517,1518,1519,1521,1523,1525,1526,1527,1528,1529,1530,1531,1532,1533,1534,1535,1538,1539,1540,1542,1544,1545,1547,1548,1550,1552,1554,1555,1556,1557,1558,1559,1560,1561,1562,1563,1564,1566,1568,1569,1570,1572,1573,1574,1576,1578,1580,1582,1584,1586,1587,1588,1589,1590,1591,1592,1593,1594,1595,1596,1604,1605,1606,1607,1608,1609,1610,1611,1612,1617,1618,1619,1620,1621,1622,1623,1624,1625,1626,1627,1628,1629,1630,1631,1632",
+ "startOffsets": "420,475,520,569,610,665,728,804,866,939,1007,1085,1166,1227,1302,1378,1455,1533,1603,1674,1735,1847,1924,2002,2108,2214,2293,2373,2430,2488,2562,2637,2702,2768,2835,2903,3007,3319,3399,3480,3539,3598,3657,3716,3775,3838,3902,3960,4019,4090,4162,4234,4307,4364,4422,4495,4569,4643,4718,4790,4863,4933,5061,5130,5200,5270,5347,5426,5502,5579,5643,5708,5777,5854,5929,5998,6066,6143,6209,6306,6371,6440,6539,6598,6656,6713,6772,6844,6912,6980,7039,7102,7192,7283,7343,7409,7476,7542,7612,7676,7729,7842,7900,7965,8029,8078,8139,8200,8261,8323,8387,8451,8515,8580,8643,8703,8764,8823,8883,8945,9016,9076,9144,9211,9279,9347,9415,9501,9588,9650,9711,10030,10102,10159,10207,10256,10307,10341,10388,10437,10483,10515,10579,10641,10696,10756,11178,11252,11330,11423,11493,11571,11625,11695,11780,11832,11905,11979,12048,12123,12197,12271,12360,18892,19861,19939,20029,20117,20213,20714,20803,21050,21331,21616,22009,22486,22708,22930,23198,23425,23655,23885,24115,24345,24572,24811,25037,25282,25412,25542,25772,26020,26239,26522,26730,26861,27088,27334,27559,27808,28029,28274,28569,28791,29029,29243,29473,29696,29911,30119,30243,30367,30472,30589,30803,30949,31089,31175,31523,31611,31841,32243,32476,32558,32656,33248,33348,33584,33992,34231,34325,34383,34620,36638,36880,39030,47744,49011,57835,59116,59652,59982,61105,61361,61597,62144,62638,63311,63526,64054,64618,64993,65111,65649,65806,65950,66270,66440,66581,66710,67009,67312,67871,68133,68483,68836,68930,69236,69498,69623,69750,69989,70200,70319,70512,70967,71148,71270,71529,71642,71829,71931,72375,72499,72784,73671,73965,74295,75215,75387,75723,76389,77418,80245,83213,83801,84395,84508,84737,85075,85235,85387,85558,85725,85968,86138,86311,86482,86756,86955,87202,87286,87382,87478,87576,87676,87778,87880,87982,88084,88186,88286,88382,88494,88623,88746,88900,89054,89152,89266,89360,89500,89634,89730,89842,89942,90058,90154,90266,90406,90554,90718,90860,91018,91168,91309,91453,91588,91724,91866,92008,92120,92260,92328,92401,92475,92548,92622,92768,92912,94396,94462,94552,94632,94724,94822,94932,95010,95116,95208,95312,95422,95544,95707,96261,96341,96441,96531,96641,96968,97068,97180,97294,97410,97526,97620,97734,97852,97954,98074,98196,98278,98382,98502,98628,98722,98810,98922,99038,99160,99272,99447,99563,99649,99761,99885,99952,100078,100146,100274,100418,100546,100615,100710,100825,100938,101037,101146,101257,101368,101469,101574,101686,101816,101907,102030,102142,102228,102332,102440,102540,102658,102762,102866,102992,103080,103170,103280,103364,103418,103540,103646,103756,103840,104386,105989,106093,106194,106241,106489,106681,107031,107190,107813,108345,108566,108725,108984,109808,110201,110347,110475,111256,111841,112312,112530,118478,119403,119894",
+ "endLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,287,300,301,302,303,310,311,315,319,324,330,337,341,345,350,354,358,362,366,370,374,378,382,386,388,390,394,398,402,407,411,414,418,422,426,430,434,438,443,446,449,452,455,458,461,464,466,468,469,470,473,475,477,479,484,485,489,495,499,500,502,513,514,518,524,528,529,530,534,561,565,593,738,760,905,927,934,939,960,965,970,980,989,1000,1004,1011,1019,1026,1027,1036,1039,1042,1047,1051,1054,1057,1061,1065,1073,1078,1085,1091,1092,1096,1101,1103,1105,1108,1111,1113,1117,1124,1127,1130,1134,1136,1140,1142,1148,1150,1154,1166,1172,1177,1192,1195,1200,1210,1215,1268,1307,1317,1326,1328,1332,1336,1339,1342,1345,1348,1352,1355,1358,1361,1365,1368,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1388,1390,1391,1392,1393,1395,1397,1398,1399,1400,1401,1402,1403,1405,1407,1409,1411,1413,1415,1416,1418,1419,1421,1423,1425,1426,1427,1428,1429,1430,1431,1432,1434,1436,1438,1467,1468,1469,1470,1471,1473,1474,1475,1476,1477,1478,1480,1484,1488,1496,1497,1498,1499,1500,1506,1508,1510,1512,1514,1515,1516,1517,1519,1521,1523,1524,1525,1526,1527,1528,1529,1530,1531,1532,1533,1536,1537,1538,1540,1542,1543,1545,1546,1548,1550,1552,1553,1554,1555,1556,1557,1558,1559,1560,1561,1562,1564,1566,1567,1568,1570,1571,1572,1574,1576,1578,1580,1582,1584,1585,1586,1587,1588,1589,1590,1591,1592,1593,1594,1602,1603,1604,1605,1606,1607,1608,1609,1610,1615,1616,1617,1618,1619,1620,1621,1622,1623,1624,1625,1626,1627,1628,1629,1630",
"endColumns": "54,44,48,40,54,62,75,61,72,67,77,80,60,74,75,76,77,69,70,60,61,76,77,105,105,78,79,56,57,73,74,64,65,66,67,103,105,79,80,58,58,58,58,58,62,63,57,58,70,71,71,72,56,57,72,73,73,74,71,72,69,70,68,69,69,76,78,75,76,63,64,68,76,74,68,67,76,65,96,64,68,98,58,57,56,58,71,67,67,58,62,89,90,59,65,66,65,69,63,52,112,57,64,63,48,60,60,60,61,63,63,63,64,62,59,60,58,59,61,70,59,67,66,67,67,67,85,86,61,60,56,71,56,47,48,50,33,46,48,45,31,63,61,54,59,69,73,77,92,69,77,53,69,84,51,72,73,68,74,73,73,88,69,70,77,89,87,95,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,57,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,12,12,97,113,93,12,12,95,111,99,115,95,111,12,12,12,12,12,12,140,12,134,12,12,12,111,139,67,72,73,72,73,12,12,12,65,89,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,91,12,12,12,12,12,93,113,117,12,12,12,81,103,119,125,93,87,111,115,121,111,12,115,85,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,12,12,90,122,12,85,103,12,12,12,12,12,12,87,89,109,83,53,121,105,109,83,125,1602,103,100,46,247,191,349,158,428,531,220,158,258,823,392,145,127,780,584,470,217,5947,924,490,152",
- "endOffsets": "470,515,564,605,660,723,799,861,934,1002,1080,1161,1222,1297,1373,1450,1528,1598,1669,1730,1792,1919,1997,2103,2209,2288,2368,2425,2483,2557,2632,2697,2763,2830,2898,3002,3108,3394,3475,3534,3593,3652,3711,3770,3833,3897,3955,4014,4085,4157,4229,4302,4359,4417,4490,4564,4638,4713,4785,4858,4928,4999,5125,5195,5265,5342,5421,5497,5574,5638,5703,5772,5849,5924,5993,6061,6138,6204,6301,6366,6435,6534,6593,6651,6708,6767,6839,6907,6975,7034,7097,7187,7278,7338,7404,7471,7537,7607,7671,7724,7837,7895,7960,8024,8073,8134,8195,8256,8318,8382,8446,8510,8575,8638,8698,8759,8818,8878,8940,9011,9071,9139,9206,9274,9342,9410,9496,9583,9645,9706,9763,10097,10154,10202,10251,10302,10336,10383,10432,10478,10510,10574,10636,10691,10751,10821,11247,11325,11418,11488,11566,11620,11690,11775,11827,11900,11974,12043,12118,12192,12266,12355,12425,19083,20059,20149,20237,20333,20834,20923,21170,21451,21736,22129,22606,22828,23050,23318,23545,23775,24005,24235,24465,24692,24931,25157,25402,25532,25662,25892,26140,26359,26642,26850,26981,27208,27454,27679,27928,28149,28394,28689,28911,29149,29363,29593,29816,30031,30239,30363,30487,30592,30709,30923,31069,31209,31295,31643,31731,31961,32363,32596,32678,32776,33368,33468,33704,34112,34351,34445,34503,34740,36758,37000,39150,47864,49131,57955,59236,59772,60102,61225,61481,61717,62264,62758,63431,63646,64174,64738,65113,65231,65769,65926,66070,66390,66560,66701,66830,67129,67432,67991,68253,68603,68956,69050,69356,69618,69743,69870,70109,70320,70439,70632,71087,71268,71390,71649,71762,71949,72051,72495,72619,72904,73791,74085,74415,75335,75507,75843,76509,76794,80407,83375,83963,84557,84670,84899,85237,85397,85549,85720,85887,86130,86300,86473,86644,86918,87117,87364,87448,87544,87640,87738,87838,87940,88042,88144,88246,88348,88448,88544,88656,88785,88908,89062,89216,89314,89428,89522,89662,89796,89892,90004,90104,90220,90316,90428,90568,90716,90880,91022,91180,91330,91471,91615,91750,91886,92028,92170,92282,92422,92490,92563,92637,92710,92784,92930,93074,93212,94624,94714,94794,94886,94984,95094,95172,95278,95370,95474,95584,95706,95869,96026,96503,96603,96693,96803,96895,97230,97342,97456,97572,97688,97782,97896,98014,98116,98236,98358,98440,98544,98664,98790,98884,98972,99084,99200,99322,99434,99609,99725,99811,99923,100047,100114,100240,100308,100436,100580,100708,100777,100872,100987,101100,101199,101308,101419,101530,101631,101736,101848,101978,102069,102192,102304,102390,102494,102602,102702,102820,102924,103028,103154,103242,103332,103442,103526,103580,103702,103808,103918,104002,104128,106151,106255,106356,106403,106651,106843,107193,107352,107781,108507,108728,108887,109146,109970,110363,110509,110637,111418,112003,112474,112692,118640,119565,120056,120209"
+ "endOffsets": "470,515,564,605,660,723,799,861,934,1002,1080,1161,1222,1297,1373,1450,1528,1598,1669,1730,1792,1919,1997,2103,2209,2288,2368,2425,2483,2557,2632,2697,2763,2830,2898,3002,3108,3394,3475,3534,3593,3652,3711,3770,3833,3897,3955,4014,4085,4157,4229,4302,4359,4417,4490,4564,4638,4713,4785,4858,4928,4999,5125,5195,5265,5342,5421,5497,5574,5638,5703,5772,5849,5924,5993,6061,6138,6204,6301,6366,6435,6534,6593,6651,6708,6767,6839,6907,6975,7034,7097,7187,7278,7338,7404,7471,7537,7607,7671,7724,7837,7895,7960,8024,8073,8134,8195,8256,8318,8382,8446,8510,8575,8638,8698,8759,8818,8878,8940,9011,9071,9139,9206,9274,9342,9410,9496,9583,9645,9706,9763,10097,10154,10202,10251,10302,10336,10383,10432,10478,10510,10574,10636,10691,10751,10821,11247,11325,11418,11488,11566,11620,11690,11775,11827,11900,11974,12043,12118,12192,12266,12355,12425,18958,19934,20024,20112,20208,20709,20798,21045,21326,21611,22004,22481,22703,22925,23193,23420,23650,23880,24110,24340,24567,24806,25032,25277,25407,25537,25767,26015,26234,26517,26725,26856,27083,27329,27554,27803,28024,28269,28564,28786,29024,29238,29468,29691,29906,30114,30238,30362,30467,30584,30798,30944,31084,31170,31518,31606,31836,32238,32471,32553,32651,33243,33343,33579,33987,34226,34320,34378,34615,36633,36875,39025,47739,49006,57830,59111,59647,59977,61100,61356,61592,62139,62633,63306,63521,64049,64613,64988,65106,65644,65801,65945,66265,66435,66576,66705,67004,67307,67866,68128,68478,68831,68925,69231,69493,69618,69745,69984,70195,70314,70507,70962,71143,71265,71524,71637,71824,71926,72370,72494,72779,73666,73960,74290,75210,75382,75718,76384,76669,80240,83208,83796,84390,84503,84732,85070,85230,85382,85553,85720,85963,86133,86306,86477,86751,86950,87197,87281,87377,87473,87571,87671,87773,87875,87977,88079,88181,88281,88377,88489,88618,88741,88895,89049,89147,89261,89355,89495,89629,89725,89837,89937,90053,90149,90261,90401,90549,90713,90855,91013,91163,91304,91448,91583,91719,91861,92003,92115,92255,92323,92396,92470,92543,92617,92763,92907,93045,94457,94547,94627,94719,94817,94927,95005,95111,95203,95307,95417,95539,95702,95859,96336,96436,96526,96636,96728,97063,97175,97289,97405,97521,97615,97729,97847,97949,98069,98191,98273,98377,98497,98623,98717,98805,98917,99033,99155,99267,99442,99558,99644,99756,99880,99947,100073,100141,100269,100413,100541,100610,100705,100820,100933,101032,101141,101252,101363,101464,101569,101681,101811,101902,102025,102137,102223,102327,102435,102535,102653,102757,102861,102987,103075,103165,103275,103359,103413,103535,103641,103751,103835,103961,105984,106088,106189,106236,106484,106676,107026,107185,107614,108340,108561,108720,108979,109803,110196,110342,110470,111251,111836,112307,112525,118473,119398,119889,120042"
}
},
{
@@ -187,12 +187,12 @@
"endOffsets": "83,411,647"
},
"to": {
- "startLines": "1491,1492,1503",
+ "startLines": "1489,1490,1501",
"startColumns": "4,4,4",
- "startOffsets": "96031,96101,96900",
- "endLines": "1491,1497,1506",
+ "startOffsets": "95864,95934,96733",
+ "endLines": "1489,1495,1504",
"endColumns": "69,12,12",
- "endOffsets": "96096,96423,97130"
+ "endOffsets": "95929,96256,96963"
}
},
{
@@ -206,12 +206,12 @@
"endOffsets": "207"
},
"to": {
- "startLines": "1613",
+ "startLines": "1611",
"startColumns": "4",
- "startOffsets": "107786",
- "endLines": "1616",
+ "startOffsets": "107619",
+ "endLines": "1614",
"endColumns": "24",
- "endOffsets": "107975"
+ "endOffsets": "107808"
}
},
{
@@ -236,18 +236,18 @@
"from": {
"startLines": "54,59,68,64,24,29,34,39,44,19,49,73,77",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2066,2275,2648,2487,897,1081,1267,1453,1657,713,1864,2857,3041",
+ "startOffsets": "2120,2334,2716,2551,921,1110,1301,1492,1701,732,1913,2940,3128",
"endLines": "57,62,71,66,27,32,37,42,47,22,52,75,80",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "2269,2481,2851,2642,1075,1261,1447,1651,1858,891,2060,3035,3273"
+ "endOffsets": "2326,2543,2932,2708,1102,1293,1484,1693,1905,913,2112,3120,3363"
},
"to": {
- "startLines": "1218,1222,1226,1230,1441,1445,1449,1453,1457,1461,1465,1597,1600",
+ "startLines": "1216,1220,1224,1228,1439,1443,1447,1451,1455,1459,1463,1595,1598",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "76799,77007,77218,77425,93217,93400,93585,93770,93973,94179,94362,104133,104316",
- "endLines": "1221,1225,1229,1232,1444,1448,1452,1456,1460,1464,1468,1599,1603",
+ "startOffsets": "76674,76882,77093,77258,93050,93233,93418,93603,93806,94012,94195,103966,104149",
+ "endLines": "1219,1223,1227,1230,1442,1446,1450,1454,1458,1462,1466,1597,1601",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "77002,77213,77420,77580,93395,93580,93765,93968,94174,94357,94558,104311,104548"
+ "endOffsets": "76877,77088,77253,77413,93228,93413,93598,93801,94007,94190,94391,104144,104381"
}
},
{
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
index 3eec949..acda6fc 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
@@ -71,6 +71,10 @@
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml"
},
+ {
+ "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_fly.png.flat",
+ "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\fly.png"
+ },
{
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_single.9.png.flat",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_single.9.png"
@@ -99,10 +103,18 @@
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\menu\\note_edit.xml"
},
+ {
+ "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_moon.png.flat",
+ "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\moon.png"
+ },
{
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_red.png.flat",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_red.png"
},
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat",
+ "source": "net.micode.notes.app-main-7:/layout/note_list.xml"
+ },
{
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png"
@@ -363,10 +375,6 @@
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_yellow.png.flat",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_yellow.png"
},
- {
- "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_batterfly.png.flat",
- "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\batterfly.png"
- },
{
"merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_green.9.png.flat",
"source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_green.9.png"
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/layout.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/layout.json
index b8d6080..168ce89 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/layout.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/layout.json
@@ -4,59 +4,63 @@
"source": "net.micode.notes.app-main-7:/layout/note_list.xml"
},
{
- "merged": "net.micode.notes.app-mergeDebugResources-4:/layout/note_list_footer.xml",
- "source": "net.micode.notes.app-main-7:/layout/note_list_footer.xml"
+ "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\activity_splash.xml",
+ "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\activity_splash.xml"
},
{
- "merged": "net.micode.notes.app-mergeDebugResources-4:/layout/widget_4x.xml",
- "source": "net.micode.notes.app-main-7:/layout/widget_4x.xml"
+ "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\account_dialog_title.xml",
+ "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\account_dialog_title.xml"
},
{
- "merged": "net.micode.notes.app-mergeDebugResources-4:/layout/activity_splash.xml",
- "source": "net.micode.notes.app-main-7:/layout/activity_splash.xml"
+ "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\note_list.xml",
+ "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\note_list.xml"
},
{
- "merged": "net.micode.notes.app-mergeDebugResources-4:/layout/dialog_edit_text.xml",
- "source": "net.micode.notes.app-main-7:/layout/dialog_edit_text.xml"
+ "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\widget_2x.xml",
+ "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\widget_2x.xml"
},
{
- "merged": "net.micode.notes.app-mergeDebugResources-4:/layout/add_account_text.xml",
- "source": "net.micode.notes.app-main-7:/layout/add_account_text.xml"
+ "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\note_item.xml",
+ "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\note_item.xml"
},
{
- "merged": "net.micode.notes.app-mergeDebugResources-4:/layout/widget_2x.xml",
- "source": "net.micode.notes.app-main-7:/layout/widget_2x.xml"
+ "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\note_edit_list_item.xml",
+ "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\note_edit_list_item.xml"
},
{
- "merged": "net.micode.notes.app-mergeDebugResources-4:/layout/note_list_dropdown_menu.xml",
- "source": "net.micode.notes.app-main-7:/layout/note_list_dropdown_menu.xml"
+ "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\folder_list_item.xml",
+ "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml"
},
{
- "merged": "net.micode.notes.app-mergeDebugResources-4:/layout/folder_list_item.xml",
- "source": "net.micode.notes.app-main-7:/layout/folder_list_item.xml"
+ "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\dialog_edit_text.xml",
+ "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml"
},
{
- "merged": "net.micode.notes.app-mergeDebugResources-4:/layout/note_edit.xml",
- "source": "net.micode.notes.app-main-7:/layout/note_edit.xml"
+ "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\add_account_text.xml",
+ "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml"
},
{
- "merged": "net.micode.notes.app-mergeDebugResources-4:/layout/account_dialog_title.xml",
- "source": "net.micode.notes.app-main-7:/layout/account_dialog_title.xml"
+ "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\note_list_dropdown_menu.xml",
+ "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml"
},
{
- "merged": "net.micode.notes.app-mergeDebugResources-4:/layout/note_item.xml",
- "source": "net.micode.notes.app-main-7:/layout/note_item.xml"
+ "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\note_edit.xml",
+ "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\note_edit.xml"
},
{
- "merged": "net.micode.notes.app-mergeDebugResources-4:/layout/settings_header.xml",
- "source": "net.micode.notes.app-main-7:/layout/settings_header.xml"
+ "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\datetime_picker.xml",
+ "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml"
},
{
- "merged": "net.micode.notes.app-mergeDebugResources-4:/layout/datetime_picker.xml",
- "source": "net.micode.notes.app-main-7:/layout/datetime_picker.xml"
+ "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\widget_4x.xml",
+ "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\widget_4x.xml"
},
{
- "merged": "net.micode.notes.app-mergeDebugResources-4:/layout/note_edit_list_item.xml",
- "source": "net.micode.notes.app-main-7:/layout/note_edit_list_item.xml"
+ "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\note_list_footer.xml",
+ "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\note_list_footer.xml"
+ },
+ {
+ "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\settings_header.xml",
+ "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\settings_header.xml"
}
]
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/batterfly.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/fly.png
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/batterfly.png
rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/fly.png
diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/moon.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/moon.png
new file mode 100644
index 0000000..009e12c
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/moon.png differ
diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list.xml
index 6b25d38..234fa83 100644
--- a/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list.xml
+++ b/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list.xml
@@ -18,8 +18,8 @@
+ android:layout_height="fill_parent">
+
+
+
+
+
+
+
diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/values-zh-rCN/values-zh-rCN.xml
index fe2f251..4d6201a 100644
--- a/src/Notes-master1/app/build/intermediates/packaged_res/debug/values-zh-rCN/values-zh-rCN.xml
+++ b/src/Notes-master1/app/build/intermediates/packaged_res/debug/values-zh-rCN/values-zh-rCN.xml
@@ -11,7 +11,7 @@
确认要删除该条便签吗?
确认要删除所选的 %d 条便签吗?
删除
- 便签
+ 原神
便签2x2
便签4x4
删除
@@ -63,6 +63,7 @@
同步
取消同步
选择文件夹
+ 回收站
已过期
字符数
发送邮件
diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml
index 51528df..7151283 100644
--- a/src/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml
+++ b/src/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml
@@ -64,6 +64,7 @@
Delete
Deselect all
Export text
+ Background: fly
Change folder name
Delete folder
View folder
@@ -73,6 +74,7 @@
Small
Super
Enter check list
+ Background: moon
Move to folder
Parent folder
Leave check list
@@ -87,6 +89,7 @@
Sync
Cancel syncing
Select folder
+ Trash Folder
Expired
Length
Send email
diff --git a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
index b4206f3..446d3b6 100644
Binary files a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/3bfd16c938f655ca28ade63ba23d521ee7e7dd397b4098cf252978e1f5693d5f_5.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/3bfd16c938f655ca28ade63ba23d521ee7e7dd397b4098cf252978e1f5693d5f_5.jar
deleted file mode 100644
index 5a52154..0000000
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/3bfd16c938f655ca28ade63ba23d521ee7e7dd397b4098cf252978e1f5693d5f_5.jar and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/3bfd16c938f655ca28ade63ba23d521ee7e7dd397b4098cf252978e1f5693d5f_0.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/aa49da9fe876df390a5dd9a1137bd9d06a85afd23a46633f0dcd62e7d2d7c1a9_0.jar
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/3bfd16c938f655ca28ade63ba23d521ee7e7dd397b4098cf252978e1f5693d5f_0.jar
rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/aa49da9fe876df390a5dd9a1137bd9d06a85afd23a46633f0dcd62e7d2d7c1a9_0.jar
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/aa49da9fe876df390a5dd9a1137bd9d06a85afd23a46633f0dcd62e7d2d7c1a9_5.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/aa49da9fe876df390a5dd9a1137bd9d06a85afd23a46633f0dcd62e7d2d7c1a9_5.jar
new file mode 100644
index 0000000..b860032
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/aa49da9fe876df390a5dd9a1137bd9d06a85afd23a46633f0dcd62e7d2d7c1a9_5.jar differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/3bfd16c938f655ca28ade63ba23d521ee7e7dd397b4098cf252978e1f5693d5f_6.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/aa49da9fe876df390a5dd9a1137bd9d06a85afd23a46633f0dcd62e7d2d7c1a9_6.jar
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/3bfd16c938f655ca28ade63ba23d521ee7e7dd397b4098cf252978e1f5693d5f_6.jar
rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/aa49da9fe876df390a5dd9a1137bd9d06a85afd23a46633f0dcd62e7d2d7c1a9_6.jar
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
index 599abfd..0e8e384 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
index 0f228a5..a6da7d5 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
index f39f781..50b5c74 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
index c8b0935..e9c7f41 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt
index 85301cc..e02bee9 100644
--- a/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt
+++ b/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt
@@ -423,7 +423,6 @@ int drawable abc_textfield_default_mtrl_alpha 0x7f070037
int drawable abc_textfield_search_activated_mtrl_alpha 0x7f070038
int drawable abc_textfield_search_default_mtrl_alpha 0x7f070039
int drawable abc_textfield_search_material 0x7f07003a
-int drawable batterfly 0x7f070080
int drawable bg_btn_set_color 0x7f07003b
int drawable bg_color_btn_mask 0x7f07003c
int drawable call_record 0x7f07003d
@@ -440,60 +439,62 @@ int drawable edit_title_white 0x7f070047
int drawable edit_title_yellow 0x7f070048
int drawable edit_white 0x7f070049
int drawable edit_yellow 0x7f07004a
-int drawable font_large 0x7f07004b
-int drawable font_normal 0x7f07004c
-int drawable font_size_selector_bg 0x7f07004d
-int drawable font_small 0x7f07004e
-int drawable font_super 0x7f07004f
-int drawable icon_app 0x7f070050
-int drawable icon_app_yuan 0x7f070051
-int drawable list_background 0x7f070052
-int drawable list_blue_down 0x7f070053
-int drawable list_blue_middle 0x7f070054
-int drawable list_blue_single 0x7f070055
-int drawable list_blue_up 0x7f070056
-int drawable list_folder 0x7f070057
-int drawable list_footer_bg 0x7f070058
-int drawable list_green_down 0x7f070059
-int drawable list_green_middle 0x7f07005a
-int drawable list_green_single 0x7f07005b
-int drawable list_green_up 0x7f07005c
-int drawable list_red_down 0x7f07005d
-int drawable list_red_middle 0x7f07005e
-int drawable list_red_single 0x7f07005f
-int drawable list_red_up 0x7f070060
-int drawable list_white_down 0x7f070061
-int drawable list_white_middle 0x7f070062
-int drawable list_white_single 0x7f070063
-int drawable list_white_up 0x7f070064
-int drawable list_yellow_down 0x7f070065
-int drawable list_yellow_middle 0x7f070066
-int drawable list_yellow_single 0x7f070067
-int drawable list_yellow_up 0x7f070068
-int drawable menu_delete 0x7f070069
-int drawable menu_move 0x7f07006a
-int drawable new_note 0x7f07006b
-int drawable new_note_normal 0x7f07006c
-int drawable new_note_pressed 0x7f07006d
-int drawable note_edit_color_selector_panel 0x7f07006e
-int drawable notification 0x7f07006f
-int drawable notification_template_icon_bg 0x7f070070
-int drawable rocket 0x7f070081
-int drawable search_result 0x7f070071
-int drawable selected 0x7f070072
-int drawable splash 0x7f070073
-int drawable title_alert 0x7f070074
-int drawable title_bar_bg 0x7f070075
-int drawable widget_2x_blue 0x7f070076
-int drawable widget_2x_green 0x7f070077
-int drawable widget_2x_red 0x7f070078
-int drawable widget_2x_white 0x7f070079
-int drawable widget_2x_yellow 0x7f07007a
-int drawable widget_4x_blue 0x7f07007b
-int drawable widget_4x_green 0x7f07007c
-int drawable widget_4x_red 0x7f07007d
-int drawable widget_4x_white 0x7f07007e
-int drawable widget_4x_yellow 0x7f07007f
+int drawable fly 0x7f07004b
+int drawable font_large 0x7f07004c
+int drawable font_normal 0x7f07004d
+int drawable font_size_selector_bg 0x7f07004e
+int drawable font_small 0x7f07004f
+int drawable font_super 0x7f070050
+int drawable icon_app 0x7f070051
+int drawable icon_app_yuan 0x7f070052
+int drawable list_background 0x7f070053
+int drawable list_blue_down 0x7f070054
+int drawable list_blue_middle 0x7f070055
+int drawable list_blue_single 0x7f070056
+int drawable list_blue_up 0x7f070057
+int drawable list_folder 0x7f070058
+int drawable list_footer_bg 0x7f070059
+int drawable list_green_down 0x7f07005a
+int drawable list_green_middle 0x7f07005b
+int drawable list_green_single 0x7f07005c
+int drawable list_green_up 0x7f07005d
+int drawable list_red_down 0x7f07005e
+int drawable list_red_middle 0x7f07005f
+int drawable list_red_single 0x7f070060
+int drawable list_red_up 0x7f070061
+int drawable list_white_down 0x7f070062
+int drawable list_white_middle 0x7f070063
+int drawable list_white_single 0x7f070064
+int drawable list_white_up 0x7f070065
+int drawable list_yellow_down 0x7f070066
+int drawable list_yellow_middle 0x7f070067
+int drawable list_yellow_single 0x7f070068
+int drawable list_yellow_up 0x7f070069
+int drawable menu_delete 0x7f07006a
+int drawable menu_move 0x7f07006b
+int drawable moon 0x7f07006c
+int drawable new_note 0x7f07006d
+int drawable new_note_normal 0x7f07006e
+int drawable new_note_pressed 0x7f07006f
+int drawable note_edit_color_selector_panel 0x7f070070
+int drawable notification 0x7f070071
+int drawable notification_template_icon_bg 0x7f070072
+int drawable rocket 0x7f070073
+int drawable search_result 0x7f070074
+int drawable selected 0x7f070075
+int drawable splash 0x7f070076
+int drawable title_alert 0x7f070077
+int drawable title_bar_bg 0x7f070078
+int drawable widget_2x_blue 0x7f070079
+int drawable widget_2x_green 0x7f07007a
+int drawable widget_2x_red 0x7f07007b
+int drawable widget_2x_white 0x7f07007c
+int drawable widget_2x_yellow 0x7f07007d
+int drawable widget_4x_blue 0x7f07007e
+int drawable widget_4x_green 0x7f07007f
+int drawable widget_4x_red 0x7f070080
+int drawable widget_4x_white 0x7f070081
+int drawable widget_4x_yellow 0x7f070082
int id account_dialog_subtitle 0x7f080000
int id account_dialog_title 0x7f080001
int id action0 0x7f080002
@@ -581,82 +582,85 @@ int id menu_alert 0x7f080053
int id menu_delete 0x7f080054
int id menu_delete_remind 0x7f080055
int id menu_export_text 0x7f080056
-int id menu_font_size 0x7f080057
-int id menu_list_mode 0x7f080058
-int id menu_new_folder 0x7f080059
-int id menu_new_note 0x7f08005a
-int id menu_search 0x7f08005b
-int id menu_send_to_desktop 0x7f08005c
-int id menu_setting 0x7f08005d
-int id menu_share 0x7f08005e
-int id menu_sync 0x7f08005f
-int id middle 0x7f080060
-int id minute 0x7f080061
-int id move 0x7f080062
-int id multiply 0x7f080063
-int id navigation_bar 0x7f080064
-int id never 0x7f080065
-int id none 0x7f080066
-int id normal 0x7f080067
-int id note_bg_color_selector 0x7f080068
-int id note_edit_list 0x7f080069
-int id note_edit_view 0x7f08006a
-int id note_item 0x7f08006b
-int id note_title 0x7f08006c
-int id notes_list 0x7f08006d
-int id parentPanel 0x7f08006e
-int id prefenerece_sync_status_textview 0x7f08006f
-int id preference_sync_button 0x7f080070
-int id progress_circular 0x7f080071
-int id progress_horizontal 0x7f080072
-int id radio 0x7f080073
-int id screen 0x7f080074
-int id scrollView 0x7f080075
-int id search_badge 0x7f080076
-int id search_bar 0x7f080077
-int id search_button 0x7f080078
-int id search_close_btn 0x7f080079
-int id search_edit_frame 0x7f08007a
-int id search_go_btn 0x7f08007b
-int id search_mag_icon 0x7f08007c
-int id search_plate 0x7f08007d
-int id search_src_text 0x7f08007e
-int id search_voice_btn 0x7f08007f
-int id select_dialog_listview 0x7f080080
-int id selection_menu 0x7f080081
-int id shortcut 0x7f080082
-int id showCustom 0x7f080083
-int id showHome 0x7f080084
-int id showTitle 0x7f080085
-int id split_action_bar 0x7f080086
-int id src_atop 0x7f080087
-int id src_in 0x7f080088
-int id src_over 0x7f080089
-int id status_bar_latest_event_content 0x7f08008a
-int id submit_area 0x7f08008b
-int id sv_note_edit 0x7f08008c
-int id tabMode 0x7f08008d
-int id text 0x7f08008e
-int id text2 0x7f08008f
-int id textSpacerNoButtons 0x7f080090
-int id text_num 0x7f080091
-int id time 0x7f080092
-int id title 0x7f080093
-int id title_template 0x7f080094
-int id topPanel 0x7f080095
-int id tv_alert_date 0x7f080096
-int id tv_folder_name 0x7f080097
-int id tv_modified_date 0x7f080098
-int id tv_name 0x7f080099
-int id tv_time 0x7f08009a
-int id tv_title 0x7f08009b
-int id tv_title_bar 0x7f08009c
-int id up 0x7f08009d
-int id useLogo 0x7f08009e
-int id widget_bg_image 0x7f08009f
-int id widget_text 0x7f0800a0
-int id withText 0x7f0800a1
-int id wrap_content 0x7f0800a2
+int id menu_fly 0x7f080057
+int id menu_font_size 0x7f080058
+int id menu_list_mode 0x7f080059
+int id menu_moon 0x7f08005a
+int id menu_new_folder 0x7f08005b
+int id menu_new_note 0x7f08005c
+int id menu_search 0x7f08005d
+int id menu_send_to_desktop 0x7f08005e
+int id menu_setting 0x7f08005f
+int id menu_share 0x7f080060
+int id menu_sync 0x7f080061
+int id menu_trash 0x7f0800a5
+int id middle 0x7f080062
+int id minute 0x7f080063
+int id move 0x7f080064
+int id multiply 0x7f080065
+int id navigation_bar 0x7f080066
+int id never 0x7f080067
+int id none 0x7f080068
+int id normal 0x7f080069
+int id note_bg_color_selector 0x7f08006a
+int id note_edit_list 0x7f08006b
+int id note_edit_view 0x7f08006c
+int id note_item 0x7f08006d
+int id note_title 0x7f08006e
+int id notes_list 0x7f08006f
+int id parentPanel 0x7f080070
+int id prefenerece_sync_status_textview 0x7f080071
+int id preference_sync_button 0x7f080072
+int id progress_circular 0x7f080073
+int id progress_horizontal 0x7f080074
+int id radio 0x7f080075
+int id screen 0x7f080076
+int id scrollView 0x7f080077
+int id search_badge 0x7f080078
+int id search_bar 0x7f080079
+int id search_button 0x7f08007a
+int id search_close_btn 0x7f08007b
+int id search_edit_frame 0x7f08007c
+int id search_go_btn 0x7f08007d
+int id search_mag_icon 0x7f08007e
+int id search_plate 0x7f08007f
+int id search_src_text 0x7f080080
+int id search_voice_btn 0x7f080081
+int id select_dialog_listview 0x7f080082
+int id selection_menu 0x7f080083
+int id shortcut 0x7f080084
+int id showCustom 0x7f080085
+int id showHome 0x7f080086
+int id showTitle 0x7f080087
+int id split_action_bar 0x7f080088
+int id src_atop 0x7f080089
+int id src_in 0x7f08008a
+int id src_over 0x7f08008b
+int id status_bar_latest_event_content 0x7f08008c
+int id submit_area 0x7f08008d
+int id sv_note_edit 0x7f08008e
+int id tabMode 0x7f08008f
+int id text 0x7f080090
+int id text2 0x7f080091
+int id textSpacerNoButtons 0x7f080092
+int id text_num 0x7f080093
+int id time 0x7f080094
+int id title 0x7f080095
+int id title_template 0x7f080096
+int id topPanel 0x7f080097
+int id tv_alert_date 0x7f080098
+int id tv_folder_name 0x7f080099
+int id tv_modified_date 0x7f08009a
+int id tv_name 0x7f08009b
+int id tv_time 0x7f08009c
+int id tv_title 0x7f08009d
+int id tv_title_bar 0x7f08009e
+int id up 0x7f08009f
+int id useLogo 0x7f0800a0
+int id widget_bg_image 0x7f0800a1
+int id widget_text 0x7f0800a2
+int id withText 0x7f0800a3
+int id wrap_content 0x7f0800a4
int integer abc_config_activityDefaultDur 0x7f090000
int integer abc_config_activityShortDur 0x7f090001
int integer abc_max_action_buttons 0x7f090002
@@ -778,75 +782,78 @@ int string menu_create_folder 0x7f0e0033
int string menu_delete 0x7f0e0034
int string menu_deselect_all 0x7f0e0035
int string menu_export_text 0x7f0e0036
-int string menu_folder_change_name 0x7f0e0037
-int string menu_folder_delete 0x7f0e0038
-int string menu_folder_view 0x7f0e0039
-int string menu_font_large 0x7f0e003a
-int string menu_font_normal 0x7f0e003b
-int string menu_font_size 0x7f0e003c
-int string menu_font_small 0x7f0e003d
-int string menu_font_super 0x7f0e003e
-int string menu_list_mode 0x7f0e003f
-int string menu_move 0x7f0e0040
-int string menu_move_parent_folder 0x7f0e0041
-int string menu_normal_mode 0x7f0e0042
-int string menu_remove_remind 0x7f0e0043
-int string menu_search 0x7f0e0044
-int string menu_select_all 0x7f0e0045
-int string menu_select_none 0x7f0e0046
-int string menu_select_title 0x7f0e0047
-int string menu_send_to_desktop 0x7f0e0048
-int string menu_setting 0x7f0e0049
-int string menu_share 0x7f0e004a
-int string menu_sync 0x7f0e004b
-int string menu_sync_cancel 0x7f0e004c
-int string menu_title_select_folder 0x7f0e004d
-int string note_alert_expired 0x7f0e004e
-int string note_length 0x7f0e004f
-int string note_link_email 0x7f0e0050
-int string note_link_other 0x7f0e0051
-int string note_link_tel 0x7f0e0052
-int string note_link_web 0x7f0e0053
-int string notealert_enter 0x7f0e0054
-int string notealert_ok 0x7f0e0055
-int string notelist_menu_new 0x7f0e0056
-int string notelist_string_info 0x7f0e0057
-int string preferences_account_summary 0x7f0e0058
-int string preferences_account_title 0x7f0e0059
-int string preferences_add_account 0x7f0e005a
-int string preferences_bg_random_appear_title 0x7f0e005b
-int string preferences_button_sync_cancel 0x7f0e005c
-int string preferences_button_sync_immediately 0x7f0e005d
-int string preferences_dialog_change_account_title 0x7f0e005e
-int string preferences_dialog_change_account_warn_msg 0x7f0e005f
-int string preferences_dialog_select_account_tips 0x7f0e0060
-int string preferences_dialog_select_account_title 0x7f0e0061
-int string preferences_last_sync_time 0x7f0e0062
-int string preferences_last_sync_time_format 0x7f0e0063
-int string preferences_menu_cancel 0x7f0e0064
-int string preferences_menu_change_account 0x7f0e0065
-int string preferences_menu_remove_account 0x7f0e0066
-int string preferences_title 0x7f0e0067
-int string preferences_toast_cannot_change_account 0x7f0e0068
-int string preferences_toast_success_set_accout 0x7f0e0069
-int string search 0x7f0e006a
-int string search_hint 0x7f0e006b
-int string search_label 0x7f0e006c
-int string search_setting_description 0x7f0e006d
-int string set_remind_time_message 0x7f0e006e
-int string status_bar_notification_info_overflow 0x7f0e006f
-int string success_sdcard_export 0x7f0e0070
-int string success_sync_account 0x7f0e0071
-int string sync_progress_init_list 0x7f0e0072
-int string sync_progress_login 0x7f0e0073
-int string sync_progress_syncing 0x7f0e0074
-int string ticker_cancel 0x7f0e0075
-int string ticker_fail 0x7f0e0076
-int string ticker_success 0x7f0e0077
-int string ticker_syncing 0x7f0e0078
-int string title_activity_splash 0x7f0e0079
-int string widget_havenot_content 0x7f0e007a
-int string widget_under_visit_mode 0x7f0e007b
+int string menu_fly 0x7f0e0037
+int string menu_folder_change_name 0x7f0e0038
+int string menu_folder_delete 0x7f0e0039
+int string menu_folder_view 0x7f0e003a
+int string menu_font_large 0x7f0e003b
+int string menu_font_normal 0x7f0e003c
+int string menu_font_size 0x7f0e003d
+int string menu_font_small 0x7f0e003e
+int string menu_font_super 0x7f0e003f
+int string menu_list_mode 0x7f0e0040
+int string menu_moon 0x7f0e0041
+int string menu_move 0x7f0e0042
+int string menu_move_parent_folder 0x7f0e0043
+int string menu_normal_mode 0x7f0e0044
+int string menu_remove_remind 0x7f0e0045
+int string menu_search 0x7f0e0046
+int string menu_select_all 0x7f0e0047
+int string menu_select_none 0x7f0e0048
+int string menu_select_title 0x7f0e0049
+int string menu_send_to_desktop 0x7f0e004a
+int string menu_setting 0x7f0e004b
+int string menu_share 0x7f0e004c
+int string menu_sync 0x7f0e004d
+int string menu_sync_cancel 0x7f0e004e
+int string menu_title_select_folder 0x7f0e004f
+int string menu_trash 0x7f0e007e
+int string note_alert_expired 0x7f0e0050
+int string note_length 0x7f0e0051
+int string note_link_email 0x7f0e0052
+int string note_link_other 0x7f0e0053
+int string note_link_tel 0x7f0e0054
+int string note_link_web 0x7f0e0055
+int string notealert_enter 0x7f0e0056
+int string notealert_ok 0x7f0e0057
+int string notelist_menu_new 0x7f0e0058
+int string notelist_string_info 0x7f0e0059
+int string preferences_account_summary 0x7f0e005a
+int string preferences_account_title 0x7f0e005b
+int string preferences_add_account 0x7f0e005c
+int string preferences_bg_random_appear_title 0x7f0e005d
+int string preferences_button_sync_cancel 0x7f0e005e
+int string preferences_button_sync_immediately 0x7f0e005f
+int string preferences_dialog_change_account_title 0x7f0e0060
+int string preferences_dialog_change_account_warn_msg 0x7f0e0061
+int string preferences_dialog_select_account_tips 0x7f0e0062
+int string preferences_dialog_select_account_title 0x7f0e0063
+int string preferences_last_sync_time 0x7f0e0064
+int string preferences_last_sync_time_format 0x7f0e0065
+int string preferences_menu_cancel 0x7f0e0066
+int string preferences_menu_change_account 0x7f0e0067
+int string preferences_menu_remove_account 0x7f0e0068
+int string preferences_title 0x7f0e0069
+int string preferences_toast_cannot_change_account 0x7f0e006a
+int string preferences_toast_success_set_accout 0x7f0e006b
+int string search 0x7f0e006c
+int string search_hint 0x7f0e006d
+int string search_label 0x7f0e006e
+int string search_setting_description 0x7f0e006f
+int string set_remind_time_message 0x7f0e0070
+int string status_bar_notification_info_overflow 0x7f0e0071
+int string success_sdcard_export 0x7f0e0072
+int string success_sync_account 0x7f0e0073
+int string sync_progress_init_list 0x7f0e0074
+int string sync_progress_login 0x7f0e0075
+int string sync_progress_syncing 0x7f0e0076
+int string ticker_cancel 0x7f0e0077
+int string ticker_fail 0x7f0e0078
+int string ticker_success 0x7f0e0079
+int string ticker_syncing 0x7f0e007a
+int string title_activity_splash 0x7f0e007b
+int string widget_havenot_content 0x7f0e007c
+int string widget_under_visit_mode 0x7f0e007d
int style AlertDialog_AppCompat 0x7f0f0000
int style AlertDialog_AppCompat_Light 0x7f0f0001
int style Animation_AppCompat_Dialog 0x7f0f0002
diff --git a/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
index 512116f..f0eb1d4 100644
--- a/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
+++ b/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
@@ -1,141 +1,143 @@
-net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Icon2 = 0x7f0f009d
net.micode.notes:style/Widget.AppCompat.Toolbar.Button.Navigation = 0x7f0f0131
net.micode.notes:style/Widget.AppCompat.Light.ActionButton.Overflow = 0x7f0f0114
-net.micode.notes:style/Widget.AppCompat.Button.Small = 0x7f0f0100
-net.micode.notes:drawable/list_green_single = 0x7f07005b
-net.micode.notes:styleable/TextAppearance = 0x7f100015
net.micode.notes:style/Base.TextAppearance.AppCompat.SearchResult.Subtitle = 0x7f0f001d
+net.micode.notes:styleable/TextAppearance = 0x7f100015
+net.micode.notes:style/Widget.AppCompat.Button.Small = 0x7f0f0100
+net.micode.notes:drawable/list_green_single = 0x7f07005c
net.micode.notes:style/Widget.AppCompat.PopupWindow = 0x7f0f0125
net.micode.notes:styleable/ActionBar = 0x7f100000
net.micode.notes:style/Widget.AppCompat.ListView.DropDown = 0x7f0f0121
-net.micode.notes:string/menu_house = 0x7f0e007d
-net.micode.notes:style/Widget.AppCompat.PopupMenu = 0x7f0f0123
-net.micode.notes:style/Base.Widget.AppCompat.ActionButton.CloseMode = 0x7f0f005b
net.micode.notes:style/TextAppearanceLarge = 0x7f0f00d4
-net.micode.notes:id/menu_house = 0x7f0800a4
net.micode.notes:style/Widget.AppCompat.Toolbar = 0x7f0f0130
-net.micode.notes:style/Widget.AppCompat.ActivityChooserView = 0x7f0f00fa
+net.micode.notes:style/Widget.AppCompat.Light.ListView.DropDown = 0x7f0f011a
+net.micode.notes:styleable/ActionMode = 0x7f100004
net.micode.notes:style/TextAppearance.AppCompat.Widget.PopupMenu.Large = 0x7f0f00c8
-net.micode.notes:style/Base.AlertDialog.AppCompat = 0x7f0f0004
-net.micode.notes:style/TextAppearance.AppCompat.Light.SearchResult.Title = 0x7f0f00b0
-net.micode.notes:id/line1 = 0x7f08004a
-net.micode.notes:style/Widget.AppCompat.Light.SearchView = 0x7f0f011d
-net.micode.notes:style/Widget.AppCompat.Light.ActionMode.Inverse = 0x7f0f0115
+net.micode.notes:string/call_record_folder_name = 0x7f0e0019
net.micode.notes:style/TextAppearance.AppCompat.SearchResult.Title = 0x7f0f00b7
-net.micode.notes:style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Small = 0x7f0f00b2
+net.micode.notes:style/Base.AlertDialog.AppCompat = 0x7f0f0004
net.micode.notes:menu/note_edit = 0x7f0b0002
-net.micode.notes:style/RtlOverlay.Widget.AppCompat.ActionBar.TitleItem = 0x7f0f0095
-net.micode.notes:style/Base.Widget.AppCompat.Button.Borderless = 0x7f0f0061
-net.micode.notes:layout/settings_header = 0x7f0a0030
-net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0e0061
-net.micode.notes:id/text_num = 0x7f080091
-net.micode.notes:style/Widget.AppCompat.ActionButton = 0x7f0f00f6
+net.micode.notes:style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Small = 0x7f0f00b2
+net.micode.notes:style/Theme.AppCompat.Light.DialogWhenLarge = 0x7f0f00e6
net.micode.notes:style/Widget.AppCompat.EditText = 0x7f0f0108
net.micode.notes:style/TextAppearance.AppCompat.Widget.DropDownItem = 0x7f0f00c7
-net.micode.notes:drawable/abc_btn_borderless_material = 0x7f070001
+net.micode.notes:style/RtlOverlay.Widget.AppCompat.ActionBar.TitleItem = 0x7f0f0095
+net.micode.notes:style/Base.Widget.AppCompat.ActionButton.CloseMode = 0x7f0f005b
+net.micode.notes:string/preferences_menu_remove_account = 0x7f0e0068
+net.micode.notes:style/ThemeOverlay.Notesmaster1.FullscreenContainer = 0x7f0f00f0
+net.micode.notes:style/Widget.AppCompat.Spinner = 0x7f0f012b
+net.micode.notes:style/Widget.AppCompat.Light.SearchView = 0x7f0f011d
net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Query = 0x7f0f009e
-net.micode.notes:drawable/abc_ic_menu_share_mtrl_alpha = 0x7f07001c
-net.micode.notes:string/status_bar_notification_info_overflow = 0x7f0e006f
+net.micode.notes:drawable/abc_btn_borderless_material = 0x7f070001
+net.micode.notes:id/line1 = 0x7f08004a
+net.micode.notes:style/TextAppearance.AppCompat.Light.SearchResult.Title = 0x7f0f00b0
+net.micode.notes:string/success_sync_account = 0x7f0e0073
net.micode.notes:id/ll_font_super = 0x7f080051
net.micode.notes:style/Base.V7.Theme.AppCompat.Light = 0x7f0f0051
-net.micode.notes:string/success_sync_account = 0x7f0e0071
+net.micode.notes:style/Platform.V11.AppCompat.Light = 0x7f0f0091
+net.micode.notes:style/Base.Widget.AppCompat.Button.Borderless = 0x7f0f0061
+net.micode.notes:style/Widget.AppCompat.ActionButton = 0x7f0f00f6
+net.micode.notes:id/text_num = 0x7f080093
+net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0e0063
+net.micode.notes:style/Theme.Notesmaster1.Fullscreen = 0x7f0f00ea
+net.micode.notes:style/Widget.AppCompat.ActivityChooserView = 0x7f0f00fa
+net.micode.notes:style/Widget.AppCompat.Light.ActionMode.Inverse = 0x7f0f0115
+net.micode.notes:string/status_bar_notification_info_overflow = 0x7f0e0071
+net.micode.notes:drawable/abc_ic_menu_share_mtrl_alpha = 0x7f07001c
net.micode.notes:style/ThemeOverlay.AppCompat.Light = 0x7f0f00ef
-net.micode.notes:id/screen = 0x7f080074
+net.micode.notes:id/screen = 0x7f080076
net.micode.notes:style/Platform.ThemeOverlay.AppCompat.Dark = 0x7f0f008e
-net.micode.notes:style/Base.Widget.AppCompat.ProgressBar = 0x7f0f007d
net.micode.notes:style/ThemeOverlay.AppCompat.ActionBar = 0x7f0f00ec
-net.micode.notes:string/preferences_menu_remove_account = 0x7f0e0066
-net.micode.notes:style/ThemeOverlay.Notesmaster1.FullscreenContainer = 0x7f0f00f0
+net.micode.notes:style/Base.Widget.AppCompat.ProgressBar = 0x7f0f007d
+net.micode.notes:id/wrap_content = 0x7f0800a4
net.micode.notes:drawable/edit_title_blue = 0x7f070044
-net.micode.notes:string/dummy_content = 0x7f0e001e
net.micode.notes:style/TextAppearance.AppCompat.Display1 = 0x7f0f00a7
-net.micode.notes:id/wrap_content = 0x7f0800a2
-net.micode.notes:style/Platform.V11.AppCompat.Light = 0x7f0f0091
-net.micode.notes:style/Widget.AppCompat.Light.ListView.DropDown = 0x7f0f011a
-net.micode.notes:styleable/ActionMode = 0x7f100004
-net.micode.notes:styleable/ListPopupWindow = 0x7f10000c
-net.micode.notes:style/Base.Widget.AppCompat.ListView.DropDown = 0x7f0f0078
-net.micode.notes:id/custom = 0x7f080020
-net.micode.notes:styleable/LinearLayoutCompat = 0x7f10000a
-net.micode.notes:id/menu_notes = 0x7f0800a6
-net.micode.notes:string/success_sdcard_export = 0x7f0e0070
-net.micode.notes:style/Theme.AppCompat.Light.DialogWhenLarge = 0x7f0f00e6
+net.micode.notes:string/dummy_content = 0x7f0e001e
net.micode.notes:drawable/edit_red = 0x7f070043
net.micode.notes:style/TextAppearance.AppCompat.Medium.Inverse = 0x7f0f00b4
net.micode.notes:dimen/abc_action_button_min_width_material = 0x7f06000d
net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse = 0x7f0f0029
+net.micode.notes:style/AlertDialog.AppCompat = 0x7f0f0000
+net.micode.notes:style/Base.Widget.AppCompat.ActionBar.Solid = 0x7f0f0056
net.micode.notes:id/collapseActionView = 0x7f08001e
net.micode.notes:drawable/bg_btn_set_color = 0x7f07003b
-net.micode.notes:id/menu_new_folder = 0x7f080059
+net.micode.notes:id/menu_new_folder = 0x7f08005b
net.micode.notes:style/TextAppearance.AppCompat.Small = 0x7f0f00b8
-net.micode.notes:string/preferences_add_account = 0x7f0e005a
+net.micode.notes:string/preferences_add_account = 0x7f0e005c
+net.micode.notes:style/Base.Widget.AppCompat.ListView.DropDown = 0x7f0f0078
+net.micode.notes:styleable/ListPopupWindow = 0x7f10000c
+net.micode.notes:id/custom = 0x7f080020
+net.micode.notes:styleable/LinearLayoutCompat = 0x7f10000a
+net.micode.notes:string/success_sdcard_export = 0x7f0e0072
+net.micode.notes:layout/settings_header = 0x7f0a0030
net.micode.notes:style/TextAppearance.AppCompat.Menu = 0x7f0f00b5
net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle = 0x7f0f00c3
net.micode.notes:style/RtlOverlay.Widget.AppCompat.SearchView.MagIcon = 0x7f0f00a0
-net.micode.notes:string/menu_send_to_desktop = 0x7f0e0048
+net.micode.notes:string/menu_send_to_desktop = 0x7f0e004a
net.micode.notes:style/TextAppearance.AppCompat.Title.Inverse = 0x7f0f00bd
net.micode.notes:style/TextAppearance.AppCompat.Button = 0x7f0f00a5
-net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Icon1 = 0x7f0f009c
net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse = 0x7f0f00c2
net.micode.notes:style/TextAppearance.AppCompat.Caption = 0x7f0f00a6
net.micode.notes:style/Base.Widget.AppCompat.ActionButton = 0x7f0f005a
net.micode.notes:style/TextAppearance.StatusBar.EventContent.Line2 = 0x7f0f00ce
net.micode.notes:style/Widget.AppCompat.ListView = 0x7f0f0120
-net.micode.notes:string/menu_select_none = 0x7f0e0046
+net.micode.notes:string/menu_select_none = 0x7f0e0048
net.micode.notes:style/Widget.AppCompat.Light.ActionBar = 0x7f0f0109
-net.micode.notes:menu/call_note_edit = 0x7f0b0000
-net.micode.notes:string/menu_share = 0x7f0e004a
+net.micode.notes:layout/notification_template_big_media_narrow = 0x7f0a0028
+net.micode.notes:id/menu_send_to_desktop = 0x7f08005e
net.micode.notes:style/Base.Theme.AppCompat.Light.DialogWhenLarge = 0x7f0f0041
net.micode.notes:style/Widget.AppCompat.Light.ActionBar.Solid = 0x7f0f010a
-net.micode.notes:string/menu_font_size = 0x7f0e003c
+net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Icon2 = 0x7f0f009d
+net.micode.notes:string/preferences_account_title = 0x7f0e005b
+net.micode.notes:style/Base.Widget.AppCompat.CompoundButton.CheckBox = 0x7f0f0067
net.micode.notes:layout/abc_alert_dialog_material = 0x7f0a0009
net.micode.notes:style/Base.TextAppearance.AppCompat.Light.Widget.PopupMenu.Small = 0x7f0f0018
-net.micode.notes:style/Base.Widget.AppCompat.CompoundButton.CheckBox = 0x7f0f0067
-net.micode.notes:string/preferences_account_title = 0x7f0e0059
-net.micode.notes:string/search_label = 0x7f0e006c
+net.micode.notes:string/menu_font_size = 0x7f0e003d
+net.micode.notes:string/menu_share = 0x7f0e004c
+net.micode.notes:menu/call_note_edit = 0x7f0b0000
+net.micode.notes:style/Widget.AppCompat.PopupMenu = 0x7f0f0123
net.micode.notes:menu/note_list_dropdown = 0x7f0b0004
net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabBar.Inverse = 0x7f0f010d
-net.micode.notes:id/action_mode_close_button = 0x7f080010
+net.micode.notes:string/search_label = 0x7f0e006e
net.micode.notes:attr/spinnerStyle = 0x7f03009c
+net.micode.notes:id/action_mode_close_button = 0x7f080010
+net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Icon1 = 0x7f0f009c
+net.micode.notes:styleable/PopupWindowBackgroundState = 0x7f100011
+net.micode.notes:id/dialog = 0x7f080026
+net.micode.notes:id/time = 0x7f080094
net.micode.notes:style/Base.Widget.AppCompat.ButtonBar.AlertDialog = 0x7f0f0066
net.micode.notes:style/TextAppearance.AppCompat.Display4 = 0x7f0f00aa
-net.micode.notes:style/Base.V7.Theme.AppCompat.Light.Dialog = 0x7f0f0052
-net.micode.notes:styleable/LinearLayoutCompat_Layout = 0x7f10000b
net.micode.notes:style/RtlOverlay.Widget.AppCompat.PopupMenuItem = 0x7f0f0098
net.micode.notes:drawable/edit_blue = 0x7f070041
net.micode.notes:style/Base.Widget.AppCompat.SearchView = 0x7f0f0080
net.micode.notes:style/Base.Theme.AppCompat.Light.Dialog.FixedSize = 0x7f0f003f
net.micode.notes:style/Base.Widget.AppCompat.ButtonBar = 0x7f0f0065
+net.micode.notes:layout/datetime_picker = 0x7f0a001c
net.micode.notes:style/RtlOverlay.DialogWindowTitle.AppCompat = 0x7f0f0094
net.micode.notes:style/Platform.V11.AppCompat = 0x7f0f0090
net.micode.notes:style/TextAppearance.StatusBar.EventContent.Info = 0x7f0f00cd
net.micode.notes:menu/note_list = 0x7f0b0003
net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inverse = 0x7f0f00c4
-net.micode.notes:id/beginning = 0x7f080016
-net.micode.notes:string/menu_create_folder = 0x7f0e0033
-net.micode.notes:string/format_exported_file_location = 0x7f0e002d
-net.micode.notes:style/TextAppearance.AppCompat.Small.Inverse = 0x7f0f00b9
net.micode.notes:style/Base.Widget.AppCompat.TextView.SpinnerItem = 0x7f0f0085
net.micode.notes:id/iv_bg_red = 0x7f080040
-net.micode.notes:drawable/abc_btn_radio_to_on_mtrl_015 = 0x7f070008
net.micode.notes:style/Widget.AppCompat.ActionMode = 0x7f0f00f9
-net.micode.notes:string/call_record_folder_name = 0x7f0e0019
-net.micode.notes:id/time = 0x7f080092
-net.micode.notes:styleable/PopupWindowBackgroundState = 0x7f100011
-net.micode.notes:id/dialog = 0x7f080026
+net.micode.notes:drawable/abc_btn_radio_to_on_mtrl_015 = 0x7f070008
net.micode.notes:style/Widget.AppCompat.ProgressBar = 0x7f0f0126
net.micode.notes:style/Theme.AppCompat.Light.Dialog.MinWidth = 0x7f0f00e5
-net.micode.notes:id/homeAsUp = 0x7f080035
-net.micode.notes:attr/colorControlHighlight = 0x7f030040
-net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabView.Inverse = 0x7f0f0111
net.micode.notes:style/Base.Widget.AppCompat.SearchView.ActionBar = 0x7f0f0081
net.micode.notes:style/Base.TextAppearance.Widget.AppCompat.Toolbar.Title = 0x7f0f0033
-net.micode.notes:style/Base.Widget.AppCompat.ProgressBar.Horizontal = 0x7f0f007e
+net.micode.notes:id/beginning = 0x7f080016
+net.micode.notes:string/menu_create_folder = 0x7f0e0033
+net.micode.notes:string/format_exported_file_location = 0x7f0e002d
+net.micode.notes:style/TextAppearance.AppCompat.Small.Inverse = 0x7f0f00b9
+net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabView.Inverse = 0x7f0f0111
+net.micode.notes:id/homeAsUp = 0x7f080035
+net.micode.notes:attr/colorControlHighlight = 0x7f030040
net.micode.notes:xml/widget_4x_info = 0x7f110003
+net.micode.notes:style/Base.Widget.AppCompat.ProgressBar.Horizontal = 0x7f0f007e
net.micode.notes:style/Base.Widget.AppCompat.PopupWindow = 0x7f0f007c
net.micode.notes:style/Base.TextAppearance.AppCompat.Display4 = 0x7f0f0012
net.micode.notes:attr/listPopupWindowStyle = 0x7f030070
-net.micode.notes:id/search_voice_btn = 0x7f08007f
+net.micode.notes:id/search_voice_btn = 0x7f080081
net.micode.notes:style/Base.ThemeOverlay.AppCompat.Light = 0x7f0f0046
net.micode.notes:style/Base.TextAppearance.AppCompat.Large = 0x7f0f0015
net.micode.notes:style/Widget.AppCompat.Spinner.Underlined = 0x7f0f012e
@@ -146,24 +148,24 @@ net.micode.notes:string/error_sdcard_export = 0x7f0e0022
net.micode.notes:style/Widget.AppCompat.ListPopupWindow = 0x7f0f011f
net.micode.notes:string/abc_shareactionprovider_share_with_application = 0x7f0e000f
net.micode.notes:style/Widget.Theme.Notesmaster1.ButtonBar.Fullscreen = 0x7f0f0133
-net.micode.notes:style/Base.Widget.AppCompat.Light.ActionBar.TabView = 0x7f0f0073
net.micode.notes:style/Widget.AppCompat.ActionBar.TabBar = 0x7f0f00f3
net.micode.notes:style/Base.TextAppearance.AppCompat.SearchResult = 0x7f0f001c
+net.micode.notes:style/Base.Widget.AppCompat.Light.ActionBar.TabView = 0x7f0f0073
net.micode.notes:style/TextAppearance.AppCompat.Body2 = 0x7f0f00a4
-net.micode.notes:string/search_setting_description = 0x7f0e006d
+net.micode.notes:string/search_setting_description = 0x7f0e006f
net.micode.notes:string/abc_searchview_description_clear = 0x7f0e0009
net.micode.notes:style/Base.Widget.AppCompat.DrawerArrowToggle.Common = 0x7f0f006b
net.micode.notes:style/Base.Theme.AppCompat.CompactMenu = 0x7f0f0035
net.micode.notes:style/RtlOverlay.Widget.AppCompat.PopupMenuItem.InternalGroup = 0x7f0f0099
-net.micode.notes:style/TextAppearance.StatusBar.EventContent.Title = 0x7f0f00d0
-net.micode.notes:style/Base.Widget.AppCompat.Light.ActionBar.Solid = 0x7f0f006f
-net.micode.notes:style/Base.Widget.AppCompat.ListPopupWindow = 0x7f0f0076
-net.micode.notes:style/Widget.AppCompat.TextView.SpinnerItem = 0x7f0f012f
net.micode.notes:style/Widget.AppCompat.Light.ActivityChooserView = 0x7f0f0116
net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse = 0x7f0f00c0
net.micode.notes:styleable/PopupWindow = 0x7f100010
+net.micode.notes:style/Widget.AppCompat.TextView.SpinnerItem = 0x7f0f012f
+net.micode.notes:style/Base.Widget.AppCompat.ListPopupWindow = 0x7f0f0076
+net.micode.notes:style/TextAppearance.StatusBar.EventContent.Title = 0x7f0f00d0
+net.micode.notes:style/Base.Widget.AppCompat.Light.ActionBar.Solid = 0x7f0f006f
net.micode.notes:style/Base.Widget.AppCompat.DropDownItem.Spinner = 0x7f0f006c
-net.micode.notes:id/note_item = 0x7f08006b
+net.micode.notes:id/note_item = 0x7f08006d
net.micode.notes:style/TextAppearance.AppCompat.Body1 = 0x7f0f00a3
net.micode.notes:style/Base.Widget.AppCompat.DrawerArrowToggle = 0x7f0f006a
net.micode.notes:style/Base.Widget.AppCompat.Light.ActionBar.TabText = 0x7f0f0071
@@ -171,74 +173,80 @@ net.micode.notes:styleable/MenuView = 0x7f10000f
net.micode.notes:style/Base.Widget.AppCompat.CompoundButton.Switch = 0x7f0f0069
net.micode.notes:drawable/edit_green = 0x7f070042
net.micode.notes:id/account_dialog_subtitle = 0x7f080000
-net.micode.notes:id/search_edit_frame = 0x7f08007a
+net.micode.notes:id/search_edit_frame = 0x7f08007c
net.micode.notes:style/Widget.AppCompat.Light.DropDownItem.Spinner = 0x7f0f0118
-net.micode.notes:string/preferences_button_sync_immediately = 0x7f0e005d
+net.micode.notes:string/preferences_button_sync_immediately = 0x7f0e005f
net.micode.notes:drawable/delete = 0x7f07003f
-net.micode.notes:string/menu_move_parent_folder = 0x7f0e0041
+net.micode.notes:string/menu_move_parent_folder = 0x7f0e0043
net.micode.notes:style/Base.Widget.AppCompat.ActionButton.Overflow = 0x7f0f005c
net.micode.notes:style/Widget.AppCompat.ActionButton.CloseMode = 0x7f0f00f7
-net.micode.notes:string/menu_sync_cancel = 0x7f0e004c
+net.micode.notes:string/menu_sync_cancel = 0x7f0e004e
net.micode.notes:layout/notification_media_action = 0x7f0a0025
net.micode.notes:style/Base.Widget.AppCompat.ActionMode = 0x7f0f005d
-net.micode.notes:string/ticker_cancel = 0x7f0e0075
-net.micode.notes:style/Base.V7.Theme.AppCompat.Dialog = 0x7f0f0050
+net.micode.notes:style/Platform.AppCompat = 0x7f0f008c
+net.micode.notes:style/Base.Widget.AppCompat.CompoundButton.RadioButton = 0x7f0f0068
net.micode.notes:style/RtlOverlay.Widget.AppCompat.DialogTitle.Icon = 0x7f0f0097
-net.micode.notes:id/search_go_btn = 0x7f08007b
+net.micode.notes:id/search_go_btn = 0x7f08007d
net.micode.notes:attr/textAppearanceLargePopupMenu = 0x7f0300a9
net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabText = 0x7f0f010e
+net.micode.notes:string/ticker_cancel = 0x7f0e0077
+net.micode.notes:style/Base.V7.Theme.AppCompat.Dialog = 0x7f0f0050
+net.micode.notes:style/Base.V7.Theme.AppCompat.Light.Dialog = 0x7f0f0052
+net.micode.notes:styleable/LinearLayoutCompat_Layout = 0x7f10000b
+net.micode.notes:style/Base.Animation.AppCompat.Dialog = 0x7f0f0006
+net.micode.notes:drawable/abc_tab_indicator_mtrl_alpha = 0x7f070034
net.micode.notes:id/iv_bg_white_select = 0x7f080043
net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Text = 0x7f0f009f
-net.micode.notes:drawable/abc_tab_indicator_mtrl_alpha = 0x7f070034
-net.micode.notes:style/Base.Animation.AppCompat.Dialog = 0x7f0f0006
+net.micode.notes:style/Base.Theme.AppCompat.Light = 0x7f0f003b
net.micode.notes:layout/abc_dialog_title_material = 0x7f0a000a
net.micode.notes:id/et_edit_text = 0x7f08002d
-net.micode.notes:style/Base.Theme.AppCompat.Light = 0x7f0f003b
-net.micode.notes:style/Platform.AppCompat = 0x7f0f008c
-net.micode.notes:style/Base.Widget.AppCompat.CompoundButton.RadioButton = 0x7f0f0068
-net.micode.notes:style/Widget.AppCompat.ActionBar.Solid = 0x7f0f00f2
net.micode.notes:layout/notification_template_part_chronometer = 0x7f0a002b
-net.micode.notes:style/Base.Widget.AppCompat.ActivityChooserView = 0x7f0f005e
-net.micode.notes:style/Base.V21.Theme.AppCompat.Light.Dialog = 0x7f0f004e
net.micode.notes:dimen/abc_text_size_headline_material = 0x7f060033
+net.micode.notes:style/Base.V21.Theme.AppCompat.Light.Dialog = 0x7f0f004e
+net.micode.notes:style/Base.Widget.AppCompat.ActivityChooserView = 0x7f0f005e
+net.micode.notes:style/Widget.AppCompat.ActionBar.Solid = 0x7f0f00f2
net.micode.notes:style/Base.V21.Theme.AppCompat.Dialog = 0x7f0f004c
net.micode.notes:style/TextAppearance.AppCompat.Widget.TextView.SpinnerItem = 0x7f0f00cb
net.micode.notes:style/Widget.Theme.Notesmaster1.ActionBar.Fullscreen = 0x7f0f0132
net.micode.notes:attr/layout = 0x7f03006b
net.micode.notes:dimen/abc_action_bar_navigation_padding_start_material = 0x7f060004
-net.micode.notes:drawable/rocket = 0x7f070081
-net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionMode.Subtitle = 0x7f0f002a
-net.micode.notes:string/notealert_ok = 0x7f0e0055
-net.micode.notes:attr/windowActionBar = 0x7f0300c1
-net.micode.notes:id/multiply = 0x7f080063
+net.micode.notes:string/notealert_ok = 0x7f0e0057
net.micode.notes:style/Base.ThemeOverlay.AppCompat = 0x7f0f0042
net.micode.notes:id/iv_small_select = 0x7f080048
net.micode.notes:menu/note_list_options = 0x7f0b0005
net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.PopupMenu.Large = 0x7f0f002d
net.micode.notes:style/Theme.AppCompat = 0x7f0f00db
net.micode.notes:style/Base.TextAppearance.AppCompat.Headline = 0x7f0f0013
+net.micode.notes:style/Base.AlertDialog.AppCompat.Light = 0x7f0f0005
+net.micode.notes:styleable/SearchView = 0x7f100012
+net.micode.notes:attr/colorAccent = 0x7f03003d
+net.micode.notes:color/user_query_highlight = 0x7f050045
+net.micode.notes:drawable/edit_title_white = 0x7f070047
+net.micode.notes:style/Base.TextAppearance.AppCompat = 0x7f0f000a
net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse = 0x7f0f0027
net.micode.notes:style/Widget.AppCompat.Spinner.DropDown.ActionBar = 0x7f0f012d
net.micode.notes:style/Base.TextAppearance.AppCompat.Title = 0x7f0f0023
net.micode.notes:string/datetime_dialog_ok = 0x7f0e001b
-net.micode.notes:drawable/font_super = 0x7f07004f
+net.micode.notes:drawable/font_super = 0x7f070050
+net.micode.notes:string/menu_trash = 0x7f0e007e
net.micode.notes:style/TextAppearance.AppCompat.Widget.Switch = 0x7f0f00ca
net.micode.notes:style/Theme.AppCompat.DialogWhenLarge = 0x7f0f00e0
-net.micode.notes:style/Widget.AppCompat.ActionButton.Overflow = 0x7f0f00f8
-net.micode.notes:styleable/ViewStubCompat = 0x7f100019
-net.micode.notes:style/Widget.AppCompat.Light.ListPopupWindow = 0x7f0f0119
net.micode.notes:attr/navigationMode = 0x7f03007d
net.micode.notes:drawable/abc_item_background_holo_dark = 0x7f07001f
+net.micode.notes:styleable/ViewStubCompat = 0x7f100019
+net.micode.notes:style/Widget.AppCompat.Light.ListPopupWindow = 0x7f0f0119
+net.micode.notes:style/Widget.AppCompat.ActionButton.Overflow = 0x7f0f00f8
net.micode.notes:style/Base.TextAppearance.AppCompat.Subhead.Inverse = 0x7f0f0022
net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionMode.Title = 0x7f0f002b
net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionBar.Menu = 0x7f0f0025
net.micode.notes:style/ThemeOverlay.AppCompat.Dark = 0x7f0f00ed
-net.micode.notes:drawable/abc_ic_menu_cut_mtrl_alpha = 0x7f070018
net.micode.notes:drawable/abc_list_pressed_holo_light = 0x7f070025
net.micode.notes:color/switch_thumb_material_dark = 0x7f050041
net.micode.notes:color/material_blue_grey_800 = 0x7f05002a
+net.micode.notes:drawable/abc_ic_menu_cut_mtrl_alpha = 0x7f070018
net.micode.notes:style/Widget.AppCompat.ActionBar.TabView = 0x7f0f00f5
net.micode.notes:dimen/abc_dropdownitem_icon_width = 0x7f06001f
+net.micode.notes:id/menu_trash = 0x7f0800a5
net.micode.notes:style/Base.TextAppearance.AppCompat.Medium.Inverse = 0x7f0f001a
net.micode.notes:style/TextAppearance.Widget.AppCompat.Toolbar.Title = 0x7f0f00d3
net.micode.notes:id/action_context_bar = 0x7f08000a
@@ -250,18 +258,15 @@ net.micode.notes:style/Base.Theme.AppCompat.Dialog = 0x7f0f0036
net.micode.notes:style/Base.TextAppearance.AppCompat.Light.Widget.PopupMenu.Large = 0x7f0f0017
net.micode.notes:string/folder_exist = 0x7f0e002a
net.micode.notes:drawable/bg_color_btn_mask = 0x7f07003c
-net.micode.notes:styleable/SearchView = 0x7f100012
-net.micode.notes:style/Base.AlertDialog.AppCompat.Light = 0x7f0f0005
-net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionBar.Title = 0x7f0f00c1
net.micode.notes:style/Base.TextAppearance.AppCompat.Display3 = 0x7f0f0011
+net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionBar.Title = 0x7f0f00c1
net.micode.notes:style/Base.TextAppearance.AppCompat.Body2 = 0x7f0f000c
net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0f00da
net.micode.notes:style/Widget.AppCompat.Light.AutoCompleteTextView = 0x7f0f0117
net.micode.notes:style/Base.V21.Theme.AppCompat.Light = 0x7f0f004d
net.micode.notes:style/Widget.AppCompat.Light.PopupMenu.Overflow = 0x7f0f011c
-net.micode.notes:drawable/batterfly = 0x7f070080
net.micode.notes:style/TextAppearance.AppCompat.Medium = 0x7f0f00b3
-net.micode.notes:id/tv_title_bar = 0x7f08009c
+net.micode.notes:id/tv_title_bar = 0x7f08009e
net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.Switch = 0x7f0f002f
net.micode.notes:color/light_blue_600 = 0x7f050024
net.micode.notes:style/Widget.AppCompat.CompoundButton.CheckBox = 0x7f0f0103
@@ -271,80 +276,79 @@ net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.DropDownItem = 0x7f0
net.micode.notes:style/Base.Widget.AppCompat.Button = 0x7f0f0060
net.micode.notes:style/Animation.AppCompat.DropDownUp = 0x7f0f0003
net.micode.notes:style/TextAppearance.AppCompat.Headline = 0x7f0f00ab
-net.micode.notes:id/showCustom = 0x7f080083
+net.micode.notes:id/showCustom = 0x7f080085
net.micode.notes:anim/abc_slide_out_bottom = 0x7f010008
net.micode.notes:id/iv_bg_blue_select = 0x7f08003d
net.micode.notes:drawable/abc_dialog_material_background_light = 0x7f070011
net.micode.notes:style/Animation.AppCompat.Dialog = 0x7f0f0002
net.micode.notes:style/Widget.AppCompat.SearchView = 0x7f0f0129
-net.micode.notes:style/AlertDialog.AppCompat.Light = 0x7f0f0001
-net.micode.notes:drawable/abc_textfield_default_mtrl_alpha = 0x7f070037
net.micode.notes:layout/note_list_footer = 0x7f0a0024
-net.micode.notes:string/preferences_title = 0x7f0e0067
-net.micode.notes:style/AlertDialog.AppCompat = 0x7f0f0000
-net.micode.notes:style/Base.Widget.AppCompat.ActionBar.Solid = 0x7f0f0056
-net.micode.notes:layout/notification_template_big_media_narrow = 0x7f0a0028
+net.micode.notes:drawable/abc_textfield_default_mtrl_alpha = 0x7f070037
+net.micode.notes:string/preferences_title = 0x7f0e0069
+net.micode.notes:style/AlertDialog.AppCompat.Light = 0x7f0f0001
net.micode.notes:attr/dividerHorizontal = 0x7f030051
-net.micode.notes:string/title_activity_splash = 0x7f0e0079
+net.micode.notes:string/title_activity_splash = 0x7f0e007b
net.micode.notes:style/Base.TextAppearance.AppCompat.Menu = 0x7f0f001b
net.micode.notes:dimen/abc_action_bar_content_inset_material = 0x7f060000
-net.micode.notes:id/prefenerece_sync_status_textview = 0x7f08006f
-net.micode.notes:string/ticker_syncing = 0x7f0e0078
+net.micode.notes:id/prefenerece_sync_status_textview = 0x7f080071
+net.micode.notes:string/ticker_syncing = 0x7f0e007a
net.micode.notes:string/file_name_txt_format = 0x7f0e0028
-net.micode.notes:string/ticker_fail = 0x7f0e0076
-net.micode.notes:drawable/list_blue_middle = 0x7f070054
+net.micode.notes:string/ticker_fail = 0x7f0e0078
+net.micode.notes:drawable/list_blue_middle = 0x7f070055
net.micode.notes:layout/abc_action_menu_item_layout = 0x7f0a0003
net.micode.notes:style/Base.TextAppearance.AppCompat.Caption = 0x7f0f000e
-net.micode.notes:string/set_remind_time_message = 0x7f0e006e
+net.micode.notes:string/set_remind_time_message = 0x7f0e0070
net.micode.notes:style/Widget.AppCompat.Spinner.DropDown = 0x7f0f012c
net.micode.notes:style/Theme.AppCompat.Dialog.MinWidth = 0x7f0f00df
net.micode.notes:color/primary_material_dark = 0x7f050031
net.micode.notes:string/abc_activity_chooser_view_see_all = 0x7f0e0006
-net.micode.notes:string/search_hint = 0x7f0e006b
+net.micode.notes:string/search_hint = 0x7f0e006d
net.micode.notes:styleable/MenuGroup = 0x7f10000d
-net.micode.notes:layout/abc_popup_menu_item_layout = 0x7f0a0010
net.micode.notes:style/Widget.AppCompat.Button.ButtonBar.AlertDialog = 0x7f0f00ff
-net.micode.notes:string/preferences_last_sync_time_format = 0x7f0e0063
-net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0e0060
+net.micode.notes:layout/abc_popup_menu_item_layout = 0x7f0a0010
+net.micode.notes:string/preferences_last_sync_time_format = 0x7f0e0065
+net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0e0062
net.micode.notes:style/Base.Widget.AppCompat.ActionBar.TabBar = 0x7f0f0057
-net.micode.notes:string/preferences_button_sync_cancel = 0x7f0e005c
-net.micode.notes:string/widget_under_visit_mode = 0x7f0e007b
+net.micode.notes:string/preferences_button_sync_cancel = 0x7f0e005e
+net.micode.notes:string/widget_under_visit_mode = 0x7f0e007d
net.micode.notes:style/Base.Widget.AppCompat.ActionBar.TabText = 0x7f0f0058
-net.micode.notes:id/select_dialog_listview = 0x7f080080
+net.micode.notes:id/select_dialog_listview = 0x7f080082
net.micode.notes:drawable/abc_switch_track_mtrl_alpha = 0x7f070032
-net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0e005b
-net.micode.notes:style/Theme.Notesmaster1.Fullscreen = 0x7f0f00ea
-net.micode.notes:layout/datetime_picker = 0x7f0a001c
-net.micode.notes:color/user_query_highlight = 0x7f050045
-net.micode.notes:drawable/edit_title_white = 0x7f070047
-net.micode.notes:attr/colorAccent = 0x7f03003d
-net.micode.notes:style/Base.TextAppearance.AppCompat = 0x7f0f000a
-net.micode.notes:string/note_link_tel = 0x7f0e0052
+net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0e005d
+net.micode.notes:string/note_link_tel = 0x7f0e0054
net.micode.notes:style/Base.TextAppearance.Widget.AppCompat.Toolbar.Subtitle = 0x7f0f0032
-net.micode.notes:string/note_link_other = 0x7f0e0051
+net.micode.notes:string/note_link_other = 0x7f0e0053
net.micode.notes:style/Base.ThemeOverlay.AppCompat.Dark = 0x7f0f0044
net.micode.notes:style/Base.TextAppearance.AppCompat.Title.Inverse = 0x7f0f0024
-net.micode.notes:string/note_length = 0x7f0e004f
+net.micode.notes:string/note_length = 0x7f0e0051
net.micode.notes:style/Base.TextAppearance.AppCompat.Body1 = 0x7f0f000b
-net.micode.notes:string/menu_title_select_folder = 0x7f0e004d
-net.micode.notes:string/menu_sync = 0x7f0e004b
+net.micode.notes:string/menu_title_select_folder = 0x7f0e004f
+net.micode.notes:string/dummy_button = 0x7f0e001d
+net.micode.notes:style/Widget.AppCompat.Light.PopupMenu = 0x7f0f011b
+net.micode.notes:layout/account_dialog_title = 0x7f0a0019
+net.micode.notes:string/menu_select_all = 0x7f0e0047
+net.micode.notes:attr/showAsAction = 0x7f030095
+net.micode.notes:dimen/abc_text_size_menu_material = 0x7f060036
+net.micode.notes:attr/windowActionBar = 0x7f0300c1
+net.micode.notes:id/multiply = 0x7f080065
+net.micode.notes:string/menu_sync = 0x7f0e004d
net.micode.notes:drawable/edit_title_red = 0x7f070046
net.micode.notes:attr/listLayout = 0x7f03006f
-net.micode.notes:string/menu_remove_remind = 0x7f0e0043
-net.micode.notes:attr/drawableSize = 0x7f030054
-net.micode.notes:style/Widget.AppCompat.Spinner = 0x7f0f012b
-net.micode.notes:string/notealert_enter = 0x7f0e0054
-net.micode.notes:string/menu_move = 0x7f0e0040
+net.micode.notes:string/menu_select_title = 0x7f0e0049
+net.micode.notes:string/menu_search = 0x7f0e0046
+net.micode.notes:dimen/abc_action_bar_icon_vertical_padding_material = 0x7f060003
+net.micode.notes:string/notealert_enter = 0x7f0e0056
+net.micode.notes:string/menu_move = 0x7f0e0042
net.micode.notes:attr/actionModeFindDrawable = 0x7f030015
-net.micode.notes:string/menu_font_large = 0x7f0e003a
-net.micode.notes:id/search_close_btn = 0x7f080079
+net.micode.notes:string/menu_font_large = 0x7f0e003b
+net.micode.notes:id/search_close_btn = 0x7f08007b
net.micode.notes:string/menu_deselect_all = 0x7f0e0035
net.micode.notes:drawable/edit_white = 0x7f070049
net.micode.notes:string/file_path = 0x7f0e0029
net.micode.notes:string/abc_action_bar_home_description = 0x7f0e0000
net.micode.notes:string/alert_title_delete = 0x7f0e0014
net.micode.notes:style/RtlOverlay.Widget.AppCompat.Toolbar.Button.Navigation = 0x7f0f00a1
-net.micode.notes:drawable/list_red_up = 0x7f070060
+net.micode.notes:drawable/list_red_up = 0x7f070061
net.micode.notes:string/app_widget4x4 = 0x7f0e0017
net.micode.notes:string/datetime_dialog_cancel = 0x7f0e001a
net.micode.notes:string/abc_searchview_description_submit = 0x7f0e000c
@@ -352,16 +356,16 @@ net.micode.notes:dimen/abc_button_inset_vertical_material = 0x7f060011
net.micode.notes:string/abc_action_bar_home_subtitle_description_format = 0x7f0e0002
net.micode.notes:anim/abc_slide_out_top = 0x7f010009
net.micode.notes:attr/listPreferredItemHeightSmall = 0x7f030073
-net.micode.notes:id/tv_alert_date = 0x7f080096
+net.micode.notes:id/tv_alert_date = 0x7f080098
net.micode.notes:style/TextAppearance.AppCompat.Subhead.Inverse = 0x7f0f00bb
net.micode.notes:style/Base.Widget.AppCompat.Button.Borderless.Colored = 0x7f0f0062
net.micode.notes:string/abc_action_bar_home_description_format = 0x7f0e0001
net.micode.notes:string/abc_searchview_description_search = 0x7f0e000b
net.micode.notes:layout/abc_search_dropdown_item_icons_2line = 0x7f0a0015
-net.micode.notes:string/sync_progress_syncing = 0x7f0e0074
+net.micode.notes:string/sync_progress_syncing = 0x7f0e0076
net.micode.notes:string/menu_export_text = 0x7f0e0036
net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0f00d7
-net.micode.notes:string/notelist_menu_new = 0x7f0e0056
+net.micode.notes:string/notelist_menu_new = 0x7f0e0058
net.micode.notes:style/TextAppearance.AppCompat.Large = 0x7f0f00ad
net.micode.notes:layout/abc_expanded_menu_layout = 0x7f0a000b
net.micode.notes:plurals/search_results_title = 0x7f0c0000
@@ -372,26 +376,21 @@ net.micode.notes:style/Widget.AppCompat.DropDownItem.Spinner = 0x7f0f0107
net.micode.notes:menu/call_record_folder = 0x7f0b0001
net.micode.notes:style/Widget.AppCompat.ButtonBar = 0x7f0f0101
net.micode.notes:layout/select_dialog_item_material = 0x7f0a002d
-net.micode.notes:id/note_title = 0x7f08006c
-net.micode.notes:string/menu_lattice = 0x7f0e007e
+net.micode.notes:id/note_title = 0x7f08006e
net.micode.notes:attr/actionModeCopyDrawable = 0x7f030013
net.micode.notes:layout/notification_media_cancel_action = 0x7f0a0026
net.micode.notes:color/link_text_material_dark = 0x7f050028
net.micode.notes:style/Base.DialogWindowTitleBackground.AppCompat = 0x7f0f0009
net.micode.notes:layout/note_list = 0x7f0a0022
net.micode.notes:dimen/disabled_alpha_material_light = 0x7f060041
-net.micode.notes:id/tv_folder_name = 0x7f080097
+net.micode.notes:id/tv_folder_name = 0x7f080099
net.micode.notes:id/action_divider = 0x7f08000b
-net.micode.notes:id/menu_cat = 0x7f0800a3
net.micode.notes:layout/folder_list_item = 0x7f0a001e
net.micode.notes:style/Base.Widget.AppCompat.AutoCompleteTextView = 0x7f0f005f
net.micode.notes:string/error_sdcard_unmounted = 0x7f0e0023
net.micode.notes:layout/dialog_edit_text = 0x7f0a001d
net.micode.notes:id/activity_chooser_view_content = 0x7f080012
-net.micode.notes:string/note_link_web = 0x7f0e0053
-net.micode.notes:string/dummy_button = 0x7f0e001d
-net.micode.notes:style/Widget.AppCompat.Light.PopupMenu = 0x7f0f011b
-net.micode.notes:layout/account_dialog_title = 0x7f0a0019
+net.micode.notes:string/note_link_web = 0x7f0e0055
net.micode.notes:attr/colorPrimary = 0x7f030042
net.micode.notes:layout/abc_simple_dropdown_hint = 0x7f0a0018
net.micode.notes:layout/abc_screen_toolbar = 0x7f0a0014
@@ -403,21 +402,20 @@ net.micode.notes:style/RtlOverlay.Widget.AppCompat.PopupMenuItem.Text = 0x7f0f00
net.micode.notes:layout/abc_action_mode_bar = 0x7f0a0005
net.micode.notes:style/Base.DialogWindowTitle.AppCompat = 0x7f0f0008
net.micode.notes:layout/abc_list_menu_item_icon = 0x7f0a000d
-net.micode.notes:drawable/widget_2x_blue = 0x7f070076
+net.micode.notes:drawable/widget_2x_blue = 0x7f070079
net.micode.notes:style/TextAppearance.AppCompat.Display2 = 0x7f0f00a8
net.micode.notes:attr/panelMenuListTheme = 0x7f030082
net.micode.notes:layout/abc_list_menu_item_checkbox = 0x7f0a000c
net.micode.notes:style/Base.TextAppearance.AppCompat.Display1 = 0x7f0f000f
net.micode.notes:style/Widget.AppCompat.AutoCompleteTextView = 0x7f0f00fb
-net.micode.notes:drawable/splash = 0x7f070073
+net.micode.notes:drawable/splash = 0x7f070076
net.micode.notes:style/Base.Widget.AppCompat.ActionBar.TabView = 0x7f0f0059
-net.micode.notes:id/search_bar = 0x7f080077
+net.micode.notes:id/search_bar = 0x7f080079
net.micode.notes:layout/abc_activity_chooser_view = 0x7f0a0007
-net.micode.notes:style/Base.Theme.AppCompat.Light.Dialog.MinWidth = 0x7f0f0040
net.micode.notes:attr/switchPadding = 0x7f0300a5
net.micode.notes:layout/abc_action_mode_close_item_material = 0x7f0a0006
net.micode.notes:style/Base.TextAppearance.AppCompat.Subhead = 0x7f0f0021
-net.micode.notes:string/preferences_account_summary = 0x7f0e0058
+net.micode.notes:string/preferences_account_summary = 0x7f0e005a
net.micode.notes:layout/abc_action_menu_layout = 0x7f0a0004
net.micode.notes:integer/cancel_button_image_alpha = 0x7f090003
net.micode.notes:layout/abc_search_view = 0x7f0a0016
@@ -425,73 +423,73 @@ net.micode.notes:integer/abc_config_activityShortDur = 0x7f090001
net.micode.notes:integer/abc_config_activityDefaultDur = 0x7f090000
net.micode.notes:style/Widget.AppCompat.ButtonBar.AlertDialog = 0x7f0f0102
net.micode.notes:attr/thumbTextPadding = 0x7f0300b3
-net.micode.notes:id/withText = 0x7f0800a1
-net.micode.notes:id/widget_bg_image = 0x7f08009f
+net.micode.notes:id/withText = 0x7f0800a3
+net.micode.notes:id/widget_bg_image = 0x7f0800a1
net.micode.notes:styleable/ActionBarLayout = 0x7f100001
net.micode.notes:drawable/abc_dialog_material_background_dark = 0x7f070010
-net.micode.notes:id/text2 = 0x7f08008f
+net.micode.notes:id/text2 = 0x7f080091
net.micode.notes:attr/fullscreenBackgroundColor = 0x7f03005d
-net.micode.notes:id/text = 0x7f08008e
+net.micode.notes:id/text = 0x7f080090
net.micode.notes:integer/status_bar_notification_info_maxnum = 0x7f090004
-net.micode.notes:id/sv_note_edit = 0x7f08008c
-net.micode.notes:id/title = 0x7f080093
-net.micode.notes:layout/note_edit = 0x7f0a001f
-net.micode.notes:id/src_over = 0x7f080089
-net.micode.notes:id/submit_area = 0x7f08008b
+net.micode.notes:id/sv_note_edit = 0x7f08008e
+net.micode.notes:id/submit_area = 0x7f08008d
net.micode.notes:style/Widget.AppCompat.ActionBar = 0x7f0f00f1
net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionMode.Title = 0x7f0f00c5
net.micode.notes:dimen/notification_large_icon_height = 0x7f060042
-net.micode.notes:id/shortcut = 0x7f080082
+net.micode.notes:id/shortcut = 0x7f080084
net.micode.notes:style/Base.Widget.AppCompat.Light.PopupMenu.Overflow = 0x7f0f0075
-net.micode.notes:id/middle = 0x7f080060
-net.micode.notes:id/search_plate = 0x7f08007d
-net.micode.notes:string/menu_font_super = 0x7f0e003e
+net.micode.notes:id/middle = 0x7f080062
+net.micode.notes:id/search_plate = 0x7f08007f
+net.micode.notes:string/menu_font_super = 0x7f0e003f
net.micode.notes:drawable/abc_btn_check_material = 0x7f070002
net.micode.notes:style/TextAppearance.StatusBar.EventContent.Time = 0x7f0f00cf
-net.micode.notes:id/search_badge = 0x7f080076
+net.micode.notes:id/search_badge = 0x7f080078
net.micode.notes:style/Base.V11.Theme.AppCompat.Light.Dialog = 0x7f0f0048
+net.micode.notes:id/scrollView = 0x7f080077
net.micode.notes:id/dummy_button = 0x7f080029
-net.micode.notes:id/scrollView = 0x7f080075
net.micode.notes:styleable/MenuItem = 0x7f10000e
net.micode.notes:style/Base.Widget.AppCompat.Light.ActionBar = 0x7f0f006e
-net.micode.notes:id/progress_horizontal = 0x7f080072
-net.micode.notes:id/progress_circular = 0x7f080071
+net.micode.notes:id/progress_horizontal = 0x7f080074
+net.micode.notes:id/progress_circular = 0x7f080073
net.micode.notes:style/Base.Widget.AppCompat.Light.PopupMenu = 0x7f0f0074
net.micode.notes:string/abc_search_hint = 0x7f0e0008
-net.micode.notes:id/search_mag_icon = 0x7f08007c
-net.micode.notes:id/preference_sync_button = 0x7f080070
+net.micode.notes:id/search_mag_icon = 0x7f08007e
+net.micode.notes:id/preference_sync_button = 0x7f080072
net.micode.notes:attr/closeItemLayout = 0x7f030039
net.micode.notes:style/Base.V7.Widget.AppCompat.AutoCompleteTextView = 0x7f0f0053
net.micode.notes:dimen/abc_control_inset_material = 0x7f060016
net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown = 0x7f0f009b
-net.micode.notes:id/notes_list = 0x7f08006d
+net.micode.notes:id/notes_list = 0x7f08006f
net.micode.notes:string/abc_action_menu_overflow_description = 0x7f0e0004
net.micode.notes:string/format_date_ymd = 0x7f0e002b
-net.micode.notes:id/note_edit_list = 0x7f080069
+net.micode.notes:id/note_edit_list = 0x7f08006b
net.micode.notes:layout/notification_template_lines = 0x7f0a0029
net.micode.notes:styleable/View = 0x7f100018
net.micode.notes:dimen/abc_button_inset_horizontal_material = 0x7f060010
-net.micode.notes:id/src_in = 0x7f080088
-net.micode.notes:id/normal = 0x7f080067
-net.micode.notes:id/never = 0x7f080065
+net.micode.notes:id/src_in = 0x7f08008a
+net.micode.notes:id/normal = 0x7f080069
+net.micode.notes:id/never = 0x7f080067
net.micode.notes:styleable/Spinner = 0x7f100013
-net.micode.notes:id/navigation_bar = 0x7f080064
+net.micode.notes:id/navigation_bar = 0x7f080066
net.micode.notes:style/Base.Widget.AppCompat.PopupMenu = 0x7f0f007a
+net.micode.notes:layout/note_edit = 0x7f0a001f
+net.micode.notes:id/src_over = 0x7f08008b
+net.micode.notes:id/title = 0x7f080095
+net.micode.notes:id/move = 0x7f080064
+net.micode.notes:string/menu_setting = 0x7f0e004b
net.micode.notes:layout/widget_4x = 0x7f0a0033
-net.micode.notes:id/move = 0x7f080062
-net.micode.notes:string/menu_setting = 0x7f0e0049
-net.micode.notes:id/menu_sync = 0x7f08005f
+net.micode.notes:id/menu_sync = 0x7f080061
net.micode.notes:id/list_item = 0x7f08004d
net.micode.notes:drawable/abc_ic_go_search_api_mtrl_alpha = 0x7f070016
-net.micode.notes:id/menu_share = 0x7f08005e
-net.micode.notes:id/menu_send_to_desktop = 0x7f08005c
-net.micode.notes:id/menu_search = 0x7f08005b
+net.micode.notes:id/menu_share = 0x7f080060
+net.micode.notes:id/menu_search = 0x7f08005d
net.micode.notes:style/Base.TextAppearance.AppCompat.Large.Inverse = 0x7f0f0016
net.micode.notes:layout/abc_screen_content_include = 0x7f0a0011
net.micode.notes:drawable/dropdown_icon = 0x7f070040
-net.micode.notes:id/menu_new_note = 0x7f08005a
-net.micode.notes:id/menu_list_mode = 0x7f080058
-net.micode.notes:id/menu_font_size = 0x7f080057
+net.micode.notes:id/menu_new_note = 0x7f08005c
+net.micode.notes:id/menu_list_mode = 0x7f080059
+net.micode.notes:id/menu_font_size = 0x7f080058
+net.micode.notes:id/menu_fly = 0x7f080057
net.micode.notes:id/menu_export_text = 0x7f080056
net.micode.notes:style/Theme.Notesmaster1 = 0x7f0f00e9
net.micode.notes:attr/listPreferredItemHeight = 0x7f030071
@@ -500,15 +498,15 @@ net.micode.notes:id/menu_alert = 0x7f080053
net.micode.notes:layout/abc_list_menu_item_layout = 0x7f0a000e
net.micode.notes:attr/middleBarArrowSize = 0x7f030079
net.micode.notes:color/secondary_text_disabled_material_light = 0x7f05003e
-net.micode.notes:id/note_bg_color_selector = 0x7f080068
+net.micode.notes:id/note_bg_color_selector = 0x7f08006a
net.micode.notes:style/Base.Widget.AppCompat.ListView.Menu = 0x7f0f0079
net.micode.notes:attr/windowFixedWidthMinor = 0x7f0300c7
net.micode.notes:id/media_actions = 0x7f080052
net.micode.notes:id/ll_font_normal = 0x7f08004f
net.micode.notes:attr/listChoiceBackgroundIndicator = 0x7f03006c
-net.micode.notes:drawable/font_large = 0x7f07004b
+net.micode.notes:drawable/font_large = 0x7f07004c
net.micode.notes:id/ll_font_small = 0x7f080050
-net.micode.notes:id/search_button = 0x7f080078
+net.micode.notes:id/search_button = 0x7f08007a
net.micode.notes:color/black_overlay = 0x7f050013
net.micode.notes:dimen/abc_dropdownitem_text_padding_right = 0x7f060021
net.micode.notes:id/iv_medium_select = 0x7f080047
@@ -526,14 +524,14 @@ net.micode.notes:color/material_deep_teal_500 = 0x7f05002e
net.micode.notes:id/ifRoom = 0x7f080038
net.micode.notes:styleable/ActionMenuView = 0x7f100003
net.micode.notes:id/hour = 0x7f080036
-net.micode.notes:string/menu_list_mode = 0x7f0e003f
+net.micode.notes:string/menu_list_mode = 0x7f0e0040
net.micode.notes:id/et_foler_name = 0x7f08002e
net.micode.notes:attr/autoCompleteTextViewStyle = 0x7f030026
net.micode.notes:id/fullscreen_content = 0x7f080032
net.micode.notes:style/Base.Widget.AppCompat.Button.ButtonBar.AlertDialog = 0x7f0f0063
net.micode.notes:id/font_size_selector = 0x7f080031
net.micode.notes:id/end_padder = 0x7f08002c
-net.micode.notes:string/preferences_last_sync_time = 0x7f0e0062
+net.micode.notes:string/preferences_last_sync_time = 0x7f0e0064
net.micode.notes:id/end = 0x7f08002b
net.micode.notes:id/disableHome = 0x7f080027
net.micode.notes:drawable/abc_popup_background_mtrl_mult = 0x7f07002d
@@ -551,75 +549,73 @@ net.micode.notes:id/btn_set_bg_color = 0x7f080018
net.micode.notes:layout/activity_splash = 0x7f0a001a
net.micode.notes:id/amPm = 0x7f080015
net.micode.notes:style/TextAppearance.AppCompat.Subhead = 0x7f0f00ba
-net.micode.notes:drawable/new_note_normal = 0x7f07006c
+net.micode.notes:drawable/new_note_normal = 0x7f07006e
net.micode.notes:id/action_menu_presenter = 0x7f08000d
net.micode.notes:id/action_bar_title = 0x7f080009
net.micode.notes:style/NoteActionBarStyle = 0x7f0f008a
net.micode.notes:id/action_bar_container = 0x7f080005
net.micode.notes:id/action_bar_activity_content = 0x7f080004
-net.micode.notes:drawable/font_small = 0x7f07004e
+net.micode.notes:drawable/font_small = 0x7f07004f
net.micode.notes:style/Platform.V14.AppCompat.Light = 0x7f0f0093
net.micode.notes:xml/preferences = 0x7f110000
net.micode.notes:id/action_bar = 0x7f080003
-net.micode.notes:id/tv_title = 0x7f08009b
+net.micode.notes:id/tv_title = 0x7f08009d
net.micode.notes:id/action0 = 0x7f080002
net.micode.notes:style/Widget.AppCompat.Light.Spinner.DropDown.ActionBar = 0x7f0f011e
-net.micode.notes:drawable/widget_4x_green = 0x7f07007c
-net.micode.notes:drawable/widget_4x_white = 0x7f07007e
-net.micode.notes:string/menu_folder_change_name = 0x7f0e0037
-net.micode.notes:drawable/widget_4x_red = 0x7f07007d
+net.micode.notes:drawable/widget_4x_green = 0x7f07007f
+net.micode.notes:drawable/widget_4x_white = 0x7f070081
+net.micode.notes:string/menu_folder_change_name = 0x7f0e0038
+net.micode.notes:drawable/widget_4x_red = 0x7f070080
net.micode.notes:style/Theme.AppCompat.Dialog.Alert = 0x7f0f00de
-net.micode.notes:drawable/widget_4x_blue = 0x7f07007b
+net.micode.notes:drawable/widget_4x_blue = 0x7f07007e
net.micode.notes:style/Base.V7.Theme.AppCompat = 0x7f0f004f
-net.micode.notes:drawable/widget_2x_red = 0x7f070078
+net.micode.notes:drawable/widget_2x_red = 0x7f07007b
net.micode.notes:style/Base.V12.Widget.AppCompat.EditText = 0x7f0f004a
-net.micode.notes:drawable/search_result = 0x7f070071
+net.micode.notes:drawable/search_result = 0x7f070074
net.micode.notes:style/Widget.AppCompat.CompoundButton.Switch = 0x7f0f0105
-net.micode.notes:drawable/new_note_pressed = 0x7f07006d
-net.micode.notes:drawable/selected = 0x7f070072
-net.micode.notes:drawable/new_note = 0x7f07006b
-net.micode.notes:drawable/menu_move = 0x7f07006a
-net.micode.notes:drawable/menu_delete = 0x7f070069
+net.micode.notes:drawable/new_note_pressed = 0x7f07006f
+net.micode.notes:drawable/selected = 0x7f070075
+net.micode.notes:drawable/new_note = 0x7f07006d
+net.micode.notes:drawable/menu_move = 0x7f07006b
+net.micode.notes:drawable/menu_delete = 0x7f07006a
net.micode.notes:string/delete_remind_time_message = 0x7f0e001c
-net.micode.notes:drawable/list_white_middle = 0x7f070062
+net.micode.notes:drawable/list_white_middle = 0x7f070063
net.micode.notes:string/abc_searchview_description_voice = 0x7f0e000d
-net.micode.notes:drawable/list_white_down = 0x7f070061
+net.micode.notes:drawable/list_white_down = 0x7f070062
net.micode.notes:drawable/clock = 0x7f07003e
net.micode.notes:color/switch_thumb_material_light = 0x7f050042
net.micode.notes:style/Widget.AppCompat.Light.ActionButton = 0x7f0f0112
-net.micode.notes:drawable/notification = 0x7f07006f
-net.micode.notes:drawable/list_red_middle = 0x7f07005e
+net.micode.notes:drawable/notification = 0x7f070071
+net.micode.notes:drawable/list_red_middle = 0x7f07005f
net.micode.notes:attr/actionBarTabBarStyle = 0x7f030006
-net.micode.notes:drawable/list_green_up = 0x7f07005c
+net.micode.notes:drawable/list_green_up = 0x7f07005d
net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionBar.Menu = 0x7f0f00be
net.micode.notes:attr/title = 0x7f0300b4
-net.micode.notes:drawable/list_yellow_down = 0x7f070065
-net.micode.notes:drawable/list_green_down = 0x7f070059
+net.micode.notes:drawable/list_yellow_down = 0x7f070066
+net.micode.notes:drawable/list_green_down = 0x7f07005a
net.micode.notes:attr/queryHint = 0x7f03008d
-net.micode.notes:drawable/list_blue_single = 0x7f070055
-net.micode.notes:id/split_action_bar = 0x7f080086
+net.micode.notes:drawable/list_blue_single = 0x7f070056
+net.micode.notes:id/split_action_bar = 0x7f080088
net.micode.notes:dimen/abc_floating_window_z = 0x7f060025
-net.micode.notes:id/showHome = 0x7f080084
+net.micode.notes:id/showHome = 0x7f080086
net.micode.notes:style/Widget.AppCompat.PopupMenu.Overflow = 0x7f0f0124
-net.micode.notes:string/menu_search = 0x7f0e0044
-net.micode.notes:dimen/abc_action_bar_icon_vertical_padding_material = 0x7f060003
+net.micode.notes:id/none = 0x7f080068
net.micode.notes:attr/windowMinWidthMajor = 0x7f0300c8
-net.micode.notes:id/none = 0x7f080066
-net.micode.notes:drawable/list_background = 0x7f070052
+net.micode.notes:drawable/list_background = 0x7f070053
net.micode.notes:attr/displayOptions = 0x7f03004f
net.micode.notes:drawable/abc_spinner_textfield_background_material = 0x7f070030
-net.micode.notes:drawable/icon_app = 0x7f070050
+net.micode.notes:drawable/icon_app = 0x7f070051
net.micode.notes:id/iv_alert_icon = 0x7f08003b
-net.micode.notes:string/sync_progress_login = 0x7f0e0073
+net.micode.notes:string/sync_progress_login = 0x7f0e0075
net.micode.notes:dimen/abc_control_corner_material = 0x7f060015
-net.micode.notes:drawable/font_size_selector_bg = 0x7f07004d
+net.micode.notes:drawable/font_size_selector_bg = 0x7f07004e
net.micode.notes:style/Base.Theme.AppCompat.Dialog.MinWidth = 0x7f0f0039
-net.micode.notes:drawable/font_normal = 0x7f07004c
+net.micode.notes:drawable/font_normal = 0x7f07004d
net.micode.notes:style/Base.V7.Widget.AppCompat.EditText = 0x7f0f0054
net.micode.notes:style/Base.TextAppearance.AppCompat.Display2 = 0x7f0f0010
net.micode.notes:drawable/edit_yellow = 0x7f07004a
net.micode.notes:bool/abc_action_bar_embed_tabs_pre_jb = 0x7f040001
-net.micode.notes:drawable/widget_2x_white = 0x7f070079
+net.micode.notes:drawable/widget_2x_white = 0x7f07007c
net.micode.notes:drawable/edit_title_green = 0x7f070045
net.micode.notes:style/TextAppearance.Widget.AppCompat.ExpandedMenu.Item = 0x7f0f00d1
net.micode.notes:drawable/call_record = 0x7f07003d
@@ -627,7 +623,7 @@ net.micode.notes:string/format_datetime_mdhm = 0x7f0e002c
net.micode.notes:id/menu_delete_remind = 0x7f080055
net.micode.notes:drawable/abc_textfield_search_material = 0x7f07003a
net.micode.notes:drawable/abc_textfield_search_activated_mtrl_alpha = 0x7f070038
-net.micode.notes:drawable/title_bar_bg = 0x7f070075
+net.micode.notes:drawable/title_bar_bg = 0x7f070078
net.micode.notes:style/Theme.AppCompat.NoActionBar = 0x7f0f00e8
net.micode.notes:drawable/abc_textfield_activated_mtrl_alpha = 0x7f070036
net.micode.notes:attr/initialActivityCount = 0x7f030068
@@ -652,16 +648,16 @@ net.micode.notes:dimen/abc_button_padding_vertical_material = 0x7f060013
net.micode.notes:attr/alertDialogTheme = 0x7f030025
net.micode.notes:string/format_folder_files_count = 0x7f0e002e
net.micode.notes:drawable/abc_list_selector_background_transition_holo_light = 0x7f070027
-net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0e005e
+net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0e0060
net.micode.notes:drawable/abc_item_background_holo_light = 0x7f070020
net.micode.notes:color/primary_text_default_material_dark = 0x7f050034
net.micode.notes:drawable/abc_ic_menu_paste_mtrl_am_alpha = 0x7f07001a
-net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0e0069
+net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0e006b
net.micode.notes:layout/note_edit_list_item = 0x7f0a0020
-net.micode.notes:drawable/widget_2x_yellow = 0x7f07007a
+net.micode.notes:drawable/widget_2x_yellow = 0x7f07007d
net.micode.notes:drawable/abc_ic_commit_search_api_mtrl_alpha = 0x7f070015
net.micode.notes:style/Base.Widget.AppCompat.RatingBar = 0x7f0f007f
-net.micode.notes:string/sync_progress_init_list = 0x7f0e0072
+net.micode.notes:string/sync_progress_init_list = 0x7f0e0074
net.micode.notes:style/Base.V12.Widget.AppCompat.AutoCompleteTextView = 0x7f0f0049
net.micode.notes:attr/itemPadding = 0x7f03006a
net.micode.notes:dimen/abc_dropdownitem_text_padding_left = 0x7f060020
@@ -670,7 +666,7 @@ net.micode.notes:attr/actionModeShareDrawable = 0x7f030019
net.micode.notes:style/Theme.AppCompat.Light.NoActionBar = 0x7f0f00e7
net.micode.notes:xml/widget_2x_info = 0x7f110002
net.micode.notes:dimen/abc_dialog_list_padding_vertical_material = 0x7f060018
-net.micode.notes:id/menu_setting = 0x7f08005d
+net.micode.notes:id/menu_setting = 0x7f08005f
net.micode.notes:attr/switchTextAppearance = 0x7f0300a7
net.micode.notes:color/abc_secondary_text_material_light = 0x7f05000c
net.micode.notes:drawable/abc_edit_text_material = 0x7f070012
@@ -680,15 +676,15 @@ net.micode.notes:styleable/Theme = 0x7f100016
net.micode.notes:color/bright_foreground_disabled_material_light = 0x7f050015
net.micode.notes:drawable/abc_cab_background_internal_bg = 0x7f07000d
net.micode.notes:attr/textAppearanceListItemSmall = 0x7f0300ab
-net.micode.notes:id/tv_modified_date = 0x7f080098
+net.micode.notes:id/tv_modified_date = 0x7f08009a
net.micode.notes:string/hint_foler_name = 0x7f0e0030
-net.micode.notes:id/parentPanel = 0x7f08006e
+net.micode.notes:id/parentPanel = 0x7f080070
net.micode.notes:style/Base.Widget.AppCompat.PopupMenu.Overflow = 0x7f0f007b
net.micode.notes:bool/abc_config_showMenuShortcutsWhenKeyboardPresent = 0x7f040006
net.micode.notes:drawable/abc_btn_rating_star_off_mtrl_alpha = 0x7f070009
net.micode.notes:drawable/abc_btn_radio_material = 0x7f070006
net.micode.notes:style/Base.TextAppearance.AppCompat.Medium = 0x7f0f0019
-net.micode.notes:drawable/widget_4x_yellow = 0x7f07007f
+net.micode.notes:drawable/widget_4x_yellow = 0x7f070082
net.micode.notes:drawable/abc_btn_check_to_on_mtrl_000 = 0x7f070003
net.micode.notes:bool/abc_config_allowActionMenuItemTextWithIcon = 0x7f040004
net.micode.notes:attr/backgroundSplit = 0x7f030028
@@ -703,13 +699,10 @@ net.micode.notes:dimen/disabled_alpha_material_dark = 0x7f060040
net.micode.notes:styleable/Toolbar = 0x7f100017
net.micode.notes:id/action_bar_subtitle = 0x7f080008
net.micode.notes:dimen/dialog_fixed_width_minor = 0x7f06003f
-net.micode.notes:id/minute = 0x7f080061
+net.micode.notes:id/minute = 0x7f080063
net.micode.notes:dimen/dialog_fixed_width_major = 0x7f06003e
net.micode.notes:style/Base.TextAppearance.Widget.AppCompat.ExpandedMenu.Item = 0x7f0f0031
net.micode.notes:dimen/dialog_fixed_height_major = 0x7f06003c
-net.micode.notes:string/menu_select_all = 0x7f0e0045
-net.micode.notes:dimen/abc_text_size_menu_material = 0x7f060036
-net.micode.notes:attr/showAsAction = 0x7f030095
net.micode.notes:attr/actionModeWebSearchDrawable = 0x7f03001c
net.micode.notes:dimen/abc_switch_padding = 0x7f06002a
net.micode.notes:attr/titleTextAppearance = 0x7f0300ba
@@ -718,11 +711,11 @@ net.micode.notes:dimen/abc_panel_menu_list_width = 0x7f060027
net.micode.notes:dimen/abc_text_size_small_material = 0x7f060037
net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabView = 0x7f0f0110
net.micode.notes:color/primary_material_light = 0x7f050032
-net.micode.notes:drawable/list_yellow_single = 0x7f070067
+net.micode.notes:drawable/list_yellow_single = 0x7f070068
net.micode.notes:dimen/abc_edit_text_inset_top_material = 0x7f060024
net.micode.notes:dimen/abc_edit_text_inset_horizontal_material = 0x7f060023
net.micode.notes:dimen/abc_dialog_padding_top_material = 0x7f06001c
-net.micode.notes:id/widget_text = 0x7f0800a0
+net.micode.notes:id/widget_text = 0x7f0800a2
net.micode.notes:dimen/abc_text_size_medium_material = 0x7f060035
net.micode.notes:dimen/abc_dialog_min_width_minor = 0x7f06001a
net.micode.notes:color/button_material_light = 0x7f05001b
@@ -735,12 +728,14 @@ net.micode.notes:style/Theme.AppCompat.CompactMenu = 0x7f0f00dc
net.micode.notes:dimen/abc_button_padding_horizontal_material = 0x7f060012
net.micode.notes:style/Theme.AppCompat.Light.Dialog.Alert = 0x7f0f00e4
net.micode.notes:string/abc_shareactionprovider_share_with = 0x7f0e000e
+net.micode.notes:id/selection_menu = 0x7f080083
+net.micode.notes:drawable/fly = 0x7f07004b
net.micode.notes:style/Widget.AppCompat.ActionBar.TabText = 0x7f0f00f4
net.micode.notes:style/ThemeOverlay.AppCompat.Dark.ActionBar = 0x7f0f00ee
net.micode.notes:dimen/abc_search_view_text_min_width = 0x7f060029
net.micode.notes:dimen/abc_action_button_min_height_material = 0x7f06000c
net.micode.notes:attr/suggestionRowLayout = 0x7f0300a3
-net.micode.notes:drawable/list_red_down = 0x7f07005d
+net.micode.notes:drawable/list_red_down = 0x7f07005e
net.micode.notes:style/Widget.AppCompat.CompoundButton.RadioButton = 0x7f0f0104
net.micode.notes:string/app_name = 0x7f0e0015
net.micode.notes:attr/actionOverflowMenuStyle = 0x7f03001e
@@ -763,13 +758,17 @@ net.micode.notes:string/error_sync_internal = 0x7f0e0025
net.micode.notes:xml/searchable = 0x7f110001
net.micode.notes:style/Base.Theme.AppCompat.Light.DarkActionBar = 0x7f0f003c
net.micode.notes:style/Base.Widget.AppCompat.Toolbar.Button.Navigation = 0x7f0f0087
-net.micode.notes:id/tv_name = 0x7f080099
+net.micode.notes:id/tv_name = 0x7f08009b
net.micode.notes:color/switch_thumb_disabled_material_dark = 0x7f05003f
net.micode.notes:color/secondary_text_default_material_dark = 0x7f05003b
net.micode.notes:attr/theme = 0x7f0300b1
net.micode.notes:dimen/abc_control_padding_material = 0x7f060017
net.micode.notes:drawable/abc_ic_menu_copy_mtrl_am_alpha = 0x7f070017
net.micode.notes:color/primary_text_default_material_light = 0x7f050035
+net.micode.notes:string/button_delete = 0x7f0e0018
+net.micode.notes:attr/collapseContentDescription = 0x7f03003a
+net.micode.notes:style/TextAppearance.AppCompat.Display3 = 0x7f0f00a9
+net.micode.notes:id/menu_delete = 0x7f080054
net.micode.notes:dimen/abc_text_size_subtitle_material_toolbar = 0x7f060039
net.micode.notes:color/background_floating_material_light = 0x7f050010
net.micode.notes:attr/commitIcon = 0x7f030045
@@ -778,11 +777,7 @@ net.micode.notes:style/Base.Theme.AppCompat.Dialog.FixedSize = 0x7f0f0038
net.micode.notes:color/ripple_material_light = 0x7f050039
net.micode.notes:color/ripple_material_dark = 0x7f050038
net.micode.notes:color/primary_text_disabled_material_light = 0x7f050037
-net.micode.notes:id/menu_delete = 0x7f080054
-net.micode.notes:string/button_delete = 0x7f0e0018
-net.micode.notes:attr/collapseContentDescription = 0x7f03003a
-net.micode.notes:style/TextAppearance.AppCompat.Display3 = 0x7f0f00a9
-net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0e005f
+net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0e0061
net.micode.notes:attr/fullscreenTextColor = 0x7f03005e
net.micode.notes:id/customPanel = 0x7f080021
net.micode.notes:id/action_mode_bar = 0x7f08000e
@@ -801,13 +796,15 @@ net.micode.notes:style/Widget.AppCompat.ProgressBar.Horizontal = 0x7f0f0127
net.micode.notes:attr/colorButtonNormal = 0x7f03003e
net.micode.notes:attr/actionModeCloseButtonStyle = 0x7f030011
net.micode.notes:attr/state_above_anchor = 0x7f03009e
-net.micode.notes:string/menu_normal_mode = 0x7f0e0042
+net.micode.notes:string/menu_normal_mode = 0x7f0e0044
net.micode.notes:color/bright_foreground_inverse_material_dark = 0x7f050016
net.micode.notes:color/light_blue_A400 = 0x7f050027
net.micode.notes:style/NoteTheme = 0x7f0f008b
net.micode.notes:attr/listDividerAlertDialog = 0x7f03006d
net.micode.notes:color/secondary_text_disabled_material_dark = 0x7f05003d
net.micode.notes:color/hint_foreground_material_light = 0x7f050023
+net.micode.notes:color/hint_foreground_material_dark = 0x7f050022
+net.micode.notes:string/menu_fly = 0x7f0e0037
net.micode.notes:attr/actionModeCloseDrawable = 0x7f030012
net.micode.notes:color/highlighted_text_material_dark = 0x7f050020
net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle = 0x7f0f0026
@@ -822,7 +819,7 @@ net.micode.notes:id/iv_bg_blue = 0x7f08003c
net.micode.notes:attr/buttonBarStyle = 0x7f030032
net.micode.notes:color/switch_thumb_disabled_material_light = 0x7f050040
net.micode.notes:color/dim_foreground_disabled_material_dark = 0x7f05001c
-net.micode.notes:drawable/notification_template_icon_bg = 0x7f070070
+net.micode.notes:drawable/notification_template_icon_bg = 0x7f070072
net.micode.notes:drawable/abc_btn_radio_to_on_mtrl_000 = 0x7f070007
net.micode.notes:id/listMode = 0x7f08004c
net.micode.notes:attr/dialogPreferredPadding = 0x7f03004c
@@ -839,6 +836,8 @@ net.micode.notes:style/Base.Widget.AppCompat.Light.ActionBar.TabText.Inverse = 0
net.micode.notes:id/btn_new_note = 0x7f080017
net.micode.notes:drawable/abc_btn_rating_star_on_mtrl_alpha = 0x7f07000a
net.micode.notes:layout/select_dialog_singlechoice_material = 0x7f0a002f
+net.micode.notes:style/Base.Theme.AppCompat.Light.Dialog.MinWidth = 0x7f0f0040
+net.micode.notes:drawable/moon = 0x7f07006c
net.micode.notes:color/abc_search_url_text_pressed = 0x7f050009
net.micode.notes:array/menu_share_ways = 0x7f020001
net.micode.notes:attr/subtitleTextAppearance = 0x7f0300a1
@@ -846,40 +845,45 @@ net.micode.notes:id/iv_bg_white = 0x7f080042
net.micode.notes:attr/actionButtonStyle = 0x7f03000b
net.micode.notes:attr/actionBarStyle = 0x7f030005
net.micode.notes:dimen/notification_large_icon_width = 0x7f060043
-net.micode.notes:string/menu_font_small = 0x7f0e003d
+net.micode.notes:string/menu_font_small = 0x7f0e003e
net.micode.notes:dimen/abc_text_size_large_material = 0x7f060034
net.micode.notes:drawable/abc_textfield_search_default_mtrl_alpha = 0x7f070039
net.micode.notes:attr/textAppearanceSearchResultSubtitle = 0x7f0300ac
net.micode.notes:attr/textAllCaps = 0x7f0300a8
net.micode.notes:id/action_menu_divider = 0x7f08000c
-net.micode.notes:string/menu_font_normal = 0x7f0e003b
+net.micode.notes:string/menu_font_normal = 0x7f0e003c
net.micode.notes:id/always = 0x7f080014
net.micode.notes:bool/abc_config_actionMenuItemAllCaps = 0x7f040003
+net.micode.notes:string/menu_moon = 0x7f0e0041
net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.PopupMenu.Small = 0x7f0f002e
net.micode.notes:dimen/abc_disabled_alpha_material_dark = 0x7f06001d
net.micode.notes:id/action_mode_bar_stub = 0x7f08000f
net.micode.notes:bool/abc_action_bar_expanded_action_views_exclusive = 0x7f040002
net.micode.notes:id/icon = 0x7f080037
net.micode.notes:attr/colorSwitchThumbNormal = 0x7f030044
-net.micode.notes:id/topPanel = 0x7f080095
-net.micode.notes:id/menu_lattice = 0x7f0800a5
-net.micode.notes:id/note_edit_view = 0x7f08006a
+net.micode.notes:id/topPanel = 0x7f080097
+net.micode.notes:id/note_edit_view = 0x7f08006c
net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionBar.Title = 0x7f0f0028
-net.micode.notes:drawable/title_alert = 0x7f070074
-net.micode.notes:drawable/list_red_single = 0x7f07005f
+net.micode.notes:drawable/title_alert = 0x7f070077
+net.micode.notes:drawable/list_red_single = 0x7f070060
net.micode.notes:attr/selectableItemBackground = 0x7f030093
net.micode.notes:attr/windowMinWidthMinor = 0x7f0300c9
net.micode.notes:attr/disableChildrenWhenDisabled = 0x7f03004e
net.micode.notes:color/abc_search_url_text = 0x7f050007
net.micode.notes:layout/widget_2x = 0x7f0a0032
+net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionMode.Subtitle = 0x7f0f002a
+net.micode.notes:drawable/rocket = 0x7f070073
+net.micode.notes:id/menu_moon = 0x7f08005a
net.micode.notes:color/button_material_dark = 0x7f05001a
net.micode.notes:id/cb_edit_item = 0x7f08001b
net.micode.notes:style/Widget.AppCompat.Button = 0x7f0f00fc
net.micode.notes:style/Base.TextAppearance.AppCompat.Small.Inverse = 0x7f0f0020
-net.micode.notes:drawable/list_blue_down = 0x7f070053
+net.micode.notes:drawable/list_blue_down = 0x7f070054
net.micode.notes:attr/windowFixedHeightMinor = 0x7f0300c5
+net.micode.notes:string/menu_remove_remind = 0x7f0e0045
+net.micode.notes:attr/drawableSize = 0x7f030054
net.micode.notes:attr/windowActionModeOverlay = 0x7f0300c3
-net.micode.notes:drawable/list_blue_up = 0x7f070056
+net.micode.notes:drawable/list_blue_up = 0x7f070057
net.micode.notes:attr/backgroundTint = 0x7f03002a
net.micode.notes:attr/homeAsUpIndicator = 0x7f030063
net.micode.notes:style/Widget.AppCompat.DrawerArrowToggle = 0x7f0f0106
@@ -904,7 +908,7 @@ net.micode.notes:attr/track = 0x7f0300bf
net.micode.notes:attr/topBottomBarArrowSize = 0x7f0300be
net.micode.notes:attr/buttonBarPositiveButtonStyle = 0x7f030031
net.micode.notes:attr/titleTextStyle = 0x7f0300bb
-net.micode.notes:string/menu_folder_delete = 0x7f0e0038
+net.micode.notes:string/menu_folder_delete = 0x7f0e0039
net.micode.notes:attr/titleMargins = 0x7f0300b9
net.micode.notes:id/info = 0x7f08003a
net.micode.notes:layout/note_item = 0x7f0a0021
@@ -917,17 +921,16 @@ net.micode.notes:attr/titleMarginStart = 0x7f0300b7
net.micode.notes:attr/windowFixedWidthMajor = 0x7f0300c6
net.micode.notes:attr/actionBarDivider = 0x7f030000
net.micode.notes:integer/abc_max_action_buttons = 0x7f090002
-net.micode.notes:drawable/list_folder = 0x7f070057
+net.micode.notes:drawable/list_folder = 0x7f070058
net.micode.notes:drawable/abc_menu_hardkey_panel_mtrl_mult = 0x7f07002c
net.micode.notes:attr/isLightTheme = 0x7f030069
net.micode.notes:attr/thickness = 0x7f0300b2
-net.micode.notes:string/preferences_menu_change_account = 0x7f0e0065
-net.micode.notes:id/textSpacerNoButtons = 0x7f080090
+net.micode.notes:string/preferences_menu_change_account = 0x7f0e0067
+net.micode.notes:id/textSpacerNoButtons = 0x7f080092
net.micode.notes:style/Widget.AppCompat.Light.ActionBar.Solid.Inverse = 0x7f0f010b
net.micode.notes:style/Base.Theme.AppCompat.Dialog.Alert = 0x7f0f0037
net.micode.notes:attr/buttonStyle = 0x7f030034
net.micode.notes:string/abc_action_mode_done = 0x7f0e0005
-net.micode.notes:string/menu_cat = 0x7f0e007c
net.micode.notes:style/Widget.AppCompat.SearchView.ActionBar = 0x7f0f012a
net.micode.notes:attr/textColorAlertDialogListItem = 0x7f0300af
net.micode.notes:attr/titleMarginEnd = 0x7f0300b6
@@ -950,10 +953,10 @@ net.micode.notes:attr/buttonBarButtonStyle = 0x7f03002e
net.micode.notes:dimen/abc_text_size_display_4_material = 0x7f060032
net.micode.notes:color/bright_foreground_material_light = 0x7f050019
net.micode.notes:style/Base.Widget.AppCompat.Spinner.DropDown.ActionBar = 0x7f0f0083
-net.micode.notes:id/radio = 0x7f080073
+net.micode.notes:id/radio = 0x7f080075
net.micode.notes:attr/subtitle = 0x7f0300a0
net.micode.notes:color/abc_background_cache_hint_selector_material_light = 0x7f050001
-net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0e0068
+net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0e006a
net.micode.notes:attr/spinBars = 0x7f030099
net.micode.notes:id/expanded_menu = 0x7f080030
net.micode.notes:attr/selectableItemBackgroundBorderless = 0x7f030094
@@ -961,31 +964,31 @@ net.micode.notes:anim/abc_fade_out = 0x7f010001
net.micode.notes:color/abc_input_method_navigation_guard = 0x7f050002
net.micode.notes:attr/actionViewClass = 0x7f030020
net.micode.notes:attr/titleMarginBottom = 0x7f0300b5
-net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f07006e
+net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f070070
net.micode.notes:attr/searchViewStyle = 0x7f030092
-net.micode.notes:id/tabMode = 0x7f08008d
-net.micode.notes:string/search = 0x7f0e006a
+net.micode.notes:id/tabMode = 0x7f08008f
+net.micode.notes:string/search = 0x7f0e006c
net.micode.notes:attr/ratingBarStyle = 0x7f03008f
net.micode.notes:attr/drawerArrowStyle = 0x7f030055
-net.micode.notes:drawable/list_green_middle = 0x7f07005a
+net.micode.notes:drawable/list_green_middle = 0x7f07005b
net.micode.notes:attr/queryBackground = 0x7f03008c
net.micode.notes:style/Widget.AppCompat.Button.Borderless = 0x7f0f00fd
net.micode.notes:dimen/dialog_fixed_height_minor = 0x7f06003d
net.micode.notes:dimen/abc_text_size_display_1_material = 0x7f06002f
net.micode.notes:attr/progressBarStyle = 0x7f03008a
net.micode.notes:style/Theme.AppCompat.Light.DarkActionBar = 0x7f0f00e2
-net.micode.notes:id/status_bar_latest_event_content = 0x7f08008a
+net.micode.notes:id/status_bar_latest_event_content = 0x7f08008c
net.micode.notes:color/primary_dark_material_dark = 0x7f05002f
net.micode.notes:layout/abc_action_bar_up_container = 0x7f0a0001
net.micode.notes:style/Base.TextAppearance.AppCompat.Small = 0x7f0f001f
net.micode.notes:attr/progressBarPadding = 0x7f030089
-net.micode.notes:string/note_alert_expired = 0x7f0e004e
+net.micode.notes:string/note_alert_expired = 0x7f0e0050
net.micode.notes:attr/popupMenuStyle = 0x7f030084
net.micode.notes:string/abc_action_bar_up_description = 0x7f0e0003
net.micode.notes:drawable/abc_ic_menu_selectall_mtrl_alpha = 0x7f07001b
net.micode.notes:style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Large = 0x7f0f00b1
net.micode.notes:dimen/abc_alert_dialog_button_bar_height = 0x7f06000f
-net.micode.notes:id/up = 0x7f08009d
+net.micode.notes:id/up = 0x7f08009f
net.micode.notes:attr/panelMenuListWidth = 0x7f030083
net.micode.notes:attr/showText = 0x7f030097
net.micode.notes:attr/prompt = 0x7f03008b
@@ -1027,7 +1030,7 @@ net.micode.notes:style/Base.Widget.AppCompat.ListView = 0x7f0f0077
net.micode.notes:attr/submitBackground = 0x7f03009f
net.micode.notes:attr/expandActivityOverflowButtonDrawable = 0x7f03005c
net.micode.notes:style/Base.Widget.AppCompat.Spinner = 0x7f0f0082
-net.micode.notes:id/tv_time = 0x7f08009a
+net.micode.notes:id/tv_time = 0x7f08009c
net.micode.notes:attr/windowFixedHeightMajor = 0x7f0300c4
net.micode.notes:attr/alertDialogButtonGroupStyle = 0x7f030022
net.micode.notes:attr/editTextStyle = 0x7f03005a
@@ -1040,8 +1043,7 @@ net.micode.notes:attr/color = 0x7f03003c
net.micode.notes:attr/goIcon = 0x7f030060
net.micode.notes:color/accent_material_light = 0x7f05000e
net.micode.notes:string/abc_toolbar_collapse_description = 0x7f0e0010
-net.micode.notes:color/hint_foreground_material_dark = 0x7f050022
-net.micode.notes:drawable/widget_2x_green = 0x7f070077
+net.micode.notes:drawable/widget_2x_green = 0x7f07007a
net.micode.notes:dimen/abc_dialog_padding_material = 0x7f06001b
net.micode.notes:attr/elevation = 0x7f03005b
net.micode.notes:attr/editTextColor = 0x7f030059
@@ -1050,7 +1052,7 @@ net.micode.notes:attr/editTextBackground = 0x7f030058
net.micode.notes:attr/dropdownListPreferredItemHeight = 0x7f030057
net.micode.notes:drawable/abc_list_pressed_holo_dark = 0x7f070024
net.micode.notes:attr/dropDownListViewStyle = 0x7f030056
-net.micode.notes:id/useLogo = 0x7f08009e
+net.micode.notes:id/useLogo = 0x7f0800a0
net.micode.notes:id/dropdown = 0x7f080028
net.micode.notes:attr/alertDialogStyle = 0x7f030024
net.micode.notes:attr/defaultQueryHint = 0x7f03004b
@@ -1072,11 +1074,11 @@ net.micode.notes:attr/spinnerDropDownItemStyle = 0x7f03009a
net.micode.notes:attr/logo = 0x7f030076
net.micode.notes:color/abc_search_url_text_normal = 0x7f050008
net.micode.notes:anim/abc_grow_fade_in_from_bottom = 0x7f010002
-net.micode.notes:string/menu_folder_view = 0x7f0e0039
+net.micode.notes:string/menu_folder_view = 0x7f0e003a
net.micode.notes:attr/panelBackground = 0x7f030081
net.micode.notes:attr/colorControlActivated = 0x7f03003f
net.micode.notes:style/Widget.AppCompat.RatingBar = 0x7f0f0128
-net.micode.notes:drawable/icon_app_yuan = 0x7f070051
+net.micode.notes:drawable/icon_app_yuan = 0x7f070052
net.micode.notes:attr/titleMarginTop = 0x7f0300b8
net.micode.notes:style/Base.V11.Theme.AppCompat.Dialog = 0x7f0f0047
net.micode.notes:anim/abc_shrink_fade_out_from_bottom = 0x7f010005
@@ -1092,26 +1094,25 @@ net.micode.notes:drawable/abc_btn_check_to_on_mtrl_015 = 0x7f070004
net.micode.notes:style/TextAppearanceNormal = 0x7f0f00d6
net.micode.notes:attr/dividerVertical = 0x7f030053
net.micode.notes:attr/checkboxStyle = 0x7f030036
-net.micode.notes:string/menu_select_title = 0x7f0e0047
net.micode.notes:drawable/abc_ic_clear_mtrl_alpha = 0x7f070014
net.micode.notes:color/abc_primary_text_material_light = 0x7f050006
net.micode.notes:attr/listItemLayout = 0x7f03006e
net.micode.notes:attr/buttonPanelSideLayout = 0x7f030033
net.micode.notes:string/error_sync_network = 0x7f0e0026
net.micode.notes:attr/actionModeBackground = 0x7f030010
-net.micode.notes:string/note_link_email = 0x7f0e0050
+net.micode.notes:string/note_link_email = 0x7f0e0052
net.micode.notes:attr/radioButtonStyle = 0x7f03008e
net.micode.notes:style/Theme.AppCompat.Light = 0x7f0f00e1
net.micode.notes:attr/actionModeCutDrawable = 0x7f030014
net.micode.notes:color/bright_foreground_material_dark = 0x7f050018
net.micode.notes:style/Base.TextAppearance.AppCompat.Inverse = 0x7f0f0014
net.micode.notes:color/dim_foreground_material_light = 0x7f05001f
-net.micode.notes:string/ticker_success = 0x7f0e0077
+net.micode.notes:string/ticker_success = 0x7f0e0079
net.micode.notes:dimen/abc_action_button_min_width_overflow_material = 0x7f06000e
net.micode.notes:attr/barSize = 0x7f03002c
net.micode.notes:id/iv_bg_green = 0x7f08003e
net.micode.notes:attr/actionMenuTextAppearance = 0x7f03000e
-net.micode.notes:drawable/list_yellow_up = 0x7f070068
+net.micode.notes:drawable/list_yellow_up = 0x7f070069
net.micode.notes:color/background_material_light = 0x7f050012
net.micode.notes:layout/abc_action_bar_title_item = 0x7f0a0000
net.micode.notes:attr/toolbarStyle = 0x7f0300bd
@@ -1119,8 +1120,8 @@ net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0e0020
net.micode.notes:attr/customNavigationLayout = 0x7f03004a
net.micode.notes:dimen/abc_disabled_alpha_material_light = 0x7f06001e
net.micode.notes:attr/listPreferredItemPaddingRight = 0x7f030075
-net.micode.notes:id/search_src_text = 0x7f08007e
-net.micode.notes:drawable/list_white_up = 0x7f070064
+net.micode.notes:id/search_src_text = 0x7f080080
+net.micode.notes:drawable/list_white_up = 0x7f070065
net.micode.notes:attr/alertDialogCenterButtons = 0x7f030023
net.micode.notes:style/Base.ThemeOverlay.AppCompat.Dark.ActionBar = 0x7f0f0045
net.micode.notes:color/light_blue_A200 = 0x7f050026
@@ -1130,28 +1131,26 @@ net.micode.notes:dimen/abc_text_size_caption_material = 0x7f06002e
net.micode.notes:attr/actionProviderClass = 0x7f03001f
net.micode.notes:drawable/abc_list_selector_disabled_holo_light = 0x7f070029
net.micode.notes:id/alertTitle = 0x7f080013
-net.micode.notes:id/selection_menu = 0x7f080081
net.micode.notes:dimen/text_font_size_medium = 0x7f060046
net.micode.notes:attr/actionBarTabStyle = 0x7f030007
net.micode.notes:string/error_sync_cancelled = 0x7f0e0024
net.micode.notes:color/background_floating_material_dark = 0x7f05000f
-net.micode.notes:string/widget_havenot_content = 0x7f0e007a
+net.micode.notes:string/widget_havenot_content = 0x7f0e007c
net.micode.notes:attr/actionBarItemBackground = 0x7f030001
net.micode.notes:style/Theme.AppCompat.Light.Dialog = 0x7f0f00e3
net.micode.notes:attr/actionMenuTextColor = 0x7f03000f
net.micode.notes:id/action_bar_root = 0x7f080006
net.micode.notes:attr/actionBarTabTextStyle = 0x7f030008
net.micode.notes:style/Base.Animation.AppCompat.DropDownUp = 0x7f0f0007
-net.micode.notes:drawable/list_yellow_middle = 0x7f070066
-net.micode.notes:string/notelist_string_info = 0x7f0e0057
+net.micode.notes:drawable/list_yellow_middle = 0x7f070067
+net.micode.notes:string/notelist_string_info = 0x7f0e0059
net.micode.notes:attr/actionLayout = 0x7f03000d
net.micode.notes:attr/splitTrack = 0x7f03009d
-net.micode.notes:id/src_atop = 0x7f080087
+net.micode.notes:id/src_atop = 0x7f080089
net.micode.notes:attr/contentInsetRight = 0x7f030048
net.micode.notes:drawable/abc_list_selector_background_transition_holo_dark = 0x7f070026
-net.micode.notes:string/menu_notes = 0x7f0e007f
net.micode.notes:attr/buttonBarNegativeButtonStyle = 0x7f03002f
-net.micode.notes:id/title_template = 0x7f080094
+net.micode.notes:id/title_template = 0x7f080096
net.micode.notes:attr/singleChoiceItemLayout = 0x7f030098
net.micode.notes:string/failed_sdcard_export = 0x7f0e0027
net.micode.notes:style/TextAppearance.AppCompat = 0x7f0f00a2
@@ -1161,13 +1160,13 @@ net.micode.notes:attr/preserveIconSpacing = 0x7f030088
net.micode.notes:color/abc_search_url_text_selected = 0x7f05000a
net.micode.notes:attr/measureWithLargestChild = 0x7f030078
net.micode.notes:dimen/abc_text_size_title_material = 0x7f06003a
-net.micode.notes:id/showTitle = 0x7f080085
+net.micode.notes:id/showTitle = 0x7f080087
net.micode.notes:attr/actionBarSplitStyle = 0x7f030004
net.micode.notes:anim/abc_slide_in_bottom = 0x7f010006
net.micode.notes:style/Platform.V14.AppCompat = 0x7f0f0092
net.micode.notes:attr/divider = 0x7f030050
-net.micode.notes:string/preferences_menu_cancel = 0x7f0e0064
-net.micode.notes:drawable/list_white_single = 0x7f070063
+net.micode.notes:string/preferences_menu_cancel = 0x7f0e0066
+net.micode.notes:drawable/list_white_single = 0x7f070064
net.micode.notes:string/alert_message_delete_folder = 0x7f0e0011
net.micode.notes:style/Base.Widget.AppCompat.EditText = 0x7f0f006d
net.micode.notes:attr/actionBarPopupTheme = 0x7f030002
@@ -1175,7 +1174,7 @@ net.micode.notes:bool/abc_action_bar_embed_tabs = 0x7f040000
net.micode.notes:style/TextAppearance.AppCompat.Widget.PopupMenu.Small = 0x7f0f00c9
net.micode.notes:dimen/text_font_size_large = 0x7f060045
net.micode.notes:attr/showDividers = 0x7f030096
-net.micode.notes:drawable/list_footer_bg = 0x7f070058
+net.micode.notes:drawable/list_footer_bg = 0x7f070059
net.micode.notes:attr/spinnerMode = 0x7f03009b
net.micode.notes:id/default_activity_button = 0x7f080024
net.micode.notes:color/light_blue_900 = 0x7f050025
diff --git a/src/Notes-master1/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt b/src/Notes-master1/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt
index 2faef34..3088437 100644
--- a/src/Notes-master1/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt
+++ b/src/Notes-master1/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt
@@ -424,7 +424,6 @@ drawable abc_textfield_default_mtrl_alpha
drawable abc_textfield_search_activated_mtrl_alpha
drawable abc_textfield_search_default_mtrl_alpha
drawable abc_textfield_search_material
-drawable batterfly
drawable bg_btn_set_color
drawable bg_color_btn_mask
drawable call_record
@@ -441,6 +440,7 @@ drawable edit_title_white
drawable edit_title_yellow
drawable edit_white
drawable edit_yellow
+drawable fly
drawable font_large
drawable font_normal
drawable font_size_selector_bg
@@ -473,6 +473,7 @@ drawable list_yellow_single
drawable list_yellow_up
drawable menu_delete
drawable menu_move
+drawable moon
drawable new_note
drawable new_note_normal
drawable new_note_pressed
@@ -582,8 +583,10 @@ id menu_alert
id menu_delete
id menu_delete_remind
id menu_export_text
+id menu_fly
id menu_font_size
id menu_list_mode
+id menu_moon
id menu_new_folder
id menu_new_note
id menu_search
@@ -591,6 +594,7 @@ id menu_send_to_desktop
id menu_setting
id menu_share
id menu_sync
+id menu_trash
id middle
id minute
id move
@@ -779,6 +783,7 @@ string menu_create_folder
string menu_delete
string menu_deselect_all
string menu_export_text
+string menu_fly
string menu_folder_change_name
string menu_folder_delete
string menu_folder_view
@@ -788,6 +793,7 @@ string menu_font_size
string menu_font_small
string menu_font_super
string menu_list_mode
+string menu_moon
string menu_move
string menu_move_parent_folder
string menu_normal_mode
@@ -802,6 +808,7 @@ string menu_share
string menu_sync
string menu_sync_cancel
string menu_title_select_folder
+string menu_trash
string note_alert_expired
string note_length
string note_link_email
diff --git a/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk
new file mode 100644
index 0000000..521c721
Binary files /dev/null and b/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk differ
diff --git a/src/Notes-master1/app/build/outputs/apk/debug/output-metadata.json b/src/Notes-master1/app/build/outputs/apk/debug/output-metadata.json
new file mode 100644
index 0000000..b2231b9
--- /dev/null
+++ b/src/Notes-master1/app/build/outputs/apk/debug/output-metadata.json
@@ -0,0 +1,20 @@
+{
+ "version": 3,
+ "artifactType": {
+ "type": "APK",
+ "kind": "Directory"
+ },
+ "applicationId": "net.micode.notes",
+ "variantName": "debug",
+ "elements": [
+ {
+ "type": "SINGLE",
+ "filters": [],
+ "attributes": [],
+ "versionCode": 1,
+ "versionName": "0.1",
+ "outputFile": "app-debug.apk"
+ }
+ ],
+ "elementType": "File"
+}
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId68 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId68
deleted file mode 100644
index 62966db..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId68 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmInitReceiver.class.uniqueId74 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmInitReceiver.class.uniqueId74
deleted file mode 100644
index 6b270bb..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmInitReceiver.class.uniqueId74 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/BackupUtils$TextExport.class.uniqueId45 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/BackupUtils$TextExport.class.uniqueId45
deleted file mode 100644
index eb10de2..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/BackupUtils$TextExport.class.uniqueId45 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/BackupUtils.class.uniqueId46 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/BackupUtils.class.uniqueId46
deleted file mode 100644
index ed15dfa..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/BackupUtils.class.uniqueId46 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Contact.class.uniqueId77 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Contact.class.uniqueId77
deleted file mode 100644
index a7948fd..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Contact.class.uniqueId77 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DataUtils.class.uniqueId54 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DataUtils.class.uniqueId54
deleted file mode 100644
index 6af3200..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DataUtils.class.uniqueId54 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DropdownMenu$1.class.uniqueId34 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DropdownMenu$1.class.uniqueId34
deleted file mode 100644
index 7dd1e34..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DropdownMenu$1.class.uniqueId34 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DropdownMenu.class.uniqueId9 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DropdownMenu.class.uniqueId9
deleted file mode 100644
index 4c39e11..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DropdownMenu.class.uniqueId9 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter$FolderListItem.class.uniqueId61 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter$FolderListItem.class.uniqueId61
deleted file mode 100644
index 4689013..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter$FolderListItem.class.uniqueId61 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter.class.uniqueId13 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter.class.uniqueId13
deleted file mode 100644
index 0c394b2..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter.class.uniqueId13 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId27 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId23
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId27
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId23
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$OnCompleteListener.class.uniqueId73 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$OnCompleteListener.class.uniqueId31
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$OnCompleteListener.class.uniqueId73
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$OnCompleteListener.class.uniqueId31
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId23 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId19
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId23
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId19
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskManager.class.uniqueId50 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskManager.class.uniqueId50
deleted file mode 100644
index ac1834c..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskManager.class.uniqueId50 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Note$NoteData.class.uniqueId29 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Note$NoteData.class.uniqueId29
deleted file mode 100644
index c40e945..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Note$NoteData.class.uniqueId29 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Note.class.uniqueId57 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Note.class.uniqueId57
deleted file mode 100644
index d2041cc..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Note.class.uniqueId57 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId49 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId6
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId49
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId6
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId65 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId21
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId65
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId21
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$4.class.uniqueId40 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$4.class.uniqueId37
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$4.class.uniqueId40
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$4.class.uniqueId37
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId35 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId33
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId35
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId33
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId62 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId17
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId62
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId17
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId52 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId52
deleted file mode 100644
index 771aa91..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId52 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId28 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId25
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId28
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId25
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider_2x.class.uniqueId25 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider_2x.class.uniqueId25
deleted file mode 100644
index 043e410..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider_2x.class.uniqueId25 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider_4x.class.uniqueId21 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider_4x.class.uniqueId21
deleted file mode 100644
index ee3fd40..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider_4x.class.uniqueId21 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$CallNote.class.uniqueId42 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$CallNote.class.uniqueId42
deleted file mode 100644
index 42394b7..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$CallNote.class.uniqueId42 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$DataColumns.class.uniqueId4 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$DataColumns.class.uniqueId4
deleted file mode 100644
index 569dbdc..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$DataColumns.class.uniqueId4 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$DataConstants.class.uniqueId5 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$DataConstants.class.uniqueId5
deleted file mode 100644
index 76ef96e..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$DataConstants.class.uniqueId5 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$NoteColumns.class.uniqueId19 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$NoteColumns.class.uniqueId19
deleted file mode 100644
index 36c8d49..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$NoteColumns.class.uniqueId19 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$TextNote.class.uniqueId72 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$TextNote.class.uniqueId72
deleted file mode 100644
index 42461a2..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$TextNote.class.uniqueId72 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes.class.uniqueId51 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes.class.uniqueId51
deleted file mode 100644
index 413745e..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes.class.uniqueId51 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesDatabaseHelper$TABLE.class.uniqueId38 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesDatabaseHelper$TABLE.class.uniqueId38
deleted file mode 100644
index 64fe9eb..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesDatabaseHelper$TABLE.class.uniqueId38 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesDatabaseHelper.class.uniqueId43 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesDatabaseHelper.class.uniqueId43
deleted file mode 100644
index 0b075b4..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesDatabaseHelper.class.uniqueId43 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId20 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId14
similarity index 89%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId20
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId14
index abb2cdd..5150ad3 100644
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId20 and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId14 differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId30 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId29
similarity index 70%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId30
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId29
index a5525b1..468aa2d 100644
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId30 and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId29 differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId47 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId4
similarity index 85%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId47
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId4
index c04be49..fb0c686 100644
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId47 and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId4 differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId60 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId16
similarity index 92%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId60
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId16
index 3f55dfc..cc86b32 100644
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId60 and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId16 differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId36 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId34
similarity index 83%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId36
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId34
index 8e75a2e..a414b00 100644
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId36 and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId34 differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId63 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId18
similarity index 90%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId63
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId18
index 696cf5b..9f0d9e4 100644
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId63 and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId18 differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId48 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId5
similarity index 88%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId48
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId5
index b9e480e..ccc9223 100644
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId48 and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId5 differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId31 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId30
similarity index 82%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId31
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId30
index 030b495..e36c662 100644
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId31 and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId30 differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId17 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId11
similarity index 88%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId17
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId11
index 9d1a9a7..d5d458c 100644
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId17 and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId11 differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId15 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId10
similarity index 86%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId15
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId10
index e0dd8a4..fbe7960 100644
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId15 and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId10 differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId66 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId24
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId66
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId24
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId11 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId7
similarity index 92%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId11
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId7
index 7926ed3..8571d73 100644
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId11 and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId7 differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId18 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId12
similarity index 88%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId18
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId12
index 3d71132..edf589c 100644
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId18 and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId12 differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId71 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId28
similarity index 86%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId71
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId28
index 862adcf..58c8c6d 100644
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId71 and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId28 differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId8 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId3
similarity index 89%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId8
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId3
index 3301a16..2050d5b 100644
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId8 and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId3 differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId2 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId1
similarity index 92%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId2
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId1
index 72d3c56..497cb9a 100644
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId2 and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId1 differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId35 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId35
new file mode 100644
index 0000000..fef2ab5
Binary files /dev/null and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId35 differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId37 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId37
deleted file mode 100644
index 47cc249..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId37 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListAdapter$AppWidgetAttribute.class.uniqueId6 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListAdapter$AppWidgetAttribute.class.uniqueId6
deleted file mode 100644
index 2bdb58b..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListAdapter$AppWidgetAttribute.class.uniqueId6 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListAdapter.class.uniqueId32 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListAdapter.class.uniqueId32
deleted file mode 100644
index 5e432e9..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListAdapter.class.uniqueId32 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListItem.class.uniqueId16 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListItem.class.uniqueId16
deleted file mode 100644
index 4596834..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListItem.class.uniqueId16 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId24 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId20
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId24
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId20
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId76 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId32
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId76
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId32
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId14 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId8
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId14
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId8
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId26 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId22
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId26
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId22
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId44 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId2
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId44
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId2
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId59 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId15
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId59
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId15
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId39 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId36
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId39
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId36
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId55 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId9
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId55
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId9
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId41 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId38
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId41
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId38
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId56 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId13
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId56
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId13
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesProvider.class.uniqueId67 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesProvider.class.uniqueId67
deleted file mode 100644
index 1d3de0e..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesProvider.class.uniqueId67 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/ResourceParser$NoteBgResources.class.uniqueId75 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/ResourceParser$NoteBgResources.class.uniqueId75
deleted file mode 100644
index 84e57a4..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/ResourceParser$NoteBgResources.class.uniqueId75 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/ResourceParser$NoteItemBgResources.class.uniqueId3 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/ResourceParser$NoteItemBgResources.class.uniqueId3
deleted file mode 100644
index 8805a06..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/ResourceParser$NoteItemBgResources.class.uniqueId3 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/ResourceParser$TextAppearanceResources.class.uniqueId12 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/ResourceParser$TextAppearanceResources.class.uniqueId12
deleted file mode 100644
index 7f2eb75..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/ResourceParser$TextAppearanceResources.class.uniqueId12 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/ResourceParser$WidgetBgResources.class.uniqueId7 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/ResourceParser$WidgetBgResources.class.uniqueId7
deleted file mode 100644
index b4ec3ba..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/ResourceParser$WidgetBgResources.class.uniqueId7 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/ResourceParser.class.uniqueId22 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/ResourceParser.class.uniqueId22
deleted file mode 100644
index f2e1b62..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/ResourceParser.class.uniqueId22 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SplashActivity$1.class.uniqueId69 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SplashActivity$1.class.uniqueId26
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SplashActivity$1.class.uniqueId69
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SplashActivity$1.class.uniqueId26
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SplashActivity.class.uniqueId70 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SplashActivity.class.uniqueId27
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SplashActivity.class.uniqueId70
rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SplashActivity.class.uniqueId27
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SqlData.class.uniqueId1 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SqlData.class.uniqueId1
deleted file mode 100644
index 099f3ba..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SqlData.class.uniqueId1 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SqlNote.class.uniqueId33 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SqlNote.class.uniqueId33
deleted file mode 100644
index 2783ae3..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SqlNote.class.uniqueId33 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Task.class.uniqueId64 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Task.class.uniqueId64
deleted file mode 100644
index 9b2d85c..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Task.class.uniqueId64 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/TaskList.class.uniqueId10 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/TaskList.class.uniqueId10
deleted file mode 100644
index d3c2e41..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/TaskList.class.uniqueId10 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote$NoteSettingChangedListener.class.uniqueId53 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote$NoteSettingChangedListener.class.uniqueId53
deleted file mode 100644
index 15f1f77..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote$NoteSettingChangedListener.class.uniqueId53 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote.class.uniqueId58 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote.class.uniqueId58
deleted file mode 100644
index df71afc..0000000
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote.class.uniqueId58 and /dev/null differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
index 6c682be..939f9da 100644
Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index 8c23c49..7f678ea 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -139,7 +139,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.note_list);
- //getWindow().setBackgroundDrawableResource(R.drawable.cat);
+ getWindow().setBackgroundDrawableResource(R.drawable.fly);
initResources();
/**
@@ -457,7 +457,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
new AsyncTask>() {
protected HashSet doInBackground(Void... unused) {
HashSet widgets = mNotesListAdapter.getSelectedWidget();
- if (!isSyncMode()) {
+ if (mCurrentFolderId == Notes.ID_TRASH_FOLER) {
// if not synced, delete notes directly
if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter
.getSelectedItemIds())) {
@@ -781,6 +781,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
createNewNote();
} else if (itemId == R.id.menu_search) {
onSearchRequested();
+ } else if (itemId == R.id.menu_fly) {
+ getWindow().setBackgroundDrawableResource(R.drawable.fly);
+ }else if (itemId == R.id.menu_moon) {
+ getWindow().setBackgroundDrawableResource(R.drawable.moon);
+ }else if (itemId == R.id.menu_trash) {
+ openTrashFolder();
}
return true;
}
@@ -843,6 +849,19 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
from.startActivityIfNeeded(intent, -1);
}
+ private void openTrashFolder() {
+ mCurrentFolderId = Notes.ID_TRASH_FOLER;
+ startAsyncNotesListQuery();
+ // 正常打开文件夹
+ mState = ListEditState.SUB_FOLDER;
+ // 将顶部栏设置为 data.getSnippet 文件夹名称
+ mTitleBar.setText(NotesListActivity.this
+ .getString(R.string.menu_trash));
+ // 不显示底部的“写便签”
+ mAddNewNote.setVisibility(View.GONE);
+ mTitleBar.setVisibility(View.GONE);
+ }
+
private class OnListItemClickListener implements OnItemClickListener {
public void onItemClick(AdapterView> parent, View view, int position, long id) {
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/batterfly.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/fly.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/batterfly.png
rename to src/Notes-master1/app/src/main/res/drawable-hdpi/fly.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/moon.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/moon.png
new file mode 100644
index 0000000..009e12c
Binary files /dev/null and b/src/Notes-master1/app/src/main/res/drawable-hdpi/moon.png differ
diff --git a/src/Notes-master1/app/src/main/res/layout/note_list.xml b/src/Notes-master1/app/src/main/res/layout/note_list.xml
index 6b25d38..234fa83 100644
--- a/src/Notes-master1/app/src/main/res/layout/note_list.xml
+++ b/src/Notes-master1/app/src/main/res/layout/note_list.xml
@@ -18,8 +18,8 @@
+ android:layout_height="fill_parent">
+
+
+
+
+
+
+
diff --git a/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml b/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml
index a0b1d43..fc89465 100644
--- a/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml
+++ b/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml
@@ -35,6 +35,7 @@
发送邮件
浏览网页
打开地图
+ 回收站
新建文件夹
导出文本
diff --git a/src/Notes-master1/app/src/main/res/values/strings.xml b/src/Notes-master1/app/src/main/res/values/strings.xml
index fb3e9d2..f937599 100644
--- a/src/Notes-master1/app/src/main/res/values/strings.xml
+++ b/src/Notes-master1/app/src/main/res/values/strings.xml
@@ -34,10 +34,16 @@
Send email
Browse web
Open map
+ Trash Folder
+
/MIUI/notes/
notes_%s.txt
+
+ Background: fly
+ Background: moon
+
(%d)
New Folder