From 93e75b3bd28a141fdee6ded7cc031c6f6a4c19d3 Mon Sep 17 00:00:00 2001 From: HINOTOR <3635271576@qq.com> Date: Sun, 7 May 2023 15:39:24 +0800 Subject: [PATCH] src --- .../7.5/executionHistory/executionHistory.bin | Bin 221246 -> 221246 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../.gradle/7.5/fileHashes/fileHashes.bin | Bin 91465 -> 139983 bytes .../.gradle/7.5/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../buildOutputCleanup/outputFiles.bin | Bin 23879 -> 26327 bytes src/Notes-master/.gradle/file-system.probe | Bin 8 -> 8 bytes .../intermediates/apk/debug/app-debug.apk | Bin 1042475 -> 1042474 bytes .../graph.bin | Bin 235 -> 0 bytes .../graph.bin | Bin 235 -> 0 bytes .../graph.bin | Bin 235 -> 0 bytes .../graph.bin | Bin 235 -> 0 bytes .../graph.bin | Bin 235 -> 0 bytes .../graph.bin | Bin 235 -> 0 bytes .../graph.bin | Bin 235 -> 0 bytes .../graph.bin | Bin 235 -> 0 bytes .../dex_archive_input_jar_hashes/debug/out | Bin 399 -> 393 bytes .../compile-file-map.properties | 192 ++++++------- .../debug/mergeDebugResources/merger.xml | 16 +- .../incremental/mergeDebugAssets/merger.xml | 2 +- .../mergeDebugJniLibFolders/merger.xml | 2 +- .../incremental/mergeDebugShaders/merger.xml | 2 +- .../tmp/debug/dex-renamer-state.txt | 4 +- .../manifest-merger-blame-debug-report.txt | 246 ++++++++--------- .../debug/out/multi-v2/debug.json | 250 ++++++----------- .../debug/out/multi-v2/values-zh-rCN.json | 4 +- .../debug/out/multi-v2/values-zh-rTW.json | 4 +- .../debug/out/multi-v2/values.json | 132 ++------- .../source_set_path_map/debug/file-map.txt | 16 +- .../app/build/outputs/apk/debug/app-debug.apk | Bin 1082514 -> 1050780 bytes .../logs/manifest-merger-debug-report.txt | 256 +++++++++--------- 31 files changed, 477 insertions(+), 649 deletions(-) delete mode 100644 src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_0/graph.bin delete mode 100644 src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_1/graph.bin delete mode 100644 src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_2/graph.bin delete mode 100644 src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_3/graph.bin delete mode 100644 src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_4/graph.bin delete mode 100644 src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_5/graph.bin delete mode 100644 src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_6/graph.bin delete mode 100644 src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_7/graph.bin diff --git a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin b/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin index 333e47d61bc08925693199f9ebe2994ced20da4f..6f1061a88d0318298b3aebe8ad92e28f92e50e1d 100644 GIT binary patch delta 36058 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 delta 20470 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 delta 1343 zcmXX_e@s+I5N5zCAexpxeEY7VV0(uk@ZO<7xTZ#FTHevvME)SvMB!{>TT)Fq(Yr$g zHQFjo_4JF~YEskV_hB)`D-x-pN>UO`T4R%1G>U>k;4G-9h$zyz(wEG9Z}yv=o!Oba z{99!ArB{AhA*df~gcaWk4L2Drs)8-51B0rD4JH+bOadLI9-MyNi-Ls)1{Z30H_nPf zafOImByenz6}^m>#Txc6R&jRmulOcjMMu0Bn-g?&B?!!4l8e?Q*8&}HL=t-6R4~u1 zVx?JNE6YiiKg>Poun3G=G^|O~aV*gR%Tf-wlmjj`upp@rbxA5llX9^pSw%&%Ko`q+ zvVnqS0$(oU#26Q(c+rufU?fFFW~z>gR0YkcZoHkQVrv?om8K(26WF2Y=+L+*onz<< z%vR>D%v&3=FupH zd8K0;8S>gTQee%@s8bP*id*L_8ZPA?l@n~i* zMKh6nfs-tm8*-k@X@tkHX^$Zh$S~gf*i5quJ`ewSd68%4n!o>S21UvY-Z;RR)RHiv zwCKai5q(aSD=bWp2@9jU@ZYc_`ldkf%|_((8ffoTK({BPz`)S~fzAOP(Sthj2a5vzgINT}kQGfs0%Jo8 z)()#UF|47FF(+uCI;bPan0HU0>|O)*{Nq9Lhz{q70^f*=;7B8`kLp-*-;Fc(1^Vy1 zQ1ZaQl?QGdd1%MjLj(C^0w=~eCS%egFNPnfFg+H?du*VI@%m#OwkHB-o*0N7H{cxi z!t|8+r#hM#uQS>vig0N{U~*J2?_3?yu`*^^d)jUkWYVN10hKcuUxQj__!Hzn%5GcdVYH6gM#2(m)=W)5vB!tG0AM zRg&y(q9d~E6c17`r1E~GMj74AQS+Pmg-tfIxAQc4G5ONK`e`?U(|T(<P3EYn_?(CJhh}H;fHX!;R?-fI~7AGKl~TKSu8sM diff --git a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock index 53241067d866491e550791a9cbbe20f19d963639..eb9270264daee3e09e7271252dd16dfb286b14d5 100644 GIT binary patch literal 17 UcmZQRo*5Z&vA9*20Sq`)05RzV2LJ#7 literal 17 VcmZQRo*5Z&vA9*20Ss7A0{}9L1gii5 diff --git a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 0128a409787b0e84ed8d15a0b6c9334f55d9f19a..a7b68de9bbbf1c9136b451a7b0ddedeb2d44b34f 100644 GIT binary patch literal 17 VcmZSXk9-=r@5|}C?I3jjU~1yBG0 literal 17 VcmZSXk9-=r@5|}C>x1^_;21+D-9 diff --git a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin index d959ff600e2bdfc62c97e50c0d232ac3b9e007ec..f207bd05269004ecd3183648cbb8cd9d09332b2c 100644 GIT binary patch delta 3065 zcmX}tdpMNa9tUuj;;8KR?V>G(8P}OKMsB^7)7Y9y*ipHaxzD&HNse=-g?yrgtE!tH|sg;uzM^&Ei$wUp`e;h zIJ#2r&!+y&L&y~cU~Q60W;q!qwiFaQFuAz#TL)hYhKf9DTqrB3*EolKV*?*vS_Hpt; z>z$s4TIO+t3Li+G<4<1tWb~nOdqfDr@KC6pQ^G3U;q4W3|HTE2r|I@rV=qS)m^R(P z2~Q!$lp?Rq;~q4~pXQHH5UtEJovKZ+W4`Hl6BY>N9#CM$;QikCDBJ#$4}Qeq%jnn& zW4%JY)15Hf?vTdgP9-hr{*sPdauzDg804J;SN=Km$o(A%g-dR0svj zl)Yx2+Qe;R`3}{ob9ni5ux8W}28UBtPMmIsOmPF$3Et?Eq1&-@64;)yWINM$t$ zFTbAWKV*qe)*_-bk%w190`quEi&4MoW{Z6dMoYT*Vf0D$tSxMO(egx8BNU)-K>fty0?8-Nv#GyrW=&R?{z{c-w z`N)OyX@5O+wc=!O#xvxi0VuF?Bepn&_S{^VhMUDet5qu5>oySJzN9Y+VYm|ftQjHi z`xCFTUs8z(#T|6&$Ko>Mb(~rrPFSGv()Rxr?_}>mF7MO$Sm~sZ1nWxVGA<~rDYCDo zwT7v`HVC1#6|$@Y2r^3~m)18U6Um^%+Krf!ADh71i3f z=}yBYpG=O#U7!Ov;9=uWezj5*1#SLVgo*`^A>D>b8QnWMyNBP_hf(wPeP7ghu;MKj zpRhplntbmN*1ogv)WuudO?MnKfB$u@;5?oz5^s$=neP5qO*0;Gl2O{V{QMq$U|xhj zY}hQF2hVhda(Y@(reqymqwDLld$jhJ9Jz2msBNN%o3ExXdVKZ)GMNJSwmG)j69v06 zCgagBQPJxs?RQxF+wz&OP_4oUT5Z#aMk-9&HKvVBWB`6FCSesFo*TCAA?{-c3RV=M zUlrv$qwoLd%9|eR*(*Ydg{289UPIbs-rqE&6O@!TbNbn8A@3`bGsOClTTy*~J zB01^Wjd%5d4seNmH);EkrtQcTy|lYdq4a;}j^Y6>OadbggLG|ASrA;3T!y>701k)2 zqH4~~@;yDRAEER$oj|?p5)Xtt#G^{I82B82p1VBLLs-~Wii@4-V)vM7o_yD%B=#tc z?`cwrEa(d_jDQTzeUjIA?3ta-@Do%l{t^7_Dblm2Xz8h$%U)t!2+8B<)g{R8{Md)@ zytEXG?ET4Qx82t~J|V$xu6!j7+A~<*83R3a@rIpfx!?`GffbSb6?fN#a*-?2z>v!z zebx+LY*U*><6d=OJ&t~(+mAm#_z?fQh94IVQJUAj1! zt<$g9(xSv6RT^LV^-AS2n-S!qZcvZ!H{{W$M)&iE)d<6rVU+7eBp&#DFWOv)OsEEq z14V{4Ow{Gw9r8seNCtsJw=MB5b(P))d;+q)bf<_2w?+`e>_)X>KX92(k&&mvRKcmf z_6VhXP|RnLQ8)azOmLo;fm1^vdH!>9Bh+i1O9T9eAy0=uM@C3&VYs>ezI6O+Wvl64 zank~7y%G<{<6bv4K3z4x{DH$Qx0V*`Nhy=kS9&hjGlH=dULan+LFusO{6FAh Hz{0-)n-}e> delta 379 zcmXYrJuE{}0ENAwO(bFwdLJ!{`f0WIKD4w-8N@YowFw5sj?_?_l_p<|Mp8qCH0@yO zBBnQ%8fs%B7Kz2r9h~G#PIAsk&ZBGH-&)r*!io?VnzB%Y>=G|_legYHg+9S&-x}+F zN!4%j>MwB-I3e3_y8R`N22{lzXt#JD^pOn;3PDjR2a^^*Lv7G|D^#W!ih1)hW;o6xipb*i(b zYgn1noX-i~41uJ{lQxIRRa(Y}Qi`*bz)d;y%u6=rpV&=H%4tC>-NaoGtSo98i#Fbj f`IC_pGMdlKCAB5l@%yi~Hotun{OYPKYj5`-T*8<* diff --git a/src/Notes-master/.gradle/file-system.probe b/src/Notes-master/.gradle/file-system.probe index 951074e83f6148f6a5882dfbd55d3b864fde4282..50a6b6ec3a229c7b0df12621f385c454ff120e96 100644 GIT binary patch literal 8 PcmZQzU~K=Ydff#82<8I5 literal 8 PcmZQzU~K=&wRZ;q2-O1p diff --git a/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk index 7c12594d2df571216456f8b86338330e959b1900..938540ef48761882e26db137b6d8fa051904d7f3 100644 GIT binary patch delta 2187 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 diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_0/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_0/graph.bin deleted file mode 100644 index 601f245f575611e9ee7dd20b1adfb34054ece53a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 235 zcmZ4UmVvdnh`}&9KUXg?FQq6yGes|{G&3h9wMZ`|wIVYwUC+0)Brz!`)g`qcH7_MK zFS*jaD6t@e0RkAA7#MvRcvGN~CB?pp1tkppK3R!niTb4_nK}AE0qcqapdI2MF+Gr& zo=;|8c4~@8VsQpg*5rU+j6lwT-$0Y17`PLYlT(X}{fmGOs3>9(MCgI4W@W#1@UU3I wMP>#jHwLbp{KOQu#N?9vB2Na+l8mC%;*9*9l!^j-2Z-~^Ie@ePh+V+|087D2XaE2J diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_1/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_1/graph.bin deleted file mode 100644 index 601f245f575611e9ee7dd20b1adfb34054ece53a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 235 zcmZ4UmVvdnh`}&9KUXg?FQq6yGes|{G&3h9wMZ`|wIVYwUC+0)Brz!`)g`qcH7_MK zFS*jaD6t@e0RkAA7#MvRcvGN~CB?pp1tkppK3R!niTb4_nK}AE0qcqapdI2MF+Gr& zo=;|8c4~@8VsQpg*5rU+j6lwT-$0Y17`PLYlT(X}{fmGOs3>9(MCgI4W@W#1@UU3I wMP>#jHwLbp{KOQu#N?9vB2Na+l8mC%;*9*9l!^j-2Z-~^Ie@ePh+V+|087D2XaE2J diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_2/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_2/graph.bin deleted file mode 100644 index 601f245f575611e9ee7dd20b1adfb34054ece53a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 235 zcmZ4UmVvdnh`}&9KUXg?FQq6yGes|{G&3h9wMZ`|wIVYwUC+0)Brz!`)g`qcH7_MK zFS*jaD6t@e0RkAA7#MvRcvGN~CB?pp1tkppK3R!niTb4_nK}AE0qcqapdI2MF+Gr& zo=;|8c4~@8VsQpg*5rU+j6lwT-$0Y17`PLYlT(X}{fmGOs3>9(MCgI4W@W#1@UU3I wMP>#jHwLbp{KOQu#N?9vB2Na+l8mC%;*9*9l!^j-2Z-~^Ie@ePh+V+|087D2XaE2J diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_3/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_3/graph.bin deleted file mode 100644 index 601f245f575611e9ee7dd20b1adfb34054ece53a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 235 zcmZ4UmVvdnh`}&9KUXg?FQq6yGes|{G&3h9wMZ`|wIVYwUC+0)Brz!`)g`qcH7_MK zFS*jaD6t@e0RkAA7#MvRcvGN~CB?pp1tkppK3R!niTb4_nK}AE0qcqapdI2MF+Gr& zo=;|8c4~@8VsQpg*5rU+j6lwT-$0Y17`PLYlT(X}{fmGOs3>9(MCgI4W@W#1@UU3I wMP>#jHwLbp{KOQu#N?9vB2Na+l8mC%;*9*9l!^j-2Z-~^Ie@ePh+V+|087D2XaE2J diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_4/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_4/graph.bin deleted file mode 100644 index 601f245f575611e9ee7dd20b1adfb34054ece53a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 235 zcmZ4UmVvdnh`}&9KUXg?FQq6yGes|{G&3h9wMZ`|wIVYwUC+0)Brz!`)g`qcH7_MK zFS*jaD6t@e0RkAA7#MvRcvGN~CB?pp1tkppK3R!niTb4_nK}AE0qcqapdI2MF+Gr& zo=;|8c4~@8VsQpg*5rU+j6lwT-$0Y17`PLYlT(X}{fmGOs3>9(MCgI4W@W#1@UU3I wMP>#jHwLbp{KOQu#N?9vB2Na+l8mC%;*9*9l!^j-2Z-~^Ie@ePh+V+|087D2XaE2J diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_5/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_5/graph.bin deleted file mode 100644 index 601f245f575611e9ee7dd20b1adfb34054ece53a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 235 zcmZ4UmVvdnh`}&9KUXg?FQq6yGes|{G&3h9wMZ`|wIVYwUC+0)Brz!`)g`qcH7_MK zFS*jaD6t@e0RkAA7#MvRcvGN~CB?pp1tkppK3R!niTb4_nK}AE0qcqapdI2MF+Gr& zo=;|8c4~@8VsQpg*5rU+j6lwT-$0Y17`PLYlT(X}{fmGOs3>9(MCgI4W@W#1@UU3I wMP>#jHwLbp{KOQu#N?9vB2Na+l8mC%;*9*9l!^j-2Z-~^Ie@ePh+V+|087D2XaE2J diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_6/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_6/graph.bin deleted file mode 100644 index 601f245f575611e9ee7dd20b1adfb34054ece53a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 235 zcmZ4UmVvdnh`}&9KUXg?FQq6yGes|{G&3h9wMZ`|wIVYwUC+0)Brz!`)g`qcH7_MK zFS*jaD6t@e0RkAA7#MvRcvGN~CB?pp1tkppK3R!niTb4_nK}AE0qcqapdI2MF+Gr& zo=;|8c4~@8VsQpg*5rU+j6lwT-$0Y17`PLYlT(X}{fmGOs3>9(MCgI4W@W#1@UU3I wMP>#jHwLbp{KOQu#N?9vB2Na+l8mC%;*9*9l!^j-2Z-~^Ie@ePh+V+|087D2XaE2J diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_7/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_76b2229438949cf10abe143ffbbb110460398976c45c7b72213c8432708f08ef_bucket_7/graph.bin deleted file mode 100644 index 601f245f575611e9ee7dd20b1adfb34054ece53a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 235 zcmZ4UmVvdnh`}&9KUXg?FQq6yGes|{G&3h9wMZ`|wIVYwUC+0)Brz!`)g`qcH7_MK zFS*jaD6t@e0RkAA7#MvRcvGN~CB?pp1tkppK3R!niTb4_nK}AE0qcqapdI2MF+Gr& zo=;|8c4~@8VsQpg*5rU+j6lwT-$0Y17`PLYlT(X}{fmGOs3>9(MCgI4W@W#1@UU3I wMP>#jHwLbp{KOQu#N?9vB2Na+l8mC%;*9*9l!^j-2Z-~^Ie@ePh+V+|087D2XaE2J diff --git a/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 48bc29cc8706112c39240a575b0c5d9e3ee5c33b..5159ff4526e581151b6032971127568f33f3b1b0 100644 GIT binary patch delta 41 wcmeBY?qr^DK)%k!DyE<)KfNe1H#ajcJtjS~B%mliD>b>qFs8UDdE(Pm08P>m^#A|> delta 47 zcmeBV?q{BGK()oiDyE<)KfNe1H#ajcJ;pIFr6@l$CAg$CB{M&uC_gJTxukgF{Z# - + -%s --%s --%s @@ -7,11 +7,11 @@ Messaging Email - #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel %1$s result for \"%2$s\" %1$s results for \"%2$s\" - + 短信 邮件 - 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 %1$s 条符合“%2$s”的搜索结果 - + 短信 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 %1$s 條符合”%2$s“的搜尋結果 - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index 90f8cac..7046816 100644 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/Notes-master/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-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 49bb3d1..c9b286a 100644 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/Notes-master/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-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index b1f053d..5d36e68 100644 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/Notes-master/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-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index ecc5aca..eaa34b1 100644 --- a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Sun May 07 15:11:19 CST 2023 -base.0=D\:\\programming\\AndroidStudioProjects\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Sun May 07 15:38:51 CST 2023 +base.0=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 8562f91..f94d200 100644 --- a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,255 +20,255 @@ 20 android:versionName="0.1" > 21 22 D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 +22-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 23 android:minSdkVersion="14" -23-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 +23-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 24 android:targetSdkVersion="29" /> -24-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 +24-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 25 26 -26-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:25:5-81 -26-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:25:22-78 +26-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:25:5-81 +26-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:25:22-78 27 -27-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:26:5-88 -27-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:26:22-85 +27-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-88 +27-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-85 28 -28-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:27:5-67 -28-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:27:22-64 +28-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-67 +28-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-64 29 -29-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:28:5-72 -29-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:28:22-69 +29-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-72 +29-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-69 30 -30-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:29:5-74 -30-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:29:22-71 +30-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-74 +30-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-71 31 -31-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:30:5-80 -31-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:30:22-77 +31-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-80 +31-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-77 32 -32-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:31:5-71 -32-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:31:22-68 +32-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-71 +32-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-68 33 -33-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:32:5-74 -33-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:32:22-71 +33-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-74 +33-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-71 34 -34-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:33:5-81 -34-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:33:22-78 +34-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:33:5-81 +34-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:33:22-78 35 36 D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19 +36-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:36:9-42 +38-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-42 39 android:label="@string/app_name" -39-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:37:9-41 +39-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:37:9-41 40 android:testOnly="true" > 41 D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20 +41-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20 42 android:name="net.micode.notes.ui.NotesListActivity" -42-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:39:13-49 +42-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-49 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 +43-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 44 android:label="@string/app_name" -44-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 +44-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 45 android:launchMode="singleTop" -45-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 +45-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 46 android:theme="@style/NoteTheme" -46-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 +46-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 47 android:uiOptions="splitActionBarWhenNarrow" -47-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:44:13-57 +47-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-57 48 android:windowSoftInputMode="adjustPan" > -48-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:45:13-52 +48-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:45:13-52 49 -49-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29 +49-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29 50 -50-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:48:17-69 -50-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:48:25-66 +50-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-69 +50-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:48:25-66 51 52 -52-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:49:17-77 -52-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:49:27-74 +52-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:49:17-77 +52-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:49:27-74 53 54 55 D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20 +55-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20 56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:54:13-48 +56-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-48 57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:55:13-74 +57-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-74 58 android:launchMode="singleTop" -58-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:56:13-43 +58-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-43 59 android:theme="@style/NoteTheme" > -59-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:57:13-45 +59-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:57:13-45 60 -60-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29 -60-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:59:28-49 +60-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29 +60-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:59:28-49 61 -61-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:60:17-69 -61-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:60:25-66 +61-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-69 +61-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:60:25-66 62 63 -63-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 -63-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 +63-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 +63-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 64 65 -65-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -65-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +65-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 +65-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 66 -66-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -66-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +66-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 +66-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 67 68 -68-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29 +68-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29 69 -69-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:67:17-79 -69-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:67:25-76 +69-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:67:17-79 +69-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:67:25-76 70 71 -71-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 -71-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 +71-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 +71-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 72 73 -73-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -73-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +73-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 +73-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 74 -74-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -74-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +74-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 +74-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 75 76 -76-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29 +76-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29 77 -77-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:74:17-71 -77-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:74:25-68 +77-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:74:17-71 +77-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:74:25-68 78 79 -79-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 -79-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 +79-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 +79-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 80 81 82 D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54 +82-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54 83 android:name="android.app.searchable" -83-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:79:17-54 +83-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:79:17-54 84 android:resource="@xml/searchable" /> -84-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:80:17-51 +84-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:80:17-51 85 86 87 D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43 +87-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43 88 android:name="net.micode.notes.data.NotesProvider" -88-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:84:13-63 +88-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:84:13-63 89 android:authorities="micode_notes" -89-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:85:13-47 +89-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:85:13-47 90 android:multiprocess="true" /> -90-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:86:13-40 +90-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:86:13-40 91 92 D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20 +92-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20 93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:89:13-57 +93-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:89:13-57 94 android:label="@string/app_widget2x2" > -94-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:90:13-50 +94-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-50 95 -95-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 +95-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 96 -96-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 -96-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 +96-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 +96-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 97 -97-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 -97-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 +97-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 +97-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 98 -98-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 -98-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 +98-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 +98-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 99 100 101 D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 +101-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 102 android:name="android.appwidget.provider" -102-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 +102-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 103 android:resource="@xml/widget_2x_info" /> -103-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 +103-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 104 105 D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20 +105-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20 106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:102:13-57 +106-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:102:13-57 107 android:label="@string/app_widget4x4" > -107-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:103:13-50 +107-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:103:13-50 108 -108-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 +108-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 109 -109-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 -109-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 +109-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 +109-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 110 -110-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 -110-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 +110-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 +110-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 111 -111-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 -111-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 +111-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 +111-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 112 113 114 D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 +114-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 115 android:name="android.appwidget.provider" -115-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 +115-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 116 android:resource="@xml/widget_4x_info" /> -116-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 +116-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 117 118 -118-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20 -118-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:116:19-55 +118-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20 +118-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:116:19-55 119 -119-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29 +119-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29 120 -120-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:118:17-79 -120-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:118:25-76 +120-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:118:17-79 +120-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:118:25-76 121 122 123 D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20 +123-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20 124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:123:13-61 +124-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:123:13-61 125 android:process=":remote" > -125-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:124:13-38 +125-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:124:13-38 126 127 128 D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20 +128-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20 129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:128:13-50 +129-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:128:13-50 130 android:label="@string/app_name" -130-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:129:13-45 +130-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:129:13-45 131 android:launchMode="singleInstance" -131-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:130:13-48 +131-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-48 132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:131:13-75 +132-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:131:13-75 133 134 D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20 +134-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20 135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:135:13-71 +135-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:135:13-71 136 android:label="@string/preferences_title" -136-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:136:13-54 +136-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:136:13-54 137 android:launchMode="singleTop" -137-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:137:13-43 +137-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:137:13-43 138 android:theme="@android:style/Theme.Holo.Light" > -138-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:138:13-60 +138-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:138:13-60 139 140 141 D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19 +141-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19 142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:142:13-74 +142-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-74 143 android:exported="false" > -143-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:143:13-37 +143-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:143:13-37 144 145 146 D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52 +146-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52 147 android:name="android.app.default_searchable" -147-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:147:13-58 +147-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-58 148 android:value=".ui.NoteEditActivity" /> -148-->D:\programming\AndroidStudioProjects\Notes-master\app\src\main\AndroidManifest.xml:148:13-49 +148-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:148:13-49 149 150 151 diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 05b50d0..9205d72 100644 --- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,29 +1,53 @@ { "logs": [ { - "outputFile": "C:\\Users\\hw\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "758,1073", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1065,1191" + "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", + "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" }, "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" } }, { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", + "map": [ + { + "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", "from": { "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -42,7 +66,45 @@ } }, { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", + "endLines": "53,58,67,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2314,2531,2920,2696,1098,1287,1476,1685,1897,911,2104" + }, + "to": { + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8704,8864,9047,9232,9417,9620,9826,10009", + "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8323,8534,8699,8859,9042,9227,9412,9615,9821,10004,10205" + } + }, + { + "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", @@ -59,7 +121,7 @@ } }, { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", "from": { "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", @@ -74,33 +136,14 @@ "endColumns": "51,52,52,51,51", "endOffsets": "524,577,630,682,734" } - }, - { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" - } } ] }, { - "outputFile": "C:\\Users\\hw\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -119,7 +162,7 @@ } }, { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -138,135 +181,6 @@ } } ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", - "map": [ - { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - }, - { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "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", - "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" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,2704,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,2920,-1,-1,-1,-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8704,8864,9047,9232,9417,9620,9826,10009", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8699,8859,9042,9227,9412,9615,9821,10004,10205" - } - } - ] - }, - { - "outputFile": "C:\\Users\\hw\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ - { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" - } - }, - { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - } - ] } ] } \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index 3dbb7fe..1453a5a 100644 --- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", "map": [ { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -23,7 +23,7 @@ } }, { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index 4e33d86..7d8e828 100644 --- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", "map": [ { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -23,7 +23,7 @@ } }, { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 661106c..77e2628 100644 --- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -4,27 +4,14 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", "map": [ { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.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:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "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", - "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" + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", + "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" }, "to": { "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", @@ -36,61 +23,7 @@ } }, { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,2704,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,2920,-1,-1,-1,-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8704,8864,9047,9232,9417,9620,9826,10009", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8699,8859,9042,9227,9412,9615,9821,10004,10205" - } - } - ] - }, - { - "outputFile": "C:\\Users\\hw\\.gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml", - "map": [ - { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", "from": { "startLines": "19,26", "startColumns": "4,4", @@ -109,26 +42,26 @@ } }, { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", + "endLines": "53,58,67,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2314,2531,2920,2696,1098,1287,1476,1685,1897,911,2104" }, "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8704,8864,9047,9232,9417,9620,9826,10009", + "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8323,8534,8699,8859,9042,9227,9412,9615,9821,10004,10205" } }, { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", @@ -145,7 +78,7 @@ } }, { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", "from": { "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", @@ -160,25 +93,6 @@ "endColumns": "51,52,52,51,51", "endOffsets": "524,577,630,682,734" } - }, - { - "source": "D:\\programming\\AndroidStudioProjects\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" - } } ] } diff --git a/src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt index 147d37d..66d7153 100644 --- a/src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,8 +1,8 @@ -net.micode.notes.app-pngs-0 D:\programming\AndroidStudioProjects\Notes-master\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 D:\programming\AndroidStudioProjects\Notes-master\app\build\generated\res\resValues\debug -net.micode.notes.app-rs-2 D:\programming\AndroidStudioProjects\Notes-master\app\build\generated\res\rs\debug -net.micode.notes.app-mergeDebugResources-3 D:\programming\AndroidStudioProjects\Notes-master\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir -net.micode.notes.app-mergeDebugResources-4 D:\programming\AndroidStudioProjects\Notes-master\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir -net.micode.notes.app-merged_res-5 D:\programming\AndroidStudioProjects\Notes-master\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-6 D:\programming\AndroidStudioProjects\Notes-master\app\src\debug\res -net.micode.notes.app-main-7 D:\programming\AndroidStudioProjects\Notes-master\app\src\main\res +net.micode.notes.app-pngs-0 D:\programming\gitProject1\src\Notes-master\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 D:\programming\gitProject1\src\Notes-master\app\build\generated\res\resValues\debug +net.micode.notes.app-rs-2 D:\programming\gitProject1\src\Notes-master\app\build\generated\res\rs\debug +net.micode.notes.app-mergeDebugResources-3 D:\programming\gitProject1\src\Notes-master\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir +net.micode.notes.app-mergeDebugResources-4 D:\programming\gitProject1\src\Notes-master\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir +net.micode.notes.app-merged_res-5 D:\programming\gitProject1\src\Notes-master\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-6 D:\programming\gitProject1\src\Notes-master\app\src\debug\res +net.micode.notes.app-main-7 D:\programming\gitProject1\src\Notes-master\app\src\main\res diff --git a/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk index 8d61ad8f47cdcef8ecf671078b2f6a441a556b09..2aab9a5de408a01409fe64e420ba8a8cfd96360e 100644 GIT binary patch delta 421 zcmV;W0b2f&i9(!_K!Ah+gaU*Egam{Iga(8Mgb0KQgbIWUgbaiYgbuV17(SO$*bfvC z0044jb8mHWV`XzLVRCb0w|LkOzV|woVUxEdgQ5h~~5sO>!e2aq`j4E;C!t zD5Zv(fd+SQ|G5{HSEBnL&y;n@z+`4KyXn;s?1h1jnx}+0!+1NEwE+Ly2Wo@^#im^+ zx4)UAW0JgS(yd<}2Mq1Z9v7R+?$_Ug#x>0di#+q`QhN}+vFrkES|}%8VzR z!Zf{+@w{SD8Gy7NlP{Cg`g>)KCW|n)ZnV*g$~$AH?A-kNq-+|edvAdz`MnLBs4n*{ z-3gMt`nR4z=c9w}^GylF0!9S4kXR5KD*_Ncm#u>kIs*K;m+6BLJOUucmnVb}Jpw|@ Pmu7?zCI&+24*&oFV#K}< delta 503 zcmbO;(P2`jQ$q`53sVbo3rh=Y3tJ0&3r7oQ3s(zw3r`Dg3*Q!g3A^nqyZG(oCde>d ztKNR`E`KD~_6K+Qy(l6l8u(8au;Z5zVqz#tEzU13N=_}-ODrl*W?db-mM zeglQScjLbYwXYO)ttq;_+biORYpME#jGcZHk|UO^41K;XVf&;T{2a{nZ3ns&!yF8Q zMW$>FEs0zp$j@5-)MnddCeG%qimBiC9T2E%5_d^`k@N5N63qf3e{(m(Lw^6JuPtLa zc`qb>Q}Sn?kEdQv+PEqBdMp1|Q(+m+P^T*u4|naK?fTFl_c&(gkpK2!aW*6%M!TJvSXUB8T9qCJK^O<2bQEi8H z>J!zN-o#hyetYokm;Cz2f=6yXS4l#z_QUr=#~4}W{y3hxF+DHBU7}(&i|umGvPF@z z|1o8YZJ%|AUs{{V>&Eo$>;hIy0(R3svkTZTnRrh({z#*W