From a71662df18cab90170c8695d6fb8e3cbba211468 Mon Sep 17 00:00:00 2001 From: HINOTOR <3635271576@qq.com> Date: Fri, 9 Jun 2023 13:56:37 +0800 Subject: [PATCH] src --- .../7.5/executionHistory/executionHistory.bin | Bin 367886 -> 367886 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../.gradle/7.5/fileHashes/fileHashes.bin | Bin 120233 -> 120233 bytes .../.gradle/7.5/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes src/Notes-master/.gradle/file-system.probe | Bin 8 -> 8 bytes .../compile-file-map.properties | 8 +- .../values-zh-rTW/values-zh-rTW.xml | 108 +++++++++++ .../merged.dir/values/values.xml | 177 ++++++++++++++++++ .../tmp/debug/dex-renamer-state.txt | 2 +- .../debug/out/multi-v2/debug.json | 127 +++++-------- .../debug/out/multi-v2/values-zh-rCN.json | 41 +--- .../app/build/outputs/apk/debug/app-debug.apk | Bin 1739351 -> 1739352 bytes 13 files changed, 335 insertions(+), 128 deletions(-) create mode 100644 src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml create mode 100644 src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml diff --git a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin b/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin index af1f327a4d744c89824e719ad970c8fa990c3723..5d03fa8fd6d55eae6cbb1a048c320ca6eace6eab 100644 GIT binary patch delta 4298 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 delta 4183 zcmai1d03Ry8s~iH9A+2=hCy~^6_7<>6c9-^mmV!m$+qk5nwX{;m6}g^O>a^lAP57W z@UoTQQYj>;=%kXeX|BO_yJ;@i)vMQ3z(7{%zTcVgxqtP@U+=u@@AocehMYr=Ifoo; z&Xs$8@^Qr5k*gLjS-5o3vg8lnj#w4`_l2uIS^e<}3)7!QPOSLbzBv_#C3-izX`jvZ z-bBvZrVH7(tVaZbhQKxGq#d&dK88ATZuodM`71i;_5SXmFh1GZNm@r&#gN9mS4(g zYN4$-Bq|xD-jU+hEAY zeNQM&&youfW9)YzS=AIyTJ zO~e)6?UmAK-B2TR_DaEYCkmc@(qVe}Nu%+4pAwTQonNnQH%Y zRHdR~-JK*|4_%;w$nGQ)-T9KbhuMU2{}eTj$HO?>j>LFs7wPy6a%>FgDt4 zcXu5I=FY%L8NYpbaG1;ez3bw(rY$SUy9fEhn4j=GJdBOhw!AjUuff8;%XP5O>-M?l zH}123&_H|-|8#2gH!B^Ir@uPk_$Rk_%`*YHRzWPX-e0_O$>K#Ji{4!cHa09gq(-2) z7K5c?{2yPfyBzt&2i|*seXn+KGOB*_Tlc~7hp`WvI(VywOkDy;ZJ0Z4In)SkHY`y4 zvT&qWSqof}o)%PV-Q(FxZkxXc$8S zW!kILh{owpaMY0o$pzl3#{@Hab^L)yu%I`FVk$5=vpDrNMWw%G4e?{B1Jnmm2UiQN zjm??~R$u&A_eb;YMRTjGFAa$zSDA2<PFPHHZGVh;!bke!=@CTM>B^?6g;8I_A!QsL zE3X-Nx)6B-u@nTPoE@M1ouqb;Z+ zv8H1wXeWAVz+vQivnl4QF>q*@O#KRdFsbPd%B*4e6zUC=P$iy=L?0FQDe?n z?Y86v^}dM3M7+)#j{FBz1E>-Zw0@Y?WJ?_eLw6)Mh-XA6-l;WyEW*sH%@ML^B8SU< z=D3G`EKET6@@HY@mAG$>Yt?a2@`O+Q(M{>O!5^tspm5rs=|#am{MmRj!cFQ)FB9-uir*zkU%#3B{i1ojt16D9yPh5RfDsFerN<#Dk$M};0@#h>TR0>I2-7R-A^qIJb=41XZRUBxVjKNjK@McgGsO$mxS zgcz-eg#!1o5;lc?jU5cz#Dh4t8>zOHFui8IGJ5^h;iMW8FEV`POOgK*EPs6y*E3l` zq_syxpQ9>1hX>FWB$1rMW9fR-e3!#R=|=3<4Mo_8wCr+uD7%mOAz=h}cZToJTQ|RP zAbGcTsrvld>@_>Z8kA|^raiZZO}X4jeK1o&P&Le?I*KYffHf}X@=5%n;BiyNcO$~U zwX_BqOgHdgE(-?no27WV1##3FaF*Rdw`a5D%)#W|DjX{;7#)&}K zlg~%sqH`zJdV%Bu)Z}vqSfFUGE5-EXaMKYr21l-fl02;0fHl9%<6(3Y@@zwar7HC7 zoVbTW)&86?hmUqd#BOW}waPs^_^ZHsqfl~(ck;PbwNup1fV^OAZB02-K{2Z79^BTd zd`#J`v@V}d;~T^U)`Jx2xw`CnEZmq`)Fwt?4L<^kE8xr5pu{OZQTO($$% z%NofQ{Fgt{WJG(aDpLi)Z_`LMxj&am>-GX+Jr^p2oizOH5nAi)?Sy^tm z*&ILl=j2!$j~l{jsDm>hEEu4GYk987WgW`g;79zd#+ycLWdRT$irwo{ROdxhwl^e( zF;|EwkyJ3Y5F1*cY-b^lRO2CHOskd2p}ItJVp~uJVQxHvKN1V_QWy(Y-4MAmU{5Ko zR=pc{;`>A=>(R*XC`q8YR0^m2aT8mBPv&01pqk51kC^d literal 17 VcmZQxz;RmS+p=4G8Nh(+HUK%C1)~4} diff --git a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin index 989ad8b8384fdab5d7a5840ad634d82a953eaea5..d2532ed1e5e8cdcc31fb4907812773fdb57ce4c7 100644 GIT binary patch delta 2871 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 literal 17 VcmZQRo*5Z&vA9*20Ss)n0RS@P1kL~e diff --git a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock index e1ceabdf52a496e516fef487eb951fef266a4f5c..ab0b1d276627374de9b7db87b1974fa7a77752c3 100644 GIT binary patch literal 17 VcmZSXk9-=r@5|}C?B1pq!;1(pB+ literal 17 VcmZSXk9-=r@5|}C<=1^_-L1!4dI diff --git a/src/Notes-master/.gradle/file-system.probe b/src/Notes-master/.gradle/file-system.probe index c486a7375965e4f20bb49554aa4988606be81261..165cbaca523b2f73f94cb662196f2b8bace964f6 100644 GIT binary patch literal 8 PcmZQzVC + + + 短信 + 郵件 + + + %1$s 條符合”%2$s“的搜尋結果 + + 確認刪除檔夾及所包含的便簽嗎？ + 确认要删除該條便籤嗎? + 确认要刪除所選的 %d 條便籤嗎? + 刪除 + 便簽 + 便簽2x2 + 便簽4x4 + 刪除 + 通話便籤 + 取消 + 設置 + 成功刪除提醒 + 不能爲空便籤設置鬧鐘提醒 + 不能將空便籤發送到桌面 + 要查看的便籤不存在 + 導出TXT時發生錯誤，請檢查SD卡 + SD卡被佔用，不能操作 + 同步已取消 + 同步失敗，發生內部錯誤 + 同步失敗，請檢查網絡和帳號設置 + 導出失敗 + 文件夾 %1$s 已存在，請重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已將文本文件(%1$s)導出至SD(%2$s)目錄 + 已將所選 %1$d 便籤移到 %2$s 文件夾 + 請輸入名稱 + 已添加到桌面 + 提醒我 + 新建文件夾 + 刪除 + 取消全選 + 導出文本 + 修改文件夾名稱 + 刪除文件夾 + 查看文件夾 + 大 + 正常 + 文字大小 + 小 + 超大 + 進入清單模式 + 移動到文件夾 + 上一級文件夾 + 退出清單模式 + 刪除提醒 + 搜尋 + 全選 + 沒有選中項，操作無效 + 選中了 %d 項 + 發送到桌面 + 設置 + 分享 + 同步 + 取消同步 + 選擇文件夾 + 已過期 + 發送郵件 + 打開地圖 + 呼叫電話 + 浏覽網頁 + 查看 + 知道了 + 新建便簽 + ... + 与google task同步便簽記錄 + 同步賬號 + 添加賬號 + 新建便籤背景顏色隨機 + 取消同步 + 立即同步 + 當前帳號 %1$s + 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復 + 請選擇google帳號，便簽將與該帳號的google task內容同步。 + 同步便簽 + 上次同步于 %1$s + 取消 + 更換賬號 + 刪除賬號 + 設置 + 正在同步中，不能修改同步帳號 + 同步帳號已設置為%1$s + 便籤 + 搜索便籤 + 正在搜索便籤 + 便籤中的文字 + 創建提醒 + 導出成功 + 與%1$s同步成功 + 正在獲取服務器便籤列表... + 登陸%1$s... + 正在同步本地便籤... + 同步已取消 + 同步失敗 + 同步成功 + 同步便簽... + 沒有關聯內容，點擊新建便簽。 + 訪客模式下，便籤內容不可見 + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml new file mode 100644 index 0000000..be0a1eb --- /dev/null +++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml @@ -0,0 +1,177 @@ + + + + -%s + --%s + --%s + --%s + + + Messaging + Email + + #335b5b5b + 26sp + 20sp + 17sp + 14sp + 33sp + + %1$s result for \"%2$s\" + + %1$s results for \"%2$s\" + + Confirm to delete folder and its notes? + Confirm to delete this note? + Confirm to delete the selected %d notes? + Confirm to make the selected %d notes go back? + Delete selected notes + Notes + Notes 2x2 + Notes 4x4 + Delete + Call notes + cancel + set + Delete reminder successfully + Sorry, can not set clock on empty note + Sorry, can not send and empty note to home + The note is not exist + Export failed, please check SD card + SD card busy, not available now + Sync is canceled + Sync failed, internal error occurs + Sync failed, please check network and account settings + Export fail + notes_%s.txt + /MIUI/notes/ + The folder %1$s exist, please rename + yyyyMMdd + MMMd kk:mm + Export text file (%1$s) to SD (%2$s) directory + (%d) + Have moved selected %1$d notes to %2$s folder + Input name + Note added to home + Remind me + New Folder + bg:default + Delete + Deselect all + Export text + Change folder name + Delete folder + View folder + Large + Medium + Font size + Small + Super + go back + Enter check list + set lock + Move to folder + Parent folder + Leave check list + set private note password + Delete reminder + revoke private note password + Search + Select all + Nothing selected, the operation is invalid + %d selected + Send to home + Settings + Share + Sync + Cancel syncing + Select folder + trash + remove lock + Expired + Send email + Open map + Call + Browse web + Take a look + Got it + Add note + ... + Sync notes with google task + Sync account + Add account + New note background color random + Cancel syncing + Sync immediately + Current account %1$s + All sync related information will be deleted, which may result in duplicated items sometime + Please select a google account. Local notes will be synced with google task. + Sync notes + Last sync time %1$s + yyyy-MM-dd hh:mm:ss + Cancel + Change sync account + Remove sync account + Settings + Cannot change the account because sync is in progress + %1$s has been set as the sync account + Notes + Search notes + Searching Notes + Text in your notes + Set reminder + Export successful + Sync is successful with account %1$s + Getting remote note list... + Logging into %1$s... + Synchronize local notes with Google Task... + Sync is canceled + Sync is failed + Sync is successful + Syncing notes... + No associated note found, click to create associated note. + Privacy mode，can not see note content + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index f5f2af8..6772a23 100644 --- a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Fri Jun 09 13:46:05 CST 2023 +#Fri Jun 09 13:55:39 CST 2023 base.0=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index b99f441..d05fbf7 100644 --- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,89 +1,7 @@ { "logs": [ - { - "outputFile": "D:\\programming\\androidstudio\\Sdk\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ - { - "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "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": "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", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,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": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" - } - } - ] - }, { "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ - { - "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7222,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,58,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7276,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "6,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,107,108,109,110,111,112,113,114,115,116,117,118", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,667,717,757,805,853,898,955,1009,1059,1121,1189,1266,1325,1390,1453,1508,1568,1631,1685,1747,1798,1858,1911,1973,2058,2117,2198,2248,2307,2350,2403,2450,2493,2544,2594,2654,2707,2758,2804,2852,2900,2946,2993,3037,3087,3129,3174,3233,3285,3337,3389,3448,3491,3538,3594,3649,3704,3748,3790,3831,3881,3940,3985,4029,4080,4129,4178,4225,4272,4319,4364,4415,4468,4543,4602,4659,4733,4797,4866,4944,5054,5158,5231,5297,5379,5434,5499,5564,5613,5696,5774,5812,5857,5905,5967,6024,6079,6138,6205,6263,6325,6373,6418,6466,6517,6583", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118", - "endColumns": "14,72,65,72,70,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,61,50,59,52,61,84,58,80,49,58,42,52,46,42,50,49,59,52,50,45,47,47,45,46,43,49,41,44,58,51,51,51,58,42,46,55,54,54,43,41,40,49,58,44,43,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,81,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,662,712,752,800,848,893,950,1004,1054,1116,1184,1261,1320,1385,1448,1503,1563,1626,1680,1742,1793,1853,1906,1968,2053,2112,2193,2243,2302,2345,2398,2445,2488,2539,2589,2649,2702,2753,2799,2847,2895,2941,2988,3032,3082,3124,3169,3228,3280,3332,3384,3443,3486,3533,3589,3644,3699,3743,3785,3826,3876,3935,3980,4024,4075,4124,4173,4220,4267,4314,4359,4410,4463,4538,4597,4654,4728,4792,4861,4939,5049,5153,5226,5292,5374,5429,5494,5559,5608,5691,5769,5807,5852,5900,5962,6019,6074,6133,6200,6258,6320,6368,6413,6461,6512,6578,6644" - } - }, - { - "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - } - ] - }, - { - "outputFile": "D:\\programming\\androidstudio\\Sdk\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", @@ -126,7 +44,7 @@ ] }, { - "outputFile": "D:\\programming\\androidstudio\\Sdk\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", "map": [ { "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", @@ -220,6 +138,49 @@ } } ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", + "map": [ + { + "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + }, + { + "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "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": "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", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,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": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" + } + } + ] } ] } \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index 8ea87e1..faad20e 100644 --- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "D:\\programming\\androidstudio\\Sdk\\.gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values-zh-rCN\\values-zh-rCN.xml", + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", "map": [ { "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", @@ -42,45 +42,6 @@ } } ] - }, - { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", - "map": [ - { - "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7222,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,58,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7276,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "6,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,107,108,109,110,111,112,113,114,115,116,117,118", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,667,717,757,805,853,898,955,1009,1059,1121,1189,1266,1325,1390,1453,1508,1568,1631,1685,1747,1798,1858,1911,1973,2058,2117,2198,2248,2307,2350,2403,2450,2493,2544,2594,2654,2707,2758,2804,2852,2900,2946,2993,3037,3087,3129,3174,3233,3285,3337,3389,3448,3491,3538,3594,3649,3704,3748,3790,3831,3881,3940,3985,4029,4080,4129,4178,4225,4272,4319,4364,4415,4468,4543,4602,4659,4733,4797,4866,4944,5054,5158,5231,5297,5379,5434,5499,5564,5613,5696,5774,5812,5857,5905,5967,6024,6079,6138,6205,6263,6325,6373,6418,6466,6517,6583", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118", - "endColumns": "14,72,65,72,70,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,61,50,59,52,61,84,58,80,49,58,42,52,46,42,50,49,59,52,50,45,47,47,45,46,43,49,41,44,58,51,51,51,58,42,46,55,54,54,43,41,40,49,58,44,43,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,81,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,662,712,752,800,848,893,950,1004,1054,1116,1184,1261,1320,1385,1448,1503,1563,1626,1680,1742,1793,1853,1906,1968,2053,2112,2193,2243,2302,2345,2398,2445,2488,2539,2589,2649,2702,2753,2799,2847,2895,2941,2988,3032,3082,3124,3169,3228,3280,3332,3384,3443,3486,3533,3589,3644,3699,3743,3785,3826,3876,3935,3980,4024,4075,4124,4173,4220,4267,4314,4359,4410,4463,4538,4597,4654,4728,4792,4861,4939,5049,5153,5226,5292,5374,5429,5494,5559,5608,5691,5769,5807,5852,5900,5962,6019,6074,6133,6200,6258,6320,6368,6413,6461,6512,6578,6644" - } - }, - { - "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - } - ] } ] } \ No newline at end of file diff --git a/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk index 3077a9d2852c0518e2dd4b9cd0ec8f0b6cb44619..ac843844d103a3bf52133c0499a15ea264dbe0b2 100644 GIT binary patch delta 2569 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 SE5241{C^+8FslnFvi||<7ck)f