diff --git a/doc/实践考评-阅读维护开源软件的团队自评报告.xlsx b/doc/实践考评-阅读维护开源软件的团队自评报告.xlsx index d7b22b8..58f1380 100644 Binary files a/doc/实践考评-阅读维护开源软件的团队自评报告.xlsx and b/doc/实践考评-阅读维护开源软件的团队自评报告.xlsx differ diff --git a/doc/实践考评-阅读维护开源软件的汇报.pptx b/doc/实践考评-阅读维护开源软件的汇报.pptx index cbf3a50..a1290cc 100644 Binary files a/doc/实践考评-阅读维护开源软件的汇报.pptx and b/doc/实践考评-阅读维护开源软件的汇报.pptx differ diff --git a/doc/小米便签软件泛读、标注和维护报告文档.docx b/doc/小米便签软件泛读、标注和维护报告文档.docx index e8d9f7e..0398951 100644 Binary files a/doc/小米便签软件泛读、标注和维护报告文档.docx and b/doc/小米便签软件泛读、标注和维护报告文档.docx differ diff --git a/src/Notes/.gradle/7.5/checksums/checksums.lock b/src/Notes/.gradle/7.5/checksums/checksums.lock index cad93d6..6c50dea 100644 Binary files a/src/Notes/.gradle/7.5/checksums/checksums.lock and b/src/Notes/.gradle/7.5/checksums/checksums.lock differ diff --git a/src/Notes/.gradle/7.5/checksums/md5-checksums.bin b/src/Notes/.gradle/7.5/checksums/md5-checksums.bin index 73aa858..7496fdb 100644 Binary files a/src/Notes/.gradle/7.5/checksums/md5-checksums.bin and b/src/Notes/.gradle/7.5/checksums/md5-checksums.bin differ diff --git a/src/Notes/.gradle/7.5/checksums/sha1-checksums.bin b/src/Notes/.gradle/7.5/checksums/sha1-checksums.bin index f1f8402..ef5944b 100644 Binary files a/src/Notes/.gradle/7.5/checksums/sha1-checksums.bin and b/src/Notes/.gradle/7.5/checksums/sha1-checksums.bin differ diff --git a/src/Notes/.gradle/7.5/executionHistory/executionHistory.bin b/src/Notes/.gradle/7.5/executionHistory/executionHistory.bin index 2835792..fea1931 100644 Binary files a/src/Notes/.gradle/7.5/executionHistory/executionHistory.bin and b/src/Notes/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/src/Notes/.gradle/7.5/executionHistory/executionHistory.lock b/src/Notes/.gradle/7.5/executionHistory/executionHistory.lock index 17f9fb0..f6fcf6e 100644 Binary files a/src/Notes/.gradle/7.5/executionHistory/executionHistory.lock and b/src/Notes/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/src/Notes/.gradle/7.5/fileHashes/fileHashes.bin b/src/Notes/.gradle/7.5/fileHashes/fileHashes.bin index d6cec51..fffc2e5 100644 Binary files a/src/Notes/.gradle/7.5/fileHashes/fileHashes.bin and b/src/Notes/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/src/Notes/.gradle/7.5/fileHashes/fileHashes.lock b/src/Notes/.gradle/7.5/fileHashes/fileHashes.lock index e4d04ed..97267be 100644 Binary files a/src/Notes/.gradle/7.5/fileHashes/fileHashes.lock and b/src/Notes/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/src/Notes/.gradle/7.5/fileHashes/resourceHashesCache.bin b/src/Notes/.gradle/7.5/fileHashes/resourceHashesCache.bin index f11633d..a88ce02 100644 Binary files a/src/Notes/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/src/Notes/.gradle/7.5/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 1f9c5fc..0c6ad91 100644 Binary files a/src/Notes/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes/.gradle/buildOutputCleanup/outputFiles.bin index 384325a..29951e8 100644 Binary files a/src/Notes/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/Notes/.gradle/file-system.probe b/src/Notes/.gradle/file-system.probe index 301258c..ec493dc 100644 Binary files a/src/Notes/.gradle/file-system.probe and b/src/Notes/.gradle/file-system.probe differ diff --git a/src/Notes/.idea/libraries/Gradle__D.xml b/src/Notes/.idea/libraries/Gradle__D.xml index 9900030..e004145 100644 --- a/src/Notes/.idea/libraries/Gradle__D.xml +++ b/src/Notes/.idea/libraries/Gradle__D.xml @@ -1,7 +1,7 @@ - + diff --git a/src/Notes/.idea/modules/app/Notes.app.androidTest.iml b/src/Notes/.idea/modules/app/Notes.app.androidTest.iml index cf66194..3b37533 100644 --- a/src/Notes/.idea/modules/app/Notes.app.androidTest.iml +++ b/src/Notes/.idea/modules/app/Notes.app.androidTest.iml @@ -18,7 +18,6 @@ - diff --git a/src/Notes/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes/app/build/intermediates/apk/debug/app-debug.apk index dee1a30..bb4f4f3 100644 Binary files a/src/Notes/app/build/intermediates/apk/debug/app-debug.apk and b/src/Notes/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/Notes/app/build/intermediates/compile_app_classes_jar/debug/classes.jar b/src/Notes/app/build/intermediates/compile_app_classes_jar/debug/classes.jar index 3cd2f31..1a8cb8a 100644 Binary files a/src/Notes/app/build/intermediates/compile_app_classes_jar/debug/classes.jar and b/src/Notes/app/build/intermediates/compile_app_classes_jar/debug/classes.jar differ diff --git a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex index e3ce883..0f08645 100644 Binary files a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex and b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex differ diff --git a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex index a36f1ce..0ec4c79 100644 Binary files a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex and b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex differ diff --git a/src/Notes/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index a2da8a1..9186a50 100644 Binary files a/src/Notes/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Notes/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out b/src/Notes/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out index 97e9812..caf65e6 100644 Binary files a/src/Notes/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out and b/src/Notes/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state index 8c84b40..65031b1 100644 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4ZKJBFY7CMZHy69x_wl9yDf4Ll0= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4ZKJBFY7CMZHy69x_wl9yDf4Ll0= deleted file mode 100644 index 083d96b..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4ZKJBFY7CMZHy69x_wl9yDf4Ll0= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4saabp8CJ2a+ZtfEz1ixGErMvns= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4saabp8CJ2a+ZtfEz1ixGErMvns= deleted file mode 100644 index 2dae2f9..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4saabp8CJ2a+ZtfEz1ixGErMvns= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9YU3iwFztWvwyvs+zTk6qL4fsNo= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9YU3iwFztWvwyvs+zTk6qL4fsNo= deleted file mode 100644 index e9e7608..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9YU3iwFztWvwyvs+zTk6qL4fsNo= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Aqz88YoDSYM9sQ0AZD2jztcXQEM= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Aqz88YoDSYM9sQ0AZD2jztcXQEM= deleted file mode 100644 index 06e914d..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Aqz88YoDSYM9sQ0AZD2jztcXQEM= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/B_oWS7iCYaluhsmpGKTjVGN5bYo= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/B_oWS7iCYaluhsmpGKTjVGN5bYo= deleted file mode 100644 index 0fb7130..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/B_oWS7iCYaluhsmpGKTjVGN5bYo= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/C3wtgA1q4WeohPIeRoDwgqvEEzc= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/C3wtgA1q4WeohPIeRoDwgqvEEzc= deleted file mode 100644 index 6bb2c49..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/C3wtgA1q4WeohPIeRoDwgqvEEzc= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/C9jroaRXwFXp_D2RDUqtZysylj8= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/C9jroaRXwFXp_D2RDUqtZysylj8= deleted file mode 100644 index c063f2b..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/C9jroaRXwFXp_D2RDUqtZysylj8= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CkZ1HD3i2Yp3jrXtMAIGpZKBdaM= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CkZ1HD3i2Yp3jrXtMAIGpZKBdaM= deleted file mode 100644 index 27924dd..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CkZ1HD3i2Yp3jrXtMAIGpZKBdaM= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/D5Qb9Ll9D3W9Ty+4X60Zi6+6Rqs= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/D5Qb9Ll9D3W9Ty+4X60Zi6+6Rqs= deleted file mode 100644 index a19a2a5..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/D5Qb9Ll9D3W9Ty+4X60Zi6+6Rqs= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F6Fnx55Rif4tKHRturEDrgm3B00= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F6Fnx55Rif4tKHRturEDrgm3B00= deleted file mode 100644 index e27d24a..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F6Fnx55Rif4tKHRturEDrgm3B00= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/J1Hkp+uynDypwdXgTiIgb18kDfc= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/J1Hkp+uynDypwdXgTiIgb18kDfc= deleted file mode 100644 index b12b287..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/J1Hkp+uynDypwdXgTiIgb18kDfc= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L7VIrSpMlXeQ8ly3BVnrm5nTC_k= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L7VIrSpMlXeQ8ly3BVnrm5nTC_k= deleted file mode 100644 index 32d47c0..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L7VIrSpMlXeQ8ly3BVnrm5nTC_k= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NlB1oymp_vxmUaQDIwr65TEzUtU= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NlB1oymp_vxmUaQDIwr65TEzUtU= deleted file mode 100644 index 1423435..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NlB1oymp_vxmUaQDIwr65TEzUtU= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ONjvaSdthQgsIJpTG3bB53bKYbw= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ONjvaSdthQgsIJpTG3bB53bKYbw= deleted file mode 100644 index a69b1ec..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ONjvaSdthQgsIJpTG3bB53bKYbw= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SZOicE_mOTB6dVCU6lvYXpu8O7g= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SZOicE_mOTB6dVCU6lvYXpu8O7g= deleted file mode 100644 index feebff2..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SZOicE_mOTB6dVCU6lvYXpu8O7g= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/VgljsqM_Ld+qtdBOxJwB0b2yZQ0= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/VgljsqM_Ld+qtdBOxJwB0b2yZQ0= deleted file mode 100644 index e7159a9..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/VgljsqM_Ld+qtdBOxJwB0b2yZQ0= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/X2jqmtPJi81FtcXN5m9MyGIcHCs= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/X2jqmtPJi81FtcXN5m9MyGIcHCs= deleted file mode 100644 index d0dcd9c..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/X2jqmtPJi81FtcXN5m9MyGIcHCs= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XhYyM8rLB6K7yKMOrPHwWuOGB3w= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XhYyM8rLB6K7yKMOrPHwWuOGB3w= deleted file mode 100644 index f6dab42..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XhYyM8rLB6K7yKMOrPHwWuOGB3w= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cyhY31xvrzDva_Q0ojTwmo+Alk4= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cyhY31xvrzDva_Q0ojTwmo+Alk4= deleted file mode 100644 index 87586a5..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cyhY31xvrzDva_Q0ojTwmo+Alk4= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/hW0653hTJfHM0Zci_ct9XwdxV1c= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/hW0653hTJfHM0Zci_ct9XwdxV1c= deleted file mode 100644 index f61d762..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/hW0653hTJfHM0Zci_ct9XwdxV1c= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/i5_diqLULFiF83meqrL0guXhqOI= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/i5_diqLULFiF83meqrL0guXhqOI= deleted file mode 100644 index b6ac9fe..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/i5_diqLULFiF83meqrL0guXhqOI= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m8Y6aRjdjEZsVr+ljo7SEJhCGvI= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m8Y6aRjdjEZsVr+ljo7SEJhCGvI= deleted file mode 100644 index e49acf7..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m8Y6aRjdjEZsVr+ljo7SEJhCGvI= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mtOauOk1+mBX3wu8ABzja1enrhM= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mtOauOk1+mBX3wu8ABzja1enrhM= deleted file mode 100644 index 2365cb9..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mtOauOk1+mBX3wu8ABzja1enrhM= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mv3x1lB+8EjBUAMQiplN7mm9Vzs= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mv3x1lB+8EjBUAMQiplN7mm9Vzs= deleted file mode 100644 index 3c086f3..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mv3x1lB+8EjBUAMQiplN7mm9Vzs= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qtmN_Ho9eMZ0HVpNEtXO9+BKRoQ= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qtmN_Ho9eMZ0HVpNEtXO9+BKRoQ= deleted file mode 100644 index 1c79806..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qtmN_Ho9eMZ0HVpNEtXO9+BKRoQ= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uLyHmlGMQqgFAKukY92Y2Bc4gc8= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uLyHmlGMQqgFAKukY92Y2Bc4gc8= deleted file mode 100644 index 371b441..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uLyHmlGMQqgFAKukY92Y2Bc4gc8= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ud2yvUkoY1n09AC5BUdJTKxfMDM= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ud2yvUkoY1n09AC5BUdJTKxfMDM= deleted file mode 100644 index 865488d..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ud2yvUkoY1n09AC5BUdJTKxfMDM= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wOBApgBXGnqi9jkHHNOV5VrLST0= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wOBApgBXGnqi9jkHHNOV5VrLST0= deleted file mode 100644 index 2b56acd..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wOBApgBXGnqi9jkHHNOV5VrLST0= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xGdFRZXKXJ21QhQKNPBp6_EIvuY= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xGdFRZXKXJ21QhQKNPBp6_EIvuY= deleted file mode 100644 index 483b42c..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xGdFRZXKXJ21QhQKNPBp6_EIvuY= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/yrBDggEPCoz7zGVA5zmA8Ro+52Y= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/yrBDggEPCoz7zGVA5zmA8Ro+52Y= deleted file mode 100644 index 25547cc..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/yrBDggEPCoz7zGVA5zmA8Ro+52Y= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zJnzddHSfoeBYZPAQLQ8pBSz4EA= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zJnzddHSfoeBYZPAQLQ8pBSz4EA= deleted file mode 100644 index 8d3e763..0000000 Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zJnzddHSfoeBYZPAQLQ8pBSz4EA= and /dev/null differ diff --git a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 08635e3..24a314a 100644 --- a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,108 +1,108 @@ -#Sat Jan 11 23:16:31 CST 2025 -net.micode.notes.app-main-10\:/color/primary_text_dark.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-10\:/color/secondary_text_dark.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-10\:/drawable-hdpi/bg_btn_set_color.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/call_record.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/clock.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/delete.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/dropdown_icon.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/edit_blue.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/edit_green.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/edit_red.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_blue.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_green.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_red.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_white.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/edit_white.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/edit_yellow.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/font_large.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/font_normal.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/font_small.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/font_super.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/icon_app.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/key.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_key.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_background.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_background1.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background1.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_background2.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background2.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_down.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_middle.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_single.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_up.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_folder.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_footer_bg.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_green_down.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_green_middle.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_green_single.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_green_up.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_red_down.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_red_middle.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_red_single.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_red_up.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_white_down.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_white_middle.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_white_single.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_white_up.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_down.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_single.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_up.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/menu_delete.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/menu_move.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/menu_top.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_top.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/new_note_normal.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/new_note_pressed.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/notification.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/search_result.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/selected.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/splash.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_splash.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/title_alert.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/title_bar_bg.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/translate.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_translate.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_blue.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_green.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_red.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_white.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_yellow.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_blue.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_green.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_red.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_white.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_yellow.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -net.micode.notes.app-main-10\:/drawable/new_note.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-10\:/menu/call_note_edit.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-10\:/menu/call_record_folder.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -net.micode.notes.app-main-10\:/menu/note_edit.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat -net.micode.notes.app-main-10\:/menu/note_list.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-10\:/menu/note_list_dropdown.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -net.micode.notes.app-main-10\:/menu/note_list_options.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-10\:/menu/sub_folder.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-10\:/raw-zh-rCN/introduction=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-10\:/raw/introduction=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-10\:/xml/preferences.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-10\:/xml/searchable.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-10\:/xml/widget_2x_info.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -net.micode.notes.app-main-10\:/xml/widget_4x_info.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat -net.micode.notes.app-mergeDebugResources-7\:/layout/account_dialog_title.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -net.micode.notes.app-mergeDebugResources-7\:/layout/activity_change_loginpassword.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_change_loginpassword.xml.flat -net.micode.notes.app-mergeDebugResources-7\:/layout/activity_delete_loginpassword.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_delete_loginpassword.xml.flat -net.micode.notes.app-mergeDebugResources-7\:/layout/activity_login.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_login.xml.flat -net.micode.notes.app-mergeDebugResources-7\:/layout/activity_set_loginpassword.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_set_loginpassword.xml.flat -net.micode.notes.app-mergeDebugResources-7\:/layout/activity_splash.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_splash.xml.flat -net.micode.notes.app-mergeDebugResources-7\:/layout/add_account_text.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-mergeDebugResources-7\:/layout/datetime_picker.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-mergeDebugResources-7\:/layout/dialog_edit_text.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-mergeDebugResources-7\:/layout/dialog_pwd.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_pwd.xml.flat -net.micode.notes.app-mergeDebugResources-7\:/layout/folder_list_item.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-mergeDebugResources-7\:/layout/note_edit.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-mergeDebugResources-7\:/layout/note_edit_list_item.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat -net.micode.notes.app-mergeDebugResources-7\:/layout/note_item.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-mergeDebugResources-7\:/layout/note_list.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -net.micode.notes.app-mergeDebugResources-7\:/layout/note_list_dropdown_menu.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -net.micode.notes.app-mergeDebugResources-7\:/layout/note_list_footer.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -net.micode.notes.app-mergeDebugResources-7\:/layout/settings_header.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-mergeDebugResources-7\:/layout/widget_2x.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-mergeDebugResources-7\:/layout/widget_4x.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +#Mon Jan 13 23:05:58 CST 2025 +net.micode.notes.app-main-10\:/color/primary_text_dark.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-10\:/color/secondary_text_dark.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-10\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/call_record.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/clock.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/delete.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/edit_blue.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/edit_green.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/edit_red.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_blue.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_green.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_red.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_white.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_yellow.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/edit_white.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/edit_yellow.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/font_large.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/font_normal.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/font_size_selector_bg.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/font_small.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/font_super.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/icon_app.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/key.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_key.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_background.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_background1.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background1.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_background2.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background2.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_down.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_middle.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_single.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_up.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_folder.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_footer_bg.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_green_down.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_green_middle.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_green_single.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_green_up.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_red_down.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_red_middle.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_red_up.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_white_down.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_white_middle.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_white_single.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_white_up.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_down.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_middle.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_up.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/menu_delete.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/menu_move.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/menu_top.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_top.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/new_note_pressed.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/note_edit_color_selector_panel.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/notification.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/search_result.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/selected.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/splash.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_splash.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/title_alert.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/translate.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_translate.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_green.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_red.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_white.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_blue.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-10\:/drawable/new_note.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-10\:/menu/call_note_edit.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-10\:/menu/call_record_folder.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-10\:/menu/note_edit.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +net.micode.notes.app-main-10\:/menu/note_list.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-10\:/menu/note_list_dropdown.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-10\:/menu/note_list_options.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-10\:/menu/sub_folder.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-10\:/raw-zh-rCN/introduction=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-10\:/raw/introduction=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-10\:/xml/preferences.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-10\:/xml/searchable.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-10\:/xml/widget_2x_info.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-10\:/xml/widget_4x_info.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +net.micode.notes.app-mergeDebugResources-7\:/layout/account_dialog_title.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-mergeDebugResources-7\:/layout/activity_change_loginpassword.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_change_loginpassword.xml.flat +net.micode.notes.app-mergeDebugResources-7\:/layout/activity_delete_loginpassword.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_delete_loginpassword.xml.flat +net.micode.notes.app-mergeDebugResources-7\:/layout/activity_login.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_login.xml.flat +net.micode.notes.app-mergeDebugResources-7\:/layout/activity_set_loginpassword.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_set_loginpassword.xml.flat +net.micode.notes.app-mergeDebugResources-7\:/layout/activity_splash.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_splash.xml.flat +net.micode.notes.app-mergeDebugResources-7\:/layout/add_account_text.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-mergeDebugResources-7\:/layout/datetime_picker.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-mergeDebugResources-7\:/layout/dialog_edit_text.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-mergeDebugResources-7\:/layout/dialog_pwd.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_pwd.xml.flat +net.micode.notes.app-mergeDebugResources-7\:/layout/folder_list_item.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-mergeDebugResources-7\:/layout/note_edit.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-mergeDebugResources-7\:/layout/note_edit_list_item.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +net.micode.notes.app-mergeDebugResources-7\:/layout/note_item.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-mergeDebugResources-7\:/layout/note_list.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-mergeDebugResources-7\:/layout/note_list_dropdown_menu.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-mergeDebugResources-7\:/layout/note_list_footer.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +net.micode.notes.app-mergeDebugResources-7\:/layout/settings_header.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-mergeDebugResources-7\:/layout/widget_2x.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-mergeDebugResources-7\:/layout/widget_4x.xml=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat diff --git a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml index 1070bde..3102662 100644 --- a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml @@ -284,7 +284,7 @@ Call notes cancel set - light mode + Light Mode Delete reminder successfully Dummy Button HELLO\nWORLD!!! @@ -319,17 +319,17 @@ Medium Font size Small - Select font + Select Font Super Enter check list Move to folder Parent folder Leave check list - quit secret model + Quit Secret Model Delete reminder Search - search_text - secret model + Search Text + Secret Model Select all Nothing selected, the operation is invalid %d selected @@ -340,7 +340,7 @@ Cancel syncing Select folder Trash Folder - night mode + Night Mode Expired Length Send email @@ -1915,11 +1915,11 @@ - + - + - + @@ -2068,17 +2068,22 @@ - + - + - + - + - + - + @@ -2090,17 +2095,22 @@ - + - + - + - + - + - + @@ -2119,9 +2129,10 @@ - + - + @@ -2502,17 +2513,22 @@ - + - + - + - + - + - + @@ -2533,70 +2549,76 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2629,14 +2651,23 @@ - + - + - + @@ -2824,15 +2855,24 @@ - + - + - + - + - + @@ -2856,17 +2896,22 @@ - + - + - + - + - + - + @@ -2981,17 +3026,22 @@ - + - + - + - + - + - + @@ -3000,17 +3050,22 @@ - + - + - + - + - + - + @@ -3071,9 +3126,9 @@ - + - + @@ -3115,17 +3170,22 @@ - + - + - + - + - + - + diff --git a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index 0ef4a86..9307dba 100644 --- a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ -#ffffffff#ff9e9e9e#1f000000#8a000000 +#ffffffff#ff9e9e9e#1f000000#8a000000 @@ -89,13 +89,13 @@ "999+""999+""999+""999+""999+" + "999+""999+""999+""999+""999+" @@ -179,7 +179,7 @@ truefalsetrue@android:color/black#7fa87f@android:color/black@android:color/black@color/material_deep_teal_200@color/material_deep_teal_500@color/material_grey_800@android:color/white@color/material_grey_850@color/material_grey_50#80ffffff#80000000@color/bright_foreground_material_light@color/bright_foreground_material_dark@android:color/white@android:color/black#ff5a595b#ffd6d7d7#80bebebe#80323232#ffbebebe#ff323232#ff7043#ff5722@android:color/white@android:color/black#6680cbc4#66009688#ff37474f#ff263238#ff21272b#ff80cbc4#ff009688#fff5f5f5#ffe0e0e0#fffafafa#ff757575#ff424242#ff303030#ff212121@android:color/black@color/material_grey_600@color/material_grey_900@color/material_grey_100#ffffffff#de000000#4Dffffff#39000000#33ffffff#1f000000#b3ffffff#8a000000#36ffffff#24000000#ff616161#ffbdbdbd#ffbdbdbd#fff1f1f1#e6616161#e6FFFFFF + truefalsetrue@android:color/black#7fa87f@android:color/black@android:color/black@color/material_deep_teal_200@color/material_deep_teal_500@color/material_grey_800@android:color/white@color/material_grey_850@color/material_grey_50#80ffffff#80000000@color/bright_foreground_material_light@color/bright_foreground_material_dark@android:color/white@android:color/black#ff5a595b#ffd6d7d7#80bebebe#80323232#ffbebebe#ff323232#ff7043#ff5722@android:color/white@android:color/black#6680cbc4#66009688#ff37474f#ff263238#ff21272b#ff80cbc4#ff009688#fff5f5f5#ffe0e0e0#fffafafa#ff757575#ff424242#ff303030#ff212121@android:color/black@color/material_grey_600@color/material_grey_900@color/material_grey_100#ffffffff#de000000#4Dffffff#39000000#33ffffff#1f000000#b3ffffff#8a000000#36ffffff#24000000#ff616161#ffbdbdbd#ffbdbdbd#fff1f1f1#e6616161#e6FFFFFF @@ -2319,14 +2319,14 @@ "होम पेज पर जाएं""ऊपर जाएं""ज़्यादा विकल्प""हो गया""सभी देखें""कोई एप्‍लिकेशन चुनें""बंद""चालू""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""खोजा जा रहा है…""क्‍वेरी साफ़ करें""सर्च क्वेरी""सर्च करें""क्वेरी सबमिट करें""आवाज़ सर्च""इसके साथ शेयर करें""%s के साथ शेयर करें""छोटा करें""सर्च""Idi na početnu""Idi gore""Dodatne opcije""Gotovo""Prikaži sve""Odabir aplikacije""ISKLJUČENO""UKLJUČENO""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""razmaknica""Sym+""Menu+""Pretražite…""Izbriši upit""Upit za pretraživanje""Pretraživanje""Pošalji upit""Glasovno pretraživanje""Dijeljenje sa""Dijeli putem aplikacije %s""Sažmi""Pretraživanje""Ugrás a főoldalra""Felfelé mozgatás""További lehetőségek""Kész""Összes megtekintése""Válasszon ki egy alkalmazást""KI""BE""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""Szóköz""Sym+""Menu+""Keresés…""Lekérdezés törlése""Keresési lekérdezés""Keresés""Lekérdezés küldése""Hangalapú keresés""Megosztás a következővel:""Megosztás a következő alkalmazással: %s""Összecsukás""Keresés""Ուղղվել տուն""Ուղղվել վերև""Այլ ընտրանքներ""Պատրաստ է""Տեսնել բոլորը""Ընտրել ծրագիր""ԱՆՋԱՏՎԱԾ""ՄԻԱՑՎԱԾ""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""բացատ""Sym+""Menu+""Որոնում...""Մաքրել հարցումը""Որոնման հարցում""Որոնել""Ուղարկել հարցումը""Ձայնային որոնում""Կիսվել""Ուղարկել %s-ին""Թաքցնել""Որոնել""Navigasi ke beranda""Navigasi naik""Opsi lain""Selesai""Lihat semua""Pilih aplikasi""NONAKTIF""AKTIF""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""spasi""Sym+""Menu+""Telusuri...""Hapus kueri""Kueri penelusuran""Telusuri""Kirim kueri""Penelusuran suara""Bagikan dengan""Bagikan ke %s""Ciutkan""Telusuri""Fara heim""Fara upp""Fleiri valkostir""Lokið""Sjá allt""Veldu forrit""SLÖKKT""KVEIKT""Alt+""Ctrl+""delete""enter""Aðgerðarlykill+""Meta+""Shift+""bilslá""Sym+""Valmynd+""Leita…""Hreinsa fyrirspurn""Leitarfyrirspurn""Leita""Senda fyrirspurn""Raddleit""Deila með""Deila með %s""Minnka""Leita""Vai alla home page""Vai in alto""Altre opzioni""Fine""Visualizza tutte""Scegli un\'applicazione""OFF""ON""ALT +""CTRL +""CANC""INVIO""FUNZIONE +""META +""MAIUSC +""barra spaziatrice""SYM +""MENU +""Cerca…""Cancella query""Query di ricerca""Cerca""Invia query""Ricerca vocale""Condividi con""Condividi tramite %s""Comprimi""Ricerca""נווט לדף הבית""נווט למעלה""עוד אפשרויות""בוצע""ראה הכל""בחר אפליקציה""כבוי""פועל""Alt+""Ctrl+‎""delete""Enter""Function+""Meta+""Shift+""מקש רווח""Sym+""תפריט+""חיפוש…""מחק שאילתה""שאילתת חיפוש""חיפוש""שלח שאילתה""חיפוש קולי""שתף עם""שתף עם %s""כווץ""חיפוש""ホームへ移動""上へ移動""その他のオプション""完了""すべて表示""アプリの選択""OFF""ON""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""Space""Sym+""Menu+""検索…""検索キーワードを削除""検索キーワード""検索""検索キーワードを送信""音声検索""共有""%sと共有""折りたたむ""検索""მთავარზე ნავიგაცია""ზემოთ ნავიგაცია""მეტი ვარიანტები""დასრულდა""ყველას ნახვა""აპის არჩევა""გამორთულია""ჩართულია""Alt+""Ctrl+""წაშლა""შეყვანა""Function+""Meta+""Shift+""space""Sym+""Menu+""ძიება...""მოთხოვნის გასუფთავება""ძიების მოთხოვნა""ძიება""მოთხოვნის გადაგზავნა""ხმოვანი ძიება""გაზიარება:""გაუზიარეთ %s-ს""აკეცვა""ძიება""Негізгі бетте қозғалу""Жоғары қозғалу""Басқа опциялар""Дайын""Барлығын көру""Қолданбаны таңдау""ӨШІРУЛІ""ҚОСУЛЫ""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""бос орын""Sym+""Mәзір+""Іздеу…""Сұрақты жою""Сұрақты іздеу""Іздеу""Сұрақты жіберу""Дауыс арқылы іздеу""Бөлісу""%s қолданбасымен бөлісу""Тасалау""Іздеу""រកមើល​ទៅ​ដើម""រកមើល​ឡើងលើ""ជម្រើស​ច្រើន​ទៀត""រួចរាល់""មើល​ទាំងអស់""ជ្រើស​កម្មវិធី​​""បិទ""បើក""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""ស្វែងរក…""សម្អាត​សំណួរ""ស្វែងរក​សំណួរ""ស្វែងរក""ដាក់​​​ស្នើ​សំណួរ""ការស្វែងរក​សំឡេង""ចែករំលែក​ជាមួយ""ចែក​រំលែក​ជា​មួយ %s""បង្រួម""ស្វែងរក""ಮುಖಪುಟವನ್ನು ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""ಮೇಲಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು""ಮುಗಿದಿದೆ""ಎಲ್ಲವನ್ನೂ ನೋಡಿ""ಒಂದು ಅಪ್ಲಿಕೇಶನ್ ಆಯ್ಕೆಮಾಡಿ""ಆಫ್""ಆನ್""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""ಹುಡುಕಿ…""ಪ್ರಶ್ನೆಯನ್ನು ತೆರವುಗೊಳಿಸು""ಪ್ರಶ್ನೆಯನ್ನು ಹುಡುಕಿ""ಹುಡುಕಿ""ಪ್ರಶ್ನೆಯನ್ನು ಸಲ್ಲಿಸು""ಧ್ವನಿ ಹುಡುಕಾಟ""ಇವರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ""%s ನೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ""ಸಂಕುಚಿಸು""ಹುಡುಕಿ""홈 탐색""위로 탐색""옵션 더보기""완료""전체 보기""앱 선택""사용 안함""사용""Alt+""Ctrl+""삭제""입력""Function+""Meta+""Shift+""스페이스바""Sym+""Menu+""검색...""검색어 삭제""검색어""검색""검색어 보내기""음성 검색""공유 대상""%s와(과) 공유""접기""검색""Үйгө багыттоо""Жогору""Көбүрөөк мүмкүнчүлүктөр""Даяр""Бардыгын көрүү""Колдонмо тандоо""ӨЧҮК""КҮЙҮК""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""боштук""Sym+""Menu+""Издөө…""Талаптарды тазалоо""Издөө талаптары""Издөө""Талап жөнөтүү""Үн аркылуу издөө""Бөлүшүү""%s аркылуу бөлүшүү""Жыйнап коюу""Издөө"48dp12dp14dp440dp60%90%60%90%55%80%"होम पेज पर जाएं""ऊपर जाएं""ज़्यादा विकल्प""हो गया""सभी देखें""कोई एप्‍लिकेशन चुनें""बंद""चालू""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""खोजा जा रहा है…""क्‍वेरी साफ़ करें""सर्च क्वेरी""सर्च करें""क्वेरी सबमिट करें""आवाज़ सर्च""इसके साथ शेयर करें""%s के साथ शेयर करें""छोटा करें""सर्च""Idi na početnu""Idi gore""Dodatne opcije""Gotovo""Prikaži sve""Odabir aplikacije""ISKLJUČENO""UKLJUČENO""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""razmaknica""Sym+""Menu+""Pretražite…""Izbriši upit""Upit za pretraživanje""Pretraživanje""Pošalji upit""Glasovno pretraživanje""Dijeljenje sa""Dijeli putem aplikacije %s""Sažmi""Pretraživanje""Ugrás a főoldalra""Felfelé mozgatás""További lehetőségek""Kész""Összes megtekintése""Válasszon ki egy alkalmazást""KI""BE""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""Szóköz""Sym+""Menu+""Keresés…""Lekérdezés törlése""Keresési lekérdezés""Keresés""Lekérdezés küldése""Hangalapú keresés""Megosztás a következővel:""Megosztás a következő alkalmazással: %s""Összecsukás""Keresés""Ուղղվել տուն""Ուղղվել վերև""Այլ ընտրանքներ""Պատրաստ է""Տեսնել բոլորը""Ընտրել ծրագիր""ԱՆՋԱՏՎԱԾ""ՄԻԱՑՎԱԾ""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""բացատ""Sym+""Menu+""Որոնում...""Մաքրել հարցումը""Որոնման հարցում""Որոնել""Ուղարկել հարցումը""Ձայնային որոնում""Կիսվել""Ուղարկել %s-ին""Թաքցնել""Որոնել""Navigasi ke beranda""Navigasi naik""Opsi lain""Selesai""Lihat semua""Pilih aplikasi""NONAKTIF""AKTIF""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""spasi""Sym+""Menu+""Telusuri...""Hapus kueri""Kueri penelusuran""Telusuri""Kirim kueri""Penelusuran suara""Bagikan dengan""Bagikan ke %s""Ciutkan""Telusuri""Fara heim""Fara upp""Fleiri valkostir""Lokið""Sjá allt""Veldu forrit""SLÖKKT""KVEIKT""Alt+""Ctrl+""delete""enter""Aðgerðarlykill+""Meta+""Shift+""bilslá""Sym+""Valmynd+""Leita…""Hreinsa fyrirspurn""Leitarfyrirspurn""Leita""Senda fyrirspurn""Raddleit""Deila með""Deila með %s""Minnka""Leita""Vai alla home page""Vai in alto""Altre opzioni""Fine""Visualizza tutte""Scegli un\'applicazione""OFF""ON""ALT +""CTRL +""CANC""INVIO""FUNZIONE +""META +""MAIUSC +""barra spaziatrice""SYM +""MENU +""Cerca…""Cancella query""Query di ricerca""Cerca""Invia query""Ricerca vocale""Condividi con""Condividi tramite %s""Comprimi""Ricerca""נווט לדף הבית""נווט למעלה""עוד אפשרויות""בוצע""ראה הכל""בחר אפליקציה""כבוי""פועל""Alt+""Ctrl+‎""delete""Enter""Function+""Meta+""Shift+""מקש רווח""Sym+""תפריט+""חיפוש…""מחק שאילתה""שאילתת חיפוש""חיפוש""שלח שאילתה""חיפוש קולי""שתף עם""שתף עם %s""כווץ""חיפוש""ホームへ移動""上へ移動""その他のオプション""完了""すべて表示""アプリの選択""OFF""ON""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""Space""Sym+""Menu+""検索…""検索キーワードを削除""検索キーワード""検索""検索キーワードを送信""音声検索""共有""%sと共有""折りたたむ""検索""მთავარზე ნავიგაცია""ზემოთ ნავიგაცია""მეტი ვარიანტები""დასრულდა""ყველას ნახვა""აპის არჩევა""გამორთულია""ჩართულია""Alt+""Ctrl+""წაშლა""შეყვანა""Function+""Meta+""Shift+""space""Sym+""Menu+""ძიება...""მოთხოვნის გასუფთავება""ძიების მოთხოვნა""ძიება""მოთხოვნის გადაგზავნა""ხმოვანი ძიება""გაზიარება:""გაუზიარეთ %s-ს""აკეცვა""ძიება""Негізгі бетте қозғалу""Жоғары қозғалу""Басқа опциялар""Дайын""Барлығын көру""Қолданбаны таңдау""ӨШІРУЛІ""ҚОСУЛЫ""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""бос орын""Sym+""Mәзір+""Іздеу…""Сұрақты жою""Сұрақты іздеу""Іздеу""Сұрақты жіберу""Дауыс арқылы іздеу""Бөлісу""%s қолданбасымен бөлісу""Тасалау""Іздеу""រកមើល​ទៅ​ដើម""រកមើល​ឡើងលើ""ជម្រើស​ច្រើន​ទៀត""រួចរាល់""មើល​ទាំងអស់""ជ្រើស​កម្មវិធី​​""បិទ""បើក""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""ស្វែងរក…""សម្អាត​សំណួរ""ស្វែងរក​សំណួរ""ស្វែងរក""ដាក់​​​ស្នើ​សំណួរ""ការស្វែងរក​សំឡេង""ចែករំលែក​ជាមួយ""ចែក​រំលែក​ជា​មួយ %s""បង្រួម""ស្វែងរក""ಮುಖಪುಟವನ್ನು ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""ಮೇಲಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು""ಮುಗಿದಿದೆ""ಎಲ್ಲವನ್ನೂ ನೋಡಿ""ಒಂದು ಅಪ್ಲಿಕೇಶನ್ ಆಯ್ಕೆಮಾಡಿ""ಆಫ್""ಆನ್""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""ಹುಡುಕಿ…""ಪ್ರಶ್ನೆಯನ್ನು ತೆರವುಗೊಳಿಸು""ಪ್ರಶ್ನೆಯನ್ನು ಹುಡುಕಿ""ಹುಡುಕಿ""ಪ್ರಶ್ನೆಯನ್ನು ಸಲ್ಲಿಸು""ಧ್ವನಿ ಹುಡುಕಾಟ""ಇವರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ""%s ನೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ""ಸಂಕುಚಿಸು""ಹುಡುಕಿ""홈 탐색""위로 탐색""옵션 더보기""완료""전체 보기""앱 선택""사용 안함""사용""Alt+""Ctrl+""삭제""입력""Function+""Meta+""Shift+""스페이스바""Sym+""Menu+""검색...""검색어 삭제""검색어""검색""검색어 보내기""음성 검색""공유 대상""%s와(과) 공유""접기""검색""Үйгө багыттоо""Жогору""Көбүрөөк мүмкүнчүлүктөр""Даяр""Бардыгын көрүү""Колдонмо тандоо""ӨЧҮК""КҮЙҮК""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""боштук""Sym+""Menu+""Издөө…""Талаптарды тазалоо""Издөө талаптары""Издөө""Талап жөнөтүү""Үн аркылуу издөө""Бөлүшүү""%s аркылуу бөлүшүү""Жыйнап коюу""Издөө"48dp12dp14dp440dp60%90%60%90%55%80%0px0px"Điều hướng về trang chủ""Điều hướng lên trên""Tùy chọn khác""Xong""Xem tất cả""Chọn một ứng dụng""TẮT""BẬT""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""phím cách""Sym+""Menu+""Tìm kiếm…""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""Thu gọn""Tìm kiếm""Điều hướng về trang chủ""Điều hướng lên trên""Tùy chọn khác""Xong""Xem tất cả""Chọn một ứng dụng""TẮT""BẬT""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""phím cách""Sym+""Menu+""Tìm kiếm…""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""Thu gọn""Tìm kiếm"60%90%50%70%45%72%"转到主屏幕""转到上一层级""更多选项""完成""查看全部""选择应用""关闭""开启""Alt+""Ctrl+""Delete 键""Enter 键""Fn+""Meta+""Shift+""空格键""Sym+""Menu+""搜索…""清除查询""搜索查询""搜索""提交查询""语音搜索""分享方式""使用%s分享""收起""搜索""瀏覽主頁""向上瀏覽""更多選項""完成""顯示全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""刪除""Enter 鍵""Fn +""Meta +""Shift +""空白鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""分享對象""使用「%s」分享""收合""搜尋""瀏覽首頁""向上瀏覽""更多選項""完成""查看全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""Delete 鍵""Enter 鍵""Fn +""Meta +""Shift +""空格鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""選擇分享對象""與「%s」分享""收合""搜尋""Zulazulela ekhaya""Zulazulela phezulu""Izinketho eziningi""Kwenziwe""Buka konke""Khetha uhlelo lokusebenza""VALIWE""VULIWE""Alt+""Ctrl+""susa""enter""Function+""Meta+""Shift+""space""Sym+""Imenyu+""Iyasesha...""Sula inkinga""Umbuzo wosesho""Sesha""Hambisa umbuzo""Ukusesha ngezwi""Yabelana no-""Yabelana ne-%s""Goqa""Sesha" + 60%90%50%70%45%72%"转到主屏幕""转到上一层级""更多选项""完成""查看全部""选择应用""关闭""开启""Alt+""Ctrl+""Delete 键""Enter 键""Fn+""Meta+""Shift+""空格键""Sym+""Menu+""搜索…""清除查询""搜索查询""搜索""提交查询""语音搜索""分享方式""使用%s分享""收起""搜索""瀏覽主頁""向上瀏覽""更多選項""完成""顯示全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""刪除""Enter 鍵""Fn +""Meta +""Shift +""空白鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""分享對象""使用「%s」分享""收合""搜尋""瀏覽首頁""向上瀏覽""更多選項""完成""查看全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""Delete 鍵""Enter 鍵""Fn +""Meta +""Shift +""空格鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""選擇分享對象""與「%s」分享""收合""搜尋""Zulazulela ekhaya""Zulazulela phezulu""Izinketho eziningi""Kwenziwe""Buka konke""Khetha uhlelo lokusebenza""VALIWE""VULIWE""Alt+""Ctrl+""susa""enter""Function+""Meta+""Shift+""space""Sym+""Imenyu+""Iyasesha...""Sula inkinga""Umbuzo wosesho""Sesha""Hambisa umbuzo""Ukusesha ngezwi""Yabelana no-""Yabelana ne-%s""Goqa""Sesha" -%s --%s --%s @@ -2608,14 +2608,14 @@ Messaging Email - + - #335b5b5b#FF039BE5#FF01579B#FF40C4FF#FF00B0FF#6600000033sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode,can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancelsecret modelquit secret modellight modenight modeTrash Folder + #335b5b5b#FF039BE5#FF01579B#FF40C4FF#FF00B0FF#6600000033sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode,can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancelSecret ModelQuit Secret ModelLight ModeNight ModeTrash FolderSelect FontSearch Text %1$s result for \"%2$s\" %1$s results for \"%2$s\" - LengthSplashActivityDummy ButtonHELLO\nWORLD!!!Select fontsearch_text + 短信 邮件 - 便签便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小正常超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消私密模式退出私密模式亮背景暗背景回收站 + 便签便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小正常超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消私密模式退出私密模式亮背景暗背景回收站选择字体搜索 %1$s 条符合“%2$s”的搜索结果 - 字符数选择字体搜索 + 字符数 短信 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容,點擊新建便簽。訪客模式下,便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項,操作無效全選取消全選文字大小正常超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在,請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎?SD卡被佔用,不能操作導出TXT時發生錯誤,請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗,請檢查網絡和帳號設置同步失敗,發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復同步便簽請選擇google帳號,便簽將與該帳號的google task內容同步。正在同步中,不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消私密模式退出私密模式亮背景暗背景回收站 + 便簽便簽2x2便簽4x4沒有關聯內容,點擊新建便簽。訪客模式下,便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項,操作無效全選取消全選文字大小正常超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在,請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎?SD卡被佔用,不能操作導出TXT時發生錯誤,請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗,請檢查網絡和帳號設置同步失敗,發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復同步便簽請選擇google帳號,便簽將與該帳號的google task內容同步。正在同步中,不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消私密模式退出私密模式亮背景暗背景回收站选择字体搜索 %1$s 條符合”%2$s“的搜尋結果 - 字符数选择字体搜索 + 字符数 diff --git a/src/Notes/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties b/src/Notes/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties index a7e84d9..73e925a 100644 --- a/src/Notes/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties +++ b/src/Notes/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties @@ -1 +1 @@ -#Tue Jan 07 21:10:23 CST 2025 +#Wed Dec 25 11:27:49 CST 2024 diff --git a/src/Notes/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml b/src/Notes/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml index 526f7cd..f4918dd 100644 --- a/src/Notes/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml +++ b/src/Notes/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml b/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml index 558e957..02e4bd2 100644 --- a/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml +++ b/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml b/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml index 2b85763..bd91cc3 100644 --- a/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml +++ b/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml b/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml index 953a7b2..4584500 100644 --- a/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml +++ b/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index b0ce63f..42e42b9 100644 --- a/src/Notes/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/Notes/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index dfe0f60..2207287 100644 --- a/src/Notes/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/Notes/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index a41e7c3..df26cfc 100644 --- a/src/Notes/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/Notes/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index c3b53fc..ec3a19d 100644 --- a/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,12 +1,12 @@ -#Sat Jan 11 23:18:21 CST 2025 -base.0=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex -base.1=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex -base.2=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex -base.3=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex -base.4=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex -base.5=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex -base.6=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex -base.7=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex +#Mon Jan 13 23:06:09 CST 2025 +base.0=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex +base.1=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex +base.2=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex +base.3=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex +base.4=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex +base.5=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex +base.6=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex +base.7=C\:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex path.0=classes.dex path.1=0/classes.dex path.2=11/classes.dex diff --git a/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index ce38db5..9f937f9 100644 Binary files a/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Notes/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt b/src/Notes/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt index e297159..8fdfe45 100644 --- a/src/Notes/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt +++ b/src/Notes/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt @@ -1,6 +1,6 @@ -#Tue Jan 07 21:10:29 CST 2025 -base.0=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\0\\classes.dex -base.1=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\13\\classes.dex +#Wed Dec 25 11:27:54 CST 2024 +base.0=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\0\\classes.dex +base.1=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\13\\classes.dex path.0=0/classes.dex path.1=13/classes.dex renamed.0=classes.dex diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class index c186861..0407c8e 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class index 39baf07..9895a13 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangedLoginPassword$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangedLoginPassword$1.class index b55d559..e7d385e 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangedLoginPassword$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangedLoginPassword$1.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeleteLoginPassword$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeleteLoginPassword$1.class index 961ca72..95e43b5 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeleteLoginPassword$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeleteLoginPassword$1.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeleteLoginPassword.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeleteLoginPassword.class index 0bdc28d..122ea84 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeleteLoginPassword.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeleteLoginPassword.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$1.class index 7db3d57..32c2532 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$1.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity.class index 6315ae6..5e6b032 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index 9e38b81..f446ef6 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index 37c85a7..b933b0e 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index 43d6243..849c172 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class index 382b65f..da8ace1 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class index 76ca8da..5758049 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class index dfcf389..2292b2c 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class index f07c9d3..2a2315e 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class index 3a5f0fd..19cfe65 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class index 46f2f02..bd41b4d 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index e6983f0..b6851f7 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index ce20e6e..2e3d8b8 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class index 7a5c53e..38e0889 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class index 9374a8c..aa493af 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class index 86e7d7c..7516d02 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index e8fb992..add63f3 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class index c19bcd9..8375800 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class index 40dc84a..cb24951 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class index 2913181..9371fa0 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class index f499412..6cd59d8 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$14.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$14.class index 99c4d1d..e06b238 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$14.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$14.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index a95a692..d0b4609 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index 095b38e..67563f3 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index 2059a50..87c2197 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index dd70ec8..02cf27f 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index 0cf0f6f..388d404 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index 0c66619..3d13bdd 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index 4b40f5f..5f10e1c 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index c70138f..6d4c3c7 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index e41bd10..9a31320 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class index 8716d3c..3e705aa 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class index c8091c0..2404465 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class index 1fe66e0..4190cd2 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index 2b7835a..20b543b 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class index 756e019..a28c9e5 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index f6d30b3..a72591a 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index f93b75b..221297a 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index 96eeee7..990f429 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class index aa048cc..b6989c8 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class index 880c4db..c6968a1 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class index 3946d79..feea283 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class index 493940d..f1ec593 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class index d93f095..92212e1 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class index 2e55c41..139133a 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class index 10a3ad9..3107d41 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class index b50e0df..f99df13 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index c31e899..d3aa5a2 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index 96fcca6..1a878d5 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RegisterLoginPassword$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RegisterLoginPassword$1.class index 61595b8..453c073 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RegisterLoginPassword$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RegisterLoginPassword$1.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RegisterLoginPassword.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RegisterLoginPassword.class index ad264cf..ca495c7 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RegisterLoginPassword.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RegisterLoginPassword.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$1.class index 27cc822..a07ce1d 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$1.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$2.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$2.class index b596182..328cde5 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$2.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$2.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$3.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$3.class index 0bc5524..17b0d77 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$3.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$3.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$4.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$4.class index 9f8a4e4..e1a74c4 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$4.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$4.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$5.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$5.class index ad27eb6..34f1f92 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$5.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$5.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$6.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$6.class index cd737a8..8d0b971 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$6.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$6.class differ diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity.class index ca56258..1e8d242 100644 Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity.class differ diff --git a/src/Notes/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 279ae1b..3671f00 100644 --- a/src/Notes/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/Notes/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -4,345 +4,345 @@ 4 android:versionCode="1" 5 android:versionName="0.1" > 6 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:5-44 +6-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:5-44 7 android:minSdkVersion="21" -7-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:15-41 +7-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:15-41 8 android:targetSdkVersion="21" /> -8-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:5-44 +8-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:5-44 9 10 11 -11-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:9:5-81 -11-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:9:22-78 +11-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:9:5-81 +11-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:9:22-78 12 -12-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:10:5-88 -12-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:10:22-85 +12-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:10:5-88 +12-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:10:22-85 13 -13-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:11:5-67 -13-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:11:22-64 +13-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:11:5-67 +13-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:11:22-64 14 -14-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:12:5-72 -14-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:12:22-69 +14-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:12:5-72 +14-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:12:22-69 15 -15-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:13:5-74 -15-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:13:22-71 +15-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:13:5-74 +15-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:13:22-71 16 -16-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:14:5-80 -16-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:14:22-77 +16-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:14:5-80 +16-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:14:22-77 17 -17-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:15:5-71 -17-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:15:22-68 +17-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:15:5-71 +17-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:15:22-68 18 -18-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:16:5-74 -18-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:16:22-71 +18-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:16:5-74 +18-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:16:22-71 19 -19-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:17:5-81 -19-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:17:22-78 +19-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:17:5-81 +19-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:17:22-78 20 21 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:19:5-177:19 +21-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:19:5-177:19 22 android:appComponentFactory="android.support.v4.app.CoreComponentFactory" -22-->[com.android.support:support-compat:28.0.0] D:\ASSDK\caches\transforms-3\d9f0b9f6301870925ec9be62a3ecf027\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91 +22-->[com.android.support:support-compat:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\d9f0b9f6301870925ec9be62a3ecf027\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91 23 android:debuggable="true" 24 android:icon="@drawable/icon_app" -24-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:20:9-42 +24-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:20:9-42 25 android:label="@string/app_name" -25-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:21:9-41 +25-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:21:9-41 26 android:testOnly="true" > 27 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:23:9-37:20 +27-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:23:9-37:20 28 android:name="net.micode.notes.ui.LoginActivity" -28-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:24:13-45 +28-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:24:13-45 29 android:configChanges="keyboardHidden|orientation|screenSize" -29-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:25:13-74 +29-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:25:13-74 30 android:label="@string/app_name" -30-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:26:13-45 +30-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:26:13-45 31 android:launchMode="singleTop" -31-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:27:13-43 +31-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:27:13-43 32 android:theme="@style/NoteTheme" -32-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:28:13-45 +32-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:28:13-45 33 android:uiOptions="splitActionBarWhenNarrow" -33-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:29:13-57 +33-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:29:13-57 34 android:windowSoftInputMode="adjustPan" > -34-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:30:13-52 +34-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:30:13-52 35 -35-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:32:13-36:29 +35-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:32:13-36:29 36 -36-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:17-69 -36-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:25-66 +36-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:17-69 +36-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:25-66 37 38 -38-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:17-77 -38-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:27-74 +38-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:17-77 +38-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:27-74 39 40 41 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:38:9-45:20 +41-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:38:9-45:20 42 android:name="net.micode.notes.ui.ChangedLoginPassword" -42-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:39:13-52 +42-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:39:13-52 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:40:13-74 +43-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:40:13-74 44 android:label="@string/app_name" -44-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:41:13-45 +44-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:41:13-45 45 android:launchMode="singleTop" -45-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:42:13-43 +45-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:42:13-43 46 android:theme="@style/NoteTheme" -46-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:43:13-45 +46-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:43:13-45 47 android:windowSoftInputMode="adjustPan" > -47-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:44:13-52 +47-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:44:13-52 48 49 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:46:9-53:20 +49-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:46:9-53:20 50 android:name="net.micode.notes.ui.RegisterLoginPassword" -50-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:47:13-53 +50-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:47:13-53 51 android:configChanges="keyboardHidden|orientation|screenSize" -51-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:48:13-74 +51-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:48:13-74 52 android:label="@string/app_name" -52-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:49:13-45 +52-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:49:13-45 53 android:launchMode="singleTop" -53-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:50:13-43 +53-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:50:13-43 54 android:theme="@style/NoteTheme" -54-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:51:13-45 +54-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:51:13-45 55 android:windowSoftInputMode="adjustPan" > -55-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:52:13-52 +55-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:52:13-52 56 57 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:54:9-61:20 +57-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:54:9-61:20 58 android:name="net.micode.notes.ui.DeleteLoginPassword" -58-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:55:13-51 +58-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:55:13-51 59 android:configChanges="keyboardHidden|orientation|screenSize" -59-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:56:13-74 +59-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:56:13-74 60 android:label="@string/app_name" -60-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:57:13-45 +60-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:57:13-45 61 android:launchMode="singleTop" -61-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:58:13-43 +61-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:58:13-43 62 android:theme="@style/NoteTheme" -62-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:59:13-45 +62-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:59:13-45 63 android:windowSoftInputMode="adjustPan" > -63-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:60:13-52 +63-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:60:13-52 64 65 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:62:9-72:20 +65-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:62:9-72:20 66 android:name="net.micode.notes.ui.SplashActivity" -66-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:63:13-46 +66-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:63:13-46 67 android:configChanges="orientation|keyboardHidden|screenSize" -67-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:64:13-74 +67-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:64:13-74 68 android:label="@string/title_activity_splash" -68-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:66:13-58 +68-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:66:13-58 69 android:theme="@style/Theme.Notes.Fullscreen" > -69-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:67:13-58 +69-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:67:13-58 70 -70-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:32:13-36:29 +70-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:32:13-36:29 71 -71-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:17-69 -71-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:25-66 +71-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:17-69 +71-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:25-66 72 73 -73-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:17-77 -73-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:27-74 +73-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:17-77 +73-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:27-74 74 75 76 77 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:74:9-85:20 +77-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:74:9-85:20 78 android:name="net.micode.notes.ui.NotesListActivity" -78-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:75:13-49 +78-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:75:13-49 79 android:configChanges="keyboardHidden|orientation|screenSize" -79-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:76:13-74 +79-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:76:13-74 80 android:label="@string/app_name" -80-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:77:13-45 +80-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:77:13-45 81 android:launchMode="singleTop" -81-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:78:13-43 +81-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:78:13-43 82 android:theme="@style/NoteTheme" -82-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:79:13-45 +82-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:79:13-45 83 android:windowSoftInputMode="adjustPan" > -83-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:80:13-52 +83-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:80:13-52 84 -84-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:32:13-36:29 +84-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:32:13-36:29 85 -85-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:17-69 -85-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:25-66 +85-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:17-69 +85-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:25-66 86 87 -87-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:17-77 -87-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:27-74 +87-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:17-77 +87-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:27-74 88 89 90 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:86:9-122:20 +90-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:86:9-122:20 91 android:name="net.micode.notes.ui.NoteEditActivity" -91-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:87:13-48 +91-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:87:13-48 92 android:configChanges="keyboardHidden|orientation|screenSize" -92-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:88:13-74 +92-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:88:13-74 93 android:launchMode="singleTop" -93-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:89:13-43 +93-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:89:13-43 94 android:theme="@style/NoteTheme" > -94-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:90:13-45 +94-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:90:13-45 95 96 97 -97-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:93:13-102:29 -97-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:94:17-38 +97-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:93:13-102:29 +97-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:94:17-38 98 -98-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:17-69 -98-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:25-66 +98-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:17-69 +98-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:25-66 99 100 -100-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-76 -100-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:27-73 +100-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-76 +100-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:27-73 101 102 -102-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:17-78 -102-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:23-75 +102-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:17-78 +102-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:23-75 103 -103-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:17-78 -103-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:23-75 +103-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:17-78 +103-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:23-75 104 105 106 -106-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:104:13-111:29 +106-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:104:13-111:29 107 -107-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:105:17-79 -107-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:105:25-76 +107-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:105:17-79 +107-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:105:25-76 108 109 -109-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-76 -109-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:27-73 +109-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-76 +109-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:27-73 110 111 -111-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:17-78 -111-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:23-75 +111-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:17-78 +111-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:23-75 112 -112-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:17-78 -112-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:23-75 +112-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:17-78 +112-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:23-75 113 114 115 -115-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:113:13-117:29 +115-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:113:13-117:29 116 -116-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:114:17-71 -116-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:114:25-68 +116-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:114:17-71 +116-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:114:25-68 117 118 -118-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-76 -118-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:27-73 +118-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-76 +118-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:27-73 119 120 121 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:119:13-121:54 +121-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:119:13-121:54 122 android:name="android.app.searchable" -122-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:120:17-54 +122-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:120:17-54 123 android:resource="@xml/searchable" /> -123-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:121:17-51 +123-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:121:17-51 124 125 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:123:9-126:43 +125-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:123:9-126:43 126 android:name="net.micode.notes.data.NotesProvider" -126-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:124:13-47 +126-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:124:13-47 127 android:authorities="micode_notes" -127-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:125:13-47 +127-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:125:13-47 128 android:multiprocess="true" /> -128-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:126:13-40 +128-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:126:13-40 129 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:127:9-139:20 +129-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:127:9-139:20 130 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -130-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:128:13-57 +130-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:128:13-57 131 android:label="@string/app_widget2x2" > -131-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:129:13-50 +131-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:129:13-50 132 -132-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:130:13-134:29 +132-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:130:13-134:29 133 -133-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:17-84 -133-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:25-81 +133-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:17-84 +133-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:25-81 134 -134-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:132:17-85 -134-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:132:25-82 +134-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:132:17-85 +134-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:132:25-82 135 -135-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:133:17-85 -135-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:133:25-82 +135-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:133:17-85 +135-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:133:25-82 136 137 138 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:136:13-138:58 +138-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:136:13-138:58 139 android:name="android.appwidget.provider" -139-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:137:17-58 +139-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:137:17-58 140 android:resource="@xml/widget_2x_info" /> -140-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:138:17-55 +140-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:138:17-55 141 142 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:140:9-152:20 +142-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:140:9-152:20 143 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -143-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:141:13-57 +143-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:141:13-57 144 android:label="@string/app_widget4x4" > -144-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:142:13-50 +144-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:142:13-50 145 -145-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:130:13-134:29 +145-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:130:13-134:29 146 -146-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:17-84 -146-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:25-81 +146-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:17-84 +146-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:25-81 147 -147-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:132:17-85 -147-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:132:25-82 +147-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:132:17-85 +147-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:132:25-82 148 -148-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:133:17-85 -148-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:133:25-82 +148-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:133:17-85 +148-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:133:25-82 149 150 151 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:136:13-138:58 +151-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:136:13-138:58 152 android:name="android.appwidget.provider" -152-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:137:17-58 +152-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:137:17-58 153 android:resource="@xml/widget_4x_info" /> -153-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:138:17-55 +153-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:138:17-55 154 155 -155-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:153:9-157:20 -155-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:153:19-55 +155-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:153:9-157:20 +155-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:153:19-55 156 -156-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:154:13-156:29 +156-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:154:13-156:29 157 -157-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:155:17-79 -157-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:155:25-76 +157-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:155:17-79 +157-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:155:25-76 158 159 160 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:158:9-160:41 +160-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:158:9-160:41 161 android:name="net.micode.notes.ui.AlarmReceiver" -161-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:159:13-45 +161-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:159:13-45 162 android:process=":remote" /> -162-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:160:13-38 +162-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:160:13-38 163 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:161:9-165:78 +163-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:161:9-165:78 164 android:name="net.micode.notes.ui.AlarmAlertActivity" -164-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:162:13-50 +164-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:162:13-50 165 android:label="@string/app_name" -165-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:163:13-45 +165-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:163:13-45 166 android:launchMode="singleInstance" -166-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:164:13-48 +166-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:164:13-48 167 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" /> -167-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:165:13-75 +167-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:165:13-75 168 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:166:9-170:63 +168-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:166:9-170:63 169 android:name="net.micode.notes.ui.NotesPreferenceActivity" -169-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:167:13-55 +169-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:167:13-55 170 android:label="@string/preferences_title" -170-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:168:13-54 +170-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:168:13-54 171 android:launchMode="singleTop" -171-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:169:13-43 +171-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:169:13-43 172 android:theme="@android:style/Theme.Holo.Light" /> -172-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:170:13-60 +172-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:170:13-60 173 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:171:9-173:40 +173-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:171:9-173:40 174 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -174-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:172:13-58 +174-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:172:13-58 175 android:exported="false" /> -175-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:173:13-37 +175-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:173:13-37 176 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:174:9-176:52 +176-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:174:9-176:52 177 android:name="android.app.default_searchable" -177-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:175:13-58 +177-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:175:13-58 178 android:value=".ui.NoteEditActivity" /> -178-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:176:13-49 +178-->C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:176:13-49 179 180 181 diff --git a/src/Notes/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt b/src/Notes/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt index 122fc23..16b4782 100644 --- a/src/Notes/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt +++ b/src/Notes/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt @@ -3,30 +3,30 @@ 3 package="net.micode.notes.test" > 4 5 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:5:5-74 +5-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:5:5-74 6 android:minSdkVersion="21" -6-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:5:15-41 +6-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:5:15-41 7 android:targetSdkVersion="21" /> -7-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:5:42-71 +7-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:5:42-71 8 9 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:11:5-15:66 +9-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:11:5-15:66 10 android:name="android.test.InstrumentationTestRunner" -10-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:11:22-75 +10-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:11:22-75 11 android:functionalTest="false" -11-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:14:22-52 +11-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:14:22-52 12 android:handleProfiling="false" -12-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:13:22-53 +12-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:13:22-53 13 android:label="Tests for net.micode.notes" -13-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:15:22-64 +13-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:15:22-64 14 android:targetPackage="net.micode.notes" /> -14-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:12:22-62 +14-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:12:22-62 15 16 -16-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:7:5-9:19 +16-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:7:5-9:19 17 -17-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:8:9-60 -17-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:8:23-57 +17-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:8:9-60 +17-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:8:23-57 18 19 20 diff --git a/src/Notes/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/src/Notes/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat index ff13e5a..f5e0a9d 100644 Binary files a/src/Notes/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and b/src/Notes/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ diff --git a/src/Notes/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/Notes/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat index 5eb6297..2f87caf 100644 Binary files a/src/Notes/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and b/src/Notes/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ diff --git a/src/Notes/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/Notes/app/build/intermediates/merged_res/debug/values_values.arsc.flat index 57b3084..d332364 100644 Binary files a/src/Notes/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/Notes/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 22117c8..3f25890 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,44 +1,36 @@ { "logs": [ { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-v28_values-v28.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-watch-v21_values-watch-v21.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v28\\values-v28.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v21\\values-watch-v21.xml", "from": { - "startLines": "2,3,4,8", - "startColumns": "4,4,4,4", - "startOffsets": "55,130,217,447", - "endLines": "2,3,7,11", - "endColumns": "74,86,12,12", - "endOffsets": "125,212,442,684" - }, - "to": { - "startLines": "2,3,4,8", - "startColumns": "4,4,4,4", - "startOffsets": "55,130,217,397", - "endLines": "2,3,7,11", - "endColumns": "74,86,12,12", - "endOffsets": "125,212,392,584" + "startLines": "2,6,10", + "startColumns": "4,4,4", + "startOffsets": "55,271,499", + "endLines": "5,9,13", + "endColumns": "12,12,12", + "endOffsets": "266,494,724" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-ro_values-ro.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-uk_values-uk.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ro\\values-ro.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-uk\\values-uk.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,226,330,443,531,643,764,849,930,1021,1114,1210,1304,1404,1497,1592,1687,1778,1870,1953,2065,2178,2278,2392,2497,2603,2767,2870", - "endColumns": "120,103,112,87,111,120,84,80,90,92,95,93,99,92,94,94,90,91,82,111,112,99,113,104,105,163,102,82", - "endOffsets": "221,325,438,526,638,759,844,925,1016,1109,1205,1299,1399,1492,1587,1682,1773,1865,1948,2060,2173,2273,2387,2492,2598,2762,2865,2948" + "startOffsets": "105,215,317,423,509,617,735,814,894,985,1078,1174,1268,1369,1462,1557,1652,1743,1834,1915,2021,2128,2226,2334,2440,2549,2719,2819", + "endColumns": "109,101,105,85,107,117,78,79,90,92,95,93,100,92,94,94,90,90,80,105,106,97,107,105,108,169,99,80", + "endOffsets": "210,312,418,504,612,730,809,889,980,1073,1169,1263,1364,1457,1552,1647,1738,1829,1910,2016,2123,2221,2329,2435,2544,2714,2814,2895" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ro\\values-ro.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-uk\\values-uk.xml", "from": { "startLines": "2", "startColumns": "4", @@ -49,18 +41,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2953", + "startOffsets": "2900", "endColumns": "100", - "endOffsets": "3049" + "endOffsets": "2996" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-pa_values-pa.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-mr_values-mr.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-pa\\values-pa.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-mr\\values-mr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -71,28 +63,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2839", + "startOffsets": "2887", "endColumns": "100", - "endOffsets": "2935" + "endOffsets": "2983" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-pa\\values-pa.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-mr\\values-mr.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,208,305,410,496,596,709,786,862,953,1046,1142,1236,1337,1430,1525,1619,1710,1801,1880,1981,2085,2182,2291,2390,2500,2659,2759", - "endColumns": "102,96,104,85,99,112,76,75,90,92,95,93,100,92,94,93,90,90,78,100,103,96,108,98,109,158,99,79", - "endOffsets": "203,300,405,491,591,704,781,857,948,1041,1137,1231,1332,1425,1520,1614,1705,1796,1875,1976,2080,2177,2286,2385,2495,2654,2754,2834" + "startOffsets": "105,216,322,429,519,620,735,812,890,981,1074,1168,1265,1366,1459,1554,1651,1742,1833,1913,2025,2127,2223,2332,2433,2545,2702,2807", + "endColumns": "110,105,106,89,100,114,76,77,90,92,93,96,100,92,94,96,90,90,79,111,101,95,108,100,111,156,104,79", + "endOffsets": "211,317,424,514,615,730,807,885,976,1069,1163,1260,1361,1454,1549,1646,1737,1828,1908,2020,2122,2218,2327,2428,2540,2697,2802,2882" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-ne_values-ne.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-zu_values-zu.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ne\\values-ne.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zu\\values-zu.xml", "from": { "startLines": "2", "startColumns": "4", @@ -103,28 +95,54 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2988", + "startOffsets": "2898", "endColumns": "100", - "endOffsets": "3084" + "endOffsets": "2994" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ne\\values-ne.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zu\\values-zu.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,210,314,422,513,620,747,841,931,1022,1115,1211,1305,1406,1499,1594,1688,1779,1870,1958,2068,2184,2287,2402,2504,2619,2790,2902", - "endColumns": "104,103,107,90,106,126,93,89,90,92,95,93,100,92,94,93,90,90,87,109,115,102,114,101,114,170,111,85", - "endOffsets": "205,309,417,508,615,742,836,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1953,2063,2179,2282,2397,2499,2614,2785,2897,2983" + "startOffsets": "105,213,320,434,522,625,752,832,912,1003,1096,1190,1284,1385,1478,1573,1667,1758,1851,1937,2041,2147,2245,2352,2458,2564,2721,2817", + "endColumns": "107,106,113,87,102,126,79,79,90,92,93,93,100,92,94,93,90,92,85,103,105,97,106,105,105,156,95,80", + "endOffsets": "208,315,429,517,620,747,827,907,998,1091,1185,1279,1380,1473,1568,1662,1753,1846,1932,2036,2142,2240,2347,2453,2559,2716,2812,2893" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-v17_values-v17.arsc.flat", + "map": [ + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v17\\values-v17.xml", + "from": { + "startLines": "2,5,9,12,15,18,22,25,29,33,37,40,43,46,50,53,57", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "55,228,456,614,764,936,1161,1331,1559,1783,2025,2196,2370,2539,2812,3012,3216", + "endLines": "4,8,11,14,17,21,24,28,32,36,39,42,45,49,52,56,60", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "223,451,609,759,931,1156,1326,1554,1778,2020,2191,2365,2534,2807,3007,3211,3540" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-bg_values-bg.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-km_values-km.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-bg\\values-bg.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-km\\values-km.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,208,308,420,507,611,729,806,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1905,2009,2114,2214,2324,2431,2539,2701,2799", + "endColumns": "102,99,111,86,103,117,76,76,90,92,95,93,100,92,94,93,90,90,82,103,104,99,109,106,107,161,97,82", + "endOffsets": "203,303,415,502,606,724,801,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1900,2004,2109,2209,2319,2426,2534,2696,2794,2877" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-km\\values-km.xml", "from": { "startLines": "2", "startColumns": "4", @@ -135,19 +153,9 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2930", + "startOffsets": "2882", "endColumns": "100", - "endOffsets": "3026" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-bg\\values-bg.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,220,327,432,518,623,744,823,901,992,1085,1181,1275,1376,1469,1564,1672,1763,1854,1937,2051,2160,2260,2374,2480,2588,2748,2847", - "endColumns": "114,106,104,85,104,120,78,77,90,92,95,93,100,92,94,107,90,90,82,113,108,99,113,105,107,159,98,82", - "endOffsets": "215,322,427,513,618,739,818,896,987,1080,1176,1270,1371,1464,1559,1667,1758,1849,1932,2046,2155,2255,2369,2475,2583,2743,2842,2925" + "endOffsets": "2978" } } ] @@ -156,46 +164,52 @@ "outputFile": "net.micode.notes.app-merged_res-8:/values_values.arsc.flat", "map": [ { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\arrays.xml", + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\attrs.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "startLines": "1", + "startColumns": "4", + "startOffsets": "16", + "endLines": "4", + "endColumns": "24", + "endOffsets": "207" }, "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" + "startLines": "2694", + "startColumns": "4", + "startOffsets": "154608", + "endLines": "2697", + "endColumns": "24", + "endOffsets": "154797" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values\\values.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\0a4a4ce1bdecc4eec4e4905ca8187ea2\\transformed\\coordinatorlayout-28.0.0\\res\\values\\values.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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "2,102,3,13", + "startColumns": "4,4,4,4", + "startOffsets": "55,5935,116,724", + "endLines": "2,104,12,101", + "endColumns": "60,12,24,24", + "endOffsets": "111,6075,719,5930" }, "to": { - "startLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,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,374,390,391,392,393,394,395,403,404,408,412,416,421,427,434,438,442,447,451,455,459,463,467,471,477,481,487,491,497,501,506,510,513,517,523,527,533,537,543,546,550,554,558,562,566,567,568,569,572,575,578,581,585,586,587,588,589,592,594,596,598,603,604,608,614,618,619,621,632,633,637,643,647,648,649,653,680,684,685,689,717,884,910,1078,1104,1135,1143,1149,1163,1185,1190,1195,1205,1214,1223,1227,1234,1242,1249,1250,1259,1262,1265,1269,1273,1277,1280,1281,1285,1289,1299,1304,1311,1317,1318,1321,1325,1330,1332,1334,1337,1340,1342,1346,1349,1356,1359,1362,1366,1368,1372,1374,1376,1378,1382,1390,1398,1410,1416,1425,1428,1439,1442,1447,1448,1468,1526,1585,1586,1596,1605,1606,1608,1612,1615,1618,1621,1624,1627,1630,1633,1637,1640,1643,1646,1650,1653,1657,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1680,1681,1683,1685,1686,1687,1688,1689,1690,1691,1692,1694,1695,1697,1698,1700,1702,1703,1705,1706,1707,1708,1709,1710,1712,1713,1714,1715,1716,1728,1730,1732,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1772,1773,1774,1776,1777,1778,1779,1780,1781,1783,1787,1797,1798,1799,1800,1801,1802,1803,1808,1810,1812,1814,1816,1818,1819,1820,1821,1823,1825,1827,1828,1829,1830,1831,1832,1833,1834,1835,1836,1837,1838,1841,1842,1843,1844,1846,1848,1849,1851,1852,1854,1856,1858,1859,1860,1861,1862,1863,1864,1865,1866,1867,1868,1869,1871,1872,1873,1874,1876,1877,1878,1879,1880,1882,1884,1886,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899,1900,1901", - "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "481,536,581,630,671,726,785,847,928,989,1064,1140,1217,1295,1380,1462,1538,1664,1741,1819,1925,2031,2110,2190,2247,2305,2379,2454,2519,2585,2645,2706,2778,2851,2918,3192,3251,3310,3369,3428,3487,3541,3595,3648,3702,3756,3810,3996,4070,4149,4222,4296,4367,4439,4511,4584,4641,4699,4772,4846,4920,4995,5067,5140,5210,5281,5341,5459,5528,5597,5667,5741,5817,5881,5958,6034,6111,6176,6245,6322,6397,6466,6534,6611,6677,6738,6835,6900,6969,7068,7139,7198,7256,7313,7372,7436,7507,7579,7651,7723,7795,7862,7930,7998,8057,8120,8184,8274,8365,8425,8491,8558,8624,8694,8758,8811,8924,8982,9045,9110,9175,9250,9323,9395,9444,9505,9566,9627,9689,9753,9817,9881,9946,10009,10069,10130,10196,10255,10315,10377,10448,10508,11064,11150,11237,11327,11414,11502,11584,11667,11757,13088,13140,13198,13243,13309,13373,13430,13487,13689,13746,13794,13843,13894,13998,14045,14094,14412,14444,14508,14570,14630,15110,15184,15254,15332,15386,15456,15541,15589,15635,15706,15784,15862,15934,16008,16082,16156,16236,16309,16378,16450,16527,16588,16651,16717,16781,16852,16915,16980,17044,17105,17166,17218,17291,17365,17434,17509,17583,17657,17798,24466,25627,25705,25795,25883,25979,26069,26651,26740,26987,27268,27520,27805,28198,28675,28897,29119,29395,29622,29852,30082,30312,30542,30769,31188,31414,31839,32069,32497,32716,32999,33207,33338,33565,33991,34216,34643,34864,35289,35409,35685,35986,36310,36601,36915,37052,37183,37288,37530,37697,37901,38109,38380,38492,38604,38709,38826,39040,39186,39326,39412,39760,39848,40094,40512,40761,40843,40941,41533,41633,41885,42309,42564,42658,42747,42984,45008,45250,45352,45605,47761,57890,59406,69634,71162,72919,73545,73965,75026,76291,76547,76783,77330,77824,78429,78627,79207,79771,80146,80264,80802,80959,81155,81428,81684,81854,81995,82059,82341,82627,83303,83567,83905,84258,84352,84538,84844,85106,85231,85358,85597,85808,85927,86120,86297,86752,86933,87055,87314,87427,87614,87716,87823,87952,88227,88735,89231,90108,90402,90972,91121,91853,92025,92361,92453,93520,97802,102227,102289,102867,103451,103542,103655,103884,104044,104196,104367,104533,104702,104869,105032,105275,105445,105618,105789,106063,106262,106467,106797,106881,106977,107073,107171,107271,107373,107475,107577,107679,107781,107881,107977,108089,108218,108341,108472,108603,108701,108815,108909,109049,109183,109279,109391,109491,109607,109703,109815,109915,110055,110191,110355,110485,110643,110793,110934,111078,111213,111325,111475,111603,111731,111867,111999,112129,112259,112371,113269,113415,113559,115043,115109,115199,115275,115379,115469,115571,115679,115787,115887,115967,116059,116157,116267,116345,116451,116543,116647,116757,116879,117042,117559,117639,117739,117829,117939,118033,118139,118459,118559,118671,118785,118901,119017,119111,119225,119337,119439,119559,119681,119763,119867,119987,120113,120211,120305,120393,120505,120621,120743,120855,121030,121146,121232,121324,121436,121560,121627,121753,121821,121949,122093,122221,122290,122385,122500,122613,122712,122821,122932,123043,123144,123249,123349,123479,123570,123693,123787,123899,123985,124089,124185,124273,124391,124495,124599,124725,124813,124921,125021,125111,125221,125305,125407,125491,125545,125609,125715,125825,125909", - "endLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,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,374,390,391,392,393,394,402,403,407,411,415,420,426,433,437,441,446,450,454,458,462,466,470,476,480,486,490,496,500,505,509,512,516,522,526,532,536,542,545,549,553,557,561,565,566,567,568,571,574,577,580,584,585,586,587,588,591,593,595,597,602,603,607,613,617,618,620,631,632,636,642,646,647,648,652,679,683,684,688,716,883,909,1077,1103,1134,1142,1148,1162,1184,1189,1194,1204,1213,1222,1226,1233,1241,1248,1249,1258,1261,1264,1268,1272,1276,1279,1280,1284,1288,1298,1303,1310,1316,1317,1320,1324,1329,1331,1333,1336,1339,1341,1345,1348,1355,1358,1361,1365,1367,1371,1373,1375,1377,1381,1389,1397,1409,1415,1424,1427,1438,1441,1446,1447,1452,1525,1584,1585,1595,1604,1605,1607,1611,1614,1617,1620,1623,1626,1629,1632,1636,1639,1642,1645,1649,1652,1656,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1680,1682,1684,1685,1686,1687,1688,1689,1690,1691,1693,1694,1696,1697,1699,1701,1702,1704,1705,1706,1707,1708,1709,1711,1712,1713,1714,1715,1716,1729,1731,1733,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1772,1773,1775,1776,1777,1778,1779,1780,1782,1786,1790,1797,1798,1799,1800,1801,1802,1803,1809,1811,1813,1815,1817,1818,1819,1820,1822,1824,1826,1827,1828,1829,1830,1831,1832,1833,1834,1835,1836,1837,1840,1841,1842,1843,1845,1847,1848,1850,1851,1853,1855,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,1867,1868,1870,1871,1872,1873,1875,1876,1877,1878,1879,1881,1883,1885,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899,1900,1901", - "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,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,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,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,63,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,91,12,12,12,61,12,12,90,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,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119", - "endOffsets": "531,576,625,666,721,780,842,923,984,1059,1135,1212,1290,1375,1457,1533,1609,1736,1814,1920,2026,2105,2185,2242,2300,2374,2449,2514,2580,2640,2701,2773,2846,2913,2981,3246,3305,3364,3423,3482,3536,3590,3643,3697,3751,3805,3859,4065,4144,4217,4291,4362,4434,4506,4579,4636,4694,4767,4841,4915,4990,5062,5135,5205,5276,5336,5397,5523,5592,5662,5736,5812,5876,5953,6029,6106,6171,6240,6317,6392,6461,6529,6606,6672,6733,6830,6895,6964,7063,7134,7193,7251,7308,7367,7431,7502,7574,7646,7718,7790,7857,7925,7993,8052,8115,8179,8269,8360,8420,8486,8553,8619,8689,8753,8806,8919,8977,9040,9105,9170,9245,9318,9390,9439,9500,9561,9622,9684,9748,9812,9876,9941,10004,10064,10125,10191,10250,10310,10372,10443,10503,10571,11145,11232,11322,11409,11497,11579,11662,11752,11843,13135,13193,13238,13304,13368,13425,13482,13536,13741,13789,13838,13889,13923,14040,14089,14135,14439,14503,14565,14625,14682,15179,15249,15327,15381,15451,15536,15584,15630,15701,15779,15857,15929,16003,16077,16151,16231,16304,16373,16445,16522,16583,16646,16712,16776,16847,16910,16975,17039,17100,17161,17213,17286,17360,17429,17504,17578,17652,17793,17863,24514,25700,25790,25878,25974,26064,26646,26735,26982,27263,27515,27800,28193,28670,28892,29114,29390,29617,29847,30077,30307,30537,30764,31183,31409,31834,32064,32492,32711,32994,33202,33333,33560,33986,34211,34638,34859,35284,35404,35680,35981,36305,36596,36910,37047,37178,37283,37525,37692,37896,38104,38375,38487,38599,38704,38821,39035,39181,39321,39407,39755,39843,40089,40507,40756,40838,40936,41528,41628,41880,42304,42559,42653,42742,42979,45003,45245,45347,45600,47756,57885,59401,69629,71157,72914,73540,73960,75021,76286,76542,76778,77325,77819,78424,78622,79202,79766,80141,80259,80797,80954,81150,81423,81679,81849,81990,82054,82336,82622,83298,83562,83900,84253,84347,84533,84839,85101,85226,85353,85592,85803,85922,86115,86292,86747,86928,87050,87309,87422,87609,87711,87818,87947,88222,88730,89226,90103,90397,90967,91116,91848,92020,92356,92448,92726,97797,102222,102284,102862,103446,103537,103650,103879,104039,104191,104362,104528,104697,104864,105027,105270,105440,105613,105784,106058,106257,106462,106792,106876,106972,107068,107166,107266,107368,107470,107572,107674,107776,107876,107972,108084,108213,108336,108467,108598,108696,108810,108904,109044,109178,109274,109386,109486,109602,109698,109810,109910,110050,110186,110350,110480,110638,110788,110929,111073,111208,111320,111470,111598,111726,111862,111994,112124,112254,112366,112506,113410,113554,113692,115104,115194,115270,115374,115464,115566,115674,115782,115882,115962,116054,116152,116262,116340,116446,116538,116642,116752,116874,117037,117194,117634,117734,117824,117934,118028,118134,118226,118554,118666,118780,118896,119012,119106,119220,119332,119434,119554,119676,119758,119862,119982,120108,120206,120300,120388,120500,120616,120738,120850,121025,121141,121227,121319,121431,121555,121622,121748,121816,121944,122088,122216,122285,122380,122495,122608,122707,122816,122927,123038,123139,123244,123344,123474,123565,123688,123782,123894,123980,124084,124180,124268,124386,124490,124594,124720,124808,124916,125016,125106,125216,125300,125402,125486,125540,125604,125710,125820,125904,126024" + "startLines": "12,1904,2534,2540", + "startColumns": "4,4,4,4", + "startOffsets": "420,126168,146974,147185", + "endLines": "12,1906,2539,2623", + "endColumns": "60,12,24,24", + "endOffsets": "476,126308,147180,151696" } }, { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\strings.xml", + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "141,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,139,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "8393,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8335,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "145,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,139,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,56,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8797,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8387,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "141,72,75,74,73,19,20,21,118,119,127,126,132,26,148,149,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,137,58,59,49,70,60,130,68,47,139,129,52,51,50,66,46,65,44,45,69,135,133,28,146,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,147,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8393,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,8126,1282,8914,8968,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,8278,3036,3086,2518,3761,3146,8062,3631,2424,8335,8009,2717,2629,2571,3520,2374,3475,2271,2314,3694,8225,8174,1431,8802,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,8849,974,1084", + "endLines": "145,72,75,74,73,19,20,21,118,119,127,126,132,26,148,149,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,137,58,59,49,70,60,130,68,47,139,129,52,51,50,66,46,65,44,45,69,135,133,28,146,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,147,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,83,53,57,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,55,49,59,52,65,61,62,62,46,56,52,54,87,57,61,49,44,42,59,66,51,49,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89", + "endOffsets": "8797,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,8169,1361,8963,9021,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,8329,3081,3141,2566,3822,3203,8120,3689,2466,8387,8057,2767,2712,2624,3577,2419,3515,2309,2369,3756,8272,8219,1481,8844,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,8909,1079,1169" }, "to": { "startLines": "231,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,375,376,378,379,380,381,382,383,384,385,386,387,388,389", @@ -207,27 +221,49 @@ } }, { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\styles.xml", + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\dimens.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" + "startLines": "15,17,19,21,13", + "startColumns": "4,4,4,4,4", + "startOffsets": "335,409,484,558,262", + "endColumns": "51,52,52,51,51", + "endOffsets": "382,457,532,605,309" }, "to": { - "startLines": "1453,1457,1461,1465,1734,1738,1742,1746,1750,1754,1758,1907,1910", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "92731,92939,93150,93360,113697,113880,114065,114250,114453,114659,114842,126313,126489", - "endLines": "1456,1460,1464,1467,1737,1741,1745,1749,1753,1757,1761,1909,1913", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "92934,93145,93355,93515,113875,114060,114245,114448,114654,114837,115038,126484,126714" + "startLines": "194,195,196,197,198", + "startColumns": "4,4,4,4,4", + "startOffsets": "12826,12878,12931,12984,13036", + "endColumns": "51,52,52,51,51", + "endOffsets": "12873,12926,12979,13031,13083" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values\\values.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1453,1461,1462,1466,1470,1474,1479,1485,1492,1496,1500,1505,1509,1513,1517,1521,1525,1529,1535,1539,1545,1549,1555,1559,1564,1568,1571,1575,1581,1585,1591,1595,1601,1604,1608,1612,1616,1620,1624,1625,1626,1627,1630,1633,1636,1639,1643,1644,1645,1646,1647,1650,1652,1654,1656,1661,1662,1666,1672,1676,1677,1679,1690,1691,1695,1701,1705,1706,1707,1711,1738,1742,1743,1747,1775,1943,1969,2138,2164,2195,2203,2209,2223,2245,2250,2255,2265,2274,2283,2287,2294,2302,2309,2310,2319,2322,2325,2329,2333,2337,2340,2341,2345,2349,2359,2364,2371,2377,2378,2381,2385,2390,2392,2394,2397,2400,2402,2406,2409,2416,2419,2422,2426,2428,2432,2434,2436,2438,2442,2450,2458,2470,2476,2485,2488,2499,2502,2507,2508,2513,2571,2630,2631,2641,2650,2651,2653,2657,2660,2663,2666,2669,2672,2675,2678,2682,2685,2688,2691,2695,2698,2702,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2726,2728,2730,2731,2732,2733,2734,2735,2736,2737,2739,2740,2742,2743,2745,2747,2748,2750,2751,2752,2753,2754,2755,2757,2758,2759,2760,2761,2762,2764,2766,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2780,2782,2783,2784,2785,2786,2787,2789,2793,2797,2798,2799,2800,2801,2802,2803,2804,2806,2808,2810,2812,2814,2815,2816,2817,2819,2821,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2837,2838,2839,2840,2842,2844,2845,2847,2848,2850,2852,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2865,2867,2868,2869,2870,2872,2873,2874,2875,2876,2878,2880,2882,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,69,152,155,158,161,175,186,196,223,230,241,271,298,307,344,725,730,756,774,810,816,822,845,986,1006,1012,1016,1022,1059,1071,1098,1103,1169,1184,1249,1268,1294", + "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "105,160,205,254,295,350,409,471,552,613,688,764,841,919,1004,1086,1162,1238,1315,1393,1499,1605,1684,1764,1821,1879,1953,2028,2093,2159,2219,2280,2352,2425,2492,2560,2619,2678,2737,2796,2855,2909,2963,3016,3070,3124,3178,3232,3306,3385,3458,3532,3603,3675,3747,3820,3877,3935,4008,4082,4156,4231,4303,4376,4446,4517,4577,70911,70980,71049,71119,71193,71269,71333,71410,71486,71563,71628,71697,71774,71849,71918,71986,72063,72129,72190,72287,72352,72421,72520,72591,72650,72708,72765,72824,72888,72959,73031,73103,73175,73247,73314,73382,73450,73509,73572,73636,73726,73817,73877,73943,74010,74076,74146,74210,74263,74376,74434,74497,74562,74627,74702,74775,74847,74896,74957,75018,75079,75141,75205,75269,75333,75398,75461,75521,75582,75648,75707,75767,75829,75900,75960,76028,76114,76201,76291,76378,76466,76548,76631,76721,76812,76864,76922,76967,77033,77097,77154,77211,77265,77322,77370,77419,77470,77504,77551,77600,77646,77678,77742,77804,77864,77921,77995,78065,78143,78197,78267,78352,78400,78446,78517,78595,78673,78745,78819,78893,78967,79047,79120,79189,79261,79338,79399,79462,79528,79592,79663,79726,79791,79855,79916,79977,80029,80102,80176,80245,80320,80394,80468,80609,80679,80732,80810,80900,80988,81084,81174,81756,81845,82092,82373,82625,82910,83303,83780,84002,84224,84500,84727,84957,85187,85417,85647,85874,86293,86519,86944,87174,87602,87821,88104,88312,88443,88670,89096,89321,89748,89969,90394,90514,90790,91091,91415,91706,92020,92157,92288,92393,92635,92802,93006,93214,93485,93597,93709,93814,93931,94145,94291,94431,94517,94865,94953,95199,95617,95866,95948,96046,96663,96763,97015,97439,97694,97788,97877,98114,100166,100408,100510,100763,102947,113668,115184,126004,127532,129289,129915,130335,131396,132661,132917,133153,133700,134194,134799,134997,135577,136141,136516,136634,137172,137329,137525,137798,138054,138224,138365,138429,138711,138997,139673,139937,140275,140628,140722,140908,141214,141476,141601,141728,141967,142178,142297,142490,142667,143122,143303,143425,143684,143797,143984,144086,144193,144322,144597,145105,145601,146478,146772,147342,147491,148223,148395,148731,148823,149101,153445,157932,157994,158624,159238,159329,159442,159671,159831,159983,160154,160320,160489,160656,160819,161062,161232,161405,161576,161850,162049,162254,162584,162668,162764,162860,162958,163058,163160,163262,163364,163466,163568,163668,163764,163876,164005,164128,164259,164390,164488,164602,164696,164836,164970,165066,165178,165278,165394,165490,165602,165702,165842,165978,166142,166272,166430,166580,166721,166865,167000,167112,167262,167390,167518,167654,167786,167916,168046,168158,168298,168444,168588,168726,168792,168882,168958,169062,169152,169254,169362,169470,169570,169650,169742,169840,169950,170028,170134,170226,170330,170440,170562,170725,170882,170962,171062,171152,171262,171356,171462,171554,171654,171766,171880,171996,172112,172206,172320,172432,172534,172654,172776,172858,172962,173082,173208,173306,173400,173488,173600,173716,173838,173950,174125,174241,174327,174419,174531,174655,174722,174848,174916,175044,175188,175316,175385,175480,175595,175708,175807,175916,176027,176138,176239,176344,176444,176574,176665,176788,176882,176994,177080,177184,177280,177368,177486,177590,177694,177820,177908,178016,178116,178206,178316,178400,178502,178586,178640,178704,178810,178920,179004,4638,9782,9900,10015,10147,10862,11554,12071,13718,14103,14700,16299,17832,18220,20527,40045,40305,41697,42730,44743,45005,45361,46191,52973,54107,54401,54624,54951,57001,57649,59282,59552,63403,64004,67813,69028,70437", + "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1460,1461,1465,1469,1473,1478,1484,1491,1495,1499,1504,1508,1512,1516,1520,1524,1528,1534,1538,1544,1548,1554,1558,1563,1567,1570,1574,1580,1584,1590,1594,1600,1603,1607,1611,1615,1619,1623,1624,1625,1626,1629,1632,1635,1638,1642,1643,1644,1645,1646,1649,1651,1653,1655,1660,1661,1665,1671,1675,1676,1678,1689,1690,1694,1700,1704,1705,1706,1710,1737,1741,1742,1746,1774,1942,1968,2137,2163,2194,2202,2208,2222,2244,2249,2254,2264,2273,2282,2286,2293,2301,2308,2309,2318,2321,2324,2328,2332,2336,2339,2340,2344,2348,2358,2363,2370,2376,2377,2380,2384,2389,2391,2393,2396,2399,2401,2405,2408,2415,2418,2421,2425,2427,2431,2433,2435,2437,2441,2449,2457,2469,2475,2484,2487,2498,2501,2506,2507,2512,2570,2629,2630,2640,2649,2650,2652,2656,2659,2662,2665,2668,2671,2674,2677,2681,2684,2687,2690,2694,2697,2701,2705,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2727,2729,2730,2731,2732,2733,2734,2735,2736,2738,2739,2741,2742,2744,2746,2747,2749,2750,2751,2752,2753,2754,2756,2757,2758,2759,2760,2761,2763,2765,2767,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2781,2782,2783,2784,2785,2786,2788,2792,2796,2797,2798,2799,2800,2801,2802,2803,2805,2807,2809,2811,2813,2814,2815,2816,2818,2820,2822,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2836,2837,2838,2839,2841,2843,2844,2846,2847,2849,2851,2853,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2866,2867,2868,2869,2871,2872,2873,2874,2875,2877,2879,2881,2883,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,151,154,157,160,174,185,195,222,229,240,270,297,306,343,724,729,755,773,809,815,821,844,985,1005,1011,1015,1021,1058,1070,1097,1102,1168,1183,1248,1267,1293,1302", + "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,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,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,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,63,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,91,12,12,12,61,12,12,90,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,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24", + "endOffsets": "155,200,249,290,345,404,466,547,608,683,759,836,914,999,1081,1157,1233,1310,1388,1494,1600,1679,1759,1816,1874,1948,2023,2088,2154,2214,2275,2347,2420,2487,2555,2614,2673,2732,2791,2850,2904,2958,3011,3065,3119,3173,3227,3301,3380,3453,3527,3598,3670,3742,3815,3872,3930,4003,4077,4151,4226,4298,4371,4441,4512,4572,4633,70975,71044,71114,71188,71264,71328,71405,71481,71558,71623,71692,71769,71844,71913,71981,72058,72124,72185,72282,72347,72416,72515,72586,72645,72703,72760,72819,72883,72954,73026,73098,73170,73242,73309,73377,73445,73504,73567,73631,73721,73812,73872,73938,74005,74071,74141,74205,74258,74371,74429,74492,74557,74622,74697,74770,74842,74891,74952,75013,75074,75136,75200,75264,75328,75393,75456,75516,75577,75643,75702,75762,75824,75895,75955,76023,76109,76196,76286,76373,76461,76543,76626,76716,76807,76859,76917,76962,77028,77092,77149,77206,77260,77317,77365,77414,77465,77499,77546,77595,77641,77673,77737,77799,77859,77916,77990,78060,78138,78192,78262,78347,78395,78441,78512,78590,78668,78740,78814,78888,78962,79042,79115,79184,79256,79333,79394,79457,79523,79587,79658,79721,79786,79850,79911,79972,80024,80097,80171,80240,80315,80389,80463,80604,80674,80727,80805,80895,80983,81079,81169,81751,81840,82087,82368,82620,82905,83298,83775,83997,84219,84495,84722,84952,85182,85412,85642,85869,86288,86514,86939,87169,87597,87816,88099,88307,88438,88665,89091,89316,89743,89964,90389,90509,90785,91086,91410,91701,92015,92152,92283,92388,92630,92797,93001,93209,93480,93592,93704,93809,93926,94140,94286,94426,94512,94860,94948,95194,95612,95861,95943,96041,96658,96758,97010,97434,97689,97783,97872,98109,100161,100403,100505,100758,102942,113663,115179,125999,127527,129284,129910,130330,131391,132656,132912,133148,133695,134189,134794,134992,135572,136136,136511,136629,137167,137324,137520,137793,138049,138219,138360,138424,138706,138992,139668,139932,140270,140623,140717,140903,141209,141471,141596,141723,141962,142173,142292,142485,142662,143117,143298,143420,143679,143792,143979,144081,144188,144317,144592,145100,145596,146473,146767,147337,147486,148218,148390,148726,148818,149096,153440,157927,157989,158619,159233,159324,159437,159666,159826,159978,160149,160315,160484,160651,160814,161057,161227,161400,161571,161845,162044,162249,162579,162663,162759,162855,162953,163053,163155,163257,163359,163461,163563,163663,163759,163871,164000,164123,164254,164385,164483,164597,164691,164831,164965,165061,165173,165273,165389,165485,165597,165697,165837,165973,166137,166267,166425,166575,166716,166860,166995,167107,167257,167385,167513,167649,167781,167911,168041,168153,168293,168439,168583,168721,168787,168877,168953,169057,169147,169249,169357,169465,169565,169645,169737,169835,169945,170023,170129,170221,170325,170435,170557,170720,170877,170957,171057,171147,171257,171351,171457,171549,171649,171761,171875,171991,172107,172201,172315,172427,172529,172649,172771,172853,172957,173077,173203,173301,173395,173483,173595,173711,173833,173945,174120,174236,174322,174414,174526,174650,174717,174843,174911,175039,175183,175311,175380,175475,175590,175703,175802,175911,176022,176133,176234,176339,176439,176569,176660,176783,176877,176989,177075,177179,177275,177363,177481,177585,177689,177815,177903,178011,178111,178201,178311,178395,178497,178581,178635,178699,178805,178915,178999,179119,9777,9895,10010,10142,10857,11549,12066,13713,14098,14695,16294,17827,18215,20522,40040,40300,41692,42725,44738,45000,45356,46186,52968,54102,54396,54619,54946,56996,57644,59277,59547,63398,63999,67808,69023,70432,70906" + }, + "to": { + "startLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,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,374,390,391,392,393,394,395,403,404,408,412,416,421,427,434,438,442,447,451,455,459,463,467,471,477,481,487,491,497,501,506,510,513,517,523,527,533,537,543,546,550,554,558,562,566,567,568,569,572,575,578,581,585,586,587,588,589,592,594,596,598,603,604,608,614,618,619,621,632,633,637,643,647,648,649,653,680,684,685,689,717,884,910,1078,1104,1135,1143,1149,1163,1185,1190,1195,1205,1214,1223,1227,1234,1242,1249,1250,1259,1262,1265,1269,1273,1277,1280,1281,1285,1289,1299,1304,1311,1317,1318,1321,1325,1330,1332,1334,1337,1340,1342,1346,1349,1356,1359,1362,1366,1368,1372,1374,1376,1378,1382,1390,1398,1410,1416,1425,1428,1439,1442,1447,1448,1468,1526,1585,1586,1596,1605,1606,1608,1612,1615,1618,1621,1624,1627,1630,1633,1637,1640,1643,1646,1650,1653,1657,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1680,1681,1683,1685,1686,1687,1688,1689,1690,1691,1692,1694,1695,1697,1698,1700,1702,1703,1705,1706,1707,1708,1709,1710,1712,1713,1714,1715,1716,1728,1730,1732,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1772,1773,1774,1776,1777,1778,1779,1780,1781,1783,1787,1797,1798,1799,1800,1801,1802,1803,1808,1810,1812,1814,1816,1818,1819,1820,1821,1823,1825,1827,1828,1829,1830,1831,1832,1833,1834,1835,1836,1837,1838,1841,1842,1843,1844,1846,1848,1849,1851,1852,1854,1856,1858,1859,1860,1861,1862,1863,1864,1865,1866,1867,1868,1869,1871,1872,1873,1874,1876,1877,1878,1879,1880,1882,1884,1886,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899,1900,1901,1914,1989,1992,1995,1998,2012,2018,2028,2044,2050,2060,2089,2116,2125,2154,2497,2508,2624,2737,2761,2767,2773,2794,2918,2938,2944,2948,2954,2989,3001,3017,3021,3087,3102,3153,3165,3191", + "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "481,536,581,630,671,726,785,847,928,989,1064,1140,1217,1295,1380,1462,1538,1664,1741,1819,1925,2031,2110,2190,2247,2305,2379,2454,2519,2585,2645,2706,2778,2851,2918,3192,3251,3310,3369,3428,3487,3541,3595,3648,3702,3756,3810,3996,4070,4149,4222,4296,4367,4439,4511,4584,4641,4699,4772,4846,4920,4995,5067,5140,5210,5281,5341,5459,5528,5597,5667,5741,5817,5881,5958,6034,6111,6176,6245,6322,6397,6466,6534,6611,6677,6738,6835,6900,6969,7068,7139,7198,7256,7313,7372,7436,7507,7579,7651,7723,7795,7862,7930,7998,8057,8120,8184,8274,8365,8425,8491,8558,8624,8694,8758,8811,8924,8982,9045,9110,9175,9250,9323,9395,9444,9505,9566,9627,9689,9753,9817,9881,9946,10009,10069,10130,10196,10255,10315,10377,10448,10508,11064,11150,11237,11327,11414,11502,11584,11667,11757,13088,13140,13198,13243,13309,13373,13430,13487,13689,13746,13794,13843,13894,13998,14045,14094,14412,14444,14508,14570,14630,15110,15184,15254,15332,15386,15456,15541,15589,15635,15706,15784,15862,15934,16008,16082,16156,16236,16309,16378,16450,16527,16588,16651,16717,16781,16852,16915,16980,17044,17105,17166,17218,17291,17365,17434,17509,17583,17657,17798,24466,25627,25705,25795,25883,25979,26069,26651,26740,26987,27268,27520,27805,28198,28675,28897,29119,29395,29622,29852,30082,30312,30542,30769,31188,31414,31839,32069,32497,32716,32999,33207,33338,33565,33991,34216,34643,34864,35289,35409,35685,35986,36310,36601,36915,37052,37183,37288,37530,37697,37901,38109,38380,38492,38604,38709,38826,39040,39186,39326,39412,39760,39848,40094,40512,40761,40843,40941,41533,41633,41885,42309,42564,42658,42747,42984,45008,45250,45352,45605,47761,57890,59406,69634,71162,72919,73545,73965,75026,76291,76547,76783,77330,77824,78429,78627,79207,79771,80146,80264,80802,80959,81155,81428,81684,81854,81995,82059,82341,82627,83303,83567,83905,84258,84352,84538,84844,85106,85231,85358,85597,85808,85927,86120,86297,86752,86933,87055,87314,87427,87614,87716,87823,87952,88227,88735,89231,90108,90402,90972,91121,91853,92025,92361,92453,93520,97802,102227,102289,102867,103451,103542,103655,103884,104044,104196,104367,104533,104702,104869,105032,105275,105445,105618,105789,106063,106262,106467,106797,106881,106977,107073,107171,107271,107373,107475,107577,107679,107781,107881,107977,108089,108218,108341,108472,108603,108701,108815,108909,109049,109183,109279,109391,109491,109607,109703,109815,109915,110055,110191,110355,110485,110643,110793,110934,111078,111213,111325,111475,111603,111731,111867,111999,112129,112259,112371,113269,113415,113559,115043,115109,115199,115275,115379,115469,115571,115679,115787,115887,115967,116059,116157,116267,116345,116451,116543,116647,116757,116879,117042,117559,117639,117739,117829,117939,118033,118139,118459,118559,118671,118785,118901,119017,119111,119225,119337,119439,119559,119681,119763,119867,119987,120113,120211,120305,120393,120505,120621,120743,120855,121030,121146,121232,121324,121436,121560,121627,121753,121821,121949,122093,122221,122290,122385,122500,122613,122712,122821,122932,123043,123144,123249,123349,123479,123570,123693,123787,123899,123985,124089,124185,124273,124391,124495,124599,124725,124813,124921,125021,125111,125221,125305,125407,125491,125545,125609,125715,125825,125909,126719,129335,129453,129568,129648,130009,130242,130759,131184,131362,131646,132990,134351,134739,135817,145335,145681,151701,155651,156402,156664,156864,157243,161521,162127,162356,162507,162722,163805,164117,164528,164655,167681,168282,170203,170543,171854", + "endLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,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,374,390,391,392,393,394,402,403,407,411,415,420,426,433,437,441,446,450,454,458,462,466,470,476,480,486,490,496,500,505,509,512,516,522,526,532,536,542,545,549,553,557,561,565,566,567,568,571,574,577,580,584,585,586,587,588,591,593,595,597,602,603,607,613,617,618,620,631,632,636,642,646,647,648,652,679,683,684,688,716,883,909,1077,1103,1134,1142,1148,1162,1184,1189,1194,1204,1213,1222,1226,1233,1241,1248,1249,1258,1261,1264,1268,1272,1276,1279,1280,1284,1288,1298,1303,1310,1316,1317,1320,1324,1329,1331,1333,1336,1339,1341,1345,1348,1355,1358,1361,1365,1367,1371,1373,1375,1377,1381,1389,1397,1409,1415,1424,1427,1438,1441,1446,1447,1452,1525,1584,1585,1595,1604,1605,1607,1611,1614,1617,1620,1623,1626,1629,1632,1636,1639,1642,1645,1649,1652,1656,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1680,1682,1684,1685,1686,1687,1688,1689,1690,1691,1693,1694,1696,1697,1699,1701,1702,1704,1705,1706,1707,1708,1709,1711,1712,1713,1714,1715,1716,1729,1731,1733,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1772,1773,1775,1776,1777,1778,1779,1780,1782,1786,1790,1797,1798,1799,1800,1801,1802,1803,1809,1811,1813,1815,1817,1818,1819,1820,1822,1824,1826,1827,1828,1829,1830,1831,1832,1833,1834,1835,1836,1837,1840,1841,1842,1843,1845,1847,1848,1850,1851,1853,1855,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,1867,1868,1870,1871,1872,1873,1875,1876,1877,1878,1879,1881,1883,1885,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899,1900,1901,1988,1991,1994,1997,2011,2017,2027,2043,2049,2059,2088,2115,2124,2153,2496,2500,2533,2641,2760,2766,2772,2793,2917,2937,2943,2947,2953,2988,3000,3016,3020,3086,3101,3152,3164,3190,3197", + "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,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,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,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,63,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,91,12,12,12,61,12,12,90,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,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24", + "endOffsets": "531,576,625,666,721,780,842,923,984,1059,1135,1212,1290,1375,1457,1533,1609,1736,1814,1920,2026,2105,2185,2242,2300,2374,2449,2514,2580,2640,2701,2773,2846,2913,2981,3246,3305,3364,3423,3482,3536,3590,3643,3697,3751,3805,3859,4065,4144,4217,4291,4362,4434,4506,4579,4636,4694,4767,4841,4915,4990,5062,5135,5205,5276,5336,5397,5523,5592,5662,5736,5812,5876,5953,6029,6106,6171,6240,6317,6392,6461,6529,6606,6672,6733,6830,6895,6964,7063,7134,7193,7251,7308,7367,7431,7502,7574,7646,7718,7790,7857,7925,7993,8052,8115,8179,8269,8360,8420,8486,8553,8619,8689,8753,8806,8919,8977,9040,9105,9170,9245,9318,9390,9439,9500,9561,9622,9684,9748,9812,9876,9941,10004,10064,10125,10191,10250,10310,10372,10443,10503,10571,11145,11232,11322,11409,11497,11579,11662,11752,11843,13135,13193,13238,13304,13368,13425,13482,13536,13741,13789,13838,13889,13923,14040,14089,14135,14439,14503,14565,14625,14682,15179,15249,15327,15381,15451,15536,15584,15630,15701,15779,15857,15929,16003,16077,16151,16231,16304,16373,16445,16522,16583,16646,16712,16776,16847,16910,16975,17039,17100,17161,17213,17286,17360,17429,17504,17578,17652,17793,17863,24514,25700,25790,25878,25974,26064,26646,26735,26982,27263,27515,27800,28193,28670,28892,29114,29390,29617,29847,30077,30307,30537,30764,31183,31409,31834,32064,32492,32711,32994,33202,33333,33560,33986,34211,34638,34859,35284,35404,35680,35981,36305,36596,36910,37047,37178,37283,37525,37692,37896,38104,38375,38487,38599,38704,38821,39035,39181,39321,39407,39755,39843,40089,40507,40756,40838,40936,41528,41628,41880,42304,42559,42653,42742,42979,45003,45245,45347,45600,47756,57885,59401,69629,71157,72914,73540,73960,75021,76286,76542,76778,77325,77819,78424,78622,79202,79766,80141,80259,80797,80954,81150,81423,81679,81849,81990,82054,82336,82622,83298,83562,83900,84253,84347,84533,84839,85101,85226,85353,85592,85803,85922,86115,86292,86747,86928,87050,87309,87422,87609,87711,87818,87947,88222,88730,89226,90103,90397,90967,91116,91848,92020,92356,92448,92726,97797,102222,102284,102862,103446,103537,103650,103879,104039,104191,104362,104528,104697,104864,105027,105270,105440,105613,105784,106058,106257,106462,106792,106876,106972,107068,107166,107266,107368,107470,107572,107674,107776,107876,107972,108084,108213,108336,108467,108598,108696,108810,108904,109044,109178,109274,109386,109486,109602,109698,109810,109910,110050,110186,110350,110480,110638,110788,110929,111073,111208,111320,111470,111598,111726,111862,111994,112124,112254,112366,112506,113410,113554,113692,115104,115194,115270,115374,115464,115566,115674,115782,115882,115962,116054,116152,116262,116340,116446,116538,116642,116752,116874,117037,117194,117634,117734,117824,117934,118028,118134,118226,118554,118666,118780,118896,119012,119106,119220,119332,119434,119554,119676,119758,119862,119982,120108,120206,120300,120388,120500,120616,120738,120850,121025,121141,121227,121319,121431,121555,121622,121748,121816,121944,122088,122216,122285,122380,122495,122608,122707,122816,122927,123038,123139,123244,123344,123474,123565,123688,123782,123894,123980,124084,124180,124268,124386,124490,124594,124720,124808,124916,125016,125106,125216,125300,125402,125486,125540,125604,125710,125820,125904,126024,129330,129448,129563,129643,130004,130237,130754,131179,131357,131641,132985,134346,134734,135812,145330,145465,146969,152268,156397,156659,156859,157238,161516,162122,162351,162502,162717,163800,164112,164523,164650,167676,168277,170198,170538,171849,172052" } }, { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\colors.xml", + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1" + "startLines": "21,17,18,19,20,16", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "594,388,439,490,542,331", + "endColumns": "49,50,50,51,51,56", + "endOffsets": "639,434,485,537,589,383" }, "to": { "startLines": "30,49,50,51,52,87", @@ -238,85 +274,98 @@ } }, { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\themes.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values\\values.xml", "from": { - "startLines": "-1,-1,-1", - "startColumns": "-1,-1,-1", - "startOffsets": "-1,-1,-1" + "startLines": "2,3,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,171,172,176,177,178,6,13,56,88,125", + "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", + "startOffsets": "55,124,7725,7795,7863,7935,8005,8066,8140,8213,8274,8335,8397,8461,8523,8584,8652,8752,8812,8878,8951,9020,9077,9129,9191,9263,9339,9374,9409,9459,9520,9577,9611,9646,9681,9751,9822,9939,10140,10250,10451,10580,10652,319,617,3523,5588,7348", + "endLines": "2,3,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,170,171,175,176,177,178,12,55,87,124,131", + "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24", + "endOffsets": "119,182,7790,7858,7930,8000,8061,8135,8208,8269,8330,8392,8456,8518,8579,8647,8747,8807,8873,8946,9015,9072,9124,9186,9258,9334,9369,9404,9454,9515,9572,9606,9641,9676,9746,9817,9934,10135,10245,10446,10575,10647,10714,612,3518,5583,7343,7720" }, "to": { - "startLines": "1791,1792,1804", - "startColumns": "4,4,4", - "startOffsets": "117199,117262,118231", - "endLines": "1791,1796,1807", - "endColumns": "62,12,12", - "endOffsets": "117257,117554,118454" + "startLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,377,1717,1718,1722,1723,1727,1902,1903,2501,2642,2673,2698,2731", + "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", + "startOffsets": "3864,3933,10576,10646,10714,10786,10856,10917,10991,11848,11909,11970,12032,12096,12158,12219,12287,12387,12447,12513,12586,12655,12712,12764,13541,13613,13928,13963,14140,14190,14251,14308,14342,14377,14687,24658,112511,112628,112829,112939,113140,126029,126101,145470,152273,153927,154802,155484", + "endLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,377,1717,1721,1722,1726,1727,1902,1903,2507,2672,2693,2730,2736", + "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24", + "endOffsets": "3928,3991,10641,10709,10781,10851,10912,10986,11059,11904,11965,12027,12091,12153,12214,12282,12382,12442,12508,12581,12650,12707,12759,12821,13608,13684,13958,13993,14185,14246,14303,14337,14372,14407,14752,24724,112623,112824,112934,113135,113264,126096,126163,145676,153922,154603,155479,155646" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\0a4a4ce1bdecc4eec4e4905ca8187ea2\\transformed\\coordinatorlayout-28.0.0\\res\\values\\values.xml", + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "startLines": "49,55,66,61,15,20,25,31,37,10,43,70,74", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "1798,2043,2507,2299,421,628,837,1066,1314,215,1560,2718,2895", + "endLines": "52,58,69,63,18,23,28,34,40,13,46,72,77", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2001,2249,2713,2454,599,808,1017,1264,1515,393,1756,2889,3120" }, "to": { - "startLines": "12,1904", - "startColumns": "4,4", - "startOffsets": "420,126168", - "endLines": "12,1906", - "endColumns": "60,12", - "endOffsets": "476,126308" + "startLines": "1453,1457,1461,1465,1734,1738,1742,1746,1750,1754,1758,1907,1910", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "92731,92939,93150,93360,113697,113880,114065,114250,114453,114659,114842,126313,126489", + "endLines": "1456,1460,1464,1467,1737,1741,1745,1749,1753,1757,1761,1909,1913", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "92934,93145,93355,93515,113875,114060,114245,114448,114654,114837,115038,126484,126714" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values\\values.xml", + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\arrays.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", - "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", - "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" + "startLines": "10,18", + "startColumns": "4,4", + "startOffsets": "237,524", + "endLines": "15,21", + "endColumns": "19,19", + "endOffsets": "492,639" }, "to": { - "startLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,377,1717,1718,1722,1723,1727,1902,1903", - "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", - "startOffsets": "3864,3933,10576,10646,10714,10786,10856,10917,10991,11848,11909,11970,12032,12096,12158,12219,12287,12387,12447,12513,12586,12655,12712,12764,13541,13613,13928,13963,14140,14190,14251,14308,14342,14377,14687,24658,112511,112628,112829,112939,113140,126029,126101", - "endLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,377,1717,1721,1722,1726,1727,1902,1903", - "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66", - "endOffsets": "3928,3991,10641,10709,10781,10851,10912,10986,11059,11904,11965,12027,12091,12153,12214,12282,12382,12442,12508,12581,12650,12707,12759,12821,13608,13684,13958,13993,14185,14246,14303,14337,14372,14407,14752,24724,112623,112824,112934,113135,113264,126096,126163" + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" } }, { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\dimens.xml", + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\themes.xml", "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" + "startLines": "1,2,8", + "startColumns": "2,4,4", + "startOffsets": "14,77,375", + "endLines": "1,6,11", + "endColumns": "60,12,12", + "endOffsets": "72,369,598" }, "to": { - "startLines": "194,195,196,197,198", - "startColumns": "4,4,4,4,4", - "startOffsets": "12826,12878,12931,12984,13036", - "endColumns": "51,52,52,51,51", - "endOffsets": "12873,12926,12979,13031,13083" + "startLines": "1791,1792,1804", + "startColumns": "4,4,4", + "startOffsets": "117199,117262,118231", + "endLines": "1791,1796,1807", + "endColumns": "62,12,12", + "endOffsets": "117257,117554,118454" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-pt-rBR_values-pt-rBR.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-hu_values-hu.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-hu\\values-hu.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,225,331,438,527,628,746,829,909,1000,1093,1189,1283,1384,1477,1572,1667,1758,1849,1936,2043,2155,2257,2365,2472,2582,2744,2844", - "endColumns": "119,105,106,88,100,117,82,79,90,92,95,93,100,92,94,94,90,90,86,106,111,101,107,106,109,161,99,84", - "endOffsets": "220,326,433,522,623,741,824,904,995,1088,1184,1278,1379,1472,1567,1662,1753,1844,1931,2038,2150,2252,2360,2467,2577,2739,2839,2924" + "startOffsets": "105,213,318,433,517,629,759,835,911,1002,1095,1191,1285,1386,1479,1574,1669,1760,1851,1934,2044,2155,2255,2366,2474,2593,2775,2878", + "endColumns": "107,104,114,83,111,129,75,75,90,92,95,93,100,92,94,94,90,90,82,109,110,99,110,107,118,181,102,82", + "endOffsets": "208,313,428,512,624,754,830,906,997,1090,1186,1280,1381,1474,1569,1664,1755,1846,1929,2039,2150,2250,2361,2469,2588,2770,2873,2956" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-hu\\values-hu.xml", "from": { "startLines": "2", "startColumns": "4", @@ -327,18 +376,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2929", + "startOffsets": "2961", "endColumns": "100", - "endOffsets": "3025" + "endOffsets": "3057" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-mr_values-mr.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-lv_values-lv.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-mr\\values-mr.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-lv\\values-lv.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,225,333,442,528,632,754,836,918,1028,1136,1243,1352,1464,1567,1679,1786,1891,1991,2076,2185,2297,2396,2507,2616,2721,2895,2994", + "endColumns": "119,107,108,85,103,121,81,81,109,107,106,108,111,102,111,106,104,99,84,108,111,98,110,108,104,173,98,81", + "endOffsets": "220,328,437,523,627,749,831,913,1023,1131,1238,1347,1459,1562,1674,1781,1886,1986,2071,2180,2292,2391,2502,2611,2716,2890,2989,3071" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-lv\\values-lv.xml", "from": { "startLines": "2", "startColumns": "4", @@ -349,149 +408,58 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2887", + "startOffsets": "3076", "endColumns": "100", - "endOffsets": "2983" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-mr\\values-mr.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,216,322,429,519,620,735,812,890,981,1074,1168,1265,1366,1459,1554,1651,1742,1833,1913,2025,2127,2223,2332,2433,2545,2702,2807", - "endColumns": "110,105,106,89,100,114,76,77,90,92,93,96,100,92,94,96,90,90,79,111,101,95,108,100,111,156,104,79", - "endOffsets": "211,317,424,514,615,730,807,885,976,1069,1163,1260,1361,1454,1549,1646,1737,1828,1908,2020,2122,2218,2327,2428,2540,2697,2802,2882" + "endOffsets": "3172" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-uk_values-uk.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-h720dp-v13_values-h720dp-v13.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-uk\\values-uk.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,215,317,423,509,617,735,814,894,985,1078,1174,1268,1369,1462,1557,1652,1743,1834,1915,2021,2128,2226,2334,2440,2549,2719,2819", - "endColumns": "109,101,105,85,107,117,78,79,90,92,95,93,100,92,94,94,90,90,80,105,106,97,107,105,108,169,99,80", - "endOffsets": "210,312,418,504,612,730,809,889,980,1073,1169,1263,1364,1457,1552,1647,1738,1829,1910,2016,2123,2221,2329,2435,2544,2714,2814,2895" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-uk\\values-uk.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-h720dp-v13\\values-h720dp-v13.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2900", - "endColumns": "100", - "endOffsets": "2996" + "endColumns": "66", + "endOffsets": "117" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-sk_values-sk.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-large-v4_values-large-v4.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sk\\values-sk.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-large-v4\\values-large-v4.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,212,312,423,509,617,735,816,897,988,1081,1180,1274,1375,1468,1563,1661,1752,1843,1927,2032,2141,2240,2346,2457,2566,2732,2830", - "endColumns": "106,99,110,85,107,117,80,80,90,92,98,93,100,92,94,97,90,90,83,104,108,98,105,110,108,165,97,87", - "endOffsets": "207,307,418,504,612,730,811,892,983,1076,1175,1269,1370,1463,1558,1656,1747,1838,1922,2027,2136,2235,2341,2452,2561,2727,2825,2913" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sk\\values-sk.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2918", - "endColumns": "100", - "endOffsets": "3014" - } - } - ] - }, - { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-pt-rPT_values-pt-rPT.arsc.flat", - "map": [ - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2949", - "endColumns": "100", - "endOffsets": "3045" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,225,331,438,527,628,752,836,917,1009,1103,1201,1295,1395,1489,1585,1680,1772,1864,1951,2058,2170,2272,2380,2487,2594,2765,2864", - "endColumns": "119,105,106,88,100,123,83,80,91,93,97,93,99,93,95,94,91,91,86,106,111,101,107,106,106,170,98,84", - "endOffsets": "220,326,433,522,623,747,831,912,1004,1098,1196,1290,1390,1484,1580,1675,1767,1859,1946,2053,2165,2267,2375,2482,2589,2760,2859,2944" - } - } - ] - }, - { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-v24_values-v24.arsc.flat", - "map": [ - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v24\\values-v24.xml", - "from": { - "startLines": "2,3", - "startColumns": "4,4", - "startOffsets": "55,212", - "endColumns": "156,134", - "endOffsets": "207,342" + "startLines": "2,3,4,5,6,7,8,9,10", + "startColumns": "4,4,4,4,4,4,4,4,4", + "startOffsets": "55,114,185,256,326,396,464,532,636", + "endColumns": "58,70,70,69,69,67,67,103,115", + "endOffsets": "109,180,251,321,391,459,527,631,747" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-km_values-km.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-gu_values-gu.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-km\\values-km.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-gu\\values-gu.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,208,308,420,507,611,729,806,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1905,2009,2114,2214,2324,2431,2539,2701,2799", - "endColumns": "102,99,111,86,103,117,76,76,90,92,95,93,100,92,94,93,90,90,82,103,104,99,109,106,107,161,97,82", - "endOffsets": "203,303,415,502,606,724,801,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1900,2004,2109,2209,2319,2426,2534,2696,2794,2877" + "startOffsets": "105,214,318,425,512,613,736,813,891,982,1075,1174,1268,1369,1462,1557,1654,1745,1836,1916,2022,2124,2221,2330,2429,2539,2699,2802", + "endColumns": "108,103,106,86,100,122,76,77,90,92,98,93,100,92,94,96,90,90,79,105,101,96,108,98,109,159,102,79", + "endOffsets": "209,313,420,507,608,731,808,886,977,1070,1169,1263,1364,1457,1552,1649,1740,1831,1911,2017,2119,2216,2325,2424,2534,2694,2797,2877" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-km\\values-km.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-gu\\values-gu.xml", "from": { "startLines": "2", "startColumns": "4", @@ -510,20 +478,20 @@ ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-en-rGB_values-en-rGB.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-pa_values-pa.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-pa\\values-pa.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", - "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", - "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" + "startOffsets": "105,208,305,410,496,596,709,786,862,953,1046,1142,1236,1337,1430,1525,1619,1710,1801,1880,1981,2085,2182,2291,2390,2500,2659,2759", + "endColumns": "102,96,104,85,99,112,76,75,90,92,95,93,100,92,94,93,90,90,78,100,103,96,108,98,109,158,99,79", + "endOffsets": "203,300,405,491,591,704,781,857,948,1041,1137,1231,1332,1425,1520,1614,1705,1796,1875,1976,2080,2177,2286,2385,2495,2654,2754,2834" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-pa\\values-pa.xml", "from": { "startLines": "2", "startColumns": "4", @@ -534,18 +502,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2846", + "startOffsets": "2839", "endColumns": "100", - "endOffsets": "2942" + "endOffsets": "2935" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-el_values-el.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-b+sr+Latn_values-b+sr+Latn.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-el\\values-el.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -556,81 +524,62 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2964", + "startOffsets": "2912", "endColumns": "100", - "endOffsets": "3060" + "endOffsets": "3008" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-el\\values-el.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,223,334,451,536,641,767,855,941,1032,1125,1221,1315,1416,1509,1604,1701,1792,1883,1968,2079,2189,2291,2402,2511,2619,2779,2879", - "endColumns": "117,110,116,84,104,125,87,85,90,92,95,93,100,92,94,96,90,90,84,110,109,101,110,108,107,159,99,84", - "endOffsets": "218,329,446,531,636,762,850,936,1027,1120,1216,1310,1411,1504,1599,1696,1787,1878,1963,2074,2184,2286,2397,2506,2614,2774,2874,2959" + "startOffsets": "105,214,318,424,510,614,732,814,895,986,1079,1175,1269,1370,1463,1558,1663,1754,1845,1933,2039,2147,2248,2353,2461,2562,2731,2828", + "endColumns": "108,103,105,85,103,117,81,80,90,92,95,93,100,92,94,104,90,90,87,105,107,100,104,107,100,168,96,83", + "endOffsets": "209,313,419,505,609,727,809,890,981,1074,1170,1264,1365,1458,1553,1658,1749,1840,1928,2034,2142,2243,2348,2456,2557,2726,2823,2907" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-v21_values-v21.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-v23_values-v23.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v21\\values-v21.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,17,19,20,21,22,24,26,27,28,29,30,32,34,36,38,40,42,43,48,50,52,53,54,56,58,59,60,61,62,63,107,110,154,157,160,162,164,166,169,171,174,175,176,179,180,181,182,183,184,187,188,190,192,194,196,200,202,203,204,205,207,211,213,215,216,217,218,219,221,222,223,233,234,235,247", - "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", - "startOffsets": "55,146,249,352,457,564,673,782,891,1000,1109,1216,1319,1438,1593,1748,1853,1974,2075,2222,2363,2466,2585,2692,2795,2950,3121,3270,3435,3592,3743,3862,4234,4383,4532,4644,4791,4944,5091,5166,5255,5342,5443,5546,8614,8799,11879,12076,12275,12398,12521,12634,12817,12948,13149,13238,13349,13582,13683,13778,13901,14030,14147,14324,14423,14558,14701,14836,14955,15156,15275,15368,15479,15535,15642,15837,15948,16081,16176,16267,16358,16475,16614,16685,16768,17448,17505,17563,18257", - "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,16,18,19,20,21,23,25,26,27,28,29,31,33,35,37,39,41,42,47,49,51,52,53,55,57,58,59,60,61,62,106,109,153,156,159,161,163,165,168,170,173,174,175,178,179,180,181,182,183,186,187,189,191,193,195,199,201,202,203,204,206,210,212,214,215,216,217,218,220,221,222,232,233,234,246,258", - "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12", - "endOffsets": "141,244,347,452,559,668,777,886,995,1104,1211,1314,1433,1588,1743,1848,1969,2070,2217,2358,2461,2580,2687,2790,2945,3116,3265,3430,3587,3738,3857,4229,4378,4527,4639,4786,4939,5086,5161,5250,5337,5438,5541,8609,8794,11874,12071,12270,12393,12516,12629,12812,12943,13144,13233,13344,13577,13678,13773,13896,14025,14142,14319,14418,14553,14696,14831,14950,15151,15270,15363,15474,15530,15637,15832,15943,16076,16171,16262,16353,16470,16609,16680,16763,17443,17500,17558,18252,18958" - }, - "to": { - "startLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,19,21,23,24,25,26,28,30,31,32,33,34,36,38,40,42,44,46,47,52,54,56,57,58,60,62,63,64,65,66,67,111,114,158,161,164,166,168,170,173,175,178,179,180,183,184,185,186,187,188,191,192,194,196,198,200,204,206,207,208,209,211,215,217,219,220,221,222,223,225,226,227,237,238,239,251", - "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", - "startOffsets": "354,445,548,651,756,863,972,1081,1190,1299,1408,1515,1618,1737,1892,2047,2152,2273,2374,2521,2662,2765,2884,2991,3094,3249,3420,3569,3734,3891,4042,4161,4533,4682,4831,4943,5090,5243,5390,5465,5554,5641,5742,5845,8697,8882,11746,11943,12142,12265,12388,12501,12684,12815,13016,13105,13216,13449,13550,13645,13768,13897,14014,14191,14290,14425,14568,14703,14822,15023,15142,15235,15346,15402,15509,15704,15815,15948,16043,16134,16225,16342,16481,16552,16635,17258,17315,17373,17997", - "endLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,20,22,23,24,25,27,29,30,31,32,33,35,37,39,41,43,45,46,51,53,55,56,57,59,61,62,63,64,65,66,110,113,157,160,163,165,167,169,172,174,177,178,179,182,183,184,185,186,187,190,191,193,195,197,199,203,205,206,207,208,210,214,216,218,219,220,221,222,224,225,226,236,237,238,250,262", - "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12", - "endOffsets": "440,543,646,751,858,967,1076,1185,1294,1403,1510,1613,1732,1887,2042,2147,2268,2369,2516,2657,2760,2879,2986,3089,3244,3415,3564,3729,3886,4037,4156,4528,4677,4826,4938,5085,5238,5385,5460,5549,5636,5737,5840,8692,8877,11741,11938,12137,12260,12383,12496,12679,12810,13011,13100,13211,13444,13545,13640,13763,13892,14009,14186,14285,14420,14563,14698,14817,15018,15137,15230,15341,15397,15504,15699,15810,15943,16038,16129,16220,16337,16476,16547,16630,17253,17310,17368,17992,18628" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-v21\\values-v21.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v23\\values-v23.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,13", - "startColumns": "4,4,4,4,4,4,4,4,4,4", - "startOffsets": "55,159,223,290,354,470,596,722,850,1022", - "endLines": "2,3,4,5,6,7,8,9,12,17", - "endColumns": "103,63,66,63,115,125,125,127,12,12", - "endOffsets": "154,218,285,349,465,591,717,845,1017,1355" + "startLines": "2,3,4,5,6,19,32,33,34,35,36", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "55,190,325,400,487,1277,2079,2206,2311,2426,2533", + "endLines": "2,3,4,5,18,31,32,33,34,35,36", + "endColumns": "134,134,74,86,12,12,126,104,114,106,112", + "endOffsets": "185,320,395,482,1272,2074,2201,2306,2421,2528,2641" }, "to": { - "startLines": "2,3,4,5,263,264,265,266,267,270", - "startColumns": "4,4,4,4,4,4,4,4,4,4", - "startOffsets": "55,159,223,290,18633,18749,18875,19001,19129,19301", - "endLines": "2,3,4,5,263,264,265,266,269,274", - "endColumns": "103,63,66,63,115,125,125,127,12,12", - "endOffsets": "154,218,285,349,18744,18870,18996,19124,19296,19634" + "startLines": "2,3,4,5,6,19,32,33,34,35,36", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "55,190,325,400,487,1131,1787,1914,2019,2134,2241", + "endLines": "2,3,4,5,18,31,32,33,34,35,36", + "endColumns": "134,134,74,86,12,12,126,104,114,106,112", + "endOffsets": "185,320,395,482,1126,1782,1909,2014,2129,2236,2349" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-ms_values-ms.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-bg_values-bg.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ms\\values-ms.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-bg\\values-bg.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,216,321,429,516,620,731,809,888,979,1072,1167,1261,1360,1453,1548,1642,1733,1824,1904,2016,2125,2222,2331,2434,2541,2700,2801", - "endColumns": "110,104,107,86,103,110,77,78,90,92,94,93,98,92,94,93,90,90,79,111,108,96,108,102,106,158,100,79", - "endOffsets": "211,316,424,511,615,726,804,883,974,1067,1162,1256,1355,1448,1543,1637,1728,1819,1899,2011,2120,2217,2326,2429,2536,2695,2796,2876" + "startOffsets": "105,220,327,432,518,623,744,823,901,992,1085,1181,1275,1376,1469,1564,1672,1763,1854,1937,2051,2160,2260,2374,2480,2588,2748,2847", + "endColumns": "114,106,104,85,104,120,78,77,90,92,95,93,100,92,94,107,90,90,82,113,108,99,113,105,107,159,98,82", + "endOffsets": "215,322,427,513,618,739,818,896,987,1080,1176,1270,1371,1464,1559,1667,1758,1849,1932,2046,2155,2255,2369,2475,2583,2743,2842,2925" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ms\\values-ms.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-bg\\values-bg.xml", "from": { "startLines": "2", "startColumns": "4", @@ -641,129 +590,99 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2881", + "startOffsets": "2930", "endColumns": "100", - "endOffsets": "2977" + "endOffsets": "3026" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-kn_values-kn.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-v26_values-v26.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-kn\\values-kn.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,223,335,448,536,643,770,847,924,1015,1108,1204,1298,1399,1492,1587,1681,1772,1863,1945,2061,2172,2271,2384,2488,2602,2766,2866", - "endColumns": "117,111,112,87,106,126,76,76,90,92,95,93,100,92,94,93,90,90,81,115,110,98,112,103,113,163,99,81", - "endOffsets": "218,330,443,531,638,765,842,919,1010,1103,1199,1293,1394,1487,1582,1676,1767,1858,1940,2056,2167,2266,2379,2483,2597,2761,2861,2943" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-kn\\values-kn.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v26\\values-v26.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" + "startLines": "2,3,4,8,12,16", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "55,130,217,431,657,896", + "endLines": "2,3,7,11,15,16", + "endColumns": "74,86,12,12,12,92", + "endOffsets": "125,212,426,652,891,984" }, "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2948", - "endColumns": "100", - "endOffsets": "3044" + "startLines": "2,3,4,8,12,16", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "55,130,217,381,557,796", + "endLines": "2,3,7,11,15,16", + "endColumns": "74,86,12,12,12,92", + "endOffsets": "125,212,376,552,791,884" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-zh-rCN_values-zh-rCN.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-zh-rHK_values-zh-rHK.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "132", + "startLines": "2", "startColumns": "4", - "startOffsets": "8370", + "startOffsets": "55", "endColumns": "100", - "endOffsets": "8466" - } - }, - { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,129,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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", - "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,6807,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,47,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,6850,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "151" }, "to": { - "startLines": "6,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,130,131,133,134,135,136,137,138,139,140,141,142,143", - "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": "215,2945,3018,3084,3157,3207,3247,3295,3343,3388,3445,3499,3549,3590,3652,3720,3797,3856,3921,3984,4039,4099,4162,4216,4276,4329,4391,4476,4557,4607,4666,4709,4762,4805,4856,4906,4966,5019,5070,5116,5164,5212,5258,5307,5354,5404,5449,5508,5560,5612,5664,5707,5755,5800,5847,5903,5958,6013,6057,6099,6140,6190,6249,6292,6335,6386,6430,6479,6528,6575,6622,6669,6714,6765,6818,6893,6952,7009,7083,7147,7216,7294,7404,7508,7581,7647,7702,7767,7832,7881,7964,8042,8080,8125,8251,8313,8471,8526,8585,8652,8710,8772,8820,8865,8913,8964,9030", - "endLines": "8,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,130,131,133,134,135,136,137,138,139,140,141,142,143", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,40,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,48,46,49,44,58,51,51,51,42,47,44,46,55,54,54,43,41,40,49,58,42,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,3013,3079,3152,3202,3242,3290,3338,3383,3440,3494,3544,3585,3647,3715,3792,3851,3916,3979,4034,4094,4157,4211,4271,4324,4386,4471,4552,4602,4661,4704,4757,4800,4851,4901,4961,5014,5065,5111,5159,5207,5253,5302,5349,5399,5444,5503,5555,5607,5659,5702,5750,5795,5842,5898,5953,6008,6052,6094,6135,6185,6244,6287,6330,6381,6425,6474,6523,6570,6617,6664,6709,6760,6813,6888,6947,7004,7078,7142,7211,7289,7399,7503,7576,7642,7697,7762,7827,7876,7959,8037,8075,8120,8168,8308,8365,8521,8580,8647,8705,8767,8815,8860,8908,8959,9025,9091" + "startLines": "30", + "startColumns": "4", + "startOffsets": "2746", + "endColumns": "100", + "endOffsets": "2842" } }, { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,200,293,393,475,572,680,756,832,924,1018,1110,1206,1302,1396,1492,1584,1676,1768,1846,1942,2038,2133,2230,2325,2423,2574,2668", + "endColumns": "94,92,99,81,96,107,75,75,91,93,91,95,95,93,95,91,91,91,77,95,95,94,96,94,97,150,93,77", + "endOffsets": "195,288,388,470,567,675,751,827,919,1013,1105,1201,1297,1391,1487,1579,1671,1763,1841,1937,2033,2128,2225,2320,2418,2569,2663,2741" } - }, + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-sw600dp-v13_values-sw600dp-v13.arsc.flat", + "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sw600dp-v13\\values-sw600dp-v13.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", - "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", - "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" - }, - "to": { - "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,129", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "384,480,575,675,757,854,960,1036,1112,1203,1296,1394,1490,1585,1678,1773,1865,1956,2047,2125,2221,2317,2412,2509,2604,2702,2851,8173", - "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77", - "endOffsets": "475,570,670,752,849,955,1031,1107,1198,1291,1389,1485,1580,1673,1768,1860,1951,2042,2120,2216,2312,2407,2504,2599,2697,2846,2940,8246" + "startLines": "2,3,4,5,6,7,8,9", + "startColumns": "4,4,4,4,4,4,4,4", + "startOffsets": "55,124,193,263,337,413,472,543", + "endColumns": "68,68,69,73,75,58,70,67", + "endOffsets": "119,188,258,332,408,467,538,606" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-zu_values-zu.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-sk_values-sk.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zu\\values-zu.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sk\\values-sk.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,213,320,434,522,625,752,832,912,1003,1096,1190,1284,1385,1478,1573,1667,1758,1851,1937,2041,2147,2245,2352,2458,2564,2721,2817", - "endColumns": "107,106,113,87,102,126,79,79,90,92,93,93,100,92,94,93,90,92,85,103,105,97,106,105,105,156,95,80", - "endOffsets": "208,315,429,517,620,747,827,907,998,1091,1185,1279,1380,1473,1568,1662,1753,1846,1932,2036,2142,2240,2347,2453,2559,2716,2812,2893" + "startOffsets": "105,212,312,423,509,617,735,816,897,988,1081,1180,1274,1375,1468,1563,1661,1752,1843,1927,2032,2141,2240,2346,2457,2566,2732,2830", + "endColumns": "106,99,110,85,107,117,80,80,90,92,98,93,100,92,94,97,90,90,83,104,108,98,105,110,108,165,97,87", + "endOffsets": "207,307,418,504,612,730,811,892,983,1076,1175,1269,1370,1463,1558,1656,1747,1838,1922,2027,2136,2235,2341,2452,2561,2727,2825,2913" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zu\\values-zu.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sk\\values-sk.xml", "from": { "startLines": "2", "startColumns": "4", @@ -774,18 +693,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2898", + "startOffsets": "2918", "endColumns": "100", - "endOffsets": "2994" + "endOffsets": "3014" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-hr_values-hr.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-et_values-et.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-hr\\values-hr.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-et\\values-et.xml", "from": { "startLines": "2", "startColumns": "4", @@ -796,102 +715,59 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2926", + "startOffsets": "2942", "endColumns": "100", - "endOffsets": "3022" + "endOffsets": "3038" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-hr\\values-hr.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-et\\values-et.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,210,307,417,503,607,726,810,893,984,1077,1173,1267,1368,1461,1556,1655,1746,1837,1923,2027,2140,2246,2351,2464,2571,2740,2837", - "endColumns": "104,96,109,85,103,118,83,82,90,92,95,93,100,92,94,98,90,90,85,103,112,105,104,112,106,168,96,88", - "endOffsets": "205,302,412,498,602,721,805,888,979,1072,1168,1262,1363,1456,1551,1650,1741,1832,1918,2022,2135,2241,2346,2459,2566,2735,2832,2921" + "startOffsets": "105,222,329,440,526,628,745,825,903,995,1089,1194,1296,1406,1500,1601,1695,1787,1880,1963,2074,2179,2278,2388,2489,2592,2758,2860", + "endColumns": "116,106,110,85,101,116,79,77,91,93,104,101,109,93,100,93,91,92,82,110,104,98,109,100,102,165,101,81", + "endOffsets": "217,324,435,521,623,740,820,898,990,1084,1189,1291,1401,1495,1596,1690,1782,1875,1958,2069,2174,2273,2383,2484,2587,2753,2855,2937" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-et_values-et.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-watch-v20_values-watch-v20.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-et\\values-et.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v20\\values-watch-v20.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,222,329,440,526,628,745,825,903,995,1089,1194,1296,1406,1500,1601,1695,1787,1880,1963,2074,2179,2278,2388,2489,2592,2758,2860", - "endColumns": "116,106,110,85,101,116,79,77,91,93,104,101,109,93,100,93,91,92,82,110,104,98,109,100,102,165,101,81", - "endOffsets": "217,324,435,521,623,740,820,898,990,1084,1189,1291,1401,1495,1596,1690,1782,1875,1958,2069,2174,2273,2383,2484,2587,2753,2855,2937" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-et\\values-et.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2942", - "endColumns": "100", - "endOffsets": "3038" + "startLines": "2,5,8", + "startColumns": "4,4,4", + "startOffsets": "55,214,385", + "endLines": "4,7,10", + "endColumns": "12,12,12", + "endOffsets": "209,380,553" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-en-rIN_values-en-rIN.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-port_values-port.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", - "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", - "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-port\\values-port.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2846", - "endColumns": "100", - "endOffsets": "2942" + "endColumns": "55", + "endOffsets": "106" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-as_values-as.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-as_values-as.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-as\\values-as.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,213,312,419,515,617,736,816,896,987,1080,1173,1268,1368,1461,1558,1652,1743,1834,1923,2025,2140,2243,2352,2471,2591,2758,2861", - "endColumns": "107,98,106,95,101,118,79,79,90,92,92,94,99,92,96,93,90,90,88,101,114,102,108,118,119,166,102,88", - "endOffsets": "208,307,414,510,612,731,811,891,982,1075,1168,1263,1363,1456,1553,1647,1738,1829,1918,2020,2135,2238,2347,2466,2586,2753,2856,2945" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-as\\values-as.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-as\\values-as.xml", "from": { "startLines": "2", "startColumns": "4", @@ -906,14 +782,24 @@ "endColumns": "100", "endOffsets": "3046" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-as\\values-as.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,213,312,419,515,617,736,816,896,987,1080,1173,1268,1368,1461,1558,1652,1743,1834,1923,2025,2140,2243,2352,2471,2591,2758,2861", + "endColumns": "107,98,106,95,101,118,79,79,90,92,92,94,99,92,96,93,90,90,88,101,114,102,108,118,119,166,102,88", + "endOffsets": "208,307,414,510,612,731,811,891,982,1075,1168,1263,1363,1456,1553,1647,1738,1829,1918,2020,2135,2238,2347,2466,2586,2753,2856,2945" + } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-mn_values-mn.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-mn_values-mn.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-mn\\values-mn.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-mn\\values-mn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -930,7 +816,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-mn\\values-mn.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-mn\\values-mn.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", @@ -942,25 +828,29 @@ ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-xlarge-v4_values-xlarge-v4.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml", + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { - "startLines": "2,3,4,5,6,7", - "startColumns": "4,4,4,4,4,4", - "startOffsets": "55,126,197,267,337,405", - "endColumns": "70,70,69,69,67,67", - "endOffsets": "121,192,262,332,400,468" + "startLines": "16", + "startColumns": "4", + "startOffsets": "336", + "endLines": "19", + "endColumns": "19", + "endOffsets": "441" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" } - } - ] - }, - { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-in_values-in.arsc.flat", - "map": [ + }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-in\\values-in.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", "from": { "startLines": "2", "startColumns": "4", @@ -969,30 +859,56 @@ "endOffsets": "151" }, "to": { - "startLines": "30", + "startLines": "132", "startColumns": "4", - "startOffsets": "2887", + "startOffsets": "8370", "endColumns": "100", - "endOffsets": "2983" + "endOffsets": "8466" + } + }, + { + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "131,71,70,69,68,19,20,21,112,113,120,119,125,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,128,54,55,45,66,56,123,64,43,129,122,48,47,46,62,42,61,40,41,65,127,126,28,134,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6856,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,6631,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,6758,2564,2611,2122,3188,2661,6578,3077,2036,6807,6533,2278,2222,2167,2979,1992,2937,1901,1942,3129,6715,6672,1318,7033,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "endLines": "133,71,70,69,68,19,20,21,112,113,120,119,125,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,128,54,55,45,66,56,123,64,43,129,122,48,47,46,62,42,61,40,41,65,127,126,28,134,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,40,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,48,46,49,44,58,51,51,51,42,47,44,46,55,54,54,43,41,40,49,58,42,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": "7028,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,6667,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,6802,2606,2656,2162,3242,2708,6625,3124,2074,6850,6573,2320,2273,2217,3029,2031,2974,1937,1987,3183,6753,6710,1364,7072,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + }, + "to": { + "startLines": "6,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,130,131,133,134,135,136,137,138,139,140,141,142,143", + "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": "215,2945,3018,3084,3157,3207,3247,3295,3343,3388,3445,3499,3549,3590,3652,3720,3797,3856,3921,3984,4039,4099,4162,4216,4276,4329,4391,4476,4557,4607,4666,4709,4762,4805,4856,4906,4966,5019,5070,5116,5164,5212,5258,5307,5354,5404,5449,5508,5560,5612,5664,5707,5755,5800,5847,5903,5958,6013,6057,6099,6140,6190,6249,6292,6335,6386,6430,6479,6528,6575,6622,6669,6714,6765,6818,6893,6952,7009,7083,7147,7216,7294,7404,7508,7581,7647,7702,7767,7832,7881,7964,8042,8080,8125,8251,8313,8471,8526,8585,8652,8710,8772,8820,8865,8913,8964,9030", + "endLines": "8,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,130,131,133,134,135,136,137,138,139,140,141,142,143", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,40,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,48,46,49,44,58,51,51,51,42,47,44,46,55,54,54,43,41,40,49,58,42,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,3013,3079,3152,3202,3242,3290,3338,3383,3440,3494,3544,3585,3647,3715,3792,3851,3916,3979,4034,4094,4157,4211,4271,4324,4386,4471,4552,4602,4661,4704,4757,4800,4851,4901,4961,5014,5065,5111,5159,5207,5253,5302,5349,5399,5444,5503,5555,5607,5659,5702,5750,5795,5842,5898,5953,6008,6052,6094,6135,6185,6244,6287,6330,6381,6425,6474,6523,6570,6617,6664,6709,6760,6813,6888,6947,7004,7078,7142,7211,7289,7399,7503,7576,7642,7697,7762,7827,7876,7959,8037,8075,8120,8168,8308,8365,8521,8580,8647,8705,8767,8815,8860,8908,8959,9025,9091" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-in\\values-in.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,215,317,422,509,613,729,811,890,981,1074,1170,1264,1365,1458,1553,1647,1738,1829,1915,2018,2127,2228,2332,2440,2548,2704,2803", - "endColumns": "109,101,104,86,103,115,81,78,90,92,95,93,100,92,94,93,90,90,85,102,108,100,103,107,107,155,98,83", - "endOffsets": "210,312,417,504,608,724,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1824,1910,2013,2122,2223,2327,2435,2543,2699,2798,2882" + "startOffsets": "105,201,296,396,478,575,681,757,833,924,1017,1115,1211,1306,1399,1494,1586,1677,1768,1846,1942,2038,2133,2230,2325,2423,2572,2666", + "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77", + "endOffsets": "196,291,391,473,570,676,752,828,919,1012,1110,1206,1301,1394,1489,1581,1672,1763,1841,1937,2033,2128,2225,2320,2418,2567,2661,2739" + }, + "to": { + "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,129", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "384,480,575,675,757,854,960,1036,1112,1203,1296,1394,1490,1585,1678,1773,1865,1956,2047,2125,2221,2317,2412,2509,2604,2702,2851,8173", + "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77", + "endOffsets": "475,570,670,752,849,955,1031,1107,1198,1291,1389,1485,1580,1673,1768,1860,1951,2042,2120,2216,2312,2407,2504,2599,2697,2846,2940,8246" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-iw_values-iw.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ro_values-ro.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-iw\\values-iw.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ro\\values-ro.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1003,58 +919,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2832", + "startOffsets": "2953", "endColumns": "100", - "endOffsets": "2928" + "endOffsets": "3049" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-iw\\values-iw.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ro\\values-ro.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,209,308,416,500,600,714,792,870,961,1055,1151,1245,1346,1439,1534,1631,1722,1814,1895,1997,2101,2199,2302,2403,2503,2655,2751", - "endColumns": "103,98,107,83,99,113,77,77,90,93,95,93,100,92,94,96,90,91,80,101,103,97,102,100,99,151,95,80", - "endOffsets": "204,303,411,495,595,709,787,865,956,1050,1146,1240,1341,1434,1529,1626,1717,1809,1890,1992,2096,2194,2297,2398,2498,2650,2746,2827" - } - } - ] - }, - { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-sw600dp-v13_values-sw600dp-v13.arsc.flat", - "map": [ - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9", - "startColumns": "4,4,4,4,4,4,4,4", - "startOffsets": "55,124,193,263,337,413,472,543", - "endColumns": "68,68,69,73,75,58,70,67", - "endOffsets": "119,188,258,332,408,467,538,606" - } - } - ] - }, - { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-land_values-land.arsc.flat", - "map": [ - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-land\\values-land.xml", - "from": { - "startLines": "2,3,4", - "startColumns": "4,4,4", - "startOffsets": "55,125,196", - "endColumns": "69,70,67", - "endOffsets": "120,191,259" + "startOffsets": "105,226,330,443,531,643,764,849,930,1021,1114,1210,1304,1404,1497,1592,1687,1778,1870,1953,2065,2178,2278,2392,2497,2603,2767,2870", + "endColumns": "120,103,112,87,111,120,84,80,90,92,95,93,99,92,94,94,90,91,82,111,112,99,113,104,105,163,102,82", + "endOffsets": "221,325,438,526,638,759,844,925,1016,1109,1205,1299,1399,1492,1587,1682,1773,1865,1948,2060,2173,2273,2387,2492,2598,2762,2865,2948" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-b+sr+Latn_values-b+sr+Latn.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ta_values-ta.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ta\\values-ta.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1065,38 +951,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2912", + "startOffsets": "2954", "endColumns": "100", - "endOffsets": "3008" + "endOffsets": "3050" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ta\\values-ta.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,214,318,424,510,614,732,814,895,986,1079,1175,1269,1370,1463,1558,1663,1754,1845,1933,2039,2147,2248,2353,2461,2562,2731,2828", - "endColumns": "108,103,105,85,103,117,81,80,90,92,95,93,100,92,94,104,90,90,87,105,107,100,104,107,100,168,96,83", - "endOffsets": "209,313,419,505,609,727,809,890,981,1074,1170,1264,1365,1458,1553,1658,1749,1840,1928,2034,2142,2243,2348,2456,2557,2726,2823,2907" + "startOffsets": "105,219,317,432,521,628,754,832,909,1009,1114,1210,1305,1412,1514,1618,1713,1815,1913,1995,2097,2201,2298,2408,2510,2617,2774,2874", + "endColumns": "113,97,114,88,106,125,77,76,99,104,95,94,106,101,103,94,101,97,81,101,103,96,109,101,106,156,99,79", + "endOffsets": "214,312,427,516,623,749,827,904,1004,1109,1205,1300,1407,1509,1613,1708,1810,1908,1990,2092,2196,2293,2403,2505,2612,2769,2869,2949" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-cs_values-cs.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ms_values-ms.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-cs\\values-cs.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ms\\values-ms.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,212,314,423,509,614,731,812,893,984,1077,1173,1267,1362,1455,1550,1647,1738,1829,1913,2017,2126,2225,2331,2441,2548,2711,2809", - "endColumns": "106,101,108,85,104,116,80,80,90,92,95,93,94,92,94,96,90,90,83,103,108,98,105,109,106,162,97,81", - "endOffsets": "207,309,418,504,609,726,807,888,979,1072,1168,1262,1357,1450,1545,1642,1733,1824,1908,2012,2121,2220,2326,2436,2543,2706,2804,2886" + "startOffsets": "105,216,321,429,516,620,731,809,888,979,1072,1167,1261,1360,1453,1548,1642,1733,1824,1904,2016,2125,2222,2331,2434,2541,2700,2801", + "endColumns": "110,104,107,86,103,110,77,78,90,92,94,93,98,92,94,93,90,90,79,111,108,96,108,102,106,158,100,79", + "endOffsets": "211,316,424,511,615,726,804,883,974,1067,1162,1256,1355,1448,1543,1637,1728,1819,1899,2011,2120,2217,2326,2429,2536,2695,2796,2876" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-cs\\values-cs.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ms\\values-ms.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1107,58 +993,50 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2891", + "startOffsets": "2881", "endColumns": "100", - "endOffsets": "2987" + "endOffsets": "2977" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-watch-v21_values-watch-v21.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ne_values-ne.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v21\\values-watch-v21.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ne\\values-ne.xml", "from": { - "startLines": "2,6,10", - "startColumns": "4,4,4", - "startOffsets": "55,271,499", - "endLines": "5,9,13", - "endColumns": "12,12,12", - "endOffsets": "266,494,724" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,210,314,422,513,620,747,841,931,1022,1115,1211,1305,1406,1499,1594,1688,1779,1870,1958,2068,2184,2287,2402,2504,2619,2790,2902", + "endColumns": "104,103,107,90,106,126,93,89,90,92,95,93,100,92,94,93,90,90,87,109,115,102,114,101,114,170,111,85", + "endOffsets": "205,309,417,508,615,742,836,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1953,2063,2179,2282,2397,2499,2614,2785,2897,2983" } - } - ] - }, - { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-v23_values-v23.arsc.flat", - "map": [ + }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v23\\values-v23.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ne\\values-ne.xml", "from": { - "startLines": "2,3,4,5,6,19,32,33,34,35,36", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "55,190,325,400,487,1277,2079,2206,2311,2426,2533", - "endLines": "2,3,4,5,18,31,32,33,34,35,36", - "endColumns": "134,134,74,86,12,12,126,104,114,106,112", - "endOffsets": "185,320,395,482,1272,2074,2201,2306,2421,2528,2641" + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" }, "to": { - "startLines": "2,3,4,5,6,19,32,33,34,35,36", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "55,190,325,400,487,1131,1787,1914,2019,2134,2241", - "endLines": "2,3,4,5,18,31,32,33,34,35,36", - "endColumns": "134,134,74,86,12,12,126,104,114,106,112", - "endOffsets": "185,320,395,482,1126,1782,1909,2014,2129,2236,2349" + "startLines": "30", + "startColumns": "4", + "startOffsets": "2988", + "endColumns": "100", + "endOffsets": "3084" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-te_values-te.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-kn_values-kn.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-te\\values-te.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-kn\\values-kn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1169,69 +1047,43 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2946", + "startOffsets": "2948", "endColumns": "100", - "endOffsets": "3042" + "endOffsets": "3044" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-te\\values-te.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-kn\\values-kn.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,219,328,439,529,634,759,841,923,1014,1107,1203,1297,1398,1491,1586,1681,1772,1863,1947,2060,2168,2267,2378,2480,2597,2763,2864", - "endColumns": "113,108,110,89,104,124,81,81,90,92,95,93,100,92,94,94,90,90,83,112,107,98,110,101,116,165,100,81", - "endOffsets": "214,323,434,524,629,754,836,918,1009,1102,1198,1292,1393,1486,1581,1676,1767,1858,1942,2055,2163,2262,2373,2475,2592,2758,2859,2941" + "startOffsets": "105,223,335,448,536,643,770,847,924,1015,1108,1204,1298,1399,1492,1587,1681,1772,1863,1945,2061,2172,2271,2384,2488,2602,2766,2866", + "endColumns": "117,111,112,87,106,126,76,76,90,92,95,93,100,92,94,93,90,90,81,115,110,98,112,103,113,163,99,81", + "endOffsets": "218,330,443,531,638,765,842,919,1010,1103,1199,1293,1394,1487,1582,1676,1767,1858,1940,2056,2167,2266,2379,2483,2597,2761,2861,2943" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-port_values-port.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-v18_values-v18.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-port\\values-port.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v18\\values-v18.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endColumns": "55", - "endOffsets": "106" - } - } - ] - }, - { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-v25_values-v25.arsc.flat", - "map": [ - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v25\\values-v25.xml", - "from": { - "startLines": "2,3,4,6", - "startColumns": "4,4,4,4", - "startOffsets": "55,126,209,308", - "endLines": "2,3,5,7", - "endColumns": "70,82,12,12", - "endOffsets": "121,204,303,414" + "endColumns": "48", + "endOffsets": "99" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-es-rUS_values-es-rUS.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-fr-rCA_values-fr-rCA.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,225,334,442,527,628,751,836,918,1009,1102,1198,1292,1392,1485,1584,1680,1771,1862,1944,2056,2156,2257,2365,2472,2579,2738,2838", - "endColumns": "119,108,107,84,100,122,84,81,90,92,95,93,99,92,98,95,90,90,81,111,99,100,107,106,106,158,99,81", - "endOffsets": "220,329,437,522,623,746,831,913,1004,1097,1193,1287,1387,1480,1579,1675,1766,1857,1939,2051,2151,2252,2360,2467,2574,2733,2833,2915" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1242,18 +1094,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2920", + "startOffsets": "2965", "endColumns": "100", - "endOffsets": "3016" + "endOffsets": "3061" } - } - ] - }, + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,216,331,442,529,645,775,858,938,1029,1122,1221,1316,1417,1510,1603,1698,1789,1880,1976,2086,2198,2301,2412,2519,2621,2780,2879", + "endColumns": "110,114,110,86,115,129,82,79,90,92,98,94,100,92,92,94,90,90,95,109,111,102,110,106,101,158,98,85", + "endOffsets": "211,326,437,524,640,770,853,933,1024,1117,1216,1311,1412,1505,1598,1693,1784,1875,1971,2081,2193,2296,2407,2514,2616,2775,2874,2960" + } + } + ] + }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-sl_values-sl.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-pt_values-pt.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sl\\values-sl.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-pt\\values-pt.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,225,331,438,527,628,746,829,909,1000,1093,1189,1283,1384,1477,1572,1667,1758,1849,1936,2043,2155,2257,2365,2472,2582,2744,2844", + "endColumns": "119,105,106,88,100,117,82,79,90,92,95,93,100,92,94,94,90,90,86,106,111,101,107,106,109,161,99,84", + "endOffsets": "220,326,433,522,623,741,824,904,995,1088,1184,1278,1379,1472,1567,1662,1753,1844,1931,2038,2150,2252,2360,2467,2577,2739,2839,2924" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-pt\\values-pt.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1264,70 +1136,82 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2936", + "startOffsets": "2929", "endColumns": "100", - "endOffsets": "3032" + "endOffsets": "3025" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-hi_values-hi.arsc.flat", + "map": [ + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-hi\\values-hi.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "30", + "startColumns": "4", + "startOffsets": "2892", + "endColumns": "100", + "endOffsets": "2988" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sl\\values-sl.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-hi\\values-hi.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,212,319,427,514,617,736,821,905,997,1091,1187,1281,1377,1471,1567,1667,1759,1851,1935,2043,2152,2252,2365,2472,2576,2756,2853", - "endColumns": "106,106,107,86,102,118,84,83,91,93,95,93,95,93,95,99,91,91,83,107,108,99,112,106,103,179,96,82", - "endOffsets": "207,314,422,509,612,731,816,900,992,1086,1182,1276,1372,1466,1562,1662,1754,1846,1930,2038,2147,2247,2360,2467,2571,2751,2848,2931" + "startOffsets": "105,211,308,418,504,606,728,805,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1912,2021,2124,2226,2336,2437,2549,2711,2812", + "endColumns": "105,96,109,85,101,121,76,77,90,92,95,93,100,92,94,93,90,90,89,108,102,101,109,100,111,161,100,79", + "endOffsets": "206,303,413,499,601,723,800,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1907,2016,2119,2221,2331,2432,2544,2706,2807,2887" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-en-rXC_values-en-rXC.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ca_values-ca.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,310,510,719,904,1106,1321,1494,1671,1862,2055,2253,2449,2652,2847,3044,3239,3432,3623,3807,4011,4216,4417,4624,4826,5031,5303,5503", - "endColumns": "204,199,208,184,201,214,172,176,190,192,197,195,202,194,196,194,192,190,183,203,204,200,206,201,204,271,199,178", - "endOffsets": "305,505,714,899,1101,1316,1489,1666,1857,2050,2248,2444,2647,2842,3039,3234,3427,3618,3802,4006,4211,4412,4619,4821,5026,5298,5498,5677" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ca\\values-ca.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endColumns": "202", - "endOffsets": "253" + "endColumns": "100", + "endOffsets": "151" }, "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "5682", - "endColumns": "202", - "endOffsets": "5880" + "startOffsets": "2915", + "endColumns": "100", + "endOffsets": "3011" } - } - ] - }, - { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-ka_values-ka.arsc.flat", - "map": [ + }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ka\\values-ka.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ca\\values-ca.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,214,318,429,517,622,735,819,901,992,1085,1180,1276,1377,1470,1565,1659,1750,1841,1924,2037,2144,2242,2355,2459,2563,2720,2818", - "endColumns": "108,103,110,87,104,112,83,81,90,92,94,95,100,92,94,93,90,90,82,112,106,97,112,103,103,156,97,80", - "endOffsets": "209,313,424,512,617,730,814,896,987,1080,1175,1271,1372,1465,1560,1654,1745,1836,1919,2032,2139,2237,2350,2454,2558,2715,2813,2894" + "startOffsets": "105,223,329,436,519,627,753,837,918,1009,1102,1196,1291,1390,1483,1576,1670,1761,1852,1935,2046,2155,2253,2363,2467,2575,2735,2834", + "endColumns": "117,105,106,82,107,125,83,80,90,92,93,94,98,92,92,93,90,90,82,110,108,97,109,103,107,159,98,80", + "endOffsets": "218,324,431,514,622,748,832,913,1004,1097,1191,1286,1385,1478,1571,1665,1756,1847,1930,2041,2150,2248,2358,2462,2570,2730,2829,2910" } - }, + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-bn_values-bn.arsc.flat", + "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ka\\values-ka.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-bn\\values-bn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1338,18 +1222,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2899", + "startOffsets": "2939", "endColumns": "100", - "endOffsets": "2995" + "endOffsets": "3035" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-bn\\values-bn.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,214,326,432,526,631,760,838,916,1007,1100,1195,1289,1390,1483,1578,1672,1763,1854,1941,2051,2159,2258,2368,2474,2587,2752,2857", + "endColumns": "108,111,105,93,104,128,77,77,90,92,94,93,100,92,94,93,90,90,86,109,107,98,109,105,112,164,104,81", + "endOffsets": "209,321,427,521,626,755,833,911,1002,1095,1190,1284,1385,1478,1573,1667,1758,1849,1936,2046,2154,2253,2363,2469,2582,2747,2852,2934" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-mk_values-mk.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-sw_values-sw.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-mk\\values-mk.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sw\\values-sw.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1360,38 +1254,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2945", + "startOffsets": "2883", "endColumns": "100", - "endOffsets": "3041" + "endOffsets": "2979" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-mk\\values-mk.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sw\\values-sw.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,213,317,425,511,616,735,818,900,997,1096,1193,1293,1400,1499,1600,1696,1793,1884,1971,2077,2184,2285,2392,2503,2607,2763,2861", - "endColumns": "107,103,107,85,104,118,82,81,96,98,96,99,106,98,100,95,96,90,86,105,106,100,106,110,103,155,97,83", - "endOffsets": "208,312,420,506,611,730,813,895,992,1091,1188,1288,1395,1494,1595,1691,1788,1879,1966,2072,2179,2280,2387,2498,2602,2758,2856,2940" + "startOffsets": "105,208,306,414,504,609,726,808,891,982,1075,1169,1263,1364,1457,1552,1647,1738,1830,1912,2013,2122,2221,2328,2437,2542,2704,2801", + "endColumns": "102,97,107,89,104,116,81,82,90,92,93,93,100,92,94,94,90,91,81,100,108,98,106,108,104,161,96,81", + "endOffsets": "203,301,409,499,604,721,803,886,977,1070,1164,1258,1359,1452,1547,1642,1733,1825,1907,2008,2117,2216,2323,2432,2537,2699,2796,2878" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-hu_values-hu.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-hy_values-hy.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-hu\\values-hu.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-hy\\values-hy.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,213,318,433,517,629,759,835,911,1002,1095,1191,1285,1386,1479,1574,1669,1760,1851,1934,2044,2155,2255,2366,2474,2593,2775,2878", - "endColumns": "107,104,114,83,111,129,75,75,90,92,95,93,100,92,94,94,90,90,82,109,110,99,110,107,118,181,102,82", - "endOffsets": "208,313,428,512,624,754,830,906,997,1090,1186,1280,1381,1474,1569,1664,1755,1846,1929,2039,2150,2250,2361,2469,2588,2770,2873,2956" + "startOffsets": "105,208,309,419,508,614,729,811,892,983,1076,1172,1266,1367,1460,1555,1649,1740,1831,1916,2023,2130,2229,2339,2446,2546,2703,2802", + "endColumns": "102,100,109,88,105,114,81,80,90,92,95,93,100,92,94,93,90,90,84,106,106,98,109,106,99,156,98,81", + "endOffsets": "203,304,414,503,609,724,806,887,978,1071,1167,1261,1362,1455,1550,1644,1735,1826,1911,2018,2125,2224,2334,2441,2541,2698,2797,2879" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-hu\\values-hu.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-hy\\values-hy.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1402,18 +1296,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2961", + "startOffsets": "2884", "endColumns": "100", - "endOffsets": "3057" + "endOffsets": "2980" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-lv_values-lv.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-fi_values-fi.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-lv\\values-lv.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-fi\\values-fi.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1424,28 +1318,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "3076", + "startOffsets": "2872", "endColumns": "100", - "endOffsets": "3172" + "endOffsets": "2968" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-lv\\values-lv.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-fi\\values-fi.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,225,333,442,528,632,754,836,918,1028,1136,1243,1352,1464,1567,1679,1786,1891,1991,2076,2185,2297,2396,2507,2616,2721,2895,2994", - "endColumns": "119,107,108,85,103,121,81,81,109,107,106,108,111,102,111,106,104,99,84,108,111,98,110,108,104,173,98,81", - "endOffsets": "220,328,437,523,627,749,831,913,1023,1131,1238,1347,1459,1562,1674,1781,1886,1986,2071,2180,2292,2391,2502,2611,2716,2890,2989,3071" + "startOffsets": "105,213,313,414,500,605,723,810,892,983,1076,1172,1266,1361,1454,1550,1649,1740,1834,1914,2021,2124,2221,2327,2426,2530,2693,2792", + "endColumns": "107,99,100,85,104,117,86,81,90,92,95,93,94,92,95,98,90,93,79,106,102,96,105,98,103,162,98,79", + "endOffsets": "208,308,409,495,600,718,805,887,978,1071,1167,1261,1356,1449,1545,1644,1735,1829,1909,2016,2119,2216,2322,2421,2525,2688,2787,2867" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-ko_values-ko.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-en-rAU_values-en-rAU.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ko\\values-ko.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1456,92 +1350,77 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2756", + "startOffsets": "2846", "endColumns": "100", - "endOffsets": "2852" + "endOffsets": "2942" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ko\\values-ko.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,200,294,396,478,576,682,761,837,928,1021,1113,1204,1305,1398,1493,1587,1678,1769,1849,1947,2042,2137,2237,2333,2432,2584,2678", - "endColumns": "94,93,101,81,97,105,78,75,90,92,91,90,100,92,94,93,90,90,79,97,94,94,99,95,98,151,93,77", - "endOffsets": "195,289,391,473,571,677,756,832,923,1016,1108,1199,1300,1393,1488,1582,1673,1764,1844,1942,2037,2132,2232,2328,2427,2579,2673,2751" + "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", + "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", + "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-zh-rHK_values-zh-rHK.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-night-v8_values-night-v8.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-night-v8\\values-night-v8.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,200,293,393,475,572,680,756,832,924,1018,1110,1206,1302,1396,1492,1584,1676,1768,1846,1942,2038,2133,2230,2325,2423,2574,2668", - "endColumns": "94,92,99,81,96,107,75,75,91,93,91,95,95,93,95,91,91,91,77,95,95,94,96,94,97,150,93,77", - "endOffsets": "195,288,388,470,567,675,751,827,919,1013,1105,1201,1297,1391,1487,1579,1671,1763,1841,1937,2033,2128,2225,2320,2418,2569,2663,2741" + "startLines": "2,3,4,5,6,7,8", + "startColumns": "4,4,4,4,4,4,4", + "startOffsets": "55,125,209,293,389,491,593", + "endColumns": "69,83,83,95,101,101,93", + "endOffsets": "120,204,288,384,486,588,682" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml", + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-night\\themes.xml", "from": { - "startLines": "2", + "startLines": "1", "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" + "startOffsets": "16", + "endLines": "4", + "endColumns": "12", + "endOffsets": "239" }, "to": { - "startLines": "30", + "startLines": "9", "startColumns": "4", - "startOffsets": "2746", - "endColumns": "100", - "endOffsets": "2842" + "startOffsets": "687", + "endLines": "12", + "endColumns": "12", + "endOffsets": "910" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-is_values-is.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-land_values-land.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-is\\values-is.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,205,302,414,499,600,714,794,874,965,1058,1154,1248,1355,1448,1543,1638,1729,1823,1904,2014,2122,2220,2329,2428,2531,2686,2784", - "endColumns": "99,96,111,84,100,113,79,79,90,92,95,93,106,92,94,94,90,93,80,109,107,97,108,98,102,154,97,80", - "endOffsets": "200,297,409,494,595,709,789,869,960,1053,1149,1243,1350,1443,1538,1633,1724,1818,1899,2009,2117,2215,2324,2423,2526,2681,2779,2860" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-is\\values-is.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-land\\values-land.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2865", - "endColumns": "100", - "endOffsets": "2961" + "startLines": "2,3,4", + "startColumns": "4,4,4", + "startOffsets": "55,125,196", + "endColumns": "69,70,67", + "endOffsets": "120,191,259" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-ar_values-ar.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-bs_values-bs.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ar\\values-ar.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-bs\\values-bs.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1552,28 +1431,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2860", + "startOffsets": "2926", "endColumns": "100", - "endOffsets": "2956" + "endOffsets": "3022" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ar\\values-ar.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-bs\\values-bs.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,222,326,435,517,618,732,811,890,981,1074,1170,1264,1365,1458,1553,1647,1738,1832,1911,2016,2117,2213,2321,2424,2527,2682,2779", - "endColumns": "116,103,108,81,100,113,78,78,90,92,95,93,100,92,94,93,90,93,78,104,100,95,107,102,102,154,96,80", - "endOffsets": "217,321,430,512,613,727,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1827,1906,2011,2112,2208,2316,2419,2522,2677,2774,2855" + "startOffsets": "105,224,333,440,526,630,752,834,915,1006,1099,1195,1289,1390,1483,1578,1677,1768,1859,1945,2048,2153,2251,2356,2469,2572,2745,2842", + "endColumns": "118,108,106,85,103,121,81,80,90,92,95,93,100,92,94,98,90,90,85,102,104,97,104,112,102,172,96,83", + "endOffsets": "219,328,435,521,625,747,829,910,1001,1094,1190,1284,1385,1478,1573,1672,1763,1854,1940,2043,2148,2246,2351,2464,2567,2740,2837,2921" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-uz_values-uz.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-lo_values-lo.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-uz\\values-uz.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-lo\\values-lo.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,208,305,412,497,602,714,791,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1888,1995,2092,2190,2295,2398,2502,2659,2755", + "endColumns": "102,96,106,84,104,111,76,77,90,92,95,93,100,92,94,93,90,90,79,106,96,97,104,102,103,156,95,80", + "endOffsets": "203,300,407,492,597,709,786,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1883,1990,2087,2185,2290,2393,2497,2654,2750,2831" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-lo\\values-lo.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1584,44 +1473,33 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2889", + "startOffsets": "2836", "endColumns": "100", - "endOffsets": "2985" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-uz\\values-uz.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,210,314,428,514,614,730,810,889,980,1073,1169,1263,1358,1451,1546,1641,1732,1824,1908,2017,2124,2225,2333,2438,2545,2706,2805", - "endColumns": "104,103,113,85,99,115,79,78,90,92,95,93,94,92,94,94,90,91,83,108,106,100,107,104,106,160,98,83", - "endOffsets": "205,309,423,509,609,725,805,884,975,1068,1164,1258,1353,1446,1541,1636,1727,1819,1903,2012,2119,2220,2328,2433,2540,2701,2800,2884" + "endOffsets": "2932" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-watch-v20_values-watch-v20.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ldltr-v21_values-ldltr-v21.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v20\\values-watch-v20.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ldltr-v21\\values-ldltr-v21.xml", "from": { - "startLines": "2,5,8", - "startColumns": "4,4,4", - "startOffsets": "55,214,385", - "endLines": "4,7,10", - "endColumns": "12,12,12", - "endOffsets": "209,380,553" + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "112", + "endOffsets": "163" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-am_values-am.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ja_values-ja.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-am\\values-am.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ja\\values-ja.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1632,28 +1510,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2817", + "startOffsets": "2771", "endColumns": "100", - "endOffsets": "2913" + "endOffsets": "2867" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-am\\values-am.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ja\\values-ja.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,207,306,412,498,601,714,792,870,961,1054,1147,1241,1342,1435,1530,1624,1715,1805,1884,1984,2084,2180,2283,2382,2489,2642,2738", - "endColumns": "101,98,105,85,102,112,77,77,90,92,92,93,100,92,94,93,90,89,78,99,99,95,102,98,106,152,95,78", - "endOffsets": "202,301,407,493,596,709,787,865,956,1049,1142,1236,1337,1430,1525,1619,1710,1800,1879,1979,2079,2175,2278,2377,2484,2637,2733,2812" + "startOffsets": "105,202,295,400,482,580,688,765,841,932,1025,1121,1215,1316,1409,1504,1598,1689,1780,1858,1960,2059,2154,2257,2352,2448,2596,2693", + "endColumns": "96,92,104,81,97,107,76,75,90,92,95,93,100,92,94,93,90,90,77,101,98,94,102,94,95,147,96,77", + "endOffsets": "197,290,395,477,575,683,760,836,927,1020,1116,1210,1311,1404,1499,1593,1684,1775,1853,1955,2054,2149,2252,2347,2443,2591,2688,2766" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-fr-rCA_values-fr-rCA.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ru_values-ru.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ru\\values-ru.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1664,78 +1542,70 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2965", + "startOffsets": "2913", "endColumns": "100", - "endOffsets": "3061" + "endOffsets": "3009" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ru\\values-ru.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,216,331,442,529,645,775,858,938,1029,1122,1221,1316,1417,1510,1603,1698,1789,1880,1976,2086,2198,2301,2412,2519,2621,2780,2879", - "endColumns": "110,114,110,86,115,129,82,79,90,92,98,94,100,92,92,94,90,90,95,109,111,102,110,106,101,158,98,85", - "endOffsets": "211,326,437,524,640,770,853,933,1024,1117,1216,1311,1412,1505,1598,1693,1784,1875,1971,2081,2193,2296,2407,2514,2616,2775,2874,2960" - } + "startOffsets": "105,220,322,434,520,625,745,824,902,994,1088,1184,1277,1373,1467,1563,1658,1750,1842,1922,2028,2136,2234,2343,2449,2557,2732,2832", + "endColumns": "114,101,111,85,104,119,78,77,91,93,95,92,95,93,95,94,91,91,79,105,107,97,108,105,107,174,99,80", + "endOffsets": "215,317,429,515,620,740,819,897,989,1083,1179,1272,1368,1462,1558,1653,1745,1837,1917,2023,2131,2229,2338,2444,2552,2727,2827,2908" + } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-night-v8_values-night-v8.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-si_values-si.arsc.flat", "map": [ { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-night\\themes.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-si\\values-si.xml", "from": { - "startLines": "1", - "startColumns": "4", - "startOffsets": "16", - "endLines": "4", - "endColumns": "12", - "endOffsets": "239" - }, - "to": { - "startLines": "9", - "startColumns": "4", - "startOffsets": "687", - "endLines": "12", - "endColumns": "12", - "endOffsets": "910" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,215,322,429,517,622,738,827,914,1005,1098,1193,1287,1388,1481,1576,1670,1761,1852,1936,2045,2150,2248,2358,2457,2563,2722,2821", + "endColumns": "109,106,106,87,104,115,88,86,90,92,94,93,100,92,94,93,90,90,83,108,104,97,109,98,105,158,98,81", + "endOffsets": "210,317,424,512,617,733,822,909,1000,1093,1188,1282,1383,1476,1571,1665,1756,1847,1931,2040,2145,2243,2353,2452,2558,2717,2816,2898" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-night-v8\\values-night-v8.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-si\\values-si.xml", "from": { - "startLines": "2,3,4,5,6,7,8", - "startColumns": "4,4,4,4,4,4,4", - "startOffsets": "55,125,209,293,389,491,593", - "endColumns": "69,83,83,95,101,101,93", - "endOffsets": "120,204,288,384,486,588,682" + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "30", + "startColumns": "4", + "startOffsets": "2903", + "endColumns": "100", + "endOffsets": "2999" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-v17_values-v17.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-or_values-or.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v17\\values-v17.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-or\\values-or.xml", "from": { - "startLines": "2,5,9,12,15,18,22,25,29,33,37,40,43,46,50,53,57", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "55,228,456,614,764,936,1161,1331,1559,1783,2025,2196,2370,2539,2812,3012,3216", - "endLines": "4,8,11,14,17,21,24,28,32,36,39,42,45,49,52,56,60", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "223,451,609,759,931,1156,1326,1554,1778,2020,2191,2365,2534,2807,3007,3211,3540" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,224,334,441,527,631,751,828,905,996,1089,1186,1281,1382,1475,1570,1666,1757,1847,1929,2039,2144,2250,2361,2464,2582,2745,2847", + "endColumns": "118,109,106,85,103,119,76,76,90,92,96,94,100,92,94,95,90,89,81,109,104,105,110,102,117,162,101,88", + "endOffsets": "219,329,436,522,626,746,823,900,991,1084,1181,1276,1377,1470,1565,1661,1752,1842,1924,2034,2139,2245,2356,2459,2577,2740,2842,2931" } - } - ] - }, - { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-de_values-de.arsc.flat", - "map": [ + }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-de\\values-de.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-or\\values-or.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1746,28 +1616,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2925", + "startOffsets": "2936", "endColumns": "100", - "endOffsets": "3021" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-de\\values-de.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,210,308,420,506,611,726,803,879,971,1065,1162,1263,1371,1471,1575,1675,1773,1870,1952,2063,2166,2265,2376,2478,2585,2741,2843", - "endColumns": "104,97,111,85,104,114,76,75,91,93,96,100,107,99,103,99,97,96,81,110,102,98,110,101,106,155,101,81", - "endOffsets": "205,303,415,501,606,721,798,874,966,1060,1157,1258,1366,1466,1570,1670,1768,1865,1947,2058,2161,2260,2371,2473,2580,2736,2838,2920" + "endOffsets": "3032" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-fa_values-fa.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-el_values-el.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-fa\\values-fa.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-el\\values-el.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,223,334,451,536,641,767,855,941,1032,1125,1221,1315,1416,1509,1604,1701,1792,1883,1968,2079,2189,2291,2402,2511,2619,2779,2879", + "endColumns": "117,110,116,84,104,125,87,85,90,92,95,93,100,92,94,96,90,90,84,110,109,101,110,108,107,159,99,84", + "endOffsets": "218,329,446,531,636,762,850,936,1027,1120,1216,1310,1411,1504,1599,1696,1787,1878,1963,2074,2184,2286,2397,2506,2614,2774,2874,2959" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-el\\values-el.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1778,44 +1648,50 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2903", + "startOffsets": "2964", "endColumns": "100", - "endOffsets": "2999" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-fa\\values-fa.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,215,318,429,513,616,731,810,888,981,1076,1172,1266,1369,1464,1561,1660,1753,1843,1924,2036,2139,2237,2347,2451,2560,2721,2822", - "endColumns": "109,102,110,83,102,114,78,77,92,94,95,93,102,94,96,98,92,89,80,111,102,97,109,103,108,160,100,80", - "endOffsets": "210,313,424,508,611,726,805,883,976,1071,1167,1261,1364,1459,1556,1655,1748,1838,1919,2031,2134,2232,2342,2446,2555,2716,2817,2898" + "endOffsets": "3060" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-hdpi-v4_values-hdpi-v4.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-eu_values-eu.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-hdpi-v4\\values-hdpi-v4.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-eu\\values-eu.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endLines": "6", - "endColumns": "13", - "endOffsets": "327" + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "30", + "startColumns": "4", + "startOffsets": "2938", + "endColumns": "100", + "endOffsets": "3034" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-eu\\values-eu.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,214,312,422,508,614,738,825,909,1001,1095,1192,1286,1388,1482,1578,1675,1767,1860,1942,2051,2161,2260,2369,2475,2586,2757,2856", + "endColumns": "108,97,109,85,105,123,86,83,91,93,96,93,101,93,95,96,91,92,81,108,109,98,108,105,110,170,98,81", + "endOffsets": "209,307,417,503,609,733,820,904,996,1090,1187,1281,1383,1477,1573,1670,1762,1855,1937,2046,2156,2255,2364,2470,2581,2752,2851,2933" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-my_values-my.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-af_values-af.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-my\\values-my.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-af\\values-af.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1826,28 +1702,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2979", + "startOffsets": "2856", "endColumns": "100", - "endOffsets": "3075" + "endOffsets": "2952" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-my\\values-my.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-af\\values-af.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,214,319,436,529,641,769,847,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1951,2074,2186,2288,2414,2525,2635,2795,2895", - "endColumns": "108,104,116,92,111,127,77,78,90,92,95,93,100,92,94,93,90,90,85,122,111,101,125,110,109,159,99,83", - "endOffsets": "209,314,431,524,636,764,842,921,1012,1105,1201,1295,1396,1489,1584,1678,1769,1860,1946,2069,2181,2283,2409,2520,2630,2790,2890,2974" + "startOffsets": "105,209,309,415,500,603,721,797,874,965,1058,1154,1248,1348,1441,1536,1635,1730,1824,1905,2012,2115,2212,2320,2422,2524,2678,2776", + "endColumns": "103,99,105,84,102,117,75,76,90,92,95,93,99,92,94,98,94,93,80,106,102,96,107,101,101,153,97,79", + "endOffsets": "204,304,410,495,598,716,792,869,960,1053,1149,1243,1343,1436,1531,1630,1725,1819,1900,2007,2110,2207,2315,2417,2519,2673,2771,2851" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-nl_values-nl.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-tl_values-tl.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-nl\\values-nl.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-tl\\values-tl.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,224,332,449,537,643,764,843,921,1012,1105,1201,1295,1396,1489,1584,1678,1769,1860,1944,2053,2164,2265,2375,2492,2600,2763,2865", + "endColumns": "118,107,116,87,105,120,78,77,90,92,95,93,100,92,94,93,90,90,83,108,110,100,109,116,107,162,101,83", + "endOffsets": "219,327,444,532,638,759,838,916,1007,1100,1196,1290,1391,1484,1579,1673,1764,1855,1939,2048,2159,2260,2370,2487,2595,2758,2860,2944" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-tl\\values-tl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1858,38 +1744,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2921", + "startOffsets": "2949", "endColumns": "100", - "endOffsets": "3017" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-nl\\values-nl.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,223,328,435,521,629,749,826,903,995,1089,1190,1284,1385,1479,1575,1670,1762,1854,1936,2047,2151,2250,2365,2478,2581,2736,2839", - "endColumns": "117,104,106,85,107,119,76,76,91,93,100,93,100,93,95,94,91,91,81,110,103,98,114,112,102,154,102,81", - "endOffsets": "218,323,430,516,624,744,821,898,990,1084,1185,1279,1380,1474,1570,1665,1757,1849,1931,2042,2146,2245,2360,2473,2576,2731,2834,2916" + "endOffsets": "3045" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-kk_values-kk.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-gl_values-gl.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-kk\\values-kk.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-gl\\values-gl.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,217,320,430,515,621,740,821,901,992,1085,1181,1275,1376,1469,1564,1661,1752,1844,1925,2028,2133,2231,2338,2447,2547,2713,2812", - "endColumns": "111,102,109,84,105,118,80,79,90,92,95,93,100,92,94,96,90,91,80,102,104,97,106,108,99,165,98,80", - "endOffsets": "212,315,425,510,616,735,816,896,987,1080,1176,1270,1371,1464,1559,1656,1747,1839,1920,2023,2128,2226,2333,2442,2542,2708,2807,2888" + "startOffsets": "105,217,329,437,522,624,750,834,915,1007,1101,1199,1293,1394,1488,1584,1679,1771,1863,1945,2052,2161,2260,2368,2472,2579,2738,2838", + "endColumns": "111,111,107,84,101,125,83,80,91,93,97,93,100,93,95,94,91,91,81,106,108,98,107,103,106,158,99,81", + "endOffsets": "212,324,432,517,619,745,829,910,1002,1096,1194,1288,1389,1483,1579,1674,1766,1858,1940,2047,2156,2255,2363,2467,2574,2733,2833,2915" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-kk\\values-kk.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-gl\\values-gl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1900,18 +1776,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2893", + "startOffsets": "2920", "endColumns": "100", - "endOffsets": "2989" + "endOffsets": "3016" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-sv_values-sv.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-en-rIN_values-en-rIN.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sv\\values-sv.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1922,28 +1798,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2863", + "startOffsets": "2846", "endColumns": "100", - "endOffsets": "2959" + "endOffsets": "2942" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sv\\values-sv.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,211,314,425,510,612,725,801,877,970,1065,1161,1255,1358,1453,1550,1648,1744,1837,1917,2023,2123,2219,2324,2426,2528,2682,2784", - "endColumns": "105,102,110,84,101,112,75,75,92,94,95,93,102,94,96,97,95,92,79,105,99,95,104,101,101,153,101,78", - "endOffsets": "206,309,420,505,607,720,796,872,965,1060,1156,1250,1353,1448,1545,1643,1739,1832,1912,2018,2118,2214,2319,2421,2523,2677,2779,2858" + "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", + "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", + "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-ur_values-ur.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-am_values-am.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ur\\values-ur.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-am\\values-am.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1954,70 +1830,60 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2904", + "startOffsets": "2817", "endColumns": "100", - "endOffsets": "3000" + "endOffsets": "2913" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ur\\values-ur.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-am\\values-am.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,215,321,430,516,620,740,816,892,984,1078,1174,1268,1370,1464,1560,1654,1746,1838,1923,2031,2140,2242,2353,2453,2561,2726,2824", - "endColumns": "109,105,108,85,103,119,75,75,91,93,95,93,101,93,95,93,91,91,84,107,108,101,110,99,107,164,97,79", - "endOffsets": "210,316,425,511,615,735,811,887,979,1073,1169,1263,1365,1459,1555,1649,1741,1833,1918,2026,2135,2237,2348,2448,2556,2721,2819,2899" + "startOffsets": "105,207,306,412,498,601,714,792,870,961,1054,1147,1241,1342,1435,1530,1624,1715,1805,1884,1984,2084,2180,2283,2382,2489,2642,2738", + "endColumns": "101,98,105,85,102,112,77,77,90,92,92,93,100,92,94,93,90,89,78,99,99,95,102,98,106,152,95,78", + "endOffsets": "202,301,407,493,596,709,787,865,956,1049,1142,1236,1337,1430,1525,1619,1710,1800,1879,1979,2079,2175,2278,2377,2484,2637,2733,2812" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-tr_values-tr.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-en-rXC_values-en-rXC.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-tr\\values-tr.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" + "endColumns": "202", + "endOffsets": "253" }, "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2865", - "endColumns": "100", - "endOffsets": "2961" + "startOffsets": "5682", + "endColumns": "202", + "endOffsets": "5880" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-tr\\values-tr.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,210,309,421,506,612,732,811,887,978,1071,1164,1258,1356,1449,1551,1646,1737,1828,1907,2014,2119,2215,2322,2424,2532,2688,2786", - "endColumns": "104,98,111,84,105,119,78,75,90,92,92,93,97,92,101,94,90,90,78,106,104,95,106,101,107,155,97,78", - "endOffsets": "205,304,416,501,607,727,806,882,973,1066,1159,1253,1351,1444,1546,1641,1732,1823,1902,2009,2114,2210,2317,2419,2527,2683,2781,2860" + "startOffsets": "105,310,510,719,904,1106,1321,1494,1671,1862,2055,2253,2449,2652,2847,3044,3239,3432,3623,3807,4011,4216,4417,4624,4826,5031,5303,5503", + "endColumns": "204,199,208,184,201,214,172,176,190,192,197,195,202,194,196,194,192,190,183,203,204,200,206,201,204,271,199,178", + "endOffsets": "305,505,714,899,1101,1316,1489,1666,1857,2050,2248,2444,2647,2842,3039,3234,3427,3618,3802,4006,4211,4412,4619,4821,5026,5298,5498,5677" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-es_values-es.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-lt_values-lt.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-es\\values-es.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,222,335,443,528,629,757,842,924,1016,1110,1208,1302,1403,1497,1593,1689,1781,1873,1955,2062,2162,2261,2369,2476,2583,2742,2842", - "endColumns": "116,112,107,84,100,127,84,81,91,93,97,93,100,93,95,95,91,91,81,106,99,98,107,106,106,158,99,81", - "endOffsets": "217,330,438,523,624,752,837,919,1011,1105,1203,1297,1398,1492,1588,1684,1776,1868,1950,2057,2157,2256,2364,2471,2578,2737,2837,2919" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-es\\values-es.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-lt\\values-lt.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2028,42 +1894,60 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2924", + "startOffsets": "2978", "endColumns": "100", - "endOffsets": "3020" + "endOffsets": "3074" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-lt\\values-lt.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,221,322,435,522,631,752,834,915,1009,1105,1203,1299,1403,1499,1597,1700,1794,1888,1973,2082,2191,2291,2401,2505,2618,2794,2895", + "endColumns": "115,100,112,86,108,120,81,80,93,95,97,95,103,95,97,102,93,93,84,108,108,99,109,103,112,175,100,82", + "endOffsets": "216,317,430,517,626,747,829,910,1004,1100,1198,1294,1398,1494,1592,1695,1789,1883,1968,2077,2186,2286,2396,2500,2613,2789,2890,2973" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-v22_values-v22.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-pl_values-pl.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v22\\values-v22.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-pl\\values-pl.xml", "from": { - "startLines": "2,3,4,9", - "startColumns": "4,4,4,4", - "startOffsets": "55,130,217,553", - "endLines": "2,3,8,13", - "endColumns": "74,86,12,12", - "endOffsets": "125,212,548,896" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,221,323,431,517,626,745,823,900,991,1084,1180,1274,1376,1469,1564,1659,1750,1841,1923,2032,2141,2240,2349,2460,2568,2731,2827", + "endColumns": "115,101,107,85,108,118,77,76,90,92,95,93,101,92,94,94,90,90,81,108,108,98,108,110,107,162,95,81", + "endOffsets": "216,318,426,512,621,740,818,895,986,1079,1175,1269,1371,1464,1559,1654,1745,1836,1918,2027,2136,2235,2344,2455,2563,2726,2822,2904" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-pl\\values-pl.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" }, "to": { - "startLines": "2,3,4,9", - "startColumns": "4,4,4,4", - "startOffsets": "55,130,217,487", - "endLines": "2,3,8,13", - "endColumns": "74,86,12,12", - "endOffsets": "125,212,482,764" + "startLines": "30", + "startColumns": "4", + "startOffsets": "2909", + "endColumns": "100", + "endOffsets": "3005" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-it_values-it.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-vi_values-vi.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-it\\values-it.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-vi\\values-vi.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2074,52 +1958,81 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2906", + "startOffsets": "2901", "endColumns": "100", - "endOffsets": "3002" + "endOffsets": "2997" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-it\\values-it.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-vi\\values-vi.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,214,314,423,507,616,741,818,894,986,1080,1174,1268,1370,1464,1561,1667,1759,1851,1932,2038,2146,2244,2348,2453,2560,2723,2823", - "endColumns": "108,99,108,83,108,124,76,75,91,93,93,93,101,93,96,105,91,91,80,105,107,97,103,104,106,162,99,82", - "endOffsets": "209,309,418,502,611,736,813,889,981,1075,1169,1263,1365,1459,1556,1662,1754,1846,1927,2033,2141,2239,2343,2448,2555,2718,2818,2901" + "startOffsets": "105,219,327,436,520,623,742,819,896,987,1080,1176,1270,1371,1464,1559,1657,1748,1839,1923,2027,2136,2237,2342,2456,2561,2718,2817", + "endColumns": "113,107,108,83,102,118,76,76,90,92,95,93,100,92,94,97,90,90,83,103,108,100,104,113,104,156,98,83", + "endOffsets": "214,322,431,515,618,737,814,891,982,1075,1171,1265,1366,1459,1554,1652,1743,1834,1918,2022,2131,2232,2337,2451,2556,2713,2812,2896" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-v26_values-v26.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-v21_values-v21.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v26\\values-v26.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-v21\\values-v21.xml", "from": { - "startLines": "2,3,4,8,12,16", - "startColumns": "4,4,4,4,4,4", - "startOffsets": "55,130,217,431,657,896", - "endLines": "2,3,7,11,15,16", - "endColumns": "74,86,12,12,12,92", - "endOffsets": "125,212,426,652,891,984" + "startLines": "2,3,4,5,6,7,8,9,10,13", + "startColumns": "4,4,4,4,4,4,4,4,4,4", + "startOffsets": "55,159,223,290,354,470,596,722,850,1022", + "endLines": "2,3,4,5,6,7,8,9,12,17", + "endColumns": "103,63,66,63,115,125,125,127,12,12", + "endOffsets": "154,218,285,349,465,591,717,845,1017,1355" }, "to": { - "startLines": "2,3,4,8,12,16", - "startColumns": "4,4,4,4,4,4", - "startOffsets": "55,130,217,381,557,796", - "endLines": "2,3,7,11,15,16", - "endColumns": "74,86,12,12,12,92", - "endOffsets": "125,212,376,552,791,884" + "startLines": "2,3,4,5,263,264,265,266,267,270", + "startColumns": "4,4,4,4,4,4,4,4,4,4", + "startOffsets": "55,159,223,290,18633,18749,18875,19001,19129,19301", + "endLines": "2,3,4,5,263,264,265,266,269,274", + "endColumns": "103,63,66,63,115,125,125,127,12,12", + "endOffsets": "154,218,285,349,18744,18870,18996,19124,19296,19634" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v21\\values-v21.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,17,19,20,21,22,24,26,27,28,29,30,32,34,36,38,40,42,43,48,50,52,53,54,56,58,59,60,61,62,63,107,110,154,157,160,162,164,166,169,171,174,175,176,179,180,181,182,183,184,187,188,190,192,194,196,200,202,203,204,205,207,211,213,215,216,217,218,219,221,222,223,233,234,235,247", + "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", + "startOffsets": "55,146,249,352,457,564,673,782,891,1000,1109,1216,1319,1438,1593,1748,1853,1974,2075,2222,2363,2466,2585,2692,2795,2950,3121,3270,3435,3592,3743,3862,4234,4383,4532,4644,4791,4944,5091,5166,5255,5342,5443,5546,8614,8799,11879,12076,12275,12398,12521,12634,12817,12948,13149,13238,13349,13582,13683,13778,13901,14030,14147,14324,14423,14558,14701,14836,14955,15156,15275,15368,15479,15535,15642,15837,15948,16081,16176,16267,16358,16475,16614,16685,16768,17448,17505,17563,18257", + "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,16,18,19,20,21,23,25,26,27,28,29,31,33,35,37,39,41,42,47,49,51,52,53,55,57,58,59,60,61,62,106,109,153,156,159,161,163,165,168,170,173,174,175,178,179,180,181,182,183,186,187,189,191,193,195,199,201,202,203,204,206,210,212,214,215,216,217,218,220,221,222,232,233,234,246,258", + "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12", + "endOffsets": "141,244,347,452,559,668,777,886,995,1104,1211,1314,1433,1588,1743,1848,1969,2070,2217,2358,2461,2580,2687,2790,2945,3116,3265,3430,3587,3738,3857,4229,4378,4527,4639,4786,4939,5086,5161,5250,5337,5438,5541,8609,8794,11874,12071,12270,12393,12516,12629,12812,12943,13144,13233,13344,13577,13678,13773,13896,14025,14142,14319,14418,14553,14696,14831,14950,15151,15270,15363,15474,15530,15637,15832,15943,16076,16171,16262,16353,16470,16609,16680,16763,17443,17500,17558,18252,18958" + }, + "to": { + "startLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,19,21,23,24,25,26,28,30,31,32,33,34,36,38,40,42,44,46,47,52,54,56,57,58,60,62,63,64,65,66,67,111,114,158,161,164,166,168,170,173,175,178,179,180,183,184,185,186,187,188,191,192,194,196,198,200,204,206,207,208,209,211,215,217,219,220,221,222,223,225,226,227,237,238,239,251", + "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", + "startOffsets": "354,445,548,651,756,863,972,1081,1190,1299,1408,1515,1618,1737,1892,2047,2152,2273,2374,2521,2662,2765,2884,2991,3094,3249,3420,3569,3734,3891,4042,4161,4533,4682,4831,4943,5090,5243,5390,5465,5554,5641,5742,5845,8697,8882,11746,11943,12142,12265,12388,12501,12684,12815,13016,13105,13216,13449,13550,13645,13768,13897,14014,14191,14290,14425,14568,14703,14822,15023,15142,15235,15346,15402,15509,15704,15815,15948,16043,16134,16225,16342,16481,16552,16635,17258,17315,17373,17997", + "endLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,20,22,23,24,25,27,29,30,31,32,33,35,37,39,41,43,45,46,51,53,55,56,57,59,61,62,63,64,65,66,110,113,157,160,163,165,167,169,172,174,177,178,179,182,183,184,185,186,187,190,191,193,195,197,199,203,205,206,207,208,210,214,216,218,219,220,221,222,224,225,226,236,237,238,250,262", + "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12", + "endOffsets": "440,543,646,751,858,967,1076,1185,1294,1403,1510,1613,1732,1887,2042,2147,2268,2369,2516,2657,2760,2879,2986,3089,3244,3415,3564,3729,3886,4037,4156,4528,4677,4826,4938,5085,5238,5385,5460,5549,5636,5737,5840,8692,8877,11741,11938,12137,12260,12383,12496,12679,12810,13011,13100,13211,13444,13545,13640,13763,13892,14009,14186,14285,14420,14563,14698,14817,15018,15137,15230,15341,15397,15504,15699,15810,15943,16038,16129,16220,16337,16476,16547,16630,17253,17310,17368,17992,18628" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-ky_values-ky.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-sq_values-sq.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ky\\values-ky.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sq\\values-sq.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,219,319,431,518,628,751,832,911,1002,1095,1191,1285,1387,1480,1575,1672,1763,1856,1939,2045,2150,2248,2354,2457,2573,2727,2826", + "endColumns": "113,99,111,86,109,122,80,78,90,92,95,93,101,92,94,96,90,92,82,105,104,97,105,102,115,153,98,80", + "endOffsets": "214,314,426,513,623,746,827,906,997,1090,1186,1280,1382,1475,1570,1667,1758,1851,1934,2040,2145,2243,2349,2452,2568,2722,2821,2902" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sq\\values-sq.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2130,38 +2043,43 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2883", + "startOffsets": "2907", "endColumns": "100", - "endOffsets": "2979" + "endOffsets": "3003" } - }, + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-xlarge-v4_values-xlarge-v4.arsc.flat", + "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ky\\values-ky.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,209,304,423,507,614,731,809,888,979,1072,1168,1262,1363,1456,1551,1646,1737,1828,1909,2019,2126,2224,2330,2437,2538,2699,2802", - "endColumns": "103,94,118,83,106,116,77,78,90,92,95,93,100,92,94,94,90,90,80,109,106,97,105,106,100,160,102,80", - "endOffsets": "204,299,418,502,609,726,804,883,974,1067,1163,1257,1358,1451,1546,1641,1732,1823,1904,2014,2121,2219,2325,2432,2533,2694,2797,2878" + "startLines": "2,3,4,5,6,7", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "55,126,197,267,337,405", + "endColumns": "70,70,69,69,67,67", + "endOffsets": "121,192,262,332,400,468" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-vi_values-vi.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-kk_values-kk.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-vi\\values-vi.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-kk\\values-kk.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,219,327,436,520,623,742,819,896,987,1080,1176,1270,1371,1464,1559,1657,1748,1839,1923,2027,2136,2237,2342,2456,2561,2718,2817", - "endColumns": "113,107,108,83,102,118,76,76,90,92,95,93,100,92,94,97,90,90,83,103,108,100,104,113,104,156,98,83", - "endOffsets": "214,322,431,515,618,737,814,891,982,1075,1171,1265,1366,1459,1554,1652,1743,1834,1918,2022,2131,2232,2337,2451,2556,2713,2812,2896" + "startOffsets": "105,217,320,430,515,621,740,821,901,992,1085,1181,1275,1376,1469,1564,1661,1752,1844,1925,2028,2133,2231,2338,2447,2547,2713,2812", + "endColumns": "111,102,109,84,105,118,80,79,90,92,95,93,100,92,94,96,90,91,80,102,104,97,106,108,99,165,98,80", + "endOffsets": "212,315,425,510,616,735,816,896,987,1080,1176,1270,1371,1464,1559,1656,1747,1839,1920,2023,2128,2226,2333,2442,2542,2708,2807,2888" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-vi\\values-vi.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-kk\\values-kk.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2172,18 +2090,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2901", + "startOffsets": "2893", "endColumns": "100", - "endOffsets": "2997" + "endOffsets": "2989" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-da_values-da.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-sv_values-sv.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-da\\values-da.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sv\\values-sv.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,211,314,425,510,612,725,801,877,970,1065,1161,1255,1358,1453,1550,1648,1744,1837,1917,2023,2123,2219,2324,2426,2528,2682,2784", + "endColumns": "105,102,110,84,101,112,75,75,92,94,95,93,102,94,96,97,95,92,79,105,99,95,104,101,101,153,101,78", + "endOffsets": "206,309,420,505,607,720,796,872,965,1060,1156,1250,1353,1448,1545,1643,1739,1832,1912,2018,2118,2214,2319,2421,2523,2677,2779,2858" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sv\\values-sv.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2194,38 +2122,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2844", + "startOffsets": "2863", "endColumns": "100", - "endOffsets": "2940" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-da\\values-da.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,208,307,419,502,602,715,792,869,960,1053,1149,1243,1338,1431,1526,1624,1715,1806,1885,1994,2102,2198,2312,2414,2515,2668,2765", - "endColumns": "102,98,111,82,99,112,76,76,90,92,95,93,94,92,94,97,90,90,78,108,107,95,113,101,100,152,96,78", - "endOffsets": "203,302,414,497,597,710,787,864,955,1048,1144,1238,1333,1426,1521,1619,1710,1801,1880,1989,2097,2193,2307,2409,2510,2663,2760,2839" + "endOffsets": "2959" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-sr_values-sr.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-de_values-de.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sr\\values-sr.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,214,317,423,509,613,731,812,892,983,1076,1172,1266,1367,1460,1555,1660,1751,1842,1930,2035,2143,2244,2348,2456,2557,2724,2821", - "endColumns": "108,102,105,85,103,117,80,79,90,92,95,93,100,92,94,104,90,90,87,104,107,100,103,107,100,166,96,83", - "endOffsets": "209,312,418,504,608,726,807,887,978,1071,1167,1261,1362,1455,1550,1655,1746,1837,1925,2030,2138,2239,2343,2451,2552,2719,2816,2900" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sr\\values-sr.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-de\\values-de.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2236,28 +2144,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2905", + "startOffsets": "2925", "endColumns": "100", - "endOffsets": "3001" + "endOffsets": "3021" } - } - ] - }, - { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-sq_values-sq.arsc.flat", - "map": [ + }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sq\\values-sq.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-de\\values-de.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,219,319,431,518,628,751,832,911,1002,1095,1191,1285,1387,1480,1575,1672,1763,1856,1939,2045,2150,2248,2354,2457,2573,2727,2826", - "endColumns": "113,99,111,86,109,122,80,78,90,92,95,93,101,92,94,96,90,92,82,105,104,97,105,102,115,153,98,80", - "endOffsets": "214,314,426,513,623,746,827,906,997,1090,1186,1280,1382,1475,1570,1667,1758,1851,1934,2040,2145,2243,2349,2452,2568,2722,2821,2902" + "startOffsets": "105,210,308,420,506,611,726,803,879,971,1065,1162,1263,1371,1471,1575,1675,1773,1870,1952,2063,2166,2265,2376,2478,2585,2741,2843", + "endColumns": "104,97,111,85,104,114,76,75,91,93,96,100,107,99,103,99,97,96,81,110,102,98,110,101,106,155,101,81", + "endOffsets": "205,303,415,501,606,721,798,874,966,1060,1157,1258,1366,1466,1570,1670,1768,1865,1947,2058,2161,2260,2371,2473,2580,2736,2838,2920" } - }, + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-is_values-is.arsc.flat", + "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sq\\values-sq.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-is\\values-is.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2268,18 +2176,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2907", + "startOffsets": "2865", "endColumns": "100", - "endOffsets": "3003" + "endOffsets": "2961" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-is\\values-is.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,205,302,414,499,600,714,794,874,965,1058,1154,1248,1355,1448,1543,1638,1729,1823,1904,2014,2122,2220,2329,2428,2531,2686,2784", + "endColumns": "99,96,111,84,100,113,79,79,90,92,95,93,106,92,94,94,90,93,80,109,107,97,108,98,102,154,97,80", + "endOffsets": "200,297,409,494,595,709,789,869,960,1053,1149,1243,1350,1443,1538,1633,1724,1818,1899,2009,2117,2215,2324,2423,2526,2681,2779,2860" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-bn_values-bn.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-az_values-az.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-bn\\values-bn.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-az\\values-az.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2290,38 +2208,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2939", + "startOffsets": "2903", "endColumns": "100", - "endOffsets": "3035" + "endOffsets": "2999" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-bn\\values-bn.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-az\\values-az.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,214,326,432,526,631,760,838,916,1007,1100,1195,1289,1390,1483,1578,1672,1763,1854,1941,2051,2159,2258,2368,2474,2587,2752,2857", - "endColumns": "108,111,105,93,104,128,77,77,90,92,94,93,100,92,94,93,90,90,86,109,107,98,109,105,112,164,104,81", - "endOffsets": "209,321,427,521,626,755,833,911,1002,1095,1190,1284,1385,1478,1573,1667,1758,1849,1936,2046,2154,2253,2363,2469,2582,2747,2852,2934" + "startOffsets": "105,213,312,424,512,619,733,814,893,984,1077,1172,1271,1372,1465,1560,1655,1746,1838,1923,2030,2137,2237,2346,2450,2560,2718,2820", + "endColumns": "107,98,111,87,106,113,80,78,90,92,94,98,100,92,94,94,90,91,84,106,106,99,108,103,109,157,101,82", + "endOffsets": "208,307,419,507,614,728,809,888,979,1072,1167,1266,1367,1460,1555,1650,1741,1833,1918,2025,2132,2232,2341,2445,2555,2713,2815,2898" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-be_values-be.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-tr_values-tr.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-be\\values-be.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,225,328,444,530,638,756,835,913,1005,1099,1195,1289,1385,1479,1575,1670,1762,1854,1937,2043,2149,2247,2355,2460,2565,2734,2834", - "endColumns": "119,102,115,85,107,117,78,77,91,93,95,93,95,93,95,94,91,91,82,105,105,97,107,104,104,168,99,80", - "endOffsets": "220,323,439,525,633,751,830,908,1000,1094,1190,1284,1380,1474,1570,1665,1757,1849,1932,2038,2144,2242,2350,2455,2560,2729,2829,2910" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-be\\values-be.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-tr\\values-tr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2332,18 +2240,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2915", + "startOffsets": "2865", "endColumns": "100", - "endOffsets": "3011" + "endOffsets": "2961" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-tr\\values-tr.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,210,309,421,506,612,732,811,887,978,1071,1164,1258,1356,1449,1551,1646,1737,1828,1907,2014,2119,2215,2322,2424,2532,2688,2786", + "endColumns": "104,98,111,84,105,119,78,75,90,92,92,93,97,92,101,94,90,90,78,106,104,95,106,101,107,155,97,78", + "endOffsets": "205,304,416,501,607,727,806,882,973,1066,1159,1253,1351,1444,1546,1641,1732,1823,1902,2009,2114,2210,2317,2419,2527,2683,2781,2860" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-ml_values-ml.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-nb_values-nb.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ml\\values-ml.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-nb\\values-nb.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2354,53 +2272,54 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2955", + "startOffsets": "2826", "endColumns": "100", - "endOffsets": "3051" + "endOffsets": "2922" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ml\\values-ml.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-nb\\values-nb.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,224,342,457,550,655,787,864,940,1031,1124,1226,1320,1421,1515,1610,1709,1800,1891,1973,2084,2190,2288,2402,2502,2613,2772,2873", - "endColumns": "118,117,114,92,104,131,76,75,90,92,101,93,100,93,94,98,90,90,81,110,105,97,113,99,110,158,100,81", - "endOffsets": "219,337,452,545,650,782,859,935,1026,1119,1221,1315,1416,1510,1605,1704,1795,1886,1968,2079,2185,2283,2397,2497,2608,2767,2868,2950" + "startOffsets": "105,213,308,422,508,608,721,797,873,964,1057,1153,1247,1348,1441,1536,1634,1725,1816,1896,1999,2098,2194,2298,2396,2497,2650,2747", + "endColumns": "107,94,113,85,99,112,75,75,90,92,95,93,100,92,94,97,90,90,79,102,98,95,103,97,100,152,96,78", + "endOffsets": "208,303,417,503,603,716,792,868,959,1052,1148,1242,1343,1436,1531,1629,1720,1811,1891,1994,2093,2189,2293,2391,2492,2645,2742,2821" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-h720dp-v13_values-h720dp-v13.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-v25_values-v25.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-h720dp-v13\\values-h720dp-v13.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v25\\values-v25.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "66", - "endOffsets": "117" + "startLines": "2,3,4,6", + "startColumns": "4,4,4,4", + "startOffsets": "55,126,209,308", + "endLines": "2,3,5,7", + "endColumns": "70,82,12,12", + "endOffsets": "121,204,303,414" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-az_values-az.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-fr_values-fr.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-az\\values-az.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-fr\\values-fr.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,213,312,424,512,619,733,814,893,984,1077,1172,1271,1372,1465,1560,1655,1746,1838,1923,2030,2137,2237,2346,2450,2560,2718,2820", - "endColumns": "107,98,111,87,106,113,80,78,90,92,94,98,100,92,94,94,90,91,84,106,106,99,108,103,109,157,101,82", - "endOffsets": "208,307,419,507,614,728,809,888,979,1072,1167,1266,1367,1460,1555,1650,1741,1833,1918,2025,2132,2232,2341,2445,2555,2713,2815,2898" + "startOffsets": "105,216,331,442,524,630,760,843,923,1014,1107,1206,1301,1402,1495,1588,1683,1774,1865,1951,2061,2173,2276,2387,2494,2601,2760,2859", + "endColumns": "110,114,110,81,105,129,82,79,90,92,98,94,100,92,92,94,90,90,85,109,111,102,110,106,106,158,98,85", + "endOffsets": "211,326,437,519,625,755,838,918,1009,1102,1201,1296,1397,1490,1583,1678,1769,1860,1946,2056,2168,2271,2382,2489,2596,2755,2854,2940" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-az\\values-az.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-fr\\values-fr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2411,18 +2330,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2903", + "startOffsets": "2945", "endColumns": "100", - "endOffsets": "2999" + "endOffsets": "3041" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-pl_values-pl.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-da_values-da.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-pl\\values-pl.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-da\\values-da.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2433,28 +2352,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2909", + "startOffsets": "2844", "endColumns": "100", - "endOffsets": "3005" + "endOffsets": "2940" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-pl\\values-pl.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-da\\values-da.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,221,323,431,517,626,745,823,900,991,1084,1180,1274,1376,1469,1564,1659,1750,1841,1923,2032,2141,2240,2349,2460,2568,2731,2827", - "endColumns": "115,101,107,85,108,118,77,76,90,92,95,93,101,92,94,94,90,90,81,108,108,98,108,110,107,162,95,81", - "endOffsets": "216,318,426,512,621,740,818,895,986,1079,1175,1269,1371,1464,1559,1654,1745,1836,1918,2027,2136,2235,2344,2455,2563,2726,2822,2904" + "startOffsets": "105,208,307,419,502,602,715,792,869,960,1053,1149,1243,1338,1431,1526,1624,1715,1806,1885,1994,2102,2198,2312,2414,2515,2668,2765", + "endColumns": "102,98,111,82,99,112,76,76,90,92,95,93,94,92,94,97,90,90,78,108,107,95,113,101,100,152,96,78", + "endOffsets": "203,302,414,497,597,710,787,864,955,1048,1144,1238,1333,1426,1521,1619,1710,1801,1880,1989,2097,2193,2307,2409,2510,2663,2760,2839" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-nb_values-nb.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-be_values-be.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-nb\\values-nb.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-be\\values-be.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2465,28 +2384,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2826", + "startOffsets": "2915", "endColumns": "100", - "endOffsets": "2922" + "endOffsets": "3011" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-nb\\values-nb.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-be\\values-be.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,213,308,422,508,608,721,797,873,964,1057,1153,1247,1348,1441,1536,1634,1725,1816,1896,1999,2098,2194,2298,2396,2497,2650,2747", - "endColumns": "107,94,113,85,99,112,75,75,90,92,95,93,100,92,94,97,90,90,79,102,98,95,103,97,100,152,96,78", - "endOffsets": "208,303,417,503,603,716,792,868,959,1052,1148,1242,1343,1436,1531,1629,1720,1811,1891,1994,2093,2189,2293,2391,2492,2645,2742,2821" + "startOffsets": "105,225,328,444,530,638,756,835,913,1005,1099,1195,1289,1385,1479,1575,1670,1762,1854,1937,2043,2149,2247,2355,2460,2565,2734,2834", + "endColumns": "119,102,115,85,107,117,78,77,91,93,95,93,95,93,95,94,91,91,82,105,105,97,107,104,104,168,99,80", + "endOffsets": "220,323,439,525,633,751,830,908,1000,1094,1190,1284,1380,1474,1570,1665,1757,1849,1932,2038,2144,2242,2350,2455,2560,2729,2829,2910" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-en-rAU_values-en-rAU.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-en-rCA_values-en-rCA.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2503,7 +2422,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", @@ -2515,10 +2434,20 @@ ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-zh-rCN_values-zh-rCN.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-th_values-th.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-th\\values-th.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,210,308,416,505,607,717,794,872,963,1056,1152,1246,1347,1440,1535,1629,1720,1811,1892,2000,2104,2202,2310,2415,2516,2669,2764", + "endColumns": "104,97,107,88,101,109,76,77,90,92,95,93,100,92,94,93,90,90,80,107,103,97,107,104,100,152,94,80", + "endOffsets": "205,303,411,500,602,712,789,867,958,1051,1147,1241,1342,1435,1530,1624,1715,1806,1887,1995,2099,2197,2305,2410,2511,2664,2759,2840" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-th\\values-th.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2527,87 +2456,32 @@ "endOffsets": "151" }, "to": { - "startLines": "130", + "startLines": "30", "startColumns": "4", - "startOffsets": "8273", + "startOffsets": "2845", "endColumns": "100", - "endOffsets": "8369" + "endOffsets": "2941" } - }, + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-es-rUS_values-es-rUS.arsc.flat", + "map": [ { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml", "from": { - "startLines": "129,71,70,69,68,19,20,21,112,113,120,119,125,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,123,64,43,122,48,47,46,62,42,61,40,41,65,127,126,28,132,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6759,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,6631,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,6578,3077,2036,6533,2278,2222,2167,2979,1992,2937,1901,1942,3129,6715,6672,1318,6936,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", - "endLines": "131,71,70,69,68,19,20,21,112,113,120,119,125,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,123,64,43,122,48,47,46,62,42,61,40,41,65,127,126,28,132,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,40,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,42,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": "6931,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,6667,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,6625,3124,2074,6573,2320,2273,2217,3029,2031,2974,1937,1987,3183,6753,6710,1364,6975,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" - }, - "to": { - "startLines": "6,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,128,129,131,132,133,134,135,136,137,138,139,140,141", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,2945,3018,3084,3157,3207,3247,3295,3343,3388,3445,3499,3549,3590,3652,3720,3797,3856,3921,3984,4039,4099,4162,4216,4276,4329,4391,4476,4557,4607,4666,4709,4762,4805,4856,4906,4966,5019,5070,5116,5164,5212,5258,5305,5355,5400,5459,5511,5563,5615,5658,5703,5750,5806,5861,5916,5960,6002,6043,6093,6152,6195,6238,6289,6333,6382,6431,6478,6525,6572,6617,6668,6721,6796,6855,6912,6986,7050,7119,7197,7307,7411,7484,7550,7605,7670,7735,7784,7867,7945,7983,8028,8154,8216,8374,8429,8488,8555,8613,8675,8723,8768,8816,8867,8933", - "endLines": "8,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,128,129,131,132,133,134,135,136,137,138,139,140,141", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,40,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,42,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,3013,3079,3152,3202,3242,3290,3338,3383,3440,3494,3544,3585,3647,3715,3792,3851,3916,3979,4034,4094,4157,4211,4271,4324,4386,4471,4552,4602,4661,4704,4757,4800,4851,4901,4961,5014,5065,5111,5159,5207,5253,5300,5350,5395,5454,5506,5558,5610,5653,5698,5745,5801,5856,5911,5955,5997,6038,6088,6147,6190,6233,6284,6328,6377,6426,6473,6520,6567,6612,6663,6716,6791,6850,6907,6981,7045,7114,7192,7302,7406,7479,7545,7600,7665,7730,7779,7862,7940,7978,8023,8071,8211,8268,8424,8483,8550,8608,8670,8718,8763,8811,8862,8928,8994" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,225,334,442,527,628,751,836,918,1009,1102,1198,1292,1392,1485,1584,1680,1771,1862,1944,2056,2156,2257,2365,2472,2579,2738,2838", + "endColumns": "119,108,107,84,100,122,84,81,90,92,95,93,99,92,98,95,90,90,81,111,99,100,107,106,106,158,99,81", + "endOffsets": "220,329,437,522,623,746,831,913,1004,1097,1193,1287,1387,1480,1579,1675,1766,1857,1939,2051,2151,2252,2360,2467,2574,2733,2833,2915" } }, { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml", "from": { - "startLines": "16", - "startColumns": "4", - "startOffsets": "336", - "endLines": "19", - "endColumns": "19", - "endOffsets": "441" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,201,296,396,478,575,681,757,833,924,1017,1115,1211,1306,1399,1494,1586,1677,1768,1846,1942,2038,2133,2230,2325,2423,2572,2666", - "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77", - "endOffsets": "196,291,391,473,570,676,752,828,919,1012,1110,1206,1301,1394,1489,1581,1672,1763,1841,1937,2033,2128,2225,2320,2418,2567,2661,2739" - }, - "to": { - "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,127", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "384,480,575,675,757,854,960,1036,1112,1203,1296,1394,1490,1585,1678,1773,1865,1956,2047,2125,2221,2317,2412,2509,2604,2702,2851,8076", - "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77", - "endOffsets": "475,570,670,752,849,955,1031,1107,1198,1291,1389,1485,1580,1673,1768,1860,1951,2042,2120,2216,2312,2407,2504,2599,2697,2846,2940,8149" - } - } - ] - }, - { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-th_values-th.arsc.flat", - "map": [ - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-th\\values-th.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,210,308,416,505,607,717,794,872,963,1056,1152,1246,1347,1440,1535,1629,1720,1811,1892,2000,2104,2202,2310,2415,2516,2669,2764", - "endColumns": "104,97,107,88,101,109,76,77,90,92,95,93,100,92,94,93,90,90,80,107,103,97,107,104,100,152,94,80", - "endOffsets": "205,303,411,500,602,712,789,867,958,1051,1147,1241,1342,1435,1530,1624,1715,1806,1887,1995,2099,2197,2305,2410,2511,2664,2759,2840" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-th\\values-th.xml", - "from": { - "startLines": "2", + "startLines": "2", "startColumns": "4", "startOffsets": "55", "endColumns": "100", @@ -2616,33 +2490,42 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2845", + "startOffsets": "2920", "endColumns": "100", - "endOffsets": "2941" + "endOffsets": "3016" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-ldltr-v21_values-ldltr-v21.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-v28_values-v28.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ldltr-v21\\values-ldltr-v21.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v28\\values-v28.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "112", - "endOffsets": "163" + "startLines": "2,3,4,8", + "startColumns": "4,4,4,4", + "startOffsets": "55,130,217,447", + "endLines": "2,3,7,11", + "endColumns": "74,86,12,12", + "endOffsets": "125,212,442,684" + }, + "to": { + "startLines": "2,3,4,8", + "startColumns": "4,4,4,4", + "startOffsets": "55,130,217,397", + "endLines": "2,3,7,11", + "endColumns": "74,86,12,12", + "endOffsets": "125,212,392,584" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-en-rCA_values-en-rCA.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-iw_values-iw.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-iw\\values-iw.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2653,28 +2536,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2846", + "startOffsets": "2832", "endColumns": "100", - "endOffsets": "2942" + "endOffsets": "2928" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-iw\\values-iw.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", - "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", - "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" + "startOffsets": "105,209,308,416,500,600,714,792,870,961,1055,1151,1245,1346,1439,1534,1631,1722,1814,1895,1997,2101,2199,2302,2403,2503,2655,2751", + "endColumns": "103,98,107,83,99,113,77,77,90,93,95,93,100,92,94,96,90,91,80,101,103,97,102,100,99,151,95,80", + "endOffsets": "204,303,411,495,595,709,787,865,956,1050,1146,1240,1341,1434,1529,1626,1717,1809,1890,1992,2096,2194,2297,2398,2498,2650,2746,2827" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-hy_values-hy.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-sr_values-sr.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-hy\\values-hy.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sr\\values-sr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2685,28 +2568,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2884", + "startOffsets": "2905", "endColumns": "100", - "endOffsets": "2980" + "endOffsets": "3001" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-hy\\values-hy.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sr\\values-sr.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,208,309,419,508,614,729,811,892,983,1076,1172,1266,1367,1460,1555,1649,1740,1831,1916,2023,2130,2229,2339,2446,2546,2703,2802", - "endColumns": "102,100,109,88,105,114,81,80,90,92,95,93,100,92,94,93,90,90,84,106,106,98,109,106,99,156,98,81", - "endOffsets": "203,304,414,503,609,724,806,887,978,1071,1167,1261,1362,1455,1550,1644,1735,1826,1911,2018,2125,2224,2334,2441,2541,2698,2797,2879" + "startOffsets": "105,214,317,423,509,613,731,812,892,983,1076,1172,1266,1367,1460,1555,1660,1751,1842,1930,2035,2143,2244,2348,2456,2557,2724,2821", + "endColumns": "108,102,105,85,103,117,80,79,90,92,95,93,100,92,94,104,90,90,87,104,107,100,103,107,100,166,96,83", + "endOffsets": "209,312,418,504,608,726,807,887,978,1071,1167,1261,1362,1455,1550,1655,1746,1837,1925,2030,2138,2239,2343,2451,2552,2719,2816,2900" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-ta_values-ta.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ur_values-ur.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ta\\values-ta.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ur\\values-ur.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2717,38 +2600,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2954", + "startOffsets": "2904", "endColumns": "100", - "endOffsets": "3050" + "endOffsets": "3000" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ta\\values-ta.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ur\\values-ur.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,219,317,432,521,628,754,832,909,1009,1114,1210,1305,1412,1514,1618,1713,1815,1913,1995,2097,2201,2298,2408,2510,2617,2774,2874", - "endColumns": "113,97,114,88,106,125,77,76,99,104,95,94,106,101,103,94,101,97,81,101,103,96,109,101,106,156,99,79", - "endOffsets": "214,312,427,516,623,749,827,904,1004,1109,1205,1300,1407,1509,1613,1708,1810,1908,1990,2092,2196,2293,2403,2505,2612,2769,2869,2949" + "startOffsets": "105,215,321,430,516,620,740,816,892,984,1078,1174,1268,1370,1464,1560,1654,1746,1838,1923,2031,2140,2242,2353,2453,2561,2726,2824", + "endColumns": "109,105,108,85,103,119,75,75,91,93,95,93,101,93,95,93,91,91,84,107,108,101,110,99,107,164,97,79", + "endOffsets": "210,316,425,511,615,735,811,887,979,1073,1169,1263,1365,1459,1555,1649,1741,1833,1918,2026,2135,2237,2348,2448,2556,2721,2819,2899" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-sw_values-sw.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-fa_values-fa.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sw\\values-sw.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-fa\\values-fa.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,208,306,414,504,609,726,808,891,982,1075,1169,1263,1364,1457,1552,1647,1738,1830,1912,2013,2122,2221,2328,2437,2542,2704,2801", - "endColumns": "102,97,107,89,104,116,81,82,90,92,93,93,100,92,94,94,90,91,81,100,108,98,106,108,104,161,96,81", - "endOffsets": "203,301,409,499,604,721,803,886,977,1070,1164,1258,1359,1452,1547,1642,1733,1825,1907,2008,2117,2216,2323,2432,2537,2699,2796,2878" + "startOffsets": "105,215,318,429,513,616,731,810,888,981,1076,1172,1266,1369,1464,1561,1660,1753,1843,1924,2036,2139,2237,2347,2451,2560,2721,2822", + "endColumns": "109,102,110,83,102,114,78,77,92,94,95,93,102,94,96,98,92,89,80,111,102,97,109,103,108,160,100,80", + "endOffsets": "210,313,424,508,611,726,805,883,976,1071,1167,1261,1364,1459,1556,1655,1748,1838,1919,2031,2134,2232,2342,2446,2555,2716,2817,2898" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sw\\values-sw.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-fa\\values-fa.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2759,18 +2642,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2883", + "startOffsets": "2903", "endColumns": "100", - "endOffsets": "2979" + "endOffsets": "2999" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-tl_values-tl.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-nl_values-nl.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-tl\\values-tl.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-nl\\values-nl.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,223,328,435,521,629,749,826,903,995,1089,1190,1284,1385,1479,1575,1670,1762,1854,1936,2047,2151,2250,2365,2478,2581,2736,2839", + "endColumns": "117,104,106,85,107,119,76,76,91,93,100,93,100,93,95,94,91,91,81,110,103,98,114,112,102,154,102,81", + "endOffsets": "218,323,430,516,624,744,821,898,990,1084,1185,1279,1380,1474,1570,1665,1757,1849,1931,2042,2146,2245,2360,2473,2576,2731,2834,2916" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-nl\\values-nl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2781,70 +2674,78 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2949", + "startOffsets": "2921", "endColumns": "100", - "endOffsets": "3045" + "endOffsets": "3017" } - }, + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-hdpi-v4_values-hdpi-v4.arsc.flat", + "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-tl\\values-tl.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-hdpi-v4\\values-hdpi-v4.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,224,332,449,537,643,764,843,921,1012,1105,1201,1295,1396,1489,1584,1678,1769,1860,1944,2053,2164,2265,2375,2492,2600,2763,2865", - "endColumns": "118,107,116,87,105,120,78,77,90,92,95,93,100,92,94,93,90,90,83,108,110,100,109,116,107,162,101,83", - "endOffsets": "219,327,444,532,638,759,838,916,1007,1100,1196,1290,1391,1484,1579,1673,1764,1855,1939,2048,2159,2260,2370,2487,2595,2758,2860,2944" + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endLines": "6", + "endColumns": "13", + "endOffsets": "327" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-bs_values-bs.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-v16_values-v16.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-bs\\values-bs.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v16\\values-v16.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" + "endLines": "5", + "endColumns": "12", + "endOffsets": "223" }, "to": { - "startLines": "30", + "startLines": "3", "startColumns": "4", - "startOffsets": "2926", - "endColumns": "100", - "endOffsets": "3022" + "startOffsets": "121", + "endLines": "6", + "endColumns": "12", + "endOffsets": "289" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-bs\\values-bs.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-v16\\values-v16.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,224,333,440,526,630,752,834,915,1006,1099,1195,1289,1390,1483,1578,1677,1768,1859,1945,2048,2153,2251,2356,2469,2572,2745,2842", - "endColumns": "118,108,106,85,103,121,81,80,90,92,95,93,100,92,94,98,90,90,85,102,104,97,104,112,102,172,96,83", - "endOffsets": "219,328,435,521,625,747,829,910,1001,1094,1190,1284,1385,1478,1573,1672,1763,1854,1940,2043,2148,2246,2351,2464,2567,2740,2837,2921" + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "65", + "endOffsets": "116" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-hi_values-hi.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ml_values-ml.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-hi\\values-hi.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ml\\values-ml.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,211,308,418,504,606,728,805,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1912,2021,2124,2226,2336,2437,2549,2711,2812", - "endColumns": "105,96,109,85,101,121,76,77,90,92,95,93,100,92,94,93,90,90,89,108,102,101,109,100,111,161,100,79", - "endOffsets": "206,303,413,499,601,723,800,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1907,2016,2119,2221,2331,2432,2544,2706,2807,2887" + "startOffsets": "105,224,342,457,550,655,787,864,940,1031,1124,1226,1320,1421,1515,1610,1709,1800,1891,1973,2084,2190,2288,2402,2502,2613,2772,2873", + "endColumns": "118,117,114,92,104,131,76,75,90,92,101,93,100,93,94,98,90,90,81,110,105,97,113,99,110,158,100,81", + "endOffsets": "219,337,452,545,650,782,859,935,1026,1119,1221,1315,1416,1510,1605,1704,1795,1886,1968,2079,2185,2283,2397,2497,2608,2767,2868,2950" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-hi\\values-hi.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ml\\values-ml.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2855,87 +2756,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2892", - "endColumns": "100", - "endOffsets": "2988" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ - { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.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", - "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", - "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" - }, - "to": { - "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,129", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "384,479,572,672,754,851,959,1035,1111,1203,1297,1395,1491,1587,1681,1777,1869,1961,2053,2131,2227,2323,2418,2515,2610,2710,2860,8180", - "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77", - "endOffsets": "474,567,667,749,846,954,1030,1106,1198,1292,1390,1486,1582,1676,1772,1864,1956,2048,2126,2222,2318,2413,2510,2605,2705,2855,2949,8253" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "132", - "startColumns": "4", - "startOffsets": "8377", + "startOffsets": "2955", "endColumns": "100", - "endOffsets": "8473" - } - }, - { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,130,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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", - "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,6782,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,47,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,6825,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,130,131,133,134,135,136,137,138,139,140,141,142,143", - "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": "215,2954,3026,3092,3165,3215,3255,3303,3351,3396,3453,3507,3557,3598,3660,3728,3805,3864,3930,3993,4048,4108,4171,4225,4285,4338,4400,4484,4564,4614,4673,4716,4769,4812,4863,4913,4973,5026,5077,5123,5171,5219,5265,5314,5361,5411,5456,5515,5567,5619,5671,5714,5762,5807,5854,5910,5965,6020,6064,6106,6147,6197,6256,6299,6342,6393,6437,6486,6535,6582,6629,6676,6721,6772,6825,6900,6959,7016,7090,7154,7223,7301,7411,7515,7588,7654,7709,7774,7839,7888,7971,8049,8087,8132,8258,8320,8478,8533,8592,8659,8717,8779,8827,8872,8920,8971,9037", - "endLines": "8,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,130,131,133,134,135,136,137,138,139,140,141,142,143", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,40,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,51,42,47,44,46,55,54,54,43,41,40,49,58,42,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,3021,3087,3160,3210,3250,3298,3346,3391,3448,3502,3552,3593,3655,3723,3800,3859,3925,3988,4043,4103,4166,4220,4280,4333,4395,4479,4559,4609,4668,4711,4764,4807,4858,4908,4968,5021,5072,5118,5166,5214,5260,5309,5356,5406,5451,5510,5562,5614,5666,5709,5757,5802,5849,5905,5960,6015,6059,6101,6142,6192,6251,6294,6337,6388,6432,6481,6530,6577,6624,6671,6716,6767,6820,6895,6954,7011,7085,7149,7218,7296,7406,7510,7583,7649,7704,7769,7834,7883,7966,8044,8082,8127,8175,8315,8372,8528,8587,8654,8712,8774,8822,8867,8915,8966,9032,9098" + "endOffsets": "3051" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-fr_values-fr.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-en-rGB_values-en-rGB.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-fr\\values-fr.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2946,38 +2778,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2945", + "startOffsets": "2846", "endColumns": "100", - "endOffsets": "3041" + "endOffsets": "2942" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-fr\\values-fr.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,216,331,442,524,630,760,843,923,1014,1107,1206,1301,1402,1495,1588,1683,1774,1865,1951,2061,2173,2276,2387,2494,2601,2760,2859", - "endColumns": "110,114,110,81,105,129,82,79,90,92,98,94,100,92,92,94,90,90,85,109,111,102,110,106,106,158,98,85", - "endOffsets": "211,326,437,519,625,755,838,918,1009,1102,1201,1296,1397,1490,1583,1678,1769,1860,1946,2056,2168,2271,2382,2489,2596,2755,2854,2940" + "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", + "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", + "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-ja_values-ja.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-hr_values-hr.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ja\\values-ja.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-hr\\values-hr.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,202,295,400,482,580,688,765,841,932,1025,1121,1215,1316,1409,1504,1598,1689,1780,1858,1960,2059,2154,2257,2352,2448,2596,2693", - "endColumns": "96,92,104,81,97,107,76,75,90,92,95,93,100,92,94,93,90,90,77,101,98,94,102,94,95,147,96,77", - "endOffsets": "197,290,395,477,575,683,760,836,927,1020,1116,1210,1311,1404,1499,1593,1684,1775,1853,1955,2054,2149,2252,2347,2443,2591,2688,2766" + "startOffsets": "105,210,307,417,503,607,726,810,893,984,1077,1173,1267,1368,1461,1556,1655,1746,1837,1923,2027,2140,2246,2351,2464,2571,2740,2837", + "endColumns": "104,96,109,85,103,118,83,82,90,92,95,93,100,92,94,98,90,90,85,103,112,105,104,112,106,168,96,88", + "endOffsets": "205,302,412,498,602,721,805,888,979,1072,1168,1262,1363,1456,1551,1650,1741,1832,1918,2022,2135,2241,2346,2459,2566,2735,2832,2921" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ja\\values-ja.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-hr\\values-hr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2988,28 +2820,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2771", + "startOffsets": "2926", "endColumns": "100", - "endOffsets": "2867" + "endOffsets": "3022" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-pt_values-pt.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-cs_values-cs.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-pt\\values-pt.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-cs\\values-cs.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,225,331,438,527,628,746,829,909,1000,1093,1189,1283,1384,1477,1572,1667,1758,1849,1936,2043,2155,2257,2365,2472,2582,2744,2844", - "endColumns": "119,105,106,88,100,117,82,79,90,92,95,93,100,92,94,94,90,90,86,106,111,101,107,106,109,161,99,84", - "endOffsets": "220,326,433,522,623,741,824,904,995,1088,1184,1278,1379,1472,1567,1662,1753,1844,1931,2038,2150,2252,2360,2467,2577,2739,2839,2924" + "startOffsets": "105,212,314,423,509,614,731,812,893,984,1077,1173,1267,1362,1455,1550,1647,1738,1829,1913,2017,2126,2225,2331,2441,2548,2711,2809", + "endColumns": "106,101,108,85,104,116,80,80,90,92,95,93,94,92,94,96,90,90,83,103,108,98,105,109,106,162,97,81", + "endOffsets": "207,309,418,504,609,726,807,888,979,1072,1168,1262,1357,1450,1545,1642,1733,1824,1908,2012,2121,2220,2326,2436,2543,2706,2804,2886" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-pt\\values-pt.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-cs\\values-cs.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3020,18 +2852,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2929", + "startOffsets": "2891", "endColumns": "100", - "endOffsets": "3025" + "endOffsets": "2987" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-af_values-af.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ka_values-ka.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-af\\values-af.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ka\\values-ka.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3042,219 +2874,199 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2856", + "startOffsets": "2899", "endColumns": "100", - "endOffsets": "2952" + "endOffsets": "2995" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-af\\values-af.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ka\\values-ka.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,209,309,415,500,603,721,797,874,965,1058,1154,1248,1348,1441,1536,1635,1730,1824,1905,2012,2115,2212,2320,2422,2524,2678,2776", - "endColumns": "103,99,105,84,102,117,75,76,90,92,95,93,99,92,94,98,94,93,80,106,102,96,107,101,101,153,97,79", - "endOffsets": "204,304,410,495,598,716,792,869,960,1053,1149,1243,1343,1436,1531,1630,1725,1819,1900,2007,2110,2207,2315,2417,2519,2673,2771,2851" + "startOffsets": "105,214,318,429,517,622,735,819,901,992,1085,1180,1276,1377,1470,1565,1659,1750,1841,1924,2037,2144,2242,2355,2459,2563,2720,2818", + "endColumns": "108,103,110,87,104,112,83,81,90,92,94,95,100,92,94,93,90,90,82,112,106,97,112,103,103,156,97,80", + "endOffsets": "209,313,424,512,617,730,814,896,987,1080,1175,1271,1372,1465,1560,1654,1745,1836,1919,2032,2139,2237,2350,2454,2558,2715,2813,2894" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values_values.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-pt-rPT_values-pt-rPT.arsc.flat", "map": [ { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "10,18", - "startColumns": "4,4", - "startOffsets": "237,524", - "endLines": "15,21", - "endColumns": "19,19", - "endOffsets": "492,639" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values\\values.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1453,1461,1462,1466,1470,1474,1479,1485,1492,1496,1500,1505,1509,1513,1517,1521,1525,1529,1535,1539,1545,1549,1555,1559,1564,1568,1571,1575,1581,1585,1591,1595,1601,1604,1608,1612,1616,1620,1624,1625,1626,1627,1630,1633,1636,1639,1643,1644,1645,1646,1647,1650,1652,1654,1656,1661,1662,1666,1672,1676,1677,1679,1690,1691,1695,1701,1705,1706,1707,1711,1738,1742,1743,1747,1775,1943,1969,2138,2164,2195,2203,2209,2223,2245,2250,2255,2265,2274,2283,2287,2294,2302,2309,2310,2319,2322,2325,2329,2333,2337,2340,2341,2345,2349,2359,2364,2371,2377,2378,2381,2385,2390,2392,2394,2397,2400,2402,2406,2409,2416,2419,2422,2426,2428,2432,2434,2436,2438,2442,2450,2458,2470,2476,2485,2488,2499,2502,2507,2508,2513,2571,2630,2631,2641,2650,2651,2653,2657,2660,2663,2666,2669,2672,2675,2678,2682,2685,2688,2691,2695,2698,2702,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2726,2728,2730,2731,2732,2733,2734,2735,2736,2737,2739,2740,2742,2743,2745,2747,2748,2750,2751,2752,2753,2754,2755,2757,2758,2759,2760,2761,2762,2764,2766,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2780,2782,2783,2784,2785,2786,2787,2789,2793,2797,2798,2799,2800,2801,2802,2803,2804,2806,2808,2810,2812,2814,2815,2816,2817,2819,2821,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2837,2838,2839,2840,2842,2844,2845,2847,2848,2850,2852,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2865,2867,2868,2869,2870,2872,2873,2874,2875,2876,2878,2880,2882,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,69,152,155,158,161,175,186,196,223,230,241,271,298,307,344,725,730,756,774,810,816,822,845,986,1006,1012,1016,1022,1059,1071,1098,1103,1169,1184,1249,1268,1294", - "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "105,160,205,254,295,350,409,471,552,613,688,764,841,919,1004,1086,1162,1238,1315,1393,1499,1605,1684,1764,1821,1879,1953,2028,2093,2159,2219,2280,2352,2425,2492,2560,2619,2678,2737,2796,2855,2909,2963,3016,3070,3124,3178,3232,3306,3385,3458,3532,3603,3675,3747,3820,3877,3935,4008,4082,4156,4231,4303,4376,4446,4517,4577,70911,70980,71049,71119,71193,71269,71333,71410,71486,71563,71628,71697,71774,71849,71918,71986,72063,72129,72190,72287,72352,72421,72520,72591,72650,72708,72765,72824,72888,72959,73031,73103,73175,73247,73314,73382,73450,73509,73572,73636,73726,73817,73877,73943,74010,74076,74146,74210,74263,74376,74434,74497,74562,74627,74702,74775,74847,74896,74957,75018,75079,75141,75205,75269,75333,75398,75461,75521,75582,75648,75707,75767,75829,75900,75960,76028,76114,76201,76291,76378,76466,76548,76631,76721,76812,76864,76922,76967,77033,77097,77154,77211,77265,77322,77370,77419,77470,77504,77551,77600,77646,77678,77742,77804,77864,77921,77995,78065,78143,78197,78267,78352,78400,78446,78517,78595,78673,78745,78819,78893,78967,79047,79120,79189,79261,79338,79399,79462,79528,79592,79663,79726,79791,79855,79916,79977,80029,80102,80176,80245,80320,80394,80468,80609,80679,80732,80810,80900,80988,81084,81174,81756,81845,82092,82373,82625,82910,83303,83780,84002,84224,84500,84727,84957,85187,85417,85647,85874,86293,86519,86944,87174,87602,87821,88104,88312,88443,88670,89096,89321,89748,89969,90394,90514,90790,91091,91415,91706,92020,92157,92288,92393,92635,92802,93006,93214,93485,93597,93709,93814,93931,94145,94291,94431,94517,94865,94953,95199,95617,95866,95948,96046,96663,96763,97015,97439,97694,97788,97877,98114,100166,100408,100510,100763,102947,113668,115184,126004,127532,129289,129915,130335,131396,132661,132917,133153,133700,134194,134799,134997,135577,136141,136516,136634,137172,137329,137525,137798,138054,138224,138365,138429,138711,138997,139673,139937,140275,140628,140722,140908,141214,141476,141601,141728,141967,142178,142297,142490,142667,143122,143303,143425,143684,143797,143984,144086,144193,144322,144597,145105,145601,146478,146772,147342,147491,148223,148395,148731,148823,149101,153445,157932,157994,158624,159238,159329,159442,159671,159831,159983,160154,160320,160489,160656,160819,161062,161232,161405,161576,161850,162049,162254,162584,162668,162764,162860,162958,163058,163160,163262,163364,163466,163568,163668,163764,163876,164005,164128,164259,164390,164488,164602,164696,164836,164970,165066,165178,165278,165394,165490,165602,165702,165842,165978,166142,166272,166430,166580,166721,166865,167000,167112,167262,167390,167518,167654,167786,167916,168046,168158,168298,168444,168588,168726,168792,168882,168958,169062,169152,169254,169362,169470,169570,169650,169742,169840,169950,170028,170134,170226,170330,170440,170562,170725,170882,170962,171062,171152,171262,171356,171462,171554,171654,171766,171880,171996,172112,172206,172320,172432,172534,172654,172776,172858,172962,173082,173208,173306,173400,173488,173600,173716,173838,173950,174125,174241,174327,174419,174531,174655,174722,174848,174916,175044,175188,175316,175385,175480,175595,175708,175807,175916,176027,176138,176239,176344,176444,176574,176665,176788,176882,176994,177080,177184,177280,177368,177486,177590,177694,177820,177908,178016,178116,178206,178316,178400,178502,178586,178640,178704,178810,178920,179004,4638,9782,9900,10015,10147,10862,11554,12071,13718,14103,14700,16299,17832,18220,20527,40045,40305,41697,42730,44743,45005,45361,46191,52973,54107,54401,54624,54951,57001,57649,59282,59552,63403,64004,67813,69028,70437", - "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1460,1461,1465,1469,1473,1478,1484,1491,1495,1499,1504,1508,1512,1516,1520,1524,1528,1534,1538,1544,1548,1554,1558,1563,1567,1570,1574,1580,1584,1590,1594,1600,1603,1607,1611,1615,1619,1623,1624,1625,1626,1629,1632,1635,1638,1642,1643,1644,1645,1646,1649,1651,1653,1655,1660,1661,1665,1671,1675,1676,1678,1689,1690,1694,1700,1704,1705,1706,1710,1737,1741,1742,1746,1774,1942,1968,2137,2163,2194,2202,2208,2222,2244,2249,2254,2264,2273,2282,2286,2293,2301,2308,2309,2318,2321,2324,2328,2332,2336,2339,2340,2344,2348,2358,2363,2370,2376,2377,2380,2384,2389,2391,2393,2396,2399,2401,2405,2408,2415,2418,2421,2425,2427,2431,2433,2435,2437,2441,2449,2457,2469,2475,2484,2487,2498,2501,2506,2507,2512,2570,2629,2630,2640,2649,2650,2652,2656,2659,2662,2665,2668,2671,2674,2677,2681,2684,2687,2690,2694,2697,2701,2705,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2727,2729,2730,2731,2732,2733,2734,2735,2736,2738,2739,2741,2742,2744,2746,2747,2749,2750,2751,2752,2753,2754,2756,2757,2758,2759,2760,2761,2763,2765,2767,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2781,2782,2783,2784,2785,2786,2788,2792,2796,2797,2798,2799,2800,2801,2802,2803,2805,2807,2809,2811,2813,2814,2815,2816,2818,2820,2822,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2836,2837,2838,2839,2841,2843,2844,2846,2847,2849,2851,2853,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2866,2867,2868,2869,2871,2872,2873,2874,2875,2877,2879,2881,2883,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,151,154,157,160,174,185,195,222,229,240,270,297,306,343,724,729,755,773,809,815,821,844,985,1005,1011,1015,1021,1058,1070,1097,1102,1168,1183,1248,1267,1293,1302", - "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,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,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,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,63,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,91,12,12,12,61,12,12,90,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,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24", - "endOffsets": "155,200,249,290,345,404,466,547,608,683,759,836,914,999,1081,1157,1233,1310,1388,1494,1600,1679,1759,1816,1874,1948,2023,2088,2154,2214,2275,2347,2420,2487,2555,2614,2673,2732,2791,2850,2904,2958,3011,3065,3119,3173,3227,3301,3380,3453,3527,3598,3670,3742,3815,3872,3930,4003,4077,4151,4226,4298,4371,4441,4512,4572,4633,70975,71044,71114,71188,71264,71328,71405,71481,71558,71623,71692,71769,71844,71913,71981,72058,72124,72185,72282,72347,72416,72515,72586,72645,72703,72760,72819,72883,72954,73026,73098,73170,73242,73309,73377,73445,73504,73567,73631,73721,73812,73872,73938,74005,74071,74141,74205,74258,74371,74429,74492,74557,74622,74697,74770,74842,74891,74952,75013,75074,75136,75200,75264,75328,75393,75456,75516,75577,75643,75702,75762,75824,75895,75955,76023,76109,76196,76286,76373,76461,76543,76626,76716,76807,76859,76917,76962,77028,77092,77149,77206,77260,77317,77365,77414,77465,77499,77546,77595,77641,77673,77737,77799,77859,77916,77990,78060,78138,78192,78262,78347,78395,78441,78512,78590,78668,78740,78814,78888,78962,79042,79115,79184,79256,79333,79394,79457,79523,79587,79658,79721,79786,79850,79911,79972,80024,80097,80171,80240,80315,80389,80463,80604,80674,80727,80805,80895,80983,81079,81169,81751,81840,82087,82368,82620,82905,83298,83775,83997,84219,84495,84722,84952,85182,85412,85642,85869,86288,86514,86939,87169,87597,87816,88099,88307,88438,88665,89091,89316,89743,89964,90389,90509,90785,91086,91410,91701,92015,92152,92283,92388,92630,92797,93001,93209,93480,93592,93704,93809,93926,94140,94286,94426,94512,94860,94948,95194,95612,95861,95943,96041,96658,96758,97010,97434,97689,97783,97872,98109,100161,100403,100505,100758,102942,113663,115179,125999,127527,129284,129910,130330,131391,132656,132912,133148,133695,134189,134794,134992,135572,136136,136511,136629,137167,137324,137520,137793,138049,138219,138360,138424,138706,138992,139668,139932,140270,140623,140717,140903,141209,141471,141596,141723,141962,142173,142292,142485,142662,143117,143298,143420,143679,143792,143979,144081,144188,144317,144592,145100,145596,146473,146767,147337,147486,148218,148390,148726,148818,149096,153440,157927,157989,158619,159233,159324,159437,159666,159826,159978,160149,160315,160484,160651,160814,161057,161227,161400,161571,161845,162044,162249,162579,162663,162759,162855,162953,163053,163155,163257,163359,163461,163563,163663,163759,163871,164000,164123,164254,164385,164483,164597,164691,164831,164965,165061,165173,165273,165389,165485,165597,165697,165837,165973,166137,166267,166425,166575,166716,166860,166995,167107,167257,167385,167513,167649,167781,167911,168041,168153,168293,168439,168583,168721,168787,168877,168953,169057,169147,169249,169357,169465,169565,169645,169737,169835,169945,170023,170129,170221,170325,170435,170557,170720,170877,170957,171057,171147,171257,171351,171457,171549,171649,171761,171875,171991,172107,172201,172315,172427,172529,172649,172771,172853,172957,173077,173203,173301,173395,173483,173595,173711,173833,173945,174120,174236,174322,174414,174526,174650,174717,174843,174911,175039,175183,175311,175380,175475,175590,175703,175802,175911,176022,176133,176234,176339,176439,176569,176660,176783,176877,176989,177075,177179,177275,177363,177481,177585,177689,177815,177903,178011,178111,178201,178311,178395,178497,178581,178635,178699,178805,178915,178999,179119,9777,9895,10010,10142,10857,11549,12066,13713,14098,14695,16294,17827,18215,20522,40040,40300,41692,42725,44738,45000,45356,46186,52968,54102,54396,54619,54946,56996,57644,59277,59547,63398,63999,67808,69023,70432,70906" - }, - "to": { - "startLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,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,372,388,389,390,391,392,393,401,402,406,410,414,419,425,432,436,440,445,449,453,457,461,465,469,475,479,485,489,495,499,504,508,511,515,521,525,531,535,541,544,548,552,556,560,564,565,566,567,570,573,576,579,583,584,585,586,587,590,592,594,596,601,602,606,612,616,617,619,630,631,635,641,645,646,647,651,678,682,683,687,715,882,908,1076,1102,1133,1141,1147,1161,1183,1188,1193,1203,1212,1221,1225,1232,1240,1247,1248,1257,1260,1263,1267,1271,1275,1278,1279,1283,1287,1297,1302,1309,1315,1316,1319,1323,1328,1330,1332,1335,1338,1340,1344,1347,1354,1357,1360,1364,1366,1370,1372,1374,1376,1380,1388,1396,1408,1414,1423,1426,1437,1440,1445,1446,1466,1524,1583,1584,1594,1603,1604,1606,1610,1613,1616,1619,1622,1625,1628,1631,1635,1638,1641,1644,1648,1651,1655,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1681,1683,1684,1685,1686,1687,1688,1689,1690,1692,1693,1695,1696,1698,1700,1701,1703,1704,1705,1706,1707,1708,1710,1711,1712,1713,1714,1726,1728,1730,1760,1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1772,1774,1775,1776,1777,1778,1779,1781,1785,1795,1796,1797,1798,1799,1800,1801,1806,1808,1810,1812,1814,1816,1817,1818,1819,1821,1823,1825,1826,1827,1828,1829,1830,1831,1832,1833,1834,1835,1836,1839,1840,1841,1842,1844,1846,1847,1849,1850,1852,1854,1856,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,1867,1869,1870,1871,1872,1874,1875,1876,1877,1878,1880,1882,1884,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899,1912,1987,1990,1993,1996,2010,2016,2026,2042,2048,2058,2087,2114,2123,2152,2495,2506,2622,2735,2759,2765,2771,2792,2916,2936,2942,2946,2952,2987,2999,3015,3019,3085,3100,3151,3163,3189", - "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "481,536,581,630,671,726,785,847,928,989,1064,1140,1217,1295,1380,1462,1538,1664,1741,1819,1925,2031,2110,2190,2247,2305,2379,2454,2519,2585,2645,2706,2778,2851,2918,3192,3251,3310,3369,3428,3487,3541,3595,3648,3702,3756,3810,3996,4070,4149,4222,4296,4367,4439,4511,4584,4641,4699,4772,4846,4920,4995,5067,5140,5210,5281,5341,5459,5528,5597,5667,5741,5817,5881,5958,6034,6111,6176,6245,6322,6397,6466,6534,6611,6677,6738,6835,6900,6969,7068,7139,7198,7256,7313,7372,7436,7507,7579,7651,7723,7795,7862,7930,7998,8057,8120,8184,8274,8365,8425,8491,8558,8624,8694,8758,8811,8924,8982,9045,9110,9175,9250,9323,9395,9444,9505,9566,9627,9689,9753,9817,9881,9946,10009,10069,10130,10196,10255,10315,10377,10448,10508,11064,11150,11237,11327,11414,11502,11584,11667,11757,13088,13140,13198,13243,13309,13373,13430,13487,13689,13746,13794,13843,13894,13998,14045,14094,14412,14444,14508,14570,14630,15110,15184,15254,15332,15386,15456,15541,15589,15635,15706,15784,15862,15934,16008,16082,16156,16236,16309,16378,16450,16527,16588,16651,16717,16781,16852,16915,16980,17044,17105,17166,17218,17291,17365,17434,17509,17583,17657,17798,24353,25514,25592,25682,25770,25866,25956,26538,26627,26874,27155,27407,27692,28085,28562,28784,29006,29282,29509,29739,29969,30199,30429,30656,31075,31301,31726,31956,32384,32603,32886,33094,33225,33452,33878,34103,34530,34751,35176,35296,35572,35873,36197,36488,36802,36939,37070,37175,37417,37584,37788,37996,38267,38379,38491,38596,38713,38927,39073,39213,39299,39647,39735,39981,40399,40648,40730,40828,41420,41520,41772,42196,42451,42545,42634,42871,44895,45137,45239,45492,47648,57777,59293,69521,71049,72806,73432,73852,74913,76178,76434,76670,77217,77711,78316,78514,79094,79658,80033,80151,80689,80846,81042,81315,81571,81741,81882,81946,82228,82514,83190,83454,83792,84145,84239,84425,84731,84993,85118,85245,85484,85695,85814,86007,86184,86639,86820,86942,87201,87314,87501,87603,87710,87839,88114,88622,89118,89995,90289,90859,91008,91740,91912,92248,92340,93407,97689,102114,102176,102754,103338,103429,103542,103771,103931,104083,104254,104420,104589,104756,104919,105162,105332,105505,105676,105950,106149,106354,106684,106768,106864,106960,107058,107158,107260,107362,107464,107566,107668,107768,107864,107976,108105,108228,108359,108490,108588,108702,108796,108936,109070,109166,109278,109378,109494,109590,109702,109802,109942,110078,110242,110372,110530,110680,110821,110965,111100,111212,111362,111490,111618,111754,111886,112016,112146,112258,113156,113302,113446,114930,114996,115086,115162,115266,115356,115458,115566,115674,115774,115854,115946,116044,116154,116232,116338,116430,116534,116644,116766,116929,117446,117526,117626,117716,117826,117920,118026,118346,118446,118558,118672,118788,118904,118998,119112,119224,119326,119446,119568,119650,119754,119874,120000,120098,120192,120280,120392,120508,120630,120742,120917,121033,121119,121211,121323,121447,121514,121640,121708,121836,121980,122108,122177,122272,122387,122500,122599,122708,122819,122930,123031,123136,123236,123366,123457,123580,123674,123786,123872,123976,124072,124160,124278,124382,124486,124612,124700,124808,124908,124998,125108,125192,125294,125378,125432,125496,125602,125712,125796,126606,129222,129340,129455,129535,129896,130129,130646,131071,131249,131533,132877,134238,134626,135704,145222,145568,151588,155538,156289,156551,156751,157130,161408,162014,162243,162394,162609,163692,164004,164415,164542,167568,168169,170090,170430,171741", - "endLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,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,372,388,389,390,391,392,400,401,405,409,413,418,424,431,435,439,444,448,452,456,460,464,468,474,478,484,488,494,498,503,507,510,514,520,524,530,534,540,543,547,551,555,559,563,564,565,566,569,572,575,578,582,583,584,585,586,589,591,593,595,600,601,605,611,615,616,618,629,630,634,640,644,645,646,650,677,681,682,686,714,881,907,1075,1101,1132,1140,1146,1160,1182,1187,1192,1202,1211,1220,1224,1231,1239,1246,1247,1256,1259,1262,1266,1270,1274,1277,1278,1282,1286,1296,1301,1308,1314,1315,1318,1322,1327,1329,1331,1334,1337,1339,1343,1346,1353,1356,1359,1363,1365,1369,1371,1373,1375,1379,1387,1395,1407,1413,1422,1425,1436,1439,1444,1445,1450,1523,1582,1583,1593,1602,1603,1605,1609,1612,1615,1618,1621,1624,1627,1630,1634,1637,1640,1643,1647,1650,1654,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1680,1682,1683,1684,1685,1686,1687,1688,1689,1691,1692,1694,1695,1697,1699,1700,1702,1703,1704,1705,1706,1707,1709,1710,1711,1712,1713,1714,1727,1729,1731,1760,1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1773,1774,1775,1776,1777,1778,1780,1784,1788,1795,1796,1797,1798,1799,1800,1801,1807,1809,1811,1813,1815,1816,1817,1818,1820,1822,1824,1825,1826,1827,1828,1829,1830,1831,1832,1833,1834,1835,1838,1839,1840,1841,1843,1845,1846,1848,1849,1851,1853,1855,1856,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,1868,1869,1870,1871,1873,1874,1875,1876,1877,1879,1881,1883,1885,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899,1986,1989,1992,1995,2009,2015,2025,2041,2047,2057,2086,2113,2122,2151,2494,2498,2531,2639,2758,2764,2770,2791,2915,2935,2941,2945,2951,2986,2998,3014,3018,3084,3099,3150,3162,3188,3195", - "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,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,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,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,63,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,91,12,12,12,61,12,12,90,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,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24", - "endOffsets": "531,576,625,666,721,780,842,923,984,1059,1135,1212,1290,1375,1457,1533,1609,1736,1814,1920,2026,2105,2185,2242,2300,2374,2449,2514,2580,2640,2701,2773,2846,2913,2981,3246,3305,3364,3423,3482,3536,3590,3643,3697,3751,3805,3859,4065,4144,4217,4291,4362,4434,4506,4579,4636,4694,4767,4841,4915,4990,5062,5135,5205,5276,5336,5397,5523,5592,5662,5736,5812,5876,5953,6029,6106,6171,6240,6317,6392,6461,6529,6606,6672,6733,6830,6895,6964,7063,7134,7193,7251,7308,7367,7431,7502,7574,7646,7718,7790,7857,7925,7993,8052,8115,8179,8269,8360,8420,8486,8553,8619,8689,8753,8806,8919,8977,9040,9105,9170,9245,9318,9390,9439,9500,9561,9622,9684,9748,9812,9876,9941,10004,10064,10125,10191,10250,10310,10372,10443,10503,10571,11145,11232,11322,11409,11497,11579,11662,11752,11843,13135,13193,13238,13304,13368,13425,13482,13536,13741,13789,13838,13889,13923,14040,14089,14135,14439,14503,14565,14625,14682,15179,15249,15327,15381,15451,15536,15584,15630,15701,15779,15857,15929,16003,16077,16151,16231,16304,16373,16445,16522,16583,16646,16712,16776,16847,16910,16975,17039,17100,17161,17213,17286,17360,17429,17504,17578,17652,17793,17863,24401,25587,25677,25765,25861,25951,26533,26622,26869,27150,27402,27687,28080,28557,28779,29001,29277,29504,29734,29964,30194,30424,30651,31070,31296,31721,31951,32379,32598,32881,33089,33220,33447,33873,34098,34525,34746,35171,35291,35567,35868,36192,36483,36797,36934,37065,37170,37412,37579,37783,37991,38262,38374,38486,38591,38708,38922,39068,39208,39294,39642,39730,39976,40394,40643,40725,40823,41415,41515,41767,42191,42446,42540,42629,42866,44890,45132,45234,45487,47643,57772,59288,69516,71044,72801,73427,73847,74908,76173,76429,76665,77212,77706,78311,78509,79089,79653,80028,80146,80684,80841,81037,81310,81566,81736,81877,81941,82223,82509,83185,83449,83787,84140,84234,84420,84726,84988,85113,85240,85479,85690,85809,86002,86179,86634,86815,86937,87196,87309,87496,87598,87705,87834,88109,88617,89113,89990,90284,90854,91003,91735,91907,92243,92335,92613,97684,102109,102171,102749,103333,103424,103537,103766,103926,104078,104249,104415,104584,104751,104914,105157,105327,105500,105671,105945,106144,106349,106679,106763,106859,106955,107053,107153,107255,107357,107459,107561,107663,107763,107859,107971,108100,108223,108354,108485,108583,108697,108791,108931,109065,109161,109273,109373,109489,109585,109697,109797,109937,110073,110237,110367,110525,110675,110816,110960,111095,111207,111357,111485,111613,111749,111881,112011,112141,112253,112393,113297,113441,113579,114991,115081,115157,115261,115351,115453,115561,115669,115769,115849,115941,116039,116149,116227,116333,116425,116529,116639,116761,116924,117081,117521,117621,117711,117821,117915,118021,118113,118441,118553,118667,118783,118899,118993,119107,119219,119321,119441,119563,119645,119749,119869,119995,120093,120187,120275,120387,120503,120625,120737,120912,121028,121114,121206,121318,121442,121509,121635,121703,121831,121975,122103,122172,122267,122382,122495,122594,122703,122814,122925,123026,123131,123231,123361,123452,123575,123669,123781,123867,123971,124067,124155,124273,124377,124481,124607,124695,124803,124903,124993,125103,125187,125289,125373,125427,125491,125597,125707,125791,125911,129217,129335,129450,129530,129891,130124,130641,131066,131244,131528,132872,134233,134621,135699,145217,145352,146856,152155,156284,156546,156746,157125,161403,162009,162238,162389,162604,163687,163999,164410,164537,167563,168164,170085,170425,171736,171939" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,225,331,438,527,628,752,836,917,1009,1103,1201,1295,1395,1489,1585,1680,1772,1864,1951,2058,2170,2272,2380,2487,2594,2765,2864", + "endColumns": "119,105,106,88,100,123,83,80,91,93,97,93,99,93,95,94,91,91,86,106,111,101,107,106,106,170,98,84", + "endOffsets": "220,326,433,522,623,747,831,912,1004,1098,1196,1290,1390,1484,1580,1675,1767,1859,1946,2053,2165,2267,2375,2482,2589,2760,2859,2944" } }, { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\strings.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml", "from": { - "startLines": "138,72,75,74,73,19,20,21,118,119,127,126,132,26,145,146,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,130,68,47,129,52,51,50,66,46,65,44,45,69,135,133,28,143,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,144,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8279,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,8126,1282,8800,8854,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,8062,3631,2424,8009,2717,2629,2571,3520,2374,3475,2271,2314,3694,8225,8174,1431,8688,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,8735,974,1084", - "endLines": "142,72,75,74,73,19,20,21,118,119,127,126,132,26,145,146,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,130,68,47,129,52,51,50,66,46,65,44,45,69,135,133,28,143,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,144,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,83,53,57,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,42,59,66,51,49,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89", - "endOffsets": "8683,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,8169,1361,8849,8907,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,8120,3689,2466,8057,2767,2712,2624,3577,2419,3515,2309,2369,3756,8272,8219,1481,8730,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,8795,1079,1169" + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" }, "to": { - "startLines": "231,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,373,374,376,377,378,379,380,381,382,383,384,385,386,387", - "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", - "startOffsets": "14757,17868,17964,18047,18143,18212,18255,18307,18359,18408,18471,18529,18580,18628,18712,18766,18824,18918,19026,19097,19181,19264,19330,19413,19515,19576,19638,19689,19767,19820,19880,19985,20044,20146,20201,20272,20321,20379,20426,20485,20542,20613,20674,20731,20781,20833,20886,20936,20986,21046,21099,21165,21227,21290,21353,21400,21453,21508,21596,21654,21716,21766,21811,21854,21914,21981,22033,22083,22138,22185,22240,22293,22340,22393,22449,22497,22552,22605,22689,22756,22820,22916,22990,23071,23160,23323,23467,23546,23621,23703,23762,23842,23922,23977,24099,24202,24243,24296,24406,24480,24616,24684,24770,24850,24919,25013,25072,25127,25189,25249,25314,25424", - "endLines": "235,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,373,374,376,377,378,379,380,381,382,383,384,385,386,387", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,83,53,57,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,42,59,66,51,49,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89", - "endOffsets": "15105,17959,18042,18138,18207,18250,18302,18354,18403,18466,18524,18575,18623,18707,18761,18819,18913,19021,19092,19176,19259,19325,19408,19510,19571,19633,19684,19762,19815,19875,19980,20039,20141,20196,20267,20316,20374,20421,20480,20537,20608,20669,20726,20776,20828,20881,20931,20981,21041,21094,21160,21222,21285,21348,21395,21448,21503,21591,21649,21711,21761,21806,21849,21909,21976,22028,22078,22133,22180,22235,22288,22335,22388,22444,22492,22547,22600,22684,22751,22815,22911,22985,23066,23155,23318,23462,23541,23616,23698,23757,23837,23917,23972,24094,24197,24238,24291,24348,24475,24540,24679,24765,24845,24914,25008,25067,25122,25184,25244,25309,25419,25509" + "startLines": "30", + "startColumns": "4", + "startOffsets": "2949", + "endColumns": "100", + "endOffsets": "3045" } - }, + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-te_values-te.arsc.flat", + "map": [ { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\styles.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-te\\values-te.xml", "from": { - "startLines": "49,55,66,61,15,20,25,31,37,10,43,70,74", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "1798,2043,2507,2299,421,628,837,1066,1314,215,1560,2718,2895", - "endLines": "52,58,69,63,18,23,28,34,40,13,46,72,77", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2001,2249,2713,2454,599,808,1017,1264,1515,393,1756,2889,3120" + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" }, "to": { - "startLines": "1451,1455,1459,1463,1732,1736,1740,1744,1748,1752,1756,1905,1908", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "92618,92826,93037,93247,113584,113767,113952,114137,114340,114546,114729,126200,126376", - "endLines": "1454,1458,1462,1465,1735,1739,1743,1747,1751,1755,1759,1907,1911", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "92821,93032,93242,93402,113762,113947,114132,114335,114541,114724,114925,126371,126601" + "startLines": "30", + "startColumns": "4", + "startOffsets": "2946", + "endColumns": "100", + "endOffsets": "3042" } }, { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\colors.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-te\\values-te.xml", "from": { - "startLines": "21,17,18,19,20,16", - "startColumns": "4,4,4,4,4,4", - "startOffsets": "594,388,439,490,542,331", - "endColumns": "49,50,50,51,51,56", - "endOffsets": "639,434,485,537,589,383" - }, - "to": { - "startLines": "30,49,50,51,52,87", - "startColumns": "4,4,4,4,4,4", - "startOffsets": "1614,2986,3037,3088,3140,5402", - "endColumns": "49,50,50,51,51,56", - "endOffsets": "1659,3032,3083,3135,3187,5454" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,219,328,439,529,634,759,841,923,1014,1107,1203,1297,1398,1491,1586,1681,1772,1863,1947,2060,2168,2267,2378,2480,2597,2763,2864", + "endColumns": "113,108,110,89,104,124,81,81,90,92,95,93,100,92,94,94,90,90,83,112,107,98,110,101,116,165,100,81", + "endOffsets": "214,323,434,524,629,754,836,918,1009,1102,1198,1292,1393,1486,1581,1676,1767,1858,1942,2055,2163,2262,2373,2475,2592,2758,2859,2941" } - }, + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-pt-rBR_values-pt-rBR.arsc.flat", + "map": [ { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\attrs.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml", "from": { - "startLines": "1", + "startLines": "2", "startColumns": "4", - "startOffsets": "16", - "endLines": "4", - "endColumns": "24", - "endOffsets": "207" + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" }, "to": { - "startLines": "2692", + "startLines": "30", "startColumns": "4", - "startOffsets": "154495", - "endLines": "2695", - "endColumns": "24", - "endOffsets": "154684" + "startOffsets": "2929", + "endColumns": "100", + "endOffsets": "3025" } }, { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\themes.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml", "from": { - "startLines": "1,2,8", - "startColumns": "2,4,4", - "startOffsets": "14,77,375", - "endLines": "1,6,11", - "endColumns": "60,12,12", - "endOffsets": "72,369,598" - }, - "to": { - "startLines": "1789,1790,1802", - "startColumns": "4,4,4", - "startOffsets": "117086,117149,118118", - "endLines": "1789,1794,1805", - "endColumns": "62,12,12", - "endOffsets": "117144,117441,118341" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,225,331,438,527,628,746,829,909,1000,1093,1189,1283,1384,1477,1572,1667,1758,1849,1936,2043,2155,2257,2365,2472,2582,2744,2844", + "endColumns": "119,105,106,88,100,117,82,79,90,92,95,93,100,92,94,94,90,90,86,106,111,101,107,106,109,161,99,84", + "endOffsets": "220,326,433,522,623,741,824,904,995,1088,1184,1278,1379,1472,1567,1662,1753,1844,1931,2038,2150,2252,2360,2467,2577,2739,2839,2924" } - }, + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-in_values-in.arsc.flat", + "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\0a4a4ce1bdecc4eec4e4905ca8187ea2\\transformed\\coordinatorlayout-28.0.0\\res\\values\\values.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-in\\values-in.xml", "from": { - "startLines": "2,102,3,13", - "startColumns": "4,4,4,4", - "startOffsets": "55,5935,116,724", - "endLines": "2,104,12,101", - "endColumns": "60,12,24,24", - "endOffsets": "111,6075,719,5930" - }, - "to": { - "startLines": "12,1902,2532,2538", - "startColumns": "4,4,4,4", - "startOffsets": "420,126055,146861,147072", - "endLines": "12,1904,2537,2621", - "endColumns": "60,12,24,24", - "endOffsets": "476,126195,147067,151583" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,215,317,422,509,613,729,811,890,981,1074,1170,1264,1365,1458,1553,1647,1738,1829,1915,2018,2127,2228,2332,2440,2548,2704,2803", + "endColumns": "109,101,104,86,103,115,81,78,90,92,95,93,100,92,94,93,90,90,85,102,108,100,103,107,107,155,98,83", + "endOffsets": "210,312,417,504,608,724,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1824,1910,2013,2122,2223,2327,2435,2543,2699,2798,2882" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values\\values.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-in\\values-in.xml", "from": { - "startLines": "2,3,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,171,172,176,177,178,6,13,56,88,125", - "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", - "startOffsets": "55,124,7725,7795,7863,7935,8005,8066,8140,8213,8274,8335,8397,8461,8523,8584,8652,8752,8812,8878,8951,9020,9077,9129,9191,9263,9339,9374,9409,9459,9520,9577,9611,9646,9681,9751,9822,9939,10140,10250,10451,10580,10652,319,617,3523,5588,7348", - "endLines": "2,3,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,170,171,175,176,177,178,12,55,87,124,131", - "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24", - "endOffsets": "119,182,7790,7858,7930,8000,8061,8135,8208,8269,8330,8392,8456,8518,8579,8647,8747,8807,8873,8946,9015,9072,9124,9186,9258,9334,9369,9404,9454,9515,9572,9606,9641,9676,9746,9817,9934,10135,10245,10446,10575,10647,10714,612,3518,5583,7343,7720" + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" }, "to": { - "startLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,375,1715,1716,1720,1721,1725,1900,1901,2499,2640,2671,2696,2729", - "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", - "startOffsets": "3864,3933,10576,10646,10714,10786,10856,10917,10991,11848,11909,11970,12032,12096,12158,12219,12287,12387,12447,12513,12586,12655,12712,12764,13541,13613,13928,13963,14140,14190,14251,14308,14342,14377,14687,24545,112398,112515,112716,112826,113027,125916,125988,145357,152160,153814,154689,155371", - "endLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,375,1715,1719,1720,1724,1725,1900,1901,2505,2670,2691,2728,2734", - "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24", - "endOffsets": "3928,3991,10641,10709,10781,10851,10912,10986,11059,11904,11965,12027,12091,12153,12214,12282,12382,12442,12508,12581,12650,12707,12759,12821,13608,13684,13958,13993,14185,14246,14303,14337,14372,14407,14752,24611,112510,112711,112821,113022,113151,125983,126050,145563,153809,154490,155366,155533" + "startLines": "30", + "startColumns": "4", + "startOffsets": "2887", + "endColumns": "100", + "endOffsets": "2983" } - }, + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-v22_values-v22.arsc.flat", + "map": [ { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\dimens.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v22\\values-v22.xml", "from": { - "startLines": "15,17,19,21,13", - "startColumns": "4,4,4,4,4", - "startOffsets": "335,409,484,558,262", - "endColumns": "51,52,52,51,51", - "endOffsets": "382,457,532,605,309" + "startLines": "2,3,4,9", + "startColumns": "4,4,4,4", + "startOffsets": "55,130,217,553", + "endLines": "2,3,8,13", + "endColumns": "74,86,12,12", + "endOffsets": "125,212,548,896" }, "to": { - "startLines": "194,195,196,197,198", - "startColumns": "4,4,4,4,4", - "startOffsets": "12826,12878,12931,12984,13036", - "endColumns": "51,52,52,51,51", - "endOffsets": "12873,12926,12979,13031,13083" + "startLines": "2,3,4,9", + "startColumns": "4,4,4,4", + "startOffsets": "55,130,217,487", + "endLines": "2,3,8,13", + "endColumns": "74,86,12,12", + "endOffsets": "125,212,482,764" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-zh-rTW_values-zh-rTW.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "133,72,71,70,69,19,20,21,112,113,121,120,126,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,129,55,56,46,67,57,124,65,44,130,123,49,48,47,63,43,62,41,42,66,128,127,28,136,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6832,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,6606,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,6733,2644,2691,2202,3268,2741,6553,3157,2116,6782,6508,2358,2302,2247,3059,2072,3017,1981,2022,3209,6690,6647,1318,7009,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "endLines": "135,72,71,70,69,19,20,21,112,113,121,120,126,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,129,55,56,46,67,57,124,65,44,130,123,49,48,47,63,43,62,41,42,66,128,127,28,136,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,40,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,51,42,47,44,46,55,54,54,43,41,40,49,58,42,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": "7004,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,6642,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,6777,2686,2736,2242,3322,2788,6600,3204,2154,6825,6548,2400,2353,2297,3109,2111,3054,2017,2067,3263,6728,6685,1364,7048,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + }, + "to": { + "startLines": "6,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,130,131,133,134,135,136,137,138,139,140,141,142,143", + "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": "215,2954,3026,3092,3165,3215,3255,3303,3351,3396,3453,3507,3557,3598,3660,3728,3805,3864,3930,3993,4048,4108,4171,4225,4285,4338,4400,4484,4564,4614,4673,4716,4769,4812,4863,4913,4973,5026,5077,5123,5171,5219,5265,5314,5361,5411,5456,5515,5567,5619,5671,5714,5762,5807,5854,5910,5965,6020,6064,6106,6147,6197,6256,6299,6342,6393,6437,6486,6535,6582,6629,6676,6721,6772,6825,6900,6959,7016,7090,7154,7223,7301,7411,7515,7588,7654,7709,7774,7839,7888,7971,8049,8087,8132,8258,8320,8478,8533,8592,8659,8717,8779,8827,8872,8920,8971,9037", + "endLines": "8,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,130,131,133,134,135,136,137,138,139,140,141,142,143", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,40,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,51,42,47,44,46,55,54,54,43,41,40,49,58,42,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,3021,3087,3160,3210,3250,3298,3346,3391,3448,3502,3552,3593,3655,3723,3800,3859,3925,3988,4043,4103,4166,4220,4280,4333,4395,4479,4559,4609,4668,4711,4764,4807,4858,4908,4968,5021,5072,5118,5166,5214,5260,5309,5356,5406,5451,5510,5562,5614,5666,5709,5757,5802,5849,5905,5960,6015,6059,6101,6142,6192,6251,6294,6337,6388,6432,6481,6530,6577,6624,6671,6716,6767,6820,6895,6954,7011,7085,7149,7218,7296,7406,7510,7583,7649,7704,7769,7834,7883,7966,8044,8082,8127,8175,8315,8372,8528,8587,8654,8712,8774,8822,8867,8915,8966,9032,9098" + } + }, + { + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "16", "startColumns": "4", @@ -3273,7 +3085,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", @@ -3282,15 +3094,15 @@ "endOffsets": "195,288,388,470,567,675,751,827,919,1013,1111,1207,1303,1397,1493,1585,1677,1769,1847,1943,2039,2134,2231,2326,2426,2576,2670,2748" }, "to": { - "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,127", + "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,129", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "384,479,572,672,754,851,959,1035,1111,1203,1297,1395,1491,1587,1681,1777,1869,1961,2053,2131,2227,2323,2418,2515,2610,2710,2860,8083", + "startOffsets": "384,479,572,672,754,851,959,1035,1111,1203,1297,1395,1491,1587,1681,1777,1869,1961,2053,2131,2227,2323,2418,2515,2610,2710,2860,8180", "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77", - "endOffsets": "474,567,667,749,846,954,1030,1106,1198,1292,1390,1486,1582,1676,1772,1864,1956,2048,2126,2222,2318,2413,2510,2605,2705,2855,2949,8156" + "endOffsets": "474,567,667,749,846,954,1030,1106,1198,1292,1390,1486,1582,1676,1772,1864,1956,2048,2126,2222,2318,2413,2510,2605,2705,2855,2949,8253" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3299,64 +3111,45 @@ "endOffsets": "151" }, "to": { - "startLines": "130", + "startLines": "132", "startColumns": "4", - "startOffsets": "8280", + "startOffsets": "8377", "endColumns": "100", - "endOffsets": "8376" - } - }, - { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "130,72,71,70,69,19,20,21,112,113,121,120,126,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,124,65,44,123,49,48,47,63,43,62,41,42,66,128,127,28,133,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6734,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,6606,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,6553,3157,2116,6508,2358,2302,2247,3059,2072,3017,1981,2022,3209,6690,6647,1318,6911,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", - "endLines": "132,72,71,70,69,19,20,21,112,113,121,120,126,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,124,65,44,123,49,48,47,63,43,62,41,42,66,128,127,28,133,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,40,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,42,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": "6906,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,6642,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,6600,3204,2154,6548,2400,2353,2297,3109,2111,3054,2017,2067,3263,6728,6685,1364,6950,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" - }, - "to": { - "startLines": "6,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,128,129,131,132,133,134,135,136,137,138,139,140,141", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,2954,3026,3092,3165,3215,3255,3303,3351,3396,3453,3507,3557,3598,3660,3728,3805,3864,3930,3993,4048,4108,4171,4225,4285,4338,4400,4484,4564,4614,4673,4716,4769,4812,4863,4913,4973,5026,5077,5123,5171,5219,5265,5312,5362,5407,5466,5518,5570,5622,5665,5710,5757,5813,5868,5923,5967,6009,6050,6100,6159,6202,6245,6296,6340,6389,6438,6485,6532,6579,6624,6675,6728,6803,6862,6919,6993,7057,7126,7204,7314,7418,7491,7557,7612,7677,7742,7791,7874,7952,7990,8035,8161,8223,8381,8436,8495,8562,8620,8682,8730,8775,8823,8874,8940", - "endLines": "8,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,128,129,131,132,133,134,135,136,137,138,139,140,141", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,40,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,42,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,3021,3087,3160,3210,3250,3298,3346,3391,3448,3502,3552,3593,3655,3723,3800,3859,3925,3988,4043,4103,4166,4220,4280,4333,4395,4479,4559,4609,4668,4711,4764,4807,4858,4908,4968,5021,5072,5118,5166,5214,5260,5307,5357,5402,5461,5513,5565,5617,5660,5705,5752,5808,5863,5918,5962,6004,6045,6095,6154,6197,6240,6291,6335,6384,6433,6480,6527,6574,6619,6670,6723,6798,6857,6914,6988,7052,7121,7199,7309,7413,7486,7552,7607,7672,7737,7786,7869,7947,7985,8030,8078,8218,8275,8431,8490,8557,8615,8677,8725,8770,8818,8869,8935,9001" + "endOffsets": "8473" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-v18_values-v18.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-v24_values-v24.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v18\\values-v18.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v24\\values-v24.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "48", - "endOffsets": "99" + "startLines": "2,3", + "startColumns": "4,4", + "startOffsets": "55,212", + "endColumns": "156,134", + "endOffsets": "207,342" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-ca_values-ca.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ar_values-ar.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ca\\values-ca.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ar\\values-ar.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,223,329,436,519,627,753,837,918,1009,1102,1196,1291,1390,1483,1576,1670,1761,1852,1935,2046,2155,2253,2363,2467,2575,2735,2834", - "endColumns": "117,105,106,82,107,125,83,80,90,92,93,94,98,92,92,93,90,90,82,110,108,97,109,103,107,159,98,80", - "endOffsets": "218,324,431,514,622,748,832,913,1004,1097,1191,1286,1385,1478,1571,1665,1756,1847,1930,2041,2150,2248,2358,2462,2570,2730,2829,2910" + "startOffsets": "105,222,326,435,517,618,732,811,890,981,1074,1170,1264,1365,1458,1553,1647,1738,1832,1911,2016,2117,2213,2321,2424,2527,2682,2779", + "endColumns": "116,103,108,81,100,113,78,78,90,92,95,93,100,92,94,93,90,93,78,104,100,95,107,102,102,154,96,80", + "endOffsets": "217,321,430,512,613,727,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1827,1906,2011,2112,2208,2316,2419,2522,2677,2774,2855" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ca\\values-ca.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ar\\values-ar.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3367,28 +3160,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2915", + "startOffsets": "2860", "endColumns": "100", - "endOffsets": "3011" + "endOffsets": "2956" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-ru_values-ru.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-uz_values-uz.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ru\\values-ru.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-uz\\values-uz.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,220,322,434,520,625,745,824,902,994,1088,1184,1277,1373,1467,1563,1658,1750,1842,1922,2028,2136,2234,2343,2449,2557,2732,2832", - "endColumns": "114,101,111,85,104,119,78,77,91,93,95,92,95,93,95,94,91,91,79,105,107,97,108,105,107,174,99,80", - "endOffsets": "215,317,429,515,620,740,819,897,989,1083,1179,1272,1368,1462,1558,1653,1745,1837,1917,2023,2131,2229,2338,2444,2552,2727,2827,2908" + "startOffsets": "105,210,314,428,514,614,730,810,889,980,1073,1169,1263,1358,1451,1546,1641,1732,1824,1908,2017,2124,2225,2333,2438,2545,2706,2805", + "endColumns": "104,103,113,85,99,115,79,78,90,92,95,93,94,92,94,94,90,91,83,108,106,100,107,104,106,160,98,83", + "endOffsets": "205,309,423,509,609,725,805,884,975,1068,1164,1258,1353,1446,1541,1636,1727,1819,1903,2012,2119,2220,2328,2433,2540,2701,2800,2884" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ru\\values-ru.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-uz\\values-uz.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3399,50 +3192,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2913", + "startOffsets": "2889", "endColumns": "100", - "endOffsets": "3009" + "endOffsets": "2985" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-gl_values-gl.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-es_values-es.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-gl\\values-gl.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2920", - "endColumns": "100", - "endOffsets": "3016" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-gl\\values-gl.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-es\\values-es.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,217,329,437,522,624,750,834,915,1007,1101,1199,1293,1394,1488,1584,1679,1771,1863,1945,2052,2161,2260,2368,2472,2579,2738,2838", - "endColumns": "111,111,107,84,101,125,83,80,91,93,97,93,100,93,95,94,91,91,81,106,108,98,107,103,106,158,99,81", - "endOffsets": "212,324,432,517,619,745,829,910,1002,1096,1194,1288,1389,1483,1579,1674,1766,1858,1940,2047,2156,2255,2363,2467,2574,2733,2833,2915" + "startOffsets": "105,222,335,443,528,629,757,842,924,1016,1110,1208,1302,1403,1497,1593,1689,1781,1873,1955,2062,2162,2261,2369,2476,2583,2742,2842", + "endColumns": "116,112,107,84,100,127,84,81,91,93,97,93,100,93,95,95,91,91,81,106,99,98,107,106,106,158,99,81", + "endOffsets": "217,330,438,523,624,752,837,919,1011,1105,1203,1297,1398,1492,1588,1684,1776,1868,1950,2057,2157,2256,2364,2471,2578,2737,2837,2919" } - } - ] - }, - { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-gu_values-gu.arsc.flat", - "map": [ + }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-gu\\values-gu.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-es\\values-es.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3453,28 +3224,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2882", + "startOffsets": "2924", "endColumns": "100", - "endOffsets": "2978" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-gu\\values-gu.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,214,318,425,512,613,736,813,891,982,1075,1174,1268,1369,1462,1557,1654,1745,1836,1916,2022,2124,2221,2330,2429,2539,2699,2802", - "endColumns": "108,103,106,86,100,122,76,77,90,92,98,93,100,92,94,96,90,90,79,105,101,96,108,98,109,159,102,79", - "endOffsets": "209,313,420,507,608,731,808,886,977,1070,1169,1263,1364,1457,1552,1649,1740,1831,1911,2017,2119,2216,2325,2424,2534,2694,2797,2877" + "endOffsets": "3020" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-lt_values-lt.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-sl_values-sl.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-lt\\values-lt.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sl\\values-sl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3485,53 +3246,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2978", + "startOffsets": "2936", "endColumns": "100", - "endOffsets": "3074" + "endOffsets": "3032" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-lt\\values-lt.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sl\\values-sl.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,221,322,435,522,631,752,834,915,1009,1105,1203,1299,1403,1499,1597,1700,1794,1888,1973,2082,2191,2291,2401,2505,2618,2794,2895", - "endColumns": "115,100,112,86,108,120,81,80,93,95,97,95,103,95,97,102,93,93,84,108,108,99,109,103,112,175,100,82", - "endOffsets": "216,317,430,517,626,747,829,910,1004,1100,1198,1294,1398,1494,1592,1695,1789,1883,1968,2077,2186,2286,2396,2500,2613,2789,2890,2973" - } - } - ] - }, - { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-large-v4_values-large-v4.arsc.flat", - "map": [ - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-large-v4\\values-large-v4.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10", - "startColumns": "4,4,4,4,4,4,4,4,4", - "startOffsets": "55,114,185,256,326,396,464,532,636", - "endColumns": "58,70,70,69,69,67,67,103,115", - "endOffsets": "109,180,251,321,391,459,527,631,747" + "startOffsets": "105,212,319,427,514,617,736,821,905,997,1091,1187,1281,1377,1471,1567,1667,1759,1851,1935,2043,2152,2252,2365,2472,2576,2756,2853", + "endColumns": "106,106,107,86,102,118,84,83,91,93,95,93,95,93,95,99,91,91,83,107,108,99,112,106,103,179,96,82", + "endOffsets": "207,314,422,509,612,731,816,900,992,1086,1182,1276,1372,1466,1562,1662,1754,1846,1930,2038,2147,2247,2360,2467,2571,2751,2848,2931" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-fi_values-fi.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-it_values-it.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-fi\\values-fi.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-it\\values-it.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,213,313,414,500,605,723,810,892,983,1076,1172,1266,1361,1454,1550,1649,1740,1834,1914,2021,2124,2221,2327,2426,2530,2693,2792", - "endColumns": "107,99,100,85,104,117,86,81,90,92,95,93,94,92,95,98,90,93,79,106,102,96,105,98,103,162,98,79", - "endOffsets": "208,308,409,495,600,718,805,887,978,1071,1167,1261,1356,1449,1545,1644,1735,1829,1909,2016,2119,2216,2322,2421,2525,2688,2787,2867" + "startOffsets": "105,214,314,423,507,616,741,818,894,986,1080,1174,1268,1370,1464,1561,1667,1759,1851,1932,2038,2146,2244,2348,2453,2560,2723,2823", + "endColumns": "108,99,108,83,108,124,76,75,91,93,93,93,101,93,96,105,91,91,80,105,107,97,103,104,106,162,99,82", + "endOffsets": "209,309,418,502,611,736,813,889,981,1075,1169,1263,1365,1459,1556,1662,1754,1846,1927,2033,2141,2239,2343,2448,2555,2718,2818,2901" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-fi\\values-fi.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-it\\values-it.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3542,18 +3288,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2872", + "startOffsets": "2906", "endColumns": "100", - "endOffsets": "2968" + "endOffsets": "3002" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-eu_values-eu.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ky_values-ky.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-eu\\values-eu.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ky\\values-ky.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3564,28 +3310,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2938", + "startOffsets": "2883", "endColumns": "100", - "endOffsets": "3034" + "endOffsets": "2979" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-eu\\values-eu.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ky\\values-ky.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,214,312,422,508,614,738,825,909,1001,1095,1192,1286,1388,1482,1578,1675,1767,1860,1942,2051,2161,2260,2369,2475,2586,2757,2856", - "endColumns": "108,97,109,85,105,123,86,83,91,93,96,93,101,93,95,96,91,92,81,108,109,98,108,105,110,170,98,81", - "endOffsets": "209,307,417,503,609,733,820,904,996,1090,1187,1281,1383,1477,1573,1670,1762,1855,1937,2046,2156,2255,2364,2470,2581,2752,2851,2933" + "startOffsets": "105,209,304,423,507,614,731,809,888,979,1072,1168,1262,1363,1456,1551,1646,1737,1828,1909,2019,2126,2224,2330,2437,2538,2699,2802", + "endColumns": "103,94,118,83,106,116,77,78,90,92,95,93,100,92,94,94,90,90,80,109,106,97,105,106,100,160,102,80", + "endOffsets": "204,299,418,502,609,726,804,883,974,1067,1163,1257,1358,1451,1546,1641,1732,1823,1904,2014,2121,2219,2325,2432,2533,2694,2797,2878" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-or_values-or.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-mk_values-mk.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-or\\values-or.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-mk\\values-mk.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3596,94 +3342,60 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2936", + "startOffsets": "2945", "endColumns": "100", - "endOffsets": "3032" + "endOffsets": "3041" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-or\\values-or.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-mk\\values-mk.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,224,334,441,527,631,751,828,905,996,1089,1186,1281,1382,1475,1570,1666,1757,1847,1929,2039,2144,2250,2361,2464,2582,2745,2847", - "endColumns": "118,109,106,85,103,119,76,76,90,92,96,94,100,92,94,95,90,89,81,109,104,105,110,102,117,162,101,88", - "endOffsets": "219,329,436,522,626,746,823,900,991,1084,1181,1276,1377,1470,1565,1661,1752,1842,1924,2034,2139,2245,2356,2459,2577,2740,2842,2931" + "startOffsets": "105,213,317,425,511,616,735,818,900,997,1096,1193,1293,1400,1499,1600,1696,1793,1884,1971,2077,2184,2285,2392,2503,2607,2763,2861", + "endColumns": "107,103,107,85,104,118,82,81,96,98,96,99,106,98,100,95,96,90,86,105,106,100,106,110,103,155,97,83", + "endOffsets": "208,312,420,506,611,730,813,895,992,1091,1188,1288,1395,1494,1595,1691,1788,1879,1966,2072,2179,2280,2387,2498,2602,2758,2856,2940" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-si_values-si.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-my_values-my.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-si\\values-si.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2903", - "endColumns": "100", - "endOffsets": "2999" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-si\\values-si.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-my\\values-my.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,215,322,429,517,622,738,827,914,1005,1098,1193,1287,1388,1481,1576,1670,1761,1852,1936,2045,2150,2248,2358,2457,2563,2722,2821", - "endColumns": "109,106,106,87,104,115,88,86,90,92,94,93,100,92,94,93,90,90,83,108,104,97,109,98,105,158,98,81", - "endOffsets": "210,317,424,512,617,733,822,909,1000,1093,1188,1282,1383,1476,1571,1665,1756,1847,1931,2040,2145,2243,2353,2452,2558,2717,2816,2898" - } - } - ] - }, - { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-v16_values-v16.arsc.flat", - "map": [ - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-v16\\values-v16.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "65", - "endOffsets": "116" + "startOffsets": "105,214,319,436,529,641,769,847,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1951,2074,2186,2288,2414,2525,2635,2795,2895", + "endColumns": "108,104,116,92,111,127,77,78,90,92,95,93,100,92,94,93,90,90,85,122,111,101,125,110,109,159,99,83", + "endOffsets": "209,314,431,524,636,764,842,921,1012,1105,1201,1295,1396,1489,1584,1678,1769,1860,1946,2069,2181,2283,2409,2520,2630,2790,2890,2974" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v16\\values-v16.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-my\\values-my.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endLines": "5", - "endColumns": "12", - "endOffsets": "223" + "endColumns": "100", + "endOffsets": "151" }, "to": { - "startLines": "3", + "startLines": "30", "startColumns": "4", - "startOffsets": "121", - "endLines": "6", - "endColumns": "12", - "endOffsets": "289" + "startOffsets": "2979", + "endColumns": "100", + "endOffsets": "3075" } } ] }, { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-lo_values-lo.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ko_values-ko.arsc.flat", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-lo\\values-lo.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ko\\values-ko.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3694,19 +3406,19 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2836", + "startOffsets": "2756", "endColumns": "100", - "endOffsets": "2932" + "endOffsets": "2852" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-lo\\values-lo.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ko\\values-ko.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", - "startOffsets": "105,208,305,412,497,602,714,791,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1888,1995,2092,2190,2295,2398,2502,2659,2755", - "endColumns": "102,96,106,84,104,111,76,77,90,92,95,93,100,92,94,93,90,90,79,106,96,97,104,102,103,156,95,80", - "endOffsets": "203,300,407,492,597,709,786,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1883,1990,2087,2185,2290,2393,2497,2654,2750,2831" + "startOffsets": "105,200,294,396,478,576,682,761,837,928,1021,1113,1204,1305,1398,1493,1587,1678,1769,1849,1947,2042,2137,2237,2333,2432,2584,2678", + "endColumns": "94,93,101,81,97,105,78,75,90,92,91,90,100,92,94,93,90,90,79,97,94,94,99,95,98,151,93,77", + "endOffsets": "195,289,391,473,571,677,756,832,923,1016,1108,1199,1300,1393,1488,1582,1673,1764,1844,1942,2037,2132,2232,2328,2427,2579,2673,2751" } } ] diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json index 5dcef22..483c819 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-af/values-af.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-af\\values-af.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-af\\values-af.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-af\\values-af.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-af\\values-af.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json index f78aee8..d8fabe6 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-am/values-am.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-am\\values-am.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-am\\values-am.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-am\\values-am.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-am\\values-am.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json index 5847be9..cf1d301 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ar/values-ar.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ar\\values-ar.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ar\\values-ar.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,222,326,435,517,618,732,811,890,981,1074,1170,1264,1365,1458,1553,1647,1738,1832,1911,2016,2117,2213,2321,2424,2527,2682,2779", + "endColumns": "116,103,108,81,100,113,78,78,90,92,95,93,100,92,94,93,90,93,78,104,100,95,107,102,102,154,96,80", + "endOffsets": "217,321,430,512,613,727,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1827,1906,2011,2112,2208,2316,2419,2522,2677,2774,2855" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ar\\values-ar.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "2956" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ar\\values-ar.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,222,326,435,517,618,732,811,890,981,1074,1170,1264,1365,1458,1553,1647,1738,1832,1911,2016,2117,2213,2321,2424,2527,2682,2779", - "endColumns": "116,103,108,81,100,113,78,78,90,92,95,93,100,92,94,93,90,93,78,104,100,95,107,102,102,154,96,80", - "endOffsets": "217,321,430,512,613,727,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1827,1906,2011,2112,2208,2316,2419,2522,2677,2774,2855" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json index 6fd55a8..46b1a76 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-as/values-as.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-as\\values-as.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,213,312,419,515,617,736,816,896,987,1080,1173,1268,1368,1461,1558,1652,1743,1834,1923,2025,2140,2243,2352,2471,2591,2758,2861", - "endColumns": "107,98,106,95,101,118,79,79,90,92,92,94,99,92,96,93,90,90,88,101,114,102,108,118,119,166,102,88", - "endOffsets": "208,307,414,510,612,731,811,891,982,1075,1168,1263,1363,1456,1553,1647,1738,1829,1918,2020,2135,2238,2347,2466,2586,2753,2856,2945" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-as\\values-as.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-as\\values-as.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "3046" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-as\\values-as.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,213,312,419,515,617,736,816,896,987,1080,1173,1268,1368,1461,1558,1652,1743,1834,1923,2025,2140,2243,2352,2471,2591,2758,2861", + "endColumns": "107,98,106,95,101,118,79,79,90,92,92,94,99,92,96,93,90,90,88,101,114,102,108,118,119,166,102,88", + "endOffsets": "208,307,414,510,612,731,811,891,982,1075,1168,1263,1363,1456,1553,1647,1738,1829,1918,2020,2135,2238,2347,2466,2586,2753,2856,2945" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json index dea9603..1b1cca2 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-az/values-az.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-az\\values-az.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,213,312,424,512,619,733,814,893,984,1077,1172,1271,1372,1465,1560,1655,1746,1838,1923,2030,2137,2237,2346,2450,2560,2718,2820", - "endColumns": "107,98,111,87,106,113,80,78,90,92,94,98,100,92,94,94,90,91,84,106,106,99,108,103,109,157,101,82", - "endOffsets": "208,307,419,507,614,728,809,888,979,1072,1167,1266,1367,1460,1555,1650,1741,1833,1918,2025,2132,2232,2341,2445,2555,2713,2815,2898" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-az\\values-az.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-az\\values-az.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "2999" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-az\\values-az.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,213,312,424,512,619,733,814,893,984,1077,1172,1271,1372,1465,1560,1655,1746,1838,1923,2030,2137,2237,2346,2450,2560,2718,2820", + "endColumns": "107,98,111,87,106,113,80,78,90,92,94,98,100,92,94,94,90,91,84,106,106,99,108,103,109,157,101,82", + "endOffsets": "208,307,419,507,614,728,809,888,979,1072,1167,1266,1367,1460,1555,1650,1741,1833,1918,2025,2132,2232,2341,2445,2555,2713,2815,2898" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json index 49a2c65..3f0718c 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-b+sr+Latn/values-b+sr+Latn.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json index afe195d..a82f9f4 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-be/values-be.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-be\\values-be.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,225,328,444,530,638,756,835,913,1005,1099,1195,1289,1385,1479,1575,1670,1762,1854,1937,2043,2149,2247,2355,2460,2565,2734,2834", - "endColumns": "119,102,115,85,107,117,78,77,91,93,95,93,95,93,95,94,91,91,82,105,105,97,107,104,104,168,99,80", - "endOffsets": "220,323,439,525,633,751,830,908,1000,1094,1190,1284,1380,1474,1570,1665,1757,1849,1932,2038,2144,2242,2350,2455,2560,2729,2829,2910" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-be\\values-be.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-be\\values-be.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "3011" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-be\\values-be.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,225,328,444,530,638,756,835,913,1005,1099,1195,1289,1385,1479,1575,1670,1762,1854,1937,2043,2149,2247,2355,2460,2565,2734,2834", + "endColumns": "119,102,115,85,107,117,78,77,91,93,95,93,95,93,95,94,91,91,82,105,105,97,107,104,104,168,99,80", + "endOffsets": "220,323,439,525,633,751,830,908,1000,1094,1190,1284,1380,1474,1570,1665,1757,1849,1932,2038,2144,2242,2350,2455,2560,2729,2829,2910" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json index 853af4e..4ea4b6d 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-bg/values-bg.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-bg\\values-bg.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-bg\\values-bg.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,220,327,432,518,623,744,823,901,992,1085,1181,1275,1376,1469,1564,1672,1763,1854,1937,2051,2160,2260,2374,2480,2588,2748,2847", + "endColumns": "114,106,104,85,104,120,78,77,90,92,95,93,100,92,94,107,90,90,82,113,108,99,113,105,107,159,98,82", + "endOffsets": "215,322,427,513,618,739,818,896,987,1080,1176,1270,1371,1464,1559,1667,1758,1849,1932,2046,2155,2255,2369,2475,2583,2743,2842,2925" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-bg\\values-bg.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3026" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-bg\\values-bg.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,220,327,432,518,623,744,823,901,992,1085,1181,1275,1376,1469,1564,1672,1763,1854,1937,2051,2160,2260,2374,2480,2588,2748,2847", - "endColumns": "114,106,104,85,104,120,78,77,90,92,95,93,100,92,94,107,90,90,82,113,108,99,113,105,107,159,98,82", - "endOffsets": "215,322,427,513,618,739,818,896,987,1080,1176,1270,1371,1464,1559,1667,1758,1849,1932,2046,2155,2255,2369,2475,2583,2743,2842,2925" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json index cd8f418..3567839 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-bn/values-bn.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-bn\\values-bn.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-bn\\values-bn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-bn\\values-bn.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-bn\\values-bn.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json index 7f27e64..f8b864a 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-bs/values-bs.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-bs\\values-bs.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-bs\\values-bs.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-bs\\values-bs.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-bs\\values-bs.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json index 56d184a..06eb08d 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ca/values-ca.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ca\\values-ca.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,223,329,436,519,627,753,837,918,1009,1102,1196,1291,1390,1483,1576,1670,1761,1852,1935,2046,2155,2253,2363,2467,2575,2735,2834", - "endColumns": "117,105,106,82,107,125,83,80,90,92,93,94,98,92,92,93,90,90,82,110,108,97,109,103,107,159,98,80", - "endOffsets": "218,324,431,514,622,748,832,913,1004,1097,1191,1286,1385,1478,1571,1665,1756,1847,1930,2041,2150,2248,2358,2462,2570,2730,2829,2910" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ca\\values-ca.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ca\\values-ca.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "3011" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ca\\values-ca.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,223,329,436,519,627,753,837,918,1009,1102,1196,1291,1390,1483,1576,1670,1761,1852,1935,2046,2155,2253,2363,2467,2575,2735,2834", + "endColumns": "117,105,106,82,107,125,83,80,90,92,93,94,98,92,92,93,90,90,82,110,108,97,109,103,107,159,98,80", + "endOffsets": "218,324,431,514,622,748,832,913,1004,1097,1191,1286,1385,1478,1571,1665,1756,1847,1930,2041,2150,2248,2358,2462,2570,2730,2829,2910" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json index 24fa791..8c923de 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-cs/values-cs.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-cs\\values-cs.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-cs\\values-cs.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", @@ -14,7 +14,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-cs\\values-cs.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-cs\\values-cs.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json index 53289bf..ce1ba8a 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-da/values-da.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-da\\values-da.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-da\\values-da.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-da\\values-da.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-da\\values-da.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json index ea47cef..c9be804 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-de/values-de.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-de\\values-de.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-de\\values-de.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-de\\values-de.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-de\\values-de.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json index f74c071..e7071c0 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-el/values-el.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-el\\values-el.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-el\\values-el.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,223,334,451,536,641,767,855,941,1032,1125,1221,1315,1416,1509,1604,1701,1792,1883,1968,2079,2189,2291,2402,2511,2619,2779,2879", + "endColumns": "117,110,116,84,104,125,87,85,90,92,95,93,100,92,94,96,90,90,84,110,109,101,110,108,107,159,99,84", + "endOffsets": "218,329,446,531,636,762,850,936,1027,1120,1216,1310,1411,1504,1599,1696,1787,1878,1963,2074,2184,2286,2397,2506,2614,2774,2874,2959" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-el\\values-el.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3060" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-el\\values-el.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,223,334,451,536,641,767,855,941,1032,1125,1221,1315,1416,1509,1604,1701,1792,1883,1968,2079,2189,2291,2402,2511,2619,2779,2879", - "endColumns": "117,110,116,84,104,125,87,85,90,92,95,93,100,92,94,96,90,90,84,110,109,101,110,108,107,159,99,84", - "endOffsets": "218,329,446,531,636,762,850,936,1027,1120,1216,1310,1411,1504,1599,1696,1787,1878,1963,2074,2184,2286,2397,2506,2614,2774,2874,2959" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json index 376f742..9e8c592 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-en-rAU/values-en-rAU.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json index 6dd55e9..4ecd8df 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-en-rCA/values-en-rCA.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json index b4a26c2..1cec7e1 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-en-rGB/values-en-rGB.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", - "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", - "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "2942" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", + "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", + "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json index a761850..7e75cec 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-en-rIN/values-en-rIN.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", - "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", - "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "2942" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", + "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", + "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json index b898d10..8946557 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-en-rXC/values-en-rXC.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,310,510,719,904,1106,1321,1494,1671,1862,2055,2253,2449,2652,2847,3044,3239,3432,3623,3807,4011,4216,4417,4624,4826,5031,5303,5503", - "endColumns": "204,199,208,184,201,214,172,176,190,192,197,195,202,194,196,194,192,190,183,203,204,200,206,201,204,271,199,178", - "endOffsets": "305,505,714,899,1101,1316,1489,1666,1857,2050,2248,2444,2647,2842,3039,3234,3427,3618,3802,4006,4211,4412,4619,4821,5026,5298,5498,5677" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "202", "endOffsets": "5880" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,310,510,719,904,1106,1321,1494,1671,1862,2055,2253,2449,2652,2847,3044,3239,3432,3623,3807,4011,4216,4417,4624,4826,5031,5303,5503", + "endColumns": "204,199,208,184,201,214,172,176,190,192,197,195,202,194,196,194,192,190,183,203,204,200,206,201,204,271,199,178", + "endOffsets": "305,505,714,899,1101,1316,1489,1666,1857,2050,2248,2444,2647,2842,3039,3234,3427,3618,3802,4006,4211,4412,4619,4821,5026,5298,5498,5677" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json index 0c55b11..251772c 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-es-rUS/values-es-rUS.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", @@ -14,7 +14,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json index af20c20..4c9d349 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-es/values-es.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-es\\values-es.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-es\\values-es.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", @@ -14,7 +14,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-es\\values-es.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-es\\values-es.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json index b3908f8..85dee90 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-et/values-et.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-et\\values-et.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,222,329,440,526,628,745,825,903,995,1089,1194,1296,1406,1500,1601,1695,1787,1880,1963,2074,2179,2278,2388,2489,2592,2758,2860", - "endColumns": "116,106,110,85,101,116,79,77,91,93,104,101,109,93,100,93,91,92,82,110,104,98,109,100,102,165,101,81", - "endOffsets": "217,324,435,521,623,740,820,898,990,1084,1189,1291,1401,1495,1596,1690,1782,1875,1958,2069,2174,2273,2383,2484,2587,2753,2855,2937" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-et\\values-et.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-et\\values-et.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "3038" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-et\\values-et.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,222,329,440,526,628,745,825,903,995,1089,1194,1296,1406,1500,1601,1695,1787,1880,1963,2074,2179,2278,2388,2489,2592,2758,2860", + "endColumns": "116,106,110,85,101,116,79,77,91,93,104,101,109,93,100,93,91,92,82,110,104,98,109,100,102,165,101,81", + "endOffsets": "217,324,435,521,623,740,820,898,990,1084,1189,1291,1401,1495,1596,1690,1782,1875,1958,2069,2174,2273,2383,2484,2587,2753,2855,2937" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json index 184f9f6..3c7d9ad 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-eu/values-eu.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-eu\\values-eu.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-eu\\values-eu.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-eu\\values-eu.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-eu\\values-eu.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json index d618b3d..67db820 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-fa/values-fa.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-fa\\values-fa.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-fa\\values-fa.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,215,318,429,513,616,731,810,888,981,1076,1172,1266,1369,1464,1561,1660,1753,1843,1924,2036,2139,2237,2347,2451,2560,2721,2822", + "endColumns": "109,102,110,83,102,114,78,77,92,94,95,93,102,94,96,98,92,89,80,111,102,97,109,103,108,160,100,80", + "endOffsets": "210,313,424,508,611,726,805,883,976,1071,1167,1261,1364,1459,1556,1655,1748,1838,1919,2031,2134,2232,2342,2446,2555,2716,2817,2898" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-fa\\values-fa.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "2999" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-fa\\values-fa.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,215,318,429,513,616,731,810,888,981,1076,1172,1266,1369,1464,1561,1660,1753,1843,1924,2036,2139,2237,2347,2451,2560,2721,2822", - "endColumns": "109,102,110,83,102,114,78,77,92,94,95,93,102,94,96,98,92,89,80,111,102,97,109,103,108,160,100,80", - "endOffsets": "210,313,424,508,611,726,805,883,976,1071,1167,1261,1364,1459,1556,1655,1748,1838,1919,2031,2134,2232,2342,2446,2555,2716,2817,2898" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json index cbe1611..d2a31d0 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-fi/values-fi.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-fi\\values-fi.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,213,313,414,500,605,723,810,892,983,1076,1172,1266,1361,1454,1550,1649,1740,1834,1914,2021,2124,2221,2327,2426,2530,2693,2792", - "endColumns": "107,99,100,85,104,117,86,81,90,92,95,93,94,92,95,98,90,93,79,106,102,96,105,98,103,162,98,79", - "endOffsets": "208,308,409,495,600,718,805,887,978,1071,1167,1261,1356,1449,1545,1644,1735,1829,1909,2016,2119,2216,2322,2421,2525,2688,2787,2867" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-fi\\values-fi.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-fi\\values-fi.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "2968" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-fi\\values-fi.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,213,313,414,500,605,723,810,892,983,1076,1172,1266,1361,1454,1550,1649,1740,1834,1914,2021,2124,2221,2327,2426,2530,2693,2792", + "endColumns": "107,99,100,85,104,117,86,81,90,92,95,93,94,92,95,98,90,93,79,106,102,96,105,98,103,162,98,79", + "endOffsets": "208,308,409,495,600,718,805,887,978,1071,1167,1261,1356,1449,1545,1644,1735,1829,1909,2016,2119,2216,2322,2421,2525,2688,2787,2867" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json index 4d68cba..214cf8c 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-fr-rCA/values-fr-rCA.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json index 9cae062..b43dfc6 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-fr/values-fr.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-fr\\values-fr.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-fr\\values-fr.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,216,331,442,524,630,760,843,923,1014,1107,1206,1301,1402,1495,1588,1683,1774,1865,1951,2061,2173,2276,2387,2494,2601,2760,2859", + "endColumns": "110,114,110,81,105,129,82,79,90,92,98,94,100,92,92,94,90,90,85,109,111,102,110,106,106,158,98,85", + "endOffsets": "211,326,437,519,625,755,838,918,1009,1102,1201,1296,1397,1490,1583,1678,1769,1860,1946,2056,2168,2271,2382,2489,2596,2755,2854,2940" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-fr\\values-fr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3041" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-fr\\values-fr.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,216,331,442,524,630,760,843,923,1014,1107,1206,1301,1402,1495,1588,1683,1774,1865,1951,2061,2173,2276,2387,2494,2601,2760,2859", - "endColumns": "110,114,110,81,105,129,82,79,90,92,98,94,100,92,92,94,90,90,85,109,111,102,110,106,106,158,98,85", - "endOffsets": "211,326,437,519,625,755,838,918,1009,1102,1201,1296,1397,1490,1583,1678,1769,1860,1946,2056,2168,2271,2382,2489,2596,2755,2854,2940" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json index b4f22c8..c867251 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-gl/values-gl.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-gl\\values-gl.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-gl\\values-gl.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,217,329,437,522,624,750,834,915,1007,1101,1199,1293,1394,1488,1584,1679,1771,1863,1945,2052,2161,2260,2368,2472,2579,2738,2838", + "endColumns": "111,111,107,84,101,125,83,80,91,93,97,93,100,93,95,94,91,91,81,106,108,98,107,103,106,158,99,81", + "endOffsets": "212,324,432,517,619,745,829,910,1002,1096,1194,1288,1389,1483,1579,1674,1766,1858,1940,2047,2156,2255,2363,2467,2574,2733,2833,2915" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-gl\\values-gl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3016" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-gl\\values-gl.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,217,329,437,522,624,750,834,915,1007,1101,1199,1293,1394,1488,1584,1679,1771,1863,1945,2052,2161,2260,2368,2472,2579,2738,2838", - "endColumns": "111,111,107,84,101,125,83,80,91,93,97,93,100,93,95,94,91,91,81,106,108,98,107,103,106,158,99,81", - "endOffsets": "212,324,432,517,619,745,829,910,1002,1096,1194,1288,1389,1483,1579,1674,1766,1858,1940,2047,2156,2255,2363,2467,2574,2733,2833,2915" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json index e272aa0..00eb28a 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-gu/values-gu.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-gu\\values-gu.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-gu\\values-gu.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,214,318,425,512,613,736,813,891,982,1075,1174,1268,1369,1462,1557,1654,1745,1836,1916,2022,2124,2221,2330,2429,2539,2699,2802", + "endColumns": "108,103,106,86,100,122,76,77,90,92,98,93,100,92,94,96,90,90,79,105,101,96,108,98,109,159,102,79", + "endOffsets": "209,313,420,507,608,731,808,886,977,1070,1169,1263,1364,1457,1552,1649,1740,1831,1911,2017,2119,2216,2325,2424,2534,2694,2797,2877" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-gu\\values-gu.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "2978" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-gu\\values-gu.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,214,318,425,512,613,736,813,891,982,1075,1174,1268,1369,1462,1557,1654,1745,1836,1916,2022,2124,2221,2330,2429,2539,2699,2802", - "endColumns": "108,103,106,86,100,122,76,77,90,92,98,93,100,92,94,96,90,90,79,105,101,96,108,98,109,159,102,79", - "endOffsets": "209,313,420,507,608,731,808,886,977,1070,1169,1263,1364,1457,1552,1649,1740,1831,1911,2017,2119,2216,2325,2424,2534,2694,2797,2877" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json index 855212c..dfec8a6 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-h720dp-v13/values-h720dp-v13.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-h720dp-v13\\values-h720dp-v13.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-h720dp-v13\\values-h720dp-v13.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json index f7db320..329c255 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-hdpi-v4/values-hdpi-v4.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-hdpi-v4\\values-hdpi-v4.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-hdpi-v4\\values-hdpi-v4.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json index c8556ac..cdff0bb 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-hi/values-hi.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-hi\\values-hi.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,211,308,418,504,606,728,805,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1912,2021,2124,2226,2336,2437,2549,2711,2812", - "endColumns": "105,96,109,85,101,121,76,77,90,92,95,93,100,92,94,93,90,90,89,108,102,101,109,100,111,161,100,79", - "endOffsets": "206,303,413,499,601,723,800,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1907,2016,2119,2221,2331,2432,2544,2706,2807,2887" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-hi\\values-hi.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-hi\\values-hi.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "2988" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-hi\\values-hi.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,211,308,418,504,606,728,805,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1912,2021,2124,2226,2336,2437,2549,2711,2812", + "endColumns": "105,96,109,85,101,121,76,77,90,92,95,93,100,92,94,93,90,90,89,108,102,101,109,100,111,161,100,79", + "endOffsets": "206,303,413,499,601,723,800,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1907,2016,2119,2221,2331,2432,2544,2706,2807,2887" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json index c92cd2b..e925547 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-hr/values-hr.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-hr\\values-hr.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-hr\\values-hr.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,210,307,417,503,607,726,810,893,984,1077,1173,1267,1368,1461,1556,1655,1746,1837,1923,2027,2140,2246,2351,2464,2571,2740,2837", + "endColumns": "104,96,109,85,103,118,83,82,90,92,95,93,100,92,94,98,90,90,85,103,112,105,104,112,106,168,96,88", + "endOffsets": "205,302,412,498,602,721,805,888,979,1072,1168,1262,1363,1456,1551,1650,1741,1832,1918,2022,2135,2241,2346,2459,2566,2735,2832,2921" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-hr\\values-hr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3022" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-hr\\values-hr.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,210,307,417,503,607,726,810,893,984,1077,1173,1267,1368,1461,1556,1655,1746,1837,1923,2027,2140,2246,2351,2464,2571,2740,2837", - "endColumns": "104,96,109,85,103,118,83,82,90,92,95,93,100,92,94,98,90,90,85,103,112,105,104,112,106,168,96,88", - "endOffsets": "205,302,412,498,602,721,805,888,979,1072,1168,1262,1363,1456,1551,1650,1741,1832,1918,2022,2135,2241,2346,2459,2566,2735,2832,2921" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json index 1b94368..19af076 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-hu/values-hu.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-hu\\values-hu.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-hu\\values-hu.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", @@ -14,7 +14,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-hu\\values-hu.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-hu\\values-hu.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json index cd2142f..6e628e4 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-hy/values-hy.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-hy\\values-hy.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-hy\\values-hy.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,208,309,419,508,614,729,811,892,983,1076,1172,1266,1367,1460,1555,1649,1740,1831,1916,2023,2130,2229,2339,2446,2546,2703,2802", + "endColumns": "102,100,109,88,105,114,81,80,90,92,95,93,100,92,94,93,90,90,84,106,106,98,109,106,99,156,98,81", + "endOffsets": "203,304,414,503,609,724,806,887,978,1071,1167,1261,1362,1455,1550,1644,1735,1826,1911,2018,2125,2224,2334,2441,2541,2698,2797,2879" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-hy\\values-hy.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "2980" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-hy\\values-hy.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,208,309,419,508,614,729,811,892,983,1076,1172,1266,1367,1460,1555,1649,1740,1831,1916,2023,2130,2229,2339,2446,2546,2703,2802", - "endColumns": "102,100,109,88,105,114,81,80,90,92,95,93,100,92,94,93,90,90,84,106,106,98,109,106,99,156,98,81", - "endOffsets": "203,304,414,503,609,724,806,887,978,1071,1167,1261,1362,1455,1550,1644,1735,1826,1911,2018,2125,2224,2334,2441,2541,2698,2797,2879" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json index 2f8cdf5..464ed77 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-in/values-in.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-in\\values-in.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-in\\values-in.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,215,317,422,509,613,729,811,890,981,1074,1170,1264,1365,1458,1553,1647,1738,1829,1915,2018,2127,2228,2332,2440,2548,2704,2803", + "endColumns": "109,101,104,86,103,115,81,78,90,92,95,93,100,92,94,93,90,90,85,102,108,100,103,107,107,155,98,83", + "endOffsets": "210,312,417,504,608,724,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1824,1910,2013,2122,2223,2327,2435,2543,2699,2798,2882" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-in\\values-in.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "2983" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-in\\values-in.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,215,317,422,509,613,729,811,890,981,1074,1170,1264,1365,1458,1553,1647,1738,1829,1915,2018,2127,2228,2332,2440,2548,2704,2803", - "endColumns": "109,101,104,86,103,115,81,78,90,92,95,93,100,92,94,93,90,90,85,102,108,100,103,107,107,155,98,83", - "endOffsets": "210,312,417,504,608,724,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1824,1910,2013,2122,2223,2327,2435,2543,2699,2798,2882" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json index db0541f..213c54a 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-is/values-is.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-is\\values-is.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,205,302,414,499,600,714,794,874,965,1058,1154,1248,1355,1448,1543,1638,1729,1823,1904,2014,2122,2220,2329,2428,2531,2686,2784", - "endColumns": "99,96,111,84,100,113,79,79,90,92,95,93,106,92,94,94,90,93,80,109,107,97,108,98,102,154,97,80", - "endOffsets": "200,297,409,494,595,709,789,869,960,1053,1149,1243,1350,1443,1538,1633,1724,1818,1899,2009,2117,2215,2324,2423,2526,2681,2779,2860" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-is\\values-is.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-is\\values-is.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "2961" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-is\\values-is.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,205,302,414,499,600,714,794,874,965,1058,1154,1248,1355,1448,1543,1638,1729,1823,1904,2014,2122,2220,2329,2428,2531,2686,2784", + "endColumns": "99,96,111,84,100,113,79,79,90,92,95,93,106,92,94,94,90,93,80,109,107,97,108,98,102,154,97,80", + "endOffsets": "200,297,409,494,595,709,789,869,960,1053,1149,1243,1350,1443,1538,1633,1724,1818,1899,2009,2117,2215,2324,2423,2526,2681,2779,2860" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json index a1211df..6c69fa2 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-it/values-it.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-it\\values-it.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-it\\values-it.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,214,314,423,507,616,741,818,894,986,1080,1174,1268,1370,1464,1561,1667,1759,1851,1932,2038,2146,2244,2348,2453,2560,2723,2823", + "endColumns": "108,99,108,83,108,124,76,75,91,93,93,93,101,93,96,105,91,91,80,105,107,97,103,104,106,162,99,82", + "endOffsets": "209,309,418,502,611,736,813,889,981,1075,1169,1263,1365,1459,1556,1662,1754,1846,1927,2033,2141,2239,2343,2448,2555,2718,2818,2901" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-it\\values-it.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3002" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-it\\values-it.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,214,314,423,507,616,741,818,894,986,1080,1174,1268,1370,1464,1561,1667,1759,1851,1932,2038,2146,2244,2348,2453,2560,2723,2823", - "endColumns": "108,99,108,83,108,124,76,75,91,93,93,93,101,93,96,105,91,91,80,105,107,97,103,104,106,162,99,82", - "endOffsets": "209,309,418,502,611,736,813,889,981,1075,1169,1263,1365,1459,1556,1662,1754,1846,1927,2033,2141,2239,2343,2448,2555,2718,2818,2901" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json index 516aced..8d4cb7d 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-iw/values-iw.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-iw\\values-iw.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-iw\\values-iw.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-iw\\values-iw.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-iw\\values-iw.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json index ad1811c..71cb9a6 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ja/values-ja.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ja\\values-ja.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,202,295,400,482,580,688,765,841,932,1025,1121,1215,1316,1409,1504,1598,1689,1780,1858,1960,2059,2154,2257,2352,2448,2596,2693", - "endColumns": "96,92,104,81,97,107,76,75,90,92,95,93,100,92,94,93,90,90,77,101,98,94,102,94,95,147,96,77", - "endOffsets": "197,290,395,477,575,683,760,836,927,1020,1116,1210,1311,1404,1499,1593,1684,1775,1853,1955,2054,2149,2252,2347,2443,2591,2688,2766" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ja\\values-ja.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ja\\values-ja.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "2867" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ja\\values-ja.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,202,295,400,482,580,688,765,841,932,1025,1121,1215,1316,1409,1504,1598,1689,1780,1858,1960,2059,2154,2257,2352,2448,2596,2693", + "endColumns": "96,92,104,81,97,107,76,75,90,92,95,93,100,92,94,93,90,90,77,101,98,94,102,94,95,147,96,77", + "endOffsets": "197,290,395,477,575,683,760,836,927,1020,1116,1210,1311,1404,1499,1593,1684,1775,1853,1955,2054,2149,2252,2347,2443,2591,2688,2766" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json index ae95a8f..6df3472 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ka/values-ka.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ka\\values-ka.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,214,318,429,517,622,735,819,901,992,1085,1180,1276,1377,1470,1565,1659,1750,1841,1924,2037,2144,2242,2355,2459,2563,2720,2818", - "endColumns": "108,103,110,87,104,112,83,81,90,92,94,95,100,92,94,93,90,90,82,112,106,97,112,103,103,156,97,80", - "endOffsets": "209,313,424,512,617,730,814,896,987,1080,1175,1271,1372,1465,1560,1654,1745,1836,1919,2032,2139,2237,2350,2454,2558,2715,2813,2894" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ka\\values-ka.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ka\\values-ka.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "2995" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ka\\values-ka.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,214,318,429,517,622,735,819,901,992,1085,1180,1276,1377,1470,1565,1659,1750,1841,1924,2037,2144,2242,2355,2459,2563,2720,2818", + "endColumns": "108,103,110,87,104,112,83,81,90,92,94,95,100,92,94,93,90,90,82,112,106,97,112,103,103,156,97,80", + "endOffsets": "209,313,424,512,617,730,814,896,987,1080,1175,1271,1372,1465,1560,1654,1745,1836,1919,2032,2139,2237,2350,2454,2558,2715,2813,2894" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json index f8bed15..8418b06 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-kk/values-kk.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-kk\\values-kk.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-kk\\values-kk.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", @@ -14,7 +14,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-kk\\values-kk.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-kk\\values-kk.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json index 014d0ff..5e51bf7 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-km/values-km.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-km\\values-km.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-km\\values-km.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", @@ -14,7 +14,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-km\\values-km.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-km\\values-km.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json index 4d786c1..c2b6f3e 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-kn/values-kn.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-kn\\values-kn.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,223,335,448,536,643,770,847,924,1015,1108,1204,1298,1399,1492,1587,1681,1772,1863,1945,2061,2172,2271,2384,2488,2602,2766,2866", - "endColumns": "117,111,112,87,106,126,76,76,90,92,95,93,100,92,94,93,90,90,81,115,110,98,112,103,113,163,99,81", - "endOffsets": "218,330,443,531,638,765,842,919,1010,1103,1199,1293,1394,1487,1582,1676,1767,1858,1940,2056,2167,2266,2379,2483,2597,2761,2861,2943" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-kn\\values-kn.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-kn\\values-kn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "3044" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-kn\\values-kn.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,223,335,448,536,643,770,847,924,1015,1108,1204,1298,1399,1492,1587,1681,1772,1863,1945,2061,2172,2271,2384,2488,2602,2766,2866", + "endColumns": "117,111,112,87,106,126,76,76,90,92,95,93,100,92,94,93,90,90,81,115,110,98,112,103,113,163,99,81", + "endOffsets": "218,330,443,531,638,765,842,919,1010,1103,1199,1293,1394,1487,1582,1676,1767,1858,1940,2056,2167,2266,2379,2483,2597,2761,2861,2943" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json index 355c755..f89a024 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ko/values-ko.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ko\\values-ko.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ko\\values-ko.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ko\\values-ko.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ko\\values-ko.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json index bb3eaa4..e33f076 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ky/values-ky.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ky\\values-ky.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ky\\values-ky.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ky\\values-ky.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ky\\values-ky.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json index 7b31d70..1bfc3b4 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-land/values-land.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-land\\values-land.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-land\\values-land.xml", "from": { "startLines": "2,3,4", "startColumns": "4,4,4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json index def10d3..efb2760 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-large-v4/values-large-v4.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-large-v4\\values-large-v4.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-large-v4\\values-large-v4.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10", "startColumns": "4,4,4,4,4,4,4,4,4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json index 09ec87b..53963ac 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ldltr-v21/values-ldltr-v21.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ldltr-v21\\values-ldltr-v21.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ldltr-v21\\values-ldltr-v21.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json index 14904c1..a2161b2 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-lo/values-lo.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-lo\\values-lo.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-lo\\values-lo.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,208,305,412,497,602,714,791,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1888,1995,2092,2190,2295,2398,2502,2659,2755", + "endColumns": "102,96,106,84,104,111,76,77,90,92,95,93,100,92,94,93,90,90,79,106,96,97,104,102,103,156,95,80", + "endOffsets": "203,300,407,492,597,709,786,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1883,1990,2087,2185,2290,2393,2497,2654,2750,2831" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-lo\\values-lo.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "2932" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-lo\\values-lo.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,208,305,412,497,602,714,791,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1888,1995,2092,2190,2295,2398,2502,2659,2755", - "endColumns": "102,96,106,84,104,111,76,77,90,92,95,93,100,92,94,93,90,90,79,106,96,97,104,102,103,156,95,80", - "endOffsets": "203,300,407,492,597,709,786,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1883,1990,2087,2185,2290,2393,2497,2654,2750,2831" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json index 6a9e776..ee46d2d 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-lt/values-lt.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-lt\\values-lt.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-lt\\values-lt.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-lt\\values-lt.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-lt\\values-lt.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json index db00170..6678c6d 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-lv/values-lv.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-lv\\values-lv.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-lv\\values-lv.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,225,333,442,528,632,754,836,918,1028,1136,1243,1352,1464,1567,1679,1786,1891,1991,2076,2185,2297,2396,2507,2616,2721,2895,2994", + "endColumns": "119,107,108,85,103,121,81,81,109,107,106,108,111,102,111,106,104,99,84,108,111,98,110,108,104,173,98,81", + "endOffsets": "220,328,437,523,627,749,831,913,1023,1131,1238,1347,1459,1562,1674,1781,1886,1986,2071,2180,2292,2391,2502,2611,2716,2890,2989,3071" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-lv\\values-lv.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3172" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-lv\\values-lv.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,225,333,442,528,632,754,836,918,1028,1136,1243,1352,1464,1567,1679,1786,1891,1991,2076,2185,2297,2396,2507,2616,2721,2895,2994", - "endColumns": "119,107,108,85,103,121,81,81,109,107,106,108,111,102,111,106,104,99,84,108,111,98,110,108,104,173,98,81", - "endOffsets": "220,328,437,523,627,749,831,913,1023,1131,1238,1347,1459,1562,1674,1781,1886,1986,2071,2180,2292,2391,2502,2611,2716,2890,2989,3071" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json index 9910fd3..38a8b28 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-mk/values-mk.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-mk\\values-mk.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-mk\\values-mk.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-mk\\values-mk.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-mk\\values-mk.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json index 0bc1a0a..1bf1595 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ml/values-ml.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ml\\values-ml.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ml\\values-ml.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,224,342,457,550,655,787,864,940,1031,1124,1226,1320,1421,1515,1610,1709,1800,1891,1973,2084,2190,2288,2402,2502,2613,2772,2873", + "endColumns": "118,117,114,92,104,131,76,75,90,92,101,93,100,93,94,98,90,90,81,110,105,97,113,99,110,158,100,81", + "endOffsets": "219,337,452,545,650,782,859,935,1026,1119,1221,1315,1416,1510,1605,1704,1795,1886,1968,2079,2185,2283,2397,2497,2608,2767,2868,2950" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ml\\values-ml.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3051" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ml\\values-ml.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,224,342,457,550,655,787,864,940,1031,1124,1226,1320,1421,1515,1610,1709,1800,1891,1973,2084,2190,2288,2402,2502,2613,2772,2873", - "endColumns": "118,117,114,92,104,131,76,75,90,92,101,93,100,93,94,98,90,90,81,110,105,97,113,99,110,158,100,81", - "endOffsets": "219,337,452,545,650,782,859,935,1026,1119,1221,1315,1416,1510,1605,1704,1795,1886,1968,2079,2185,2283,2397,2497,2608,2767,2868,2950" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json index dd9a1e3..ad89fcc 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-mn/values-mn.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-mn\\values-mn.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-mn\\values-mn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-mn\\values-mn.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-mn\\values-mn.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json index 8e4eec6..9158086 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-mr/values-mr.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-mr\\values-mr.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-mr\\values-mr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-mr\\values-mr.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-mr\\values-mr.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json index 08b67c1..6a519c5 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ms/values-ms.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ms\\values-ms.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ms\\values-ms.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", @@ -14,7 +14,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ms\\values-ms.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ms\\values-ms.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json index dfb88e1..086632f 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-my/values-my.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-my\\values-my.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-my\\values-my.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,214,319,436,529,641,769,847,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1951,2074,2186,2288,2414,2525,2635,2795,2895", + "endColumns": "108,104,116,92,111,127,77,78,90,92,95,93,100,92,94,93,90,90,85,122,111,101,125,110,109,159,99,83", + "endOffsets": "209,314,431,524,636,764,842,921,1012,1105,1201,1295,1396,1489,1584,1678,1769,1860,1946,2069,2181,2283,2409,2520,2630,2790,2890,2974" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-my\\values-my.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3075" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-my\\values-my.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,214,319,436,529,641,769,847,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1951,2074,2186,2288,2414,2525,2635,2795,2895", - "endColumns": "108,104,116,92,111,127,77,78,90,92,95,93,100,92,94,93,90,90,85,122,111,101,125,110,109,159,99,83", - "endOffsets": "209,314,431,524,636,764,842,921,1012,1105,1201,1295,1396,1489,1584,1678,1769,1860,1946,2069,2181,2283,2409,2520,2630,2790,2890,2974" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json index 2455da3..21f448e 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-nb/values-nb.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-nb\\values-nb.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-nb\\values-nb.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-nb\\values-nb.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-nb\\values-nb.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json index 7a481e0..f4f830a 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ne/values-ne.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ne\\values-ne.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ne\\values-ne.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,210,314,422,513,620,747,841,931,1022,1115,1211,1305,1406,1499,1594,1688,1779,1870,1958,2068,2184,2287,2402,2504,2619,2790,2902", + "endColumns": "104,103,107,90,106,126,93,89,90,92,95,93,100,92,94,93,90,90,87,109,115,102,114,101,114,170,111,85", + "endOffsets": "205,309,417,508,615,742,836,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1953,2063,2179,2282,2397,2499,2614,2785,2897,2983" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ne\\values-ne.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3084" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ne\\values-ne.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,210,314,422,513,620,747,841,931,1022,1115,1211,1305,1406,1499,1594,1688,1779,1870,1958,2068,2184,2287,2402,2504,2619,2790,2902", - "endColumns": "104,103,107,90,106,126,93,89,90,92,95,93,100,92,94,93,90,90,87,109,115,102,114,101,114,170,111,85", - "endOffsets": "205,309,417,508,615,742,836,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1953,2063,2179,2282,2397,2499,2614,2785,2897,2983" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json index 87daafd..40287e5 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-night-v8/values-night-v8.xml", "map": [ { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-night\\themes.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-night-v8\\values-night-v8.xml", + "from": { + "startLines": "2,3,4,5,6,7,8", + "startColumns": "4,4,4,4,4,4,4", + "startOffsets": "55,125,209,293,389,491,593", + "endColumns": "69,83,83,95,101,101,93", + "endOffsets": "120,204,288,384,486,588,682" + } + }, + { + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-night\\themes.xml", "from": { "startLines": "1", "startColumns": "4", @@ -21,16 +31,6 @@ "endColumns": "12", "endOffsets": "910" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-night-v8\\values-night-v8.xml", - "from": { - "startLines": "2,3,4,5,6,7,8", - "startColumns": "4,4,4,4,4,4,4", - "startOffsets": "55,125,209,293,389,491,593", - "endColumns": "69,83,83,95,101,101,93", - "endOffsets": "120,204,288,384,486,588,682" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json index dd317ae..fc32b3b 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-nl/values-nl.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-nl\\values-nl.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-nl\\values-nl.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,223,328,435,521,629,749,826,903,995,1089,1190,1284,1385,1479,1575,1670,1762,1854,1936,2047,2151,2250,2365,2478,2581,2736,2839", + "endColumns": "117,104,106,85,107,119,76,76,91,93,100,93,100,93,95,94,91,91,81,110,103,98,114,112,102,154,102,81", + "endOffsets": "218,323,430,516,624,744,821,898,990,1084,1185,1279,1380,1474,1570,1665,1757,1849,1931,2042,2146,2245,2360,2473,2576,2731,2834,2916" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-nl\\values-nl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3017" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-nl\\values-nl.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,223,328,435,521,629,749,826,903,995,1089,1190,1284,1385,1479,1575,1670,1762,1854,1936,2047,2151,2250,2365,2478,2581,2736,2839", - "endColumns": "117,104,106,85,107,119,76,76,91,93,100,93,100,93,95,94,91,91,81,110,103,98,114,112,102,154,102,81", - "endOffsets": "218,323,430,516,624,744,821,898,990,1084,1185,1279,1380,1474,1570,1665,1757,1849,1931,2042,2146,2245,2360,2473,2576,2731,2834,2916" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json index acf42e8..380b81b 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-or/values-or.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-or\\values-or.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-or\\values-or.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,224,334,441,527,631,751,828,905,996,1089,1186,1281,1382,1475,1570,1666,1757,1847,1929,2039,2144,2250,2361,2464,2582,2745,2847", + "endColumns": "118,109,106,85,103,119,76,76,90,92,96,94,100,92,94,95,90,89,81,109,104,105,110,102,117,162,101,88", + "endOffsets": "219,329,436,522,626,746,823,900,991,1084,1181,1276,1377,1470,1565,1661,1752,1842,1924,2034,2139,2245,2356,2459,2577,2740,2842,2931" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-or\\values-or.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3032" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-or\\values-or.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,224,334,441,527,631,751,828,905,996,1089,1186,1281,1382,1475,1570,1666,1757,1847,1929,2039,2144,2250,2361,2464,2582,2745,2847", - "endColumns": "118,109,106,85,103,119,76,76,90,92,96,94,100,92,94,95,90,89,81,109,104,105,110,102,117,162,101,88", - "endOffsets": "219,329,436,522,626,746,823,900,991,1084,1181,1276,1377,1470,1565,1661,1752,1842,1924,2034,2139,2245,2356,2459,2577,2740,2842,2931" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json index 8166be2..2bc0015 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-pa/values-pa.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-pa\\values-pa.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-pa\\values-pa.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,208,305,410,496,596,709,786,862,953,1046,1142,1236,1337,1430,1525,1619,1710,1801,1880,1981,2085,2182,2291,2390,2500,2659,2759", + "endColumns": "102,96,104,85,99,112,76,75,90,92,95,93,100,92,94,93,90,90,78,100,103,96,108,98,109,158,99,79", + "endOffsets": "203,300,405,491,591,704,781,857,948,1041,1137,1231,1332,1425,1520,1614,1705,1796,1875,1976,2080,2177,2286,2385,2495,2654,2754,2834" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-pa\\values-pa.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "2935" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-pa\\values-pa.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,208,305,410,496,596,709,786,862,953,1046,1142,1236,1337,1430,1525,1619,1710,1801,1880,1981,2085,2182,2291,2390,2500,2659,2759", - "endColumns": "102,96,104,85,99,112,76,75,90,92,95,93,100,92,94,93,90,90,78,100,103,96,108,98,109,158,99,79", - "endOffsets": "203,300,405,491,591,704,781,857,948,1041,1137,1231,1332,1425,1520,1614,1705,1796,1875,1976,2080,2177,2286,2385,2495,2654,2754,2834" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json index f3fca6c..66257fb 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-pl/values-pl.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-pl\\values-pl.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-pl\\values-pl.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,221,323,431,517,626,745,823,900,991,1084,1180,1274,1376,1469,1564,1659,1750,1841,1923,2032,2141,2240,2349,2460,2568,2731,2827", + "endColumns": "115,101,107,85,108,118,77,76,90,92,95,93,101,92,94,94,90,90,81,108,108,98,108,110,107,162,95,81", + "endOffsets": "216,318,426,512,621,740,818,895,986,1079,1175,1269,1371,1464,1559,1654,1745,1836,1918,2027,2136,2235,2344,2455,2563,2726,2822,2904" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-pl\\values-pl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3005" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-pl\\values-pl.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,221,323,431,517,626,745,823,900,991,1084,1180,1274,1376,1469,1564,1659,1750,1841,1923,2032,2141,2240,2349,2460,2568,2731,2827", - "endColumns": "115,101,107,85,108,118,77,76,90,92,95,93,101,92,94,94,90,90,81,108,108,98,108,110,107,162,95,81", - "endOffsets": "216,318,426,512,621,740,818,895,986,1079,1175,1269,1371,1464,1559,1654,1745,1836,1918,2027,2136,2235,2344,2455,2563,2726,2822,2904" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json index e47f68d..5ae0acb 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-port/values-port.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-port\\values-port.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-port\\values-port.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json index 184b9c7..47d2402 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-pt-rBR/values-pt-rBR.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,225,331,438,527,628,746,829,909,1000,1093,1189,1283,1384,1477,1572,1667,1758,1849,1936,2043,2155,2257,2365,2472,2582,2744,2844", - "endColumns": "119,105,106,88,100,117,82,79,90,92,95,93,100,92,94,94,90,90,86,106,111,101,107,106,109,161,99,84", - "endOffsets": "220,326,433,522,623,741,824,904,995,1088,1184,1278,1379,1472,1567,1662,1753,1844,1931,2038,2150,2252,2360,2467,2577,2739,2839,2924" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "3025" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,225,331,438,527,628,746,829,909,1000,1093,1189,1283,1384,1477,1572,1667,1758,1849,1936,2043,2155,2257,2365,2472,2582,2744,2844", + "endColumns": "119,105,106,88,100,117,82,79,90,92,95,93,100,92,94,94,90,90,86,106,111,101,107,106,109,161,99,84", + "endOffsets": "220,326,433,522,623,741,824,904,995,1088,1184,1278,1379,1472,1567,1662,1753,1844,1931,2038,2150,2252,2360,2467,2577,2739,2839,2924" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json index 27dbb72..43286d7 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-pt-rPT/values-pt-rPT.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,225,331,438,527,628,752,836,917,1009,1103,1201,1295,1395,1489,1585,1680,1772,1864,1951,2058,2170,2272,2380,2487,2594,2765,2864", + "endColumns": "119,105,106,88,100,123,83,80,91,93,97,93,99,93,95,94,91,91,86,106,111,101,107,106,106,170,98,84", + "endOffsets": "220,326,433,522,623,747,831,912,1004,1098,1196,1290,1390,1484,1580,1675,1767,1859,1946,2053,2165,2267,2375,2482,2589,2760,2859,2944" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3045" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,225,331,438,527,628,752,836,917,1009,1103,1201,1295,1395,1489,1585,1680,1772,1864,1951,2058,2170,2272,2380,2487,2594,2765,2864", - "endColumns": "119,105,106,88,100,123,83,80,91,93,97,93,99,93,95,94,91,91,86,106,111,101,107,106,106,170,98,84", - "endOffsets": "220,326,433,522,623,747,831,912,1004,1098,1196,1290,1390,1484,1580,1675,1767,1859,1946,2053,2165,2267,2375,2482,2589,2760,2859,2944" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json index e3a27a5..153c23f 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-pt/values-pt.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-pt\\values-pt.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-pt\\values-pt.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", @@ -14,7 +14,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-pt\\values-pt.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-pt\\values-pt.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json index 06e2e34..3ae30ed 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ro/values-ro.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ro\\values-ro.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,226,330,443,531,643,764,849,930,1021,1114,1210,1304,1404,1497,1592,1687,1778,1870,1953,2065,2178,2278,2392,2497,2603,2767,2870", - "endColumns": "120,103,112,87,111,120,84,80,90,92,95,93,99,92,94,94,90,91,82,111,112,99,113,104,105,163,102,82", - "endOffsets": "221,325,438,526,638,759,844,925,1016,1109,1205,1299,1399,1492,1587,1682,1773,1865,1948,2060,2173,2273,2387,2492,2598,2762,2865,2948" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ro\\values-ro.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ro\\values-ro.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "3049" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ro\\values-ro.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,226,330,443,531,643,764,849,930,1021,1114,1210,1304,1404,1497,1592,1687,1778,1870,1953,2065,2178,2278,2392,2497,2603,2767,2870", + "endColumns": "120,103,112,87,111,120,84,80,90,92,95,93,99,92,94,94,90,91,82,111,112,99,113,104,105,163,102,82", + "endOffsets": "221,325,438,526,638,759,844,925,1016,1109,1205,1299,1399,1492,1587,1682,1773,1865,1948,2060,2173,2273,2387,2492,2598,2762,2865,2948" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json index fedafa7..9297f81 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ru/values-ru.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ru\\values-ru.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,220,322,434,520,625,745,824,902,994,1088,1184,1277,1373,1467,1563,1658,1750,1842,1922,2028,2136,2234,2343,2449,2557,2732,2832", - "endColumns": "114,101,111,85,104,119,78,77,91,93,95,92,95,93,95,94,91,91,79,105,107,97,108,105,107,174,99,80", - "endOffsets": "215,317,429,515,620,740,819,897,989,1083,1179,1272,1368,1462,1558,1653,1745,1837,1917,2023,2131,2229,2338,2444,2552,2727,2827,2908" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ru\\values-ru.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ru\\values-ru.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "3009" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ru\\values-ru.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,220,322,434,520,625,745,824,902,994,1088,1184,1277,1373,1467,1563,1658,1750,1842,1922,2028,2136,2234,2343,2449,2557,2732,2832", + "endColumns": "114,101,111,85,104,119,78,77,91,93,95,92,95,93,95,94,91,91,79,105,107,97,108,105,107,174,99,80", + "endOffsets": "215,317,429,515,620,740,819,897,989,1083,1179,1272,1368,1462,1558,1653,1745,1837,1917,2023,2131,2229,2338,2444,2552,2727,2827,2908" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json index dedae4a..a57e048 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-si/values-si.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-si\\values-si.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-si\\values-si.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,215,322,429,517,622,738,827,914,1005,1098,1193,1287,1388,1481,1576,1670,1761,1852,1936,2045,2150,2248,2358,2457,2563,2722,2821", + "endColumns": "109,106,106,87,104,115,88,86,90,92,94,93,100,92,94,93,90,90,83,108,104,97,109,98,105,158,98,81", + "endOffsets": "210,317,424,512,617,733,822,909,1000,1093,1188,1282,1383,1476,1571,1665,1756,1847,1931,2040,2145,2243,2353,2452,2558,2717,2816,2898" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-si\\values-si.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "2999" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-si\\values-si.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,215,322,429,517,622,738,827,914,1005,1098,1193,1287,1388,1481,1576,1670,1761,1852,1936,2045,2150,2248,2358,2457,2563,2722,2821", - "endColumns": "109,106,106,87,104,115,88,86,90,92,94,93,100,92,94,93,90,90,83,108,104,97,109,98,105,158,98,81", - "endOffsets": "210,317,424,512,617,733,822,909,1000,1093,1188,1282,1383,1476,1571,1665,1756,1847,1931,2040,2145,2243,2353,2452,2558,2717,2816,2898" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json index 9c7b421..0f9d0fa 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-sk/values-sk.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sk\\values-sk.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sk\\values-sk.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", @@ -14,7 +14,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sk\\values-sk.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sk\\values-sk.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json index 9af6af6..b9e0003 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-sl/values-sl.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sl\\values-sl.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sl\\values-sl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sl\\values-sl.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sl\\values-sl.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json index 7fa4ad5..803f90f 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-sq/values-sq.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sq\\values-sq.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sq\\values-sq.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", @@ -14,7 +14,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sq\\values-sq.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sq\\values-sq.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json index 1aa2554..608f8eb 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-sr/values-sr.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sr\\values-sr.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,214,317,423,509,613,731,812,892,983,1076,1172,1266,1367,1460,1555,1660,1751,1842,1930,2035,2143,2244,2348,2456,2557,2724,2821", - "endColumns": "108,102,105,85,103,117,80,79,90,92,95,93,100,92,94,104,90,90,87,104,107,100,103,107,100,166,96,83", - "endOffsets": "209,312,418,504,608,726,807,887,978,1071,1167,1261,1362,1455,1550,1655,1746,1837,1925,2030,2138,2239,2343,2451,2552,2719,2816,2900" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sr\\values-sr.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sr\\values-sr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "3001" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sr\\values-sr.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,214,317,423,509,613,731,812,892,983,1076,1172,1266,1367,1460,1555,1660,1751,1842,1930,2035,2143,2244,2348,2456,2557,2724,2821", + "endColumns": "108,102,105,85,103,117,80,79,90,92,95,93,100,92,94,104,90,90,87,104,107,100,103,107,100,166,96,83", + "endOffsets": "209,312,418,504,608,726,807,887,978,1071,1167,1261,1362,1455,1550,1655,1746,1837,1925,2030,2138,2239,2343,2451,2552,2719,2816,2900" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json index b636ab9..a50faf5 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-sv/values-sv.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sv\\values-sv.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sv\\values-sv.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,211,314,425,510,612,725,801,877,970,1065,1161,1255,1358,1453,1550,1648,1744,1837,1917,2023,2123,2219,2324,2426,2528,2682,2784", + "endColumns": "105,102,110,84,101,112,75,75,92,94,95,93,102,94,96,97,95,92,79,105,99,95,104,101,101,153,101,78", + "endOffsets": "206,309,420,505,607,720,796,872,965,1060,1156,1250,1353,1448,1545,1643,1739,1832,1912,2018,2118,2214,2319,2421,2523,2677,2779,2858" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sv\\values-sv.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "2959" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sv\\values-sv.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,211,314,425,510,612,725,801,877,970,1065,1161,1255,1358,1453,1550,1648,1744,1837,1917,2023,2123,2219,2324,2426,2528,2682,2784", - "endColumns": "105,102,110,84,101,112,75,75,92,94,95,93,102,94,96,97,95,92,79,105,99,95,104,101,101,153,101,78", - "endOffsets": "206,309,420,505,607,720,796,872,965,1060,1156,1250,1353,1448,1545,1643,1739,1832,1912,2018,2118,2214,2319,2421,2523,2677,2779,2858" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json index 34f7caf..f7ccc35 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-sw/values-sw.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sw\\values-sw.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,208,306,414,504,609,726,808,891,982,1075,1169,1263,1364,1457,1552,1647,1738,1830,1912,2013,2122,2221,2328,2437,2542,2704,2801", - "endColumns": "102,97,107,89,104,116,81,82,90,92,93,93,100,92,94,94,90,91,81,100,108,98,106,108,104,161,96,81", - "endOffsets": "203,301,409,499,604,721,803,886,977,1070,1164,1258,1359,1452,1547,1642,1733,1825,1907,2008,2117,2216,2323,2432,2537,2699,2796,2878" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sw\\values-sw.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-sw\\values-sw.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "2979" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sw\\values-sw.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,208,306,414,504,609,726,808,891,982,1075,1169,1263,1364,1457,1552,1647,1738,1830,1912,2013,2122,2221,2328,2437,2542,2704,2801", + "endColumns": "102,97,107,89,104,116,81,82,90,92,93,93,100,92,94,94,90,91,81,100,108,98,106,108,104,161,96,81", + "endOffsets": "203,301,409,499,604,721,803,886,977,1070,1164,1258,1359,1452,1547,1642,1733,1825,1907,2008,2117,2216,2323,2432,2537,2699,2796,2878" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json index 47a5ebd..fe60b63 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-sw600dp-v13/values-sw600dp-v13.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml", "from": { "startLines": "2,3,4,5,6,7,8,9", "startColumns": "4,4,4,4,4,4,4,4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json index 52f32e1..7c64b48 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ta/values-ta.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ta\\values-ta.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ta\\values-ta.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ta\\values-ta.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ta\\values-ta.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json index 48affbd..b25f687 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-te/values-te.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-te\\values-te.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-te\\values-te.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-te\\values-te.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-te\\values-te.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json index 4d27002..7fef1f4 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-th/values-th.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-th\\values-th.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-th\\values-th.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", @@ -14,7 +14,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-th\\values-th.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-th\\values-th.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json index d37c80f..f40079c 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-tl/values-tl.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-tl\\values-tl.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-tl\\values-tl.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,224,332,449,537,643,764,843,921,1012,1105,1201,1295,1396,1489,1584,1678,1769,1860,1944,2053,2164,2265,2375,2492,2600,2763,2865", + "endColumns": "118,107,116,87,105,120,78,77,90,92,95,93,100,92,94,93,90,90,83,108,110,100,109,116,107,162,101,83", + "endOffsets": "219,327,444,532,638,759,838,916,1007,1100,1196,1290,1391,1484,1579,1673,1764,1855,1939,2048,2159,2260,2370,2487,2595,2758,2860,2944" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-tl\\values-tl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3045" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-tl\\values-tl.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,224,332,449,537,643,764,843,921,1012,1105,1201,1295,1396,1489,1584,1678,1769,1860,1944,2053,2164,2265,2375,2492,2600,2763,2865", - "endColumns": "118,107,116,87,105,120,78,77,90,92,95,93,100,92,94,93,90,90,83,108,110,100,109,116,107,162,101,83", - "endOffsets": "219,327,444,532,638,759,838,916,1007,1100,1196,1290,1391,1484,1579,1673,1764,1855,1939,2048,2159,2260,2370,2487,2595,2758,2860,2944" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json index 9311eae..8a6be02 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-tr/values-tr.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-tr\\values-tr.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-tr\\values-tr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-tr\\values-tr.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-tr\\values-tr.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json index 1edafdb..509bf7e 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-uk/values-uk.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-uk\\values-uk.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-uk\\values-uk.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", @@ -14,7 +14,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-uk\\values-uk.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-uk\\values-uk.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json index e89f068..6f14e76 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ur/values-ur.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ur\\values-ur.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-ur\\values-ur.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ur\\values-ur.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-ur\\values-ur.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "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", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json index 6d578ec..6b4e28f 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json @@ -4,7 +4,17 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-uz/values-uz.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-uz\\values-uz.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-uz\\values-uz.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,210,314,428,514,614,730,810,889,980,1073,1169,1263,1358,1451,1546,1641,1732,1824,1908,2017,2124,2225,2333,2438,2545,2706,2805", + "endColumns": "104,103,113,85,99,115,79,78,90,92,95,93,94,92,94,94,90,91,83,108,106,100,107,104,106,160,98,83", + "endOffsets": "205,309,423,509,609,725,805,884,975,1068,1164,1258,1353,1446,1541,1636,1727,1819,1903,2012,2119,2220,2328,2433,2540,2701,2800,2884" + } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-uz\\values-uz.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "2985" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-uz\\values-uz.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,210,314,428,514,614,730,810,889,980,1073,1169,1263,1358,1451,1546,1641,1732,1824,1908,2017,2124,2225,2333,2438,2545,2706,2805", - "endColumns": "104,103,113,85,99,115,79,78,90,92,95,93,94,92,94,94,90,91,83,108,106,100,107,104,106,160,98,83", - "endOffsets": "205,309,423,509,609,725,805,884,975,1068,1164,1258,1353,1446,1541,1636,1727,1819,1903,2012,2119,2220,2328,2433,2540,2701,2800,2884" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json index 7133496..41975b5 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-v16/values-v16.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-v16\\values-v16.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "65", - "endOffsets": "116" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v16\\values-v16.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v16\\values-v16.xml", "from": { "startLines": "2", "startColumns": "4", @@ -31,6 +21,16 @@ "endColumns": "12", "endOffsets": "289" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-v16\\values-v16.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "65", + "endOffsets": "116" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json index 5b2d0bc..a46e6d7 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-v17/values-v17.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v17\\values-v17.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v17\\values-v17.xml", "from": { "startLines": "2,5,9,12,15,18,22,25,29,33,37,40,43,46,50,53,57", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json index 4b3c9e3..dda2862 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-v18/values-v18.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v18\\values-v18.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v18\\values-v18.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json index 5a658f0..28fd807 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json @@ -4,26 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-v21/values-v21.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v21\\values-v21.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,17,19,20,21,22,24,26,27,28,29,30,32,34,36,38,40,42,43,48,50,52,53,54,56,58,59,60,61,62,63,107,110,154,157,160,162,164,166,169,171,174,175,176,179,180,181,182,183,184,187,188,190,192,194,196,200,202,203,204,205,207,211,213,215,216,217,218,219,221,222,223,233,234,235,247", - "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", - "startOffsets": "55,146,249,352,457,564,673,782,891,1000,1109,1216,1319,1438,1593,1748,1853,1974,2075,2222,2363,2466,2585,2692,2795,2950,3121,3270,3435,3592,3743,3862,4234,4383,4532,4644,4791,4944,5091,5166,5255,5342,5443,5546,8614,8799,11879,12076,12275,12398,12521,12634,12817,12948,13149,13238,13349,13582,13683,13778,13901,14030,14147,14324,14423,14558,14701,14836,14955,15156,15275,15368,15479,15535,15642,15837,15948,16081,16176,16267,16358,16475,16614,16685,16768,17448,17505,17563,18257", - "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,16,18,19,20,21,23,25,26,27,28,29,31,33,35,37,39,41,42,47,49,51,52,53,55,57,58,59,60,61,62,106,109,153,156,159,161,163,165,168,170,173,174,175,178,179,180,181,182,183,186,187,189,191,193,195,199,201,202,203,204,206,210,212,214,215,216,217,218,220,221,222,232,233,234,246,258", - "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12", - "endOffsets": "141,244,347,452,559,668,777,886,995,1104,1211,1314,1433,1588,1743,1848,1969,2070,2217,2358,2461,2580,2687,2790,2945,3116,3265,3430,3587,3738,3857,4229,4378,4527,4639,4786,4939,5086,5161,5250,5337,5438,5541,8609,8794,11874,12071,12270,12393,12516,12629,12812,12943,13144,13233,13344,13577,13678,13773,13896,14025,14142,14319,14418,14553,14696,14831,14950,15151,15270,15363,15474,15530,15637,15832,15943,16076,16171,16262,16353,16470,16609,16680,16763,17443,17500,17558,18252,18958" - }, - "to": { - "startLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,19,21,23,24,25,26,28,30,31,32,33,34,36,38,40,42,44,46,47,52,54,56,57,58,60,62,63,64,65,66,67,111,114,158,161,164,166,168,170,173,175,178,179,180,183,184,185,186,187,188,191,192,194,196,198,200,204,206,207,208,209,211,215,217,219,220,221,222,223,225,226,227,237,238,239,251", - "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", - "startOffsets": "354,445,548,651,756,863,972,1081,1190,1299,1408,1515,1618,1737,1892,2047,2152,2273,2374,2521,2662,2765,2884,2991,3094,3249,3420,3569,3734,3891,4042,4161,4533,4682,4831,4943,5090,5243,5390,5465,5554,5641,5742,5845,8697,8882,11746,11943,12142,12265,12388,12501,12684,12815,13016,13105,13216,13449,13550,13645,13768,13897,14014,14191,14290,14425,14568,14703,14822,15023,15142,15235,15346,15402,15509,15704,15815,15948,16043,16134,16225,16342,16481,16552,16635,17258,17315,17373,17997", - "endLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,20,22,23,24,25,27,29,30,31,32,33,35,37,39,41,43,45,46,51,53,55,56,57,59,61,62,63,64,65,66,110,113,157,160,163,165,167,169,172,174,177,178,179,182,183,184,185,186,187,190,191,193,195,197,199,203,205,206,207,208,210,214,216,218,219,220,221,222,224,225,226,236,237,238,250,262", - "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12", - "endOffsets": "440,543,646,751,858,967,1076,1185,1294,1403,1510,1613,1732,1887,2042,2147,2268,2369,2516,2657,2760,2879,2986,3089,3244,3415,3564,3729,3886,4037,4156,4528,4677,4826,4938,5085,5238,5385,5460,5549,5636,5737,5840,8692,8877,11741,11938,12137,12260,12383,12496,12679,12810,13011,13100,13211,13444,13545,13640,13763,13892,14009,14186,14285,14420,14563,14698,14817,15018,15137,15230,15341,15397,15504,15699,15810,15943,16038,16129,16220,16337,16476,16547,16630,17253,17310,17368,17992,18628" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-v21\\values-v21.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-v21\\values-v21.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,13", "startColumns": "4,4,4,4,4,4,4,4,4,4", @@ -40,6 +21,25 @@ "endColumns": "103,63,66,63,115,125,125,127,12,12", "endOffsets": "154,218,285,349,18744,18870,18996,19124,19296,19634" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v21\\values-v21.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,17,19,20,21,22,24,26,27,28,29,30,32,34,36,38,40,42,43,48,50,52,53,54,56,58,59,60,61,62,63,107,110,154,157,160,162,164,166,169,171,174,175,176,179,180,181,182,183,184,187,188,190,192,194,196,200,202,203,204,205,207,211,213,215,216,217,218,219,221,222,223,233,234,235,247", + "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", + "startOffsets": "55,146,249,352,457,564,673,782,891,1000,1109,1216,1319,1438,1593,1748,1853,1974,2075,2222,2363,2466,2585,2692,2795,2950,3121,3270,3435,3592,3743,3862,4234,4383,4532,4644,4791,4944,5091,5166,5255,5342,5443,5546,8614,8799,11879,12076,12275,12398,12521,12634,12817,12948,13149,13238,13349,13582,13683,13778,13901,14030,14147,14324,14423,14558,14701,14836,14955,15156,15275,15368,15479,15535,15642,15837,15948,16081,16176,16267,16358,16475,16614,16685,16768,17448,17505,17563,18257", + "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,16,18,19,20,21,23,25,26,27,28,29,31,33,35,37,39,41,42,47,49,51,52,53,55,57,58,59,60,61,62,106,109,153,156,159,161,163,165,168,170,173,174,175,178,179,180,181,182,183,186,187,189,191,193,195,199,201,202,203,204,206,210,212,214,215,216,217,218,220,221,222,232,233,234,246,258", + "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12", + "endOffsets": "141,244,347,452,559,668,777,886,995,1104,1211,1314,1433,1588,1743,1848,1969,2070,2217,2358,2461,2580,2687,2790,2945,3116,3265,3430,3587,3738,3857,4229,4378,4527,4639,4786,4939,5086,5161,5250,5337,5438,5541,8609,8794,11874,12071,12270,12393,12516,12629,12812,12943,13144,13233,13344,13577,13678,13773,13896,14025,14142,14319,14418,14553,14696,14831,14950,15151,15270,15363,15474,15530,15637,15832,15943,16076,16171,16262,16353,16470,16609,16680,16763,17443,17500,17558,18252,18958" + }, + "to": { + "startLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,19,21,23,24,25,26,28,30,31,32,33,34,36,38,40,42,44,46,47,52,54,56,57,58,60,62,63,64,65,66,67,111,114,158,161,164,166,168,170,173,175,178,179,180,183,184,185,186,187,188,191,192,194,196,198,200,204,206,207,208,209,211,215,217,219,220,221,222,223,225,226,227,237,238,239,251", + "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", + "startOffsets": "354,445,548,651,756,863,972,1081,1190,1299,1408,1515,1618,1737,1892,2047,2152,2273,2374,2521,2662,2765,2884,2991,3094,3249,3420,3569,3734,3891,4042,4161,4533,4682,4831,4943,5090,5243,5390,5465,5554,5641,5742,5845,8697,8882,11746,11943,12142,12265,12388,12501,12684,12815,13016,13105,13216,13449,13550,13645,13768,13897,14014,14191,14290,14425,14568,14703,14822,15023,15142,15235,15346,15402,15509,15704,15815,15948,16043,16134,16225,16342,16481,16552,16635,17258,17315,17373,17997", + "endLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,20,22,23,24,25,27,29,30,31,32,33,35,37,39,41,43,45,46,51,53,55,56,57,59,61,62,63,64,65,66,110,113,157,160,163,165,167,169,172,174,177,178,179,182,183,184,185,186,187,190,191,193,195,197,199,203,205,206,207,208,210,214,216,218,219,220,221,222,224,225,226,236,237,238,250,262", + "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12", + "endOffsets": "440,543,646,751,858,967,1076,1185,1294,1403,1510,1613,1732,1887,2042,2147,2268,2369,2516,2657,2760,2879,2986,3089,3244,3415,3564,3729,3886,4037,4156,4528,4677,4826,4938,5085,5238,5385,5460,5549,5636,5737,5840,8692,8877,11741,11938,12137,12260,12383,12496,12679,12810,13011,13100,13211,13444,13545,13640,13763,13892,14009,14186,14285,14420,14563,14698,14817,15018,15137,15230,15341,15397,15504,15699,15810,15943,16038,16129,16220,16337,16476,16547,16630,17253,17310,17368,17992,18628" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json index f8ce28f..979e2b6 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-v22/values-v22.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v22\\values-v22.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v22\\values-v22.xml", "from": { "startLines": "2,3,4,9", "startColumns": "4,4,4,4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json index d6c8fbb..0b73229 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-v23/values-v23.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v23\\values-v23.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v23\\values-v23.xml", "from": { "startLines": "2,3,4,5,6,19,32,33,34,35,36", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json index 0baab9d..90a59bf 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-v24/values-v24.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v24\\values-v24.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v24\\values-v24.xml", "from": { "startLines": "2,3", "startColumns": "4,4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json index d6b82f6..92c7227 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-v25/values-v25.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v25\\values-v25.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v25\\values-v25.xml", "from": { "startLines": "2,3,4,6", "startColumns": "4,4,4,4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json index 8b563d0..eb4ee25 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-v26/values-v26.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v26\\values-v26.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v26\\values-v26.xml", "from": { "startLines": "2,3,4,8,12,16", "startColumns": "4,4,4,4,4,4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json index af5d96a..fdecadb 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-v28/values-v28.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v28\\values-v28.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-v28\\values-v28.xml", "from": { "startLines": "2,3,4,8", "startColumns": "4,4,4,4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json index 9544d12..e08d874 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-vi/values-vi.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-vi\\values-vi.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,219,327,436,520,623,742,819,896,987,1080,1176,1270,1371,1464,1559,1657,1748,1839,1923,2027,2136,2237,2342,2456,2561,2718,2817", - "endColumns": "113,107,108,83,102,118,76,76,90,92,95,93,100,92,94,97,90,90,83,103,108,100,104,113,104,156,98,83", - "endOffsets": "214,322,431,515,618,737,814,891,982,1075,1171,1265,1366,1459,1554,1652,1743,1834,1918,2022,2131,2232,2337,2451,2556,2713,2812,2896" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-vi\\values-vi.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-vi\\values-vi.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "2997" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-vi\\values-vi.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,219,327,436,520,623,742,819,896,987,1080,1176,1270,1371,1464,1559,1657,1748,1839,1923,2027,2136,2237,2342,2456,2561,2718,2817", + "endColumns": "113,107,108,83,102,118,76,76,90,92,95,93,100,92,94,97,90,90,83,103,108,100,104,113,104,156,98,83", + "endOffsets": "214,322,431,515,618,737,814,891,982,1075,1171,1265,1366,1459,1554,1652,1743,1834,1918,2022,2131,2232,2337,2451,2556,2713,2812,2896" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json index 1b9090d..411ee79 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-watch-v20/values-watch-v20.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v20\\values-watch-v20.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v20\\values-watch-v20.xml", "from": { "startLines": "2,5,8", "startColumns": "4,4,4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json index b18e803..fd051e8 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-watch-v21/values-watch-v21.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v21\\values-watch-v21.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v21\\values-watch-v21.xml", "from": { "startLines": "2,6,10", "startColumns": "4,4,4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json index 373e15b..92c221e 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-xlarge-v4/values-xlarge-v4.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml", "from": { "startLines": "2,3,4,5,6,7", "startColumns": "4,4,4,4,4,4", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index fca32e7..7211dd4 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -1,47 +1,17 @@ { "logs": [ { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-6:\\values-zh-rCN\\values-zh-rCN.xml", + "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-zh-rCN/values-zh-rCN.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "131", + "startLines": "16", "startColumns": "4", - "startOffsets": "8322", - "endColumns": "100", - "endOffsets": "8418" - } - }, - { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,128,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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", - "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,6758,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,6802,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,129,130,132,133,134,135,136,137,138,139,140,141,142", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,2945,3018,3084,3157,3207,3247,3295,3343,3388,3445,3499,3549,3590,3652,3720,3797,3856,3921,3984,4039,4099,4162,4216,4276,4329,4391,4476,4557,4607,4666,4709,4762,4805,4856,4906,4966,5019,5070,5116,5164,5212,5258,5307,5354,5404,5449,5508,5560,5612,5664,5707,5752,5799,5855,5910,5965,6009,6051,6092,6142,6201,6244,6287,6338,6382,6431,6480,6527,6574,6621,6666,6717,6770,6845,6904,6961,7035,7099,7168,7246,7356,7460,7533,7599,7654,7719,7784,7833,7916,7994,8032,8077,8203,8265,8423,8478,8537,8604,8662,8724,8772,8817,8865,8916,8982", - "endLines": "8,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,129,130,132,133,134,135,136,137,138,139,140,141,142", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,40,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,48,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,42,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,3013,3079,3152,3202,3242,3290,3338,3383,3440,3494,3544,3585,3647,3715,3792,3851,3916,3979,4034,4094,4157,4211,4271,4324,4386,4471,4552,4602,4661,4704,4757,4800,4851,4901,4961,5014,5065,5111,5159,5207,5253,5302,5349,5399,5444,5503,5555,5607,5659,5702,5747,5794,5850,5905,5960,6004,6046,6087,6137,6196,6239,6282,6333,6377,6426,6475,6522,6569,6616,6661,6712,6765,6840,6899,6956,7030,7094,7163,7241,7351,7455,7528,7594,7649,7714,7779,7828,7911,7989,8027,8072,8120,8260,8317,8473,8532,8599,8657,8719,8767,8812,8860,8911,8977,9043" - } - }, - { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" + "startOffsets": "336", + "endLines": "19", + "endColumns": "19", + "endOffsets": "441" }, "to": { "startLines": "2", @@ -53,31 +23,13 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.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", - "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", - "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" - }, - "to": { - "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,128", - "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", - "startOffsets": "384,480,575,675,757,854,960,1036,1112,1203,1296,1394,1490,1585,1678,1773,1865,1956,2047,2125,2221,2317,2412,2509,2604,2702,2851,8125", - "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77", - "endOffsets": "475,570,670,752,849,955,1031,1107,1198,1291,1389,1485,1580,1673,1768,1860,1951,2042,2120,2216,2312,2407,2504,2599,2697,2846,2940,8198" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-zh-rCN/values-zh-rCN.xml", - "map": [ - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" }, "to": { "startLines": "132", @@ -88,13 +40,14 @@ } }, { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,129,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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", - "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,6807,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,47,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,6850,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "131,71,70,69,68,19,20,21,112,113,120,119,125,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,128,54,55,45,66,56,123,64,43,129,122,48,47,46,62,42,61,40,41,65,127,126,28,134,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6856,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,6631,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,6758,2564,2611,2122,3188,2661,6578,3077,2036,6807,6533,2278,2222,2167,2979,1992,2937,1901,1942,3129,6715,6672,1318,7033,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "endLines": "133,71,70,69,68,19,20,21,112,113,120,119,125,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,128,54,55,45,66,56,123,64,43,129,122,48,47,46,62,42,61,40,41,65,127,126,28,134,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,40,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,48,46,49,44,58,51,51,51,42,47,44,46,55,54,54,43,41,40,49,58,42,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": "7028,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,6667,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,6802,2606,2656,2162,3242,2708,6625,3124,2074,6850,6573,2320,2273,2217,3029,2031,2974,1937,1987,3183,6753,6710,1364,7072,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" }, "to": { "startLines": "6,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,130,131,133,134,135,136,137,138,139,140,141,142,143", @@ -106,27 +59,13 @@ } }, { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.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", - "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", - "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" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,201,296,396,478,575,681,757,833,924,1017,1115,1211,1306,1399,1494,1586,1677,1768,1846,1942,2038,2133,2230,2325,2423,2572,2666", + "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77", + "endOffsets": "196,291,391,473,570,676,752,828,919,1012,1110,1206,1301,1394,1489,1581,1672,1763,1841,1937,2033,2128,2225,2320,2418,2567,2661,2739" }, "to": { "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,129", diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json index 7bbe5d6..632c897 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-zh-rHK/values-zh-rHK.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,200,293,393,475,572,680,756,832,924,1018,1110,1206,1302,1396,1492,1584,1676,1768,1846,1942,2038,2133,2230,2325,2423,2574,2668", - "endColumns": "94,92,99,81,96,107,75,75,91,93,91,95,95,93,95,91,91,91,77,95,95,94,96,94,97,150,93,77", - "endOffsets": "195,288,388,470,567,675,751,827,919,1013,1105,1201,1297,1391,1487,1579,1671,1763,1841,1937,2033,2128,2225,2320,2418,2569,2663,2741" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "2842" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,200,293,393,475,572,680,756,832,924,1018,1110,1206,1302,1396,1492,1584,1676,1768,1846,1942,2038,2133,2230,2325,2423,2574,2668", + "endColumns": "94,92,99,81,96,107,75,75,91,93,91,95,95,93,95,91,91,91,77,95,95,94,96,94,97,150,93,77", + "endOffsets": "195,288,388,470,567,675,751,827,919,1013,1105,1201,1297,1391,1487,1579,1671,1763,1841,1937,2033,2128,2225,2320,2418,2569,2663,2741" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index a1e117b..614e27b 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -1,83 +1,36 @@ { "logs": [ { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-6:\\values-zh-rTW\\values-zh-rTW.xml", + "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-zh-rTW/values-zh-rTW.xml", "map": [ { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.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", - "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", - "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" + "startLines": "133,72,71,70,69,19,20,21,112,113,121,120,126,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,129,55,56,46,67,57,124,65,44,130,123,49,48,47,63,43,62,41,42,66,128,127,28,136,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6832,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,6606,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,6733,2644,2691,2202,3268,2741,6553,3157,2116,6782,6508,2358,2302,2247,3059,2072,3017,1981,2022,3209,6690,6647,1318,7009,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "endLines": "135,72,71,70,69,19,20,21,112,113,121,120,126,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,129,55,56,46,67,57,124,65,44,130,123,49,48,47,63,43,62,41,42,66,128,127,28,136,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,40,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,51,42,47,44,46,55,54,54,43,41,40,49,58,42,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": "7004,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,6642,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,6777,2686,2736,2242,3322,2788,6600,3204,2154,6825,6548,2400,2353,2297,3109,2111,3054,2017,2067,3263,6728,6685,1364,7048,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" }, "to": { - "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,128", - "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", - "startOffsets": "384,479,572,672,754,851,959,1035,1111,1203,1297,1395,1491,1587,1681,1777,1869,1961,2053,2131,2227,2323,2418,2515,2610,2710,2860,8132", - "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77", - "endOffsets": "474,567,667,749,846,954,1030,1106,1198,1292,1390,1486,1582,1676,1772,1864,1956,2048,2126,2222,2318,2413,2510,2605,2705,2855,2949,8205" + "startLines": "6,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,130,131,133,134,135,136,137,138,139,140,141,142,143", + "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": "215,2954,3026,3092,3165,3215,3255,3303,3351,3396,3453,3507,3557,3598,3660,3728,3805,3864,3930,3993,4048,4108,4171,4225,4285,4338,4400,4484,4564,4614,4673,4716,4769,4812,4863,4913,4973,5026,5077,5123,5171,5219,5265,5314,5361,5411,5456,5515,5567,5619,5671,5714,5762,5807,5854,5910,5965,6020,6064,6106,6147,6197,6256,6299,6342,6393,6437,6486,6535,6582,6629,6676,6721,6772,6825,6900,6959,7016,7090,7154,7223,7301,7411,7515,7588,7654,7709,7774,7839,7888,7971,8049,8087,8132,8258,8320,8478,8533,8592,8659,8717,8779,8827,8872,8920,8971,9037", + "endLines": "8,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,130,131,133,134,135,136,137,138,139,140,141,142,143", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,40,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,51,42,47,44,46,55,54,54,43,41,40,49,58,42,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,3021,3087,3160,3210,3250,3298,3346,3391,3448,3502,3552,3593,3655,3723,3800,3859,3925,3988,4043,4103,4166,4220,4280,4333,4395,4479,4559,4609,4668,4711,4764,4807,4858,4908,4968,5021,5072,5118,5166,5214,5260,5309,5356,5406,5451,5510,5562,5614,5666,5709,5757,5802,5849,5905,5960,6015,6059,6101,6142,6192,6251,6294,6337,6388,6432,6481,6530,6577,6624,6671,6716,6767,6820,6895,6954,7011,7085,7149,7218,7296,7406,7510,7583,7649,7704,7769,7834,7883,7966,8044,8082,8127,8175,8315,8372,8528,8587,8654,8712,8774,8822,8867,8915,8966,9032,9098" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml", + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "131", + "startLines": "16", "startColumns": "4", - "startOffsets": "8329", - "endColumns": "100", - "endOffsets": "8425" - } - }, - { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,129,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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", - "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,6733,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,6777,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,129,130,132,133,134,135,136,137,138,139,140,141,142", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,2954,3026,3092,3165,3215,3255,3303,3351,3396,3453,3507,3557,3598,3660,3728,3805,3864,3930,3993,4048,4108,4171,4225,4285,4338,4400,4484,4564,4614,4673,4716,4769,4812,4863,4913,4973,5026,5077,5123,5171,5219,5265,5314,5361,5411,5456,5515,5567,5619,5671,5714,5759,5806,5862,5917,5972,6016,6058,6099,6149,6208,6251,6294,6345,6389,6438,6487,6534,6581,6628,6673,6724,6777,6852,6911,6968,7042,7106,7175,7253,7363,7467,7540,7606,7661,7726,7791,7840,7923,8001,8039,8084,8210,8272,8430,8485,8544,8611,8669,8731,8779,8824,8872,8923,8989", - "endLines": "8,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,129,130,132,133,134,135,136,137,138,139,140,141,142", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,40,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,42,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,3021,3087,3160,3210,3250,3298,3346,3391,3448,3502,3552,3593,3655,3723,3800,3859,3925,3988,4043,4103,4166,4220,4280,4333,4395,4479,4559,4609,4668,4711,4764,4807,4858,4908,4968,5021,5072,5118,5166,5214,5260,5309,5356,5406,5451,5510,5562,5614,5666,5709,5754,5801,5857,5912,5967,6011,6053,6094,6144,6203,6246,6289,6340,6384,6433,6482,6529,6576,6623,6668,6719,6772,6847,6906,6963,7037,7101,7170,7248,7358,7462,7535,7601,7656,7721,7786,7835,7918,7996,8034,8079,8127,8267,8324,8480,8539,8606,8664,8726,8774,8819,8867,8918,8984,9050" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-zh-rTW/values-zh-rTW.xml", - "map": [ - { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" + "startOffsets": "333", + "endLines": "19", + "endColumns": "19", + "endOffsets": "438" }, "to": { "startLines": "2", @@ -89,11 +42,13 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.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", - "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", - "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" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,200,293,393,475,572,680,756,832,924,1018,1116,1212,1308,1402,1498,1590,1682,1774,1852,1948,2044,2139,2236,2331,2431,2581,2675", + "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77", + "endOffsets": "195,288,388,470,567,675,751,827,919,1013,1111,1207,1303,1397,1493,1585,1677,1769,1847,1943,2039,2134,2231,2326,2426,2576,2670,2748" }, "to": { "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,129", @@ -104,11 +59,13 @@ } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" }, "to": { "startLines": "132", @@ -117,24 +74,6 @@ "endColumns": "100", "endOffsets": "8473" } - }, - { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,130,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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", - "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,6782,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,47,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,6825,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,130,131,133,134,135,136,137,138,139,140,141,142,143", - "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": "215,2954,3026,3092,3165,3215,3255,3303,3351,3396,3453,3507,3557,3598,3660,3728,3805,3864,3930,3993,4048,4108,4171,4225,4285,4338,4400,4484,4564,4614,4673,4716,4769,4812,4863,4913,4973,5026,5077,5123,5171,5219,5265,5314,5361,5411,5456,5515,5567,5619,5671,5714,5762,5807,5854,5910,5965,6020,6064,6106,6147,6197,6256,6299,6342,6393,6437,6486,6535,6582,6629,6676,6721,6772,6825,6900,6959,7016,7090,7154,7223,7301,7411,7515,7588,7654,7709,7774,7839,7888,7971,8049,8087,8132,8258,8320,8478,8533,8592,8659,8717,8779,8827,8872,8920,8971,9037", - "endLines": "8,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,130,131,133,134,135,136,137,138,139,140,141,142,143", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,40,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,51,42,47,44,46,55,54,54,43,41,40,49,58,42,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,3021,3087,3160,3210,3250,3298,3346,3391,3448,3502,3552,3593,3655,3723,3800,3859,3925,3988,4043,4103,4166,4220,4280,4333,4395,4479,4559,4609,4668,4711,4764,4807,4858,4908,4968,5021,5072,5118,5166,5214,5260,5309,5356,5406,5451,5510,5562,5614,5666,5709,5757,5802,5849,5905,5960,6015,6059,6101,6142,6192,6251,6294,6337,6388,6432,6481,6530,6577,6624,6671,6716,6767,6820,6895,6954,7011,7085,7149,7218,7296,7406,7510,7583,7649,7704,7769,7834,7883,7966,8044,8082,8127,8175,8315,8372,8528,8587,8654,8712,8774,8822,8867,8915,8966,9032,9098" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json index c5e088e..ab8d477 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json @@ -4,17 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-zu/values-zu.xml", "map": [ { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zu\\values-zu.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "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", - "startOffsets": "105,213,320,434,522,625,752,832,912,1003,1096,1190,1284,1385,1478,1573,1667,1758,1851,1937,2041,2147,2245,2352,2458,2564,2721,2817", - "endColumns": "107,106,113,87,102,126,79,79,90,92,93,93,100,92,94,93,90,92,85,103,105,97,106,105,105,156,95,80", - "endOffsets": "208,315,429,517,620,747,827,907,998,1091,1185,1279,1380,1473,1568,1662,1753,1846,1932,2036,2142,2240,2347,2453,2559,2716,2812,2893" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zu\\values-zu.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zu\\values-zu.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "2994" } + }, + { + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zu\\values-zu.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "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", + "startOffsets": "105,213,320,434,522,625,752,832,912,1003,1096,1190,1284,1385,1478,1573,1667,1758,1851,1937,2041,2147,2245,2352,2458,2564,2721,2817", + "endColumns": "107,106,113,87,102,126,79,79,90,92,93,93,100,92,94,93,90,92,85,103,105,97,106,105,105,156,95,80", + "endOffsets": "208,315,429,517,620,747,827,907,998,1091,1185,1279,1380,1473,1568,1662,1753,1846,1932,2036,2142,2240,2347,2453,2559,2716,2812,2893" + } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 92b9bc2..9eb5141 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -1,144 +1,73 @@ { "logs": [ { - "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-6:\\values\\values.xml", + "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values/values.xml", "map": [ { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values\\values.xml", + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\attrs.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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "1", + "startColumns": "4", + "startOffsets": "16", + "endLines": "4", + "endColumns": "24", + "endOffsets": "207" }, "to": { - "startLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,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,373,389,390,391,392,393,394,402,403,407,411,415,420,426,433,437,441,446,450,454,458,462,466,470,476,480,486,490,496,500,505,509,512,516,522,526,532,536,542,545,549,553,557,561,565,566,567,568,571,574,577,580,584,585,586,587,588,591,593,595,597,602,603,607,613,617,618,620,631,632,636,642,646,647,648,652,679,683,684,688,716,883,909,1077,1103,1134,1142,1148,1162,1184,1189,1194,1204,1213,1222,1226,1233,1241,1248,1249,1258,1261,1264,1268,1272,1276,1279,1280,1284,1288,1298,1303,1310,1316,1317,1320,1324,1329,1331,1333,1336,1339,1341,1345,1348,1355,1358,1361,1365,1367,1371,1373,1375,1377,1381,1389,1397,1409,1415,1424,1427,1438,1441,1446,1447,1467,1525,1584,1585,1595,1604,1605,1607,1611,1614,1617,1620,1623,1626,1629,1632,1636,1639,1642,1645,1649,1652,1656,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1680,1682,1684,1685,1686,1687,1688,1689,1690,1691,1693,1694,1696,1697,1699,1701,1702,1704,1705,1706,1707,1708,1709,1711,1712,1713,1714,1715,1727,1729,1731,1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1772,1773,1775,1776,1777,1778,1779,1780,1782,1786,1796,1797,1798,1799,1800,1801,1802,1807,1809,1811,1813,1815,1817,1818,1819,1820,1822,1824,1826,1827,1828,1829,1830,1831,1832,1833,1834,1835,1836,1837,1840,1841,1842,1843,1845,1847,1848,1850,1851,1853,1855,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,1867,1868,1870,1871,1872,1873,1875,1876,1877,1878,1879,1881,1883,1885,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899,1900", - "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "481,536,581,630,671,726,785,847,928,989,1064,1140,1217,1295,1380,1462,1538,1664,1741,1819,1925,2031,2110,2190,2247,2305,2379,2454,2519,2585,2645,2706,2778,2851,2918,3192,3251,3310,3369,3428,3487,3541,3595,3648,3702,3756,3810,3996,4070,4149,4222,4296,4367,4439,4511,4584,4641,4699,4772,4846,4920,4995,5067,5140,5210,5281,5341,5459,5528,5597,5667,5741,5817,5881,5958,6034,6111,6176,6245,6322,6397,6466,6534,6611,6677,6738,6835,6900,6969,7068,7139,7198,7256,7313,7372,7436,7507,7579,7651,7723,7795,7862,7930,7998,8057,8120,8184,8274,8365,8425,8491,8558,8624,8694,8758,8811,8924,8982,9045,9110,9175,9250,9323,9395,9444,9505,9566,9627,9689,9753,9817,9881,9946,10009,10069,10130,10196,10255,10315,10377,10448,10508,11064,11150,11237,11327,11414,11502,11584,11667,11757,13088,13140,13198,13243,13309,13373,13430,13487,13689,13746,13794,13843,13894,13998,14045,14094,14412,14444,14508,14570,14630,15110,15184,15254,15332,15386,15456,15541,15589,15635,15706,15784,15862,15934,16008,16082,16156,16236,16309,16378,16450,16527,16588,16651,16717,16781,16852,16915,16980,17044,17105,17166,17218,17291,17365,17434,17509,17583,17657,17798,24409,25570,25648,25738,25826,25922,26012,26594,26683,26930,27211,27463,27748,28141,28618,28840,29062,29338,29565,29795,30025,30255,30485,30712,31131,31357,31782,32012,32440,32659,32942,33150,33281,33508,33934,34159,34586,34807,35232,35352,35628,35929,36253,36544,36858,36995,37126,37231,37473,37640,37844,38052,38323,38435,38547,38652,38769,38983,39129,39269,39355,39703,39791,40037,40455,40704,40786,40884,41476,41576,41828,42252,42507,42601,42690,42927,44951,45193,45295,45548,47704,57833,59349,69577,71105,72862,73488,73908,74969,76234,76490,76726,77273,77767,78372,78570,79150,79714,80089,80207,80745,80902,81098,81371,81627,81797,81938,82002,82284,82570,83246,83510,83848,84201,84295,84481,84787,85049,85174,85301,85540,85751,85870,86063,86240,86695,86876,86998,87257,87370,87557,87659,87766,87895,88170,88678,89174,90051,90345,90915,91064,91796,91968,92304,92396,93463,97745,102170,102232,102810,103394,103485,103598,103827,103987,104139,104310,104476,104645,104812,104975,105218,105388,105561,105732,106006,106205,106410,106740,106824,106920,107016,107114,107214,107316,107418,107520,107622,107724,107824,107920,108032,108161,108284,108415,108546,108644,108758,108852,108992,109126,109222,109334,109434,109550,109646,109758,109858,109998,110134,110298,110428,110586,110736,110877,111021,111156,111268,111418,111546,111674,111810,111942,112072,112202,112314,113212,113358,113502,114986,115052,115142,115218,115322,115412,115514,115622,115730,115830,115910,116002,116100,116210,116288,116394,116486,116590,116700,116822,116985,117502,117582,117682,117772,117882,117976,118082,118402,118502,118614,118728,118844,118960,119054,119168,119280,119382,119502,119624,119706,119810,119930,120056,120154,120248,120336,120448,120564,120686,120798,120973,121089,121175,121267,121379,121503,121570,121696,121764,121892,122036,122164,122233,122328,122443,122556,122655,122764,122875,122986,123087,123192,123292,123422,123513,123636,123730,123842,123928,124032,124128,124216,124334,124438,124542,124668,124756,124864,124964,125054,125164,125248,125350,125434,125488,125552,125658,125768,125852", - "endLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,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,373,389,390,391,392,393,401,402,406,410,414,419,425,432,436,440,445,449,453,457,461,465,469,475,479,485,489,495,499,504,508,511,515,521,525,531,535,541,544,548,552,556,560,564,565,566,567,570,573,576,579,583,584,585,586,587,590,592,594,596,601,602,606,612,616,617,619,630,631,635,641,645,646,647,651,678,682,683,687,715,882,908,1076,1102,1133,1141,1147,1161,1183,1188,1193,1203,1212,1221,1225,1232,1240,1247,1248,1257,1260,1263,1267,1271,1275,1278,1279,1283,1287,1297,1302,1309,1315,1316,1319,1323,1328,1330,1332,1335,1338,1340,1344,1347,1354,1357,1360,1364,1366,1370,1372,1374,1376,1380,1388,1396,1408,1414,1423,1426,1437,1440,1445,1446,1451,1524,1583,1584,1594,1603,1604,1606,1610,1613,1616,1619,1622,1625,1628,1631,1635,1638,1641,1644,1648,1651,1655,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1681,1683,1684,1685,1686,1687,1688,1689,1690,1692,1693,1695,1696,1698,1700,1701,1703,1704,1705,1706,1707,1708,1710,1711,1712,1713,1714,1715,1728,1730,1732,1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1772,1774,1775,1776,1777,1778,1779,1781,1785,1789,1796,1797,1798,1799,1800,1801,1802,1808,1810,1812,1814,1816,1817,1818,1819,1821,1823,1825,1826,1827,1828,1829,1830,1831,1832,1833,1834,1835,1836,1839,1840,1841,1842,1844,1846,1847,1849,1850,1852,1854,1856,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,1867,1869,1870,1871,1872,1874,1875,1876,1877,1878,1880,1882,1884,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899,1900", - "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,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,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,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,63,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,91,12,12,12,61,12,12,90,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,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119", - "endOffsets": "531,576,625,666,721,780,842,923,984,1059,1135,1212,1290,1375,1457,1533,1609,1736,1814,1920,2026,2105,2185,2242,2300,2374,2449,2514,2580,2640,2701,2773,2846,2913,2981,3246,3305,3364,3423,3482,3536,3590,3643,3697,3751,3805,3859,4065,4144,4217,4291,4362,4434,4506,4579,4636,4694,4767,4841,4915,4990,5062,5135,5205,5276,5336,5397,5523,5592,5662,5736,5812,5876,5953,6029,6106,6171,6240,6317,6392,6461,6529,6606,6672,6733,6830,6895,6964,7063,7134,7193,7251,7308,7367,7431,7502,7574,7646,7718,7790,7857,7925,7993,8052,8115,8179,8269,8360,8420,8486,8553,8619,8689,8753,8806,8919,8977,9040,9105,9170,9245,9318,9390,9439,9500,9561,9622,9684,9748,9812,9876,9941,10004,10064,10125,10191,10250,10310,10372,10443,10503,10571,11145,11232,11322,11409,11497,11579,11662,11752,11843,13135,13193,13238,13304,13368,13425,13482,13536,13741,13789,13838,13889,13923,14040,14089,14135,14439,14503,14565,14625,14682,15179,15249,15327,15381,15451,15536,15584,15630,15701,15779,15857,15929,16003,16077,16151,16231,16304,16373,16445,16522,16583,16646,16712,16776,16847,16910,16975,17039,17100,17161,17213,17286,17360,17429,17504,17578,17652,17793,17863,24457,25643,25733,25821,25917,26007,26589,26678,26925,27206,27458,27743,28136,28613,28835,29057,29333,29560,29790,30020,30250,30480,30707,31126,31352,31777,32007,32435,32654,32937,33145,33276,33503,33929,34154,34581,34802,35227,35347,35623,35924,36248,36539,36853,36990,37121,37226,37468,37635,37839,38047,38318,38430,38542,38647,38764,38978,39124,39264,39350,39698,39786,40032,40450,40699,40781,40879,41471,41571,41823,42247,42502,42596,42685,42922,44946,45188,45290,45543,47699,57828,59344,69572,71100,72857,73483,73903,74964,76229,76485,76721,77268,77762,78367,78565,79145,79709,80084,80202,80740,80897,81093,81366,81622,81792,81933,81997,82279,82565,83241,83505,83843,84196,84290,84476,84782,85044,85169,85296,85535,85746,85865,86058,86235,86690,86871,86993,87252,87365,87552,87654,87761,87890,88165,88673,89169,90046,90340,90910,91059,91791,91963,92299,92391,92669,97740,102165,102227,102805,103389,103480,103593,103822,103982,104134,104305,104471,104640,104807,104970,105213,105383,105556,105727,106001,106200,106405,106735,106819,106915,107011,107109,107209,107311,107413,107515,107617,107719,107819,107915,108027,108156,108279,108410,108541,108639,108753,108847,108987,109121,109217,109329,109429,109545,109641,109753,109853,109993,110129,110293,110423,110581,110731,110872,111016,111151,111263,111413,111541,111669,111805,111937,112067,112197,112309,112449,113353,113497,113635,115047,115137,115213,115317,115407,115509,115617,115725,115825,115905,115997,116095,116205,116283,116389,116481,116585,116695,116817,116980,117137,117577,117677,117767,117877,117971,118077,118169,118497,118609,118723,118839,118955,119049,119163,119275,119377,119497,119619,119701,119805,119925,120051,120149,120243,120331,120443,120559,120681,120793,120968,121084,121170,121262,121374,121498,121565,121691,121759,121887,122031,122159,122228,122323,122438,122551,122650,122759,122870,122981,123082,123187,123287,123417,123508,123631,123725,123837,123923,124027,124123,124211,124329,124433,124537,124663,124751,124859,124959,125049,125159,125243,125345,125429,125483,125547,125653,125763,125847,125967" + "startLines": "2694", + "startColumns": "4", + "startOffsets": "154608", + "endLines": "2697", + "endColumns": "24", + "endOffsets": "154797" } }, { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\strings.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\0a4a4ce1bdecc4eec4e4905ca8187ea2\\transformed\\coordinatorlayout-28.0.0\\res\\values\\values.xml", "from": { - "startLines": "140,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,137,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,-1,-1", - "startOffsets": "8336,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8278,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "144,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,137,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,55,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8740,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8329,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "2,102,3,13", + "startColumns": "4,4,4,4", + "startOffsets": "55,5935,116,724", + "endLines": "2,104,12,101", + "endColumns": "60,12,24,24", + "endOffsets": "111,6075,719,5930" }, "to": { - "startLines": "231,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,374,375,377,378,379,380,381,382,383,384,385,386,387,388", - "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", - "startOffsets": "14757,17868,17964,18047,18143,18212,18255,18307,18359,18408,18471,18529,18580,18628,18712,18766,18824,18918,19026,19097,19181,19264,19330,19413,19515,19576,19638,19689,19767,19820,19880,19985,20044,20146,20201,20272,20321,20379,20426,20485,20542,20613,20674,20731,20781,20833,20886,20936,20992,21042,21102,21155,21221,21283,21346,21409,21456,21509,21564,21652,21710,21772,21822,21867,21910,21970,22037,22089,22139,22194,22241,22296,22349,22396,22449,22505,22553,22608,22661,22745,22812,22876,22972,23046,23127,23216,23379,23523,23602,23677,23759,23818,23898,23978,24033,24155,24258,24299,24352,24462,24536,24672,24740,24826,24906,24975,25069,25128,25183,25245,25305,25370,25480", - "endLines": "235,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,374,375,377,378,379,380,381,382,383,384,385,386,387,388", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,83,53,57,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,55,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,42,59,66,51,49,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89", - "endOffsets": "15105,17959,18042,18138,18207,18250,18302,18354,18403,18466,18524,18575,18623,18707,18761,18819,18913,19021,19092,19176,19259,19325,19408,19510,19571,19633,19684,19762,19815,19875,19980,20039,20141,20196,20267,20316,20374,20421,20480,20537,20608,20669,20726,20776,20828,20881,20931,20987,21037,21097,21150,21216,21278,21341,21404,21451,21504,21559,21647,21705,21767,21817,21862,21905,21965,22032,22084,22134,22189,22236,22291,22344,22391,22444,22500,22548,22603,22656,22740,22807,22871,22967,23041,23122,23211,23374,23518,23597,23672,23754,23813,23893,23973,24028,24150,24253,24294,24347,24404,24531,24596,24735,24821,24901,24970,25064,25123,25178,25240,25300,25365,25475,25565" + "startLines": "12,1904,2534,2540", + "startColumns": "4,4,4,4", + "startOffsets": "420,126168,146974,147185", + "endLines": "12,1906,2539,2623", + "endColumns": "60,12,24,24", + "endOffsets": "476,126308,147180,151696" } }, { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\styles.xml", + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\strings.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": "1452,1456,1460,1464,1733,1737,1741,1745,1749,1753,1757,1906,1909", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "92674,92882,93093,93303,113640,113823,114008,114193,114396,114602,114785,126256,126432", - "endLines": "1455,1459,1463,1466,1736,1740,1744,1748,1752,1756,1760,1908,1912", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "92877,93088,93298,93458,113818,114003,114188,114391,114597,114780,114981,126427,126657" - } - }, - { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "30,49,50,51,52,87", - "startColumns": "4,4,4,4,4,4", - "startOffsets": "1614,2986,3037,3088,3140,5402", - "endColumns": "49,50,50,51,51,56", - "endOffsets": "1659,3032,3083,3135,3187,5454" - } - }, - { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\themes.xml", - "from": { - "startLines": "-1,-1,-1", - "startColumns": "-1,-1,-1", - "startOffsets": "-1,-1,-1" - }, - "to": { - "startLines": "1790,1791,1803", - "startColumns": "4,4,4", - "startOffsets": "117142,117205,118174", - "endLines": "1790,1795,1806", - "endColumns": "62,12,12", - "endOffsets": "117200,117497,118397" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\0a4a4ce1bdecc4eec4e4905ca8187ea2\\transformed\\coordinatorlayout-28.0.0\\res\\values\\values.xml", - "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" - }, - "to": { - "startLines": "12,1903", - "startColumns": "4,4", - "startOffsets": "420,126111", - "endLines": "12,1905", - "endColumns": "60,12", - "endOffsets": "476,126251" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values\\values.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", - "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", - "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" + "startLines": "141,72,75,74,73,19,20,21,118,119,127,126,132,26,148,149,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,137,58,59,49,70,60,130,68,47,139,129,52,51,50,66,46,65,44,45,69,135,133,28,146,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,147,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8393,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,8126,1282,8914,8968,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,8278,3036,3086,2518,3761,3146,8062,3631,2424,8335,8009,2717,2629,2571,3520,2374,3475,2271,2314,3694,8225,8174,1431,8802,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,8849,974,1084", + "endLines": "145,72,75,74,73,19,20,21,118,119,127,126,132,26,148,149,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,137,58,59,49,70,60,130,68,47,139,129,52,51,50,66,46,65,44,45,69,135,133,28,146,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,147,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,83,53,57,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,55,49,59,52,65,61,62,62,46,56,52,54,87,57,61,49,44,42,59,66,51,49,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89", + "endOffsets": "8797,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,8169,1361,8963,9021,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,8329,3081,3141,2566,3822,3203,8120,3689,2466,8387,8057,2767,2712,2624,3577,2419,3515,2309,2369,3756,8272,8219,1481,8844,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,8909,1079,1169" }, "to": { - "startLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,376,1716,1717,1721,1722,1726,1901,1902", - "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", - "startOffsets": "3864,3933,10576,10646,10714,10786,10856,10917,10991,11848,11909,11970,12032,12096,12158,12219,12287,12387,12447,12513,12586,12655,12712,12764,13541,13613,13928,13963,14140,14190,14251,14308,14342,14377,14687,24601,112454,112571,112772,112882,113083,125972,126044", - "endLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,376,1716,1720,1721,1725,1726,1901,1902", - "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66", - "endOffsets": "3928,3991,10641,10709,10781,10851,10912,10986,11059,11904,11965,12027,12091,12153,12214,12282,12382,12442,12508,12581,12650,12707,12759,12821,13608,13684,13958,13993,14185,14246,14303,14337,14372,14407,14752,24667,112566,112767,112877,113078,113207,126039,126106" + "startLines": "231,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,375,376,378,379,380,381,382,383,384,385,386,387,388,389", + "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", + "startOffsets": "14757,17868,17964,18047,18143,18212,18255,18307,18359,18408,18471,18529,18580,18628,18712,18766,18824,18918,19026,19097,19181,19264,19330,19413,19515,19576,19638,19689,19767,19820,19880,19985,20044,20146,20201,20272,20321,20379,20426,20485,20542,20613,20674,20731,20781,20833,20886,20936,20992,21042,21102,21155,21221,21283,21346,21409,21456,21513,21566,21621,21709,21767,21829,21879,21924,21967,22027,22094,22146,22196,22251,22298,22353,22406,22453,22506,22562,22610,22665,22718,22802,22869,22933,23029,23103,23184,23273,23436,23580,23659,23734,23816,23875,23955,24035,24090,24212,24315,24356,24409,24519,24593,24729,24797,24883,24963,25032,25126,25185,25240,25302,25362,25427,25537", + "endLines": "235,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,375,376,378,379,380,381,382,383,384,385,386,387,388,389", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,83,53,57,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,55,49,59,52,65,61,62,62,46,56,52,54,87,57,61,49,44,42,59,66,51,49,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89", + "endOffsets": "15105,17959,18042,18138,18207,18250,18302,18354,18403,18466,18524,18575,18623,18707,18761,18819,18913,19021,19092,19176,19259,19325,19408,19510,19571,19633,19684,19762,19815,19875,19980,20039,20141,20196,20267,20316,20374,20421,20480,20537,20608,20669,20726,20776,20828,20881,20931,20987,21037,21097,21150,21216,21278,21341,21404,21451,21508,21561,21616,21704,21762,21824,21874,21919,21962,22022,22089,22141,22191,22246,22293,22348,22401,22448,22501,22557,22605,22660,22713,22797,22864,22928,23024,23098,23179,23268,23431,23575,23654,23729,23811,23870,23950,24030,24085,24207,24310,24351,24404,24461,24588,24653,24792,24878,24958,25027,25121,25180,25235,25297,25357,25422,25532,25622" } }, { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\dimens.xml", + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" + "startLines": "15,17,19,21,13", + "startColumns": "4,4,4,4,4", + "startOffsets": "335,409,484,558,262", + "endColumns": "51,52,52,51,51", + "endOffsets": "382,457,532,605,309" }, "to": { "startLines": "194,195,196,197,198", @@ -147,69 +76,71 @@ "endColumns": "51,52,52,51,51", "endOffsets": "12873,12926,12979,13031,13083" } - } - ] - }, - { - "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values/values.xml", - "map": [ + }, { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\arrays.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values\\values.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1453,1461,1462,1466,1470,1474,1479,1485,1492,1496,1500,1505,1509,1513,1517,1521,1525,1529,1535,1539,1545,1549,1555,1559,1564,1568,1571,1575,1581,1585,1591,1595,1601,1604,1608,1612,1616,1620,1624,1625,1626,1627,1630,1633,1636,1639,1643,1644,1645,1646,1647,1650,1652,1654,1656,1661,1662,1666,1672,1676,1677,1679,1690,1691,1695,1701,1705,1706,1707,1711,1738,1742,1743,1747,1775,1943,1969,2138,2164,2195,2203,2209,2223,2245,2250,2255,2265,2274,2283,2287,2294,2302,2309,2310,2319,2322,2325,2329,2333,2337,2340,2341,2345,2349,2359,2364,2371,2377,2378,2381,2385,2390,2392,2394,2397,2400,2402,2406,2409,2416,2419,2422,2426,2428,2432,2434,2436,2438,2442,2450,2458,2470,2476,2485,2488,2499,2502,2507,2508,2513,2571,2630,2631,2641,2650,2651,2653,2657,2660,2663,2666,2669,2672,2675,2678,2682,2685,2688,2691,2695,2698,2702,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2726,2728,2730,2731,2732,2733,2734,2735,2736,2737,2739,2740,2742,2743,2745,2747,2748,2750,2751,2752,2753,2754,2755,2757,2758,2759,2760,2761,2762,2764,2766,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2780,2782,2783,2784,2785,2786,2787,2789,2793,2797,2798,2799,2800,2801,2802,2803,2804,2806,2808,2810,2812,2814,2815,2816,2817,2819,2821,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2837,2838,2839,2840,2842,2844,2845,2847,2848,2850,2852,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2865,2867,2868,2869,2870,2872,2873,2874,2875,2876,2878,2880,2882,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,69,152,155,158,161,175,186,196,223,230,241,271,298,307,344,725,730,756,774,810,816,822,845,986,1006,1012,1016,1022,1059,1071,1098,1103,1169,1184,1249,1268,1294", + "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "105,160,205,254,295,350,409,471,552,613,688,764,841,919,1004,1086,1162,1238,1315,1393,1499,1605,1684,1764,1821,1879,1953,2028,2093,2159,2219,2280,2352,2425,2492,2560,2619,2678,2737,2796,2855,2909,2963,3016,3070,3124,3178,3232,3306,3385,3458,3532,3603,3675,3747,3820,3877,3935,4008,4082,4156,4231,4303,4376,4446,4517,4577,70911,70980,71049,71119,71193,71269,71333,71410,71486,71563,71628,71697,71774,71849,71918,71986,72063,72129,72190,72287,72352,72421,72520,72591,72650,72708,72765,72824,72888,72959,73031,73103,73175,73247,73314,73382,73450,73509,73572,73636,73726,73817,73877,73943,74010,74076,74146,74210,74263,74376,74434,74497,74562,74627,74702,74775,74847,74896,74957,75018,75079,75141,75205,75269,75333,75398,75461,75521,75582,75648,75707,75767,75829,75900,75960,76028,76114,76201,76291,76378,76466,76548,76631,76721,76812,76864,76922,76967,77033,77097,77154,77211,77265,77322,77370,77419,77470,77504,77551,77600,77646,77678,77742,77804,77864,77921,77995,78065,78143,78197,78267,78352,78400,78446,78517,78595,78673,78745,78819,78893,78967,79047,79120,79189,79261,79338,79399,79462,79528,79592,79663,79726,79791,79855,79916,79977,80029,80102,80176,80245,80320,80394,80468,80609,80679,80732,80810,80900,80988,81084,81174,81756,81845,82092,82373,82625,82910,83303,83780,84002,84224,84500,84727,84957,85187,85417,85647,85874,86293,86519,86944,87174,87602,87821,88104,88312,88443,88670,89096,89321,89748,89969,90394,90514,90790,91091,91415,91706,92020,92157,92288,92393,92635,92802,93006,93214,93485,93597,93709,93814,93931,94145,94291,94431,94517,94865,94953,95199,95617,95866,95948,96046,96663,96763,97015,97439,97694,97788,97877,98114,100166,100408,100510,100763,102947,113668,115184,126004,127532,129289,129915,130335,131396,132661,132917,133153,133700,134194,134799,134997,135577,136141,136516,136634,137172,137329,137525,137798,138054,138224,138365,138429,138711,138997,139673,139937,140275,140628,140722,140908,141214,141476,141601,141728,141967,142178,142297,142490,142667,143122,143303,143425,143684,143797,143984,144086,144193,144322,144597,145105,145601,146478,146772,147342,147491,148223,148395,148731,148823,149101,153445,157932,157994,158624,159238,159329,159442,159671,159831,159983,160154,160320,160489,160656,160819,161062,161232,161405,161576,161850,162049,162254,162584,162668,162764,162860,162958,163058,163160,163262,163364,163466,163568,163668,163764,163876,164005,164128,164259,164390,164488,164602,164696,164836,164970,165066,165178,165278,165394,165490,165602,165702,165842,165978,166142,166272,166430,166580,166721,166865,167000,167112,167262,167390,167518,167654,167786,167916,168046,168158,168298,168444,168588,168726,168792,168882,168958,169062,169152,169254,169362,169470,169570,169650,169742,169840,169950,170028,170134,170226,170330,170440,170562,170725,170882,170962,171062,171152,171262,171356,171462,171554,171654,171766,171880,171996,172112,172206,172320,172432,172534,172654,172776,172858,172962,173082,173208,173306,173400,173488,173600,173716,173838,173950,174125,174241,174327,174419,174531,174655,174722,174848,174916,175044,175188,175316,175385,175480,175595,175708,175807,175916,176027,176138,176239,176344,176444,176574,176665,176788,176882,176994,177080,177184,177280,177368,177486,177590,177694,177820,177908,178016,178116,178206,178316,178400,178502,178586,178640,178704,178810,178920,179004,4638,9782,9900,10015,10147,10862,11554,12071,13718,14103,14700,16299,17832,18220,20527,40045,40305,41697,42730,44743,45005,45361,46191,52973,54107,54401,54624,54951,57001,57649,59282,59552,63403,64004,67813,69028,70437", + "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1460,1461,1465,1469,1473,1478,1484,1491,1495,1499,1504,1508,1512,1516,1520,1524,1528,1534,1538,1544,1548,1554,1558,1563,1567,1570,1574,1580,1584,1590,1594,1600,1603,1607,1611,1615,1619,1623,1624,1625,1626,1629,1632,1635,1638,1642,1643,1644,1645,1646,1649,1651,1653,1655,1660,1661,1665,1671,1675,1676,1678,1689,1690,1694,1700,1704,1705,1706,1710,1737,1741,1742,1746,1774,1942,1968,2137,2163,2194,2202,2208,2222,2244,2249,2254,2264,2273,2282,2286,2293,2301,2308,2309,2318,2321,2324,2328,2332,2336,2339,2340,2344,2348,2358,2363,2370,2376,2377,2380,2384,2389,2391,2393,2396,2399,2401,2405,2408,2415,2418,2421,2425,2427,2431,2433,2435,2437,2441,2449,2457,2469,2475,2484,2487,2498,2501,2506,2507,2512,2570,2629,2630,2640,2649,2650,2652,2656,2659,2662,2665,2668,2671,2674,2677,2681,2684,2687,2690,2694,2697,2701,2705,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2727,2729,2730,2731,2732,2733,2734,2735,2736,2738,2739,2741,2742,2744,2746,2747,2749,2750,2751,2752,2753,2754,2756,2757,2758,2759,2760,2761,2763,2765,2767,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2781,2782,2783,2784,2785,2786,2788,2792,2796,2797,2798,2799,2800,2801,2802,2803,2805,2807,2809,2811,2813,2814,2815,2816,2818,2820,2822,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2836,2837,2838,2839,2841,2843,2844,2846,2847,2849,2851,2853,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2866,2867,2868,2869,2871,2872,2873,2874,2875,2877,2879,2881,2883,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,151,154,157,160,174,185,195,222,229,240,270,297,306,343,724,729,755,773,809,815,821,844,985,1005,1011,1015,1021,1058,1070,1097,1102,1168,1183,1248,1267,1293,1302", + "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,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,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,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,63,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,91,12,12,12,61,12,12,90,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,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24", + "endOffsets": "155,200,249,290,345,404,466,547,608,683,759,836,914,999,1081,1157,1233,1310,1388,1494,1600,1679,1759,1816,1874,1948,2023,2088,2154,2214,2275,2347,2420,2487,2555,2614,2673,2732,2791,2850,2904,2958,3011,3065,3119,3173,3227,3301,3380,3453,3527,3598,3670,3742,3815,3872,3930,4003,4077,4151,4226,4298,4371,4441,4512,4572,4633,70975,71044,71114,71188,71264,71328,71405,71481,71558,71623,71692,71769,71844,71913,71981,72058,72124,72185,72282,72347,72416,72515,72586,72645,72703,72760,72819,72883,72954,73026,73098,73170,73242,73309,73377,73445,73504,73567,73631,73721,73812,73872,73938,74005,74071,74141,74205,74258,74371,74429,74492,74557,74622,74697,74770,74842,74891,74952,75013,75074,75136,75200,75264,75328,75393,75456,75516,75577,75643,75702,75762,75824,75895,75955,76023,76109,76196,76286,76373,76461,76543,76626,76716,76807,76859,76917,76962,77028,77092,77149,77206,77260,77317,77365,77414,77465,77499,77546,77595,77641,77673,77737,77799,77859,77916,77990,78060,78138,78192,78262,78347,78395,78441,78512,78590,78668,78740,78814,78888,78962,79042,79115,79184,79256,79333,79394,79457,79523,79587,79658,79721,79786,79850,79911,79972,80024,80097,80171,80240,80315,80389,80463,80604,80674,80727,80805,80895,80983,81079,81169,81751,81840,82087,82368,82620,82905,83298,83775,83997,84219,84495,84722,84952,85182,85412,85642,85869,86288,86514,86939,87169,87597,87816,88099,88307,88438,88665,89091,89316,89743,89964,90389,90509,90785,91086,91410,91701,92015,92152,92283,92388,92630,92797,93001,93209,93480,93592,93704,93809,93926,94140,94286,94426,94512,94860,94948,95194,95612,95861,95943,96041,96658,96758,97010,97434,97689,97783,97872,98109,100161,100403,100505,100758,102942,113663,115179,125999,127527,129284,129910,130330,131391,132656,132912,133148,133695,134189,134794,134992,135572,136136,136511,136629,137167,137324,137520,137793,138049,138219,138360,138424,138706,138992,139668,139932,140270,140623,140717,140903,141209,141471,141596,141723,141962,142173,142292,142485,142662,143117,143298,143420,143679,143792,143979,144081,144188,144317,144592,145100,145596,146473,146767,147337,147486,148218,148390,148726,148818,149096,153440,157927,157989,158619,159233,159324,159437,159666,159826,159978,160149,160315,160484,160651,160814,161057,161227,161400,161571,161845,162044,162249,162579,162663,162759,162855,162953,163053,163155,163257,163359,163461,163563,163663,163759,163871,164000,164123,164254,164385,164483,164597,164691,164831,164965,165061,165173,165273,165389,165485,165597,165697,165837,165973,166137,166267,166425,166575,166716,166860,166995,167107,167257,167385,167513,167649,167781,167911,168041,168153,168293,168439,168583,168721,168787,168877,168953,169057,169147,169249,169357,169465,169565,169645,169737,169835,169945,170023,170129,170221,170325,170435,170557,170720,170877,170957,171057,171147,171257,171351,171457,171549,171649,171761,171875,171991,172107,172201,172315,172427,172529,172649,172771,172853,172957,173077,173203,173301,173395,173483,173595,173711,173833,173945,174120,174236,174322,174414,174526,174650,174717,174843,174911,175039,175183,175311,175380,175475,175590,175703,175802,175911,176022,176133,176234,176339,176439,176569,176660,176783,176877,176989,177075,177179,177275,177363,177481,177585,177689,177815,177903,178011,178111,178201,178311,178395,178497,178581,178635,178699,178805,178915,178999,179119,9777,9895,10010,10142,10857,11549,12066,13713,14098,14695,16294,17827,18215,20522,40040,40300,41692,42725,44738,45000,45356,46186,52968,54102,54396,54619,54946,56996,57644,59277,59547,63398,63999,67808,69023,70432,70906" }, "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" + "startLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,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,374,390,391,392,393,394,395,403,404,408,412,416,421,427,434,438,442,447,451,455,459,463,467,471,477,481,487,491,497,501,506,510,513,517,523,527,533,537,543,546,550,554,558,562,566,567,568,569,572,575,578,581,585,586,587,588,589,592,594,596,598,603,604,608,614,618,619,621,632,633,637,643,647,648,649,653,680,684,685,689,717,884,910,1078,1104,1135,1143,1149,1163,1185,1190,1195,1205,1214,1223,1227,1234,1242,1249,1250,1259,1262,1265,1269,1273,1277,1280,1281,1285,1289,1299,1304,1311,1317,1318,1321,1325,1330,1332,1334,1337,1340,1342,1346,1349,1356,1359,1362,1366,1368,1372,1374,1376,1378,1382,1390,1398,1410,1416,1425,1428,1439,1442,1447,1448,1468,1526,1585,1586,1596,1605,1606,1608,1612,1615,1618,1621,1624,1627,1630,1633,1637,1640,1643,1646,1650,1653,1657,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1680,1681,1683,1685,1686,1687,1688,1689,1690,1691,1692,1694,1695,1697,1698,1700,1702,1703,1705,1706,1707,1708,1709,1710,1712,1713,1714,1715,1716,1728,1730,1732,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1772,1773,1774,1776,1777,1778,1779,1780,1781,1783,1787,1797,1798,1799,1800,1801,1802,1803,1808,1810,1812,1814,1816,1818,1819,1820,1821,1823,1825,1827,1828,1829,1830,1831,1832,1833,1834,1835,1836,1837,1838,1841,1842,1843,1844,1846,1848,1849,1851,1852,1854,1856,1858,1859,1860,1861,1862,1863,1864,1865,1866,1867,1868,1869,1871,1872,1873,1874,1876,1877,1878,1879,1880,1882,1884,1886,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899,1900,1901,1914,1989,1992,1995,1998,2012,2018,2028,2044,2050,2060,2089,2116,2125,2154,2497,2508,2624,2737,2761,2767,2773,2794,2918,2938,2944,2948,2954,2989,3001,3017,3021,3087,3102,3153,3165,3191", + "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "481,536,581,630,671,726,785,847,928,989,1064,1140,1217,1295,1380,1462,1538,1664,1741,1819,1925,2031,2110,2190,2247,2305,2379,2454,2519,2585,2645,2706,2778,2851,2918,3192,3251,3310,3369,3428,3487,3541,3595,3648,3702,3756,3810,3996,4070,4149,4222,4296,4367,4439,4511,4584,4641,4699,4772,4846,4920,4995,5067,5140,5210,5281,5341,5459,5528,5597,5667,5741,5817,5881,5958,6034,6111,6176,6245,6322,6397,6466,6534,6611,6677,6738,6835,6900,6969,7068,7139,7198,7256,7313,7372,7436,7507,7579,7651,7723,7795,7862,7930,7998,8057,8120,8184,8274,8365,8425,8491,8558,8624,8694,8758,8811,8924,8982,9045,9110,9175,9250,9323,9395,9444,9505,9566,9627,9689,9753,9817,9881,9946,10009,10069,10130,10196,10255,10315,10377,10448,10508,11064,11150,11237,11327,11414,11502,11584,11667,11757,13088,13140,13198,13243,13309,13373,13430,13487,13689,13746,13794,13843,13894,13998,14045,14094,14412,14444,14508,14570,14630,15110,15184,15254,15332,15386,15456,15541,15589,15635,15706,15784,15862,15934,16008,16082,16156,16236,16309,16378,16450,16527,16588,16651,16717,16781,16852,16915,16980,17044,17105,17166,17218,17291,17365,17434,17509,17583,17657,17798,24466,25627,25705,25795,25883,25979,26069,26651,26740,26987,27268,27520,27805,28198,28675,28897,29119,29395,29622,29852,30082,30312,30542,30769,31188,31414,31839,32069,32497,32716,32999,33207,33338,33565,33991,34216,34643,34864,35289,35409,35685,35986,36310,36601,36915,37052,37183,37288,37530,37697,37901,38109,38380,38492,38604,38709,38826,39040,39186,39326,39412,39760,39848,40094,40512,40761,40843,40941,41533,41633,41885,42309,42564,42658,42747,42984,45008,45250,45352,45605,47761,57890,59406,69634,71162,72919,73545,73965,75026,76291,76547,76783,77330,77824,78429,78627,79207,79771,80146,80264,80802,80959,81155,81428,81684,81854,81995,82059,82341,82627,83303,83567,83905,84258,84352,84538,84844,85106,85231,85358,85597,85808,85927,86120,86297,86752,86933,87055,87314,87427,87614,87716,87823,87952,88227,88735,89231,90108,90402,90972,91121,91853,92025,92361,92453,93520,97802,102227,102289,102867,103451,103542,103655,103884,104044,104196,104367,104533,104702,104869,105032,105275,105445,105618,105789,106063,106262,106467,106797,106881,106977,107073,107171,107271,107373,107475,107577,107679,107781,107881,107977,108089,108218,108341,108472,108603,108701,108815,108909,109049,109183,109279,109391,109491,109607,109703,109815,109915,110055,110191,110355,110485,110643,110793,110934,111078,111213,111325,111475,111603,111731,111867,111999,112129,112259,112371,113269,113415,113559,115043,115109,115199,115275,115379,115469,115571,115679,115787,115887,115967,116059,116157,116267,116345,116451,116543,116647,116757,116879,117042,117559,117639,117739,117829,117939,118033,118139,118459,118559,118671,118785,118901,119017,119111,119225,119337,119439,119559,119681,119763,119867,119987,120113,120211,120305,120393,120505,120621,120743,120855,121030,121146,121232,121324,121436,121560,121627,121753,121821,121949,122093,122221,122290,122385,122500,122613,122712,122821,122932,123043,123144,123249,123349,123479,123570,123693,123787,123899,123985,124089,124185,124273,124391,124495,124599,124725,124813,124921,125021,125111,125221,125305,125407,125491,125545,125609,125715,125825,125909,126719,129335,129453,129568,129648,130009,130242,130759,131184,131362,131646,132990,134351,134739,135817,145335,145681,151701,155651,156402,156664,156864,157243,161521,162127,162356,162507,162722,163805,164117,164528,164655,167681,168282,170203,170543,171854", + "endLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,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,374,390,391,392,393,394,402,403,407,411,415,420,426,433,437,441,446,450,454,458,462,466,470,476,480,486,490,496,500,505,509,512,516,522,526,532,536,542,545,549,553,557,561,565,566,567,568,571,574,577,580,584,585,586,587,588,591,593,595,597,602,603,607,613,617,618,620,631,632,636,642,646,647,648,652,679,683,684,688,716,883,909,1077,1103,1134,1142,1148,1162,1184,1189,1194,1204,1213,1222,1226,1233,1241,1248,1249,1258,1261,1264,1268,1272,1276,1279,1280,1284,1288,1298,1303,1310,1316,1317,1320,1324,1329,1331,1333,1336,1339,1341,1345,1348,1355,1358,1361,1365,1367,1371,1373,1375,1377,1381,1389,1397,1409,1415,1424,1427,1438,1441,1446,1447,1452,1525,1584,1585,1595,1604,1605,1607,1611,1614,1617,1620,1623,1626,1629,1632,1636,1639,1642,1645,1649,1652,1656,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1680,1682,1684,1685,1686,1687,1688,1689,1690,1691,1693,1694,1696,1697,1699,1701,1702,1704,1705,1706,1707,1708,1709,1711,1712,1713,1714,1715,1716,1729,1731,1733,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1772,1773,1775,1776,1777,1778,1779,1780,1782,1786,1790,1797,1798,1799,1800,1801,1802,1803,1809,1811,1813,1815,1817,1818,1819,1820,1822,1824,1826,1827,1828,1829,1830,1831,1832,1833,1834,1835,1836,1837,1840,1841,1842,1843,1845,1847,1848,1850,1851,1853,1855,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,1867,1868,1870,1871,1872,1873,1875,1876,1877,1878,1879,1881,1883,1885,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899,1900,1901,1988,1991,1994,1997,2011,2017,2027,2043,2049,2059,2088,2115,2124,2153,2496,2500,2533,2641,2760,2766,2772,2793,2917,2937,2943,2947,2953,2988,3000,3016,3020,3086,3101,3152,3164,3190,3197", + "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,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,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,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,63,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,91,12,12,12,61,12,12,90,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,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24", + "endOffsets": "531,576,625,666,721,780,842,923,984,1059,1135,1212,1290,1375,1457,1533,1609,1736,1814,1920,2026,2105,2185,2242,2300,2374,2449,2514,2580,2640,2701,2773,2846,2913,2981,3246,3305,3364,3423,3482,3536,3590,3643,3697,3751,3805,3859,4065,4144,4217,4291,4362,4434,4506,4579,4636,4694,4767,4841,4915,4990,5062,5135,5205,5276,5336,5397,5523,5592,5662,5736,5812,5876,5953,6029,6106,6171,6240,6317,6392,6461,6529,6606,6672,6733,6830,6895,6964,7063,7134,7193,7251,7308,7367,7431,7502,7574,7646,7718,7790,7857,7925,7993,8052,8115,8179,8269,8360,8420,8486,8553,8619,8689,8753,8806,8919,8977,9040,9105,9170,9245,9318,9390,9439,9500,9561,9622,9684,9748,9812,9876,9941,10004,10064,10125,10191,10250,10310,10372,10443,10503,10571,11145,11232,11322,11409,11497,11579,11662,11752,11843,13135,13193,13238,13304,13368,13425,13482,13536,13741,13789,13838,13889,13923,14040,14089,14135,14439,14503,14565,14625,14682,15179,15249,15327,15381,15451,15536,15584,15630,15701,15779,15857,15929,16003,16077,16151,16231,16304,16373,16445,16522,16583,16646,16712,16776,16847,16910,16975,17039,17100,17161,17213,17286,17360,17429,17504,17578,17652,17793,17863,24514,25700,25790,25878,25974,26064,26646,26735,26982,27263,27515,27800,28193,28670,28892,29114,29390,29617,29847,30077,30307,30537,30764,31183,31409,31834,32064,32492,32711,32994,33202,33333,33560,33986,34211,34638,34859,35284,35404,35680,35981,36305,36596,36910,37047,37178,37283,37525,37692,37896,38104,38375,38487,38599,38704,38821,39035,39181,39321,39407,39755,39843,40089,40507,40756,40838,40936,41528,41628,41880,42304,42559,42653,42742,42979,45003,45245,45347,45600,47756,57885,59401,69629,71157,72914,73540,73960,75021,76286,76542,76778,77325,77819,78424,78622,79202,79766,80141,80259,80797,80954,81150,81423,81679,81849,81990,82054,82336,82622,83298,83562,83900,84253,84347,84533,84839,85101,85226,85353,85592,85803,85922,86115,86292,86747,86928,87050,87309,87422,87609,87711,87818,87947,88222,88730,89226,90103,90397,90967,91116,91848,92020,92356,92448,92726,97797,102222,102284,102862,103446,103537,103650,103879,104039,104191,104362,104528,104697,104864,105027,105270,105440,105613,105784,106058,106257,106462,106792,106876,106972,107068,107166,107266,107368,107470,107572,107674,107776,107876,107972,108084,108213,108336,108467,108598,108696,108810,108904,109044,109178,109274,109386,109486,109602,109698,109810,109910,110050,110186,110350,110480,110638,110788,110929,111073,111208,111320,111470,111598,111726,111862,111994,112124,112254,112366,112506,113410,113554,113692,115104,115194,115270,115374,115464,115566,115674,115782,115882,115962,116054,116152,116262,116340,116446,116538,116642,116752,116874,117037,117194,117634,117734,117824,117934,118028,118134,118226,118554,118666,118780,118896,119012,119106,119220,119332,119434,119554,119676,119758,119862,119982,120108,120206,120300,120388,120500,120616,120738,120850,121025,121141,121227,121319,121431,121555,121622,121748,121816,121944,122088,122216,122285,122380,122495,122608,122707,122816,122927,123038,123139,123244,123344,123474,123565,123688,123782,123894,123980,124084,124180,124268,124386,124490,124594,124720,124808,124916,125016,125106,125216,125300,125402,125486,125540,125604,125710,125820,125904,126024,129330,129448,129563,129643,130004,130237,130754,131179,131357,131641,132985,134346,134734,135812,145330,145465,146969,152268,156397,156659,156859,157238,161516,162122,162351,162502,162717,163800,164112,164523,164650,167676,168277,170198,170538,171849,172052" } }, { - "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values\\values.xml", + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\colors.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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "21,17,18,19,20,16", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "594,388,439,490,542,331", + "endColumns": "49,50,50,51,51,56", + "endOffsets": "639,434,485,537,589,383" }, "to": { - "startLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,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,374,390,391,392,393,394,395,403,404,408,412,416,421,427,434,438,442,447,451,455,459,463,467,471,477,481,487,491,497,501,506,510,513,517,523,527,533,537,543,546,550,554,558,562,566,567,568,569,572,575,578,581,585,586,587,588,589,592,594,596,598,603,604,608,614,618,619,621,632,633,637,643,647,648,649,653,680,684,685,689,717,884,910,1078,1104,1135,1143,1149,1163,1185,1190,1195,1205,1214,1223,1227,1234,1242,1249,1250,1259,1262,1265,1269,1273,1277,1280,1281,1285,1289,1299,1304,1311,1317,1318,1321,1325,1330,1332,1334,1337,1340,1342,1346,1349,1356,1359,1362,1366,1368,1372,1374,1376,1378,1382,1390,1398,1410,1416,1425,1428,1439,1442,1447,1448,1468,1526,1585,1586,1596,1605,1606,1608,1612,1615,1618,1621,1624,1627,1630,1633,1637,1640,1643,1646,1650,1653,1657,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1680,1681,1683,1685,1686,1687,1688,1689,1690,1691,1692,1694,1695,1697,1698,1700,1702,1703,1705,1706,1707,1708,1709,1710,1712,1713,1714,1715,1716,1728,1730,1732,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1772,1773,1774,1776,1777,1778,1779,1780,1781,1783,1787,1797,1798,1799,1800,1801,1802,1803,1808,1810,1812,1814,1816,1818,1819,1820,1821,1823,1825,1827,1828,1829,1830,1831,1832,1833,1834,1835,1836,1837,1838,1841,1842,1843,1844,1846,1848,1849,1851,1852,1854,1856,1858,1859,1860,1861,1862,1863,1864,1865,1866,1867,1868,1869,1871,1872,1873,1874,1876,1877,1878,1879,1880,1882,1884,1886,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899,1900,1901", - "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "481,536,581,630,671,726,785,847,928,989,1064,1140,1217,1295,1380,1462,1538,1664,1741,1819,1925,2031,2110,2190,2247,2305,2379,2454,2519,2585,2645,2706,2778,2851,2918,3192,3251,3310,3369,3428,3487,3541,3595,3648,3702,3756,3810,3996,4070,4149,4222,4296,4367,4439,4511,4584,4641,4699,4772,4846,4920,4995,5067,5140,5210,5281,5341,5459,5528,5597,5667,5741,5817,5881,5958,6034,6111,6176,6245,6322,6397,6466,6534,6611,6677,6738,6835,6900,6969,7068,7139,7198,7256,7313,7372,7436,7507,7579,7651,7723,7795,7862,7930,7998,8057,8120,8184,8274,8365,8425,8491,8558,8624,8694,8758,8811,8924,8982,9045,9110,9175,9250,9323,9395,9444,9505,9566,9627,9689,9753,9817,9881,9946,10009,10069,10130,10196,10255,10315,10377,10448,10508,11064,11150,11237,11327,11414,11502,11584,11667,11757,13088,13140,13198,13243,13309,13373,13430,13487,13689,13746,13794,13843,13894,13998,14045,14094,14412,14444,14508,14570,14630,15110,15184,15254,15332,15386,15456,15541,15589,15635,15706,15784,15862,15934,16008,16082,16156,16236,16309,16378,16450,16527,16588,16651,16717,16781,16852,16915,16980,17044,17105,17166,17218,17291,17365,17434,17509,17583,17657,17798,24466,25627,25705,25795,25883,25979,26069,26651,26740,26987,27268,27520,27805,28198,28675,28897,29119,29395,29622,29852,30082,30312,30542,30769,31188,31414,31839,32069,32497,32716,32999,33207,33338,33565,33991,34216,34643,34864,35289,35409,35685,35986,36310,36601,36915,37052,37183,37288,37530,37697,37901,38109,38380,38492,38604,38709,38826,39040,39186,39326,39412,39760,39848,40094,40512,40761,40843,40941,41533,41633,41885,42309,42564,42658,42747,42984,45008,45250,45352,45605,47761,57890,59406,69634,71162,72919,73545,73965,75026,76291,76547,76783,77330,77824,78429,78627,79207,79771,80146,80264,80802,80959,81155,81428,81684,81854,81995,82059,82341,82627,83303,83567,83905,84258,84352,84538,84844,85106,85231,85358,85597,85808,85927,86120,86297,86752,86933,87055,87314,87427,87614,87716,87823,87952,88227,88735,89231,90108,90402,90972,91121,91853,92025,92361,92453,93520,97802,102227,102289,102867,103451,103542,103655,103884,104044,104196,104367,104533,104702,104869,105032,105275,105445,105618,105789,106063,106262,106467,106797,106881,106977,107073,107171,107271,107373,107475,107577,107679,107781,107881,107977,108089,108218,108341,108472,108603,108701,108815,108909,109049,109183,109279,109391,109491,109607,109703,109815,109915,110055,110191,110355,110485,110643,110793,110934,111078,111213,111325,111475,111603,111731,111867,111999,112129,112259,112371,113269,113415,113559,115043,115109,115199,115275,115379,115469,115571,115679,115787,115887,115967,116059,116157,116267,116345,116451,116543,116647,116757,116879,117042,117559,117639,117739,117829,117939,118033,118139,118459,118559,118671,118785,118901,119017,119111,119225,119337,119439,119559,119681,119763,119867,119987,120113,120211,120305,120393,120505,120621,120743,120855,121030,121146,121232,121324,121436,121560,121627,121753,121821,121949,122093,122221,122290,122385,122500,122613,122712,122821,122932,123043,123144,123249,123349,123479,123570,123693,123787,123899,123985,124089,124185,124273,124391,124495,124599,124725,124813,124921,125021,125111,125221,125305,125407,125491,125545,125609,125715,125825,125909", - "endLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,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,374,390,391,392,393,394,402,403,407,411,415,420,426,433,437,441,446,450,454,458,462,466,470,476,480,486,490,496,500,505,509,512,516,522,526,532,536,542,545,549,553,557,561,565,566,567,568,571,574,577,580,584,585,586,587,588,591,593,595,597,602,603,607,613,617,618,620,631,632,636,642,646,647,648,652,679,683,684,688,716,883,909,1077,1103,1134,1142,1148,1162,1184,1189,1194,1204,1213,1222,1226,1233,1241,1248,1249,1258,1261,1264,1268,1272,1276,1279,1280,1284,1288,1298,1303,1310,1316,1317,1320,1324,1329,1331,1333,1336,1339,1341,1345,1348,1355,1358,1361,1365,1367,1371,1373,1375,1377,1381,1389,1397,1409,1415,1424,1427,1438,1441,1446,1447,1452,1525,1584,1585,1595,1604,1605,1607,1611,1614,1617,1620,1623,1626,1629,1632,1636,1639,1642,1645,1649,1652,1656,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1680,1682,1684,1685,1686,1687,1688,1689,1690,1691,1693,1694,1696,1697,1699,1701,1702,1704,1705,1706,1707,1708,1709,1711,1712,1713,1714,1715,1716,1729,1731,1733,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1772,1773,1775,1776,1777,1778,1779,1780,1782,1786,1790,1797,1798,1799,1800,1801,1802,1803,1809,1811,1813,1815,1817,1818,1819,1820,1822,1824,1826,1827,1828,1829,1830,1831,1832,1833,1834,1835,1836,1837,1840,1841,1842,1843,1845,1847,1848,1850,1851,1853,1855,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,1867,1868,1870,1871,1872,1873,1875,1876,1877,1878,1879,1881,1883,1885,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899,1900,1901", - "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,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,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,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,63,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,91,12,12,12,61,12,12,90,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,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119", - "endOffsets": "531,576,625,666,721,780,842,923,984,1059,1135,1212,1290,1375,1457,1533,1609,1736,1814,1920,2026,2105,2185,2242,2300,2374,2449,2514,2580,2640,2701,2773,2846,2913,2981,3246,3305,3364,3423,3482,3536,3590,3643,3697,3751,3805,3859,4065,4144,4217,4291,4362,4434,4506,4579,4636,4694,4767,4841,4915,4990,5062,5135,5205,5276,5336,5397,5523,5592,5662,5736,5812,5876,5953,6029,6106,6171,6240,6317,6392,6461,6529,6606,6672,6733,6830,6895,6964,7063,7134,7193,7251,7308,7367,7431,7502,7574,7646,7718,7790,7857,7925,7993,8052,8115,8179,8269,8360,8420,8486,8553,8619,8689,8753,8806,8919,8977,9040,9105,9170,9245,9318,9390,9439,9500,9561,9622,9684,9748,9812,9876,9941,10004,10064,10125,10191,10250,10310,10372,10443,10503,10571,11145,11232,11322,11409,11497,11579,11662,11752,11843,13135,13193,13238,13304,13368,13425,13482,13536,13741,13789,13838,13889,13923,14040,14089,14135,14439,14503,14565,14625,14682,15179,15249,15327,15381,15451,15536,15584,15630,15701,15779,15857,15929,16003,16077,16151,16231,16304,16373,16445,16522,16583,16646,16712,16776,16847,16910,16975,17039,17100,17161,17213,17286,17360,17429,17504,17578,17652,17793,17863,24514,25700,25790,25878,25974,26064,26646,26735,26982,27263,27515,27800,28193,28670,28892,29114,29390,29617,29847,30077,30307,30537,30764,31183,31409,31834,32064,32492,32711,32994,33202,33333,33560,33986,34211,34638,34859,35284,35404,35680,35981,36305,36596,36910,37047,37178,37283,37525,37692,37896,38104,38375,38487,38599,38704,38821,39035,39181,39321,39407,39755,39843,40089,40507,40756,40838,40936,41528,41628,41880,42304,42559,42653,42742,42979,45003,45245,45347,45600,47756,57885,59401,69629,71157,72914,73540,73960,75021,76286,76542,76778,77325,77819,78424,78622,79202,79766,80141,80259,80797,80954,81150,81423,81679,81849,81990,82054,82336,82622,83298,83562,83900,84253,84347,84533,84839,85101,85226,85353,85592,85803,85922,86115,86292,86747,86928,87050,87309,87422,87609,87711,87818,87947,88222,88730,89226,90103,90397,90967,91116,91848,92020,92356,92448,92726,97797,102222,102284,102862,103446,103537,103650,103879,104039,104191,104362,104528,104697,104864,105027,105270,105440,105613,105784,106058,106257,106462,106792,106876,106972,107068,107166,107266,107368,107470,107572,107674,107776,107876,107972,108084,108213,108336,108467,108598,108696,108810,108904,109044,109178,109274,109386,109486,109602,109698,109810,109910,110050,110186,110350,110480,110638,110788,110929,111073,111208,111320,111470,111598,111726,111862,111994,112124,112254,112366,112506,113410,113554,113692,115104,115194,115270,115374,115464,115566,115674,115782,115882,115962,116054,116152,116262,116340,116446,116538,116642,116752,116874,117037,117194,117634,117734,117824,117934,118028,118134,118226,118554,118666,118780,118896,119012,119106,119220,119332,119434,119554,119676,119758,119862,119982,120108,120206,120300,120388,120500,120616,120738,120850,121025,121141,121227,121319,121431,121555,121622,121748,121816,121944,122088,122216,122285,122380,122495,122608,122707,122816,122927,123038,123139,123244,123344,123474,123565,123688,123782,123894,123980,124084,124180,124268,124386,124490,124594,124720,124808,124916,125016,125106,125216,125300,125402,125486,125540,125604,125710,125820,125904,126024" + "startLines": "30,49,50,51,52,87", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "1614,2986,3037,3088,3140,5402", + "endColumns": "49,50,50,51,51,56", + "endOffsets": "1659,3032,3083,3135,3187,5454" } }, { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\strings.xml", + "source": "C:\\Users\\83998\\.gradle\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values\\values.xml", "from": { - "startLines": "141,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,139,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "8393,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8335,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "145,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,139,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,56,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8797,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8387,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "2,3,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,171,172,176,177,178,6,13,56,88,125", + "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", + "startOffsets": "55,124,7725,7795,7863,7935,8005,8066,8140,8213,8274,8335,8397,8461,8523,8584,8652,8752,8812,8878,8951,9020,9077,9129,9191,9263,9339,9374,9409,9459,9520,9577,9611,9646,9681,9751,9822,9939,10140,10250,10451,10580,10652,319,617,3523,5588,7348", + "endLines": "2,3,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,170,171,175,176,177,178,12,55,87,124,131", + "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24", + "endOffsets": "119,182,7790,7858,7930,8000,8061,8135,8208,8269,8330,8392,8456,8518,8579,8647,8747,8807,8873,8946,9015,9072,9124,9186,9258,9334,9369,9404,9454,9515,9572,9606,9641,9676,9746,9817,9934,10135,10245,10446,10575,10647,10714,612,3518,5583,7343,7720" }, "to": { - "startLines": "231,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,375,376,378,379,380,381,382,383,384,385,386,387,388,389", - "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", - "startOffsets": "14757,17868,17964,18047,18143,18212,18255,18307,18359,18408,18471,18529,18580,18628,18712,18766,18824,18918,19026,19097,19181,19264,19330,19413,19515,19576,19638,19689,19767,19820,19880,19985,20044,20146,20201,20272,20321,20379,20426,20485,20542,20613,20674,20731,20781,20833,20886,20936,20992,21042,21102,21155,21221,21283,21346,21409,21456,21513,21566,21621,21709,21767,21829,21879,21924,21967,22027,22094,22146,22196,22251,22298,22353,22406,22453,22506,22562,22610,22665,22718,22802,22869,22933,23029,23103,23184,23273,23436,23580,23659,23734,23816,23875,23955,24035,24090,24212,24315,24356,24409,24519,24593,24729,24797,24883,24963,25032,25126,25185,25240,25302,25362,25427,25537", - "endLines": "235,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,375,376,378,379,380,381,382,383,384,385,386,387,388,389", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,83,53,57,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,55,49,59,52,65,61,62,62,46,56,52,54,87,57,61,49,44,42,59,66,51,49,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,64,109,89", - "endOffsets": "15105,17959,18042,18138,18207,18250,18302,18354,18403,18466,18524,18575,18623,18707,18761,18819,18913,19021,19092,19176,19259,19325,19408,19510,19571,19633,19684,19762,19815,19875,19980,20039,20141,20196,20267,20316,20374,20421,20480,20537,20608,20669,20726,20776,20828,20881,20931,20987,21037,21097,21150,21216,21278,21341,21404,21451,21508,21561,21616,21704,21762,21824,21874,21919,21962,22022,22089,22141,22191,22246,22293,22348,22401,22448,22501,22557,22605,22660,22713,22797,22864,22928,23024,23098,23179,23268,23431,23575,23654,23729,23811,23870,23950,24030,24085,24207,24310,24351,24404,24461,24588,24653,24792,24878,24958,25027,25121,25180,25235,25297,25357,25422,25532,25622" + "startLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,377,1717,1718,1722,1723,1727,1902,1903,2501,2642,2673,2698,2731", + "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", + "startOffsets": "3864,3933,10576,10646,10714,10786,10856,10917,10991,11848,11909,11970,12032,12096,12158,12219,12287,12387,12447,12513,12586,12655,12712,12764,13541,13613,13928,13963,14140,14190,14251,14308,14342,14377,14687,24658,112511,112628,112829,112939,113140,126029,126101,145470,152273,153927,154802,155484", + "endLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,377,1717,1721,1722,1726,1727,1902,1903,2507,2672,2693,2730,2736", + "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24", + "endOffsets": "3928,3991,10641,10709,10781,10851,10912,10986,11059,11904,11965,12027,12091,12153,12214,12282,12382,12442,12508,12581,12650,12707,12759,12821,13608,13684,13958,13993,14185,14246,14303,14337,14372,14407,14752,24724,112623,112824,112934,113135,113264,126096,126163,145676,153922,154603,155479,155646" } }, { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\styles.xml", + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\styles.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" + "startLines": "49,55,66,61,15,20,25,31,37,10,43,70,74", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "1798,2043,2507,2299,421,628,837,1066,1314,215,1560,2718,2895", + "endLines": "52,58,69,63,18,23,28,34,40,13,46,72,77", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2001,2249,2713,2454,599,808,1017,1264,1515,393,1756,2889,3120" }, "to": { "startLines": "1453,1457,1461,1465,1734,1738,1742,1746,1750,1754,1758,1907,1910", @@ -221,26 +152,33 @@ } }, { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\colors.xml", + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1" + "startLines": "10,18", + "startColumns": "4,4", + "startOffsets": "237,524", + "endLines": "15,21", + "endColumns": "19,19", + "endOffsets": "492,639" }, "to": { - "startLines": "30,49,50,51,52,87", - "startColumns": "4,4,4,4,4,4", - "startOffsets": "1614,2986,3037,3088,3140,5402", - "endColumns": "49,50,50,51,51,56", - "endOffsets": "1659,3032,3083,3135,3187,5454" + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" } }, { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\themes.xml", + "source": "C:\\Users\\83998\\Desktop\\xiaomi-b_branch (2)\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\themes.xml", "from": { - "startLines": "-1,-1,-1", - "startColumns": "-1,-1,-1", - "startOffsets": "-1,-1,-1" + "startLines": "1,2,8", + "startColumns": "2,4,4", + "startOffsets": "14,77,375", + "endLines": "1,6,11", + "endColumns": "60,12,12", + "endOffsets": "72,369,598" }, "to": { "startLines": "1791,1792,1804", @@ -250,53 +188,6 @@ "endColumns": "62,12,12", "endOffsets": "117257,117554,118454" } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\0a4a4ce1bdecc4eec4e4905ca8187ea2\\transformed\\coordinatorlayout-28.0.0\\res\\values\\values.xml", - "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" - }, - "to": { - "startLines": "12,1904", - "startColumns": "4,4", - "startOffsets": "420,126168", - "endLines": "12,1906", - "endColumns": "60,12", - "endOffsets": "476,126308" - } - }, - { - "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values\\values.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", - "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", - "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" - }, - "to": { - "startLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,377,1717,1718,1722,1723,1727,1902,1903", - "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", - "startOffsets": "3864,3933,10576,10646,10714,10786,10856,10917,10991,11848,11909,11970,12032,12096,12158,12219,12287,12387,12447,12513,12586,12655,12712,12764,13541,13613,13928,13963,14140,14190,14251,14308,14342,14377,14687,24658,112511,112628,112829,112939,113140,126029,126101", - "endLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,377,1717,1721,1722,1726,1727,1902,1903", - "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66", - "endOffsets": "3928,3991,10641,10709,10781,10851,10912,10986,11059,11904,11965,12027,12091,12153,12214,12282,12382,12442,12508,12581,12650,12707,12759,12821,13608,13684,13958,13993,14185,14246,14303,14337,14372,14407,14752,24724,112623,112824,112934,113135,113264,126096,126163" - } - }, - { - "source": "D:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "194,195,196,197,198", - "startColumns": "4,4,4,4,4", - "startOffsets": "12826,12878,12931,12984,13036", - "endColumns": "51,52,52,51,51", - "endOffsets": "12873,12926,12979,13031,13083" - } } ] } diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json index 27340d6..4fbf7dd 100644 --- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -1,434 +1,430 @@ [ { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_new_note_normal.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\new_note_normal.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_splash.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/splash.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_white_up.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_white_up.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_new_note_normal.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/new_note_normal.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_activity_login.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\activity_login.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_white_up.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_white_up.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_new_note_pressed.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\new_note_pressed.png" + "merged": "net.micode.notes.app-merged_res-8:/layout_note_item.xml.flat", + "source": "net.micode.notes.app-main-10:/layout/note_item.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\raw_introduction.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\raw\\introduction" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_new_note_pressed.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/new_note_pressed.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_green_down.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_green_down.9.png" + "merged": "net.micode.notes.app-merged_res-8:/xml_searchable.xml.flat", + "source": "net.micode.notes.app-main-10:/xml/searchable.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_note_list_footer.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\note_list_footer.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_translate.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/translate.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable_new_note.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable\\new_note.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_icon_app.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/icon_app.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_green.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_green.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_yellow_down.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_yellow_down.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_activity_delete_loginpassword.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\activity_delete_loginpassword.xml" + "merged": "net.micode.notes.app-merged_res-8:/layout_activity_splash.xml.flat", + "source": "net.micode.notes.app-main-10:/layout/activity_splash.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\note_edit_color_selector_panel.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_edit_title_blue.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/edit_title_blue.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_yellow.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_yellow.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_title_bar_bg.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/title_bar_bg.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_datetime_picker.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\datetime_picker.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_green_middle.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_green_middle.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_blue.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_blue.9.png" + "merged": "net.micode.notes.app-merged_res-8:/xml_widget_2x_info.xml.flat", + "source": "net.micode.notes.app-main-10:/xml/widget_2x_info.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\menu_sub_folder.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\menu\\sub_folder.xml" + "merged": "net.micode.notes.app-merged_res-8:/color_secondary_text_dark.xml.flat", + "source": "net.micode.notes.app-main-10:/color/secondary_text_dark.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_search_result.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\search_result.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_call_record.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/call_record.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_blue_down.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_blue_down.9.png" + "merged": "net.micode.notes.app-merged_res-8:/xml_preferences.xml.flat", + "source": "net.micode.notes.app-main-10:/xml/preferences.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_title_blue.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_title_blue.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_font_normal.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/font_normal.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_title_white.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_title_white.9.png" + "merged": "net.micode.notes.app-merged_res-8:/menu_note_list_options.xml.flat", + "source": "net.micode.notes.app-main-10:/menu/note_list_options.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\color_primary_text_dark.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\color\\primary_text_dark.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_yellow_up.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_yellow_up.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_folder.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_folder.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_edit_title_green.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/edit_title_green.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\xml_searchable.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\xml\\searchable.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_edit_green.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/edit_green.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_key.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\key.png" + "merged": "net.micode.notes.app-merged_res-8:/layout_activity_login.xml.flat", + "source": "net.micode.notes.app-main-10:/layout/activity_login.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_account_dialog_title.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\account_dialog_title.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_menu_delete.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/menu_delete.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_font_super.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\font_super.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_font_large.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/font_large.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_splash.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\splash.png" + "merged": "net.micode.notes.app-merged_res-8:/layout_widget_4x.xml.flat", + "source": "net.micode.notes.app-main-10:/layout/widget_4x.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_yellow_single.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_yellow_single.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_menu_move.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/menu_move.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\xml_preferences.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\xml\\preferences.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_bg_btn_set_color.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/bg_btn_set_color.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_note_edit_list_item.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\note_edit_list_item.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_edit_red.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/edit_red.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_menu_move.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\menu_move.png" + "merged": "net.micode.notes.app-merged_res-8:/layout_add_account_text.xml.flat", + "source": "net.micode.notes.app-main-10:/layout/add_account_text.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_title_yellow.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable_new_note.xml.flat", + "source": "net.micode.notes.app-main-10:/drawable/new_note.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_note_list.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\note_list.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/font_size_selector_bg.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_white_middle.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_white_middle.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/note_edit_color_selector_panel.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_activity_change_loginpassword.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\activity_change_loginpassword.xml" + "merged": "net.micode.notes.app-merged_res-8:/layout_note_list_footer.xml.flat", + "source": "net.micode.notes.app-main-10:/layout/note_list_footer.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_translate.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\translate.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_blue_up.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_blue_up.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_dialog_edit_text.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\dialog_edit_text.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_red_single.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_red_single.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_2x_blue.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_2x_blue.png" + "merged": "net.micode.notes.app-merged_res-8:/layout_activity_delete_loginpassword.xml.flat", + "source": "net.micode.notes.app-main-10:/layout/activity_delete_loginpassword.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_widget_4x.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\widget_4x.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_clock.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/clock.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_menu_delete.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\menu_delete.png" + "merged": "net.micode.notes.app-merged_res-8:/layout_activity_change_loginpassword.xml.flat", + "source": "net.micode.notes.app-main-10:/layout/activity_change_loginpassword.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_clock.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\clock.png" + "merged": "net.micode.notes.app-merged_res-8:/layout_account_dialog_title.xml.flat", + "source": "net.micode.notes.app-main-10:/layout/account_dialog_title.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\menu_note_list_options.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\menu\\note_list_options.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_widget_2x_yellow.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/widget_2x_yellow.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_bg_btn_set_color.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\bg_btn_set_color.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_red_middle.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_red_middle.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_activity_set_loginpassword.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\activity_set_loginpassword.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_green_down.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_green_down.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_dialog_pwd.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\dialog_pwd.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_font_small.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/font_small.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\color_secondary_text_dark.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\color\\secondary_text_dark.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_background1.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_background1.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_delete.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\delete.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_search_result.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/search_result.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_menu_top.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\menu_top.png" + "merged": "net.micode.notes.app-merged_res-8:/layout_note_list_dropdown_menu.xml.flat", + "source": "net.micode.notes.app-main-10:/layout/note_list_dropdown_menu.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_note_edit.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\note_edit.xml" + "merged": "net.micode.notes.app-merged_res-8:/raw-zh-rCN_introduction.flat", + "source": "net.micode.notes.app-main-10:/raw-zh-rCN/introduction" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_4x_red.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_4x_red.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_dropdown_icon.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/dropdown_icon.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_red_middle.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_red_middle.9.png" + "merged": "net.micode.notes.app-merged_res-8:/menu_note_list.xml.flat", + "source": "net.micode.notes.app-main-10:/menu/note_list.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_title_bar_bg.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\title_bar_bg.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/edit_title_yellow.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\menu_call_note_edit.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\menu\\call_note_edit.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_widget_2x_white.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/widget_2x_white.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_selected.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\selected.png" - }, - { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_red_single.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_red_single.9.png" + "merged": "net.micode.notes.app-merged_res-8:/menu_note_edit.xml.flat", + "source": "net.micode.notes.app-main-10:/menu/note_edit.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_blue_up.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_blue_up.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_title_alert.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/title_alert.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\menu_note_list_dropdown.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\menu\\note_list_dropdown.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_green_up.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_green_up.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_footer_bg.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_footer_bg.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/bg_color_btn_mask.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_4x_yellow.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_4x_yellow.png" + "merged": "net.micode.notes.app-merged_res-8:/layout_widget_2x.xml.flat", + "source": "net.micode.notes.app-main-10:/layout/widget_2x.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\bg_color_btn_mask.png" + "merged": "net.micode.notes.app-merged_res-8:/layout_dialog_pwd.xml.flat", + "source": "net.micode.notes.app-main-10:/layout/dialog_pwd.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_folder_list_item.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\folder_list_item.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_footer_bg.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_footer_bg.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_green_single.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_green_single.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_edit_yellow.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/edit_yellow.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\xml_widget_2x_info.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\xml\\widget_2x_info.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_widget_4x_green.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/widget_4x_green.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_green_up.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_green_up.9.png" + "merged": "net.micode.notes.app-merged_res-8:/layout_dialog_edit_text.xml.flat", + "source": "net.micode.notes.app-main-10:/layout/dialog_edit_text.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_2x_white.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_2x_white.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_background2.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_background2.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_dropdown_icon.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\dropdown_icon.9.png" + "merged": "net.micode.notes.app-merged_res-8:/layout_datetime_picker.xml.flat", + "source": "net.micode.notes.app-main-10:/layout/datetime_picker.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_font_small.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\font_small.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_widget_4x_yellow.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/widget_4x_yellow.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_note_list_dropdown_menu.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\note_list_dropdown_menu.xml" + "merged": "net.micode.notes.app-merged_res-8:/color_primary_text_dark.xml.flat", + "source": "net.micode.notes.app-main-10:/color/primary_text_dark.xml" }, { - "merged": "net.micode.notes.app-merged_res-8:/menu_note_edit.xml.flat", - "source": "net.micode.notes.app-main-10:/menu/note_edit.xml" + "merged": "net.micode.notes.app-merged_res-8:/layout_folder_list_item.xml.flat", + "source": "net.micode.notes.app-main-10:/layout/folder_list_item.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\menu_call_record_folder.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\menu\\call_record_folder.xml" + "merged": "net.micode.notes.app-merged_res-8:/layout_note_edit_list_item.xml.flat", + "source": "net.micode.notes.app-main-10:/layout/note_edit_list_item.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_background1.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_background1.png" + "merged": "net.micode.notes.app-merged_res-8:/menu_note_list_dropdown.xml.flat", + "source": "net.micode.notes.app-main-10:/menu/note_list_dropdown.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_title_green.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_title_green.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_key.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/key.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_green_middle.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_green_middle.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_edit_title_white.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/edit_title_white.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_white_single.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_white_single.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_menu_top.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/menu_top.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_activity_splash.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\activity_splash.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_background.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_background.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_yellow_middle.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_widget_2x_green.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/widget_2x_green.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_notification.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\notification.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_widget_2x_blue.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/widget_2x_blue.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_yellow_down.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_yellow_down.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_widget_4x_white.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/widget_4x_white.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\menu_note_list.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\menu\\note_list.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_green_single.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_green_single.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_4x_white.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_4x_white.png" + "merged": "net.micode.notes.app-merged_res-8:/raw_introduction.flat", + "source": "net.micode.notes.app-main-10:/raw/introduction" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\raw-zh-rCN_introduction.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\raw-zh-rCN\\introduction" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_red_down.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_red_down.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_2x_yellow.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_2x_yellow.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_red_up.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_red_up.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_settings_header.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\settings_header.xml" + "merged": "net.micode.notes.app-merged_res-8:/menu_sub_folder.xml.flat", + "source": "net.micode.notes.app-main-10:/menu/sub_folder.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_title_alert.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\title_alert.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_folder.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_folder.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_widget_2x.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\widget_2x.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_white_single.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_white_single.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_2x_red.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_2x_red.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_white_middle.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_white_middle.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\menu_note_edit.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\menu\\note_edit.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_blue_middle.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_blue_middle.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_background2.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_background2.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_notification.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/notification.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_background.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_background.png" + "merged": "net.micode.notes.app-merged_res-8:/layout_settings_header.xml.flat", + "source": "net.micode.notes.app-main-10:/layout/settings_header.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_font_normal.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\font_normal.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_widget_4x_blue.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/widget_4x_blue.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_4x_green.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_4x_green.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_selected.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/selected.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_add_account_text.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\add_account_text.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_edit_white.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/edit_white.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_blue_middle.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_blue_middle.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_edit_blue.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/edit_blue.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_call_record.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\call_record.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_widget_4x_red.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/widget_4x_red.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_2x_green.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_2x_green.png" + "merged": "net.micode.notes.app-merged_res-8:/menu_call_record_folder.xml.flat", + "source": "net.micode.notes.app-main-10:/menu/call_record_folder.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\xml_widget_4x_info.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\xml\\widget_4x_info.xml" + "merged": "net.micode.notes.app-merged_res-8:/layout_note_edit.xml.flat", + "source": "net.micode.notes.app-main-10:/layout/note_edit.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_title_red.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_title_red.9.png" + "merged": "net.micode.notes.app-merged_res-8:/xml_widget_4x_info.xml.flat", + "source": "net.micode.notes.app-main-10:/xml/widget_4x_info.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_red.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_red.9.png" + "merged": "net.micode.notes.app-merged_res-8:/layout_note_list.xml.flat", + "source": "net.micode.notes.app-main-10:/layout/note_list.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_icon_app.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\icon_app.png" + "merged": "net.micode.notes.app-merged_res-8:/menu_call_note_edit.xml.flat", + "source": "net.micode.notes.app-main-10:/menu/call_note_edit.xml" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_red_down.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_red_down.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_font_super.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/font_super.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_blue_single.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_blue_single.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_edit_title_red.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/edit_title_red.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_white_down.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_white_down.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_white_down.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_white_down.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_font_large.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\font_large.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_yellow_middle.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_yellow_middle.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_yellow_up.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_yellow_up.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_yellow_single.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_yellow_single.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_white.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_white.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_blue_down.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_blue_down.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_4x_blue.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_4x_blue.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_delete.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/delete.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\font_size_selector_bg.9.png" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_widget_2x_red.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/widget_2x_red.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_note_item.xml.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\note_item.xml" + "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_blue_single.9.png.flat", + "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_blue_single.9.png" }, { - "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_red_up.9.png.flat", - "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_red_up.9.png" + "merged": "net.micode.notes.app-merged_res-8:/layout_activity_set_loginpassword.xml.flat", + "source": "net.micode.notes.app-main-10:/layout/activity_set_loginpassword.xml" } ] \ No newline at end of file diff --git a/src/Notes/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 2b2aa5a..b008224 100644 Binary files a/src/Notes/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex index 9c2b4a3..75de419 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex index 4f5c9ec..7cd9a77 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangedLoginPassword$1.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangedLoginPassword$1.dex index 7155a9c..3caf17d 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangedLoginPassword$1.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangedLoginPassword$1.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeleteLoginPassword$1.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeleteLoginPassword$1.dex index 42482fc..0ed9ef6 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeleteLoginPassword$1.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeleteLoginPassword$1.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeleteLoginPassword.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeleteLoginPassword.dex index dcd0acb..2fe0e15 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeleteLoginPassword.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeleteLoginPassword.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$1.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$1.dex index c6bb855..3a8554b 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$1.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$1.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity.dex index 1ae382f..0ac4efd 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex index 06070ea..3562dc0 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index 0057936..58cbf30 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index 9448b76..f7d848e 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex index dd7d08e..2aa49d9 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex index a1c7d18..14748f2 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$6.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$6.dex index 9a52551..cded0ef 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$6.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$6.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$7.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$7.dex index 889c151..0180496 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$7.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$7.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$8.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$8.dex index cafbcb0..db3067e 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$8.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$8.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$9.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$9.dex index 9237022..6ebbd79 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$9.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$9.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex index 06f62dd..b5ed87d 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index 797dd70..753b718 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex index c8bc061..93285e6 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex index 8e45bd2..fec2a1d 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex index 8157bf9..e78ad19 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex index fe3040e..7cf81d9 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$10.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$10.dex index 4eaf6c6..a3214ae 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$10.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$10.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$11.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$11.dex index e8de894..9e1047a 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$11.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$11.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$12.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$12.dex index 8d37a94..600fe52 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$12.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$12.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$13.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$13.dex index c0fc4ff..4795602 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$13.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$13.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$14.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$14.dex index 70b3e8f..e219a03 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$14.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$14.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex index e4d6bb2..eaf0df4 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex index 512a783..3c46199 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex index d14fde7..310789d 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex index c2fb32f..4ea6e51 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index 281a22e..a617a8b 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex index 18ff66e..1b9fd31 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index 77b9bae..2973aad 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex index 707ebb5..6395ab8 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex index 13f6cea..11053c5 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex index fcb196d..f9ac6bc 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex index 561b7b2..a058d1f 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex index c1e78d3..76e39cb 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index fb4ab19..e7d079a 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex index aa1804e..a7e62b9 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex index c31f80b..ba46f55 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index 185cca3..327a110 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index b0b2326..6b5f289 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex index ecca9b4..615d57f 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex index 2771543..a674443 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex index cdab20e..90976ba 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex index 4a3de70..ccc4f10 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex index a0f8cde..f60695a 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex index 9988e0c..1903aa7 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex index 630719c..301c84c 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex index 7b11437..5b5612d 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex index 502dcf9..91559e4 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex index 923a9d8..b3ff1fa 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RegisterLoginPassword$1.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RegisterLoginPassword$1.dex index 966f4f1..271987f 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RegisterLoginPassword$1.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RegisterLoginPassword$1.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RegisterLoginPassword.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RegisterLoginPassword.dex index 6cd6089..93c0cd9 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RegisterLoginPassword.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RegisterLoginPassword.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$1.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$1.dex index 2fbfa7f..aa8b563 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$1.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$1.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$2.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$2.dex index 1e5d153..208a565 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$2.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$2.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$3.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$3.dex index 810aca7..a87d485 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$3.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$3.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$4.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$4.dex index 1496714..cf36b60 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$4.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$4.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$5.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$5.dex index fba6a1f..d98f7b8 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$5.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$5.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$6.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$6.dex index 7bdd1d4..66dfcf4 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$6.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$6.dex differ diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity.dex index 6841577..755d50e 100644 Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity.dex differ diff --git a/src/Notes/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/Notes/app/build/intermediates/source_set_path_map/debug/file-map.txt index b40d234..0cd46f9 100644 --- a/src/Notes/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/src/Notes/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,11 +1,11 @@ -net.micode.notes.app-coordinatorlayout-28.0.0-0 D:\ASSDK\caches\transforms-3\0a4a4ce1bdecc4eec4e4905ca8187ea2\transformed\coordinatorlayout-28.0.0\res -net.micode.notes.app-appcompat-v7-28.0.0-1 D:\ASSDK\caches\transforms-3\52946320d6d0b4428c2de41aa0bbe2c7\transformed\appcompat-v7-28.0.0\res -net.micode.notes.app-support-compat-28.0.0-2 D:\ASSDK\caches\transforms-3\d9f0b9f6301870925ec9be62a3ecf027\transformed\support-compat-28.0.0\res -net.micode.notes.app-pngs-3 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-4 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\generated\res\resValues\debug -net.micode.notes.app-rs-5 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\generated\res\rs\debug -net.micode.notes.app-mergeDebugResources-6 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir -net.micode.notes.app-mergeDebugResources-7 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir -net.micode.notes.app-merged_res-8 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-9 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\debug\res -net.micode.notes.app-main-10 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\res +net.micode.notes.app-coordinatorlayout-28.0.0-0 C:\Users\83998\.gradle\caches\transforms-3\0a4a4ce1bdecc4eec4e4905ca8187ea2\transformed\coordinatorlayout-28.0.0\res +net.micode.notes.app-appcompat-v7-28.0.0-1 C:\Users\83998\.gradle\caches\transforms-3\52946320d6d0b4428c2de41aa0bbe2c7\transformed\appcompat-v7-28.0.0\res +net.micode.notes.app-support-compat-28.0.0-2 C:\Users\83998\.gradle\caches\transforms-3\d9f0b9f6301870925ec9be62a3ecf027\transformed\support-compat-28.0.0\res +net.micode.notes.app-pngs-3 C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-4 C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\build\generated\res\resValues\debug +net.micode.notes.app-rs-5 C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\build\generated\res\rs\debug +net.micode.notes.app-mergeDebugResources-6 C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir +net.micode.notes.app-mergeDebugResources-7 C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir +net.micode.notes.app-merged_res-8 C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-9 C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\debug\res +net.micode.notes.app-main-10 C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\res diff --git a/src/Notes/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt b/src/Notes/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt index 646d5a9..8d1df27 100644 --- a/src/Notes/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt +++ b/src/Notes/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt @@ -1,7 +1,7 @@ -net.micode.notes.test.app-androidTest-0 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\generated\res\resValues\androidTest\debug -net.micode.notes.test.app-androidTest-1 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\generated\res\rs\androidTest\debug -net.micode.notes.test.app-mergeDebugAndroidTestResources-2 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir -net.micode.notes.test.app-mergeDebugAndroidTestResources-3 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir -net.micode.notes.test.app-merged_res-4 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\merged_res\debugAndroidTest -net.micode.notes.test.app-androidTest-5 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\androidTest\res -net.micode.notes.test.app-androidTestDebug-6 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\androidTestDebug\res +net.micode.notes.test.app-androidTest-0 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\generated\res\resValues\androidTest\debug +net.micode.notes.test.app-androidTest-1 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\generated\res\rs\androidTest\debug +net.micode.notes.test.app-mergeDebugAndroidTestResources-2 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir +net.micode.notes.test.app-mergeDebugAndroidTestResources-3 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir +net.micode.notes.test.app-merged_res-4 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\merged_res\debugAndroidTest +net.micode.notes.test.app-androidTest-5 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\androidTest\res +net.micode.notes.test.app-androidTestDebug-6 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\androidTestDebug\res diff --git a/src/Notes/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk b/src/Notes/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk index 61db29f..6ab9b3d 100644 Binary files a/src/Notes/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk and b/src/Notes/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk differ diff --git a/src/Notes/app/build/outputs/apk/debug/app-debug.apk b/src/Notes/app/build/outputs/apk/debug/app-debug.apk deleted file mode 100644 index 4ffdf4e..0000000 Binary files a/src/Notes/app/build/outputs/apk/debug/app-debug.apk and /dev/null differ diff --git a/src/Notes/app/build/outputs/apk/debug/output-metadata.json b/src/Notes/app/build/outputs/apk/debug/output-metadata.json deleted file mode 100644 index b2231b9..0000000 --- a/src/Notes/app/build/outputs/apk/debug/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes/app/build/outputs/logs/manifest-merger-debug-report.txt index d7ceb3d..04eca84 100644 --- a/src/Notes/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/Notes/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,394 +1,394 @@ -- Merging decision tree log --- manifest -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12 -INJECTED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12 -INJECTED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12 -INJECTED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12 -MERGED from [com.android.databinding:viewbinding:7.2.2] D:\ASSDK\caches\transforms-3\7c3c35a22a19e4cf64a3746f1513f947\transformed\viewbinding-7.2.2\AndroidManifest.xml:17:1-24:12 -MERGED from [com.android.support:appcompat-v7:28.0.0] D:\ASSDK\caches\transforms-3\52946320d6d0b4428c2de41aa0bbe2c7\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:support-fragment:28.0.0] D:\ASSDK\caches\transforms-3\9b324531538c1987ac8d6dab364c979a\transformed\support-fragment-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:animated-vector-drawable:28.0.0] D:\ASSDK\caches\transforms-3\64a02c29752afdae97c6c897724c60ae\transformed\animated-vector-drawable-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:support-core-ui:28.0.0] D:\ASSDK\caches\transforms-3\19dfceecc664c161397d7106ccb73525\transformed\support-core-ui-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:support-core-utils:28.0.0] D:\ASSDK\caches\transforms-3\90117452d1d076dc0e3112e2c6952329\transformed\support-core-utils-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:support-vector-drawable:28.0.0] D:\ASSDK\caches\transforms-3\b04e7cd2bd580b99562fe4025f3d0e7f\transformed\support-vector-drawable-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:loader:28.0.0] D:\ASSDK\caches\transforms-3\7fe263e0a9389282c978704f6824a544\transformed\loader-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:viewpager:28.0.0] D:\ASSDK\caches\transforms-3\c76ef6d6dc7db6d7e4867a1067fd934f\transformed\viewpager-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:coordinatorlayout:28.0.0] D:\ASSDK\caches\transforms-3\0a4a4ce1bdecc4eec4e4905ca8187ea2\transformed\coordinatorlayout-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:drawerlayout:28.0.0] D:\ASSDK\caches\transforms-3\fd8440d22500e64fcccfd52600b1fd6c\transformed\drawerlayout-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:slidingpanelayout:28.0.0] D:\ASSDK\caches\transforms-3\2890553d26a467fa3a0e1a6239438ac5\transformed\slidingpanelayout-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:customview:28.0.0] D:\ASSDK\caches\transforms-3\b70c8401efca52441f45e80df9a38e4e\transformed\customview-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:swiperefreshlayout:28.0.0] D:\ASSDK\caches\transforms-3\af1e6680ef01b4bdcc3fac923c9bf1b2\transformed\swiperefreshlayout-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:asynclayoutinflater:28.0.0] D:\ASSDK\caches\transforms-3\7086bdbd997ee6567318cbacc283148e\transformed\asynclayoutinflater-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:support-compat:28.0.0] D:\ASSDK\caches\transforms-3\d9f0b9f6301870925ec9be62a3ecf027\transformed\support-compat-28.0.0\AndroidManifest.xml:17:1-24:12 -MERGED from [com.android.support:versionedparcelable:28.0.0] D:\ASSDK\caches\transforms-3\fa2caf22bdfeff77b33c6e9e469107de\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:17:1-25:12 -MERGED from [com.android.support:cursoradapter:28.0.0] D:\ASSDK\caches\transforms-3\39aa2b4be811b8332f642340676eef01\transformed\cursoradapter-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [android.arch.lifecycle:runtime:1.1.1] D:\ASSDK\caches\transforms-3\dd80ea39f4710fb51c3a701be6319dee\transformed\runtime-1.1.1\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:documentfile:28.0.0] D:\ASSDK\caches\transforms-3\58d4902b2f48effc3b1b2ed1e2e1a31e\transformed\documentfile-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:localbroadcastmanager:28.0.0] D:\ASSDK\caches\transforms-3\39fa9b58c4a2a0160283255d68cdb0c9\transformed\localbroadcastmanager-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:print:28.0.0] D:\ASSDK\caches\transforms-3\fefb639cdb034d82dbfedda774cc3487\transformed\print-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [android.arch.lifecycle:viewmodel:1.1.1] D:\ASSDK\caches\transforms-3\ef8a43026c946cb38e6e4cf92e217d98\transformed\viewmodel-1.1.1\AndroidManifest.xml:17:1-22:12 -MERGED from [android.arch.lifecycle:livedata:1.1.1] D:\ASSDK\caches\transforms-3\c3e3cad76e89eb4a70294d12d60419dd\transformed\livedata-1.1.1\AndroidManifest.xml:17:1-22:12 -MERGED from [android.arch.lifecycle:livedata-core:1.1.1] D:\ASSDK\caches\transforms-3\9e0dab91aa213f02bf6442f477693ad0\transformed\livedata-core-1.1.1\AndroidManifest.xml:17:1-22:12 -MERGED from [android.arch.core:runtime:1.1.1] D:\ASSDK\caches\transforms-3\e5f608aa90757d0971f669fd7153b99d\transformed\runtime-1.1.1\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:interpolator:28.0.0] D:\ASSDK\caches\transforms-3\82606dc5ed8a140f83703823d4adaaf7\transformed\interpolator-28.0.0\AndroidManifest.xml:17:1-22:12 -INJECTED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12 -INJECTED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12 -INJECTED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12 +INJECTED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12 +INJECTED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12 +INJECTED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12 +MERGED from [com.android.databinding:viewbinding:7.2.2] C:\Users\83998\.gradle\caches\transforms-3\7c3c35a22a19e4cf64a3746f1513f947\transformed\viewbinding-7.2.2\AndroidManifest.xml:17:1-24:12 +MERGED from [com.android.support:appcompat-v7:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\52946320d6d0b4428c2de41aa0bbe2c7\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:support-fragment:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\9b324531538c1987ac8d6dab364c979a\transformed\support-fragment-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:animated-vector-drawable:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\64a02c29752afdae97c6c897724c60ae\transformed\animated-vector-drawable-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:support-core-ui:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\19dfceecc664c161397d7106ccb73525\transformed\support-core-ui-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:support-core-utils:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\90117452d1d076dc0e3112e2c6952329\transformed\support-core-utils-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:support-vector-drawable:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\b04e7cd2bd580b99562fe4025f3d0e7f\transformed\support-vector-drawable-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:loader:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\7fe263e0a9389282c978704f6824a544\transformed\loader-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:viewpager:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\c76ef6d6dc7db6d7e4867a1067fd934f\transformed\viewpager-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:coordinatorlayout:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\0a4a4ce1bdecc4eec4e4905ca8187ea2\transformed\coordinatorlayout-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:drawerlayout:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\fd8440d22500e64fcccfd52600b1fd6c\transformed\drawerlayout-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:slidingpanelayout:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\2890553d26a467fa3a0e1a6239438ac5\transformed\slidingpanelayout-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:customview:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\b70c8401efca52441f45e80df9a38e4e\transformed\customview-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:swiperefreshlayout:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\af1e6680ef01b4bdcc3fac923c9bf1b2\transformed\swiperefreshlayout-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:asynclayoutinflater:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\7086bdbd997ee6567318cbacc283148e\transformed\asynclayoutinflater-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:support-compat:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\d9f0b9f6301870925ec9be62a3ecf027\transformed\support-compat-28.0.0\AndroidManifest.xml:17:1-24:12 +MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\fa2caf22bdfeff77b33c6e9e469107de\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:17:1-25:12 +MERGED from [com.android.support:cursoradapter:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\39aa2b4be811b8332f642340676eef01\transformed\cursoradapter-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [android.arch.lifecycle:runtime:1.1.1] C:\Users\83998\.gradle\caches\transforms-3\dd80ea39f4710fb51c3a701be6319dee\transformed\runtime-1.1.1\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:documentfile:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\58d4902b2f48effc3b1b2ed1e2e1a31e\transformed\documentfile-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:localbroadcastmanager:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\39fa9b58c4a2a0160283255d68cdb0c9\transformed\localbroadcastmanager-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:print:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\fefb639cdb034d82dbfedda774cc3487\transformed\print-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [android.arch.lifecycle:viewmodel:1.1.1] C:\Users\83998\.gradle\caches\transforms-3\ef8a43026c946cb38e6e4cf92e217d98\transformed\viewmodel-1.1.1\AndroidManifest.xml:17:1-22:12 +MERGED from [android.arch.lifecycle:livedata:1.1.1] C:\Users\83998\.gradle\caches\transforms-3\c3e3cad76e89eb4a70294d12d60419dd\transformed\livedata-1.1.1\AndroidManifest.xml:17:1-22:12 +MERGED from [android.arch.lifecycle:livedata-core:1.1.1] C:\Users\83998\.gradle\caches\transforms-3\9e0dab91aa213f02bf6442f477693ad0\transformed\livedata-core-1.1.1\AndroidManifest.xml:17:1-22:12 +MERGED from [android.arch.core:runtime:1.1.1] C:\Users\83998\.gradle\caches\transforms-3\e5f608aa90757d0971f669fd7153b99d\transformed\runtime-1.1.1\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:interpolator:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\82606dc5ed8a140f83703823d4adaaf7\transformed\interpolator-28.0.0\AndroidManifest.xml:17:1-22:12 +INJECTED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12 +INJECTED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12 +INJECTED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12 package - INJECTED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12 - INJECTED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml + INJECTED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12 + INJECTED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml android:versionName - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:5:5-30 - INJECTED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml - INJECTED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:5:5-30 + INJECTED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml + INJECTED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml xmlns:tools - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:3:5-51 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:3:5-51 xmlns:android - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:11-69 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:11-69 android:versionCode - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:4:5-28 - INJECTED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml - INJECTED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:4:5-28 + INJECTED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml + INJECTED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml uses-sdk -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:5-44 -INJECTED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:5-44 -INJECTED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:5-44 -MERGED from [com.android.databinding:viewbinding:7.2.2] D:\ASSDK\caches\transforms-3\7c3c35a22a19e4cf64a3746f1513f947\transformed\viewbinding-7.2.2\AndroidManifest.xml:20:5-22:41 -MERGED from [com.android.databinding:viewbinding:7.2.2] D:\ASSDK\caches\transforms-3\7c3c35a22a19e4cf64a3746f1513f947\transformed\viewbinding-7.2.2\AndroidManifest.xml:20:5-22:41 -MERGED from [com.android.support:appcompat-v7:28.0.0] D:\ASSDK\caches\transforms-3\52946320d6d0b4428c2de41aa0bbe2c7\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:appcompat-v7:28.0.0] D:\ASSDK\caches\transforms-3\52946320d6d0b4428c2de41aa0bbe2c7\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-fragment:28.0.0] D:\ASSDK\caches\transforms-3\9b324531538c1987ac8d6dab364c979a\transformed\support-fragment-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-fragment:28.0.0] D:\ASSDK\caches\transforms-3\9b324531538c1987ac8d6dab364c979a\transformed\support-fragment-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:animated-vector-drawable:28.0.0] D:\ASSDK\caches\transforms-3\64a02c29752afdae97c6c897724c60ae\transformed\animated-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:animated-vector-drawable:28.0.0] D:\ASSDK\caches\transforms-3\64a02c29752afdae97c6c897724c60ae\transformed\animated-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-core-ui:28.0.0] D:\ASSDK\caches\transforms-3\19dfceecc664c161397d7106ccb73525\transformed\support-core-ui-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-core-ui:28.0.0] D:\ASSDK\caches\transforms-3\19dfceecc664c161397d7106ccb73525\transformed\support-core-ui-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-core-utils:28.0.0] D:\ASSDK\caches\transforms-3\90117452d1d076dc0e3112e2c6952329\transformed\support-core-utils-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-core-utils:28.0.0] D:\ASSDK\caches\transforms-3\90117452d1d076dc0e3112e2c6952329\transformed\support-core-utils-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-vector-drawable:28.0.0] D:\ASSDK\caches\transforms-3\b04e7cd2bd580b99562fe4025f3d0e7f\transformed\support-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-vector-drawable:28.0.0] D:\ASSDK\caches\transforms-3\b04e7cd2bd580b99562fe4025f3d0e7f\transformed\support-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:loader:28.0.0] D:\ASSDK\caches\transforms-3\7fe263e0a9389282c978704f6824a544\transformed\loader-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:loader:28.0.0] D:\ASSDK\caches\transforms-3\7fe263e0a9389282c978704f6824a544\transformed\loader-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:viewpager:28.0.0] D:\ASSDK\caches\transforms-3\c76ef6d6dc7db6d7e4867a1067fd934f\transformed\viewpager-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:viewpager:28.0.0] D:\ASSDK\caches\transforms-3\c76ef6d6dc7db6d7e4867a1067fd934f\transformed\viewpager-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:coordinatorlayout:28.0.0] D:\ASSDK\caches\transforms-3\0a4a4ce1bdecc4eec4e4905ca8187ea2\transformed\coordinatorlayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:coordinatorlayout:28.0.0] D:\ASSDK\caches\transforms-3\0a4a4ce1bdecc4eec4e4905ca8187ea2\transformed\coordinatorlayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:drawerlayout:28.0.0] D:\ASSDK\caches\transforms-3\fd8440d22500e64fcccfd52600b1fd6c\transformed\drawerlayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:drawerlayout:28.0.0] D:\ASSDK\caches\transforms-3\fd8440d22500e64fcccfd52600b1fd6c\transformed\drawerlayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:slidingpanelayout:28.0.0] D:\ASSDK\caches\transforms-3\2890553d26a467fa3a0e1a6239438ac5\transformed\slidingpanelayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:slidingpanelayout:28.0.0] D:\ASSDK\caches\transforms-3\2890553d26a467fa3a0e1a6239438ac5\transformed\slidingpanelayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:customview:28.0.0] D:\ASSDK\caches\transforms-3\b70c8401efca52441f45e80df9a38e4e\transformed\customview-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:customview:28.0.0] D:\ASSDK\caches\transforms-3\b70c8401efca52441f45e80df9a38e4e\transformed\customview-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:swiperefreshlayout:28.0.0] D:\ASSDK\caches\transforms-3\af1e6680ef01b4bdcc3fac923c9bf1b2\transformed\swiperefreshlayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:swiperefreshlayout:28.0.0] D:\ASSDK\caches\transforms-3\af1e6680ef01b4bdcc3fac923c9bf1b2\transformed\swiperefreshlayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:asynclayoutinflater:28.0.0] D:\ASSDK\caches\transforms-3\7086bdbd997ee6567318cbacc283148e\transformed\asynclayoutinflater-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:asynclayoutinflater:28.0.0] D:\ASSDK\caches\transforms-3\7086bdbd997ee6567318cbacc283148e\transformed\asynclayoutinflater-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-compat:28.0.0] D:\ASSDK\caches\transforms-3\d9f0b9f6301870925ec9be62a3ecf027\transformed\support-compat-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-compat:28.0.0] D:\ASSDK\caches\transforms-3\d9f0b9f6301870925ec9be62a3ecf027\transformed\support-compat-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:versionedparcelable:28.0.0] D:\ASSDK\caches\transforms-3\fa2caf22bdfeff77b33c6e9e469107de\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:versionedparcelable:28.0.0] D:\ASSDK\caches\transforms-3\fa2caf22bdfeff77b33c6e9e469107de\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:cursoradapter:28.0.0] D:\ASSDK\caches\transforms-3\39aa2b4be811b8332f642340676eef01\transformed\cursoradapter-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:cursoradapter:28.0.0] D:\ASSDK\caches\transforms-3\39aa2b4be811b8332f642340676eef01\transformed\cursoradapter-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:runtime:1.1.1] D:\ASSDK\caches\transforms-3\dd80ea39f4710fb51c3a701be6319dee\transformed\runtime-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:runtime:1.1.1] D:\ASSDK\caches\transforms-3\dd80ea39f4710fb51c3a701be6319dee\transformed\runtime-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:documentfile:28.0.0] D:\ASSDK\caches\transforms-3\58d4902b2f48effc3b1b2ed1e2e1a31e\transformed\documentfile-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:documentfile:28.0.0] D:\ASSDK\caches\transforms-3\58d4902b2f48effc3b1b2ed1e2e1a31e\transformed\documentfile-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:localbroadcastmanager:28.0.0] D:\ASSDK\caches\transforms-3\39fa9b58c4a2a0160283255d68cdb0c9\transformed\localbroadcastmanager-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:localbroadcastmanager:28.0.0] D:\ASSDK\caches\transforms-3\39fa9b58c4a2a0160283255d68cdb0c9\transformed\localbroadcastmanager-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:print:28.0.0] D:\ASSDK\caches\transforms-3\fefb639cdb034d82dbfedda774cc3487\transformed\print-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:print:28.0.0] D:\ASSDK\caches\transforms-3\fefb639cdb034d82dbfedda774cc3487\transformed\print-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:viewmodel:1.1.1] D:\ASSDK\caches\transforms-3\ef8a43026c946cb38e6e4cf92e217d98\transformed\viewmodel-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:viewmodel:1.1.1] D:\ASSDK\caches\transforms-3\ef8a43026c946cb38e6e4cf92e217d98\transformed\viewmodel-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:livedata:1.1.1] D:\ASSDK\caches\transforms-3\c3e3cad76e89eb4a70294d12d60419dd\transformed\livedata-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:livedata:1.1.1] D:\ASSDK\caches\transforms-3\c3e3cad76e89eb4a70294d12d60419dd\transformed\livedata-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:livedata-core:1.1.1] D:\ASSDK\caches\transforms-3\9e0dab91aa213f02bf6442f477693ad0\transformed\livedata-core-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:livedata-core:1.1.1] D:\ASSDK\caches\transforms-3\9e0dab91aa213f02bf6442f477693ad0\transformed\livedata-core-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.core:runtime:1.1.1] D:\ASSDK\caches\transforms-3\e5f608aa90757d0971f669fd7153b99d\transformed\runtime-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.core:runtime:1.1.1] D:\ASSDK\caches\transforms-3\e5f608aa90757d0971f669fd7153b99d\transformed\runtime-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:interpolator:28.0.0] D:\ASSDK\caches\transforms-3\82606dc5ed8a140f83703823d4adaaf7\transformed\interpolator-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:interpolator:28.0.0] D:\ASSDK\caches\transforms-3\82606dc5ed8a140f83703823d4adaaf7\transformed\interpolator-28.0.0\AndroidManifest.xml:20:5-44 -INJECTED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:5-44 -INJECTED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:5-44 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:5-44 +INJECTED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:5-44 +INJECTED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:5-44 +MERGED from [com.android.databinding:viewbinding:7.2.2] C:\Users\83998\.gradle\caches\transforms-3\7c3c35a22a19e4cf64a3746f1513f947\transformed\viewbinding-7.2.2\AndroidManifest.xml:20:5-22:41 +MERGED from [com.android.databinding:viewbinding:7.2.2] C:\Users\83998\.gradle\caches\transforms-3\7c3c35a22a19e4cf64a3746f1513f947\transformed\viewbinding-7.2.2\AndroidManifest.xml:20:5-22:41 +MERGED from [com.android.support:appcompat-v7:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\52946320d6d0b4428c2de41aa0bbe2c7\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:appcompat-v7:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\52946320d6d0b4428c2de41aa0bbe2c7\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:support-fragment:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\9b324531538c1987ac8d6dab364c979a\transformed\support-fragment-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:support-fragment:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\9b324531538c1987ac8d6dab364c979a\transformed\support-fragment-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:animated-vector-drawable:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\64a02c29752afdae97c6c897724c60ae\transformed\animated-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:animated-vector-drawable:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\64a02c29752afdae97c6c897724c60ae\transformed\animated-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:support-core-ui:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\19dfceecc664c161397d7106ccb73525\transformed\support-core-ui-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:support-core-ui:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\19dfceecc664c161397d7106ccb73525\transformed\support-core-ui-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:support-core-utils:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\90117452d1d076dc0e3112e2c6952329\transformed\support-core-utils-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:support-core-utils:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\90117452d1d076dc0e3112e2c6952329\transformed\support-core-utils-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:support-vector-drawable:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\b04e7cd2bd580b99562fe4025f3d0e7f\transformed\support-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:support-vector-drawable:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\b04e7cd2bd580b99562fe4025f3d0e7f\transformed\support-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:loader:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\7fe263e0a9389282c978704f6824a544\transformed\loader-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:loader:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\7fe263e0a9389282c978704f6824a544\transformed\loader-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:viewpager:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\c76ef6d6dc7db6d7e4867a1067fd934f\transformed\viewpager-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:viewpager:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\c76ef6d6dc7db6d7e4867a1067fd934f\transformed\viewpager-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:coordinatorlayout:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\0a4a4ce1bdecc4eec4e4905ca8187ea2\transformed\coordinatorlayout-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:coordinatorlayout:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\0a4a4ce1bdecc4eec4e4905ca8187ea2\transformed\coordinatorlayout-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:drawerlayout:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\fd8440d22500e64fcccfd52600b1fd6c\transformed\drawerlayout-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:drawerlayout:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\fd8440d22500e64fcccfd52600b1fd6c\transformed\drawerlayout-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:slidingpanelayout:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\2890553d26a467fa3a0e1a6239438ac5\transformed\slidingpanelayout-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:slidingpanelayout:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\2890553d26a467fa3a0e1a6239438ac5\transformed\slidingpanelayout-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:customview:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\b70c8401efca52441f45e80df9a38e4e\transformed\customview-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:customview:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\b70c8401efca52441f45e80df9a38e4e\transformed\customview-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:swiperefreshlayout:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\af1e6680ef01b4bdcc3fac923c9bf1b2\transformed\swiperefreshlayout-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:swiperefreshlayout:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\af1e6680ef01b4bdcc3fac923c9bf1b2\transformed\swiperefreshlayout-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:asynclayoutinflater:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\7086bdbd997ee6567318cbacc283148e\transformed\asynclayoutinflater-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:asynclayoutinflater:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\7086bdbd997ee6567318cbacc283148e\transformed\asynclayoutinflater-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:support-compat:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\d9f0b9f6301870925ec9be62a3ecf027\transformed\support-compat-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:support-compat:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\d9f0b9f6301870925ec9be62a3ecf027\transformed\support-compat-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\fa2caf22bdfeff77b33c6e9e469107de\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\fa2caf22bdfeff77b33c6e9e469107de\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:cursoradapter:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\39aa2b4be811b8332f642340676eef01\transformed\cursoradapter-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:cursoradapter:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\39aa2b4be811b8332f642340676eef01\transformed\cursoradapter-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [android.arch.lifecycle:runtime:1.1.1] C:\Users\83998\.gradle\caches\transforms-3\dd80ea39f4710fb51c3a701be6319dee\transformed\runtime-1.1.1\AndroidManifest.xml:20:5-44 +MERGED from [android.arch.lifecycle:runtime:1.1.1] C:\Users\83998\.gradle\caches\transforms-3\dd80ea39f4710fb51c3a701be6319dee\transformed\runtime-1.1.1\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:documentfile:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\58d4902b2f48effc3b1b2ed1e2e1a31e\transformed\documentfile-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:documentfile:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\58d4902b2f48effc3b1b2ed1e2e1a31e\transformed\documentfile-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:localbroadcastmanager:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\39fa9b58c4a2a0160283255d68cdb0c9\transformed\localbroadcastmanager-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:localbroadcastmanager:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\39fa9b58c4a2a0160283255d68cdb0c9\transformed\localbroadcastmanager-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:print:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\fefb639cdb034d82dbfedda774cc3487\transformed\print-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:print:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\fefb639cdb034d82dbfedda774cc3487\transformed\print-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [android.arch.lifecycle:viewmodel:1.1.1] C:\Users\83998\.gradle\caches\transforms-3\ef8a43026c946cb38e6e4cf92e217d98\transformed\viewmodel-1.1.1\AndroidManifest.xml:20:5-44 +MERGED from [android.arch.lifecycle:viewmodel:1.1.1] C:\Users\83998\.gradle\caches\transforms-3\ef8a43026c946cb38e6e4cf92e217d98\transformed\viewmodel-1.1.1\AndroidManifest.xml:20:5-44 +MERGED from [android.arch.lifecycle:livedata:1.1.1] C:\Users\83998\.gradle\caches\transforms-3\c3e3cad76e89eb4a70294d12d60419dd\transformed\livedata-1.1.1\AndroidManifest.xml:20:5-44 +MERGED from [android.arch.lifecycle:livedata:1.1.1] C:\Users\83998\.gradle\caches\transforms-3\c3e3cad76e89eb4a70294d12d60419dd\transformed\livedata-1.1.1\AndroidManifest.xml:20:5-44 +MERGED from [android.arch.lifecycle:livedata-core:1.1.1] C:\Users\83998\.gradle\caches\transforms-3\9e0dab91aa213f02bf6442f477693ad0\transformed\livedata-core-1.1.1\AndroidManifest.xml:20:5-44 +MERGED from [android.arch.lifecycle:livedata-core:1.1.1] C:\Users\83998\.gradle\caches\transforms-3\9e0dab91aa213f02bf6442f477693ad0\transformed\livedata-core-1.1.1\AndroidManifest.xml:20:5-44 +MERGED from [android.arch.core:runtime:1.1.1] C:\Users\83998\.gradle\caches\transforms-3\e5f608aa90757d0971f669fd7153b99d\transformed\runtime-1.1.1\AndroidManifest.xml:20:5-44 +MERGED from [android.arch.core:runtime:1.1.1] C:\Users\83998\.gradle\caches\transforms-3\e5f608aa90757d0971f669fd7153b99d\transformed\runtime-1.1.1\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:interpolator:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\82606dc5ed8a140f83703823d4adaaf7\transformed\interpolator-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:interpolator:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\82606dc5ed8a140f83703823d4adaaf7\transformed\interpolator-28.0.0\AndroidManifest.xml:20:5-44 +INJECTED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:5-44 +INJECTED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:5-44 android:targetSdkVersion - INJECTED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:5-44 - INJECTED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml + INJECTED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:5-44 + INJECTED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml android:minSdkVersion - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:15-41 - INJECTED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml - INJECTED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:15-41 + INJECTED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml + INJECTED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:9:5-81 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:9:5-81 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:9:22-78 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:9:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:10:5-88 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:10:5-88 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:10:22-85 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:10:22-85 uses-permission#android.permission.INTERNET -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:11:5-67 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:11:5-67 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:11:22-64 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:11:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:12:5-72 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:12:5-72 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:12:22-69 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:12:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:13:5-74 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:13:5-74 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:13:22-71 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:13:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:14:5-80 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:14:5-80 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:14:22-77 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:14:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:15:5-71 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:15:5-71 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:15:22-68 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:15:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:16:5-74 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:16:5-74 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:16:22-71 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:16:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:17:5-81 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:17:5-81 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:17:22-78 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:17:22-78 application -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:19:5-177:19 -MERGED from [com.android.support:support-compat:28.0.0] D:\ASSDK\caches\transforms-3\d9f0b9f6301870925ec9be62a3ecf027\transformed\support-compat-28.0.0\AndroidManifest.xml:22:5-94 -MERGED from [com.android.support:support-compat:28.0.0] D:\ASSDK\caches\transforms-3\d9f0b9f6301870925ec9be62a3ecf027\transformed\support-compat-28.0.0\AndroidManifest.xml:22:5-94 -MERGED from [com.android.support:versionedparcelable:28.0.0] D:\ASSDK\caches\transforms-3\fa2caf22bdfeff77b33c6e9e469107de\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:22:5-23:19 -MERGED from [com.android.support:versionedparcelable:28.0.0] D:\ASSDK\caches\transforms-3\fa2caf22bdfeff77b33c6e9e469107de\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:22:5-23:19 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:19:5-177:19 +MERGED from [com.android.support:support-compat:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\d9f0b9f6301870925ec9be62a3ecf027\transformed\support-compat-28.0.0\AndroidManifest.xml:22:5-94 +MERGED from [com.android.support:support-compat:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\d9f0b9f6301870925ec9be62a3ecf027\transformed\support-compat-28.0.0\AndroidManifest.xml:22:5-94 +MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\fa2caf22bdfeff77b33c6e9e469107de\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:22:5-23:19 +MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\fa2caf22bdfeff77b33c6e9e469107de\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:22:5-23:19 android:appComponentFactory - ADDED from [com.android.support:support-compat:28.0.0] D:\ASSDK\caches\transforms-3\d9f0b9f6301870925ec9be62a3ecf027\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91 + ADDED from [com.android.support:support-compat:28.0.0] C:\Users\83998\.gradle\caches\transforms-3\d9f0b9f6301870925ec9be62a3ecf027\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91 android:label - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:21:9-41 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:21:9-41 android:icon - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:20:9-42 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:20:9-42 activity#net.micode.notes.ui.LoginActivity -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:23:9-37:20 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:23:9-37:20 android:label - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:26:13-45 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:26:13-45 android:launchMode - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:27:13-43 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:27:13-43 android:windowSoftInputMode - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:30:13-52 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:30:13-52 android:uiOptions - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:29:13-57 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:29:13-57 android:configChanges - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:25:13-74 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:25:13-74 android:theme - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:28:13-45 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:28:13-45 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:24:13-45 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:24:13-45 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:32:13-36:29 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:32:13-36:29 action#android.intent.action.MAIN -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:17-69 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:17-69 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:25-66 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:25-66 category#android.intent.category.LAUNCHER -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:17-77 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:17-77 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:27-74 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:27-74 activity#net.micode.notes.ui.ChangedLoginPassword -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:38:9-45:20 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:38:9-45:20 android:label - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:41:13-45 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:41:13-45 android:launchMode - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:42:13-43 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:42:13-43 android:windowSoftInputMode - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:44:13-52 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:44:13-52 android:configChanges - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:40:13-74 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:40:13-74 android:theme - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:43:13-45 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:43:13-45 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:39:13-52 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:39:13-52 activity#net.micode.notes.ui.RegisterLoginPassword -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:46:9-53:20 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:46:9-53:20 android:label - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:49:13-45 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:49:13-45 android:launchMode - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:50:13-43 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:50:13-43 android:windowSoftInputMode - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:52:13-52 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:52:13-52 android:configChanges - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:48:13-74 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:48:13-74 android:theme - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:51:13-45 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:51:13-45 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:47:13-53 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:47:13-53 activity#net.micode.notes.ui.DeleteLoginPassword -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:54:9-61:20 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:54:9-61:20 android:label - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:57:13-45 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:57:13-45 android:launchMode - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:58:13-43 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:58:13-43 android:windowSoftInputMode - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:60:13-52 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:60:13-52 android:configChanges - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:56:13-74 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:56:13-74 android:theme - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:59:13-45 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:59:13-45 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:55:13-51 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:55:13-51 activity#net.micode.notes.ui.SplashActivity -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:62:9-72:20 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:62:9-72:20 android:label - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:66:13-58 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:66:13-58 android:configChanges - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:64:13-74 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:64:13-74 android:theme - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:67:13-58 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:67:13-58 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:63:13-46 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:63:13-46 activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:74:9-85:20 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:74:9-85:20 android:label - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:77:13-45 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:77:13-45 android:launchMode - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:78:13-43 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:78:13-43 android:windowSoftInputMode - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:80:13-52 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:80:13-52 android:configChanges - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:76:13-74 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:76:13-74 android:theme - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:79:13-45 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:79:13-45 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:75:13-49 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:75:13-49 activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:86:9-122:20 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:86:9-122:20 android:launchMode - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:89:13-43 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:89:13-43 android:configChanges - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:88:13-74 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:88:13-74 android:theme - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:90:13-45 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:90:13-45 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:87:13-48 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:87:13-48 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:93:13-102:29 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:93:13-102:29 android:scheme - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:94:17-38 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:94:17-38 tools:ignore - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:95:17-47 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:95:17-47 action#android.intent.action.VIEW -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:17-69 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:17-69 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:25-66 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:25-66 category#android.intent.category.DEFAULT -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-76 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-76 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:27-73 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:27-73 data -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:17-78 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:17-78 android:mimeType - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:23-75 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:23-75 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:104:13-111:29 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:104:13-111:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:105:17-79 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:105:17-79 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:105:25-76 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:105:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:113:13-117:29 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:113:13-117:29 action#android.intent.action.SEARCH -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:114:17-71 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:114:17-71 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:114:25-68 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:114:25-68 meta-data#android.app.searchable -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:119:13-121:54 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:119:13-121:54 android:resource - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:121:17-51 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:121:17-51 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:120:17-54 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:120:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:123:9-126:43 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:123:9-126:43 android:authorities - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:125:13-47 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:125:13-47 android:multiprocess - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:126:13-40 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:126:13-40 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:124:13-47 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:124:13-47 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:127:9-139:20 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:127:9-139:20 android:label - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:129:13-50 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:129:13-50 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:128:13-57 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:128:13-57 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:130:13-134:29 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:130:13-134:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:17-84 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:17-84 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:25-81 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:132:17-85 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:132:17-85 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:132:25-82 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:132:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:133:17-85 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:133:17-85 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:133:25-82 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:133:25-82 meta-data#android.appwidget.provider -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:136:13-138:58 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:136:13-138:58 android:resource - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:138:17-55 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:138:17-55 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:137:17-58 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:137:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:140:9-152:20 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:140:9-152:20 android:label - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:142:13-50 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:142:13-50 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:141:13-57 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:141:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:153:9-157:20 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:153:9-157:20 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:153:19-55 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:153:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:154:13-156:29 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:154:13-156:29 action#android.intent.action.BOOT_COMPLETED -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:155:17-79 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:155:17-79 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:155:25-76 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:155:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:158:9-160:41 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:158:9-160:41 android:process - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:160:13-38 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:160:13-38 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:159:13-45 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:159:13-45 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:161:9-165:78 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:161:9-165:78 android:label - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:163:13-45 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:163:13-45 android:launchMode - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:164:13-48 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:164:13-48 android:theme - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:165:13-75 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:165:13-75 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:162:13-50 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:162:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:166:9-170:63 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:166:9-170:63 android:label - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:168:13-54 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:168:13-54 android:launchMode - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:169:13-43 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:169:13-43 android:theme - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:170:13-60 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:170:13-60 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:167:13-55 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:167:13-55 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:171:9-173:40 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:171:9-173:40 android:exported - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:173:13-37 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:173:13-37 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:172:13-58 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:172:13-58 meta-data#android.app.default_searchable -ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:174:9-176:52 +ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:174:9-176:52 android:value - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:176:13-49 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:176:13-49 android:name - ADDED from D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:175:13-58 + ADDED from C:\Users\83998\Desktop\xiaomi-b_branch (2)\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:175:13-58 diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index ffb2fd4..57ec023 100644 Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/Notes/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/Notes/app/src/main/java/net/micode/notes/tool/BackupUtils.java index 8fc1c3f..e1f0e63 100644 --- a/src/Notes/app/src/main/java/net/micode/notes/tool/BackupUtils.java +++ b/src/Notes/app/src/main/java/net/micode/notes/tool/BackupUtils.java @@ -16,6 +16,72 @@ package net.micode.notes.tool; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.content.ContentResolver; +import android.content.ContentUris; +import android.content.ContentValues; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.SharedPreferences; +import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Paint; +import android.net.Uri; +import android.os.Build; +import android.os.Bundle; +import android.preference.PreferenceManager; +import android.provider.DocumentsContract; +import android.provider.MediaStore; +import android.support.annotation.RequiresApi; +import android.text.Editable; +import android.text.Spannable; +import android.text.SpannableString; +import android.text.TextUtils; +import android.text.TextWatcher; +import android.text.format.DateUtils; +import android.text.style.BackgroundColorSpan; +import android.text.style.ImageSpan; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuItem; +import android.view.MotionEvent; +import android.view.View; +import android.view.View.OnClickListener; +import android.view.WindowManager; import android.content.Context; import android.database.Cursor; import android.os.Environment; diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/ChangedLoginPassword.java b/src/Notes/app/src/main/java/net/micode/notes/ui/ChangedLoginPassword.java index 6cbc61e..eeac464 100644 --- a/src/Notes/app/src/main/java/net/micode/notes/ui/ChangedLoginPassword.java +++ b/src/Notes/app/src/main/java/net/micode/notes/ui/ChangedLoginPassword.java @@ -12,48 +12,48 @@ import android.widget.Toast; import net.micode.notes.R; -public class ChangedLoginPassword extends Activity{ - EditText OldPassword; - EditText NewPassword; - EditText AckPassword; - Button Acknowledged; +public class ChangedLoginPassword extends Activity { + EditText OldPassword; // 旧密码输入框 + EditText NewPassword; // 新密码输入框 + EditText AckPassword; // 确认密码输入框 + Button Acknowledged; // 确认按钮 @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_change_loginpassword); + setContentView(R.layout.activity_change_loginpassword); // 设置布局文件 getWindow().setSoftInputMode( WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE - | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); - OldPassword=(EditText) findViewById(R.id.old_password); - NewPassword=(EditText) findViewById(R.id.new_password); - AckPassword=(EditText) findViewById(R.id.ack_password); - Acknowledged=(Button)findViewById(R.id.Bt_Acknowledged); + | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); // 调整软键盘输入模式 + OldPassword = (EditText) findViewById(R.id.old_password); // 获取旧密码输入框 + NewPassword = (EditText) findViewById(R.id.new_password); // 获取新密码输入框 + AckPassword = (EditText) findViewById(R.id.ack_password); // 获取确认密码输入框 + Acknowledged = (Button) findViewById(R.id.Bt_Acknowledged); // 获取确认按钮 Acknowledged.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - String old_password = OldPassword.getText().toString(); - String new_password = NewPassword.getText().toString(); - String ack_password = AckPassword.getText().toString(); - SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE); - String login_password=pref.getString("password",""); - if(old_password.equals("")==true || new_password.equals("")==true || ack_password.equals("")==true) { - Toast.makeText(ChangedLoginPassword.this, "密码不能为空", Toast.LENGTH_SHORT).show(); - }else if (new_password.equals(ack_password) == false) { - Toast.makeText(ChangedLoginPassword.this, "新建密码与重复密码不匹配,请重新输入密码", Toast.LENGTH_SHORT).show(); - AckPassword.setText(""); - }else if(old_password.equals(login_password) == false){ - Toast.makeText(ChangedLoginPassword.this, "原有密码错误,请重新输入密码", Toast.LENGTH_SHORT).show(); - OldPassword.setText(""); - } - else if (new_password.equals(ack_password) == true && old_password.equals(login_password) == true){ - SharedPreferences.Editor editor=getSharedPreferences("user management", MODE_PRIVATE).edit(); - editor.putString("password",new_password); - editor.apply(); - Toast.makeText(ChangedLoginPassword.this, "修改密码成功", Toast.LENGTH_SHORT).show(); - Intent intent=new Intent(ChangedLoginPassword.this,NotesListActivity.class); - startActivity(intent); - finish(); + String old_password = OldPassword.getText().toString(); // 读取旧密码 + String new_password = NewPassword.getText().toString(); // 读取新密码 + String ack_password = AckPassword.getText().toString(); // 读取确认密码 + SharedPreferences pref = getSharedPreferences("user management", MODE_PRIVATE); // 获取SharedPreferences实例 + String login_password = pref.getString("password", ""); // 获取存储的登录密码 + if (old_password.equals("") == true || new_password.equals("") == true + || ack_password.equals("") == true) { + Toast.makeText(ChangedLoginPassword.this, "密码不能为空", Toast.LENGTH_SHORT).show(); // 检查密码是否为空 + } else if (new_password.equals(ack_password) == false) { + Toast.makeText(ChangedLoginPassword.this, "新建密码与重复密码不匹配,请重新输入密码", Toast.LENGTH_SHORT).show(); // 检查新密码和确认密码是否匹配 + AckPassword.setText(""); // 清空确认密码输入框 + } else if (old_password.equals(login_password) == false) { + Toast.makeText(ChangedLoginPassword.this, "原有密码错误,请重新输入密码", Toast.LENGTH_SHORT).show(); // 检查旧密码是否正确 + OldPassword.setText(""); // 清空旧密码输入框 + } else if (new_password.equals(ack_password) == true && old_password.equals(login_password) == true) { + SharedPreferences.Editor editor = getSharedPreferences("user management", MODE_PRIVATE).edit(); // 获取SharedPreferences.Editor实例 + editor.putString("password", new_password); // 更新密码 + editor.apply(); // 提交修改 + Toast.makeText(ChangedLoginPassword.this, "修改密码成功", Toast.LENGTH_SHORT).show(); // 显示成功提示 + Intent intent = new Intent(ChangedLoginPassword.this, NotesListActivity.class); // 创建跳转到笔记列表的Intent + startActivity(intent); // 启动跳转 + finish(); // 结束当前Activity } } }); @@ -61,8 +61,8 @@ public class ChangedLoginPassword extends Activity{ @Override public void onBackPressed() { - Intent intent=new Intent(ChangedLoginPassword.this,NotesListActivity.class); - startActivity(intent); - finish(); + Intent intent = new Intent(ChangedLoginPassword.this, NotesListActivity.class); // 创建返回笔记列表的Intent + startActivity(intent); // 启动Intent + finish(); // 结束当前Activity } -} +} \ No newline at end of file diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/DeleteLoginPassword.java b/src/Notes/app/src/main/java/net/micode/notes/ui/DeleteLoginPassword.java index 025ebf3..6f8c304 100644 --- a/src/Notes/app/src/main/java/net/micode/notes/ui/DeleteLoginPassword.java +++ b/src/Notes/app/src/main/java/net/micode/notes/ui/DeleteLoginPassword.java @@ -12,42 +12,41 @@ import android.widget.Toast; import net.micode.notes.R; -public class DeleteLoginPassword extends Activity{ - EditText password01; - Button Acknowledged; +public class DeleteLoginPassword extends Activity { + EditText password01; // 定义编辑文本变量用于输入旧密码 + Button Acknowledged; // 定义按钮变量用于确认删除密码 @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_delete_loginpassword); + setContentView(R.layout.activity_delete_loginpassword); // 设置当前Activity的布局 getWindow().setSoftInputMode( WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE - | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); - password01=(EditText) findViewById(R.id.old_password); - Acknowledged=(Button)findViewById(R.id.Bt_Acknowledged); + | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); // 设置软键盘显示模式 + password01 = (EditText) findViewById(R.id.old_password); // 获取旧密码输入框的实例 + Acknowledged = (Button) findViewById(R.id.Bt_Acknowledged); // 获取确认按钮的实例 Acknowledged.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - String text02 = password01.getText().toString(); - if(text02.equals("")==true) - Toast.makeText(DeleteLoginPassword.this, "密码不能为空", Toast.LENGTH_SHORT).show(); - SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE); - String password = pref.getString("password",""); - if(password.equals("")==false&&password.equals(text02)==true){ - SharedPreferences.Editor editor=getSharedPreferences("user management", - MODE_PRIVATE).edit(); - editor.putBoolean("user",false);//false表示已经设置登录密码 - editor.putString("password",""); - editor.apply(); + String text02 = password01.getText().toString(); // 获取输入的密码 + if (text02.equals("") == true) + Toast.makeText(DeleteLoginPassword.this, "密码不能为空", Toast.LENGTH_SHORT).show(); // 如果密码为空,显示密码不能为空的Toast消息 + SharedPreferences pref = getSharedPreferences("user management", MODE_PRIVATE); // 获取SharedPreferences实例 + String password = pref.getString("password", ""); // 从SharedPreferences获取密码 + if (password.equals("") == false && password.equals(text02) == true) { // 如果密码不为空且输入正确 + SharedPreferences.Editor editor = getSharedPreferences("user management", + MODE_PRIVATE).edit(); // 获取SharedPreferences的编辑器 + editor.putBoolean("user", false); // 设置user为false表示删除登录密码 + editor.putString("password", ""); // 清空密码 + editor.apply(); // 应用更改 - Toast.makeText(DeleteLoginPassword.this, "已经删除登录密码", Toast.LENGTH_SHORT).show(); - Intent intent=new Intent(DeleteLoginPassword.this,NotesListActivity.class); - startActivity(intent); - finish(); - } - else{ - Toast.makeText(DeleteLoginPassword.this, "密码错误", Toast.LENGTH_SHORT).show(); - password01.setText("");//把密码框内输入过的错误密码清空 + Toast.makeText(DeleteLoginPassword.this, "已经删除登录密码", Toast.LENGTH_SHORT).show(); // 显示已删除登录密码的Toast消息 + Intent intent = new Intent(DeleteLoginPassword.this, NotesListActivity.class); // 创建跳转到NotesListActivity的Intent + startActivity(intent); // 启动Intent + finish(); // 结束当前Activity + } else { + Toast.makeText(DeleteLoginPassword.this, "密码错误", Toast.LENGTH_SHORT).show(); // 显示密码错误的Toast消息 + password01.setText(""); // 清空密码输入框 } } }); @@ -55,8 +54,8 @@ public class DeleteLoginPassword extends Activity{ @Override public void onBackPressed() { - Intent intent=new Intent(DeleteLoginPassword.this,NotesListActivity.class); - startActivity(intent); - finish(); + Intent intent = new Intent(DeleteLoginPassword.this, NotesListActivity.class); // 创建跳转到NotesListActivity的Intent + startActivity(intent); // 启动Intent + finish(); // 结束当前Activity } -} +} \ No newline at end of file diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/LoginActivity.java b/src/Notes/app/src/main/java/net/micode/notes/ui/LoginActivity.java index 141087a..7f95952 100644 --- a/src/Notes/app/src/main/java/net/micode/notes/ui/LoginActivity.java +++ b/src/Notes/app/src/main/java/net/micode/notes/ui/LoginActivity.java @@ -1,6 +1,5 @@ package net.micode.notes.ui; - import android.app.Activity; import android.content.Intent; import android.content.SharedPreferences; @@ -15,44 +14,39 @@ import net.micode.notes.R; public class LoginActivity extends Activity { - EditText lg_password; - Button lg_login; - + EditText lg_password; // 定义编辑文本变量用于输入密码 + Button lg_login; // 定义按钮变量用于登录 @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE); - boolean User_boolean = pref.getBoolean("user",false);//获取用户是否设置了密码 - if(!User_boolean) //User_boolean = false时,(没有设置密码),直接跳转到便签主界面 + SharedPreferences pref = getSharedPreferences("user management", MODE_PRIVATE); // 获取SharedPreferences实例 + boolean User_boolean = pref.getBoolean("user", false); // 从SharedPreferences获取用户是否设置了密码 + if (!User_boolean) // 如果用户没有设置密码 { - Intent intent=new Intent(LoginActivity.this,SplashActivity.class); - startActivity(intent); - finish(); + Intent intent = new Intent(LoginActivity.this, SplashActivity.class); // 创建跳转到SplashActivity的Intent + startActivity(intent); // 启动Intent + finish(); // 结束当前Activity } - - setContentView(R.layout.activity_login); + setContentView(R.layout.activity_login); // 设置当前Activity的布局 getWindow().setSoftInputMode( WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE - | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); - lg_password=(EditText) findViewById(R.id.lg_password); - lg_login=(Button)findViewById(R.id.login); + | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); // 设置软键盘显示模式 + lg_password = (EditText) findViewById(R.id.lg_password); // 获取密码输入框的实例 + lg_login = (Button) findViewById(R.id.login); // 获取登录按钮的实例 lg_login.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE); - String password=pref.getString("password",""); - if(password.equals("")==false&&password.equals(lg_password.getText().toString())==true){ - Intent intent=new Intent(LoginActivity.this,SplashActivity.class); - startActivity(intent); - finish(); - } - else{ - Toast.makeText(LoginActivity.this, "密码错误", Toast.LENGTH_SHORT).show(); - lg_password.setText("");//把密码框内输入过的错误密码清空 + SharedPreferences pref = getSharedPreferences("user management", MODE_PRIVATE); // 获取SharedPreferences实例 + String password = pref.getString("password", ""); // 从SharedPreferences获取密码 + if (password.equals("") == false && password.equals(lg_password.getText().toString()) == true) { // 如果密码不为空且输入正确 + Intent intent = new Intent(LoginActivity.this, SplashActivity.class); // 创建跳转到SplashActivity的Intent + startActivity(intent); // 启动Intent + finish(); // 结束当前Activity + } else { + Toast.makeText(LoginActivity.this, "密码错误", Toast.LENGTH_SHORT).show(); // 显示密码错误的Toast消息 + lg_password.setText(""); // 清空密码输入框 } } - } - ); - + }); } -} +} \ No newline at end of file diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 1abcca5..4f21bdf 100644 --- a/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -21,6 +21,30 @@ import static android.content.Intent.ACTION_INSERT_OR_EDIT; import android.text.InputType; import android.graphics.Color; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; import android.graphics.Typeface; import android.app.Activity; import android.app.AlarmManager; @@ -101,7 +125,6 @@ import retrofit2.Response; import retrofit2.Retrofit; import retrofit2.converter.gson.GsonConverterFactory; - public class NoteEditActivity extends Activity implements OnClickListener, NoteSettingChangedListener, OnTextViewChangeListener { /** @@ -112,7 +135,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, public ImageView ivAlertIcon; // 提示图标图像视图 public TextView tvAlertDate; // 显示提醒日期的文本视图 public ImageView ibSetBgColor; // 设置背景颜色的图像视图 - public TextView tvToptext;//设置显示置顶信息的文本视图 + public TextView tvToptext;// 设置显示置顶信息的文本视图 } /** @@ -169,15 +192,15 @@ public class NoteEditActivity extends Activity implements OnClickListener, sFontSelectorSelectionMap.put(ResourceParser.TEXT_SUPER, R.id.iv_super_select); } - private AlertDialog alertDialog2; + private AlertDialog alertDialog2;// 视图 - private int fontstyle; + private int fontstyle;// 字体类型 - private EditText editText; + private EditText editText;// 编辑文本 - private TextView textView; + private TextView textView;// 文本视图 - private final int PHOTO_REQUEST=1;//图片请求 + private final int PHOTO_REQUEST = 1;// 图片请求 private static final String TAG = "NoteEditActivity"; // 日志标签 @@ -210,7 +233,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, private String mUserQuery; // 用户查询字符串 private Pattern mPattern; // 正则表达式模式 - private Editable restore_translate; + private Editable restore_translate;// 保存的翻译文本 @Override protected void onCreate(Bundle savedInstanceState) { @@ -226,19 +249,17 @@ public class NoteEditActivity extends Activity implements OnClickListener, count(); translate(); - - - if(mWorkingNote.getCheckListMode()==2) { + // 判断私密便签的密码 + if (mWorkingNote.getCheckListMode() == 2) { if (!(mWorkingNote.comparePassword(getIntent().getStringExtra("password")))) { Toast.makeText(getApplicationContext(), "密码错误", Toast.LENGTH_SHORT).show(); finish(); return; } - } - + // 插入图片的视图 final ImageButton add_img_btn = (ImageButton) findViewById(R.id.add_img_button); add_img_btn.setOnClickListener(new View.OnClickListener() { @Override @@ -248,8 +269,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, loadImage.addCategory(Intent.CATEGORY_OPENABLE); loadImage.setType("image/*"); startActivityForResult(loadImage, PHOTO_REQUEST); - }} - ); + } + }); initResources(); // 初始化资源 } @@ -276,7 +297,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, } } - /** * 初始化活动状态,根据传入的Intent确定是查看笔记、新建笔记还是编辑笔记。 * @@ -371,7 +391,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, return true; } - /** * 当Activity恢复到前台时调用。 * 主要负责初始化笔记界面。 @@ -435,12 +454,11 @@ public class NoteEditActivity extends Activity implements OnClickListener, * 显示提醒头部信息的方法。 * 如果当前笔记被置顶,该方法将显示已置顶。 */ - private void showTopHeader(){ - if(mWorkingNote.getTopId()!= 1){ + private void showTopHeader() { + if (mWorkingNote.getTopId() != 1) { mNoteHeaderHolder.tvToptext.setText("未置顶"); mNoteHeaderHolder.tvToptext.setVisibility(View.GONE); - } - else{ + } else { mNoteHeaderHolder.tvToptext.setText("已置顶"); mNoteHeaderHolder.tvToptext.setVisibility(View.VISIBLE); } @@ -503,7 +521,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, Log.d(TAG, "Save working note id: " + mWorkingNote.getNoteId() + " onSaveInstanceState"); } - /** * 分发触摸事件。如果触摸事件不在指定视图范围内,则隐藏该视图。 * @@ -594,19 +611,22 @@ public class NoteEditActivity extends Activity implements OnClickListener, } // 初始化编辑列表 mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list); - - + // 字符数的实时显示 editText.addTextChangedListener(new TextWatcher() { int currentLength = 0; + @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) { textView.setText("字符数:" + currentLength); } + @Override public void onTextChanged(CharSequence s, int start, int before, int count) { - currentLength = editText.getText().length() - countSpacesAndNewlines(s)[0] - countSpacesAndNewlines(s)[1] - countSpacesAndNewlines(s)[2]; + currentLength = editText.getText().length() - countSpacesAndNewlines(s)[0] + - countSpacesAndNewlines(s)[1] - countSpacesAndNewlines(s)[2]; } + @Override public void afterTextChanged(Editable s) { textView.setText("字符数:" + currentLength); @@ -646,7 +666,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, } // 设置小部件ID - intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[]{ + intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] { mWorkingNote.getWidgetId() }); @@ -656,7 +676,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, setResult(RESULT_OK, intent); } - /** * 点击事件的处理函数。 * @@ -770,21 +789,21 @@ public class NoteEditActivity extends Activity implements OnClickListener, menu.findItem(R.id.menu_delete_remind).setVisible(false); } // 根据笔记是否被置顶,更新“置顶”菜单项 - if (mWorkingNote.getTopId() == 1 ) { + if (mWorkingNote.getTopId() == 1) { menu.findItem(R.id.menu_top).setTitle("Cancel Top"); - } else if(mWorkingNote.getTopId() == 0){ + } else if (mWorkingNote.getTopId() == 0) { menu.findItem(R.id.menu_top).setTitle("Top"); } // 根据笔记是否为私密笔记,设置隐私便签和撤销隐私便签 - if (mWorkingNote.getCheckListMode()== TextNote.MODE_PRIVATE_TYPE){ + if (mWorkingNote.getCheckListMode() == TextNote.MODE_PRIVATE_TYPE) { menu.findItem(R.id.menu_Private).setTitle("Cancel Private"); - }else{ + } else { menu.findItem(R.id.menu_Private).setTitle("Set Private"); } + return true; } - /** * 处理选项菜单项的选择事件。 * @@ -807,12 +826,11 @@ public class NoteEditActivity extends Activity implements OnClickListener, builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { - if(mWorkingNote.getCheckListMode()==TextNote.MODE_PRIVATE_TYPE){ - Toast.makeText(getApplicationContext(),"私密便签不可删除",Toast.LENGTH_SHORT).show(); + if (mWorkingNote.getCheckListMode() == TextNote.MODE_PRIVATE_TYPE) { + Toast.makeText(getApplicationContext(), "私密便签不可删除", Toast.LENGTH_SHORT).show(); } // 确认删除当前笔记并结束当前活动 - else - { + else { deleteCurrentNote(); finish(); } @@ -828,8 +846,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, break; case R.id.menu_list_mode: // 切换笔记的列表模式 - mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? - TextNote.MODE_CHECK_LIST : 0); + mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? TextNote.MODE_CHECK_LIST : 0); break; case R.id.menu_share: // 获取当前编辑的笔记内容并分享 @@ -850,20 +867,20 @@ public class NoteEditActivity extends Activity implements OnClickListener, break; case R.id.menu_top: // 设置置顶 - mWorkingNote.setTop((mWorkingNote.getTopId())==1 ? "0" : "1"); - if(mWorkingNote.getTopId()==1){ - Toast.makeText(this,"已置顶",Toast.LENGTH_SHORT).show(); + mWorkingNote.setTop((mWorkingNote.getTopId()) == 1 ? "0" : "1"); + if (mWorkingNote.getTopId() == 1) { + Toast.makeText(this, "已置顶", Toast.LENGTH_SHORT).show(); } else { - Toast.makeText(this,"已取消置顶",Toast.LENGTH_SHORT).show(); + Toast.makeText(this, "已取消置顶", Toast.LENGTH_SHORT).show(); } showTopHeader(); break; case R.id.menu_Private: - //设置为私密便签 - if(mNoteEditor.getText().toString().equals("")){ - Toast.makeText(getApplicationContext(),"为空的便签不能设置密码",Toast.LENGTH_SHORT).show(); - }else{ + // 设置为私密便签 + if (mNoteEditor.getText().toString().equals("")) { + Toast.makeText(getApplicationContext(), "为空的便签不能设置密码", Toast.LENGTH_SHORT).show(); + } else { controlPwd(); } break; @@ -871,7 +888,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, case R.id.menu_count_words: AlertDialog.Builder builder1 = new AlertDialog.Builder(this); builder1.setIcon(android.R.drawable.ic_dialog_alert); - TextView content = (TextView)findViewById(R.id.note_edit_view); + TextView content = (TextView) findViewById(R.id.note_edit_view); int c = content.length(); builder1.setMessage("all characters num is " + c); builder1.setPositiveButton(android.R.string.ok, null); @@ -935,7 +952,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, startActivity(intent); } - /** * 删除当前正在编辑的笔记。 * 如果笔记存在于数据库中,并且当前不是同步模式,将直接删除该笔记; @@ -1068,7 +1084,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, } } - /** * 切换到列表模式。 * 将文本分割成多行,并为每行创建一个列表项,展示在编辑文本列表中。 @@ -1117,7 +1132,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, // 设置高亮背景 spannable.setSpan( new BackgroundColorSpan(this.getResources().getColor( - R.color.user_query_highlight)), m.start(), m.end(), + R.color.user_query_highlight)), + m.start(), m.end(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE); start = m.end(); } @@ -1257,7 +1273,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, return saved; } - /** * 将当前编辑的笔记发送到桌面。首先会检查当前编辑的笔记是否已存在于数据库中, * 如果不存在,则先保存。如果存在,会创建一个快捷方式放在桌面。 @@ -1321,6 +1336,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, private void showToast(int resId, int duration) { Toast.makeText(this, resId, duration).show(); } + public void translate() { final EditText editable = findViewById(R.id.note_edit_view); final Button get_local = findViewById(R.id.translate); @@ -1341,14 +1357,14 @@ public class NoteEditActivity extends Activity implements OnClickListener, AlertDialog.Builder builder = new AlertDialog.Builder(NoteEditActivity.this); builder.setView(linear); builder.setTitle("请选择翻译模式"); - AlertDialog choose_trans = builder.create();//创建对话框 + AlertDialog choose_trans = builder.create();// 创建对话框 choose_trans.show(); - trans1.setOnClickListener(new OnClickListener() {//中文翻译为英文的响应事件实现 + trans1.setOnClickListener(new OnClickListener() {// 中文翻译为英文的响应事件实现 @Override - public void onClick(View v) {//点击按钮后执行的操作 + public void onClick(View v) {// 点击按钮后执行的操作 restore_translate = editable.getText(); translate_z2u(); - Toast.makeText(NoteEditActivity.this, "中文翻译为英文", Toast.LENGTH_SHORT).show();//显示到屏幕 + Toast.makeText(NoteEditActivity.this, "中文翻译为英文", Toast.LENGTH_SHORT).show();// 显示到屏幕 } }); trans2.setOnClickListener(new OnClickListener() { @@ -1362,7 +1378,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, trans3.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - if (restore_translate == null || restore_translate.toString().equals(editable.getText().toString())) { + if (restore_translate == null + || restore_translate.toString().equals(editable.getText().toString())) { Toast.makeText(NoteEditActivity.this, "无可还原内容", Toast.LENGTH_SHORT).show(); } else { editable.setText(restore_translate); @@ -1373,19 +1390,20 @@ public class NoteEditActivity extends Activity implements OnClickListener, } }); } + public void translate_z2u() { final EditText editable = findViewById(R.id.note_edit_view); String word = editable.getText().toString(); word = word.replaceAll("\\n", "//"); - String from ="zh"; - String to="en"; - final String appid="20250106002246245"; - String key="9FW9ybSm5bOw4L12SPIX"; - String salt=(int)(Math.random()*100+1)+""; - String secretKey=appid+word+salt+key; - String sign=MD5Utils.getMD5Code(secretKey); - Log.d(TAG,"secretKey: "+secretKey); - Log.d(TAG,"sign: "+sign); + String from = "zh"; + String to = "en"; + final String appid = "20250106002246245"; + String key = "9FW9ybSm5bOw4L12SPIX"; + String salt = (int) (Math.random() * 100 + 1) + ""; + String secretKey = appid + word + salt + key; + String sign = MD5Utils.getMD5Code(secretKey); + Log.d(TAG, "secretKey: " + secretKey); + Log.d(TAG, "sign: " + sign); Retrofit retrofitBaidu = new Retrofit.Builder() .baseUrl("https://fanyi-api.baidu.com/api/trans/vip/") @@ -1414,15 +1432,15 @@ public class NoteEditActivity extends Activity implements OnClickListener, final EditText editable = findViewById(R.id.note_edit_view); String word = editable.getText().toString(); word = word.replaceAll("\\n", "//"); - String from ="en"; - String to="zh"; - final String appid="20250106002246245"; - String key="9FW9ybSm5bOw4L12SPIX"; - String salt=(int)(Math.random()*100+1)+""; - String secretKey=appid+word+salt+key; - String sign=MD5Utils.getMD5Code(secretKey); - Log.d(TAG,"secretKey: "+secretKey); - Log.d(TAG,"sign: "+sign); + String from = "en"; + String to = "zh"; + final String appid = "20250106002246245"; + String key = "9FW9ybSm5bOw4L12SPIX"; + String salt = (int) (Math.random() * 100 + 1) + ""; + String secretKey = appid + word + salt + key; + String sign = MD5Utils.getMD5Code(secretKey); + Log.d(TAG, "secretKey: " + secretKey); + Log.d(TAG, "sign: " + sign); Retrofit retrofitBaidu = new Retrofit.Builder() .baseUrl("https://fanyi-api.baidu.com/api/trans/vip/") .addConverterFactory(GsonConverterFactory.create()) @@ -1445,7 +1463,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, } }); } - //获取图片路径 + + // 获取图片路径 @RequiresApi(api = Build.VERSION_CODES.KITKAT) public String getPath(final Context context, final Uri uri) { final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT; @@ -1460,11 +1479,11 @@ public class NoteEditActivity extends Activity implements OnClickListener, contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI; } final String selection = "_id=?"; - final String[] selectionArgs = new String[]{split[1]}; + final String[] selectionArgs = new String[] { split[1] }; return getDataColumn(context, contentUri, selection, selectionArgs); } } - //Media + // Media else if ("content".equalsIgnoreCase(uri.getScheme())) { return getDataColumn(context, uri, null, null); } @@ -1475,43 +1494,45 @@ public class NoteEditActivity extends Activity implements OnClickListener, return null; } - //将路径转为图片 + // 将路径转为图片 private void convertToImage() { NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view); Editable editable = noteEditText.getText(); String noteText = editable.toString(); int length = editable.length(); - for(int i = 0; i < length; i++) { - for(int j = i; j < length; j++) {//通过穷尽所有可能的字符串,进行查找满足的图片路径 - String img_fragment = noteText.substring(i, j+1); - if(img_fragment.length() > 15 && img_fragment.endsWith("[/local]") && img_fragment.startsWith("[local]")){ + for (int i = 0; i < length; i++) { + for (int j = i; j < length; j++) {// 通过穷尽所有可能的字符串,进行查找满足的图片路径 + String img_fragment = noteText.substring(i, j + 1); + if (img_fragment.length() > 15 && img_fragment.endsWith("[/local]") + && img_fragment.startsWith("[local]")) { int limit = 7; - int len = img_fragment.length()-15; - String path = img_fragment.substring(limit,limit+len); + int len = img_fragment.length() - 15; + String path = img_fragment.substring(limit, limit + len); Bitmap bitmap = null; - Log.d(TAG, "图片的路径是:"+path); + Log.d(TAG, "图片的路径是:" + path); try { bitmap = BitmapFactory.decodeFile(path); } catch (Exception e) { e.printStackTrace(); - Log.d(TAG, "图片路径不可decode且路径是:"+path); + Log.d(TAG, "图片路径不可decode且路径是:" + path); } - if(bitmap!=null){ - Log.d(TAG, "图片不为null,且图片路径为:"+path); + if (bitmap != null) { + Log.d(TAG, "图片不为null,且图片路径为:" + path); ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap); String ss = "[local]" + path + "[/local]"; SpannableString spannableString = new SpannableString(ss); spannableString.setSpan(imageSpan, 0, ss.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); Log.d(TAG, "Create spannable string success!"); Editable edit_text = noteEditText.getEditableText(); - edit_text.delete(i,i+len+15); + edit_text.delete(i, i + len + 15); edit_text.insert(i, spannableString); } } } } } - //是否为媒体文件 + + // 是否为媒体文件 public boolean isMediaDocument(Uri uri) { return "com.android.providers.media.documents".equals(uri.getAuthority()); } @@ -1520,7 +1541,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, Cursor cursor = null; final String column = "_data"; - final String[] projection = {column}; + final String[] projection = { column }; try { cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null); if (cursor != null && cursor.moveToFirst()) { @@ -1543,7 +1564,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, Uri originalUri = intent.getData(); Bitmap bitmap = null; try { - bitmap = BitmapFactory.decodeStream(resolver.openInputStream(originalUri));//2.解码图片 + bitmap = BitmapFactory.decodeStream(resolver.openInputStream(originalUri));// 2.解码图片 } catch (FileNotFoundException e) { Log.d(TAG, "onActivityResult: get file_exception"); e.printStackTrace(); @@ -1566,10 +1587,12 @@ public class NoteEditActivity extends Activity implements OnClickListener, ContentValues contentValues = new ContentValues(); final long id = mWorkingNote.getNoteId(); contentValues.put("snippet", mWorkingNote.getContent()); - contentResolver.update(Uri.parse("content://micode_notes/note"), contentValues, "_id=?", new String[]{"" + id}); + contentResolver.update(Uri.parse("content://micode_notes/note"), contentValues, "_id=?", + new String[] { "" + id }); ContentValues contentValues1 = new ContentValues(); contentValues1.put("content", mWorkingNote.getContent()); - contentResolver.update(Uri.parse("content://micode_notes/data"), contentValues1, "mime_type=? and note_id=?", new String[]{"vnd.android.cursor.item/text_note", "" + id}); + contentResolver.update(Uri.parse("content://micode_notes/data"), contentValues1, + "mime_type=? and note_id=?", new String[] { "vnd.android.cursor.item/text_note", "" + id }); } else { Toast.makeText(NoteEditActivity.this, "获取图片失败", Toast.LENGTH_SHORT).show(); @@ -1580,68 +1603,66 @@ public class NoteEditActivity extends Activity implements OnClickListener, } } - //设置隐私模式 + // 设置隐私模式 private void controlPwd() { - final AlertDialog.Builder builder = new AlertDialog.Builder(this);//初始化对话框 - View view = LayoutInflater.from(this).inflate(R.layout.dialog_pwd, null);//加载对话框的布局文件 - final EditText etPwd = (EditText) view.findViewById(R.id.set_private_pwd);//初始化对话框里的文本对象 + final AlertDialog.Builder builder = new AlertDialog.Builder(this);// 初始化对话框 + View view = LayoutInflater.from(this).inflate(R.layout.dialog_pwd, null);// 加载对话框的布局文件 + final EditText etPwd = (EditText) view.findViewById(R.id.set_private_pwd);// 初始化对话框里的文本对象 showSoftInput(); - builder.setPositiveButton(android.R.string.ok, null);//确定按钮 + builder.setPositiveButton(android.R.string.ok, null);// 确定按钮 builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) {//取消按钮 + public void onClick(DialogInterface dialog, int which) {// 取消按钮 hideSoftInput(etPwd); } }); - final Dialog dialog = builder.setView(view).show();//显示出来 - final Button positive = (Button) dialog.findViewById(android.R.id.button1);//加载确定按钮布局文件 + final Dialog dialog = builder.setView(view).show();// 显示出来 + final Button positive = (Button) dialog.findViewById(android.R.id.button1);// 加载确定按钮布局文件 positive.setOnClickListener(new OnClickListener() { - public void onClick(View v) {//设置确定按钮的接收器 + public void onClick(View v) {// 设置确定按钮的接收器 hideSoftInput(etPwd); String Password = etPwd.getText().toString(); - if(mWorkingNote.getCheckListMode()==TextNote.MODE_PRIVATE_TYPE){ - if (!TextUtils.isEmpty(Password) && mWorkingNote.comparePassword(Password) ) { + if (mWorkingNote.getCheckListMode() == TextNote.MODE_PRIVATE_TYPE) { + if (!TextUtils.isEmpty(Password) && mWorkingNote.comparePassword(Password)) { Toast.makeText(getApplicationContext(), "成功撤销私密便签", Toast.LENGTH_SHORT).show(); - //加到数据库里 + // 加到数据库里 mWorkingNote.setmPwd(""); saveNote(); mWorkingNote.setCheckListMode(0); - } - else{ + } else { Toast.makeText(getApplicationContext(), "撤销私密便签失败", Toast.LENGTH_SHORT).show(); } - } - else{ - if (!TextUtils.isEmpty(Password)) {//输入不为空 + } else { + if (!TextUtils.isEmpty(Password)) {// 输入不为空 Toast.makeText(getApplicationContext(), "成功设置私密便签", Toast.LENGTH_SHORT).show(); - //加到数据库里 + // 加到数据库里 mWorkingNote.setmPwd(Password); saveNote(); - mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?//改workingnote的mMode的值,对应上文的界面设置 + mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? // 改workingnote的mMode的值,对应上文的界面设置 TextNote.MODE_PRIVATE_TYPE : 0); } } - dialog.dismiss();//撤销对话框 + dialog.dismiss();// 撤销对话框 } }); - if (TextUtils.isEmpty(etPwd.getText())) {//如果文件夹名称为空,则不能选择确定按钮 + if (TextUtils.isEmpty(etPwd.getText())) {// 如果文件夹名称为空,则不能选择确定按钮 positive.setEnabled(false); } - etPwd.addTextChangedListener(new TextWatcher() {//添加文本更改监听器,即判断文本更改状态 - public void beforeTextChanged(CharSequence s, int start, int count, int after) {//文本更改之前(未完成) + etPwd.addTextChangedListener(new TextWatcher() {// 添加文本更改监听器,即判断文本更改状态 + public void beforeTextChanged(CharSequence s, int start, int count, int after) {// 文本更改之前(未完成) // TODO Auto-generated method stub } - public void onTextChanged(CharSequence s, int start, int before, int count) {//当前文本改变触发, - if (TextUtils.isEmpty(etPwd.getText())) {//文本为空确定按键不可用,不为空则可用 + public void onTextChanged(CharSequence s, int start, int before, int count) {// 当前文本改变触发, + if (TextUtils.isEmpty(etPwd.getText())) {// 文本为空确定按键不可用,不为空则可用 positive.setEnabled(false); } else { positive.setEnabled(true); } } - public void afterTextChanged(Editable s) {//文本修改之后(未完成) + public void afterTextChanged(Editable s) {// 文本修改之后(未完成) // TODO Auto-generated method stub } }); @@ -1667,19 +1688,42 @@ public class NoteEditActivity extends Activity implements OnClickListener, inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0); } + private void fsearchAndHighlight(String searchText) { + Editable editable = mNoteEditor.getText(); + String content = editable.toString(); + + BackgroundColorSpan[] oldSpans = editable.getSpans(0, editable.length(), BackgroundColorSpan.class); + for (BackgroundColorSpan span : oldSpans) { + editable.removeSpan(span); + } + Pattern pattern = Pattern.compile(searchText, Pattern.CASE_INSENSITIVE); + Matcher matcher = pattern.matcher(content); + boolean found = false; + while (matcher.find()) { + found = true; + int start = matcher.start(); + int end = matcher.end(); + editable.setSpan( + new BackgroundColorSpan(Color.RED), + start, + end, + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + } + } - private void count(){ - mNoteEditor.addTextChangedListener(new TextWatcher(){ + private void count() { + mNoteEditor.addTextChangedListener(new TextWatcher() { int currentLength = 0; public void beforeTextChanged(CharSequence s, int start, int count, int after) { - textView.setText("字符" + currentLength ); + textView.setText("字符" + currentLength); } public void onTextChanged(CharSequence s, int start, int before, int count) { - currentLength = editText.getText().length() - countSpacesAndNewlines(s)[0] - countSpacesAndNewlines(s)[1] - countSpacesAndNewlines(s)[2]; + currentLength = editText.getText().length() - countSpacesAndNewlines(s)[0] + - countSpacesAndNewlines(s)[1] - countSpacesAndNewlines(s)[2]; } public void afterTextChanged(Editable s) { @@ -1687,19 +1731,38 @@ public class NoteEditActivity extends Activity implements OnClickListener, textView.setText("字符" + currentLength); } - }); convertToImage(); } + private void esearchAndHighlight(String searchText) { + Editable editable = mNoteEditor.getText(); + String content = editable.toString(); + BackgroundColorSpan[] oldSpans = editable.getSpans(0, editable.length(), BackgroundColorSpan.class); + for (BackgroundColorSpan span : oldSpans) { + editable.removeSpan(span); + } + Pattern pattern = Pattern.compile(searchText, Pattern.CASE_INSENSITIVE); + Matcher matcher = pattern.matcher(content); + boolean found = false; + while (matcher.find()) { + found = true; + int start = matcher.start(); + int end = matcher.end(); + editable.setSpan( + new BackgroundColorSpan(Color.RED), + start, + end, + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + } + } private int[] countSpacesAndNewlines(CharSequence text) { int spaceCount = 0; int newlineCount = 0; int photoCount = 0; - for (int i = 0; i < text.length(); i++) { char currentChar = text.charAt(i); if (currentChar == ' ') { @@ -1709,79 +1772,113 @@ public class NoteEditActivity extends Activity implements OnClickListener, } } - for(int i = 0; i < text.length(); i++) - { + for (int i = 0; i < text.length(); i++) { char currentChar = text.charAt(i); - if (currentChar == '[' && text.charAt(i + 1) == 'l' && + if (currentChar == '[' && text.charAt(i + 1) == 'l' && text.charAt(i + 2) == 'o' && text.charAt(i + 3) == 'c' && text.charAt(i + 4) == 'a' && text.charAt(i + 5) == 'l' && - text.charAt(i + 6) == ']') - { + text.charAt(i + 6) == ']') { photoCount = photoCount + 7; i = i + 7; - for(;i"); if (Flag1 != -1 && Flag2 != -1) { - stringBuffer = stringBuffer.replace(Flag1, Flag2+1, ""); + stringBuffer = stringBuffer.replace(Flag1, Flag2 + 1, ""); } } while (Flag1 != -1 && Flag2 != -1); - do {//不计入换行字符 + do {// 不计入换行字符 Flag1 = stringBuffer.indexOf("\n"); - if (Flag1 != -1){ - stringBuffer = stringBuffer.replace(Flag1, Flag1+1, ""); + if (Flag1 != -1) { + stringBuffer = stringBuffer.replace(Flag1, Flag1 + 1, ""); } } while (Flag1 != -1); - do {//不计入空格字符 + do {// 不计入空格字符 Flag1 = stringBuffer.indexOf(" "); if (Flag1 != -1) { - stringBuffer = stringBuffer.replace(Flag1, Flag1+1, ""); + stringBuffer = stringBuffer.replace(Flag1, Flag1 + 1, ""); } } while (Flag1 != -1); return stringBuffer.toString(); } + private void csearchAndHighlight(String searchText) { + Editable editable = mNoteEditor.getText(); + String content = editable.toString(); - public void showSingleAlertDiglog(){ - final String[] items = {"默认-普通","默认-非衬线","默认-衬线","默认-等宽","仿宋"}; + BackgroundColorSpan[] oldSpans = editable.getSpans(0, editable.length(), BackgroundColorSpan.class); + for (BackgroundColorSpan span : oldSpans) { + editable.removeSpan(span); + } + Pattern pattern = Pattern.compile(searchText, Pattern.CASE_INSENSITIVE); + Matcher matcher = pattern.matcher(content); + boolean found = false; + while (matcher.find()) { + found = true; + int start = matcher.start(); + int end = matcher.end(); + editable.setSpan( + new BackgroundColorSpan(Color.RED), + start, + end, + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + } + } + + public void showSingleAlertDiglog() { + final String[] items = { "默认-普通", "默认-非衬线", "默认-衬线", "默认-等宽", "仿宋" }; AlertDialog.Builder alertBuiler = new AlertDialog.Builder(this); alertBuiler.setTitle("选择字体"); alertBuiler.setSingleChoiceItems(items, 0, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogInterface, int i) { - switch(i){ + switch (i) { case 0: mNoteEditor.setTypeface(Typeface.DEFAULT); break; @@ -1795,7 +1892,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, mNoteEditor.setTypeface(Typeface.MONOSPACE); break; case 4: - Typeface typeface4 = Typeface.createFromAsset(getAssets(),"font/仿宋.ttf"); + Typeface typeface4 = Typeface.createFromAsset(getAssets(), "font/仿宋.ttf"); mNoteEditor.setTypeface(typeface4); break; } @@ -1817,7 +1914,28 @@ public class NoteEditActivity extends Activity implements OnClickListener, alertDialog2 = alertBuiler.create(); alertDialog2.show(); } + private void bsearchAndHighlight(String searchText) { + Editable editable = mNoteEditor.getText(); + String content = editable.toString(); + BackgroundColorSpan[] oldSpans = editable.getSpans(0, editable.length(), BackgroundColorSpan.class); + for (BackgroundColorSpan span : oldSpans) { + editable.removeSpan(span); + } + Pattern pattern = Pattern.compile(searchText, Pattern.CASE_INSENSITIVE); + Matcher matcher = pattern.matcher(content); + boolean found = false; + while (matcher.find()) { + found = true; + int start = matcher.start(); + int end = matcher.end(); + editable.setSpan( + new BackgroundColorSpan(Color.RED), + start, + end, + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + } + } private void showSearchDialog() { AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle("搜索文本"); @@ -1864,10 +1982,33 @@ public class NoteEditActivity extends Activity implements OnClickListener, new BackgroundColorSpan(Color.RED), start, end, - Spannable.SPAN_EXCLUSIVE_EXCLUSIVE - ); + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); } } -} + private void asearchAndHighlight(String searchText) { + Editable editable = mNoteEditor.getText(); + String content = editable.toString(); + + BackgroundColorSpan[] oldSpans = editable.getSpans(0, editable.length(), BackgroundColorSpan.class); + for (BackgroundColorSpan span : oldSpans) { + editable.removeSpan(span); + } + Pattern pattern = Pattern.compile(searchText, Pattern.CASE_INSENSITIVE); + Matcher matcher = pattern.matcher(content); + boolean found = false; + while (matcher.find()) { + found = true; + int start = matcher.start(); + int end = matcher.end(); + editable.setSpan( + new BackgroundColorSpan(Color.RED), + start, + end, + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + } + } + + +} diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditText.java index b4bc297..10ce3cb 100644 --- a/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditText.java +++ b/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditText.java @@ -16,6 +16,72 @@ package net.micode.notes.ui; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.content.ContentResolver; +import android.content.ContentUris; +import android.content.ContentValues; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.SharedPreferences; +import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Paint; +import android.net.Uri; +import android.os.Build; +import android.os.Bundle; +import android.preference.PreferenceManager; +import android.provider.DocumentsContract; +import android.provider.MediaStore; +import android.support.annotation.RequiresApi; +import android.text.Editable; +import android.text.Spannable; +import android.text.SpannableString; +import android.text.TextUtils; +import android.text.TextWatcher; +import android.text.format.DateUtils; +import android.text.style.BackgroundColorSpan; +import android.text.style.ImageSpan; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuItem; +import android.view.MotionEvent; +import android.view.View; +import android.view.View.OnClickListener; +import android.view.WindowManager; import android.content.Context; import android.graphics.Rect; import android.text.Layout; diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/Notes/app/src/main/java/net/micode/notes/ui/NoteItemData.java index 60df047..26afd4e 100644 --- a/src/Notes/app/src/main/java/net/micode/notes/ui/NoteItemData.java +++ b/src/Notes/app/src/main/java/net/micode/notes/ui/NoteItemData.java @@ -16,6 +16,72 @@ package net.micode.notes.ui; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.content.ContentResolver; +import android.content.ContentUris; +import android.content.ContentValues; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.SharedPreferences; +import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Paint; +import android.net.Uri; +import android.os.Build; +import android.os.Bundle; +import android.preference.PreferenceManager; +import android.provider.DocumentsContract; +import android.provider.MediaStore; +import android.support.annotation.RequiresApi; +import android.text.Editable; +import android.text.Spannable; +import android.text.SpannableString; +import android.text.TextUtils; +import android.text.TextWatcher; +import android.text.format.DateUtils; +import android.text.style.BackgroundColorSpan; +import android.text.style.ImageSpan; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuItem; +import android.view.MotionEvent; +import android.view.View; +import android.view.View.OnClickListener; +import android.view.WindowManager; import android.content.Context; import android.database.Cursor; import android.text.TextUtils; diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index 35ad355..8c92c31 100644 --- a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -16,7 +16,6 @@ package net.micode.notes.ui; - import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; @@ -89,7 +88,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt public static int time_mode = 1; - // 定义文件夹中笔记列表查询的标记 private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0; @@ -457,21 +455,21 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt // 根据菜单项ID执行相应操作 switch (item.getItemId()) { case R.id.delete: - AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); - builder.setTitle("Delete selected notes"); - builder.setIcon(android.R.drawable.ic_dialog_alert); - builder.setMessage(getString(R.string.alert_message_delete_notes, - mNotesListAdapter.getSelectedCount())); - builder.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - //Log.e(TAG, "onclick: which:" + which); - batchDelete(); - } - }); - builder.setNegativeButton(android.R.string.cancel, null); - builder.show(); + AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); + builder.setTitle("Delete selected notes"); + builder.setIcon(android.R.drawable.ic_dialog_alert); + builder.setMessage(getString(R.string.alert_message_delete_notes, + mNotesListAdapter.getSelectedCount())); + builder.setPositiveButton(android.R.string.ok, + new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + // Log.e(TAG, "onclick: which:" + which); + batchDelete(); + } + }); + builder.setNegativeButton(android.R.string.cancel, null); + builder.show(); break; case R.id.move: @@ -485,7 +483,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } } - /** * 为“新建笔记”按钮添加触摸监听器的内部类,实现点击和拖动事件的处理。 */ @@ -563,15 +560,16 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private void startAsyncNotesListQuery() { String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION : NORMAL_SELECTION; - if(secret_mode == 0) { + if (secret_mode == 0) { mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, - Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[]{ + Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] { String.valueOf(mCurrentFolderId) - }, NoteColumns.TOP + " DESC"+","+NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); - } - else{ + }, + NoteColumns.TOP + " DESC" + "," + NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + + " DESC"); + } else { String str1 = "88888888"; - String [] PROJECTION = new String [] { //定义一个新的PROJECTION数组,只换掉SNIPPET + String[] PROJECTION = new String[] { // 定义一个新的PROJECTION数组,只换掉SNIPPET NoteColumns.ID, NoteColumns.ALERTED_DATE, NoteColumns.BG_COLOR_ID, @@ -580,7 +578,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt NoteColumns.MODIFIED_DATE, NoteColumns.NOTES_COUNT, NoteColumns.PARENT_ID, - //NoteColumns.SNIPPET, + // NoteColumns.SNIPPET, str1, NoteColumns.TYPE, NoteColumns.WIDGET_ID, @@ -590,7 +588,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt }; mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, - Notes.CONTENT_NOTE_URI, PROJECTION, selection, new String[]{ + Notes.CONTENT_NOTE_URI, PROJECTION, selection, new String[] { String.valueOf(mCurrentFolderId) }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); @@ -695,7 +693,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt new AsyncTask>() { protected HashSet doInBackground(Void... unused) { HashSet widgets = mNotesListAdapter.getSelectedWidget(); - if (mCurrentFolderId == Notes.ID_TRASH_FOLER){ // 只需要修改这里 + if (mCurrentFolderId == Notes.ID_TRASH_FOLER) { // 只需要修改这里 // if in trash, really delete notes if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter .getSelectedItemIds())) { @@ -703,9 +701,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt Log.e(TAG, "Delete notes error, should not happens"); } } else { - HashSet ids=mNotesListAdapter.getSelectedItemIds(); - for(Long id : ids){ - if(NotesProvider.isPrivateNote(id)){ + HashSet ids = mNotesListAdapter.getSelectedItemIds(); + for (Long id : ids) { + if (NotesProvider.isPrivateNote(id)) { ids.remove(id); } } @@ -767,7 +765,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } } - /** * 打开指定的笔记节点进行编辑。 * @@ -784,9 +781,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } public void testNode(final NoteItemData item) { - if (item.getPassWord().equals("")||item.getPassWord().equals("0"))// 判断是否有密码,如果没有密码,那么item.getmPassWord()返回的值就是空字符串 + if (item.getPassWord().equals("") || item.getPassWord().equals("0"))// 判断是否有密码,如果没有密码,那么item.getmPassWord()返回的值就是空字符串 { - inputPwd=""; + inputPwd = ""; openNode(item); } else { final AlertDialog.Builder builder = new AlertDialog.Builder(this);// 初始化对话框 @@ -1030,7 +1027,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } } - /** * 更新小部件显示。 * 根据传入的小部件类型,设置对应的Provider并发送更新广播。 @@ -1150,24 +1146,22 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } else { Log.e(TAG, "Wrong state:" + mState); } - if(secret_mode == 1) + if (secret_mode == 1) menu.findItem(R.id.menu_secret).setVisible(false); else menu.findItem(R.id.menu_quit_secret).setVisible(false); - if(time_mode == 1) - { + if (time_mode == 1) { menu.findItem(R.id.menu_daytime).setVisible(false); - }else{ + } else { menu.findItem(R.id.menu_night_time).setVisible(false); } SharedPreferences preferences = getSharedPreferences("user management", MODE_WORLD_READABLE); - boolean login_mode=preferences.getBoolean("user",false); - if(!login_mode){ - menu.findItem(R.id.menu_deletelogin).setVisible(false); - } - else{ + boolean login_mode = preferences.getBoolean("user", false); + if (!login_mode) { + menu.findItem(R.id.menu_deletelogin).setVisible(false); + } else { menu.findItem(R.id.menu_login).setTitle("Change Lock"); } return true; @@ -1214,41 +1208,40 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt case R.id.menu_search: onSearchRequested(); // 触发搜索请求 break; - case R.id.menu_login: { //设置登录密码功能 + case R.id.menu_login: { // 设置登录密码功能 SharedPreferences preferences = getSharedPreferences("user management", MODE_WORLD_READABLE); - boolean login_mode=preferences.getBoolean("user",false); - if(!login_mode)//没有设置密码 + boolean login_mode = preferences.getBoolean("user", false); + if (!login_mode)// 没有设置密码 set_login_password(); - else if(login_mode)//已经设置密码 + else if (login_mode)// 已经设置密码 change_login_password(); break; } - case R.id.menu_deletelogin:{ + case R.id.menu_deletelogin: { delete_login_password(); break; } - case R.id.menu_secret: { // 进入私密模式的处理 - secret_mode = 1; // 设置状态为私密模式 - AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this); // 创建对话框构建器 - dialog.setTitle("重要提醒"); // 设置对话框标题 - dialog.setMessage("您已经进入私密模式!"); // 设置对话框消息 - dialog.setCancelable(false); // 禁止对话框被取消 - dialog.setPositiveButton("确定", new DialogInterface.OnClickListener() { // 添加确定按钮 + case R.id.menu_secret: { // 进入私密模式的处理 + secret_mode = 1; // 设置状态为私密模式 + AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this); // 创建对话框构建器 + dialog.setTitle("重要提醒"); // 设置对话框标题 + dialog.setMessage("您已经进入私密模式!"); // 设置对话框消息 + dialog.setCancelable(false); // 禁止对话框被取消 + dialog.setPositiveButton("确定", new DialogInterface.OnClickListener() { // 添加确定按钮 @Override public void onClick(DialogInterface dialog, int which) { - startAsyncNotesListQuery(); // 启动异步笔记列表查询 - Toast.makeText(NotesListActivity.this, "您已进入私密模式", Toast.LENGTH_SHORT).show(); // 显示提示信息 + startAsyncNotesListQuery(); // 启动异步笔记列表查询 + Toast.makeText(NotesListActivity.this, "您已进入私密模式", Toast.LENGTH_SHORT).show(); // 显示提示信息 } }); - dialog.show(); // 显示对话框 - startAsyncNotesListQuery(); // 启动异步笔记列表查询 - Toast.makeText(this, "您已进入私密模式", Toast.LENGTH_SHORT).show(); // 再次显示提示信息 - break; // 结束当前case + dialog.show(); // 显示对话框 + startAsyncNotesListQuery(); // 启动异步笔记列表查询 + Toast.makeText(this, "您已进入私密模式", Toast.LENGTH_SHORT).show(); // 再次显示提示信息 + break; // 结束当前case } - - case R.id.menu_quit_secret:{ //退出私密模式 + case R.id.menu_quit_secret: { // 退出私密模式 secret_mode = 0; AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this); dialog.setTitle("重要提醒"); @@ -1258,15 +1251,16 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt @Override public void onClick(DialogInterface dialog, int which) { startAsyncNotesListQuery(); - Toast.makeText(NotesListActivity.this,"您已退出私密模式",Toast.LENGTH_SHORT).show(); + Toast.makeText(NotesListActivity.this, "您已退出私密模式", Toast.LENGTH_SHORT).show(); } }); /* - dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which){} - }); - */ + * dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() { + * + * @Override + * public void onClick(DialogInterface dialog, int which){} + * }); + */ dialog.show(); break; } @@ -1285,14 +1279,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt break; } - if (item.getItemId() == R.id.menu_trash) { openTrashFolder(); } return true; } - @Override public boolean onSearchRequested() { startSearch(null, false, null /* appData */, false); @@ -1331,23 +1323,27 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt }.execute(); } + // 注册应用锁 private void set_login_password() { - Intent intent=new Intent(NotesListActivity.this,RegisterLoginPassword.class); + Intent intent = new Intent(NotesListActivity.this, RegisterLoginPassword.class); startActivity(intent); finish(); } + // 修改应用锁 private void change_login_password() { - Intent intent=new Intent(NotesListActivity.this,ChangedLoginPassword.class); + Intent intent = new Intent(NotesListActivity.this, ChangedLoginPassword.class); startActivity(intent); finish(); } + // 删除应用锁 private void delete_login_password() { - Intent intent=new Intent(NotesListActivity.this,DeleteLoginPassword.class); + Intent intent = new Intent(NotesListActivity.this, DeleteLoginPassword.class); startActivity(intent); finish(); } + /** * 检查当前是否为同步模式。 * diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListItem.java index 2b2f30e..9124b5c 100644 --- a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListItem.java +++ b/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListItem.java @@ -16,6 +16,72 @@ package net.micode.notes.ui; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.content.ContentResolver; +import android.content.ContentUris; +import android.content.ContentValues; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.SharedPreferences; +import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Paint; +import android.net.Uri; +import android.os.Build; +import android.os.Bundle; +import android.preference.PreferenceManager; +import android.provider.DocumentsContract; +import android.provider.MediaStore; +import android.support.annotation.RequiresApi; +import android.text.Editable; +import android.text.Spannable; +import android.text.SpannableString; +import android.text.TextUtils; +import android.text.TextWatcher; +import android.text.format.DateUtils; +import android.text.style.BackgroundColorSpan; +import android.text.style.ImageSpan; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuItem; +import android.view.MotionEvent; +import android.view.View; +import android.view.View.OnClickListener; +import android.view.WindowManager; import android.content.Context; import android.text.format.DateUtils; import android.view.View; diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/Notes/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java index 76640bc..ebb5474 100644 --- a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java +++ b/src/Notes/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java @@ -16,6 +16,72 @@ package net.micode.notes.ui; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.content.ContentResolver; +import android.content.ContentUris; +import android.content.ContentValues; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.SharedPreferences; +import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Paint; +import android.net.Uri; +import android.os.Build; +import android.os.Bundle; +import android.preference.PreferenceManager; +import android.provider.DocumentsContract; +import android.provider.MediaStore; +import android.support.annotation.RequiresApi; +import android.text.Editable; +import android.text.Spannable; +import android.text.SpannableString; +import android.text.TextUtils; +import android.text.TextWatcher; +import android.text.format.DateUtils; +import android.text.style.BackgroundColorSpan; +import android.text.style.ImageSpan; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuItem; +import android.view.MotionEvent; +import android.view.View; +import android.view.View.OnClickListener; +import android.view.WindowManager; import android.accounts.Account; import android.accounts.AccountManager; import android.app.ActionBar; diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/RegisterLoginPassword.java b/src/Notes/app/src/main/java/net/micode/notes/ui/RegisterLoginPassword.java index 6f01953..d3225ca 100644 --- a/src/Notes/app/src/main/java/net/micode/notes/ui/RegisterLoginPassword.java +++ b/src/Notes/app/src/main/java/net/micode/notes/ui/RegisterLoginPassword.java @@ -1,5 +1,71 @@ package net.micode.notes.ui; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.graphics.Typeface; +import android.app.Activity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.content.ContentResolver; +import android.content.ContentUris; +import android.content.ContentValues; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.SharedPreferences; +import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Paint; +import android.net.Uri; +import android.os.Build; +import android.os.Bundle; +import android.preference.PreferenceManager; +import android.provider.DocumentsContract; +import android.provider.MediaStore; +import android.support.annotation.RequiresApi; +import android.text.Editable; +import android.text.Spannable; +import android.text.SpannableString; +import android.text.TextUtils; +import android.text.TextWatcher; +import android.text.format.DateUtils; +import android.text.style.BackgroundColorSpan; +import android.text.style.ImageSpan; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuItem; +import android.view.MotionEvent; +import android.view.View; +import android.view.View.OnClickListener; +import android.view.WindowManager; import android.app.Activity; import android.content.Intent; import android.content.SharedPreferences; @@ -14,41 +80,41 @@ import android.widget.Toast; import net.micode.notes.R; public class RegisterLoginPassword extends Activity { - EditText password01; - EditText password02; - Button registered; + EditText password01; // 第一个密码输入框 + EditText password02; // 第二个密码输入框 + Button registered; // 注册按钮 @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_set_loginpassword); + setContentView(R.layout.activity_set_loginpassword); // 设置布局文件 getWindow().setSoftInputMode( WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE - | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); - password01=(EditText) findViewById(R.id.rg_password01); - password02=(EditText) findViewById(R.id.rg_password02); - registered=(Button)findViewById(R.id.rg_registered); + | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); // 调整软键盘输入模式 + password01 = (EditText) findViewById(R.id.rg_password01); // 初始化第一个密码输入框 + password02 = (EditText) findViewById(R.id.rg_password02); // 初始化第二个密码输入框 + registered = (Button) findViewById(R.id.rg_registered); // 初始化注册按钮 registered.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - String text02 = password01.getText().toString(); - String text03 = password02.getText().toString(); - if(text02.equals("")==true) { + String text02 = password01.getText().toString(); // 获取第一个密码框的内容 + String text03 = password02.getText().toString(); // 获取第二个密码框的内容 + if (text02.equals("")) { // 检查密码是否为空 Toast.makeText(RegisterLoginPassword.this, "密码不能为空", Toast.LENGTH_SHORT).show(); - }else if (text02.equals(text03) == false) { + } else if (!text02.equals(text03)) { // 检查两次输入的密码是否一致 Toast.makeText(RegisterLoginPassword.this, "密码不匹配,请重新输入密码", Toast.LENGTH_SHORT).show(); - password02.setText(""); - }else if (text02.equals(text03) == true){ - SharedPreferences.Editor editor=getSharedPreferences("user management", - MODE_PRIVATE).edit(); - editor.putBoolean("user",true);//true表示已经设置登录密码 - editor.putString("password",text02); - editor.apply(); - Log.d("RegisterLoginPassword","password is "+text02); - Toast.makeText(RegisterLoginPassword.this, "设置密码成功", Toast.LENGTH_SHORT).show(); - Intent intent=new Intent(RegisterLoginPassword.this,NotesListActivity.class); - startActivity(intent); - finish(); + password02.setText(""); // 清空第二个密码框 + } else { + SharedPreferences.Editor editor = getSharedPreferences("user management", + MODE_PRIVATE).edit(); // 获取SharedPreferences编辑器 + editor.putBoolean("user", true); // 设置用户已设置密码 + editor.putString("password", text02); // 保存密码 + editor.apply(); // 提交修改 + Log.d("RegisterLoginPassword", "password is " + text02); // 记录日志 + Toast.makeText(RegisterLoginPassword.this, "设置密码成功", Toast.LENGTH_SHORT).show(); // 显示成功提示 + Intent intent = new Intent(RegisterLoginPassword.this, NotesListActivity.class); // 创建跳转到笔记列表的Intent + startActivity(intent); // 启动Intent + finish(); // 结束当前Activity } } @@ -57,9 +123,9 @@ public class RegisterLoginPassword extends Activity { @Override public void onBackPressed() { - Intent intent=new Intent(RegisterLoginPassword.this,NotesListActivity.class); - startActivity(intent); - finish(); + Intent intent = new Intent(RegisterLoginPassword.this, NotesListActivity.class); // 创建返回笔记列表的Intent + startActivity(intent); // 启动Intent + finish(); // 结束当前Activity } } \ No newline at end of file diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/SplashActivity.java b/src/Notes/app/src/main/java/net/micode/notes/ui/SplashActivity.java index 66d60aa..eb7d6a2 100644 --- a/src/Notes/app/src/main/java/net/micode/notes/ui/SplashActivity.java +++ b/src/Notes/app/src/main/java/net/micode/notes/ui/SplashActivity.java @@ -14,7 +14,6 @@ import android.view.WindowInsets; import net.micode.notes.databinding.ActivitySplashBinding; import net.micode.notes.R; - import android.app.Activity; import android.app.AlarmManager; import android.app.AlertDialog; @@ -54,8 +53,6 @@ import android.widget.Toast; import android.text.TextWatcher; import android.text.Editable; // 如果还使用到了Editable,也要导入 - - import net.micode.notes.R; import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.TextNote; @@ -75,30 +72,24 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; - /** - * An example full-screen activity that shows and hides the system UI (i.e. - * status bar and navigation/system bar) with user interaction. + * 一个示例全屏活动,通过用户交互显示和隐藏系统UI(即状态栏和导航/系统栏)。 */ public class SplashActivity extends AppCompatActivity { /** - * Whether or not the system UI should be auto-hidden after - * {@link #AUTO_HIDE_DELAY_MILLIS} milliseconds. + * 是否在 {@link #AUTO_HIDE_DELAY_MILLIS} 毫秒后自动隐藏系统UI。 */ Handler mHandler = new Handler(); - private static final boolean AUTO_HIDE = true; /** - * If {@link #AUTO_HIDE} is set, the number of milliseconds to wait after - * user interaction before hiding the system UI. + * 如果设置了 {@link #AUTO_HIDE},则用户交互后隐藏系统UI前的等待毫秒数。 */ private static final int AUTO_HIDE_DELAY_MILLIS = 3000; /** - * Some older devices needs a small delay between UI widget updates - * and a change of the status and navigation bar. + * 一些较旧的设备在更新UI组件和更改状态栏及导航栏之间需要一个小的延迟。 */ private static final int UI_ANIMATION_DELAY = 300; private final Handler mHideHandler = new Handler(Looper.myLooper()); @@ -107,7 +98,7 @@ public class SplashActivity extends AppCompatActivity { @SuppressLint("InlinedApi") @Override public void run() { - // Delayed removal of status and navigation bar + // 安排一个runnable,在延迟后移除状态栏和导航栏 if (Build.VERSION.SDK_INT >= 30) { mContentView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE | View.SYSTEM_UI_FLAG_FULLSCREEN @@ -116,9 +107,9 @@ public class SplashActivity extends AppCompatActivity { | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION); } else { - // Note that some of these constants are new as of API 16 (Jelly Bean) - // and API 19 (KitKat). It is safe to use them, as they are inlined - // at compile-time and do nothing on earlier devices. + // 注意,这些常量中的一些是从API 16(Jelly Bean) + // 和API 19(KitKat)开始新增的。使用它们是安全的, + // 因为它们在编译时会被内联,对早期设备没有任何作用。 mContentView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE | View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE @@ -132,7 +123,7 @@ public class SplashActivity extends AppCompatActivity { private final Runnable mShowPart2Runnable = new Runnable() { @Override public void run() { - // Delayed display of UI elements + // 延迟展示UI组件 ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { actionBar.show(); @@ -148,9 +139,8 @@ public class SplashActivity extends AppCompatActivity { } }; /** - * Touch listener to use for in-layout UI controls to delay hiding the - * system UI. This is to prevent the jarring behavior of controls going away - * while interacting with activity UI. + * 用于布局内UI控件的触摸监听器,以延迟隐藏系统UI。 + * 这是为了防止在与活动UI交互时控件突然消失的不和谐行为。 */ private final View.OnTouchListener mDelayHideTouchListener = new View.OnTouchListener() { @Override @@ -181,10 +171,10 @@ public class SplashActivity extends AppCompatActivity { mHandler.postDelayed(new Runnable() { @Override public void run() { - Intent intent=new Intent(); + Intent intent = new Intent(); intent.setClass(SplashActivity.this, NotesListActivity.class); startActivity(intent); - finish(); //销毁欢迎页面 + finish(); // 销毁欢迎页面 } }, 2000); @@ -195,27 +185,25 @@ public class SplashActivity extends AppCompatActivity { mControlsView = binding.fullscreenContentControls; mContentView = binding.fullscreenContent; - // Set up the user interaction to manually show or hide the system UI. - mContentView.setOnClickListener(new View.OnClickListener() { + // 设置用户交互以手动显示或隐藏系统UI。 + mContentView.setOnClickListener(new OnClickListener() { @Override public void onClick(View view) { toggle(); } }); - // Upon interacting with UI controls, delay any scheduled hide() - // operations to prevent the jarring behavior of controls going away - // while interacting with the UI. + // 在与UI控件交互时,延迟任何预定的隐藏操作(hide()) + // 以防止在与UI交互时控件突然消失的不和谐行为。 binding.dummyButton.setOnTouchListener(mDelayHideTouchListener); + } @Override protected void onPostCreate(Bundle savedInstanceState) { super.onPostCreate(savedInstanceState); - // Trigger the initial hide() shortly after the activity has been - // created, to briefly hint to the user that UI controls - // are available. + // 在活动创建后不久触发初始的隐藏操作(hide()),以简短地提示用户UI控件是可用的。 delayedHide(100); } @@ -228,7 +216,7 @@ public class SplashActivity extends AppCompatActivity { } private void hide() { - // Hide UI first + // 先隐藏UI ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { actionBar.hide(); @@ -236,13 +224,13 @@ public class SplashActivity extends AppCompatActivity { mControlsView.setVisibility(View.GONE); mVisible = false; - // Schedule a runnable to remove the status and navigation bar after a delay + // 安排一个runnable,在延迟后移除状态栏和导航栏 mHideHandler.removeCallbacks(mShowPart2Runnable); mHideHandler.postDelayed(mHidePart2Runnable, UI_ANIMATION_DELAY); } private void show() { - // Show the system bar + // 展示系统柱 if (Build.VERSION.SDK_INT >= 30) { mContentView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION); @@ -252,20 +240,17 @@ public class SplashActivity extends AppCompatActivity { } mVisible = true; - // Schedule a runnable to display UI elements after a delay + // 安排一个runnable,在延迟后显示UI元素 mHideHandler.removeCallbacks(mHidePart2Runnable); mHideHandler.postDelayed(mShowPart2Runnable, UI_ANIMATION_DELAY); } /** - * Schedules a call to hide() in delay milliseconds, canceling any - * previously scheduled calls. + * 在延迟毫秒后安排调用 hide(),取消任何之前安排的调用。 */ private void delayedHide(int delayMillis) { mHideHandler.removeCallbacks(mHideRunnable); mHideHandler.postDelayed(mHideRunnable, delayMillis); } - - } \ No newline at end of file diff --git a/src/Notes/app/src/main/res/menu/note_edit.xml b/src/Notes/app/src/main/res/menu/note_edit.xml index 7267f4f..9a1e7c1 100644 --- a/src/Notes/app/src/main/res/menu/note_edit.xml +++ b/src/Notes/app/src/main/res/menu/note_edit.xml @@ -61,7 +61,7 @@ + android:title="Count Character"/> + android:title="Delete Lock"/> set cancel - secret model - quit secret model + Secret Model + Quit Secret Model - light mode - night mode + Light Mode + Night Mode Trash Folder - Select font + Select Font - search_text + Search Text %1$s result for \"%2$s\" diff --git a/src/Notes/local.properties b/src/Notes/local.properties index f3604c4..6e8ca38 100644 --- a/src/Notes/local.properties +++ b/src/Notes/local.properties @@ -4,5 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Tue Jan 07 21:08:32 CST 2025 +#Mon Jan 13 23:02:37 CST 2025 sdk.dir=D\:\\ASSDK