From b21a86034a5234dfde6992d7f91b9cc1edfca799 Mon Sep 17 00:00:00 2001 From: Dragonshout <1551759347@qq.com> Date: Fri, 31 Mar 2023 16:42:05 +0800 Subject: [PATCH 01/17] 1 --- doc/第一次实践分工.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/第一次实践分工.txt b/doc/第一次实践分工.txt index e175d15..f5dfac9 100644 --- a/doc/第一次实践分工.txt +++ b/doc/第一次实践分工.txt @@ -9,4 +9,5 @@ 王俊龙: gtask 王志成:ui -1 +123 +好 \ No newline at end of file From 6c244024de1c7c85f013547f48b23827ae0f780b Mon Sep 17 00:00:00 2001 From: Dragonshout <1551759347@qq.com> Date: Fri, 31 Mar 2023 16:44:33 +0800 Subject: [PATCH 02/17] q --- doc/第一次实践分工.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/第一次实践分工.txt b/doc/第一次实践分工.txt index f5dfac9..deba829 100644 --- a/doc/第一次实践分工.txt +++ b/doc/第一次实践分工.txt @@ -9,5 +9,5 @@ 王俊龙: gtask 王志成:ui -123 +12 好 \ No newline at end of file From 8a4e1969c2de5781a3e40d7981b3a0813c5eaa8c Mon Sep 17 00:00:00 2001 From: Dragonshout <1551759347@qq.com> Date: Fri, 31 Mar 2023 16:46:30 +0800 Subject: [PATCH 03/17] q --- doc/第一次实践分工.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/第一次实践分工.txt b/doc/第一次实践分工.txt index deba829..9fcbe72 100644 --- a/doc/第一次实践分工.txt +++ b/doc/第一次实践分工.txt @@ -9,5 +9,5 @@ 王俊龙: gtask 王志成:ui -12 +12s 好 \ No newline at end of file From f12df1f1f38dca34f78e4393d3f4f0451313e32d Mon Sep 17 00:00:00 2001 From: Dragonshout <1551759347@qq.com> Date: Fri, 31 Mar 2023 17:13:52 +0800 Subject: [PATCH 04/17] Q --- .../.gradle/7.5/checksums/checksums.lock | Bin 17 -> 17 bytes .../.gradle/7.5/checksums/md5-checksums.bin | Bin 23347 -> 32747 bytes .../.gradle/7.5/checksums/sha1-checksums.bin | Bin 41825 -> 95279 bytes .../7.5/executionHistory/executionHistory.bin | Bin 210157 -> 307862 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../.gradle/7.5/fileHashes/fileHashes.bin | Bin 77315 -> 126083 bytes .../.gradle/7.5/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../7.5/fileHashes/resourceHashesCache.bin | Bin 20265 -> 21591 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../buildOutputCleanup/outputFiles.bin | Bin 22907 -> 25661 bytes src/Notes-master3/.gradle/file-system.probe | Bin 8 -> 8 bytes .../.idea/deploymentTargetDropDown.xml | 4 +- .../intermediates/apk/debug/app-debug.apk | Bin 1042521 -> 1042525 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 366 -> 397 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 +- .../tmp/debug/zip-cache/androidResources | Bin 7931 -> 7931 bytes .../manifest-merger-blame-debug-report.txt | 256 ++++++++-------- .../debug/raw-zh-rCN_introduction.flat | Bin 592 -> 600 bytes .../debug/out/multi-v2/debug.json | 114 ++++---- .../debug/out/multi-v2/values-zh-rCN.json | 12 +- .../debug/out/multi-v2/values-zh-rTW.json | 12 +- .../debug/out/multi-v2/values.json | 90 +++--- .../debug/out/resources-debug.ap_ | Bin 946407 -> 946411 bytes .../source_set_path_map/debug/file-map.txt | 16 +- .../app/build/outputs/apk/debug/app-debug.apk | Bin 1050816 -> 1050832 bytes .../logs/manifest-merger-debug-report.txt | 274 +++++++++--------- .../previous-compilation-data.bin | Bin 13232 -> 13232 bytes src/Notes-master3/local.properties | 4 +- 41 files changed, 500 insertions(+), 500 deletions(-) delete mode 100644 src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_0/graph.bin delete mode 100644 src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_1/graph.bin delete mode 100644 src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_2/graph.bin delete mode 100644 src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_3/graph.bin delete mode 100644 src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_4/graph.bin delete mode 100644 src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_5/graph.bin delete mode 100644 src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_6/graph.bin delete mode 100644 src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_7/graph.bin diff --git a/src/Notes-master3/.gradle/7.5/checksums/checksums.lock b/src/Notes-master3/.gradle/7.5/checksums/checksums.lock index a2088b335e577746f7d66f9cdc607050dbc0280e..3ea0351fceeabd641519f4754da22273631b0853 100644 GIT binary patch literal 17 VcmZRsv@dxOaY<_@0~oNf0{}9a1StRj literal 17 VcmZRsv@dxOaY<_@0~jzV0su0t1V8`) diff --git a/src/Notes-master3/.gradle/7.5/checksums/md5-checksums.bin b/src/Notes-master3/.gradle/7.5/checksums/md5-checksums.bin index d2a5fc2098fb65aeea48c3f0315a460d3eea596c..8fd4140bf07eb3782f9e7f93ad0bbfb1bedb1fed 100644 GIT binary patch literal 32747 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 Swwe?BM@-b$_Vh6MF8u;gQE!O= diff --git a/src/Notes-master3/.gradle/7.5/checksums/sha1-checksums.bin b/src/Notes-master3/.gradle/7.5/checksums/sha1-checksums.bin index 598112817b229be3bcc42c96487922327e685801..1cad8d72845c1df66ad58d6170c5f1ed707030b4 100644 GIT binary patch delta 26847 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

Gfzrqfo~LIcw4aGE%KifE$mXx zexUsW?MJj9Nz5H7tRHFY9oYyTGuC5;jpG=aPng3A`*>o*|B-$q{n0}3KZz766W^)C zBeF%Z#97jKP%@FGocR>N?k5xR&-_oH7vcZHxWAZqamG5G@%&i~3txHmtA_Jj;QqP7 z66M=-_Wwd6RJO2I7IelNk&h^x}8tAv&!0k?D$~90odxb7*SGdhqCg)Y^GFRyrXf&+kN~7@$vQvL1(=NJ| iT!z>_4b>al*TVHic6o_SCpQ2&L%%!6|R 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 D%cO^> delta 10253 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 Dn>d_w diff --git a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock b/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock index 9ec8cdf7ef11cd8a4c893773c83ba1cf4ba06ce2..c32faf35e61e149f7e0f19fc026bb58793603001 100644 GIT binary patch literal 17 VcmZQRux5)(aDJ>d0~j#<1pqR01hD`B literal 17 VcmZQRux5)(aDJ>d0~j#=0st~@1g!u7 diff --git a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin index 48c84e31d38aabd9f8b5ffdec67ee9d0d924ec0f..d7690cdf4bca23aee030009ec0e7efbd61ba28d5 100644 GIT binary patch delta 22595 zcmeI430zHI+xO3DK&AFcrsi`roCeKG;d7k@u-uLtF&qw|G?(4eN+H0@9_Oy}OYOd$8Jk@9d4j^GDz8To5@hJ#&y zE22^@u9Rgahx=kg5Za$d5J$EB&bQ7*_UsHKkZgWucJ9QWYGgJGA&q2x?p#y$KeYsz zzdG#dpG8cvJKcPGt39%i<6x)0#Ch2xLB!sgeP#%Uc4sQEtmD0WQq<&i$g^)Td^vkm zs(R)*G4c_1P^|vcXypxfYC7($2EyHM8RL~7N;x5>xr>oMeh$kugnaRkk9G%VzC|{y zma$!3s(I_r?PnGsACd@1HDZ$2ju_h%aBzkf!um?acx~>*h@sb`6Or$oE9K?QCAJau zgOI5v(w)kMmXdVW4wXY`gOAH`uoTyx=6V)=e8C5 zMkn&Ud!*cZ#r>&QcDN#MlvZrRyzEO4E__~!JY3qpGGtz=j=b}l=Yu@Ix-BfO5?er{vI08g^fnBa2~7 ze{M?Nx9?lJ2i*~x44568Qd9JfYCf(-``UdFsm0}NYTMt-a*nGBLf=qG(h~BA&b-oZ z?#|7~3fD6MGWUi&AN=iS3G$HTP^`rx`s<#&KWBmgvO(=oNwTS1rwi^>eMB~<3Tm~M z7;P@e-(D$~6{7U3`{?JMK@A`R~ML1$@T`#}G)+;qm9D zpRYJ_;0UrnC&qSL!P;Y!r-ofazRecWbbN`~YQ}wgrfsBc@4{UjuJiUDCL85*^jZ;) z8N>wGKH}N7VF4fMOXg{`lz$pHreDITzG$D_1DbVsgx-F`&9@D&BilO+_UF-g*JNJ0#uZ8=& zA@i??PHqV?<-~ej`QR92mSwM^YP zGs#97e4f$wB!yUP=kuU#P){6gQ|@$8rTeP)Zunvl!#UovvabC}_zHAxItc-WF`P2J zPjhwp99U1oW;kld;}h~re-bz8!L48pb2KOTR}1IyH@-pJf(KA#$Td2#szspR?yZDy z*a*h>6f68kqu2Mj$X^eF216lnAXC5e)!ZyPfGhOjiwJiwdHGGFl4-_)1inx5=?kZ` zH7hptK&oVY+ut{wU>B7rDf~&G1HhM<*%2GUxlq z0iM`s?EEJTKPw-*O^N>wuJc`t&bA)kC)2y38GU`)r8ccU^InURJCNJW0C^)G5pcRh zM|>s`nSC~B8loZDP-h?r?SN0F0FX$m^U}h#F7H3tB{gQAFZLPH-jbyF^V1{jT z6f*Z+&}`-tRMWU$aCdkEoqf#=~FnXLEBVr1BcxUTCi}*%)3}UrX%3nX2 zzv9N9bT;a13U=ncM2}k;$8I)?(00T%NHXUUsXbKmeG^tA^QeSO^AsY>V|LMOIl9$t zJVDt)$QN~%Y4p8VhjtG2OgVL#Pb*71Zl@t1xe^>LQizW9)9o3_bVrD(f}<8ZLKtd& z^}vNrw6n{HDvPH^&wq3*Odl-bBMjZg1bt!YFgx|Gt`5!nz%I)eqlP))W%9qFu*%wl1F#y^4_uy^y)cN%hO_{9)s{0TINYmBExwA@V z6%@4~kC9GG8b7lhCaMpj)1%Q!U|@a7`R&I^Hqi%f(Kk@PRHhcqJ%+R>tsAV3L4qQs zeA!~><~KV>AfJ#7Rn|g6)6c#vrlAd)c_(yQb2;zNFYIR%`EU_JCo%M~;StlGb~~_7 z;S#dpd0=KEA`BuYTV8zpj%EswM%t}OTDRX{aS*cceAs0pF#7oIvuLJI%P@o^q}}0Q%Vb5|0;-XZ3pU44JJPgxU*?zF$b# z=Wn7(4;$lzOrw8qxR~?JD|;6jPb47C-iOoqRCmv&Ncn|XBTc$rfm6A0XnV&CH5XEijeYg^OZUj%IK~$$qtkSJpK;7i*@6>(PPeV2gX+B z^qpe;rM&E=T_S?9wA^tqKqheg&NZU&2VJGRM4)PRb{gfV)tT z+`WBl!KIjmiD)=NmZ@rw(ixxXHVkY)9=LM*-MLkcJa2?tV9={FZG+%f1py;(hI7Yk+t}@UncGsS-D5tyri^zDke6p zO>wyY@haTEZz%aYxP%vEJ-) z-NCb#$4@<&?fLU?BO1Pt-jFz(E)i-Vrmt?dWC*Y2sg$#SK1)4FXMq7QuXZdy)2Z=T zvy&XUkGsi~uX-wVO4PDJl0%d{=CObZvZ!mW%cg!|*&quCsqMX;BXTYOpf4V)Ca588 zxevehwos-0^9C@sy-cq5^jG@H^!qIMSj%C<({IiAL|qlJ>eSlnR+tg_26oHU>ZA)3EVf%q-y$`+E6SoCL2KFF)$`7t=pIGH@T-76YYV;6W`cWC7|m|H}I_&s>rswoZeP- z5Sb+`sn=7vcCln`_wq_jEuzCmW_@u1U;D!)~tC$X$<1xmmC0>{qgMa^)NbF3(a3?~F>F^CQdAHpCCg zo{{Ie;8I5A9Wk<}olyNu#P7GRY%@E69@8HAF){UK@utK&Wzu!n^AfC{^Y~_wevPv} z(<$|i?ToFy9TBcraJLBKzNrAu=R9K8$4%~DZa0xxl|eYkg15~W?qnoF7NH08pO+8@ zU*NNR_FiPpX25&l!!f#J6%fL$nuu^%9}vCZ5r(~kKKQ47Ll)@?DK7*@#^3nDw?j9d zM)<^qsgZH#EQhPFKE)%?+IzUGfz$SL^kn0V{4|^chlDqDfAsbga=kH1x9A?er^k#$F#}T zS&Xr{mZ4d!m6kUKvAYf7FMWxTlS@DDzH<_puo;S8@`%?-!DfC@bj6}}L&ZxWv88{> z+n_z!XjeNQKEC7{S+>mDsLz}E0O9D{OhJ}EnzR)JZ|FOV;|@@GB_j6JtebYo_cGf0 zTmsRnB}UfOcghuXTS>e=<(D+9aLZYaBL5~HF@^cbr>3ts)OLyzJy0X+od5>i;->Dg8bJ4XS<3qEmad1 zY9f3loo3p5oG;wP=dWMuA>Fjp-m=Qf_PtgXmAwnW@i>7wJrSvdrKL|pHaD$vq=Ully z_c-0EgEE-_POtiGHlH4M0tuwJQ^GRem`Zt!`nFNQRp*covVycB zJkV&`L(Dt9?oaDh`T<6iDwH(|iGW6@d#=j#5NOj6nul;f;cb6sw=-W#Uu~47M|Ric zOmMgRi8eJYO7zo_p|K1fc00cCgozB@k8Kk`{Vk90>6$)chM5*tWO4{&%lu}sGd^ma~zu9X;KDgr=};EAsJc!T6mIXUzWGA0-!0%tknN zHN=z9=Ud{FRZqvK&=Jg`>>W8m2d=gwW^^J8{sPtSdf(~6V%`H_%R%> z9up1edv@r2ru4D%>Ia@Yf9@Lk7xf3L_dG&*i~rP-b#!7KIs!c33kjD`a@)JvZKTV- z0Q2Ab5|avy`6?sn3vYXk6qYrYAHl|Vm(cTjiH5a!b&tCw|PC{b-jAVDQ^?qd0`JnAAgg-ybBh=TtJX$&V zEAp|;;PTPODCn^M)E+;x>9(HIzyuC@^!&X??z&NEY<>+^lg7cX`y847S?(0V;PZ^} z_;j5omE})5=*TCb`lEm|{^y}DM+bTtBFvct>`x*hDsu4Z+&=~)bIyS9PchD+Yi3@% zQMW1rVR$7IH8fLpn&?2k;mAFuBWGx_rhyaDT7!Ie98`Sb8cnp=dAaw>l}QN0q_e$= zM?Lmmx?o06j?JT?=97?EfAF!`a`s}hb@PTQ7p_rQ#TLbJd(3(x3@Bo1F-d8`4a*Ht z^i?_O8t_`k*GrEk*Qp#|hPL@0(CH$8_?G@g;Vpvf`9K|>k7 z#D0cY~@RbS#mBkd5{%R>nXBc7;FRW&|ffiUk4)VBzUKZND!lbY#kC%g?*KZ}Ua zq(YTGGBIdpZU^z7g@nw!A@6Riqla(X-H`v8%ZUpboG)bB0@r|Hw;E=^40g6d0G*2d8N(}~TrbX@Ri-SXD6^y%91C#1CU zh`qAo0&6D?!oqgSLFX_oC+_OzLis#*bA&-1hf7*j*@XQV&x}9|MTFZ&L$f>ADE?%h z8(YfF_aNM5$rKg;<@AiH50B6{w(T#Vx{YfzOUKA9KE9>_jm@P~@L687bbH{Lkc zU8zs(x6?h+wUO~(G&#g(v5`I9^gE@mo)<-Gg?_R=5Q%ZOZIRl~=+P1|QmF}fj_K0Eg{pp*W(13}$cynrL zX;Ahj46u6@&0(csqftoW&>wq=$=;{^M}))iLFPO4@sSr>6dU$&ZV`pi$A z`~7zp2i1Jmef%SqHd;U%orfwCs}ATR!2ErtZK?ugBzpNBvpxl2HcH9BdcdH z@V2Xo_xEJeyFIWapH1iHm%-E73o7WKUz%( zr7;wm4vvhNfno;a(?aY`px+E}vQ(AOY9@$$s0cG5n-Ntg;^8MFtb8e(cyTQUL(LKs zs*G}B6ttt+EHE8Q+0TYhMx-;M0>vD0TrUhTN1R8i1aUQ^V6`6=VJ@6xL^C6F{pnr4 zC=$h;Y8Wa}Y|)!h;iQtBv3YpLx=(?OX=>sFz44UH1Frxo$~;J7#6cAEp`I4vv_2SZ zzW9t(eeA>5NbY~*)uFt}O`2wNJV&ognLyrZsP0a8)^0&$ndXv#Ofu8rN&a!{4=t7t z`@(Cm^`AU;^ynh;(KY3PS0PL8+wUG%gWpEvZ0YV+nf0lgmFaErmM!&=jNaXAAl^qU z`GLw}xkqo7y$Or);yNUF|HX*3kv;x<*j}3#e%9(S*dfuN#W`)pl{LS5$Zh)FV?^Gx z>z2_ahV{?89nY!WN*)(g5h{taXR(G#a+)qjJ3eZG>6Z0ABL;tK@%G$g{o=1KESCIx za0yaN&JG)X;o$|x*9BJyC4+<7zuG8m{ypl=p$l5s3+yh7zY^CM#pR{b9!aDnx%H4d zi0D#}Ec8 z@b>Rv7YU9GFU>i*r*`=W^RpL^GXvUUv8EB(IVKLN)Oea8cRF*W+G)GDBmSi0Vd}?{ z-}-yJ!&)^pi{FNP)C}eSF*oi)P8W~7-#zBs`Q){mu-JMcc}KQ-ueNg9L-Ht6lE%qP z(&8>{v7`K@S>K5L4`SkPLVlWqF5@CL)g~)FJo_Q%<+uuO?k9)%XPbYJvj*xUO9GNx zH%X%0C7zahP&b?SvH)Yloyp4xHkot()k9wMcaK)#-a=>j51T6OPC{tje)4LeJeH7_ zl5%9@es{^=a&dY$m%8>t5oa&UKJ#L#C2=7)IkNY5t=6A|PmOyVs8_mjs-EG!G#m0M zlC%)gST^-{51*>xE^u%>M=}(rh#fV^))*4DPdq#<{*Uhd;}ffzb@k~WDWo&GvFpem zU0UN{%m|0c?dNvfKIb^8wD$W7+Cx$txycl<~0xDHIYZGu!Mh|%n+#7 zkQ730yg5)ZL(Owh%?ZbrXH$ynr`%iKJd~VBP&UiaMrj)PyGzyA2rR4X&s}?WY+%mr z(i<7%43Y9!3i(?#Mh07Ov*&v+n9P1TIxb?R*EnV;hSQZKj$OhD=kyD)8@*}5TX9Ig zt4+~lT1bUUm4r*?boX=VCmuHE)Ao;%q9?AV%uYI-WQ6S!uI)>5xBC;DSE+=Ldw)h4 zHh}h^k4H|DFm~}c=3}PckZ4@zb-(r4G4?)#zj#PGrko@L?&4y<;&Q(HS__`jK#q-> z@pM1hg*@+)O?D^wql?Gu)IqsRSDd?k`f%Ye$1*2!w4#pkf8&wLuiK*K^-5SiI%m^) z(}l;$Sv2WV-+eVz221u1xa?4a>!D|vqLiriE?=^}Be$kMO@s|YpSk4nl)9acMEKkM7J`QFn~%BE4L2+QyqD$XCs=F5@* zh%gPV=+;7&6{YJAn_s>BDN^v6Y*VsEjXF3_VYv$#>;0rPd4FxxDF&A?4Uk_<)~a^D zDQGX&fRM1>J?(eR;a~|4W^iUVnc3B=Hc7HeZqvd5j*R#0ge4o6LUMD*5n``PxSlZ5 z@(JxBxj&LyKk}Z|)#J}?5tCx4-+vu+)cbwJfp+pPK$Ri6kXdppmfj$7hc?+T^*v5N z-Xslf=xgT@1#?e4o>HfBcaBK`UJ~^^$bnh1jdT%*=}^|$ARA6LOnr|+@kt#vnLzg_ z5;yCxHMmoXCw8(;A~k#Ozv^m9bTrcCUBmzd>0-XFB!EJ=*jHELr!XEmsYnWuU@=(| zQehH=qqrkh=TbJq#a<{bij%lx?@*19^bWOwU>qUwP_u>*6y$?HhMYk$7CtgUZwh5h ze)5CD23Df*g)$U_p$UZmv?HmyxQh>B$sv$J5w*c^78`lf#gUd*_2*@ZlO21gXuFaw1L4>l+! zLnMkC@jhe9V}`gE#U=6*)8Ouyd}lrHd#{ro$8)^`27j4@*Qx?e;8`+3Voww5Tuy|r z*;MEYkURg276xD5q;|bir2nJauQC4Bl)=P7%nV@LELxWzACjJDGa* zg&_57-p2=yJ<>MvtAS|fuO50I;NyC=WUcDE>r=Wu0_LSkru!cA*CsMKU+&+L&_px&3BeY<*Or)x2WM#n(T6_0TMqT-j>6 zrpneXt@WS%L#H0H+7!Sf>~vVqSCU(Ka#4+|Om#xB>9UujMHk+Z$3xXtGMgkfOEQt^ zTJ(-JESD?Ji=GgZN)Kh?51f%w8{2PP;_MYS*94M{N4W%(mgFWkm;BMiL*`P^>8Lpy)#n=7MDb#ECjaWu z`|p&oe?K8i*Suj7=VV`Z;NtUay7pGAvbr0bp~vjEf|q;Gr|sYGj*eO7m)NQj zb>~+Pf}A~f^@v%pFzWV&p(h*$?GUK-)*St-NB zyBvAEVu(%Ht>h_JC$;Z3zJK#q51paEdpv6EX?-E_sk-5+n!!hWxRJESB+`=HG|40% ztCjq>W6w`iQBpL0I!^tR-{PlX@5oD!YT!u{2Nr9a)a7p;YK8IdwolbCu-|j?cFv0C z1;2Xqy+XQmIrbyH_IW(5cwF!x(7s*v!^=@D0t*SJ%3!Hog?v!cEqG%lt?w16*sP{|+N$RD>K$KDPd`7m2Ga8&QH({E`zcCk4RMJa}44yH{PE>i#oizPD~ zbvGEZSds^*kAsxOk~B>n-?Ok}wuVFrpw$WI}Y;S@abD3vM-pwWUBb(r;v4C^=!;yHE;b9dBM|nbnaTd{A-RXl`hY2#LNJuat z-_rfLZ-LiU$yG!;J9t5wiO?xCa6v^xo@7)ZS%dU@&TD(y!|n}8sYV`I$5i0jm2V0o zMH~g>ZY5A|!sT3hCv4J>t+Yot_$b^p5g1)Rf6PI4)HuoTE-5XEiBKhL^4vHnSs!^r z9mtysiHe_F)@{v@To$D5^Cqw}<#MXp#%pHy^^-hWBcbyb@Fopclw4TVK0g6j?FdLR z6%mRV!wa(K;+V>gXo6Z(9^ceHy?SWx<7j6gedB#I#3*m)=`eD@BR96+EBIo{BUGLY zZB}gOD&gdHJVv5sqOh|MO23UbVnj8Skm=rq#@jKaJn|dFFkzK>MtD zkTcNNsoSi0)46fqkQIJnY;SAF+p4=U>)7h5rCjIOT7xHx@EHkvTr4yU6gdCOt3`xa z$=SxqPqEPa{m{pZoBW@)YQ$!uh2>i1g%~`0FjMn;4t+v-5gOK}XMW^emE72SdrA5K z*aAO{)M$NA|h~p?6%UeWI{=9>|I|WhxFg4f1uF7j=tvK>N3sp z^zW>z;dfbA!`RmQ^E{*Vqv*Hg+rE?QZFt1y0Oe(exnHoXtjEw`aoPF#*IDWgKMEwN zG+BYI_m}|x%G#Wu2IKm0KgR|5jD%gMzyxWSt*bq?_F@SJ&s`_w|FN|^zQo`^pB&9P zDtQDq z^N4u~!BK&|WRTVNfjH}!|BMAf0_S%py3b3S^E?kD7fxW>?Omg)zi|B{`cPh1G5q~M zyP}96=4V`-*hp6pdTNOyKyn;-6rI9($AXy zTURFea9W#INAwD7eT&t~&ILz1-Z;mI!*|oHl8|jxVGg0qRjpz~hyOX`jnYpq+qx`o zlG<;K<>=|zk-0LtvA0E$%bvJKZEd-2LmK9FNBBhg8BklNbq`*?DL%huzf6EQay`_4 z@){}U@8hkaHtZg70t@F_mQ{u4w7C z^$9(WG+vUdvkGF%B!0r8yA~PWr#U@BcA%+SRX3&Dd z0t}W@#?~+ng(ZZ0l8?NXOJ*vXwr~<@2{fZP4!SEShZEq7q5)D-yo94DUc;*uk~x%S zBi2~nP;AwQoUPfeq^jHmUMr~(?;#0A2OLDv4)rL0fZ8fa2rYUVCVK?J3)NuKDoF&b z?vS`j5<#mE6rtz`k5FWR@@i^VHaMZ!2JtAiz>d{a%tEY|=qzL`SA!3$shF0~eGTPk z0YVhE5Q~CbO-KoCS-6Qp9@uLo#@gM$21O5uM49 zg*I~WcEplB1oc^Ja5jT1w2@~D_t7j7syAwY-bONVBhL&RHd4;@5Jw4~J>;Pfl6KUt z6p#gp;ORnIrUr}w%F`U8k=j8Pih*zqg$;C4g1ZMSHc_7T5RO6sfPx2=l;Eb5tw_EY z%#;M>E&}6Ba~D#a#&(k{C4Woj=Bn;rqc4g368O-OJyQB9=5X$8r^W%U*w}1yS@3+z zbsoOYVeMJDcKUuj^d>XF4eyxO()_t|8dU;2cf6GUEK|DoXZ-@?V+|nut%%rgD8%F{ zTk>HD+1kDpP(cPBai#F6i+1fTgx(2EfDsK&ZM}Fq1Ce`5pB#9Y+!~&GU?RRrW#^Sb z&07&a8O(Jy{b7K%QPLQm%jC{a2t9^}&yENHA-UW@X41&zBDeQw`#)j{0+%y-?fwae zatDsWNbJ?`6M`K5z>EPgn@SBgD3b9tr|3_Ws&h$ZFyKdlpAHN6mV)r>|g$B^Ldn zfjQ}27fnd{f$E5B!`HQ;{qul->tc$af4rDN;q7fR)rVNC`ZlJvT^CvWjlY}vO4e&C z+P`xA?_YcYC9NU?9*o`P<4w;K8$3a^O+?(ZHJskgK1dn@c{(IMGIQ^4rG?=!X z@?#ssgW_M_hb&@~!3dN@R6$AZ+LUzrDu8 zIVr34qGrAC4Z0b2Gbj1KZ0(1PdQk~4rY}y>5-<;JA~Q`Y_xuQFD8W;Qk0>lbZ!@*) zGXzkArwJ>OBtsbz1871q0JOza0;&&VD8YRRDM-xVFp2@tAg0phZ`2{Pls=0;^2u42 z^%hCq%-sc^Tc{A)un>hU6r-?%Iuz!hnni`c$0aPaoxsi^zYEKvB7B8}EULy|U^j|3 za>AeiEm>5~yBCzUQoG-SBPDp`|L=stj{E|ZuKsPb=>Yj`idayeO@nVXm5f`1h{D`w zkd1lFt5NiZla$~-hh`KnK{t;w7JzRa)p+q`NR@( z^QdWyHXKE>?(hl)xpsfMxhy#yfsxxSBxk4-lD1Qk`oKXHT2Q~83fYRMv}b>DxH5T4 z&GV@f@&erRDF;h96QKba`P6y10Ywxg<2}ON)}UMGVKSVw!qC74`*e30B<)H m=Zd6$`YuP#ZaFdcaZbUulPf~OyPYoWJash0Yss5L^Zx~4i+kq) delta 1707 zcma)+4NR3)7{@sm5eX-QR_{4xS1%v|BJcZ>C~7ENgZo~#Hlg8kExA})Uepv*K9;N` zEL}_RAD(oJrA@^z3@x2(7((iFvsSGX2ci%PC?AS^D$sMit7&EHZqIq1`<(xI&bjCL zott0lonJTV>uH=V#Rjh9Ea&JY3lSU(L?MPn7AnVI#+m1IgiJ`o&;$ePo;R@6%yHPf zA0-nNT%4#QauUa4vQH;vA=)Ca%u!g;Ios(%Mj38%p&<1%~N+WSEM|FoBLR2lB!>%E+#Ut4N)q zBARMSwYIuNZ1TQr9e&enST)V?%bUN)@@4Hu9_!mCwR=;vfrmSS2%cxb% zE^AgX6;q=*_C%+{Jl%oq(`|^IVVC)twAHapmWHV@0*hlb`O8}7fO#gDc$abH&Afzy zSq?li+m7|KFQNFQQWV7M_#sxoP^^&1CH3ApbhC3*M9TQCMp82%z_5>C62?Rx=fs#aO zQlecpeMmpzSDS#@u$U~HQP2^LI~^L9cWOA_sUx6E#pW)7iY|_}E(1&MaBL&HdnX$k z?<%-{*Fb!?!0v7hZQTme?+IMF$1$siV8$X`&EpTSIuky2%@|}Zh zlDu?~2|4BvUHrL26!lYtlf43My=lnlR5z;up)Z!eb6`y9B^kKw-laYR>Yq-ED7hs}u#+&GznI_8ZHc`&xNl}z1v&kY) zRw$E45gJEFkHzBh{ezsiri1&{Tz!zv~#^tYJyB0Gd@?X?7sx z2Cci11M5wW%$p9FTBt5rF4=*WQaD>}INvHT*s2~|)RxRpeTxd-=194%qWm^(*iMIP z*RZ9XTGgJ8q>ikIoF;b~DDR~CCvaN*7^^vdPM-H)c8F!f2 zspzH0(3_3iJ`Gp;_!IaH7%-4IKx(qK0S!@u263AG2&1LMr_IHt-1iOB2+;J$*^D32 zA7#__IGZVq{-gehrQ?4Pd4h=aVgCZ6!_DC4F+^U)7^eP3qw1ou)(v8~FHI1L^e|mW a{z;?LWZqS7S?wGE3=;U4r3yn$37cGs-j%kGoM*fF_8ONj<4=I_|LBxa4Pu?rh5V6Gi z=$p!mEh`~{A;K`l%MTvQvDmB94G|BBhKnDS%jaTQ{RS#-2@~H~Q}vqh?&l(?cY;du@~Et+fXBWC-X`v2t2RK@7DOt8w=ImKUozh__Ds$ zhW}Q(0z@!4bF!_JMg3b-sVXKGPpB({=E7Y6u4W>qM18aw)C5hK_|NipD{D@#mv4>6s5R?0$vFDiOVld=~qj4n_9E2ZEdv_jBe`GdQS z5S4+RFcU;OmpD&}Qhxyz&xVPMFI4;_F@H)nRGf9PsPqW|y#u~ef;nEChX@9DPrfRh zA>eADCG@2C_Eo5$>SR+H1p#-#_fJ;^#+yO~KTh_Q32+D#wcVPWc?TlK5L6AbD>Czy z>4yL>Xha9?hl`*3d3`eLg})FDf$Jwvl~Ls9=4Ywo`tuVic5(7rnSh8Sp_@nF+a1e< z2nIZc8IWqNwe;MZCs3#Pd&9)jOU-x33K*0@)r-T#v)_kUiw1u>2Ngd!`Kyc;6UWSr fia*3R8Z_{4cJz3`wz<_~8RKMiKc&sSUTMq#ZXRxQ delta 119 zcmcb891^@s6 literal 17 VcmZSn8eGv@J-bDe0Sp*V001=J1i=6R diff --git a/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin index ebf4786f5e0b26d2bc95142275044c9bbdf5326d..71baa32284322a2a6584d08d9cf5c6dd471ec7c8 100644 GIT binary patch delta 3503 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 OBp(3d=KSwX%YOmL)S6EK delta 415 zcmXYtKTH#09ERJ07!x3Btl#%pT3RY+p|tlq`kzt~2Euia#DxtxcF+nfJCwb=g$$Ro8`uk(_Ls8$0j9v|fw_e;2x{-f8 z{mPb3^H%q08cioOFrRtSuKbuP1- z*j$U(b3T=MkMnt9GAC^2Tt4MAS2;y~!ROn;b2jpdy}WQ1I#DpJ6oi99j}u!nCLVhd z_KRRS>%4O`L&tFAD7F?g-9?{7(XdhUxhQ&UmK2?ma9Q%$DH{&U>UgY@j83#0lQ4wklwHCnVA9zPmAj+PyMF55Jldi>9SA`x|a Qkp86xawmGc>Mq^=3!6fmIRF3v diff --git a/src/Notes-master3/.gradle/file-system.probe b/src/Notes-master3/.gradle/file-system.probe index 5e41a53b4fdaf9ee1b8431746ed5e3d1fe894bdc..bf3f2b3fd4df3d24158ada4b66ae7122fb92f308 100644 GIT binary patch literal 8 PcmZQzU~D&gxpOW62vY+7 literal 8 PcmZQzU~D&=vC0 - + - + \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk index d3c4d6e9ede2f0b6f0596a5866060558ce07fc62..ab52cd48b629170b7000461909ba81acc4c133a3 100644 GIT binary patch delta 1713 zcmd^A`!|#c0R6t1!Dx)nqcm90%^W0;nUV1(lxI;yB25$7#S~+_VyE;WkK|FNQi_eV zF^oqZqiM-&yc(p^FtS2f2T4dCt8?~;{U7$;AMUyL_j~WKzR-d#uo0bq<}B*1Diy*#=Px46rU<}N_-;H*EFGTyZc9z@GH zIJUl*OKftn{ov+!*~TWM5K|$@OQtyC6}(Hqd|uS_7d}*WHh`5R(Cb zh(P*zMg%pGu1|@eQ&VtnuywdM(yzzW$pu@orhNB9oDSbx`TkYTFn4ChEJq=)r$6qq zN&MF{Ea?VF4aBhY8z4I+qLCrl*qBK0#X$r^W1=CEK>Rmg88$#>thNS7ompI7qDfF2 zvl1{$CmAW3Q^IyNlD#SFBtHtb@RlfU=tY^{kN?7>Y0%jLRqdx{T#R0$BSSABM+y0Wu&2AQu^f4o6Thdx&+THkyGVHyh?4Ogm#?DWBn>}eyn)M#A+g;Em~)a#-`CS zsk9{(DS4VaYm*D%nEq#G=1)d1;BjCBp_ZU_8Wr0j6Grq@isSUC@6O*`5>#HyacWn$j8}t*BFO6|ZzW6q_fo!^LT>$79qao6(IGUXJR(~1fm6x~jJS{-@oE2(k+ zmE_if+ks>J;m#V~6-=K<4pfcLh)hW`*o=}yA7Oh=OoS*K=uZTFzIEY9_2l#JdWR|l ztHWD3yE|VzESpLf$+r9CMb9pq@j@d%`?Z-lm1r#d+A@)$SWb{M*3pf_)VCK!$jyqf z>850LDkTH)bPr468Km`puL@$Nx6Ygg*=qmiHIk+vU$B|=ehRV&tyx;rkR8~|`ehnA w1dg#dKV*URZ5lGy`gl|tpoUWD^zBJI8yMs6A}0Q0_o&-UQUidNPH5Zx1C}uwW*C=7=gD?t4 z!x&fwmW8pf94rqjz=|-g0Z$y1kFs?pgo6MeLd*v7TiG;E-T{=S^89CoHsH*0O$Cz) zth%1VM!gLwhM4%Bid&j0{Y9Cz z?X*O?6>_UMcQKBimR6j5_vs~)o%r&**Ae>Cq>OPK`xG(fH0O;dNTOmm?sp=Q&+34N&d^1y6Lq5f?o(jOHx@mRqEa}07^C`rI>JHoXN^&j)RBRW(c1hk-s zY>ADpPl+qH9gU*>=BFS#v;%P?geP3#+;NU1Gra)wkiELULe1dDt-{fp`7rFNQ9 z&5ppV4x3ulIk6@tr?J}jrW6y*^w>o-9z~9OXurqCf>U%G9f%6^dtX$Y9b?BLL3RB( z+gCL0hOgU3?Y}WQuphjeiY{<&G3@NC+|gcxY3aVVW^={S>`BAa;@qNBUjmCNbK?nX zFZFkKBhu=cxA9cwp3;goUR7 zAWdr&&(#`L8hPualT5rIXR#y!XP(!WP~Jmv-#i_E8joE%xZ{D%k}%9&f&zees;UJOaEoIQP*9<+M~Tz=~Np{)Id|B zNkLadxh?uou%3HyOfZFz5$Q9OUMn>D=N78%ExI*i(@ti2Udoq)i=L~peI?xli?`hDFp|i@efb)n{8oGEp-9C35l$ORZT=)5IGIRN zRC@@}!%n*-A@=oIHzdOZ4mw@vz(1<&@%(Z;so$}Slv}O7JaD=(CWRw+4nU#bZq-) zkAu4&u;!Doj(r#rFXtKa)}!V0uz-81n@x7!(wS)g_(Yx0WHoWEE5+=+WreFFzT(nX zdSlOo(V0E1u=giQc}Dd8tT(1!bl0&}8SM9@dF$}1g$_7EurZ~tf`!pzHed~$)~auN zSe#37UiO$h6z3;I>BXB*?FOx5z3Pmg2E_5b$)u4O+MBKZK%V?H!GdOhT%ygY%ebHV zpl+n@kBzSAK9(MCgI4W@W#1@UU3I wMP>#jHwLbp{KOQu#N?9vB2Na+l8mC%;*9*9l!^j-2Z-~^Ie@ePh+V+|087D2XaE2J diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_1/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_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-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_2/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_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-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_3/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_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-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_4/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_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-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_5/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_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-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_6/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_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-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_7/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_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-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index c6d3b40f74afffe4af121a50480be2c986d70384..56b20fc93f5e4940441f32e9647c0094dc4a50dc 100644 GIT binary patch delta 44 zcmaFI)XO~KfKrpIRZMY7X-Z{GQC50#OnH7$c1(I^NkCD4R%&udOmR{2#KWrrmY5R6 delta 13 UcmeBWe#bQ70CTd7)x<}u0VRC}(*OVf diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 391f5c6..3007280 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,96 +1,96 @@ -#Fri Mar 31 15:36:28 CST 2023 -net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -net.micode.notes.app-main-7\:/menu/sub_folder.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat -net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-7\:/layout/widget_4x.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-7\:/layout/note_edit.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-7\:/xml/preferences.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-7\:/menu/call_record_folder.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-7\:/layout/widget_2x.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat -net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -net.micode.notes.app-main-7\:/layout/add_account_text.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-7\:/layout/settings_header.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-7\:/menu/note_list.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-7\:/menu/call_note_edit.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable/new_note.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -net.micode.notes.app-main-7\:/color/primary_text_dark.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/datetime_picker.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-7\:/raw/introduction=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat -net.micode.notes.app-main-7\:/menu/note_list_options.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-7\:/layout/note_item.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -net.micode.notes.app-main-7\:/layout/note_list_footer.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat -net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-7\:/xml/searchable.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat -net.micode.notes.app-main-7\:/layout/folder_list_item.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -net.micode.notes.app-main-7\:/menu/note_edit.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +#Fri Mar 31 16:55:30 CST 2023 +net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-7\:/menu/sub_folder.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-7\:/layout/widget_4x.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-7\:/xml/preferences.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-7\:/menu/call_record_folder.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-7\:/layout/widget_2x.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-7\:/layout/add_account_text.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-7\:/layout/settings_header.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-7\:/menu/note_list.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-7\:/menu/call_note_edit.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable/new_note.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-7\:/color/primary_text_dark.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/datetime_picker.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-7\:/raw/introduction=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list_options.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-7\:/layout/note_item.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-7\:/layout/note_list_footer.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-7\:/xml/searchable.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +net.micode.notes.app-main-7\:/layout/folder_list_item.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +net.micode.notes.app-main-7\:/menu/note_edit.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index e5a2a0e..fbd232d 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ - + -%s --%s --%s @@ -7,11 +7,11 @@ Messaging Email - #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your 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-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index 8a43b72..36b31d1 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/Notes-master3/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-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index b4b4fd6..13c8488 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/Notes-master3/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-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 5341556..6e03a2d 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/Notes-master3/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-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 5c65a42..25511cd 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Tue Mar 28 18:51:42 CST 2023 -base.0=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Fri Mar 31 17:04:20 CST 2023 +base.0=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 582922f3b0efeff215584f652d01e723e9f664e1..ebe91fc5c8e4ccdd927b6f228fbfef6cd1f769b4 100644 GIT binary patch delta 50 zcmexu``dOyxGd+V9RauV7#SGuPfn1HVmvu{x2y}J`y@GM#;cQEHy5X5)=Rc diff --git a/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index a9c0ce7..3ff6fc1 100644 --- a/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,266 +20,266 @@ 20 android:versionName="0.1" > 21 22 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 +22-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 23 android:minSdkVersion="14" -23-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41 +23-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41 24 android:targetSdkVersion="33" /> -24-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 +24-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 25 26 -26-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81 -26-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78 +26-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81 +26-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78 27 -27-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88 -27-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85 +27-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88 +27-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85 28 -28-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67 -28-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64 +28-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67 +28-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64 29 -29-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72 -29-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69 +29-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72 +29-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69 30 -30-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74 -30-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71 +30-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74 +30-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71 31 -31-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80 -31-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77 +31-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80 +31-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77 32 -32-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71 -32-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68 +32-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71 +32-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68 33 -33-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74 -33-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71 +33-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74 +33-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71 34 -34-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81 -34-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78 +34-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81 +34-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78 35 36 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19 +36-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42 +38-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42 39 android:label="@string/app_name" -39-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41 +39-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41 40 android:testOnly="true" > 41 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20 +41-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20 42 android:name="net.micode.notes.ui.NotesListActivity" -42-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49 +42-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74 +43-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74 44 android:exported="true" -44-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36 +44-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36 45 android:launchMode="singleTop" -45-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43 +45-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43 46 android:theme="@style/NoteTheme" -46-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45 +46-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45 47 android:uiOptions="splitActionBarWhenNarrow" -47-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57 +47-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57 48 android:windowSoftInputMode="adjustPan" > -48-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52 +48-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52 49 -49-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29 +49-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29 50 -50-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69 -50-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66 +50-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69 +50-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66 51 52 -52-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77 -52-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74 +52-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77 +52-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74 53 54 55 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20 +55-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20 56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48 +56-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48 57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74 +57-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74 58 android:exported="true" -58-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36 +58-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36 59 android:launchMode="singleTop" -59-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43 +59-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43 60 android:theme="@style/NoteTheme" > -60-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45 +60-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45 61 -61-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29 -61-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49 +61-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29 +61-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49 62 -62-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69 -62-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66 +62-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69 +62-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66 63 64 -64-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 -64-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 +64-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 +64-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 65 66 -66-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 -66-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 +66-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 +66-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 67 -67-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 -67-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 +67-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 +67-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 68 69 -69-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29 +69-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29 70 -70-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79 -70-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76 +70-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79 +70-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76 71 72 -72-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 -72-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 +72-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 +72-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 73 74 -74-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 -74-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 +74-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 +74-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 75 -75-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 -75-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 +75-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 +75-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 76 77 -77-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29 +77-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29 78 -78-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71 -78-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68 +78-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71 +78-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68 79 80 -80-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 -80-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 +80-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 +80-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 81 82 83 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54 +83-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54 84 android:name="android.app.searchable" -84-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54 +84-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54 85 android:resource="@xml/searchable" /> -85-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51 +85-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51 86 87 88 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40 +88-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40 89 android:name="net.micode.notes.data.NotesProvider" -89-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63 +89-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63 90 android:authorities="micode_notes" -90-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47 +90-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47 91 android:exported="false" -91-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37 +91-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37 92 android:multiprocess="true" /> -92-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40 +92-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40 93 94 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20 +94-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20 95 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -95-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57 +95-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57 96 android:exported="true" -96-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36 +96-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36 97 android:label="@string/app_widget2x2" > -97-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50 +97-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50 98 -98-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29 +98-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29 99 -99-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84 -99-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81 +99-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84 +99-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81 100 -100-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85 -100-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82 +100-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85 +100-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82 101 -101-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 -101-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 +101-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 +101-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 102 103 104 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58 +104-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58 105 android:name="android.appwidget.provider" -105-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58 +105-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58 106 android:resource="@xml/widget_2x_info" /> -106-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55 +106-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55 107 108 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20 +108-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20 109 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -109-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57 +109-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57 110 android:exported="true" -110-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36 +110-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36 111 android:label="@string/app_widget4x4" > -111-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50 +111-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50 112 -112-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29 +112-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29 113 -113-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84 -113-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81 +113-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84 +113-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81 114 -114-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85 -114-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82 +114-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85 +114-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82 115 -115-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 -115-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 +115-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 +115-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 116 117 118 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58 +118-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58 119 android:name="android.appwidget.provider" -119-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58 +119-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58 120 android:resource="@xml/widget_4x_info" /> -120-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55 +120-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55 121 122 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20 +122-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20 123 android:name="net.micode.notes.ui.AlarmInitReceiver" -123-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55 +123-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55 124 android:exported="true" > -124-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36 +124-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36 125 -125-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29 +125-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29 126 -126-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79 -126-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76 +126-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79 +126-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76 127 128 129 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20 +129-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20 130 android:name="net.micode.notes.ui.AlarmReceiver" -130-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61 +130-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61 131 android:process=":remote" > -131-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38 +131-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38 132 133 134 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20 +134-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20 135 android:name="net.micode.notes.ui.AlarmAlertActivity" -135-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50 +135-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50 136 android:label="@string/app_name" -136-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45 +136-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45 137 android:launchMode="singleInstance" -137-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48 +137-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48 138 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -138-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75 +138-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75 139 140 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20 +140-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20 141 android:name="net.micode.notes.ui.NotesPreferenceActivity" -141-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71 +141-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71 142 android:label="@string/preferences_title" -142-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54 +142-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54 143 android:launchMode="singleTop" -143-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43 +143-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43 144 android:theme="@android:style/Theme.Holo.Light" > -144-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60 +144-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60 145 146 147 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19 +147-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19 148 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -148-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74 +148-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74 149 android:exported="false" > -149-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37 +149-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37 150 151 152 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52 +152-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52 153 android:name="android.app.default_searchable" -153-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58 +153-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58 154 android:value=".ui.NoteEditActivity" /> -154-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49 +154-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49 155 156 157 diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat index 17cb018899e5d33d7a51e9174f9d276f2eb58d61..e25eb7b70bb70d2d4e387ca30371c7e7fa625935 100644 GIT binary patch delta 64 zcmcb>a)U+I(J>%|k%55$h8>uI93Th;;`|PCRZTM002(J B3N-)# delta 56 zcmcb?a)CwG(J>%|k%55$hAo(Y93Th;;u{lXOBlH(PAO;Pn#{-eA4m!?xiWGA00^21 A&j0`b diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index b217750..1a6bc35 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -4,14 +4,14 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "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": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + "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", @@ -23,14 +23,14 @@ } }, { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endLines": "21", "endColumns": "19", - "endOffsets": "817" + "endOffsets": "838" }, "to": { "startLines": "2", @@ -47,30 +47,13 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", "map": [ { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" - }, - "to": { - "startLines": "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": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endColumns": "56", - "endOffsets": "764" + "endOffsets": "782" }, "to": { "startLines": "12", @@ -81,33 +64,14 @@ } }, { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "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": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" - }, - "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": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml", "from": { "startLines": "19,26", "startColumns": "4,4", - "startOffsets": "739,1047", + "startOffsets": "758,1073", "endLines": "24,29", "endColumns": "19,19", - "endOffsets": "1041,1162" + "endOffsets": "1065,1191" }, "to": { "startLines": "2,8", @@ -119,14 +83,14 @@ } }, { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", + "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": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + "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", @@ -136,6 +100,42 @@ "endColumns": "12,12,12,12,12,12,12,12,12,12,12", "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" } + }, + { + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", + "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" + }, + "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": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "783,836,890,944,730", + "endColumns": "51,52,52,51,51", + "endOffsets": "830,884,938,991,777" + }, + "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" + } } ] }, @@ -143,14 +143,14 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endLines": "21", "endColumns": "19", - "endOffsets": "817" + "endOffsets": "838" }, "to": { "startLines": "2", @@ -162,14 +162,14 @@ } }, { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" }, "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", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index b2739fa..a34e1f9 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -4,14 +4,14 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", "map": [ { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "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": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + "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", @@ -23,14 +23,14 @@ } }, { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endLines": "21", "endColumns": "19", - "endOffsets": "817" + "endOffsets": "838" }, "to": { "startLines": "2", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index 9cd6958..0f8ace8 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -4,14 +4,14 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", "map": [ { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endLines": "21", "endColumns": "19", - "endOffsets": "817" + "endOffsets": "838" }, "to": { "startLines": "2", @@ -23,14 +23,14 @@ } }, { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" }, "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", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index d2ca56e..ff3cdd6 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -4,30 +4,13 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", "map": [ { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" - }, - "to": { - "startLines": "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": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endColumns": "56", - "endOffsets": "764" + "endOffsets": "782" }, "to": { "startLines": "12", @@ -38,33 +21,14 @@ } }, { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "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": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" - }, - "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": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml", "from": { "startLines": "19,26", "startColumns": "4,4", - "startOffsets": "739,1047", + "startOffsets": "758,1073", "endLines": "24,29", "endColumns": "19,19", - "endOffsets": "1041,1162" + "endOffsets": "1065,1191" }, "to": { "startLines": "2,8", @@ -76,14 +40,14 @@ } }, { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", + "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": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + "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", @@ -93,6 +57,42 @@ "endColumns": "12,12,12,12,12,12,12,12,12,12,12", "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" } + }, + { + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", + "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" + }, + "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": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "783,836,890,944,730", + "endColumns": "51,52,52,51,51", + "endOffsets": "830,884,938,991,777" + }, + "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" + } } ] } diff --git a/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 5253e980352f89f945a10929d1f48507bacf2f3e..80170f5ed86fea8c1d6cf35e103f51221175e71b 100644 GIT binary patch delta 557 zcmV+|0@D5G;W_K!Ie>%#gaU*Egam{Iga(8Mgb0KQgbIWUgbcI|FwYP2xKP_}0RRBs z0RR9S005U@Zw?%PRZ+`M!cY+1lkg9G0qkA7Vd2X70Y(TAMM%Wp5`w%-LF7$Hfj~fO zp$nqW2mKiD%xzcvf&+vQ@9xaWJ&zgu8rzo0Op7<>SNzfutSuHBf%MrvD|`xyq1gvLcs*FXH`36+KUfn z4#AS0lmxoQV()cI^C5ilC(xM1t$&4OU-?*rrR5cDK&pYD0@)sZ_~n;lc^cXTLDbKa0}rP~V? z%qI3%B+9oUOikJYEQ*kw|Jwi#rclT+O+J1;-iev-&Zhvi+0N*N6N&hR&zDRlz0t^X z#CsQu`XY~k;EOjNj=NodP)h>@000002mk;;Apjb;)6fk(1rPuLa%FRGb#h~6b1q?W zb7Qw4)(s<>3G%p5+in2>0N1LxEYm;cla8<&-E4k`iom%wliAqMbK4gdfEh0gWI delta 544 zcmV+*0^j}X;W_8wIe>%#gaU*Egam{Iga(8Mgb0KQgbIWUgbcI|FwY5ZIYc070RRBl zmpRW3B7aR$yG{a85bgO2z5se_8wxAq2N)qh6d@6VB?Ngd3nFhq76=3s7q-|a?DJ#1 zGk3S*7aSl2Z+GV8p2rM+O&nWfrp=p+tH4cwSvHrgossc)yoZOKk+ag6E;{C#>ECQ4 z^MQ)u41aVek9LOO*j?-rCE{3chZC%{p`fLr!GCZlN$gqE$(qjUgP9|+mu^}DUE|9N zGz4Z3LGGS>2Pa>*H)UGhQL@-lv0VVU1JgMuwcm8+q$gl+O^{d$2GcEE4HSp)LGO%AFpT#Ugus}t+y8w8KFsVc1V1YvDZJt!*I zmw!+l?+0}OO%CBn?4 zEx@V-xy8T!IGjN-&$Q+7>+wR&e0M(usLyvsKaxx)F8uyfD&>nspQFCJc+4Mt42E8O ziAcip2T)4`1ONa400;m8Kp_AcJ%)lw0k_@I4L1c50RVDkb8mHWV`XzLVRCb00JkL8 z4I`NeZ#hIDX#oHL*q2am4q5@km#c3ML;*sV@NW)71klqB0GH764H}olZw?Tb_0$az i3jhEB000000002umwa#zM*;Jf#BdHF2JBG|0000Dvf$AG diff --git a/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt index ce07c7e..6ae019e 100644 --- a/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,8 +1,8 @@ -net.micode.notes.app-pngs-0 C:\Users\13293\Desktop\Notes-master3\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 C:\Users\13293\Desktop\Notes-master3\app\build\generated\res\resValues\debug -net.micode.notes.app-rs-2 C:\Users\13293\Desktop\Notes-master3\app\build\generated\res\rs\debug -net.micode.notes.app-mergeDebugResources-3 C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir -net.micode.notes.app-mergeDebugResources-4 C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir -net.micode.notes.app-merged_res-5 C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-6 C:\Users\13293\Desktop\Notes-master3\app\src\debug\res -net.micode.notes.app-main-7 C:\Users\13293\Desktop\Notes-master3\app\src\main\res +net.micode.notes.app-pngs-0 E:\study\rjgc\work\gitProject\src\Notes-master3\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 E:\study\rjgc\work\gitProject\src\Notes-master3\app\build\generated\res\resValues\debug +net.micode.notes.app-rs-2 E:\study\rjgc\work\gitProject\src\Notes-master3\app\build\generated\res\rs\debug +net.micode.notes.app-mergeDebugResources-3 E:\study\rjgc\work\gitProject\src\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir +net.micode.notes.app-mergeDebugResources-4 E:\study\rjgc\work\gitProject\src\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir +net.micode.notes.app-merged_res-5 E:\study\rjgc\work\gitProject\src\Notes-master3\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-6 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\debug\res +net.micode.notes.app-main-7 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\res diff --git a/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk index 3e66e298fd68ab9d51c840894e5f8d9afda0c361..5d507994a71c403d6acb0ac8ae6004a53a6ae4f3 100644 GIT binary patch delta 9432 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 F{SSc_P?-P# delta 9364 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 HVJuGv`czO% delta 725 zcmV;`0xJEmXRv3mxFZPRCM2m3$b(6fz#}jSt8TV@X81f>llUVqf5>;*yeOyaW?rN4q<-}1%oTvhTa4Q)f`EzBS;M|)9I}of20DJ-9$(K%l&T>&E|=~3 zTqghk00cmje5OE?sb?(@q~q>e9xf^X000uf2sFgFMMk_Brr3>?mgk7<0-3o0Df+EQ zu|rEmv!}55*U<_^BealjlN6mIf1O>_C^w?JnHCS}=~1RlS^^Ah`syuxij#|^(uf9@q(0pLc*ciC3JD}d7SwWu9IeFR|#Ygrw|7G=$ zTn2XC<;0UrB`SZZzR_q-Fh#1;0RR912X+n=gpR9G3!vT-EDUGnAH2X(uB+nd6$jm; zf;RvF00kbV&x{v;`dvYzpV(@Wj-C7491V2<0003uRtW{f0RR91F5V_g4iqu~r^}Z> z;Ax>+JOkktc<27ANd2>>c#|EWH6*D7jJy2kh0000BytqtTSkf%A1qJG8l4c}E2Q zld&coBJ2VBp~X32S|u)=lwCe=ExiH&0009}P*m8G9=sj27*9&G?Wt}Qkyj;~dnv)?L20SsDxefawxY^#-=>8_J6EFuu9=fnU`@K!CL&l>!)SP!kU HVJuGv-ZxN8 diff --git a/src/Notes-master3/local.properties b/src/Notes-master3/local.properties index 7fbf616..1976308 100644 --- a/src/Notes-master3/local.properties +++ b/src/Notes-master3/local.properties @@ -4,5 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Fri Mar 31 15:23:17 CST 2023 -sdk.dir=C\:\\Users\\13293\\AppData\\Local\\Android\\Sdk +#Fri Mar 31 16:42:01 CST 2023 +sdk.dir=E\:\\study\\rjgc\\work From 4c2d1ec4f131e436901cdf19f0dc944748412717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=88=90=E6=89=AC?= <1329310186@qq.com> Date: Wed, 5 Apr 2023 14:54:17 +0800 Subject: [PATCH 05/17] change --- doc/第一次实践分工.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/第一次实践分工.txt b/doc/第一次实践分工.txt index 9fcbe72..f9a61f2 100644 --- a/doc/第一次实践分工.txt +++ b/doc/第一次实践分工.txt @@ -9,5 +9,4 @@ 王俊龙: gtask 王志成:ui -12s -好 \ No newline at end of file +、 \ No newline at end of file From 22b7c6a270a85ebfa08d0efeeac39a670155024e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=88=90=E6=89=AC?= <1329310186@qq.com> Date: Wed, 5 Apr 2023 15:17:41 +0800 Subject: [PATCH 06/17] 1 --- src/Notes-master3/.idea/Notes-master3.iml | 9 +++++++++ src/Notes-master3/.idea/gradle.xml | 2 +- src/Notes-master3/.idea/misc.xml | 2 +- src/Notes-master3/.idea/modules.xml | 8 ++++++++ src/Notes-master3/.idea/vcs.xml | 6 ++++++ src/Notes-master3/local.properties | 4 ++-- 6 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 src/Notes-master3/.idea/Notes-master3.iml create mode 100644 src/Notes-master3/.idea/modules.xml create mode 100644 src/Notes-master3/.idea/vcs.xml diff --git a/src/Notes-master3/.idea/Notes-master3.iml b/src/Notes-master3/.idea/Notes-master3.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/src/Notes-master3/.idea/Notes-master3.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/Notes-master3/.idea/gradle.xml b/src/Notes-master3/.idea/gradle.xml index 6e5389e..7b46144 100644 --- a/src/Notes-master3/.idea/gradle.xml +++ b/src/Notes-master3/.idea/gradle.xml @@ -7,7 +7,7 @@