From 108301aef93eed05d652ae7b40467b3a2c42791d 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:37:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.gradle/7.5/checksums/checksums.lock | Bin 17 -> 17 bytes .../.gradle/7.5/checksums/md5-checksums.bin | Bin 32747 -> 32797 bytes .../.gradle/7.5/checksums/sha1-checksums.bin | Bin 95279 -> 95441 bytes .../7.5/executionHistory/executionHistory.bin | Bin 307862 -> 307862 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../.gradle/7.5/fileHashes/fileHashes.bin | Bin 126083 -> 131533 bytes .../.gradle/7.5/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../buildOutputCleanup/outputFiles.bin | Bin 25661 -> 26201 bytes src/Notes-master3/.gradle/file-system.probe | Bin 8 -> 8 bytes src/Notes-master3/.idea/checkstyle-idea.xml | 16 ++ src/Notes-master3/.idea/gradle.xml | 2 +- src/Notes-master3/.idea/misc.xml | 2 +- .../compile-file-map.properties | 192 +++++++++--------- .../debug/mergeDebugResources/merger.xml | 16 +- .../drawable-hdpi_edit_title_green.9.png.flat | Bin 0 -> 3096 bytes .../drawable-hdpi_edit_title_white.9.png.flat | Bin 0 -> 1180 bytes .../debug/drawable-hdpi_edit_white.9.png.flat | Bin 0 -> 692 bytes ...able-hdpi_font_size_selector_bg.9.png.flat | Bin 0 -> 1656 bytes .../drawable-hdpi_list_blue_middle.9.png.flat | Bin 0 -> 628 bytes .../drawable-hdpi_list_blue_single.9.png.flat | Bin 0 -> 2052 bytes .../drawable-hdpi_list_folder.9.png.flat | Bin 0 -> 3044 bytes .../drawable-hdpi_list_green_up.9.png.flat | Bin 0 -> 856 bytes .../drawable-hdpi_list_red_middle.9.png.flat | Bin 0 -> 604 bytes .../drawable-hdpi_list_red_single.9.png.flat | Bin 0 -> 2000 bytes .../drawable-hdpi_list_white_down.9.png.flat | Bin 0 -> 1528 bytes ...drawable-hdpi_list_white_single.9.png.flat | Bin 0 -> 1700 bytes ...rawable-hdpi_list_yellow_middle.9.png.flat | Bin 0 -> 688 bytes .../drawable-hdpi_list_yellow_up.9.png.flat | Bin 0 -> 832 bytes .../drawable-hdpi_title_bar_bg.9.png.flat | Bin 0 -> 3392 bytes .../debug/out/multi-v2/debug.json | 130 ++++++------ .../debug/out/multi-v2/values-zh-rCN.json | 40 ++-- .../debug/out/multi-v2/values-zh-rTW.json | 4 +- .../debug/out/multi-v2/values.json | 86 ++++---- .../source_set_path_map/debug/file-map.txt | 16 +- 35 files changed, 260 insertions(+), 244 deletions(-) create mode 100644 src/Notes-master3/.idea/checkstyle-idea.xml create mode 100644 src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat create mode 100644 src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat create mode 100644 src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat create mode 100644 src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat create mode 100644 src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat create mode 100644 src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat create mode 100644 src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat create mode 100644 src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat create mode 100644 src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat create mode 100644 src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat create mode 100644 src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat create mode 100644 src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat create mode 100644 src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat create mode 100644 src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat create mode 100644 src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat diff --git a/src/Notes-master3/.gradle/7.5/checksums/checksums.lock b/src/Notes-master3/.gradle/7.5/checksums/checksums.lock index 3ea0351fceeabd641519f4754da22273631b0853..f774aeb767bd3e7cc341908cdb807a1d6c1a68e6 100644 GIT binary patch literal 17 VcmZRsv@dxOaY<_@0~oOK0{}9i1Tg>r literal 17 VcmZRsv@dxOaY<_@0~oNf0{}9a1StRj 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 8fd4140bf07eb3782f9e7f93ad0bbfb1bedb1fed..fc2523ec2144f3a1ebb7b7368569b27fe31b807f 100644 GIT binary patch delta 73 zcmaF;pK)#j(*_d>M!C(V5{<(A4JsN;ZvPq?z@Yy1=C#`1?2HdLDjJAxcJx?fJ~=ap VZ}Rba5rF_t$4L-HEbc&B4*+kP6!!oC delta 32 ocmbQ+!1Ve*;|3E6M%m4#5{<%}&uKfcGoIY2=pnk<(PNc40Lq^W!~g&Q 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 1cad8d72845c1df66ad58d6170c5f1ed707030b4..415d95564b13d90ea1aeff955d8fccb4f0be37aa 100644 GIT binary patch delta 145 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 literal 17 VcmZQRux5)(aDJ>d0~j#<1pqR01hD`B diff --git a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin index d7690cdf4bca23aee030009ec0e7efbd61ba28d5..397e99e2408cfab4413eb48d507664fd1bd0a029 100644 GIT binary patch delta 3590 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 diff --git a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock index e05740e8d8fdac8cc787f2a2355a39a4a9ccabbc..c2cda0b21adca92c1edaab943803a24b52090d27 100644 GIT binary patch literal 17 UcmZQRS;(HBDtIuD0Sx$Z04m=D(*OVf literal 17 VcmZQRS;(HBDtIuD0StJ50{|;*1YrOG diff --git a/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 9de4047e15dcbe56feca9d039740435799b765e7..3226fae273a21908236b95881b73699ead405bb1 100644 GIT binary patch literal 17 UcmZSn8eGv@J-bDe0SuV60W?JfCIA2c literal 17 UcmZSn8eGv@J-bDe0SuVA0W>891^@s6 diff --git a/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin index 71baa32284322a2a6584d08d9cf5c6dd471ec7c8..0543e866f011eead2d13464ae40db8e794984c72 100644 GIT binary patch delta 678 zcmdmcg7M}V#tkMCjB6&FN*MC<@qX#76`#le1}PsW$4V#&wEWFGUCyq)2`cEnxm02y zBY#NE^v}6Qw;+P4lQ;89F*5NhuNI2l7*PaOxpFeA%maa?YdvRji51I31k(gJ-<7$@ z$RDS5c#TqNEmZr`$xG#a@;f()F6Nui4Aot{d8)hsqrd@?2G*GGtm#md+c(cuh-BpF zEuNThYfdOsFn{t}MMeIGuHHJ;3EWVzx0_j&A{o{F#QsNVPRWFt+4>&}uJ)?%@^>GX zfhxA#9IC9zsJ?CPoVV{EF+l~HVTy0Qo2L0vTB8vvesXiEiX#iZ%Uiz5=|3wVf@!9k z*J?;I@tX$iTrF-A1QAS`K6$TJh5*w6$tRHyPnSSdDsPt6p2^IAysqJs?;1|1nd+0* z>TM7Zd$rMP;kxKAQ0@08hw7gYkY2Id>~=xfNvO)$&7uYenfNja7Py^x_h&#g#?p8x~-dd&b3kjsOZ_rrdAs? zvKN)gz7~F_1{F+%1wiiBFFIFOEQ*7Or;1L#YZb`PdFkYe&F&ANVvUnktvB*>ToJp^ zv-dqz?Dpof*1#C7`jq|m$Dwv;NTvRteAOmHpfvt1p@0h2x-@UuoB z2LZEXAyEO7&LSAI{vuETvwkEX0kh5}I0UmEDi8vbMl4^my)2OflV&idlO-|0v;8r- z0<+FEpaQdoH@5<_RXPv?lYKm>lT|%QleRsmvvxiQ0h5(KV3Q3%QUWDmu_3Suvq4Dw E8yHzRwg3PC diff --git a/src/Notes-master3/.gradle/file-system.probe b/src/Notes-master3/.gradle/file-system.probe index bf3f2b3fd4df3d24158ada4b66ae7122fb92f308..ef9fb1a131aa206994f2969504fffa5c96a05a95 100644 GIT binary patch literal 8 PcmZQzU~CWYG&%tQ1^5CS literal 8 PcmZQzU~D&gxpOW62vY+7 diff --git a/src/Notes-master3/.idea/checkstyle-idea.xml b/src/Notes-master3/.idea/checkstyle-idea.xml new file mode 100644 index 0000000..ac8ae2c --- /dev/null +++ b/src/Notes-master3/.idea/checkstyle-idea.xml @@ -0,0 +1,16 @@ + + + + 10.7.0 + JavaOnly + true + + + \ No newline at end of file diff --git a/src/Notes-master3/.idea/gradle.xml b/src/Notes-master3/.idea/gradle.xml index 7b46144..df39334 100644 --- a/src/Notes-master3/.idea/gradle.xml +++ b/src/Notes-master3/.idea/gradle.xml @@ -7,7 +7,7 @@